cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Fri, 01 Aug 2014 15:20:35 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 5f0413bef546b3489525709cececd1947be34b67
Parents: 169b1cf 18ce8c7
Author: Jake Luciani <jake@apache.org>
Authored: Fri Aug 1 11:17:23 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Fri Aug 1 11:17:23 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/config/DatabaseDescriptor.java    |  5 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 +++-----------
 test/conf/cassandra.yaml                        |  1 +
 .../org/apache/cassandra/db/CommitLogTest.java  | 32 ++++++++++++++++++++
 5 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f0413be/test/conf/cassandra.yaml
----------------------------------------------------------------------


Mime
View raw message