From b760e7cf6c84233bba1bcf336f630cbbbe54f672 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date: Wed, 19 Jan 2011 21:15:23 +0100
Subject: Exception string lacking 'G' for gigabytes unit

---
 nova/volume/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/volume/api.py b/nova/volume/api.py
index ce4831cc3..cab9e4b05 100644
--- a/nova/volume/api.py
+++ b/nova/volume/api.py
@@ -44,7 +44,7 @@ class API(base.Base):
             LOG.warn(_("Quota exceeeded for %s, tried to create %sG volume"),
                          context.project_id, size)
             raise quota.QuotaError(_("Volume quota exceeded. You cannot "
-                                     "create a volume of size %s") % size)
+                                     "create a volume of size %sG") % size)
 
         options = {
             'size': size,
-- 
cgit 


From 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date: Tue, 25 Jan 2011 13:50:11 +0100
Subject: Added myself to ./Authors file

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index 82e07a6b5..fb0c87150 100644
--- a/Authors
+++ b/Authors
@@ -38,6 +38,7 @@ MORITA Kazutaka <morita.kazutaka@gmail.com>
 Muneyuki Noguchi <noguchimn@nttdata.co.jp>
 Nachi Ueno <ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp> <nati.ueno@gmail.com> <nova@u4>
 Paul Voccio <paul@openstack.org>
+Ricardo Carrillo Cruz <emaildericky@gmail.com>
 Rick Clark <rick@openstack.org>
 Rick Harris <rconradharris@gmail.com>
 Ryan Lane <rlane@wikimedia.org>
-- 
cgit 


From f3652fd4814eb5d9df851422aa946f283263fd07 Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Sun, 30 Jan 2011 21:38:58 -0800
Subject: add logging.basicConfig() to tests

---
 run_tests.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/run_tests.py b/run_tests.py
index 5c8436aee..24786e8ad 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -26,6 +26,8 @@ from nose import config
 from nose import result
 from nose import core
 
+from nova import log as logging
+
 
 class NovaTestResult(result.TextTestResult):
     def __init__(self, *args, **kw):
@@ -58,6 +60,7 @@ class NovaTestRunner(core.TextTestRunner):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,
-- 
cgit 


From 86b96d377cb5f0cbaccf40fc87f2c1ad64ae05e1 Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Sun, 30 Jan 2011 21:55:32 -0800
Subject: Only run pep8 after tests if running all the tests

---
 run_tests.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index cf1affcea..4e21fe945 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -65,10 +65,15 @@ then
       if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
         # Install the virtualenv and run the test suite in it
         python tools/install_venv.py
-		wrapper=${with_venv}
+        wrapper=${with_venv}
       fi
     fi
   fi
 fi
 
-run_tests && pep8 --repeat --show-pep8 --show-source --exclude=vcsversion.py bin/* nova setup.py || exit 1
+if [ -z "$noseargs" ];
+then
+  run_tests && pep8 --repeat --show-pep8 --show-source --exclude=vcsversion.py bin/* nova setup.py || exit 1
+else
+  run_tests
+fi
-- 
cgit 


From 10657adef2028926319fa5c0402f434187213263 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Wed, 2 Feb 2011 11:23:08 +0100
Subject: Open Cactus development.

---
 nova/version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/version.py b/nova/version.py
index 48ac84a03..c3ecc2245 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -21,10 +21,10 @@ except ImportError:
                     'revision_id': 'LOCALREVISION',
                     'revno': 0}
 
-NOVA_VERSION = ['2011', '1']
+NOVA_VERSION = ['2011', '2']
 YEAR, COUNT = NOVA_VERSION
 
-FINAL = True   # This becomes true at Release Candidate time
+FINAL = False   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():
-- 
cgit