Merge branch 'cassandra-2.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/9c9fa149 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9fa149 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c9fa149 Branch: refs/heads/trunk Commit: 9c9fa1498096c51db7692a453f4af77f9276adfa Parents: 19b7d56 3d2da79 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jul 22 01:30:10 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jul 22 01:30:10 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/ClientState.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9fa149/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9fa149/src/java/org/apache/cassandra/service/ClientState.java ----------------------------------------------------------------------
