cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 07 Aug 2015 20:53:19 GMT
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/69f0b893
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69f0b893
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69f0b893

Branch: refs/heads/cassandra-3.0
Commit: 69f0b8936b660fda91b316c73de9294b898e47c8
Parents: dfc1a44 67903d7
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Aug 7 15:53:04 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Aug 7 15:53:04 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69f0b893/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f5cf1b2,705e560..216d3f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,12 +1,18 @@@
 -2.2.1
 +3.0.0-beta1
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
+  * (cqlsh) Fix timestamps before 1970 on Windows, always
+    use UTC for timestamp display (CASSANDRA-10000)
   * (cqlsh) Avoid overwriting new config file with old config
     when both exist (CASSANDRA-9777)
   * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)


Mime
View raw message