diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-04 22:12:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-04 22:12:20 +0000 |
| commit | e183b93481de61d909abb9569841bd553e1ea489 (patch) | |
| tree | 154b46f36a9bac87fbf9b2a71d499b32538947fb /setup.py | |
| parent | 0c9538d24462f64bdff64a6d80492b29a6232189 (diff) | |
| parent | 2ff3ddd356d599677bfc2a1ad08009b2226357eb (diff) | |
Merge "Ignore conflict on v2 auto role assignment (bug 1161963)"
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions