cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Fri, 25 Oct 2013 16:13:21 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

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


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

Branch: refs/heads/trunk
Commit: 2f248b3f905380347cf45652462d1fc5989ee8d0
Parents: 9385cfd cb506b7
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Oct 25 11:11:31 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Oct 25 11:11:31 2013 -0500

----------------------------------------------------------------------
 .../cassandra/hadoop/pig/AbstractCassandraStorage.java       | 4 +++-
 .../org/apache/cassandra/hadoop/pig/CassandraStorage.java    | 6 +++++-
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java     | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------


Mime
View raw message