cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 01 Mar 2017 21:49:37 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 218743dc39a49bd31182c8e796d10781b6c236eb
Parents: 873660c 9bbb449
Author: Jeff Jirsa <jeff@jeffjirsa.net>
Authored: Wed Mar 1 13:43:53 2017 -0800
Committer: Jeff Jirsa <jeff@jeffjirsa.net>
Committed: Wed Mar 1 13:44:55 2017 -0800

----------------------------------------------------------------------
 CHANGES.txt              | 1 +
 build.properties.default | 3 ---
 build.xml                | 6 ++----
 3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/218743dc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2289334,404440a..c4622ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,49 -7,10 +12,50 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
  Merged from 2.1:
+  * Remove unused repositories (CASSANDRA-13278)
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in addition to

 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/218743dc/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 69b6bdf,6dbdb9e..cffaa17
--- a/build.xml
+++ b/build.xml
@@@ -386,9 -387,15 +385,10 @@@
            <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
            <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
  
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"
scope="test"/>
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"
scope="test"/>
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"
scope="test"/>
++          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>
  
  
            <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.1.1"/>
@@@ -504,11 -525,12 +504,12 @@@
          <parent groupId="org.apache.cassandra"
                  artifactId="cassandra-parent"
                  version="${version}"/>
 -        <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/>
          <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
 -        <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
 -        <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>
 -        <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>
 -        <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>
 +        <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" />
++        <dependency groupId="org.jboss.byteman" artifactId="byteman-install"/>
 +        <dependency groupId="org.jboss.byteman" artifactId="byteman"/>
 +        <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/>
 +        <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/>
        </artifact:pom>
  
        <artifact:pom id="test-deps-pom"


Mime
View raw message