diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-16 12:09:51 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-16 12:09:51 +0000 |
| commit | 4a451f96ba4a2ef9d061a491b97b61780c28a252 (patch) | |
| tree | e5995adc3f01fb8f5a664af13f40fee83ec896d4 | |
| parent | 02371cafcc50957d79253cbd11f1c5bccc7cde6c (diff) | |
Restore code which was changed for testing reasons to the original state.
Kudos to Armando for spotting this.
| -rw-r--r-- | nova/compute/instance_types.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index ed292ff8d..6e47170bd 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -27,7 +27,7 @@ from nova import exception FLAGS = flags.FLAGS INSTANCE_TYPES = { 'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1), - 'm1.small': dict(memory_mb=1024, vcpus=1, local_gb=20, flavorid=2), + 'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2), 'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3), 'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4), 'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)} diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 036019443..55036d1d1 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -43,7 +43,7 @@ def is_admin_context(context): if not context: warnings.warn('Use of empty request context is deprecated', DeprecationWarning) - #raise Exception('die') + raise Exception('die') return context.is_admin |