| commit | a286795de07698eb33585ba9da61bc7711352730 | [log] [tgz] |
|---|---|---|
| author | Ash Wilson <smashwilson@gmail.com> | Wed Sep 10 12:29:06 2014 -0400 |
| committer | Ash Wilson <smashwilson@gmail.com> | Wed Sep 10 12:29:06 2014 -0400 |
| tree | 83dd94d46d19aca4d95d80ccde62d209c73dff14 | |
| parent | 5266e49cf3097f1ee9062a1731fa137a5ac4d0a6 [diff] | |
| parent | e69059d9c42b46df908bd68ed47dccce3046e1c2 [diff] |
Merge remote-tracking branch 'upstream/v0.2.0' into identity-v3 Conflicts: acceptance/openstack/compute/tools_test.go