[2/5] git commit: Merge branch 'cassandra-1.2' into trunk

2013-06-26 Thread aleksey
Merge branch 'cassandra-1.2' into trunk Conflicts: bin/cqlsh pylib/cqlshlib/test/test_cqlsh_output.py pylib/cqlshlib/test/test_keyspace_init2.cql Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[2/5] git commit: Merge branch 'cassandra-1.2' into trunk

2013-01-31 Thread jbellis
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/d9d9d655 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9d9d655 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/5] git commit: Merge branch 'cassandra-1.2' into trunk

2013-01-18 Thread slebresne
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b02851b Tree: http://git-wip-us.apache.org