You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/08/22 02:53:11 UTC
[4/5] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/751b1e10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/751b1e10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/751b1e10
Branch: refs/heads/trunk
Commit: 751b1e1011e96ba38286b317caf0c793b95a14fe
Parents: 99e3c94 8079401
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 20:50:13 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 20:50:13 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 14 ++---
bin/cqlsh | 4 +-
doc/cql3/CQL.textile | 9 ++-
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 43 +++++++------
.../apache/cassandra/cql3/QueryProcessor.java | 11 ++--
.../cql3/statements/ModificationStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 63 ++++++++++++++++----
.../compaction/LeveledCompactionStrategy.java | 2 +-
.../db/compaction/LeveledManifest.java | 12 ++--
.../cassandra/utils/obs/OffHeapBitSet.java | 4 +-
11 files changed, 104 insertions(+), 62 deletions(-)
----------------------------------------------------------------------