Repository: hbase Updated Branches: refs/heads/branch-1 3ca818434 -> 49e274188
HBASE-11892 Stale config entries Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/49e27418 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/49e27418 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/49e27418 Branch: refs/heads/branch-1 Commit: 49e27418808a6ad69c28c57ced093cfdcef65dc2 Parents: 3ca8184 Author: Misty Stanley-Jones <[email protected]> Authored: Mon Sep 15 11:30:12 2014 +1000 Committer: Misty Stanley-Jones <[email protected]> Committed: Mon Sep 15 11:30:12 2014 +1000 ---------------------------------------------------------------------- hbase-common/src/main/resources/hbase-default.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/49e27418/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index d0ec402..fc78b6c 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -111,10 +111,10 @@ possible configurations would overwhelm and obscure the important. <property> <name>hbase.master.logcleaner.plugins</name> <value>org.apache.hadoop.hbase.master.cleaner.TimeToLiveLogCleaner</value> - <description>A comma-separated list of LogCleanerDelegate invoked by + <description>A comma-separated list of BaseLogCleanerDelegate invoked by the LogsCleaner service. These WAL/HLog cleaners are called in order, so put the HLog cleaner that prunes the most HLog files in front. To - implement your own LogCleanerDelegate, just put it in HBase's classpath + implement your own BaseLogCleanerDelegate, just put it in HBase's classpath and add the fully qualified class name here. Always add the above default log cleaners in the list.</description> </property> @@ -127,10 +127,10 @@ possible configurations would overwhelm and obscure the important. <property> <name>hbase.master.hfilecleaner.plugins</name> <value>org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner</value> - <description>A comma-separated list of HFileCleanerDelegate invoked by + <description>A comma-separated list of BaseHFileCleanerDelegate invoked by the HFileCleaner service. These HFiles cleaners are called in order, so put the cleaner that prunes the most files in front. To - implement your own HFileCleanerDelegate, just put it in HBase's classpath + implement your own BaseHFileCleanerDelegate, just put it in HBase's classpath and add the fully qualified class name here. Always add the above default log cleaners in the list as they will be overwritten in hbase-site.xml.</description> @@ -786,12 +786,6 @@ possible configurations would overwhelm and obscure the important. block is finished.</description> </property> <property> - <name>hbase.rpc.server.engine</name> - <value>org.apache.hadoop.hbase.ipc.ProtobufRpcServerEngine</value> - <description>Implementation of org.apache.hadoop.hbase.ipc.RpcServerEngine to be - used for server RPC call marshalling.</description> - </property> - <property> <name>hbase.rpc.timeout</name> <value>60000</value> <description>This is for the RPC layer to define how long HBase client applications
