Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3666e47a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3666e47a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3666e47a Branch: refs/heads/trunk Commit: 3666e47a118f26e944fe51c89492b319f9a01b8d Parents: 3c186be a6f5f36 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 28 10:41:23 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 28 10:41:23 2014 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ----- src/java/org/apache/cassandra/config/Config.java | 2 -- 2 files changed, 7 deletions(-) ----------------------------------------------------------------------
