diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 15:42:54 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 15:42:54 -0600 |
| commit | 8a9130eae5a421c52573a0fb34fb0125e594ef83 (patch) | |
| tree | c2612ae7cba187abc1714f74a5d1408accadd010 /nova/exception.py | |
| parent | 8da6796789767b1341cb5a650066b67ad3191c74 (diff) | |
| parent | 78bd53a44a529f0c6641357fa001d4d037fbc375 (diff) | |
| download | nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.tar.gz nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.tar.xz nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.zip | |
Merge from trunk and mega conflict resolution
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions