summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-18 17:26:38 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-07-18 17:26:38 -0700
commit89ead61d521c8f585732d50b8d3d31361d7c1d82 (patch)
tree67be0c2abfcd1208a8cd553a7db1b9b09d4d627f /nova/openstack
parent87434352e7dc165d269b5831af8ff690fcdbdb5b (diff)
fix bad merge
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions