From 86c36005f2eb49e6f9b39f706e11cbbce7ae2824 Mon Sep 17 00:00:00 2001 From: Nilakhya Date: Thu, 16 Jan 2014 19:35:41 +0530 Subject: [PATCH] Bugfix of repeating lines in configuration file Both the following files contain multiple dbaas_image keys 1.tests/integration/core.test.conf 2.scripts/conf/test_begin.conf They have been cleaned up in the fix. Closes-Bug: #1269813 Change-Id: Ie749b4101e31a0c250ff0f68b552e99507f94fdb --- scripts/conf/test_begin.conf | 1 - tests/integration/core.test.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf index 436662ad..ec58481f 100644 --- a/scripts/conf/test_begin.conf +++ b/scripts/conf/test_begin.conf @@ -97,7 +97,6 @@ "openvz_disabled": true, "management_api_disabled": true, "dbaas_image": 1, - "dbaas_image": 1, "dns_driver":"trove.dns.rsdns.driver.RsDnsDriver", "dns_instance_entry_factory":"trove.dns.rsdns.driver.RsDnsInstanceEntryFactory", "trove_dns_support": false, diff --git a/tests/integration/core.test.conf b/tests/integration/core.test.conf index 6713cc1f..2ba05bef 100644 --- a/tests/integration/core.test.conf +++ b/tests/integration/core.test.conf @@ -36,7 +36,6 @@ "openvz_disabled": false, "management_api_disabled": true, "dbaas_image": 1, - "dbaas_image": 1, "dns_driver":"trove.dns.rsdns.driver.RsDnsDriver", "dns_instance_entry_factory":"trove.dns.rsdns.driver.RsDnsInstanceEntryFactory", "databases_page_size": 20,