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/c54c618b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c54c618b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c54c618b Branch: refs/heads/trunk Commit: c54c618b345ccf11e9e618ad07961245487c751f Parents: fc77037 3595131 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 15:27:44 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 15:27:44 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/db/commitlog/CommitLogSegment.java | 1 - src/java/org/apache/cassandra/gms/Gossiper.java | 18 ++++++++++++++++++ .../apache/cassandra/service/StorageProxy.java | 8 ++++---- 4 files changed, 23 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c54c618b/CHANGES.txt ----------------------------------------------------------------------
