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 <[email protected]> Authored: Thu Sep 4 13:36:36 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Thu Sep 4 13:36:36 2014 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_keyspace_init.cql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
