Merge branch '1.6' into 1.7
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7c79d3d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7c79d3d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7c79d3d
Branch: refs/heads/1.7
Commit: a7c79d3d6c620831bed8df9718e1201f5b6f4f7d
Parents: 5312fac ddd3932
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Jun 11 17:49:31 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Jun 11 17:49:31 2015 -0400
----------------------------------------------------------------------
assemble/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a7c79d3d/assemble/build.sh
----------------------------------------------------------------------
