cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 09 Oct 2015 11:17:00 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/a9db74b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9db74b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9db74b3

Branch: refs/heads/trunk
Commit: a9db74b30fc44970ed988199ad0cc7213fdd67aa
Parents: cf365e3 82dabe0
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Oct 9 13:14:53 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Oct 9 13:14:53 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt           | 4 +++-
 conf/cassandra-env.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9db74b3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f8da643,d57cc07..fa74c69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,24 +1,46 @@@
 -2.2.3
 +3.0
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
 + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ Merged from 2.1:
+  * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
+  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161)
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations (CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
-  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes
     share an rpc_address (CASSANDRA-10052)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9db74b3/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index fd348fe,ca5f17a..0a5bada
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -274,13 -326,10 +274,15 @@@ JVM_OPTS="$JVM_OPTS -Djava.net.preferIP
  # To enable remote JMX connections, uncomment lines below
  # with authentication and/or ssl enabled. See https://wiki.apache.org/cassandra/JmxSecurity

  #
- LOCAL_JMX=yes
+ if [ "x$LOCAL_JMX" = "x" ]; then
+     LOCAL_JMX=yes
+ fi
  
 +# Specifies the default port over which Cassandra will be available for
 +# JMX connections.
 +# For security reasons, you should not expose this port to the internet.  Firewall it if
needed.
 +JMX_PORT="7199"
 +
  if [ "$LOCAL_JMX" = "yes" ]; then
    JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT -XX:+DisableExplicitGC"
  else


Mime
View raw message