accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [18/19] accumulo git commit: Merge branch '1.7'
Date Thu, 31 Dec 2015 06:18:05 GMT
Merge branch '1.7'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java


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

Branch: refs/heads/master
Commit: d45bdb3af3db2711922c54e6a561a44d9ef373df
Parents: 9290ed3 01cdd02
Author: Josh Elser <elserj@apache.org>
Authored: Thu Dec 31 00:09:58 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Dec 31 00:09:58 2015 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/BatchWriter.java       |  5 ++++-
 .../file/blockfile/cache/LruBlockCache.java     | 22 +++++++++-----------
 pom.xml                                         |  2 +-
 .../accumulo/gc/SimpleGarbageCollector.java     |  6 +++++-
 .../org/apache/accumulo/monitor/Monitor.java    |  2 ++
 .../org/apache/accumulo/tracer/TraceServer.java |  3 +++
 .../apache/accumulo/tserver/TabletServer.java   |  2 ++
 .../accumulo/tserver/tablet/Compactor.java      |  7 +++++--
 .../accumulo/tserver/tablet/MinorCompactor.java | 19 +++++++++--------
 9 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d45bdb3a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
----------------------------------------------------------------------


Mime
View raw message