hadoop-hdfs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Eli Collins <...@cloudera.com>
Subject Re: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/ha
Date Thu, 22 Mar 2012 23:12:28 GMT
Works for me.   How about we check a merge script into the repo so we
all do merges the same way?

On Thu, Mar 22, 2012 at 3:49 PM, Todd Lipcon <todd@cloudera.com> wrote:
> On a related subject, can I make a request that, when we merge issues,
> we also include the original commit message?
> ie instead of just: "Merging HDFS-12345 from trunk", we say something
> like "Merge HDFS-12345 from trunk: Fix the blah bug." (or just re-use
> the original commit)?
>
> I find it really difficult to follow the log on branch-23 when many of
> the commits just reference JIRA numbers with no further explanation.
>
> -Todd
>
> On Thu, Mar 22, 2012 at 3:46 PM, Tsz Wo Sze <szetszwo@yahoo.com> wrote:
>> Hi Eli,
>>
>> For merging a HDFS issue, please don't merge COMMON and MAPREDUCE.  It generates
useless merge info and emails.  Does it make sense?
>>
>> Regards,
>>
>> Nicholas
>>
>>
>>
>> ________________________________
>>  From: "eli@apache.org" <eli@apache.org>
>> To: mapreduce-commits@hadoop.apache.org
>> Sent: Thursday, March 22, 2012 2:13 PM
>> Subject: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project:
./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/
hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/hadoop-y...
>>
>> Author: eli
>> Date: Thu Mar 22 21:13:18 2012
>> New Revision: 1304067
>>
>> URL: http://svn.apache.org/viewvc?rev=1304067&view=rev
>> Log:
>> HDFS-3044. svn merge -c 1304063 from trunk
>>
>> Modified:
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt   (props
changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/   (props
changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/   (props
changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++/   (props
changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/   (props
changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ 
 (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/ 
 (props changed)
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/c++:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/examples:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/java:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1304063
>>
>> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/
>> ------------------------------------------------------------------------------
>>   Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:r1304063
>
>
>
> --
> Todd Lipcon
> Software Engineer, Cloudera

Mime
View raw message