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/51e41a7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51e41a7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51e41a7f Branch: refs/heads/trunk Commit: 51e41a7fbd7b5f740e3f4a73e485323012e99619 Parents: fcd791a 0ccee7f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 19 09:01:17 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 19 09:01:17 2014 -0500 ---------------------------------------------------------------------- debian/cassandra.conf | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------