Merge branch '1.7'

Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6739a20
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6739a20
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6739a20

Branch: refs/heads/master
Commit: b6739a200694a419ef3baeac7ec1e448153d5fcd
Parents: 68b8cd7 61eea42
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu May 7 19:54:16 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu May 7 19:54:16 2015 -0400

----------------------------------------------------------------------
 assemble/pom.xml                        |  1 +
 examples/simple/pom.xml                 |  9 ----
 maven-plugin/pom.xml                    |  3 ++
 maven-plugin/src/it/plugin-test/pom.xml |  7 ---
 pom.xml                                 | 72 +++++++++++-----------------
 server/base/pom.xml                     |  9 ----
 server/gc/pom.xml                       | 11 -----
 server/master/pom.xml                   | 11 -----
 server/monitor/pom.xml                  |  9 ----
 server/native/pom.xml                   |  8 +---
 server/tracer/pom.xml                   | 11 -----
 server/tserver/pom.xml                  |  9 ----
 12 files changed, 34 insertions(+), 126 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/maven-plugin/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/gc/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/master/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/native/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tracer/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tserver/pom.xml
----------------------------------------------------------------------

Reply via email to