accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [9/9] accumulo git commit: Merge branch '1.6'
Date Thu, 18 Dec 2014 22:57:45 GMT
Merge branch '1.6'

Conflicts:
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java


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

Branch: refs/heads/master
Commit: 26db8eea425b09911ce95d3992fdea9ef6a44278
Parents: 79c0a5e b8d31d7
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Dec 18 17:51:14 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Dec 18 17:51:14 2014 -0500

----------------------------------------------------------------------
 .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/26db8eea/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------


Mime
View raw message