Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91e4d228 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e4d228 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91e4d228 Branch: refs/heads/cassandra-2.0 Commit: 91e4d22880b341882149013f5f4c1da6227481fc Parents: f1f8384 3008532 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 19 09:00:51 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 19 09:00:51 2014 -0500 ---------------------------------------------------------------------- debian/cassandra.conf | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
