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 2012/12/28 16:33:02 UTC

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

Updated Branches:
  refs/heads/cassandra-1.2 ac9f4786e -> d6a3845a2


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

Branch: refs/heads/cassandra-1.2
Commit: d6a3845a212422c26192a61fe42a3b7e21d34e10
Parents: ac9f478 1772b1c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 28 18:32:36 2012 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 28 18:32:36 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |   22 ++-------------
 2 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


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