You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/12/03 13:01:33 UTC

[10/10] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

Merge branch 'cassandra-3.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0cb117cd303bbbe0b0c5dd3dc7a2d340ae3a5a14
Parents: 47e133c ebb1f8d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu Dec 3 11:58:11 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Thu Dec 3 11:58:11 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/Schema.java     | 41 +++++++++-----------
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +-
 src/java/org/apache/cassandra/db/Keyspace.java  | 14 +++----
 .../cassandra/service/StorageService.java       | 19 +++------
 5 files changed, 32 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


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

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