PIG-4331: update README, '-x' option in usage to include tez
git-svn-id: https://svn.apache.org/repos/asf/pig/branches/branch-0.14@1676645 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 8c1df5c..07fbb24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,8 @@
BUG FIXES
+PIG-4331: update README, '-x' option in usage to include tez (thejas via daijy)
+
PIG-4409: fs.defaultFS is overwritten in JobConf by replicated join at runtime (cheolsoo)
PIG-4404: LOAD with HBaseStorage on secure cluster is broken in Tez (rohini)
diff --git a/README.txt b/README.txt
index 3d2e2ef..4be5aed 100644
--- a/README.txt
+++ b/README.txt
@@ -7,10 +7,10 @@
join, filter, project; (2) functional-programming style operators such as map,
reduce.
-Pig compiles these dataflow programs into (sequences of) map-reduce jobs and
-executes them using Hadoop. It is also possible to execute Pig Latin programs
-in a "local" mode (without Hadoop cluster), in which case all processing takes
-place in a single local JVM.
+Pig compiles these dataflow programs into (sequences of) map-reduce or Apache Tez
+jobs and executes them using Hadoop. It is also possible to execute Pig Latin
+programs in a "local" mode (without Hadoop cluster), in which case all
+processing takes place in a single local JVM.
General Info
===============
diff --git a/src/org/apache/pig/Main.java b/src/org/apache/pig/Main.java
index f5cf5e5..29b3732 100644
--- a/src/org/apache/pig/Main.java
+++ b/src/org/apache/pig/Main.java
@@ -899,7 +899,7 @@
System.out.println(" All optimizations listed here are enabled by default. Optimization values are case insensitive.");
System.out.println(" -v, -verbose - Print all error messages to screen");
System.out.println(" -w, -warning - Turn warning logging on; also turns warning aggregation off");
- System.out.println(" -x, -exectype - Set execution mode: local|mapreduce, default is mapreduce.");
+ System.out.println(" -x, -exectype - Set execution mode: local|mapreduce|tez, default is mapreduce.");
System.out.println(" -F, -stop_on_failure - Aborts execution on the first failed job; default is off");
System.out.println(" -M, -no_multiquery - Turn multiquery optimization off; default is on");
System.out.println(" -N, -no_fetch - Turn fetch optimization off; default is on");
@@ -940,7 +940,7 @@
System.out.println(" If the in-map partial aggregation does not reduce the output num records");
System.out.println(" by this factor, it gets disabled.");
System.out.println(" Miscellaneous:");
- System.out.println(" exectype=mapreduce|local; default is mapreduce. This property is the same as -x switch");
+ System.out.println(" exectype=mapreduce|tez|local; default is mapreduce. This property is the same as -x switch");
System.out.println(" pig.additional.jars.uris=<comma seperated list of jars>. Used in place of register command.");
System.out.println(" udf.import.list=<comma seperated list of imports>. Used to avoid package names in UDF.");
System.out.println(" stop.on.failure=true|false; default is false. Set to true to terminate on the first error.");
