Merge branch 'cassandra-2.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/0ccee7f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ccee7f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ccee7f5 Branch: refs/heads/trunk Commit: 0ccee7f58cfbccd2f73aca847a32024eb25a338d Parents: e23e57f 91e4d22 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 19 09:01:05 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 19 09:01:05 2014 -0500 ---------------------------------------------------------------------- debian/cassandra.conf | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
