Updated Branches: refs/heads/trunk c65f9e7ed -> 13e0c6357
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13e0c635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13e0c635 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13e0c635 Branch: refs/heads/trunk Commit: 13e0c6357778ad5865bd9e1203a4b5d1dd26cd7e Parents: c65f9e7 edc37bc Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 11 21:17:32 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 11 21:17:32 2013 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_output.py | 27 ++++++++------- pylib/cqlshlib/test/test_keyspace_init2.cql | 2 +- pylib/cqlshlib/test/test_keyspace_init3.cql | 40 +++++++++++----------- 3 files changed, 35 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
