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/8955a465 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8955a465 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8955a465 Branch: refs/heads/trunk Commit: 8955a4658e081659495bdd04b9d59bcad3c90d93 Parents: 7aaa390 729da03 Author: Dave Brosius <[email protected]> Authored: Fri Mar 14 00:47:29 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Mar 14 00:47:29 2014 -0400 ---------------------------------------------------------------------- build.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8955a465/build.xml ----------------------------------------------------------------------
