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/99b0076c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b0076c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99b0076c Branch: refs/heads/trunk Commit: 99b0076c7421e63f7dc6bc61dd7ba42eb9225101 Parents: ff44eeb 28658dd Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Nov 27 23:58:49 2013 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Nov 27 23:58:49 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
