Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8165af5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8165af5d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8165af5d Branch: refs/heads/trunk Commit: 8165af5db91c43dd564f879bd7f124275e3b9608 Parents: 80548b3 5284e12 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jan 2 14:19:47 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jan 2 14:19:47 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientState.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8165af5d/CHANGES.txt ----------------------------------------------------------------------