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