Hi Andrew, For merging a change, please merge only the sub-projects involved. In particular, for merging a HDFS commit, cd hadoop-hdfs-project/hadoop-hdfs and run the merge command there. Please do not merge common/mapreduce. It generates a lot of noise; see attached message at the end.
Thanks. Tsz-Wo On Thursday, April 10, 2014 3:37 PM, "w...@apache.org" <w...@apache.org> wrote: Author: wang >Date: Thu Apr 10 22:36:36 2014 >New Revision: 1586494 > >URL: http://svn.apache.org/r1586494 >Log: >HDFS-6224. Add a unit test to TestAuditLogger for file permissions passed to >logAuditEvent. Contributed by Charles Lamb. > >Modified: > hadoop/common/branches/branch-2/hadoop-mapreduce-project/ (props changed) > hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt >(props changed) > hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/ (props >changed) > hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ (props >changed) > >hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml > (props changed) > >hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/ > (props changed) > >Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/ >------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1586490 > >Propchange: >hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt >------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1586490 > >Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/ >------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1586490 > >Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ >------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1586490 > >Propchange: >hadoop/common/branches/branch-2/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:r1586490 > >Propchange: >hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/ >------------------------------------------------------------------------------ > Merged >/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1586490 > > > > >
