hadoop git commit: HDFS-8366. Erasure Coding: Make the timeout parameter of polling blocking queue configurable in DFSStripedOutputStream. Contributed by Li Bo

2015-05-19 Thread libo
Repository: hadoop Updated Branches: refs/heads/HDFS-7285 12d030bef - 3cf3398f3 HDFS-8366. Erasure Coding: Make the timeout parameter of polling blocking queue configurable in DFSStripedOutputStream. Contributed by Li Bo Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

[1/2] hadoop git commit: HDFS-6348. SecondaryNameNode not terminating properly on runtime exceptions (Contributed by Rakesh R)

2015-05-19 Thread vinayakumarb
Repository: hadoop Updated Branches: refs/heads/branch-2 5caea4cd4 - 6dee42f6d refs/heads/trunk 0790275f0 - 93972a332 HDFS-6348. SecondaryNameNode not terminating properly on runtime exceptions (Contributed by Rakesh R) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

[2/2] hadoop git commit: HDFS-6348. SecondaryNameNode not terminating properly on runtime exceptions (Contributed by Rakesh R)

2015-05-19 Thread vinayakumarb
HDFS-6348. SecondaryNameNode not terminating properly on runtime exceptions (Contributed by Rakesh R) (cherry picked from commit 93972a332a9fc6390447fc5fc9785c98fb4c3344) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8378. Erasure Coding: Few improvements for the erasure coding worker. Contributed by Rakesh R.

2015-05-19 Thread waltersu4549
Repository: hadoop Updated Branches: refs/heads/HDFS-7285 3cf3398f3 - 3676277c1 HDFS-8378. Erasure Coding: Few improvements for the erasure coding worker. Contributed by Rakesh R. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

[2/3] hadoop git commit: HADOOP-8934. Shell command ls should include sort options (Jonathan Allen via aw) (missed file)

2015-05-19 Thread aajisaka
HADOOP-8934. Shell command ls should include sort options (Jonathan Allen via aw) (missed file) (cherry picked from commit 576459801c4e21effc4e3bca796527896b6e4f4b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/df6d242e

[1/3] hadoop git commit: HADOOP-8934. Shell command ls should include sort options (Jonathan Allen via aw)

2015-05-19 Thread aajisaka
Repository: hadoop Updated Branches: refs/heads/branch-2 6dee42f6d - fb49967e9 HADOOP-8934. Shell command ls should include sort options (Jonathan Allen via aw) (cherry picked from commit 30b797ee9df30260314eeadffc7d51492871b352) Conflicts:

hadoop git commit: HADOOP-10971. Add -C flag to make `hadoop fs -ls` print filenames only. Contributed by Kengo Seki.

2015-05-19 Thread aajisaka
Repository: hadoop Updated Branches: refs/heads/trunk 93972a332 - 3b50dcdce HADOOP-10971. Add -C flag to make `hadoop fs -ls` print filenames only. Contributed by Kengo Seki. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

[3/3] hadoop git commit: HADOOP-10971. Add -C flag to make `hadoop fs -ls` print filenames only. Contributed by Kengo Seki.

2015-05-19 Thread aajisaka
HADOOP-10971. Add -C flag to make `hadoop fs -ls` print filenames only. Contributed by Kengo Seki. (cherry picked from commit 3b50dcdce4ffe3d4e5892fca84909ff22be28739) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt Project:

hadoop git commit: HADOOP-11581. Multithreaded correctness Warnings #org.apache.hadoop.fs.shell.Ls (Brahma Reddy Battula via aw)

2015-05-19 Thread aajisaka
Repository: hadoop Updated Branches: refs/heads/branch-2 5bbf157cb - 6c4aa89e5 HADOOP-11581. Multithreaded correctness Warnings #org.apache.hadoop.fs.shell.Ls (Brahma Reddy Battula via aw) (cherry picked from commit b015fec6011586784fd6f4791a0c1c22e3902046) Conflicts:

hadoop git commit: Move HADOOP-8934 in CHANGES.txt from 3.0.0 to 2.8.0.

2015-05-19 Thread aajisaka
Repository: hadoop Updated Branches: refs/heads/trunk 3b50dcdce - f889a4927 Move HADOOP-8934 in CHANGES.txt from 3.0.0 to 2.8.0. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f889a492 Tree:

[1/2] hadoop git commit: HADOOP-11103. Clean up RemoteException (Contributed by Sean Busbey)

2015-05-19 Thread vinayakumarb
Repository: hadoop Updated Branches: refs/heads/branch-2 fb49967e9 - 5bbf157cb refs/heads/trunk f889a4927 - d4a2830b6 HADOOP-11103. Clean up RemoteException (Contributed by Sean Busbey) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

[2/2] hadoop git commit: HADOOP-11103. Clean up RemoteException (Contributed by Sean Busbey)

2015-05-19 Thread vinayakumarb
HADOOP-11103. Clean up RemoteException (Contributed by Sean Busbey) (cherry picked from commit d4a2830b63f0819979b592f4ea6ea3abd5885b71) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5bbf157c Tree:

hadoop git commit: Move HADOOP-11581 in CHANGES.txt from 3.0.0 to 2.8.0.

2015-05-19 Thread aajisaka
Repository: hadoop Updated Branches: refs/heads/trunk d4a2830b6 - eb4c9ddeb Move HADOOP-11581 in CHANGES.txt from 3.0.0 to 2.8.0. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb4c9dde Tree:

hadoop git commit: YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli.

2015-05-19 Thread ozawa
Repository: hadoop Updated Branches: refs/heads/branch-2.7 6b03ec513 - 6c7840f5b YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli. (cherry picked from commit 7401e5b5e8060b6b027d714b5ceb641fcfe5b598) Project:

hadoop git commit: YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda)

