Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46e27b2e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46e27b2e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46e27b2e
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b83b4ab
Tree: http://git-wip-us.apache.or
Merge branch '1.6' into 1.7
Conflicts:
core/src/test/java/org/apache/accumulo/core/client/ClientConfigurationTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/208a1032
Tree: http://git-wip-us.apache.org
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96e00e0f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96e00e0f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96e00e0f
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6243e6ee
Tree: http://git-
Merge branch '1.6' into 1.7
Conflicts:
server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/782dc237
Tree: http://git-wip-us.apache.org
