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/6d863072 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d863072 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d863072 Branch: refs/heads/trunk Commit: 6d86307242ac1304c15ae616d351e1d19fd014b6 Parents: 0b0c9e4 d00a233 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Oct 20 22:17:17 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Oct 20 22:17:17 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d863072/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
