You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by al...@apache.org on 2013/12/20 18:17:32 UTC

[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c17189b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c17189b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c17189b

Branch: refs/heads/cassandra-2.0
Commit: 9c17189b78f75b33d8c66f236da2d45840c2d30f
Parents: b1435ff 9244923
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 20 20:16:08 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 20 20:16:08 2013 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------