Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/278f2106 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/278f2106 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/278f2106 Branch: refs/heads/trunk Commit: 278f21062d760aae708b6727058607b555f16291 Parents: 8ccd241 a7b32de Author: Jonathan Ellis <[email protected]> Authored: Wed Sep 18 09:45:52 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Sep 18 09:45:52 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/cql3/CQL3Type.java | 2 +- .../org/apache/cassandra/db/SystemKeyspace.java | 27 ++++++++++++++++++++ .../service/pager/AbstractQueryPager.java | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/278f2106/CHANGES.txt ----------------------------------------------------------------------
