Repository: hadoop Updated Branches: refs/heads/branch-2 46323d774 -> 2a6224aa0
HADOOP-12713. Disable spurious checkstyle checks. (cherry picked from commit 5d5a22a878d185dd996a921d681863c4bc44e6b8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a6224aa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a6224aa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a6224aa Branch: refs/heads/branch-2 Commit: 2a6224aa0f5fc92152fb496f574e3cfd07bbf777 Parents: 46323d7 Author: Andrew Wang <[email protected]> Authored: Fri Jan 15 11:58:56 2016 -0800 Committer: Andrew Wang <[email protected]> Committed: Fri Jan 15 11:58:58 2016 -0800 ---------------------------------------------------------------------- .../src/main/resources/checkstyle/checkstyle.xml | 12 +++++++----- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a6224aa/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml ---------------------------------------------------------------------- diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml index de7319c..74faa48 100644 --- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml +++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml @@ -61,7 +61,8 @@ <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> <module name="Translation"/> - <module name="FileLength"/> + <!-- We have many existing long files, this check ends up being spurious --> + <!--<module name="FileLength">--> <module name="FileTabCharacter"/> <module name="TreeWalker"> @@ -130,13 +131,14 @@ <module name="ParenPad"/> <module name="TypecastParenPad"/> <module name="WhitespaceAfter"> - <property name="tokens" value="COMMA, SEMI"/> - </module> + <property name="tokens" value="COMMA, SEMI"/> + </module> <!-- Modifier Checks --> <!-- See http://checkstyle.sf.net/config_modifiers.html --> - <module name="ModifierOrder"/> + <!-- This one is nitty, disable --> + <!-- <module name="ModifierOrder"/> --> <module name="RedundantModifier"/> @@ -178,7 +180,7 @@ <property name="basicOffset" value="2" /> <property name="caseIndent" value="0" /> </module> - <module name="TodoComment"/> + <!--<module name="TodoComment"/>--> <module name="UpperEll"/> </module> http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a6224aa/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a3f2218..93f31d1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -28,6 +28,8 @@ Release 2.9.0 - UNRELEASED HADOOP-8887. Use a Maven plugin to build the native code using CMake (cmccabe) + HADOOP-12713. Disable spurious checkstyle checks. (wang) + BUG FIXES HADOOP-12655. TestHttpServer.testBindAddress bind port range is wider