2015-05-19 Thread wangda
Repository: hadoop Updated Branches: refs/heads/trunk 12d6c5ce4 - b37da52a1 YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda)

2015-05-19 Thread wangda
Repository: hadoop Updated Branches: refs/heads/trunk b37da52a1 - 563eb1ad2 YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8428. Erasure Coding: Fix the NullPointerException when deleting file. Contributed by Yi Liu.

2015-05-19 Thread zhz
Repository: hadoop Updated Branches: refs/heads/HDFS-7285 3c36df154 - bf3c28a89 HDFS-8428. Erasure Coding: Fix the NullPointerException when deleting file. Contributed by Yi Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda)

2015-05-19 Thread wangda
Repository: hadoop Updated Branches: refs/heads/branch-2 d022c5aba - b5ba6979b YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda) (cherry picked from commit 563eb1ad2ae848a23bbbf32ebfaf107e8fa14e87) (cherry picked from commit

hadoop git commit: HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni.

2015-05-19 Thread wheat9
Repository: hadoop Updated Branches: refs/heads/branch-2 b5ba6979b - ed320da2b HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni.

2015-05-19 Thread wheat9
Repository: hadoop Updated Branches: refs/heads/trunk 7401e5b5e - ce53c8eb0 HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda)

2015-05-19 Thread wangda
Repository: hadoop Updated Branches: refs/heads/branch-2 511a503aa - 7b97f049e YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda) (cherry picked from commit b37da52a1c4fb3da2bd21bfadc5ec61c5f953a59)

hadoop git commit: YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli.

2015-05-19 Thread ozawa
Repository: hadoop Updated Branches: refs/heads/trunk 563eb1ad2 - 7401e5b5e YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli.

2015-05-19 Thread ozawa
Repository: hadoop Updated Branches: refs/heads/branch-2 7b97f049e - d022c5aba YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. Contributed by Vinod Kumar Vavilapalli. (cherry picked from commit 7401e5b5e8060b6b027d714b5ceb641fcfe5b598) Project:

hadoop git commit: HDFS-8323. Bump GenerationStamp for write faliure in DFSStripedOutputStream. Contributed by Tsz Wo Nicholas Sze.

2015-05-19 Thread jing9
Repository: hadoop Updated Branches: refs/heads/HDFS-7285 bf3c28a89 - 4dd4aa577 HDFS-8323. Bump GenerationStamp for write faliure in DFSStripedOutputStream. Contributed by Tsz Wo Nicholas Sze. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8131. Implement a space balanced block placement policy. Contributed by Liu Shaohui.

2015-05-19 Thread kihwal
Repository: hadoop Updated Branches: refs/heads/trunk eb4c9ddeb - de30d66b2 HDFS-8131. Implement a space balanced block placement policy. Contributed by Liu Shaohui. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8131. Implement a space balanced block placement policy. Contributed by Liu Shaohui. (cherry picked from commit de30d66b2673d0344346fb985e786247ca682317)

