Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08e33464 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08e33464 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08e33464 Branch: refs/heads/trunk Commit: 08e3346494a21688d214f465c7048567a86e5f06 Parents: af4799b 3448ca5 Author: Marcus Eriksson <marc...@spotify.com> Authored: Tue Sep 24 09:57:39 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Tue Sep 24 09:57:39 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessagingService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e33464/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e33464/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
