Merge branch 'cassandra-2.0' into trunk Conflicts: build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d82ac9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d82ac9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d82ac9d Branch: refs/heads/trunk Commit: 4d82ac9d29a2f329fa7236704b06464430d53f76 Parents: 0bff97a 8a06958 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Oct 22 15:30:07 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Oct 22 15:30:07 2013 -0500 ---------------------------------------------------------------------- .rat-excludes | 1 + CHANGES.txt | 1 + NEWS.txt | 2 -- debian/changelog | 6 ++++++ examples/triggers/build.xml | 19 +++++++++++++++++++ examples/triggers/conf/InvertedIndex.properties | 19 ++++++++++++++++++- .../org/apache/cassandra/config/CFMetaData.java | 2 +- .../cassandra/db/HintedHandOffManager.java | 8 ++++++-- .../filter/TombstoneOverwhelmingException.java | 18 ++++++++++++++++++ .../cassandra/io/sstable/SSTableReader.java | 10 ++++------ .../cassandra/metrics/RestorableMeter.java | 20 +++++++++++++++++++- .../apache/cassandra/net/WriteCallbackInfo.java | 18 ++++++++++++++++++ .../cassandra/service/MigrationManager.java | 5 ++++- .../cassandra/pig/CqlTableDataTypeTest.java | 18 ++++++++++++++++++ .../pig/ThriftColumnFamilyDataTypeTest.java | 18 ++++++++++++++++++ 15 files changed, 151 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------