From 3e809e45f2d7ddbbe2e9710bf5d6f4c80801d834 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 20 May 2011 14:53:02 +0100
Subject: [PATCH 1/2] Removing .pydevproject from version control

---
 .pydevproject | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .pydevproject

diff --git a/.pydevproject b/.pydevproject
deleted file mode 100644
index a9cca037b33..00000000000
--- a/.pydevproject
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>

From b6f2ca5aa0e774826dc5855f98fb446ee78a2430 Mon Sep 17 00:00:00 2001
From: Brad Hall <bhall@nicira.com>
Date: Fri, 20 May 2011 16:22:48 -0700
Subject: [PATCH 2/2] Minor fixes: indentation in bin/quantum and fix import in
 config.py

---
 bin/quantum              | 13 ++++++-------
 quantum/common/config.py |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/quantum b/bin/quantum
index 16ef7346d2c..d19fa91efa2 100644
--- a/bin/quantum
+++ b/bin/quantum
@@ -37,9 +37,9 @@ from quantum.common import wsgi
 from quantum.common import config
 
 def create_options(parser):
-    """                             
+    """
     Sets up the CLI and config-file options that may be
-    parsed and program commands.                                                        
+    parsed and program commands.
     :param parser: The option parser
     """
     config.add_common_options(parser)
@@ -53,10 +53,9 @@ if __name__ == '__main__':
 
     try:
         conf, app = config.load_paste_app('quantum', options, args)
-        
-    server = wsgi.Server()
-    server.start(app, int(conf['bind_port']), conf['bind_host'])
-    server.wait()
+        server = wsgi.Server()
+        server.start(app, int(conf['bind_port']), conf['bind_host'])
+        server.wait()
     except RuntimeError, e:
-    sys.exit("ERROR: %s" % e)
+        sys.exit("ERROR: %s" % e)
 
diff --git a/quantum/common/config.py b/quantum/common/config.py
index dbbcd260fc9..21c1b59514b 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -31,7 +31,7 @@ import sys
 
 from paste import deploy
 
-import quantum.common.exception as exception
+import quantum.common.exceptions as exception
 
 DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"