Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10c60f5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c60f5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10c60f5a Branch: refs/heads/trunk Commit: 10c60f5ad6bbf56effa9b7f5f7ef42de317b408d Parents: 6c37934 cfa0e58 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Oct 18 21:55:08 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Oct 18 21:55:08 2013 -0400 ---------------------------------------------------------------------- NEWS.txt | 15 ++++++++++----- .../org/apache/cassandra/service/StorageService.java | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c60f5a/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c60f5a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