2015-05-19 Thread kihwal
Repository: hadoop Updated Branches: refs/heads/branch-2 6c4aa89e5 - 9e656bfa9 HDFS-8131. Implement a space balanced block placement policy. Contributed by Liu Shaohui. (cherry picked from commit de30d66b2673d0344346fb985e786247ca682317) Project:

hadoop git commit: YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang

2015-05-19 Thread xgong
Repository: hadoop Updated Branches: refs/heads/branch-2 9e656bfa9 - d39039d54 YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang (cherry picked from commit 5009ad4a7f712fc578b461ecec53f7f97eaaed0c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo

hadoop git commit: YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang

2015-05-19 Thread xgong
Repository: hadoop Updated Branches: refs/heads/branch-2.7 59d1b4a32 - f0399f56e YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang (cherry picked from commit 5009ad4a7f712fc578b461ecec53f7f97eaaed0c) (cherry picked from commit

hadoop git commit: YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang

2015-05-19 Thread xgong
Repository: hadoop Updated Branches: refs/heads/trunk de30d66b2 - 5009ad4a7 YARN-3601. Fix UT TestRMFailover.testRMWebAppRedirect. Contributed by Weiwei Yang Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5009ad4a

hadoop git commit: Moving MAPREDUCE-6361 to 2.7.1 CHANGES.txt

2015-05-19 Thread junping_du
Repository: hadoop Updated Branches: refs/heads/trunk 8860e352c - 8ca1dfeeb Moving MAPREDUCE-6361 to 2.7.1 CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ca1dfee Tree:

hadoop git commit: Moving MAPREDUCE-6361 to 2.7.1 CHANGES.txt

2015-05-19 Thread junping_du
Repository: hadoop Updated Branches: refs/heads/branch-2 9534e533d - dafe33efb Moving MAPREDUCE-6361 to 2.7.1 CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dafe33ef Tree:

hadoop git commit: HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh)

2015-05-19 Thread asuresh
Repository: hadoop Updated Branches: refs/heads/trunk 8ca1dfeeb - fd3cb533d HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh)

2015-05-19 Thread asuresh
Repository: hadoop Updated Branches: refs/heads/branch-2 dafe33efb - 00e2a0a49 HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh) (cherry picked from commit fd3cb533d2495ea220ab2e468835a43a784d7532) Project:

hadoop git commit: HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh)

2015-05-19 Thread asuresh
Repository: hadoop Updated Branches: refs/heads/branch-2.7 7ac66f871 - 273d2f975 HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh) (cherry picked from commit fd3cb533d2495ea220ab2e468835a43a784d7532) Project:

hadoop git commit: MAPREDUCE-6361. NPE issue in shuffle caused by concurrent issue between copySucceeded() in one thread and copyFailed() in another thread on the same host. Contributed by Junping Du.

2015-05-19 Thread junping_du
Repository: hadoop Updated Branches: refs/heads/branch-2.7 273d2f975 - 6b03ec513 MAPREDUCE-6361. NPE issue in shuffle caused by concurrent issue between copySucceeded() in one thread and copyFailed() in another thread on the same host. Contributed by Junping Du. Project:

[1/2] hadoop git commit: HADOOP-11963. Metrics documentation for FSNamesystem misspells PendingDataNodeMessageCount. Contributed by Anu Engineer.

2015-05-19 Thread cnauroth
Repository: hadoop Updated Branches: refs/heads/branch-2 00e2a0a49 - 7af9a78fe refs/heads/trunk fd3cb533d - e422e76fc HADOOP-11963. Metrics documentation for FSNamesystem misspells PendingDataNodeMessageCount. Contributed by Anu Engineer. Project:

[2/2] hadoop git commit: HADOOP-11963. Metrics documentation for FSNamesystem misspells PendingDataNodeMessageCount. Contributed by Anu Engineer.

2015-05-19 Thread cnauroth
HADOOP-11963. Metrics documentation for FSNamesystem misspells PendingDataNodeMessageCount. Contributed by Anu Engineer. (cherry picked from commit e422e76fcaaa04fc22384d978a2abae967d801b6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak)

2015-05-19 Thread raviprak
Repository: hadoop Updated Branches: refs/heads/trunk 5009ad4a7 - c97f32e7b YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak)

