Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22b27168 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22b27168 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22b27168 Branch: refs/heads/trunk Commit: 22b271689ba0d6c559fee675970dacf6e88c47cd Parents: 47675ce 245038f Author: Mikhail Stepura <[email protected]> Authored: Fri Mar 14 13:51:29 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Fri Mar 14 13:51:29 2014 -0700 ---------------------------------------------------------------------- build.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22b27168/build.xml ----------------------------------------------------------------------
