diff options
| author | Matt Dietz <matt.dietz@rackspace.com> | 2011-08-02 20:23:12 +0000 |
|---|---|---|
| committer | Matt Dietz <matt.dietz@rackspace.com> | 2011-08-02 20:23:12 +0000 |
| commit | 0d8942fc5f47a5f434115ac0c1444b6485c6ba1f (patch) | |
| tree | 4a6c3ea0875976f64e3dcb8a761d1ba09ca61bf6 /nova/openstack | |
| parent | 1c8d2970456a713cebece538050f1efff9747d1a (diff) | |
Bad merge res
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions