Merge branch '1.6.1-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/Constants.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e01de52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e01de52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e01de52
Branch: refs/heads/master
Commit: 7e01de52492149aaac14d6d02a5964d15cd19480
Parents: bc7b5ff 3fafd23
Author: Mike Drob <md...@cloudera.com>
Authored: Thu Jun 19 10:30:49 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Thu Jun 19 10:30:49 2014 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/Constants.java | 6 +++++-
.../main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 +--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e01de52/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/Constants.java
index 2e213d8,15cccf4..76b86d4
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@@ -16,6 -16,11 +16,10 @@@
*/
package org.apache.accumulo.core;
-import java.nio.charset.Charset;
+ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.Collections;
+
import org.apache.accumulo.core.security.Authorizations;
public class Constants {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e01de52/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
