accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Wed, 11 Jun 2014 15:21:03 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
	server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java


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

Branch: refs/heads/master
Commit: 9fcaace81ca4a0f5c5a3917195bff5c77d5e91df
Parents: 8f60d49 d50bb3a
Author: Bill Havanki <bhavanki@cloudera.com>
Authored: Wed Jun 11 11:03:52 2014 -0400
Committer: Bill Havanki <bhavanki@cloudera.com>
Committed: Wed Jun 11 11:03:52 2014 -0400

----------------------------------------------------------------------
 .../core/conf/ObservableConfiguration.java      | 109 +++++++++++++++++++
 .../core/conf/ObservableConfigurationTest.java  |  96 ++++++++++++++++
 .../server/conf/NamespaceConfWatcher.java       |   2 +-
 .../server/conf/NamespaceConfiguration.java     |  35 ++----
 .../accumulo/server/conf/TableConfWatcher.java  |   2 +-
 .../server/conf/TableConfiguration.java         |  36 ++----
 6 files changed, 221 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fcaace8/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 7525366,ebb098b..5b74f4b
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@@ -16,13 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.server.conf;
  
 +import java.nio.charset.StandardCharsets;
- import java.util.Collection;
- import java.util.Collections;
- import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
- import java.util.Set;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fcaace8/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index f40f751,a9c9411..169a4dc
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@@ -16,13 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.server.conf;
  
 +import java.nio.charset.StandardCharsets;
- import java.util.Collection;
- import java.util.Collections;
- import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
- import java.util.Set;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Instance;


Mime
View raw message