diff options
| author | jaypipes@gmail.com <> | 2010-12-15 15:14:09 -0500 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2010-12-15 15:14:09 -0500 |
| commit | d7edc3d1d4ea67e4a3b86cc4c8c4836b23bc703a (patch) | |
| tree | 950d414d239dbe06bcce66b576ca252bf41fb7ad /nova/compute | |
| parent | c00d99102c826f6a501ff7a530291dc8d7680df7 (diff) | |
| parent | 1ca7d8697679e6c7522ab294f5a97ed8608920b6 (diff) | |
Merge trunk and resolve slight conflict
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/instance_types.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index 000b3a6d9..196d6a8df 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -22,6 +22,7 @@ The built-in instance properties. """ from nova import flags +from nova import exception FLAGS = flags.FLAGS INSTANCE_TYPES = { |