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-3.0' into trunk
Date Wed, 28 Oct 2015 19:17:19 GMT
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/0df49539
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0df49539
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0df49539

Branch: refs/heads/trunk
Commit: 0df49539fa64672341f86e876849764a41037e47
Parents: a88d3e8 4b47d71
Author: Robert Stupp <snazy@snazy.de>
Authored: Wed Oct 28 20:13:57 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Wed Oct 28 20:13:57 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  4 ++++
 conf/cassandra-env.sh                           | 23 +++++++++-----------
 conf/cassandra.yaml                             | 13 -----------
 .../org/apache/cassandra/config/Config.java     |  3 ---
 5 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df49539/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 114e2aa,3f2f493..dda3843
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
   * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604)
   * Fix thrift cas operations with defined columns (CASSANDRA-10576)
   * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df49539/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------


Mime
View raw message