diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-23 15:37:00 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-23 15:37:00 -0800 |
| commit | 9c1f1c72883bb58a1d0de8541e55078859c2315c (patch) | |
| tree | 9bb0e2f3008393a4977d885c01fc56fbfbc94870 /nova/rpc.py | |
| parent | 80970a82f1d23611291144ed41362d4c535c70e0 (diff) | |
| parent | c27c19ea316b343f1623a7c1bf21c53cd426603b (diff) | |
| download | nova-9c1f1c72883bb58a1d0de8541e55078859c2315c.tar.gz nova-9c1f1c72883bb58a1d0de8541e55078859c2315c.tar.xz nova-9c1f1c72883bb58a1d0de8541e55078859c2315c.zip | |
merge and fix conflicts
Diffstat (limited to 'nova/rpc.py')
0 files changed, 0 insertions, 0 deletions