cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Fri, 30 Sep 2016 14:58:41 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 8d4478ba282c52b64ff1b925884582f394490cc6
Parents: 56e0177 cf5cd15
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Sep 30 09:58:03 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Sep 30 09:58:03 2016 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java     | 2 --
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java   | 4 +++-
 .../org/apache/cassandra/test/microbench/MutationBench.java      | 3 +++
 .../org/apache/cassandra/config/DatabaseDescriptorRefTest.java   | 1 +
 .../org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java  | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



Mime
View raw message