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

2014-09-19 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9812ee35 Tree: http://git-wip-

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

2014-07-22 Thread elserj
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/aa887d38 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa887d38 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa887d