diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-28 12:03:07 -0500 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-28 12:03:07 -0500 |
| commit | f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436 (patch) | |
| tree | afe78923410e9d039e54e2705f6c7514377a2163 /nova/exception.py | |
| parent | a55fefdd78ac984b366c8e1701cbbd8f5ad18e97 (diff) | |
| parent | edf5da85648659b1a7ad105248d69ef9f8c977e4 (diff) | |
| download | nova-f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436.tar.gz nova-f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436.tar.xz nova-f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436.zip | |
Merging trunk to my branch. Fixed a conflict in servers.py.
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions