You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/03/26 16:40:47 UTC

[06/12] git commit: Merge branch 'cassandra-2.1' into trunk

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/cf52eae5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf52eae5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf52eae5

Branch: refs/heads/trunk
Commit: cf52eae55b33906b4548246978759ad3dac5097f
Parents: a0817d5 a06adb6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Mar 26 10:31:13 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Mar 26 10:31:13 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../hadoop/AbstractColumnFamilyInputFormat.java | 22 +++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf52eae5/CHANGES.txt
----------------------------------------------------------------------