Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce357d91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce357d91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce357d91 Branch: refs/heads/trunk Commit: ce357d9158fdb74c02a33207a86f235bb16016a1 Parents: eecc034 d96485f Author: Yuki Morishita <yu...@apache.org> Authored: Mon Sep 22 11:12:17 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Sep 22 11:12:17 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/ClientState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce357d91/src/java/org/apache/cassandra/service/ClientState.java ----------------------------------------------------------------------
