Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bb73e90a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bb73e90a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bb73e90a
Branch: refs/heads/master
Commit: bb73e90aa27eac5440dfc34e05d35472660eb2fb
Parents: 44cd470 55a9c8a
Author: Josh Elser <els...@apache.org>
Authored: Thu May 28 21:32:24 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu May 28 21:32:24 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/server/conf/ServerConfigurationFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bb73e90a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
----------------------------------------------------------------------
