cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Tue, 26 Jul 2016 13:00:05 GMT
Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: d8ca69c01dd32489e661cfb4ea19d47261d8ac87
Parents: 0f64618 79fbdbe
Author: Carl Yeksigian <carl@apache.org>
Authored: Tue Jul 26 08:59:12 2016 -0400
Committer: Carl Yeksigian <carl@apache.org>
Committed: Tue Jul 26 08:59:12 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 src/java/org/apache/cassandra/config/Config.java        |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java |  5 +++++
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++++++++
 .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 10 ++++++++++
 src/java/org/apache/cassandra/db/Directories.java       |  3 ++-
 .../apache/cassandra/db/compaction/CompactionTask.java  |  6 ++++++
 7 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------


Mime
View raw message