Merge branch 'cassandra-2.2' into cassandra-3.0

NEWS.txt

@@ -119,6 +119,11 @@ Upgrading
 2.2.4
 =====
 
+Deprecation
+-----------
+    - Pig support has been deprecated, and will be removed in 3.0.
+      Please see CASSANDRA-10542 for more details.
+
 Operations
 ----------
     - Switching racks is no longer an allowed operation on a node which has

src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java

@@ -61,7 +61,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
-
+@Deprecated
 public class CqlNativeStorage extends LoadFunc implements StoreFuncInterface, LoadMetadata
 {
     protected String DEFAULT_INPUT_FORMAT;

src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java

@@ -16,6 +16,7 @@ import org.apache.pig.data.DataByteArray;
 import org.apache.pig.data.DataType;
 import org.apache.pig.data.Tuple;
 
+@Deprecated
 public class StorageHelper
 {
     // system environment variables that can be set to configure connection info: