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/fa0cc903 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa0cc903 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa0cc903 Branch: refs/heads/trunk Commit: fa0cc90393d079aee40e91d02846f915093efe13 Parents: c6525da e906192 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jan 9 19:59:14 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jan 9 19:59:14 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessageOut.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa0cc903/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa0cc903/src/java/org/apache/cassandra/net/MessageOut.java ----------------------------------------------------------------------
