You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/12 20:30:08 UTC
[1/5] git commit: ACCUMULO-1900 use the old deprecated API for 1.0
compatibility
Updated Branches:
refs/heads/1.5.1-SNAPSHOT dc70a30d6 -> 464bfe3ac
refs/heads/1.6.0-SNAPSHOT a425f6a50 -> e8f1a9eda
ACCUMULO-1900 use the old deprecated API for 1.0 compatibility
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/998648d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/998648d3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/998648d3
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 998648d3ddeebf9295e62ab6069bdd47e96e1420
Parents: 7eb838e
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:26:46 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:26:46 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/tabletserver/log/DfsLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/998648d3/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
index 2235242..213c885 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
@@ -258,7 +258,7 @@ public class DfsLogger {
FileSystem fs = conf.getFileSystem();
short replication = (short) conf.getConfiguration().getCount(Property.TSERV_WAL_REPLICATION);
if (replication == 0)
- replication = fs.getDefaultReplication(logPath);
+ replication = fs.getDefaultReplication(); // use fs.getDefaultReplication(logPath) in hadoop 1.2 or greater
long blockSize = conf.getConfiguration().getMemoryInBytes(Property.TSERV_WAL_BLOCKSIZE);
if (blockSize == 0)
blockSize = (long) (conf.getConfiguration().getMemoryInBytes(Property.TSERV_WALOG_MAX_SIZE) * 1.1);
[5/5] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e8f1a9ed
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8f1a9ed
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e8f1a9ed
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e8f1a9eda993a368032fc035e280e154c76b2167
Parents: 7a840db a425f6a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:30:24 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:30:24 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] git commit: Merge branch '1.5.1-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/464bfe3a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/464bfe3a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/464bfe3a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 464bfe3ace73d6d0ea827e8ea75aff6bc94228e4
Parents: 998648d dc70a30
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:30:13 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:30:13 2013 -0500
----------------------------------------------------------------------
assemble/src/main/assemblies/binary-release.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] git commit: ACCUMULO-1900 use the old deprecated API for 1.0
compatibility
Posted by ec...@apache.org.
ACCUMULO-1900 use the old deprecated API for 1.0 compatibility
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/998648d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/998648d3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/998648d3
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 998648d3ddeebf9295e62ab6069bdd47e96e1420
Parents: 7eb838e
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:26:46 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:26:46 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/tabletserver/log/DfsLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/998648d3/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
index 2235242..213c885 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
@@ -258,7 +258,7 @@ public class DfsLogger {
FileSystem fs = conf.getFileSystem();
short replication = (short) conf.getConfiguration().getCount(Property.TSERV_WAL_REPLICATION);
if (replication == 0)
- replication = fs.getDefaultReplication(logPath);
+ replication = fs.getDefaultReplication(); // use fs.getDefaultReplication(logPath) in hadoop 1.2 or greater
long blockSize = conf.getConfiguration().getMemoryInBytes(Property.TSERV_WAL_BLOCKSIZE);
if (blockSize == 0)
blockSize = (long) (conf.getConfiguration().getMemoryInBytes(Property.TSERV_WALOG_MAX_SIZE) * 1.1);
[3/5] git commit: ACCUMULO-1900 code already uses deprecated API
Posted by ec...@apache.org.
ACCUMULO-1900 code already uses deprecated API
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a840dbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a840dbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a840dbe
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7a840dbe91e819fca829dcb28d76324e2dda4082
Parents: 0227581 998648d
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:28:57 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:28:57 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------