cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 13 Dec 2012 20:03:11 GMT
Updated Branches:
  refs/heads/trunk 803bbeb0d -> ccbd1d528


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: ccbd1d5286b8b185765d03320032b97c2e81e41d
Parents: 803bbeb 8e2f380
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Dec 13 23:02:46 2012 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Dec 13 23:02:46 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/cql/CFPropDefs.java  |   25 ++++------
 .../cassandra/cql/CreateColumnFamilyStatement.java |    3 +
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |    8 +---
 .../statements/CreateColumnFamilyStatement.java    |   37 +++++++++------
 5 files changed, 36 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbd1d52/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbd1d52/src/java/org/apache/cassandra/cql/CFPropDefs.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbd1d52/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbd1d52/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------


Mime
View raw message