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