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/32f05670 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f05670 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f05670 Branch: refs/heads/trunk Commit: 32f056708faa69667068aa58cfd896efac1fca47 Parents: 8c1e4e0 b17a1e7 Author: Sylvain Lebresne <[email protected]> Authored: Fri Mar 7 11:37:05 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Mar 7 11:37:05 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f05670/CHANGES.txt ----------------------------------------------------------------------
