[6/7] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/28f97db1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28f97db1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28f97d

[6/7] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1789cafb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1789cafb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1789ca

[6/7] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61bf188c Tree: http://git-wip-us.apache.org/rep

[6/7] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d37f05f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d37f05f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d37f05