From 1c4edd2ab702488e21c4929a998c49a4208633fc Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Mon, 4 Jan 2016 20:03:56 -0800
Subject: [PATCH] Revert "HBASE-14902 Revert some of the stringency recently
 introduced by checkstyle tightening"

This reverts commit 998b9371c9d9a6fe4a93e734ba0055c3e20e0b3e.
---
 hbase-checkstyle/src/main/resources/hbase/checkstyle.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index 667018210ce..e7272c55d8e 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -41,9 +41,7 @@
     http://checkstyle.sourceforge.net/config_blocks.html -->
     <module name="EmptyBlock"/>
     <module name="LeftCurly"/>
-    <module name="NeedBraces">
-      <property name="allowSingleLineStatement" value="true"/>
-    </module>
+    <module name="NeedBraces"/>
 
     <!-- Class Design Checks
     http://checkstyle.sourceforge.net/config_design.html -->
@@ -79,9 +77,7 @@
 
     <!-- Javadoc Checks
     http://checkstyle.sourceforge.net/config_javadoc.html -->
-    <module name="JavadocTagContinuationIndentation">
-      <property name="offset" value="2"/>
-    </module>
+    <module name="JavadocTagContinuationIndentation"/>
     <module name="NonEmptyAtclauseDescription"/>
 
     <!-- Miscellaneous Checks