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/fbf075d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf075d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf075d2 Branch: refs/heads/trunk Commit: fbf075d28a3820e8d52afc7fcf3fc2260e2e3197 Parents: 583041f 7b5bdd2 Author: Brandon Williams <[email protected]> Authored: Wed Feb 26 14:24:17 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Feb 26 14:24:17 2014 -0600 ---------------------------------------------------------------------- debian/cassandra.in.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
