You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2014/01/28 22:58:16 UTC

[2/2] git commit: ACCUMULO-2121 remove client. prefix from ClientConfiguration properties

ACCUMULO-2121 remove client. prefix from ClientConfiguration properties


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cdd6d51
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cdd6d51
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cdd6d51

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4cdd6d51acff0d5335538dd6e209c6e9be391e1c
Parents: 8cce1fd
Author: John Vines <vi...@apache.org>
Authored: Tue Jan 28 16:57:09 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Tue Jan 28 16:57:09 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/client/ClientConfiguration.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cdd6d51/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index aa1c6fc..e7afe89 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -55,8 +55,8 @@ public class ClientConfiguration extends CompositeConfiguration {
     INSTANCE_RPC_SSL_ENABLED(Property.INSTANCE_RPC_SSL_ENABLED),
     INSTANCE_ZK_HOST(Property.INSTANCE_ZK_HOST),
     INSTANCE_ZK_TIMEOUT(Property.INSTANCE_ZK_TIMEOUT),
-    INSTANCE_NAME("client.instance.name", null, PropertyType.STRING, "Name of Accumulo instance to connect to"),
-    INSTANCE_ID("client.instance.id", null, PropertyType.STRING, "UUID of Accumulo instance to connect to"),
+    INSTANCE_NAME("instance.name", null, PropertyType.STRING, "Name of Accumulo instance to connect to"),
+    INSTANCE_ID("instance.id", null, PropertyType.STRING, "UUID of Accumulo instance to connect to"),
     ;
 
     private String key;