You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/14 00:55:54 UTC
[4/5] git commit: Merge branch 'cassandra-2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
Merge branch 'cassandra-2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7c65412
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7c65412
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7c65412
Branch: refs/heads/cassandra-2.0
Commit: a7c6541220f6e3673075284bd5e398caa9641a54
Parents: c9a906c 53b2d9d
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:53:17 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:53:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
NEWS.txt | 3 +-
.../org/apache/cassandra/config/CFMetaData.java | 10 ++++--
.../apache/cassandra/db/ColumnFamilyStore.java | 8 ++---
.../AbstractSimplePerColumnSecondaryIndex.java | 19 ------------
.../apache/cassandra/utils/StatusLogger.java | 2 +-
.../org/apache/cassandra/stress/Session.java | 32 ++++++++++++++++++--
7 files changed, 44 insertions(+), 32 deletions(-)
----------------------------------------------------------------------