cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 14 Oct 2015 15:05:15 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42f7611d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42f7611d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42f7611d

Branch: refs/heads/trunk
Commit: 42f7611d8b25bff6d1bdcefc6b66eae4c575cb54
Parents: aa0bc75 f21c888
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Oct 14 16:05:02 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 14 16:05:02 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        | 20 ++++++++++++++++++++
 conf/cassandra-rackdc.properties                |  4 ++--
 conf/cassandra.yaml                             |  3 +++
 .../org/apache/cassandra/db/SystemKeyspace.java | 14 ++++++++++++++
 .../cassandra/service/CassandraDaemon.java      | 13 +++++++++++++
 6 files changed, 53 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42f7611d/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/42f7611d/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


Mime
View raw message