Revert "HAWQ-1242. hawq-site.xml default content has wrong guc variable names"
This reverts commit 61646cd55fddb4ef3feafe9fd125763796d518c0. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/94239f5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/94239f5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/94239f5e Branch: refs/heads/2.1.0.0-incubating Commit: 94239f5ed5ecf39e1650ec4b5d348ec9a907edc9 Parents: 61646cd Author: Yi <y...@pivotal.io> Authored: Fri Dec 30 16:06:44 2016 +1100 Committer: Yi <y...@pivotal.io> Committed: Fri Dec 30 16:06:44 2016 +1100 ---------------------------------------------------------------------- src/backend/utils/misc/etc/hawq-site.xml | 8 ++++---- src/backend/utils/misc/etc/template-hawq-site.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/94239f5e/src/backend/utils/misc/etc/hawq-site.xml ---------------------------------------------------------------------- diff --git a/src/backend/utils/misc/etc/hawq-site.xml b/src/backend/utils/misc/etc/hawq-site.xml index 012ccbf..b327ab4 100644 --- a/src/backend/utils/misc/etc/hawq-site.xml +++ b/src/backend/utils/misc/etc/hawq-site.xml @@ -33,7 +33,7 @@ under the License. </property> <property> - <name>standby_address_host</name> + <name>hawq_standby_address_host</name> <value>none</value> <description>The host name of hawq standby master.</description> </property> @@ -45,19 +45,19 @@ under the License. </property> <property> - <name>dfs_url</name> + <name>hawq_dfs_url</name> <value>localhost:8020/hawq_default</value> <description>URL for accessing HDFS.</description> </property> <property> - <name>master_directory</name> + <name>hawq_master_directory</name> <value>~/hawq-data-directory/masterdd</value> <description>The directory of hawq master.</description> </property> <property> - <name>segment_directory</name> + <name>hawq_segment_directory</name> <value>~/hawq-data-directory/segmentdd</value> <description>The directory of hawq segment.</description> </property> http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/94239f5e/src/backend/utils/misc/etc/template-hawq-site.xml ---------------------------------------------------------------------- diff --git a/src/backend/utils/misc/etc/template-hawq-site.xml b/src/backend/utils/misc/etc/template-hawq-site.xml index 1901db3..cf6273a 100644 --- a/src/backend/utils/misc/etc/template-hawq-site.xml +++ b/src/backend/utils/misc/etc/template-hawq-site.xml @@ -33,7 +33,7 @@ under the License. </property> <property> - <name>standby_address_host</name> + <name>hawq_standby_address_host</name> <value>%standby.host%</value> <description>The host name of hawq standby master.</description> </property> @@ -45,19 +45,19 @@ under the License. </property> <property> - <name>dfs_url</name> + <name>hawq_dfs_url</name> <value>%namenode.host%:%namenode.port%/%hawq.file.space%</value> <description>URL for accessing HDFS.</description> </property> <property> - <name>master_directory</name> + <name>hawq_master_directory</name> <value>%master.directory%</value> <description>The directory of hawq master.</description> </property> <property> - <name>segment_directory</name> + <name>hawq_segment_directory</name> <value>%segment.directory%</value> <description>The directory of hawq segment.</description> </property>
