diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-18 16:45:31 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-18 16:45:31 -0600 |
| commit | 201391007e58b2f92fd7b56ccbf308e5909da7c0 (patch) | |
| tree | 7965568a97336d0817f47035504ec79bcf488a70 /nova/rpc.py | |
| parent | a43c5929de7ebf58eb9ecb8416ce3cf4194c176a (diff) | |
| parent | 8de8d1d045ca9fe12596e53d2244f4f8703cc209 (diff) | |
| download | nova-201391007e58b2f92fd7b56ccbf308e5909da7c0.tar.gz nova-201391007e58b2f92fd7b56ccbf308e5909da7c0.tar.xz nova-201391007e58b2f92fd7b56ccbf308e5909da7c0.zip | |
Merge from trunk and merge conflict resolution
Diffstat (limited to 'nova/rpc.py')
0 files changed, 0 insertions, 0 deletions