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/0bec52b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bec52b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bec52b5 Branch: refs/heads/master Commit: 0bec52b51be05641144089dcc427644a511f658f Parents: 4832f90 352dc1b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 6 22:47:43 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 6 22:47:43 2013 -0500 ---------------------------------------------------------------------- core/pom.xml | 59 ++++++++------------ examples/simple/pom.xml | 41 +++++++------- fate/pom.xml | 3 - minicluster/pom.xml | 25 ++++----- .../apache/accumulo/minicluster/MemoryUnit.java | 14 ++--- .../minicluster/MiniAccumuloInstance.java | 4 +- .../minicluster/MiniAccumuloRunner.java | 48 ++++++++-------- .../minicluster/ProcessNotFoundException.java | 2 +- .../accumulo/minicluster/ProcessReference.java | 6 +- proxy/pom.xml | 28 ++++------ server/extras/pom.xml | 19 +++---- server/gc/pom.xml | 19 +++---- server/master/pom.xml | 28 ++++------ server/monitor/pom.xml | 29 ++++------ server/tracer/pom.xml | 19 +++---- server/tserver/pom.xml | 55 ++++++++---------- start/pom.xml | 12 ++-- test/pom.xml | 54 +++++++++--------- trace/pom.xml | 11 ++-- 19 files changed, 211 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/fate/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/minicluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/proxy/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/extras/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/master/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tracer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tserver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/start/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/trace/pom.xml ----------------------------------------------------------------------
