Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a360a06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a360a06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a360a06 Branch: refs/heads/trunk Commit: 6a360a06fe2d49ea165768f9406ab277de88a968 Parents: 0eb048f a2436f0 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jun 6 16:47:08 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jun 6 16:47:08 2013 -0500 ---------------------------------------------------------------------- .../hadoop/cql3/ColumnFamilyRecordWriter.java | 43 +++++++-------- 1 files changed, 20 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
