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/05/28 22:51:43 UTC

[10/32] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/ACCUMULO-378
Commit: 20a466be30ec0849b29c862ba2d8f53905837014
Parents: 0164991 2bf3ebb
Author: Josh Elser <el...@apache.org>
Authored: Fri May 23 16:07:40 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri May 23 16:07:40 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/Property.java |  5 ++++-
 .../java/org/apache/accumulo/tserver/log/DfsLogger.java   | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/20a466be/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

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