You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/08/11 23:37:33 UTC

[18/50] [abbrv] 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/94cfec89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94cfec89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94cfec89

Branch: refs/heads/cassandra-2.1
Commit: 94cfec89b8bf9401a7f4f1b49d59679e4c50f598
Parents: 774f3ac 7fc89ad
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:08:42 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:08:42 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                      |  2 ++
 .../cassandra/hadoop/cql3/CqlInputFormat.java    | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


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