You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/21 20:21:19 UTC
[1/3] git commit: fix CliTest on Windows patch by Josh McKenzie;
reviewed by jbellis for CASSANDRA-7194
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e00878d95 -> dd6a22959
refs/heads/trunk decc30888 -> 6581abfae
fix CliTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7194
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd6a2295
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd6a2295
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd6a2295
Branch: refs/heads/cassandra-2.1
Commit: dd6a2295991be002e2fb85201b43297a105bd1a4
Parents: e00878d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 21 13:21:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 21 13:21:05 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cli/CliTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd6a2295/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java
index 6b7232c..5d28c70 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -253,8 +253,8 @@ public class CliTest extends SchemaLoader
// System.out.println("Result:\n" + result);
if (statement.startsWith("show schema"))
assertEquals(errStream.toString() + "processing" + statement,
- "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output.\n"
- + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n\n",
+ "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output." + String.format("%n")
+ + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n" + String.format("%n"),
errStream.toString());
else
assertEquals(errStream.toString() + " processing " + statement, "", errStream.toString());
[2/3] git commit: fix CliTest on Windows patch by Josh McKenzie;
reviewed by jbellis for CASSANDRA-7194
Posted by jb...@apache.org.
fix CliTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7194
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd6a2295
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd6a2295
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd6a2295
Branch: refs/heads/trunk
Commit: dd6a2295991be002e2fb85201b43297a105bd1a4
Parents: e00878d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 21 13:21:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 21 13:21:05 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cli/CliTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd6a2295/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java
index 6b7232c..5d28c70 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -253,8 +253,8 @@ public class CliTest extends SchemaLoader
// System.out.println("Result:\n" + result);
if (statement.startsWith("show schema"))
assertEquals(errStream.toString() + "processing" + statement,
- "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output.\n"
- + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n\n",
+ "\nWARNING: CQL3 tables are intentionally omitted from 'show schema' output." + String.format("%n")
+ + "See https://issues.apache.org/jira/browse/CASSANDRA-4377 for details.\n" + String.format("%n"),
errStream.toString());
else
assertEquals(errStream.toString() + " processing " + statement, "", errStream.toString());
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6581abfa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6581abfa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6581abfa
Branch: refs/heads/trunk
Commit: 6581abfae5f3dc06a7a555bdc8b16fcde6f38970
Parents: decc308 dd6a229
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 21 13:21:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 21 13:21:10 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cli/CliTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------