cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Fri, 20 Nov 2015 14:21:26 GMT
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/f3fcdd7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3fcdd7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3fcdd7c

Branch: refs/heads/cassandra-3.1
Commit: f3fcdd7cba1d78093e887bae4dff28ed79497391
Parents: 4b364ec fee9791
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 20 15:21:16 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 20 15:21:16 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java     | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3fcdd7c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 87e0dd4,e6f5406..6c879a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
   * Correctly preserve deletion info on updated rows when notifying indexers
     of single-row deletions (CASSANDRA-10694)
   * Notify indexers of partition delete during cleanup (CASSANDRA-10685)


Mime
View raw message