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/4a652565 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a652565 Branch: refs/heads/cassandra-2.1 Commit: 4a6525655c12edf417e3be666c3647e60fde7cba Parents: 5b31449 b59ae73 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 28 11:51:55 2014 +0200 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 28 11:51:55 2014 +0200 ---------------------------------------------------------------------- build.xml | 1 + src/java/org/apache/cassandra/service/ClientState.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a652565/build.xml ----------------------------------------------------------------------
