Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558a9e57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558a9e57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558a9e57 Branch: refs/heads/trunk Commit: 558a9e57bb2f443b69ef1acb31fd90aa8b373e5d Parents: 6990f95 538039a Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Oct 7 14:23:59 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Oct 7 14:23:59 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------