Updated Branches: refs/heads/trunk 8a2afef95 -> dc920ab63
Merge branch 'cassandra-1.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/dc920ab6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc920ab6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc920ab6 Branch: refs/heads/trunk Commit: dc920ab63ef59489980e30b78156b1b5675e1781 Parents: 8a2afef 3fdc86c Author: Sylvain Lebresne <[email protected]> Authored: Wed May 30 16:05:51 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed May 30 16:05:51 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/SchemaAlteringStatement.java | 2 +- .../org/apache/cassandra/service/ClientState.java | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/src/java/org/apache/cassandra/service/ClientState.java ----------------------------------------------------------------------
