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/1dc43bda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dc43bda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dc43bda Branch: refs/heads/trunk Commit: 1dc43bdad2beb52793253c4aacb737c8de74cd4a Parents: 6949880 ae0a1e0 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jan 7 06:50:43 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 7 06:50:43 2014 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 3 +++ .../org/apache/cassandra/tools/BulkLoader.java | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc43bda/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc43bda/src/java/org/apache/cassandra/tools/BulkLoader.java ----------------------------------------------------------------------
