svn commit: r1568210 [2/2] - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/n

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/

svn commit: r1568207 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod

Author: jing9 Date: Fri Feb 14 07:38:34 2014 New Revision: 1568207 URL: http://svn.apache.org/r1568207 Log: HDFS-5647. Merge change r1548796 from trunk. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-proje

svn commit: r1568206 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod

Author: jing9 Date: Fri Feb 14 07:35:44 2014 New Revision: 1568206 URL: http://svn.apache.org/r1568206 Log: HDFS-5554. Merge change r1548796 from trunk. Added: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWi

svn commit: r1568204 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod

Author: jing9 Date: Fri Feb 14 07:18:58 2014 New Revision: 1568204 URL: http://svn.apache.org/r1568204 Log: HDFS-5537. Merge change r1546184 from trunk. Added: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDi

svn commit: r1568203 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod

Author: jing9 Date: Fri Feb 14 07:13:02 2014 New Revision: 1568203 URL: http://svn.apache.org/r1568203 Log: HDFS-5286. Merge change r1545768 from trunk. Added: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/DirectoryWithQu

svn commit: r1568201 [2/2] - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ src/main/java/org/apache/hadoop/hdfs/s

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop

svn commit: r1568186 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod

Author: jing9 Date: Fri Feb 14 01:40:08 2014 New Revision: 1568186 URL: http://svn.apache.org/r1568186 Log: HDFS-5531. Merge change r1544018 from trunk. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-proje

svn commit: r1568169 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/webapps/hdfs/dfshealth.html src/main/webapps/hdfs/dfshealth.js src/main/webapps/hdfs/ex

Author: brandonli Date: Thu Feb 13 23:57:19 2014 New Revision: 1568169 URL: http://svn.apache.org/r1568169 Log: HDFS-5901. Merging change r1568168 from trunk Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-

svn commit: r1568168 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/webapps/hdfs/dfshealth.html src/main/webapps/hdfs/dfshealth.js src/main/webapps/hdfs/explorer.html

Author: brandonli Date: Thu Feb 13 23:53:14 2014 New Revision: 1568168 URL: http://svn.apache.org/r1568168 Log: HDFS-5901 Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html

svn commit: r1568167 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/webapps/hdfs/dfshealth.js src/main/webapps/hdfs/explorer.js

Author: brandonli Date: Thu Feb 13 23:49:14 2014 New Revision: 1568167 URL: http://svn.apache.org/r1568167 Log: HDFS-5934. Merging change r1568165 from trunk Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-

svn commit: r1568165 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/webapps/hdfs/dfshealth.js src/main/webapps/hdfs/explorer.js

Author: brandonli Date: Thu Feb 13 23:47:11 2014 New Revision: 1568165 URL: http://svn.apache.org/r1568165 Log: HDFS-5934. New Namenode UI back button doesn't work as expected. Contributed by Travis Thompson Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoo

svn commit: r1568119 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project: hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java hadoop-hdfs/CHANGES.txt

Author: brandonli Date: Thu Feb 13 23:16:33 2014 New Revision: 1568119 URL: http://svn.apache.org/r1568119 Log: HDFS-5913. Merging change r1568076 from trunk Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgram

svn commit: r1568076 - in /hadoop/common/trunk/hadoop-hdfs-project: hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java hadoop-hdfs/CHANGES.txt

Author: brandonli Date: Thu Feb 13 22:41:29 2014 New Revision: 1568076 URL: http://svn.apache.org/r1568076 Log: HDFS-5913. Nfs3Utils#getWccAttr() should check attr parameter against null. Contributed by Brandon Li Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/ja

svn commit: r1568029 - in /hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/ src/main/native/ src/main/resources/ src/main/webapps/datanode/ src/main/webapps/hdfs/ sr

Author: cnauroth Date: Thu Feb 13 20:19:53 2014 New Revision: 1568029 URL: http://svn.apache.org/r1568029 Log: Merge trunk to HDFS-4685. Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/ (props changed) hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hado

svn commit: r1568026 - /hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt

Author: cnauroth Date: Thu Feb 13 20:17:00 2014 New Revision: 1568026 URL: http://svn.apache.org/r1568026 Log: HADOOP-10344. Fix TestAclCommands after merging HADOOP-10338 patch. Contributed by Chris Nauroth. Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES

svn commit: r1568021 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/resources/hdfs-default.xml

Author: cnauroth Date: Thu Feb 13 19:55:47 2014 New Revision: 1568021 URL: http://svn.apache.org/r1568021 Log: HDFS-5941. Merging change r1568019 from trunk to branch-2. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/

svn commit: r1568019 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/resources/hdfs-default.xml

Author: cnauroth Date: Thu Feb 13 19:53:20 2014 New Revision: 1568019 URL: http://svn.apache.org/r1568019 Log: HDFS-5941. add dfs.namenode.secondary.https-address and dfs.namenode.secondary.https-address in hdfs-default.xml. Contributed by Haohui Mai. Modified: hadoop/common/trunk/hadoop-hd

svn commit: r1567992 - /hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt

Author: cnauroth Date: Thu Feb 13 18:12:40 2014 New Revision: 1567992 URL: http://svn.apache.org/r1567992 Log: HDFS-5937. Update CHANGES-HDFS-4685.txt. Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt Modified: hadoop/common/branches/HDFS-468

svn commit: r1567986 - in /hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src: main/java/org/apache/hadoop/hdfs/server/namenode/ test/java/org/apache/hadoop/hdfs/server/namenode/ tes

Author: cnauroth Date: Thu Feb 13 17:52:26 2014 New Revision: 1567986 URL: http://svn.apache.org/r1567986 Log: HDFS-5937. Fix TestOfflineEditsViewer on HDFS-4685 branch. Contributed by Chris Nauroth. Modified: hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/main/java/or

svn commit: r1567947 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java

Author: kihwal Date: Thu Feb 13 15:07:34 2014 New Revision: 1567947 URL: http://svn.apache.org/r1567947 Log: svn merge -c 1567946 merging from trunk to branch-2 to fix:HDFS-5904. TestFileStatus fails intermittently. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CH

svn commit: r1567946 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java

Author: kihwal Date: Thu Feb 13 15:06:17 2014 New Revision: 1567946 URL: http://svn.apache.org/r1567946 Log: HDFS-5904. TestFileStatus fails intermittently. Contributed by Mit Desai. Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs

svn commit: r1567874 - in /hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/ src/main/java/org/apache/hadoop/hdfs/tools/ src/test/java/org/apache/hadoop/hdfs/server/n

Author: szetszwo Date: Thu Feb 13 09:53:52 2014 New Revision: 1567874 URL: http://svn.apache.org/r1567874 Log: Merge r1555021 through r1566358 from trunk. Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/ (props changed) hadoop/common/branches/HDFS-5535/hadoop

svn commit: r1567861 - in /hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/nameno

Author: szetszwo Date: Thu Feb 13 08:04:58 2014 New Revision: 1567861 URL: http://svn.apache.org/r1567861 Log: HDFS-5889. When starting rolling upgrade, create a fs image for rollback so that the standby namenode can create checkpoints during upgrade. Contributed by szetszwo & jing9 Modified: