merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e91cb6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e91cb6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e91cb6d Branch: refs/heads/trunk Commit: 3e91cb6d75974159342ab6f16f66bb3a70106606 Parents: fc7ccb8 4a65256 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 28 11:52:45 2014 +0200 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 28 11:52:45 2014 +0200 ---------------------------------------------------------------------- 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/3e91cb6d/src/java/org/apache/cassandra/service/ClientState.java ----------------------------------------------------------------------
