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

Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/05 06:43:15 UTC

[33/35] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java


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

Branch: refs/heads/ACCUMULO-378
Commit: 47d593311e6b57cf3462512214994a73b9d3deb9
Parents: a7884bb 05cf918
Author: Josh Elser <el...@apache.org>
Authored: Wed Jun 4 16:41:00 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jun 4 16:41:00 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/tserver/log/DfsLogger.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/47d59331/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------