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/f21a7ac8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f21a7ac8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f21a7ac8 Branch: refs/heads/trunk Commit: f21a7ac85b622eb6b0b4d5d474cc66166f5034c2 Parents: cc3bd8b 8a3fc02 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 5 10:38:18 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 5 10:38:18 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/UserTypes.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f21a7ac8/CHANGES.txt ----------------------------------------------------------------------
