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 2012/07/02 20:36:08 UTC

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

Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: ed8e35369b4d913af9c95d45771bea624be6134e
Parents: 583cc97 8674784
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jul 2 13:31:07 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jul 2 13:31:07 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed8e3536/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------