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/11/10 17:33:21 UTC
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11b073e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11b073e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11b073e6
Branch: refs/heads/cassandra-3.1
Commit: 11b073e6313e5284d69b3037d3f1e4bd5de1e4ba
Parents: ffe48ec d00fcbc
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Nov 10 16:33:03 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Nov 10 16:33:03 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11b073e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e0c4e2b,ef21f9f..b6ab144
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,8 @@@
-3.0.1
+3.1
+Merged from 3.0:
* Updated trigger example (CASSANDRA-10257)
Merged from 2.2:
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
Merged from 2.1:
* Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)