summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-07-14 13:25:05 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-07-14 13:25:05 -0400
commit27b8d75f9b666ce08472270b38685d8e36a612d8 (patch)
tree71c8fd18532acb36ee23dcf77c0f8dcb542f2bfc /nova/openstack
parentbf7db726c3b26c8e13226cf5c1446befee6a6f2d (diff)
fixing bad merge
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions