Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28658ddb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28658ddb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28658ddb Branch: refs/heads/cassandra-2.0 Commit: 28658ddb207d344f212fc81bc1cc0079398bf93a Parents: 8ec971b 4bdd7f8 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Nov 27 23:57:57 2013 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Nov 27 23:57:57 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28658ddb/src/java/org/apache/cassandra/dht/BootStrapper.java ----------------------------------------------------------------------
