cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Sat, 12 Oct 2013 16:50:54 GMT
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5b6a33f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5b6a33f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5b6a33f

Branch: refs/heads/trunk
Commit: c5b6a33fff3ff9ec29bc576a63c3fd9f01768288
Parents: b89cce9 3e7ebf8
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat Oct 12 11:49:13 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat Oct 12 11:49:13 2013 -0500

----------------------------------------------------------------------
 .../hadoop/pig/AbstractCassandraStorage.java    | 50 +++++++-------------
 .../cassandra/hadoop/pig/CassandraStorage.java  | 15 ++----
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  1 -
 3 files changed, 19 insertions(+), 47 deletions(-)
----------------------------------------------------------------------



Mime
View raw message