cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Date Mon, 09 Nov 2015 16:21:20 GMT
Merge branch 'cassandra-3.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/27f47b74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27f47b74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27f47b74

Branch: refs/heads/trunk
Commit: 27f47b74a0efc285a8145b5689223051f87ef8ca
Parents: 1b39c9c fa741a5
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Nov 9 16:21:10 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Nov 9 16:21:10 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27f47b74/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ed825ac,e045905..7efdf5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,4 +1,10 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
- 3.0.1
+ 3.1
  Merged from 2.1:
   * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
  


Mime
View raw message