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/3a7242ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a7242ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a7242ec Branch: refs/heads/trunk Commit: 3a7242eca51e703c33ed8a4ca7d61a66018f7a81 Parents: 9c9fa14 f9af6ab Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jul 22 01:46:32 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jul 22 01:46:32 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/transport/DataType.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a7242ec/CHANGES.txt ----------------------------------------------------------------------
