This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 324267b3c0676ad31bd4f2fac0e2e673a9257a37 Merge: 958aa79 1b29401 Author: Brandon Williams <[email protected]> AuthorDate: Wed Feb 26 11:48:29 2020 -0600 Merge branch 'cassandra-3.11' into trunk CHANGES.txt | 2 ++ bin/cassandra | 1 + bin/cassandra.in.sh | 3 +++ debian/patches/cassandra_in.sh_dirs.diff | 11 ++++------- 4 files changed, 10 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index a7f3e89,a4a6c12..ab91023 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,63 -1,11 +1,65 @@@ -3.11.7 +4.0-alpha4 + * Correct inaccurate logging message (CASSANDRA-15549) + * Add documentation of dynamo (CASSANDRA-15486) + * Added documentation for Guarantees (CASSANDRA-15482) + * Added documentation for audit logging (CASSANDRA-15474) + * Unset GREP_OPTIONS (CASSANDRA-14487) + * Added streaming documentation (CASSANDRA-15477) + * Update to Python driver 3.21 for cqlsh (CASSANDRA-14872) + * Added bulk loading documentation (CASSANDRA-15480) + * Updated overview documentation (CASSANDRA-15483) + * Added CDC and speculative retry documentation to DDL section (CASSANDRA-15492) + * Fix missing Keyspaces in cqlsh describe output (CASSANDRA-15576) + * Fix multi DC nodetool status output (CASSANDRA-15305) + * Added documentation covering new Netty based internode messaging (CASSANDRA-15478) + * Add documentation of hints (CASSANDRA-15491) + * updateCoordinatorWriteLatencyTableMetric can produce misleading metrics (CASSANDRA-15569) + * Added documentation for read repair and an example of full repair (CASSANDRA-15485) + * Make cqlsh and cqlshlib Python 2 & 3 compatible (CASSANDRA-10190) + * Added documentation for Full Query Logging (CASSANDRA-15475) + * Added documentation for backups (CASSANDRA-15479) + * Documentation gives the wrong instruction to activate remote jmx (CASSANDRA-15535) + * Improve the description of nodetool listsnapshots command (CASSANDRA-14587) + * allow embedded cassandra launched from a one-jar or uno-jar (CASSANDRA-15494) + * Update hppc library to version 0.8.1 (CASSANDRA-12995) + * Limit the dependencies used by UDFs/UDAs (CASSANDRA-14737) + * Make native_transport_max_concurrent_requests_in_bytes updatable (CASSANDRA-15519) + * Cleanup and improvements to IndexInfo/ColumnIndex (CASSANDRA-15469) + * Potential Overflow in DatabaseDescriptor Functions That Convert Between KB/MB & Bytes (CASSANDRA-15470) Merged from 3.0: - * Run evictFromMembership in GossipStage (CASSANDRA-15592) -Merged from 2.2 - * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567) - +* Run evictFromMembership in GossipStage (CASSANDRA-15592) ++Merged from 2.2: ++* Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567) -3.11.6 +4.0-alpha3 + * Restore monotonic read consistency guarantees for blocking read repair (CASSANDRA-14740) + * Separate exceptions for CAS write timeout exceptions caused by contention and unkown result (CASSANDRA-15350) + * Fix in-jvm dtest java 11 compatibility (CASSANDRA-15463) + * Remove joda time dependency (CASSANDRA-15257) + * Exclude purgeable tombstones from repaired data tracking (CASSANDRA-15462) + * Exclude legacy counter shards from repaired data tracking (CASSANDRA-15461) + * Make it easier to add trace headers to messages (CASSANDRA-15499) + * Fix and optimise partial compressed sstable streaming (CASSANDRA-13938) + * Improve error when JVM 11 can't access required modules (CASSANDRA-15468) + * Better handling of file deletion failures by DiskFailurePolicy (CASSANDRA-15143) + * Prevent read repair mutations from increasing read timeout (CASSANDRA-15442) + * Document 4.0 system keyspace changes, bump generations (CASSANDRA-15454) + * Make it possible to disable STCS-in-L0 during runtime (CASSANDRA-15445) + * Removed obsolete OldNetworkTopologyStrategy (CASSANDRA-13990) + * Align record header of FQL and audit binary log (CASSANDRA-15076) + * Shuffle forwarding replica for messages to non-local DC (CASSANDRA-15318) + * Optimise native protocol ASCII string encoding (CASSANDRA-15410) + * Make sure all exceptions are propagated in DebuggableThreadPoolExecutor (CASSANDRA-15332) + * Make it possible to resize concurrent read / write thread pools at runtime (CASSANDRA-15277) + * Close channels on error (CASSANDRA-15407) + * Add documentation for Java 11 support in Cassandra (CASSANDRA-15428) + * Integrate SJK into nodetool (CASSANDRA-12197) + * Ensure that empty clusterings with kind==CLUSTERING are Clustering.EMPTY (CASSANDRA-15498) + * The flag 'cross_node_timeout' has been set as true by default. This change + is done under the assumption that users have setup NTP on their clusters or + otherwise synchronize their clocks, and that clocks are mostly in sync, since + this is a requirement for general correctness of last write wins. (CASSANDRA-15216) +Merged from 3.11: * Fix bad UDT sstable metadata serialization headers written by C* 3.0 on upgrade and in sstablescrub (CASSANDRA-15035) * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409) * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075) diff --cc debian/patches/cassandra_in.sh_dirs.diff index 2d91442,0000000..6642165 mode 100644,000000..100644 --- a/debian/patches/cassandra_in.sh_dirs.diff +++ b/debian/patches/cassandra_in.sh_dirs.diff @@@ -1,50 -1,0 +1,47 @@@ +--- a/bin/cassandra.in.sh ++++ b/bin/cassandra.in.sh +@@ -14,17 +14,17 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-if [ "x$CASSANDRA_HOME" = "x" ]; then +- CASSANDRA_HOME="`dirname "$0"`/.." +-fi ++CASSANDRA_HOME=/usr/share/cassandra + + # The directory where Cassandra's configs live (required) +-if [ "x$CASSANDRA_CONF" = "x" ]; then +- CASSANDRA_CONF="$CASSANDRA_HOME/conf" +-fi ++CASSANDRA_CONF=/etc/cassandra + + # The java classpath (required) +-CLASSPATH="$CASSANDRA_CONF" ++if [ -n "$CLASSPATH" ]; then ++ CLASSPATH=$CLASSPATH:$CASSANDRA_CONF ++else ++ CLASSPATH="$CASSANDRA_CONF" ++fi + + # This can be the path to a jar file, or a directory containing the + # compiled classes. NOTE: This isn't needed by the startup script, - @@ -38,7 +38,7 @@ ++@@ -38,7 +38,7 @@ fi + + # the default location for commitlogs, sstables, and saved caches + # if not set in cassandra.yaml +-cassandra_storagedir="$CASSANDRA_HOME/data" ++cassandra_storagedir=/var/lib/cassandra + + # JAVA_HOME can optionally be set here + #JAVA_HOME=/usr/local/jdk6 - @@ -47,6 +47,13 @@ ++@@ -47,6 +47,10 @@ for jar in "$CASSANDRA_HOME"/lib/*.jar; do + CLASSPATH="$CLASSPATH:$jar" + done + ++for jar in "$CASSANDRA_HOME"/*.jar; do ++ CLASSPATH="$CLASSPATH:$jar" ++done ++ - +# Include EXTRA_CLASSPATH from /etc/default/cassandra - +CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH" - + ++ CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH" ++ + # JSR223 - collect all JSR223 engines' jars - for jsr223jar in "$CASSANDRA_HOME"/lib/jsr223/*/*.jar; do - CLASSPATH="$CLASSPATH:$jsr223jar" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
