summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-14 12:11:08 +0000
committerGerrit Code Review <review@openstack.org>2016-09-14 12:11:08 +0000
commit1bd913c8ede3367ccca79eec42efe70b8e2a8aaf (patch)
tree67148faa0da44afecc14b4114edfb929879674d2
parentb53d9e15dabda03385078929596fa018476c6965 (diff)
parent25a558d9fd8383f99a132dc84f6dda2ec5336807 (diff)
downloadtrove-1bd913c8ede3367ccca79eec42efe70b8e2a8aaf.tar.gz
Merge "Update #noqa for out 79 character"
-rw-r--r--install-guide/source/conf.py3
-rw-r--r--trove/configuration/models.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/install-guide/source/conf.py b/install-guide/source/conf.py
index 7c8e52a4..2589cd3a 100644
--- a/install-guide/source/conf.py
+++ b/install-guide/source/conf.py
@@ -74,7 +74,8 @@ release = '0.1'
# extracted from git log.
# bug_tag: Tag for categorizing the bug. Must be set manually.
# These variables are passed to the logabug code via html_context.
-giturl = u'http://git.openstack.org/cgit/openstack/trove/tree/install-guide/source' # noqa
+giturl = (u'http://git.openstack.org/cgit/openstack/trove/tree/'
+ 'install-guide/source')
git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
gitsha = os.popen(git_cmd).read().strip('\n')
html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
diff --git a/trove/configuration/models.py b/trove/configuration/models.py
index dd4f6662..5935f34a 100644
--- a/trove/configuration/models.py
+++ b/trove/configuration/models.py
@@ -402,5 +402,6 @@ def persisted_models():
return {
'configurations': DBConfiguration,
'configuration_parameters': DBConfigurationParameter,
- 'datastore_configuration_parameters': DBDatastoreConfigurationParameters, # noqa
+ 'datastore_configuration_parameters':
+ DBDatastoreConfigurationParameters,
}