Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry 733745eaf -> c51f2f0ea
SLIDER-465 remove props from accumulo default configuration files Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2bbaafd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2bbaafd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2bbaafd5 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 2bbaafd5d7fcd352731dd165ce320125f274f7b5 Parents: 41ec741 Author: Billie Rinaldi <[email protected]> Authored: Wed Oct 1 09:22:32 2014 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Wed Oct 1 09:22:32 2014 -0700 ---------------------------------------------------------------------- .../accumulo/configuration/accumulo-site.xml | 19 +------------------ app-packages/accumulo/configuration/global.xml | 7 +------ 2 files changed, 2 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2bbaafd5/app-packages/accumulo/configuration/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/accumulo-site.xml b/app-packages/accumulo/configuration/accumulo-site.xml index 269cc2b..3001c45 100644 --- a/app-packages/accumulo/configuration/accumulo-site.xml +++ b/app-packages/accumulo/configuration/accumulo-site.xml @@ -28,17 +28,6 @@ </property> <property> - <name>instance.secret</name> - <value>DEFAULT</value> - <description>A secret unique to a given instance that all servers - must know in order to communicate with one another. - Change it before initialization. To - change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd], - and then update this file. - </description> - </property> - - <property> <name>tserver.memory.maps.max</name> <value>80M</value> </property> @@ -54,12 +43,6 @@ </property> <property> - <name>trace.token.property.password</name> - <!-- change this to the root user's password, and/or change the user below --> - <value>secret</value> - </property> - - <property> <name>trace.user</name> <value>root</value> </property> @@ -71,7 +54,7 @@ <property> <name>tserver.walog.max.size</name> - <value>100M</value> + <value>40M</value> </property> <property> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2bbaafd5/app-packages/accumulo/configuration/global.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/global.xml b/app-packages/accumulo/configuration/global.xml index 5d39dca..904a645 100644 --- a/app-packages/accumulo/configuration/global.xml +++ b/app-packages/accumulo/configuration/global.xml @@ -58,15 +58,10 @@ </property> <property> <name>accumulo_hdfs_root_dir</name> - <value>/apps/accumulo/data</value> + <value>${DEFAULT_DATA_DIR}</value> <description>Accumulo Relative Path to HDFS.</description> </property> <property> - <name>accumulo_conf_dir</name> - <value>/etc/accumulo</value> - <description>Config Directory for Accumulo.</description> - </property> - <property> <name>app_user</name> <value>yarn</value> <description>Accumulo User Name.</description>
