summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-05-27 09:18:02 -0400
committerDan Prince <dan.prince@rackspace.com>2011-05-27 09:18:02 -0400
commit3100caf770269ef4a1289cecead26ac0349b17ac (patch)
tree5541dd57c3f38a0996bc9723f01edb3a0d43c7e3 /nova/api
parent299cadb9ce2e2600b18e2befbed967ca2941256d (diff)
parenta7c36f68793a7db454d344187d4596ebecc8ade0 (diff)
Merge w/ trunk.
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions