You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2017/05/31 13:02:04 UTC
[09/10] cassandra git commit: Merge branch cassandra-3.0 into
cassandra-3.11
Merge branch cassandra-3.0 into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54ff6193
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54ff6193
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54ff6193
Branch: refs/heads/trunk
Commit: 54ff61931c04640a0358a9eaac332331f2009b29
Parents: 5a860a7 a2f742c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed May 31 14:44:24 2017 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed May 31 14:44:42 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +
build.xml | 2 +-
lib/jna-4.0.0.jar | Bin 914639 -> 0 bytes
lib/jna-4.4.0.jar | Bin 0 -> 1091208 bytes
lib/licenses/jna-4.0.0.txt | 202 ----------------------------------------
lib/licenses/jna-4.4.0.txt | 202 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 205 insertions(+), 203 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54ff6193/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c006b50,164470f..26a8018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -69,33 -32,14 +69,35 @@@ Merged from 3.0
* Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
- * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)
+ * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
+ * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071)
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+ * 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)
+ * 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)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
- * Fix NPE issue in StorageService (CASSANDRA-13060)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
Merged from 2.2:
+ * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+ * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54ff6193/build.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org