Return-Path: 
 <commits-return-30764-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5641F18D94
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue,  5 Jan 2016 18:01:29 +0000 (UTC)
Received: (qmail 64137 invoked by uid 500); 5 Jan 2016 18:01:29 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 64095 invoked by uid 500); 5 Jan 2016 18:01:29 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 64083 invoked by uid 99); 5 Jan 2016 18:01:29 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 18:01:29 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id ECFCFE00B1; Tue,  5 Jan 2016 18:01:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: stack@apache.org
To: commits@hbase.apache.org
Message-Id: <08a40f6cfe7f4b558df1962a24740d0f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: Revert "HBASE-14902 Revert some of the stringency
 recently introduced by checkstyle tightening"
Date: Tue,  5 Jan 2016 18:01:28 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/master 9997e4ee5 -> 1c4edd2ab


Revert "HBASE-14902 Revert some of the stringency recently introduced by checkstyle tightening"

This reverts commit 998b9371c9d9a6fe4a93e734ba0055c3e20e0b3e.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1c4edd2a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1c4edd2a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1c4edd2a

Branch: refs/heads/master
Commit: 1c4edd2ab702488e21c4929a998c49a4208633fc
Parents: 9997e4e
Author: stack <stack@apache.org>
Authored: Mon Jan 4 20:03:56 2016 -0800
Committer: stack <stack@apache.org>
Committed: Mon Jan 4 20:03:56 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/1c4edd2a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index 6670182..e7272c5 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