summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2010-09-28 13:13:36 -0500
committerCerberus <matt.dietz@rackspace.com>2010-09-28 13:13:36 -0500
commit7ee8a0f8b2d781d758b62d2aec423a5a733d2aa7 (patch)
tree38db21bb15b6bf0ad17b47579e4e89c24193434f /nova/api
parent41e8f72334bd7a69d86575c6fc855146e12dce59 (diff)
parentfa112f5aec624df7d6fc10584295a38bf440b28c (diff)
downloadnova-7ee8a0f8b2d781d758b62d2aec423a5a733d2aa7.tar.gz
nova-7ee8a0f8b2d781d758b62d2aec423a5a733d2aa7.tar.xz
nova-7ee8a0f8b2d781d758b62d2aec423a5a733d2aa7.zip
merge from trunk
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions