accumulo-commits mailing list archives

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

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java


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

Branch: refs/heads/master
Commit: aa73e7f45c0931d9f350e096170874ac01c9c26a
Parents: d1af19d 8f852e2
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Dec 18 15:52:46 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Dec 18 15:52:46 2014 -0500

----------------------------------------------------------------------
 pom.xml                                         |   2 +-
 .../server/util/AddFilesWithMissingEntries.java | 137 -------------------
 .../accumulo/master/tableOps/BulkImport.java    |   6 +-
 .../test/stress/random/package-info.java        |   3 +-
 4 files changed, 5 insertions(+), 143 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa73e7f4/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------


Mime
View raw message