diff options
| author | matt.dietz@rackspace.com <> | 2011-07-21 16:50:00 -0500 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-21 16:50:00 -0500 |
| commit | f67ffed5fc42a1234ccbf0909bd7326c5a06307e (patch) | |
| tree | 5b6c6cedff03cea1ac3a77b32536109ead9eede9 /nova/openstack | |
| parent | 806be42000cf54e5b2ff9fb03446e8e6924bd38b (diff) | |
| parent | 490226870887f9986f9f57b6af7cfcc92e45da7c (diff) | |
Resolved conflict with trunk
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions