cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 17 Mar 2015 19:35:08 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d58f90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d58f90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d58f90

Branch: refs/heads/cassandra-2.1
Commit: 77d58f900efac62c7c8dcc63c3de5ecb0fe4e343
Parents: 89cdfd8 b2aa67e
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Mar 17 14:34:26 2015 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Mar 17 14:34:26 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d58f90/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30bf698,f10a89a..6b8618b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
 -2.0.14:
 +2.1.4
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 +Merged from 2.0:
+  * Allow specifying the tmp dir (CASSANDRA-7712)
   * Improve compaction estimated tasks estimation (CASSANDRA-8904)
   * Fix duplicate up/down messages sent to native clients (CASSANDRA-7816)
   * Expose commit log archive status via JMX (CASSANDRA-8734)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d58f90/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 4ced4e2,f5e14ba..bdb3646
--- a/build.xml
+++ b/build.xml
@@@ -1182,21 -1099,8 +1183,22 @@@
        <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+       <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
      </testmacro>
 +    <fileset dir="${test.unit.src}">
 +        <exclude name="**/pig/*.java" />
 +    </fileset>
 +  </target>
 +  
 +  <target name="testlist">
 +    <testmacro suitename="${testlist.name}" inputdir="${test.unit.src}" filelist="${test.file.list}"
poffset="${testlist.offset}" exclude="**/*.java" timeout="${test.timeout}">
 +      <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
 +      <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
 +      <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
 +      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
 +      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
 +      <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/>
 +    </testmacro>
    </target>
  
    <!-- Use this with an FQDN for test class, and a csv list of methods like this:


Mime
View raw message