Merge branch 'cassandra-3.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/16f29aac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16f29aac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16f29aac Branch: refs/heads/trunk Commit: 16f29aac9f43a126573cfa22e99a78348c4207ea Parents: 739de13 50fae5d Author: Marcus Eriksson <[email protected]> Authored: Mon Oct 12 08:28:35 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Oct 12 08:28:35 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemKeyspace.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------
