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/c00ac628 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c00ac628 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c00ac628 Branch: refs/heads/master Commit: c00ac6287593e06a6998f4f62b287be197baacdf Parents: ddde450 fdc6c62 Author: John Vines <jvi...@gmail.com> Authored: Fri Nov 8 10:54:38 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Fri Nov 8 10:54:38 2013 -0500 ---------------------------------------------------------------------- core/pom.xml | 14 +-- examples/simple/pom.xml | 18 +-- maven-plugin/pom.xml | 58 ++-------- maven-plugin/src/it/plugin-test/pom.xml | 5 + minicluster/pom.xml | 34 +++--- pom.xml | 15 +++ proxy/pom.xml | 14 +-- server/base/pom.xml | 22 +--- .../security/AuditedSecurityOperation.java | 6 +- .../accumulo/server/util/TableDiskUsage.java | 110 +++++++++---------- server/extras/pom.xml | 30 ++++- server/gc/pom.xml | 39 +++++++ server/master/pom.xml | 44 ++++++++ server/monitor/pom.xml | 57 ++++++++++ server/tracer/pom.xml | 36 +++++- server/tserver/pom.xml | 78 +++++++++++++ start/pom.xml | 10 -- test/pom.xml | 46 ++++---- .../randomwalk/conf/modules/Conditional.xml | 4 +- trace/pom.xml | 5 - 20 files changed, 423 insertions(+), 222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/minicluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/proxy/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/extras/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/master/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tracer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tserver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/start/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/trace/pom.xml ----------------------------------------------------------------------
