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/c1a248a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1a248a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1a248a4 Branch: refs/heads/trunk Commit: c1a248a43f80f819e3a624067ac672378b86cac1 Parents: 48563e0 8df6c93 Author: Tyler Hobbs <[email protected]> Authored: Wed Feb 18 11:32:04 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Wed Feb 18 11:32:04 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/db/ColumnFamily.java | 7 ++++++- .../apache/cassandra/service/pager/AbstractQueryPager.java | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1a248a4/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1a248a4/src/java/org/apache/cassandra/db/ColumnFamily.java ----------------------------------------------------------------------
