You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/04 13:58:27 UTC

[1/2] cassandra git commit: Fix logback-tools.xml incorrectly configured for outputing to System.err

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a549bd085 -> b4b268407


Fix logback-tools.xml incorrectly configured for outputing to System.err

patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937


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

Branch: refs/heads/cassandra-2.2
Commit: dc73c0b31feb399750c5a6823854714ee711152e
Parents: 068614c
Author: Mike Adamson <ma...@datastax.com>
Authored: Wed Nov 4 12:21:54 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Nov 4 12:26:12 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt            | 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c24b35..fd6c8a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.12
+ * Fix logback-tools.xml incorrectly configured for outputing to System.err
+   (CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/conf/logback-tools.xml
----------------------------------------------------------------------
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index ade6c12..e47985e 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -18,7 +18,8 @@
 -->
 
 <configuration>
-  <appender name="STDERR" target="System.err" class="ch.qos.logback.core.ConsoleAppender">
+  <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+    <target>System.err</target>
     <encoder>
       <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
     </encoder>


[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by al...@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/b4b26840
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b26840
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b26840

Branch: refs/heads/cassandra-2.2
Commit: b4b268407f6bf1d1137099c1b34ca3fb91733bd1
Parents: a549bd0 dc73c0b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Nov 4 12:58:21 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Nov 4 12:58:21 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt            | 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b26840/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5c23acf,fd6c8a1..f25ac7e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * 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:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+    (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)