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 2012/01/04 17:43:23 UTC
[1/2] git commit: Merge branch 'cassandra-1.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.0
Updated Branches:
refs/heads/cassandra-1.0 de333791e -> 0f2121e31
Merge branch 'cassandra-1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f2121e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f2121e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f2121e3
Branch: refs/heads/cassandra-1.0
Commit: 0f2121e31032df105ca2846380b98a563d1b2c8a
Parents: 9f32014 de33379
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 4 17:43:01 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 4 17:43:01 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
examples/hadoop_word_count/src/WordCountSetup.java | 18 +-
.../apache/cassandra/db/HintedHandOffManager.java | 14 +-
.../cassandra/service/ConsistencyLevelTest.java | 193 ---------------
4 files changed, 26 insertions(+), 200 deletions(-)
----------------------------------------------------------------------