You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/01/15 18:27:35 UTC
[4/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Updated Branches:
refs/heads/cassandra-1.2 bc575ae28 -> 7ca9b6970
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
build.xml
debian/changelog
src/java/org/apache/cassandra/gms/PureRandom.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ca9b697
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ca9b697
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ca9b697
Branch: refs/heads/cassandra-1.2
Commit: 7ca9b69703ff30645401e48bee3bcdc4f8199fc5
Parents: bc575ae 233ea26
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 15 18:27:24 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 15 18:27:24 2013 +0100
----------------------------------------------------------------------
conf/cassandra-env.sh | 5 +
src/java/org/apache/cassandra/gms/PureRandom.java | 80 ----------------
2 files changed, 5 insertions(+), 80 deletions(-)
----------------------------------------------------------------------