Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d03e28b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d03e28b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d03e28b Branch: refs/heads/trunk Commit: 7d03e28b5cd08fb35482f42322556084441be41d Parents: 08eb9c8 a7b32de Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Sep 18 14:30:13 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Sep 18 14:30:13 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +- .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d03e28b/CHANGES.txt ----------------------------------------------------------------------
