You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/08/19 23:57:58 UTC
[1/3] git commit: Ninja: fixed cqlsh test (after 7d7d529)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a323a1a6d -> a37a03632
refs/heads/trunk c69f257f9 -> 501c3e564
Ninja: fixed cqlsh test (after 7d7d529)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a37a0363
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a37a0363
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a37a0363
Branch: refs/heads/cassandra-2.1
Commit: a37a036321b11f0e0bd254a16024fca562fe7454
Parents: a323a1a
Author: Mikhail Stepura <mi...@apache.org>
Authored: Tue Aug 19 14:57:20 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Tue Aug 19 14:57:20 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_completion.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a37a0363/pylib/cqlshlib/test/test_cqlsh_completion.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cqlsh_completion.py b/pylib/cqlshlib/test/test_cqlsh_completion.py
index fc2dad9..8d3b7c4 100644
--- a/pylib/cqlshlib/test/test_cqlsh_completion.py
+++ b/pylib/cqlshlib/test/test_cqlsh_completion.py
@@ -153,10 +153,10 @@ class TestCqlshCompletion(CqlshCompletionCase):
"{'class': 'SimpleStrategy', 'repl", "ication_factor'")
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': ", '',
- choices=('<value>',))
+ choices=('<term>',))
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': 1", '',
- choices=('<value>',))
+ choices=('<term>',))
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': 1 ", '}')
self.trycompletions("create keyspace foo with replication ="
[2/3] git commit: Ninja: fixed cqlsh test (after 7d7d529)
Posted by mi...@apache.org.
Ninja: fixed cqlsh test (after 7d7d529)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a37a0363
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a37a0363
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a37a0363
Branch: refs/heads/trunk
Commit: a37a036321b11f0e0bd254a16024fca562fe7454
Parents: a323a1a
Author: Mikhail Stepura <mi...@apache.org>
Authored: Tue Aug 19 14:57:20 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Tue Aug 19 14:57:20 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_completion.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a37a0363/pylib/cqlshlib/test/test_cqlsh_completion.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cqlsh_completion.py b/pylib/cqlshlib/test/test_cqlsh_completion.py
index fc2dad9..8d3b7c4 100644
--- a/pylib/cqlshlib/test/test_cqlsh_completion.py
+++ b/pylib/cqlshlib/test/test_cqlsh_completion.py
@@ -153,10 +153,10 @@ class TestCqlshCompletion(CqlshCompletionCase):
"{'class': 'SimpleStrategy', 'repl", "ication_factor'")
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': ", '',
- choices=('<value>',))
+ choices=('<term>',))
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': 1", '',
- choices=('<value>',))
+ choices=('<term>',))
self.trycompletions("create keyspace foo with replication ="
"{'class': 'SimpleStrategy', 'replication_factor': 1 ", '}')
self.trycompletions("create keyspace foo with replication ="
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@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/501c3e56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/501c3e56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/501c3e56
Branch: refs/heads/trunk
Commit: 501c3e564b4d73cec45cb16c38ea1656e3bc363d
Parents: c69f257 a37a036
Author: Mikhail Stepura <mi...@apache.org>
Authored: Tue Aug 19 14:57:48 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Tue Aug 19 14:57:48 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_completion.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------