You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/06/03 14:10:20 UTC
[5/9] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2215961
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2215961
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2215961
Branch: refs/heads/trunk
Commit: b221596106c8cb1e57a3f488ed3ce01f753726ac
Parents: e8fd1b1 c1c7855
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jun 3 13:04:08 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jun 3 13:04:08 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 32 +++++++++++---------
2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2215961/CHANGES.txt
----------------------------------------------------------------------