You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/11/27 13:00:53 UTC
[1/2] cassandra git commit: Status command in debian/ubuntu init
script doesn't work
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 f8fc0311b -> d44dbe192
Status command in debian/ubuntu init script doesn't work
patch by Ruggero Marchei; reviewed by Michael Shuler for CASSANDRA-10213
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cd13f13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cd13f13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cd13f13
Branch: refs/heads/cassandra-2.2
Commit: 8cd13f1381dff81aa5dfe0f6b630fa8198aa0d2b
Parents: 4ecbbc0
Author: Ruggero Marchei <ru...@daemonzone.net>
Authored: Fri Nov 27 12:57:49 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 12:57:49 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/8cd13f13/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4adcf4f..111852c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * 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/8cd13f13/debian/init
----------------------------------------------------------------------
diff --git a/debian/init b/debian/init
index aff54e1..72417ae 100644
--- a/debian/init
+++ b/debian/init
@@ -47,7 +47,7 @@ FD_LIMIT=100000
# process is not running but the pidfile exists (to match the exit codes for
# the "status" command; see LSB core spec 3.1, section 20.2)
#
-CMD_PATT="cassandra.+CassandraDaemon"
+CMD_PATT="Dcassandra-pidfile=.*cassandra\.pid"
is_running()
{
if [ -f $PIDFILE ]; then
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sn...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d44dbe19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d44dbe19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d44dbe19
Branch: refs/heads/cassandra-2.2
Commit: d44dbe1929b3746f6f931ef5c6499073ed3bbaeb
Parents: f8fc031 8cd13f1
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 12:58:16 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 12:58:16 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/d44dbe19/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63305d6,111852c..39ce927
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-2.1.12
+2.2.4
+ * Reject index queries while the index is building (CASSANDRA-8505)
+ * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
+ * Fix JSON update with prepared statements (CASSANDRA-10631)
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * 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)