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/f48adab3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f48adab3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f48adab3 Branch: refs/heads/trunk Commit: f48adab37101737d8ea76365feca82b599be414e Parents: d697ba6 bdd24cc Author: Brandon Williams <[email protected]> Authored: Tue Feb 25 10:45:09 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Feb 25 10:45:09 2014 -0600 ---------------------------------------------------------------------- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
