You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2016/07/16 20:54:01 UTC

svn commit: r1752998 - in /pig/trunk: CHANGES.txt src/docs/src/documentation/content/xdocs/cont.xml

Author: daijy
Date: Sat Jul 16 20:54:01 2016
New Revision: 1752998

URL: http://svn.apache.org/viewvc?rev=1752998&view=rev
Log:
PIG-4945: Update document for conflicting macro params

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/docs/src/documentation/content/xdocs/cont.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1752998&r1=1752997&r2=1752998&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Jul 16 20:54:01 2016
@@ -46,7 +46,21 @@ PIG-4921: Kill running jobs on Interrupt
 
 PIG-4916: Pig on Tez fail to remove temporary HDFS files in some cases (daijy)
 
-Release 0.16.0 - Unreleased
+Release 0.16.1 - Unreleased
+
+INCOMPATIBLE CHANGES
+
+IMPROVEMENTS
+
+PIG-4945: Update document for conflicting macro params (knoguchi via daijy)
+
+OPTIMIZATIONS
+
+BUG FIXES
+
+PIG-4949: Fix registering jar in S3 which was broken by PIG-4417 in Pig 0.16 (yangyishan0901m via daijy)
+
+Release 0.16.0
 
 INCOMPATIBLE CHANGES
 
@@ -161,8 +175,6 @@ PIG-4639: Add better parser for Apache H
 
 BUG FIXES
 
-PIG-4949: Fix registering jar in S3 which was broken by PIG-4417 in Pig 0.16 (yangyishan0901m via daijy)
-
 PIG-4821: Pig chararray field with special UTF-8 chars as part of tuple join key produces wrong results in Tez (rohini)
 
 PIG-4734: TOMAP schema inferring breaks some scripts in type checking for bincond (daijy)

Modified: pig/trunk/src/docs/src/documentation/content/xdocs/cont.xml
URL: http://svn.apache.org/viewvc/pig/trunk/src/docs/src/documentation/content/xdocs/cont.xml?rev=1752998&r1=1752997&r2=1752998&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/cont.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/cont.xml Sat Jul 16 20:54:01 2016
@@ -1388,7 +1388,7 @@ IMPORT 'my_macro.pig';
       </li>
    </ul>
    <p></p>
-   <p>Parameter substitution may be used inside of macros, but it is the responsibility of the user to ensure that there are no conflicts between names of parameters defined at the top level and names of arguments or return values for a macro. A simple way to ensure this is to use ALL_CAPS for top-level parameters and lower_case for macro-level parameters. See <a href="#define-macros">DEFINE (macros)</a>.</p>
+   <p>Parameter substitution may be used inside of macros. When there are conflicts between names of parameters defined at the top level and names of arguments or return values for a given macro, then ones inside the macro are used. See <a href="#define-macros">DEFINE (macros)</a>.</p>
    </section>
    
    <section>