summaryrefslogtreecommitdiffstats
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-09-16 12:39:35 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-09-16 12:39:35 -0400
commit8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8 (patch)
tree6fcdcea61420089517dc4b0976cc6114e847387f /nova/cloudpipe
parenta458a5a6987f151403aa8d4fbc9440396712e3d7 (diff)
Fix things not quite merged perfectly -- all tests now pass
Diffstat (limited to 'nova/cloudpipe')
0 files changed, 0 insertions, 0 deletions