From 998b9371c9d9a6fe4a93e734ba0055c3e20e0b3e Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Mon, 4 Jan 2016 14:21:59 -0800
Subject: [PATCH] HBASE-14902 Revert some of the stringency recently introduced
 by checkstyle tightening

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

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