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 2014/09/04 21:06:05 UTC

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

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

Branch: refs/heads/trunk
Commit: befd0b900c2cf894191fe5913aab6603a6b80f4f
Parents: 9b98fec 7650821
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Sep 4 15:05:52 2014 -0400
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Sep 4 15:05:52 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/config/CFMetaData.java | 21 ++++++++++++--------
 .../cql3/statements/CreateTableStatement.java   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/befd0b90/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/befd0b90/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------