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/c3d9280e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3d9280e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3d9280e Branch: refs/heads/trunk Commit: c3d9280e453de90a27b01a27374ccb9ec56c69d5 Parents: 3d017f0 dd60ab4 Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 17 11:37:16 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 17 11:37:16 2014 -0500 ---------------------------------------------------------------------- build.xml | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d9280e/build.xml ----------------------------------------------------------------------
