Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70daa8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70daa8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70daa8e Branch: refs/heads/cassandra-2.1 Commit: c70daa8ed3ff70868815ed7ccd032b69bc0b5d7c Parents: 5dc04e7 3958fc4 Author: Jake Luciani <j...@apache.org> Authored: Tue Jul 1 14:39:47 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Tue Jul 1 14:39:47 2014 -0400 ---------------------------------------------------------------------- test/conf/cassandra.yaml | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
