You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/08 06:39:33 UTC
[1/2] git commit: fix c* launch issues on Russian os's due to output
of linux 'free' cmd
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 773b95efb -> 1b1f0b079
fix c* launch issues on Russian os's due to output of linux 'free' cmd
patch by dbrosius reviewed by bwilliams for cassandra-6162
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16fd1a4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16fd1a4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16fd1a4a
Branch: refs/heads/cassandra-2.1
Commit: 16fd1a4a89958595ca2ae44fdac2eb7aa1ad6be2
Parents: fb0a78a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu May 8 00:32:29 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu May 8 00:32:29 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
conf/cassandra-env.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16fd1a4a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6c8f1fb..05cc193 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,8 @@
2.0.9
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
2.0.8
* Correctly delete scheduled range xfers (CASSANDRA-7143)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16fd1a4a/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index fc4fa3d..7604918 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -18,7 +18,7 @@ calculate_heap_sizes()
{
case "`uname`" in
Linux)
- system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'`
+ system_memory_in_mb=`free -m | awk '/:/ {print $2;exit}'`
system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo`
;;
FreeBSD)
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b1f0b07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b1f0b07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b1f0b07
Branch: refs/heads/cassandra-2.1
Commit: 1b1f0b0790cf4f36fddd6815634261ace6cb588e
Parents: 773b95e 16fd1a4
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu May 8 00:39:13 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu May 8 00:39:13 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
conf/cassandra-env.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b1f0b07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4a0548a,05cc193..f57b649
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,25 +1,18 @@@
-2.0.9
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
-
-2.0.8
+2.1.0-rc1
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+Merged from 2.0:
* Correctly delete scheduled range xfers (CASSANDRA-7143)
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
++ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
++ * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b1f0b07/conf/cassandra-env.sh
----------------------------------------------------------------------