git commit: updated refs/heads/master to 30c6e27

[se...@apache.org]

Updated Branches:
  refs/heads/master 4ca3f5c5e -> 30c6e2707


settings.py pep8 compliant


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30c6e270
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30c6e270
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30c6e270

Branch: refs/heads/master
Commit: 30c6e2707a8c53daeb0907b547e1ad1bfec7a56e
Parents: 4ca3f5c
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Thu Jun 20 16:09:11 2013 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Thu Jun 20 12:32:39 2013 -0400

----------------------------------------------------------------------
 tools/marvin/marvin/settings.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30c6e270/tools/marvin/marvin/settings.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/settings.py b/tools/marvin/marvin/settings.py
index 30b78ac..a31e182 100644
--- a/tools/marvin/marvin/settings.py
+++ b/tools/marvin/marvin/settings.py
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,8 +21,8 @@
 TEST_OUTPUT_VERBOSE = 2.
 
 # If your test methods contains docstrings, you can display such docstrings
-# instead of display the test name (ex: module.TestCase.test_method).  In order to
-# use this feature, you have to enable verbose output by setting
+# instead of display the test name (ex: module.TestCase.test_method).
+# In order to use this feature, you have to enable verbose output by setting
 # TEST_OUTPUT_VERBOSE = 2.
 
-TEST_OUTPUT_DESCRIPTIONS=True 
+TEST_OUTPUT_DESCRIPTIONS = True