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/09/04 22:36:49 UTC
[1/3] git commit: Ninja: adjusted cqlsh tests for CASSANDRA-7857
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 76508213d -> c54126bb4
refs/heads/trunk befd0b900 -> 2f3fab14f
Ninja: adjusted cqlsh tests for CASSANDRA-7857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c54126bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c54126bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c54126bb
Branch: refs/heads/cassandra-2.1
Commit: c54126bb47c90bdb67810d71f61e371088778bca
Parents: 7650821
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Sep 4 13:36:13 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Sep 4 13:36:13 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_keyspace_init.cql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c54126bb/pylib/cqlshlib/test/test_keyspace_init.cql
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_keyspace_init.cql b/pylib/cqlshlib/test/test_keyspace_init.cql
index b8d600c..cd5ac75 100644
--- a/pylib/cqlshlib/test/test_keyspace_init.cql
+++ b/pylib/cqlshlib/test/test_keyspace_init.cql
@@ -196,8 +196,8 @@ CREATE TYPE phone_number (
CREATE TABLE users (
login text PRIMARY KEY,
name text,
- addresses set<address>,
- phone_numbers set<phone_number>
+ addresses set<frozen<address>>,
+ phone_numbers set<frozen<phone_number>>
);
insert into users (login, name, addresses, phone_numbers)
@@ -229,8 +229,8 @@ CREATE TYPE tags (
CREATE TABLE songs (
title text PRIMARY KEY,
band text,
- info band_info_type,
- tags tags
+ info frozen<band_info_type>,
+ tags frozen<tags>
);
insert into songs (title, band, info, tags)
[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/2f3fab14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f3fab14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f3fab14
Branch: refs/heads/trunk
Commit: 2f3fab14f055fe64d5091171d2e7d54899fe63c5
Parents: befd0b9 c54126b
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Sep 4 13:36:36 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Sep 4 13:36:36 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_keyspace_init.cql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Ninja: adjusted cqlsh tests for CASSANDRA-7857
Posted by mi...@apache.org.
Ninja: adjusted cqlsh tests for CASSANDRA-7857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c54126bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c54126bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c54126bb
Branch: refs/heads/trunk
Commit: c54126bb47c90bdb67810d71f61e371088778bca
Parents: 7650821
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Sep 4 13:36:13 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Sep 4 13:36:13 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_keyspace_init.cql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c54126bb/pylib/cqlshlib/test/test_keyspace_init.cql
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_keyspace_init.cql b/pylib/cqlshlib/test/test_keyspace_init.cql
index b8d600c..cd5ac75 100644
--- a/pylib/cqlshlib/test/test_keyspace_init.cql
+++ b/pylib/cqlshlib/test/test_keyspace_init.cql
@@ -196,8 +196,8 @@ CREATE TYPE phone_number (
CREATE TABLE users (
login text PRIMARY KEY,
name text,
- addresses set<address>,
- phone_numbers set<phone_number>
+ addresses set<frozen<address>>,
+ phone_numbers set<frozen<phone_number>>
);
insert into users (login, name, addresses, phone_numbers)
@@ -229,8 +229,8 @@ CREATE TYPE tags (
CREATE TABLE songs (
title text PRIMARY KEY,
band text,
- info band_info_type,
- tags tags
+ info frozen<band_info_type>,
+ tags frozen<tags>
);
insert into songs (title, band, info, tags)