Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b49f9309 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b49f9309 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b49f9309 Branch: refs/heads/master Commit: b49f9309f628670ef17aca1ce6c107d4fb2f228a Parents: 1d58ee1 aaa8afb Author: Christopher Tubbs <[email protected]> Authored: Wed Apr 2 16:31:16 2014 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Wed Apr 2 16:31:16 2014 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 31 --------- examples/simple/pom.xml | 1 - maven-plugin/src/it/plugin-test/pom.xml | 4 -- pom.xml | 70 ++++++++------------ start/pom.xml | 3 +- test/pom.xml | 7 +- .../apache/accumulo/test/util/CertUtils.java | 10 +-- test/src/test/scripts/run-test.sh | 2 +- 8 files changed, 38 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b49f9309/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b49f9309/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b49f9309/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b49f9309/start/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b49f9309/test/pom.xml ----------------------------------------------------------------------
