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/a45918b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a45918b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a45918b0 Branch: refs/heads/trunk Commit: a45918b081bebd7e3919411420074a0a628994cb Parents: 4a104d9 dc5b1e9 Author: Sylvain Lebresne <[email protected]> Authored: Fri Apr 26 17:21:26 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Apr 26 17:21:26 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Server.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a45918b0/CHANGES.txt ----------------------------------------------------------------------
