Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/54cafe52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/54cafe52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/54cafe
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51761404
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51761404
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/517614