cassandra-commits mailing list archives

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

Branch: refs/heads/cassandra-3.0
Commit: b166f5f3fe3f460a878cd9d3bc37e69ffdada513
Parents: c7724e6 d44dbe1
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Nov 27 12:58:46 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Nov 27 12:58:46 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 debian/init | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b166f5f3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 252972c,39ce927..472ed45
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,7 -6,16 +18,8 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213)
   * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS (CASSANDRA-10658)
   * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)
   * Force encoding when computing statement ids (CASSANDRA-10755)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b166f5f3/debian/init
----------------------------------------------------------------------


Mime
View raw message