Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a5e09b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a5e09b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a5e09b Branch: refs/heads/trunk Commit: 66a5e09b0453dd9e1489f05c154a598e0bc3b66b Parents: d004234 082684d Author: Dave Brosius <[email protected]> Authored: Sat Jun 15 11:43:10 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Jun 15 11:43:10 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- src/java/org/apache/cassandra/net/MessagingService.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a5e09b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a5e09b/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
