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/12/29 15:35:38 UTC
[1/3] cassandra git commit: jemalloc detection fails due to quoting
issues in regex
Repository: cassandra
Updated Branches:
refs/heads/trunk b3a8486d5 -> 52430b93e
jemalloc detection fails due to quoting issues in regex
patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9ac6574
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9ac6574
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9ac6574
Branch: refs/heads/trunk
Commit: f9ac6574561cccd6d829832166ef117ff6b7c5d2
Parents: 450091b
Author: Bernhard K. Weisshuhn <bk...@codingforce.com>
Authored: Tue Dec 29 15:31:33 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Dec 29 15:31:33 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9ac6574/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82af7fc..23d6bae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
* Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9ac6574/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 0bbd9fb..c15c1ab 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -153,7 +153,7 @@ case "`uname -s`" in
which ldconfig > /dev/null 2>&1
if [ $? = 0 ] ; then
# e.g. for CentOS
- dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
+ dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v '^\s' | sed 's/^\([^:]*\):.*$/\1/'`"
else
# e.g. for Debian, OpenSUSE
dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf | grep '^/'`"
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
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/36608cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36608cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36608cef
Branch: refs/heads/trunk
Commit: 36608cefa3470da7aa70a4c3de32d4ed3c3eed3e
Parents: fe62557 f9ac657
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Dec 29 15:34:06 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Dec 29 15:34:06 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36608cef/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b1a556a,23d6bae..837a592
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
-2.2.5
+3.0.3
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-1837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
- * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52430b93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52430b93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52430b93
Branch: refs/heads/trunk
Commit: 52430b93e502dd44f6f0e1bf097ccaaa45e74fd5
Parents: b3a8486 36608ce
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Dec 29 15:34:17 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Dec 29 15:34:17 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52430b93/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52430b93/bin/cassandra
----------------------------------------------------------------------