Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24813234 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24813234 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24813234 Branch: refs/heads/master Commit: 24813234fdc44632d0a8e8f5ff1c948d26c9b5b8 Parents: a6bf35a c6d1ce5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 10 20:53:52 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 10 20:53:52 2015 -0400 ---------------------------------------------------------------------- assemble/build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/24813234/assemble/build.sh ----------------------------------------------------------------------