You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/04 16:49:23 UTC
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d86b7e3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d86b7e3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d86b7e3f
Branch: refs/heads/trunk
Commit: d86b7e3ff446eaf1722e1f7f98218c98c6df0b76
Parents: 2bbabe1 424fb48
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 4 09:49:08 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 4 09:49:08 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 7 +++
.../apache/cassandra/cql3/QueryProcessor.java | 49 +++++++++++++++-----
src/java/org/apache/cassandra/db/Memtable.java | 6 +--
3 files changed, 47 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d86b7e3f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d86b7e3f/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d86b7e3f/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------