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/2f25e6e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f25e6e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f25e6e6 Branch: refs/heads/cassandra-2.1 Commit: 2f25e6e6ea1b1f428873eb964dfc8df401d2bb2d Parents: 05eac99 8aed419 Author: Sylvain Lebresne <[email protected]> Authored: Fri Aug 8 12:51:12 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Aug 8 12:51:12 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 5 +++++ debian/rules | 1 + 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f25e6e6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f25e6e6/build.xml ----------------------------------------------------------------------
