cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 23 Apr 2014 12:20:04 GMT
Merge branch 'cassandra-2.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/c7d604bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7d604bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7d604bd

Branch: refs/heads/trunk
Commit: c7d604bdfcc0724c90448783dced932d7276407b
Parents: 9029257 13910dc
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Apr 23 14:17:03 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Apr 23 14:17:03 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   3 +-
 .../org/apache/cassandra/config/Schema.java     |  11 ++
 .../cassandra/db/CollationController.java       |   6 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  | 117 ++++++++-----------
 .../cassandra/io/sstable/SSTableReader.java     |  79 +++++++++----
 .../cassandra/streaming/StreamSession.java      |   2 +-
 6 files changed, 119 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message