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 2015/07/29 23:11:58 UTC
[1/2] cassandra git commit: Fix CHANGES.txt
Repository: cassandra
Updated Branches:
refs/heads/trunk b93f05d7d -> 4635f2f95
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/2da01692
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2da01692
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2da01692
Branch: refs/heads/trunk
Commit: 2da016921d0a3a1bf9e7744bd0f5772b931ced07
Parents: 33e3af5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 30 00:11:28 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 30 00:11:28 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2da01692/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b079d4..50ac561 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,8 +10,10 @@ Merged from 2.0:
* Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
* Don't track hotness when opening from snapshot for validation (CASSANDRA-9382)
+
2.2.0
- * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
+ * Allow the selection of columns together with aggregates (CASSANDRA-9767)
+ * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
* Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
* sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4635f2f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4635f2f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4635f2f9
Branch: refs/heads/trunk
Commit: 4635f2f95ff509bc07b65ad899a3fd9190cb9fc4
Parents: b93f05d 2da0169
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 30 00:12:02 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 30 00:12:02 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4635f2f9/CHANGES.txt
----------------------------------------------------------------------