You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by yj...@apache.org on 2016/12/30 02:15:15 UTC

incubator-hawq git commit: HAWQ-1242. hawq-site.xml default content has wrong guc variable names

Repository: incubator-hawq
Updated Branches:
  refs/heads/master e25fe8b42 -> 61646cd55


HAWQ-1242. hawq-site.xml default content has wrong guc variable names


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/61646cd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/61646cd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/61646cd5

Branch: refs/heads/master
Commit: 61646cd55fddb4ef3feafe9fd125763796d518c0
Parents: e25fe8b
Author: Yi <yj...@pivotal.io>
Authored: Fri Dec 30 13:15:07 2016 +1100
Committer: Yi <yj...@pivotal.io>
Committed: Fri Dec 30 13:15:07 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/61646cd5/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 b327ab4..012ccbf 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>hawq_standby_address_host</name>
+		<name>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>hawq_dfs_url</name>
+		<name>dfs_url</name>
 		<value>localhost:8020/hawq_default</value>
 		<description>URL for accessing HDFS.</description>
 	</property>
 
 	<property>
-		<name>hawq_master_directory</name>
+		<name>master_directory</name>
 		<value>~/hawq-data-directory/masterdd</value>
 		<description>The directory of hawq master.</description>
 	</property>
 
 	<property>
-		<name>hawq_segment_directory</name>
+		<name>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/61646cd5/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 cf6273a..1901db3 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>hawq_standby_address_host</name>
+		<name>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>hawq_dfs_url</name>
+		<name>dfs_url</name>
 		<value>%namenode.host%:%namenode.port%/%hawq.file.space%</value>
 		<description>URL for accessing HDFS.</description>
 	</property>
 
 	<property>
-		<name>hawq_master_directory</name>
+		<name>master_directory</name>
 		<value>%master.directory%</value>
 		<description>The directory of hawq master.</description>
 	</property>
 
 	<property>
-		<name>hawq_segment_directory</name>
+		<name>segment_directory</name>
 		<value>%segment.directory%</value>
 		<description>The directory of hawq segment.</description>
 	</property>