You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/12/02 01:37:03 UTC

[3/3] accumulo git commit: Merge branch '1.6'

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 54475e5c15434eabfcbe130fdad157536642f21f
Parents: 692312b 3bb20cd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Dec 1 19:34:48 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Dec 1 19:34:48 2014 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/cluster/AccumuloCluster.java   | 4 ----
 .../java/org/apache/accumulo/cluster/RemoteShellOptions.java     | 2 +-
 .../test/java/org/apache/accumulo/harness/AccumuloClusterIT.java | 2 --
 .../java/org/apache/accumulo/harness/MiniClusterHarness.java     | 4 ----
 4 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------