| commit | f25ae3782f99fa33f4af54042e64bae722d01ab1 | [log] [tgz] |
|---|---|---|
| author | Ash Wilson <smashwilson@gmail.com> | Mon Oct 06 14:40:29 2014 -0400 |
| committer | Ash Wilson <smashwilson@gmail.com> | Mon Oct 06 14:40:29 2014 -0400 |
| tree | 16fe1a2c29097841878048d95fe234b17150283c | |
| parent | f2f6c0a6aa5d29eafcfd0c7e515c26e7e5ff81b2 [diff] | |
| parent | 541fa55b8cf33935a907cffc90e3a79c51a5791a [diff] |
Merge remote-tracking branch 'upstream/v0.2.0' into update-identity-v2 Conflicts: openstack/common/extensions/requests.go openstack/identity/v3/tokens/results.go openstack/networking/v2/extensions/delegate_test.go