From ea4750a366123f78411d90082733642376dc6afc Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Mon, 2 Nov 2015 11:55:17 +0530 Subject: Rebase to stable/kilo This change ports most of swiftonfile object server fixes and changes into gluster-swift. Storage policy as a feature is not usable here (it doesn't make sense). The hacky way of creating zero byte tracker objects for object expiration has not been ported to this release due to scalability issues and the need to have a separate volume. Change-Id: I17ba27dacea9ac000bdb8934700996e4d17f4251 Signed-off-by: Prashanth Pai Reviewed-on: http://review.gluster.org/13269 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- test/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/__init__.py') diff --git a/test/__init__.py b/test/__init__.py index 7eb5f47..3bd25b1 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -53,12 +53,12 @@ def get_config(section_name=None, defaults=None): :param section_name: the section to read (all sections if not defined) :param defaults: an optional dictionary namespace of defaults """ - config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE', - '/etc/swift/test.conf') config = {} if defaults is not None: config.update(defaults) + config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE', + '/etc/swift/test.conf') try: config = readconf(config_file, section_name) except SystemExit: -- cgit