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/1cfa5610 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cfa5610 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cfa5610 Branch: refs/heads/trunk Commit: 1cfa56100cafbf9119d7a3bc6a9be27c6c4d98db Parents: 30aec93 a680f72 Author: Brandon Williams <[email protected]> Authored: Wed May 14 13:27:49 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 14 13:27:49 2014 -0500 ---------------------------------------------------------------------- build.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cfa5610/build.xml ----------------------------------------------------------------------
