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 2014/01/03 18:25:02 UTC
[1/4] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 1873fc565 -> a573f96d4
refs/heads/master abb4f9147 -> 86a26fe67
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/1873fc56
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1873fc56
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1873fc56
Branch: refs/heads/master
Commit: 1873fc5658ef3413ffc3d36d88ff4f5ea5d85266
Parents: 51f84de a89d97a
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 3 10:13:45 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 3 10:13:45 2014 -0500
----------------------------------------------------------------------
.../core/client/mapred/AbstractInputFormat.java | 2 +-
.../core/client/mapreduce/AbstractInputFormat.java | 2 +-
pom.xml | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-1743 wait for the trace table to exist
Posted by ec...@apache.org.
ACCUMULO-1743 wait for the trace table to exist
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a573f96d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a573f96d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a573f96d
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a573f96d434fb5ef3016b8f7d3d9904e4fd88d65
Parents: 1873fc5
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 3 12:25:05 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 3 12:25:05 2014 -0500
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a573f96d/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index ea66b68..05a8961 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1197,8 +1197,11 @@ public class ConditionalWriterIT extends SimpleMacIT {
Process tracer = getStaticCluster().exec(TraceServer.class);
Connector conn = getConnector();
+ while (!conn.tableOperations().exists("trace")) {
+ UtilWaitThread.sleep(1000);
+ }
+
String tableName = getTableNames(1)[0];
-
conn.tableOperations().create(tableName);
conn.tableOperations().deleteRows("trace", null, null);
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '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/86a26fe6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86a26fe6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/86a26fe6
Branch: refs/heads/master
Commit: 86a26fe6716974fc046fec6a0324fe65c367c35c
Parents: abb4f91 a573f96
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 3 12:25:19 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 3 12:25:19 2014 -0500
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] git commit: ACCUMULO-1743 wait for the trace table to exist
Posted by ec...@apache.org.
ACCUMULO-1743 wait for the trace table to exist
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a573f96d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a573f96d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a573f96d
Branch: refs/heads/master
Commit: a573f96d434fb5ef3016b8f7d3d9904e4fd88d65
Parents: 1873fc5
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 3 12:25:05 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 3 12:25:05 2014 -0500
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a573f96d/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index ea66b68..05a8961 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1197,8 +1197,11 @@ public class ConditionalWriterIT extends SimpleMacIT {
Process tracer = getStaticCluster().exec(TraceServer.class);
Connector conn = getConnector();
+ while (!conn.tableOperations().exists("trace")) {
+ UtilWaitThread.sleep(1000);
+ }
+
String tableName = getTableNames(1)[0];
-
conn.tableOperations().create(tableName);
conn.tableOperations().deleteRows("trace", null, null);