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/70e89bd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70e89bd0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70e89bd0 Branch: refs/heads/trunk Commit: 70e89bd04984ca1973cdc8ae35755b995ac46d27 Parents: 67c2c28 e0eb517 Author: Jonathan Ellis <[email protected]> Authored: Mon Nov 4 15:26:22 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Nov 4 15:26:22 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/SystemKeyspace.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e89bd0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e89bd0/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------
