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/4cd434f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cd434f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cd434f4 Branch: refs/heads/trunk Commit: 4cd434f465e99e552802e07687cc173b51db761f Parents: 97f3130 7bd2331 Author: Brandon Williams <[email protected]> Authored: Tue Feb 25 15:52:13 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Feb 25 15:52:13 2014 -0600 ---------------------------------------------------------------------- build.xml | 3 +++ debian/rules | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cd434f4/build.xml ----------------------------------------------------------------------
