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/15ced942 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ced942 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ced942 Branch: refs/heads/trunk Commit: 15ced9428715f29c3d6fcef0bd405f2fbae9bd3c Parents: 304ead1 40fd7f0 Author: Brandon Williams <[email protected]> Authored: Wed Jul 9 11:58:27 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jul 9 11:58:27 2014 -0500 ---------------------------------------------------------------------- build.xml | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ced942/build.xml ----------------------------------------------------------------------
