From 4c6d97ec4ac728a05c1fca23d27cc2a0ea431508 Mon Sep 17 00:00:00 2001 From: troymc Date: Fri, 14 Oct 2016 14:53:44 +0200 Subject: [PATCH 1/2] Fixed the docstring in config_utils.py --- bigchaindb/config_utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bigchaindb/config_utils.py b/bigchaindb/config_utils.py index 7168806d..6e1dd9b8 100644 --- a/bigchaindb/config_utils.py +++ b/bigchaindb/config_utils.py @@ -1,13 +1,13 @@ -"""Utils to configure BigchainDB. +"""Utils for reading and setting configuration settings. -By calling `file_config`, the global configuration (stored in -`$HOME/.bigchaindb`) will be updated with the values contained -in the configuration file. +The value of each BigchainDB Server configuration setting is +determined according to the following rules: -Note that there is a precedence in reading configuration values: - - local config file; - - environment vars; - - default config file (contained in ``bigchaindb.__init__``). +* If it’s set by an environment variable, then use that value +* Otherwise, if it’s set in a local config file, then use that + value +* Otherwise, use the default value (contained in + ``bigchaindb.__init__``) """ From 6ef3f9943ca6baa01b3dfba26724f579a7aff861 Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 17 Oct 2016 14:49:21 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Changed=20it=E2=80=99s=20to=20it's=20in=202?= =?UTF-8?q?=20places?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bigchaindb/config_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bigchaindb/config_utils.py b/bigchaindb/config_utils.py index 6e1dd9b8..f72c348b 100644 --- a/bigchaindb/config_utils.py +++ b/bigchaindb/config_utils.py @@ -3,8 +3,8 @@ The value of each BigchainDB Server configuration setting is determined according to the following rules: -* If it’s set by an environment variable, then use that value -* Otherwise, if it’s set in a local config file, then use that +* If it's set by an environment variable, then use that value +* Otherwise, if it's set in a local config file, then use that value * Otherwise, use the default value (contained in ``bigchaindb.__init__``)