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/ddd3932d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ddd3932d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ddd3932d Branch: refs/heads/1.6 Commit: ddd3932d8ad0f1d5b39b439fad59c45295f45f13 Parents: 8f75ef5 ffe1d90 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jun 11 17:48:55 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jun 11 17:48:55 2015 -0400 ---------------------------------------------------------------------- assemble/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ddd3932d/assemble/build.sh ----------------------------------------------------------------------