Updated Branches: refs/heads/cassandra-1.0 8703f745f -> add9372b0
Merge branch 'cassandra-1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/add9372b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/add9372b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/add9372b Branch: refs/heads/cassandra-1.0 Commit: add9372b027ca5d5433e5da03ca35a0ea94dc887 Parents: 7efab48 8703f74 Author: Jonathan Ellis <[email protected]> Authored: Sat Dec 31 10:07:54 2011 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Dec 31 10:07:54 2011 -0600 ---------------------------------------------------------------------- build.xml | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
