You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/07/13 19:30:01 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
src/java/org/apache/cassandra/service/CassandraDaemon.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a090cc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a090cc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a090cc5
Branch: refs/heads/cassandra-2.2
Commit: 5a090cc5a13d01a22776378b65116868359b8f8c
Parents: 01f3d0a 1eccced
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Jul 13 19:22:55 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Jul 13 19:23:41 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 9 +--
.../io/sstable/format/SSTableReader.java | 71 ++++++++++++++++----
.../org/apache/cassandra/io/util/FileUtils.java | 23 +++++++
.../apache/cassandra/io/util/SegmentedFile.java | 13 +++-
.../cassandra/service/CassandraDaemon.java | 9 +++
.../cassandra/service/StorageService.java | 7 ++
.../cassandra/utils/JVMStabilityInspector.java | 17 ++++-
8 files changed, 128 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a090cc5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 03458b2,5f4fdf2..3046ceb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.1.9
+2.2.0-rc3
+ * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
+ * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
+Merged from 2.1:
+ * Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
config file or environment variables (CASSANDRA-9544)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a090cc5/conf/cassandra.yaml
----------------------------------------------------------------------