cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 10 Aug 2015 07:34:37 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 2dd8101ae0b6c51600f00929c2f15beea94463b7
Parents: 9c3b967 76e8eb8
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Aug 10 09:27:22 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Aug 10 09:27:22 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                                |  2 +-
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++------
 .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 12 ++++++------
 .../cassandra/db/compaction/CompactionsCQLTest.java     | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd8101a/NEWS.txt
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd8101a/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
----------------------------------------------------------------------


Mime
View raw message