[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: assemble/pom.xml core/pom.xml docs/pom.xml examples/simple/pom.xml fate/pom.xml maven-plugin/pom.xml minicluster/pom.xml pom.xml proxy/pom.xml server/base/pom.xml server/g

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4ccbbfe Tree: http://git-wip-

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 * This preserves the existing configuration and formatting in the 1.7 branch (equivalent to merging with -sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5efa0bd9 Tree: http://git-wi

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af21ac58 Tree: http://git-wip-us.

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c3dc17e Tree: http://git-wip-us.apache.org/rep

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67d6d7c5 Tree: http://git-wip-us.apache.org/

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

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/e3652a24 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3652a24 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3652a24

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e76d89a8 Tree: http://git-wip-us.apache.org/repo

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

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/4815ec45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4815ec45 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4815ec45

[8/9] accumulo git commit: Merge branch '1.6' into 1.7

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.