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 2013/10/18 01:47:20 UTC
[1/2] git commit: ACCUMULO-1637 Missed a usage of the DFSConfigKeys
constant that might not always be present.
Updated Branches:
refs/heads/master 5480ae0f1 -> e26fc0bff
ACCUMULO-1637 Missed a usage of the DFSConfigKeys constant that might
not always be present.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18bcd14c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18bcd14c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18bcd14c
Branch: refs/heads/master
Commit: 18bcd14ca8020e969b9881c44cc3c565471cae5b
Parents: 109db35
Author: Josh Elser <el...@apache.org>
Authored: Thu Oct 17 19:36:16 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 17 19:36:16 2013 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/tabletserver/TabletServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/18bcd14c/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index ea30694..7ad106e 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -3257,7 +3257,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
if (!dfsSupportAppendDefaultValue) {
// See if the user did the correct override
- if (!fs.getConf().getBoolean(DFSConfigKeys.DFS_SUPPORT_APPEND_KEY, false)) {
+ if (!fs.getConf().getBoolean(DFS_SUPPORT_APPEND, false)) {
log.fatal("Accumulo requires that dfs.support.append to true. " + ticketMessage);
System.exit(-1);
}
[2/2] git commit: Merge branch '1.5.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT'
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
I had fixed this in master when resolving the merge conflict, but not in
1.5.1
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e26fc0bf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e26fc0bf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e26fc0bf
Branch: refs/heads/master
Commit: e26fc0bff1c2558f68f096e23393d3dca1a3b80f
Parents: 5480ae0 18bcd14
Author: Josh Elser <el...@apache.org>
Authored: Thu Oct 17 19:46:51 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 17 19:46:51 2013 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------