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/968810e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968810e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/968810e5 Branch: refs/heads/trunk Commit: 968810e50f261346c464b792b2b100283472d1f7 Parents: 7161fed aac8e6c Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 7 00:13:57 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 7 00:13:57 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cassandra | 7 +++++++ conf/README.txt | 2 ++ .../apache/cassandra/net/MessagingService.java | 18 +++++++++--------- 4 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/968810e5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/968810e5/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
