You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/05/14 16:20:18 UTC
[1/2] cassandra git commit: Fix CLI removal warning for 2.2
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5e631a8fd -> bccd4a3ed
Fix CLI removal warning for 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4ec535d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4ec535d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4ec535d
Branch: refs/heads/cassandra-2.1
Commit: f4ec535db47234a2cdcadabf5c4f98d8e85d9ee2
Parents: 1611ef3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu May 14 17:20:25 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 14 17:20:25 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ec535d/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index b1f2673..ada734d 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -196,7 +196,7 @@ public class CliClient
{
sessionState.out.println("Welcome to Cassandra CLI version " + FBUtilities.getReleaseVersionString() + "\n");
- sessionState.out.println("The CLI is deprecated and will be removed in Cassandra 3.0. Consider migrating to cqlsh.");
+ sessionState.out.println("The CLI is deprecated and will be removed in Cassandra 2.2. Consider migrating to cqlsh.");
sessionState.out.println("CQL is fully backwards compatible with Thrift data; see http://www.datastax.com/dev/blog/thrift-to-cql3\n");
sessionState.out.println(getHelp().banner);
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bccd4a3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bccd4a3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bccd4a3e
Branch: refs/heads/cassandra-2.1
Commit: bccd4a3ed34cab7c66f6a5469f6dd3b2c35574a9
Parents: 5e631a8 f4ec535
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu May 14 17:20:42 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 14 17:20:42 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bccd4a3e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------