svn commit: r1596873 - in /hadoop/common/branches/fs-encryption/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/

Author: umamahesh Date: Thu May 22 13:54:53 2014 New Revision: 1596873 URL: http://svn.apache.org/r1596873 Log: Merge from trunk to fs-encryption branch Added: hadoop/common/branches/fs-encryption/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/

svn commit: r1596931 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Author: jing9 Date: Thu May 22 18:17:11 2014 New Revision: 1596931 URL: http://svn.apache.org/r1596931 Log: MAPREDUCE-5899. Support incremental data copy in DistCp. Contributed by Jing Zhao. Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/trunk/had

svn commit: r1596937 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Author: jing9 Date: Thu May 22 18:50:20 2014 New Revision: 1596937 URL: http://svn.apache.org/r1596937 Log: MAPREDUCE-5899. Merge change r1596931 from trunk. Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-mapred

svn commit: r1596967 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ CHANGES.txt bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xm

Author: wang Date: Thu May 22 20:45:13 2014 New Revision: 1596967 URL: http://svn.apache.org/r1596967 Log: HDFS-6435. Merged from r1596966. Add support for specifying a static uid/gid mapping for the NFS gateway. (atm via wang) Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-proje