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/f1bd50ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1bd50ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1bd50ce

Branch: refs/heads/trunk
Commit: f1bd50ce5f0fc81877b99231db018010675eba1e
Parents: 7762518 ce357d9
Author: Yuki Morishita <[email protected]>
Authored: Mon Sep 22 11:12:26 2014 -0500
Committer: Yuki Morishita <[email protected]>
Committed: Mon Sep 22 11:12:26 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/f1bd50ce/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------

Reply via email to