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/01/11 20:52:47 UTC

[1/3] git commit: Merge branch 'cassandra-1.0' into trunk

Updated Branches:
  refs/heads/cassandra-1.0 185eca5d1 -> a95eafdcc
  refs/heads/trunk a4fc7e270 -> bfac658f0


Merge branch 'cassandra-1.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/bfac658f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfac658f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfac658f

Branch: refs/heads/trunk
Commit: bfac658f0d19068d7ef922b3c3de631846b29ece
Parents: a4fc7e2 a95eafd
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jan 11 13:52:35 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jan 11 13:52:35 2012 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/SystemTable.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------