You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/09/13 08:03:32 UTC
[1/2] git commit: Fix CHANGES.txt
Repository: cassandra
Updated Branches:
refs/heads/trunk 796ddbc06 -> e5d1528e5
Fix CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f168fdad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f168fdad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f168fdad
Branch: refs/heads/trunk
Commit: f168fdad6f5c8d574f9c32781f1eaad6de2d3e3c
Parents: d93a580
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Sep 12 23:02:28 2014 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Sep 12 23:02:28 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f168fdad/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 177ac76..7030570 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
2.1.1
* Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
* (cqlsh) tab-completion for triggers (CASSANDRA-7824)
- * (cqlsh): Support for query paging (CASSANDRA-7514)
- * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
* Add syntax to remove multiple elements from a map (CASSANDRA-6599)
* Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
* Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
@@ -65,6 +65,7 @@ Merged from 1.2:
* Add null check for keys when freezing collection (CASSANDRA-7869)
* Improve stress workload realism (CASSANDRA-7519)
+
2.1.0-rc7
* Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
* Track added sstable size correctly (CASSANDRA-7239)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5d1528e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5d1528e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5d1528e
Branch: refs/heads/trunk
Commit: e5d1528e54e122e9759d4b96e3d95db8a88a95de
Parents: 796ddbc f168fda
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Sep 12 23:02:54 2014 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Sep 12 23:03:25 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5d1528e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5c6bace,7030570..a05b91b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,3 +1,24 @@@
+3.0
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
++
2.1.1
* Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
* (cqlsh) tab-completion for triggers (CASSANDRA-7824)