Merge branch 'cassandra-1.2'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fac299f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fac299f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fac299f8 Branch: refs/heads/trunk Commit: fac299f8a61b0df61d704ea494a3617a761a68fe Parents: 4870949 a548f05 Author: Brandon Williams <[email protected]> Authored: Tue Jan 15 16:42:33 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 15 16:42:33 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 5 + src/java/org/apache/cassandra/gms/PureRandom.java | 80 --------------- .../cassandra/streaming/IncomingStreamReader.java | 9 +- .../streaming/compress/CompressedInputStream.java | 8 +- 5 files changed, 15 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
