cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.0.14-build' into cassandra-2.0
Date Wed, 01 Apr 2015 15:00:43 GMT
Merge branch 'cassandra-2.0.14-build' into cassandra-2.0

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog


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

Branch: refs/heads/cassandra-2.1
Commit: 38a04eab6a18fe81e91cd0b7ecf00c34c443f2b5
Parents: 2cf4ca3 2433068
Author: T Jake Luciani <jake@apache.org>
Authored: Wed Apr 1 10:45:51 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Wed Apr 1 10:45:51 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 +-
 NEWS.txt                                        |  5 ++
 bin/cassandra.bat                               | 11 ++-
 build.xml                                       |  2 +-
 conf/cassandra-env.sh                           | 22 ++++--
 debian/changelog                                |  9 +++
 .../cassandra/service/CassandraDaemon.java      | 79 +++++++++++++++++++-
 .../utils/RMIServerSocketFactoryImpl.java       | 34 +++++++++
 8 files changed, 151 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a04eab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b6b5caf,7a3a4ea..fe1aa37
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,5 +1,41 @@@
--2.0.14:
 - * If no JMX flags are set start a localhost only JMX service
++2.0.15:
 + * Avoid race in cancelling compactions (CASSANDRA-9070)
 + * More aggressive check for expired sstables in DTCS (CASSANDRA-8359)
 + * Don't set clientMode to true when bulk-loading sstables to avoid
 +   a NullPointerException (CASSANDRA-8238)
 + * Fix ignored index_interval change in ALTER TABLE statements (CASSANDRA-7976)
 + * Do more aggressive compaction in old time windows in DTCS (CASSANDRA-8360)
 + * java.lang.AssertionError when reading saved cache (CASSANDRA-8740)
 + * "disk full" when running cleanup (CASSANDRA-9036)
 + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
 + * Lower logging level from ERROR to DEBUG when a scheduled schema pull
 +   cannot be completed due to a node being down (CASSANDRA-9032)
 + * Fix MOVED_NODE client event (CASSANDRA-8516)
 + * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
 + * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * (cqlsh) Allow increasing CSV field size limit through
 +   cqlshrc config option (CASSANDRA-8934)
 + * Stop logging range tombstones when exceeding the threshold
 +   (CASSANDRA-8559)
 + * Fix NullPointerException when nodetool getendpoints is run
 +   against invalid keyspaces or tables (CASSANDRA-8950)
 + * 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)
 + * Provide better exceptions for invalid replication strategy parameters
 +   (CASSANDRA-8909)
 + * Fix regression in mixed single and multi-column relation support for
 +   SELECT statements (CASSANDRA-8613)
 + * Add ability to limit number of native connections (CASSANDRA-8086)
 + * Fix CQLSSTableWriter throwing exception and spawning threads
 +   (CASSANDRA-8808)
 + * Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
 + * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
 +
++2.0.14
++ * Bind JMX to localhost unless explicitly configured otherwise (CASSANDRA-9085)
  
  2.0.13:
   * Add offline tool to relevel sstables (CASSANDRA-8301)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a04eab/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a04eab/debian/changelog
----------------------------------------------------------------------
diff --cc debian/changelog
index 2c80800,257d636..cd183a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,12 @@@
++<<<<<<< HEAD
++=======
+ cassandra (2.0.14) unstable; urgency=medium
+ 
+   * New release
+ 
+  -- Jake Luciani <jake@apache.org>  Thu, 26 Mar 2015 14:57:39 -0400
+ 
++>>>>>>> cassandra-2.0.14-build
  cassandra (2.0.13) unstable; urgency=medium
  
    * New release


Mime
View raw message