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/b192acbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b192acbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b192acbb Branch: refs/heads/trunk Commit: b192acbbdaee02050c2286e5b2b610c02977439d Parents: 9cfde47 c70daa8 Author: Jake Luciani <j...@apache.org> Authored: Tue Jul 1 14:40:13 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Tue Jul 1 14:40:13 2014 -0400 ---------------------------------------------------------------------- test/conf/cassandra.yaml | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
