Merge cassandra-2.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5476420 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5476420 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5476420 Branch: refs/heads/trunk Commit: f547642072bc10be61a03a0232603a3101d7c867 Parents: db82949 723abe2 Author: Eric Evans <eev...@apache.org> Authored: Thu Oct 3 09:42:52 2013 -0500 Committer: Eric Evans <eev...@apache.org> Committed: Thu Oct 3 09:42:52 2013 -0500 ---------------------------------------------------------------------- debian/cassandra.in.sh | 2 ++ debian/init | 23 ++++------------------- 2 files changed, 6 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
