Updated Branches: refs/heads/trunk 38a1e7e92 -> 1e7100148
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/1e710014 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e710014 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e710014 Branch: refs/heads/trunk Commit: 1e71001485acd87646e74814c1afc3ea67a61e21 Parents: 38a1e7e f4700ed Author: Sylvain Lebresne <[email protected]> Authored: Thu Dec 20 16:13:13 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Dec 20 16:13:13 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ src/java/org/apache/cassandra/cql3/ParsedType.java | 22 +++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e710014/CHANGES.txt ----------------------------------------------------------------------
