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

Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/07/04 13:24:36 UTC

[2/4] git commit: Merge branch 'cassandra-1.1' into trunk

Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java


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

Branch: refs/heads/trunk
Commit: a0c9a01e8b022f69bce7568a01e48727b8f7dfcd
Parents: bbfab66 b8ca84c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 4 12:06:43 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 4 12:06:43 2012 +0200

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

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