Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a373da9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a373da9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2a373da9 Branch: refs/heads/1.8 Commit: 2a373da9e3d76482b777edf7df7af48f2c84440c Parents: 6cc07fa 5b80b2a Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jul 25 15:43:28 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jul 25 15:43:28 2016 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 21 --------------- assemble/src/main/assemblies/dev-directory.xml | 27 -------------------- pom.xml | 4 +++ server/native/pom.xml | 15 +++++++++++ .../native/src/main/assemblies/native-dir.xml | 27 ++++++++++++++++++++ .../src/main/assemblies/native-tarball.xml | 1 - 6 files changed, 46 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a373da9/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a373da9/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a373da9/server/native/pom.xml ----------------------------------------------------------------------
