[2/4] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-29 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27c999a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27c999a1 Diff:

[2/4] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-27 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql/AlterTableStatement.java src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java

[2/4] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-22 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f110584 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f110584 Diff: