Updated Branches: refs/heads/trunk c3b40df72 -> 118cd0d99
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/118cd0d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/118cd0d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/118cd0d9 Branch: refs/heads/trunk Commit: 118cd0d99e379f08f75e553e0bbc0d3cd2df240d Parents: c3b40df cc0c9f3 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 9 12:08:15 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 9 12:08:15 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 12 ++++++++---- .../locator/AbstractReplicationStrategy.java | 13 +++++++++---- .../apache/cassandra/locator/LocalStrategy.java | 2 +- .../cassandra/locator/NetworkTopologyStrategy.java | 1 - .../apache/cassandra/locator/SimpleStrategy.java | 9 ++++----- .../apache/cassandra/thrift/CassandraServer.java | 8 ++++++++ 7 files changed, 31 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/118cd0d9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/118cd0d9/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