2015-05-19 Thread raviprak
Repository: hadoop Updated Branches: refs/heads/branch-2 d39039d54 - 084e45362 YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak) (cherry picked from commit c97f32e7b9d9e1d4c80682cc01741579166174d1)

hadoop git commit: HADOOP-12000. cannot use --java-home in test-patch (aw)

2015-05-19 Thread aw
Repository: hadoop Updated Branches: refs/heads/trunk 743896658 - 12d6c5ce4 HADOOP-12000. cannot use --java-home in test-patch (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12d6c5ce Tree:

hadoop git commit: HADOOP-12000. cannot use --java-home in test-patch (aw)

2015-05-19 Thread aw
Repository: hadoop Updated Branches: refs/heads/branch-2 adb90c7f5 - 511a503aa HADOOP-12000. cannot use --java-home in test-patch (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/511a503a Tree:

hadoop git commit: YARN-2821. Fixed a problem that DistributedShell AM may hang if restarted. Contributed by Varun Vasudev (cherry picked from commit 7438966586f1896ab3e8b067d47a4af28a894106)

2015-05-19 Thread jianhe
Repository: hadoop Updated Branches: refs/heads/branch-2 7af9a78fe - adb90c7f5 YARN-2821. Fixed a problem that DistributedShell AM may hang if restarted. Contributed by Varun Vasudev (cherry picked from commit 7438966586f1896ab3e8b067d47a4af28a894106) Project:

[2/2] hadoop git commit: HDFS-8375. Add cellSize as an XAttr to ECZone. Contributed by Vinayakumar B.

2015-05-19 Thread zhz
HDFS-8375. Add cellSize as an XAttr to ECZone. Contributed by Vinayakumar B. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c36df15 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c36df15 Diff:

[1/2] hadoop git commit: HDFS-8375. Add cellSize as an XAttr to ECZone. Contributed by Vinayakumar B.

2015-05-19 Thread zhz
Repository: hadoop Updated Branches: refs/heads/HDFS-7285 3676277c1 - 3c36df154 http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c36df15/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaWithStripedBlocks.java

hadoop git commit: YARN-2821. Fixed a problem that DistributedShell AM may hang if restarted. Contributed by Varun Vasudev

2015-05-19 Thread jianhe
Repository: hadoop Updated Branches: refs/heads/trunk e422e76fc - 743896658 YARN-2821. Fixed a problem that DistributedShell AM may hang if restarted. Contributed by Varun Vasudev Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts. (cherry picked from commit 8860e352c394372e4eb3ebdf82ea899567f34e4e)

2015-05-19 Thread kihwal
Repository: hadoop Updated Branches: refs/heads/branch-2.7 f0399f56e - 7ac66f871 HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts. (cherry picked from commit 8860e352c394372e4eb3ebdf82ea899567f34e4e) Conflicts:

hadoop git commit: HADOOP-11970. Replace uses of ThreadLocalRandom with JDK7 ThreadLocalRandom (Sean Busbey via Colin P. McCabe)

2015-05-19 Thread cmccabe
Repository: hadoop Updated Branches: refs/heads/trunk c97f32e7b - 470c87dbc HADOOP-11970. Replace uses of ThreadLocalRandom with JDK7 ThreadLocalRandom (Sean Busbey via Colin P. McCabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts.

2015-05-19 Thread kihwal
Repository: hadoop Updated Branches: refs/heads/trunk 470c87dbc - 8860e352c HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit:

hadoop git commit: HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts. (cherry picked from commit 8860e352c394372e4eb3ebdf82ea899567f34e4e)

2015-05-19 Thread kihwal
Repository: hadoop Updated Branches: refs/heads/branch-2 084e45362 - 536b9ee6d HDFS-8404. Pending block replication can get stuck using older genstamp. Contributed by Nathan Roberts. (cherry picked from commit 8860e352c394372e4eb3ebdf82ea899567f34e4e) Project:

hadoop git commit: HADOOP-11970. Replace uses of ThreadLocalRandom with JDK7 ThreadLocalRandom (Sean Busbey via Colin P. McCabe)

2015-05-19 Thread cmccabe
Repository: hadoop Updated Branches: refs/heads/branch-2 536b9ee6d - 9534e533d HADOOP-11970. Replace uses of ThreadLocalRandom with JDK7 ThreadLocalRandom (Sean Busbey via Colin P. McCabe) (cherry picked from commit 470c87dbc6c24dd3b370f1ad9e7ab1f6dabd2080) Conflicts: