Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6111043f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6111043f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6111043f
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14f9f00e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14f9f00e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14f9f00e
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3280461
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3280461
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3280461