Updated Branches: refs/heads/trunk cedf6655c -> f02ee5412
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/f02ee541 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f02ee541 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f02ee541 Branch: refs/heads/trunk Commit: f02ee541248450090e02ec0da694f53c30be983d Parents: cedf665 791affd Author: Aleksey Yeschenko <[email protected]> Authored: Mon Nov 19 21:49:38 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Nov 19 21:49:38 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/native_protocol.spec | 4 + .../org/apache/cassandra/hadoop/ConfigHelper.java | 22 ++++ .../cassandra/hadoop/pig/CassandraStorage.java | 83 ++++++++++---- 4 files changed, 86 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f02ee541/CHANGES.txt ----------------------------------------------------------------------
