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/17 12:13:42 UTC
[2/3] git commit: Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into 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/d64dc2eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d64dc2eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d64dc2eb
Branch: refs/heads/trunk
Commit: d64dc2eb3a1a3c3771bbe3218af9ce9629ec67bf
Parents: afed8cc 205a993
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jan 17 12:12:32 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jan 17 12:12:32 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++
.../org/apache/cassandra/db/ColumnFamilyStore.java | 5 ++
.../cassandra/db/ColumnFamilyStoreMBean.java | 6 +++
src/java/org/apache/cassandra/db/DataTracker.java | 18 +++++++
.../cassandra/gms/GossipDigestSynVerbHandler.java | 2 -
src/java/org/apache/cassandra/gms/Gossiper.java | 8 ---
.../cassandra/hadoop/pig/CassandraStorage.java | 36 ++++++++-------
.../cassandra/io/sstable/SSTableMetadata.java | 12 +++++-
.../apache/cassandra/io/sstable/SSTableReader.java | 5 ++
.../locator/GossipingPropertyFileSnitch.java | 10 +++-
.../cassandra/locator/PropertyFileSnitch.java | 7 ++-
11 files changed, 82 insertions(+), 31 deletions(-)
----------------------------------------------------------------------