You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/07/17 15:59:55 UTC

[2/2] git commit: Merge branch 'master' into ACCUMULO-1000

Merge branch 'master' into ACCUMULO-1000


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

Branch: refs/heads/ACCUMULO-1000
Commit: fbcbd8746f1907ae3a33a248187d857372cadabf
Parents: be54c95 af06b16
Author: Keith Turner <kt...@apache.org>
Authored: Wed Jul 17 09:52:07 2013 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Jul 17 09:52:07 2013 -0400

----------------------------------------------------------------------
 .../maven/plugin/AbstractAccumuloMojo.java      | 42 ----------
 .../org/accumulo/maven/plugin/StartMojo.java    | 67 ---------------
 .../org/accumulo/maven/plugin/StopMojo.java     | 45 ----------
 .../maven/plugin/AbstractAccumuloMojo.java      | 49 +++++++++++
 .../apache/accumulo/maven/plugin/StartMojo.java | 88 ++++++++++++++++++++
 .../apache/accumulo/maven/plugin/StopMojo.java  | 45 ++++++++++
 pom.xml                                         |  5 ++
 test/pom.xml                                    | 59 +++++++++++++
 8 files changed, 246 insertions(+), 154 deletions(-)
----------------------------------------------------------------------