Updated Branches: refs/heads/cassandra-0.8 8d6b6f657 -> 70a350e6e refs/heads/cassandra-1.0 0f2121e31 -> 17d2c8a5f refs/heads/trunk 38c04fef0 -> 95ca3a21f
Merge branch 'cassandra-1.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ca3a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ca3a21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ca3a21 Branch: refs/heads/trunk Commit: 95ca3a21fa8124859f236ba9cf47f8faea853499 Parents: 38c04fe 17d2c8a Author: Jonathan Ellis <[email protected]> Authored: Thu Jan 5 13:49:49 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jan 5 13:49:49 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ debian/cassandra.install | 1 - debian/control | 5 +-- debian/pyversions | 1 - debian/rules | 4 -- examples/hadoop_word_count/src/WordCountSetup.java | 18 +++++++--- pylib/setup.py | 24 ------------- .../cassandra/service/DatacenterReadCallback.java | 27 +++++++++----- .../org/apache/cassandra/service/ReadCallback.java | 14 +++++-- 9 files changed, 45 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ca3a21/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ca3a21/src/java/org/apache/cassandra/service/ReadCallback.java ----------------------------------------------------------------------
