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/11/13 09:05:05 UTC

[1/2] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

Updated Branches:
  refs/heads/cassandra-1.2 489355d36 -> 30c5b8168


Merge branch 'cassandra-1.2.0' into cassandra-1.2


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

Branch: refs/heads/cassandra-1.2
Commit: 30c5b81683d3ec57b0b87290b396f66b6215c514
Parents: 489355d 01c9e10
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 13 09:04:48 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 13 09:04:48 2012 +0100

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