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/5c66dc81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c66dc81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c66dc81 Branch: refs/heads/trunk Commit: 5c66dc819b72bea2cd4157648d13dadfe5ac2c31 Parents: 284d3f7 f0575f1 Author: T Jake Luciani <j...@apache.org> Authored: Mon May 5 17:13:08 2014 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Mon May 5 17:13:08 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.properties.default | 1 + build.xml | 8 ++++++-- lib/high-scale-lib-1.0.5.jar | Bin 0 -> 104776 bytes lib/high-scale-lib-1.1.2.jar | Bin 96046 -> 0 bytes 5 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c66dc81/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c66dc81/build.xml ----------------------------------------------------------------------
