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/367a4d02
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/367a4d02
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/367a4d
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/6d7288dd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d7288dd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d7288