diff options
author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-14 14:38:00 -0700 |
---|---|---|
committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-14 14:38:00 -0700 |
commit | 7f5c50502815c31b3c609cf26caa02063b823294 (patch) | |
tree | 2e2f64f6f8f4ad2a3967cfae6178e9a2dcbd9517 /nova/exception.py | |
parent | 8bdc9ec6f90341ed1a3890af283addc7c0a053c9 (diff) | |
parent | 24f8cb89f8b92563d364186b80c7d73d28b26bea (diff) | |
download | nova-7f5c50502815c31b3c609cf26caa02063b823294.tar.gz nova-7f5c50502815c31b3c609cf26caa02063b823294.tar.xz nova-7f5c50502815c31b3c609cf26caa02063b823294.zip |
merged fix-hostname and fixed conflict
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions