summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-12 15:49:44 -0600
committerRick Harris <rick.harris@rackspace.com>2011-01-12 15:49:44 -0600
commitafaec68e7a43499aaa07f8ea45cbb92341891b10 (patch)
tree9769a07343b11c1fe6e60c84f9f84d6765595033 /nova/api
parenteb146fd75183d80e50f8a67021dae565f4915b2e (diff)
parentc5c5b77a405cf1adb6d6289be24d4385ff6d5ea9 (diff)
Merging trunk
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions