Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8d0f11c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d0f11c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d0f11c Branch: refs/heads/trunk Commit: c8d0f11c0b1acad2c5fc1d9948510efb5f9597d3 Parents: ecfb403 f547642 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 3 12:12:38 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 3 12:12:38 2013 -0500 ---------------------------------------------------------------------- debian/cassandra.in.sh | 2 ++ debian/init | 23 ++++------------------- 2 files changed, 6 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
