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/78659a61 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78659a61 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78659a61 Branch: refs/heads/master Commit: 78659a61fca3739a35e709f5e34415c92767fd2a Parents: d55fef7 8669215 Author: Josh Elser <els...@apache.org> Authored: Sun Jan 10 13:20:06 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Jan 10 13:20:06 2016 -0500 ---------------------------------------------------------------------- assemble/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/78659a61/assemble/build.sh ----------------------------------------------------------------------
