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/1e819233 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e819233 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e819233 Branch: refs/heads/trunk Commit: 1e819233f64abc30ef59223df1852993992376e1 Parents: a7684c7 cf9b8c9 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 14:31:17 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 14:31:17 2014 -0500 ---------------------------------------------------------------------- lib/snappy-java-1.0.5.1.jar | Bin 0 -> 1280090 bytes lib/snappy-java-1.0.5.jar | Bin 1251514 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
