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/11c8a227 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11c8a227 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11c8a227 Branch: refs/heads/trunk Commit: 11c8a227080a066817607b3b68f06324f2d21be6 Parents: 05a54e0 e3dd88a Author: Jake Luciani <j...@apache.org> Authored: Fri May 9 16:44:04 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri May 9 16:44:04 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/CBUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
