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/c5dd9866 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5dd9866 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5dd9866 Branch: refs/heads/trunk Commit: c5dd986638b11749143912e407128db60e82e4f6 Parents: febd6e1 a53d531 Author: Jonathan Ellis <[email protected]> Authored: Sat Feb 22 08:15:53 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Feb 22 08:15:53 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dd9866/CHANGES.txt ----------------------------------------------------------------------
