You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2010/03/05 02:34:16 UTC

svn commit: r919264 - in /hadoop/pig/trunk: CHANGES.txt build.xml conf/pig.properties

Author: gates
Date: Fri Mar  5 01:34:16 2010
New Revision: 919264

URL: http://svn.apache.org/viewvc?rev=919264&view=rev
Log:
PIG-1053: Put pig.properties back into release distribution. 

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/build.xml
    hadoop/pig/trunk/conf/pig.properties

Modified: hadoop/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=919264&r1=919263&r2=919264&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Mar  5 01:34:16 2010
@@ -143,6 +143,8 @@
 
 BUG FIXES
 
+PIG-1053: Put pig.properties back into release distribution (gates).
+
 PIG-1273: Skewed join throws error (rding)
 
 PIG-1267: Problems with partition filter optimizer (rding)

Modified: hadoop/pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=919264&r1=919263&r2=919264&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Fri Mar  5 01:34:16 2010
@@ -569,6 +569,7 @@
     <target name="package" depends="docs, api-report" description="Create a Pig release">
         <mkdir dir="${dist.dir}" />
         <mkdir dir="${dist.dir}/lib" />
+        <mkdir dir="${dist.dir}/conf" />
         <mkdir dir="${dist.dir}/scripts" />
         <mkdir dir="${dist.dir}/docs" />
         <mkdir dir="${dist.dir}/docs/api" />
@@ -596,6 +597,8 @@
             <fileset dir="${build.docs}" />
         </copy>
 
+		<copy todir="${dist.dir}/conf" file="conf/pig.properties"/>
+
         <copy todir="${dist.dir}/src" includeEmptyDirs="true">
             <fileset dir="${src.dir}" />
         </copy>

Modified: hadoop/pig/trunk/conf/pig.properties
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/conf/pig.properties?rev=919264&r1=919263&r2=919264&view=diff
==============================================================================
--- hadoop/pig/trunk/conf/pig.properties (original)
+++ hadoop/pig/trunk/conf/pig.properties Fri Mar  5 01:34:16 2010
@@ -23,7 +23,7 @@
 verbose=false
 
 #exectype local|mapreduce, mapreduce is default
-#exectype=mapreduce
+exectype=mapreduce
 # hod realted properties
 #ssh.gateway
 #hod.expect.root
@@ -32,31 +32,11 @@
 #hod.config.dir
 #hod.param
 
+#pig.logfile=
+
 
 #Do not spill temp files smaller than this size (bytes)
 pig.spill.size.threshold=5000000
 #EXPERIMENT: Activate garbage collection when spilling a file bigger than this size (bytes)
 #This should help reduce the number of files being spilled.
 pig.spill.gc.activation.size=40000000
-
-
-######################
-# Everything below this line is Yahoo specific.  Note that I've made
-# (almost) no changes to the lines above to make merging in from Apache
-# easier.  Any values I don't want from above I override below.
-#
-# This file is configured for use with HOD on the production clusters.  If you
-# want to run pig with a static cluster you will need to remove everything
-# below this line and set the cluster value (above) to the
-# hostname and port of your job tracker.
-
-exectype=mapreduce
-
-hod.config.dir=/export/crawlspace/kryptonite/hod/current/conf
-hod.server=local
-
-cluster.domain=inktomisearch.com
-
-log.file=
-
-yinst.cluster=kryptonite