You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2016/12/29 07:42:46 UTC

incubator-rocketmq git commit: Bugfix for CI

Repository: incubator-rocketmq
Updated Branches:
  refs/heads/master 167cce034 -> 9edaab15e


Bugfix for CI


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/9edaab15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/9edaab15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/9edaab15

Branch: refs/heads/master
Commit: 9edaab15e17088ee7375d25aefa10f205b89216a
Parents: 167cce0
Author: vongosling <vo...@apache.org>
Authored: Thu Dec 29 15:42:39 2016 +0800
Committer: vongosling <vo...@apache.org>
Committed: Thu Dec 29 15:42:39 2016 +0800

----------------------------------------------------------------------
 .../apache/rocketmq/broker/BrokerPathConfigHelper.java    |  1 +
 style/rmq_checkstyle.xml                                  | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9edaab15/broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java
----------------------------------------------------------------------
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java
index 9a4a9e8..24876df 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java
@@ -19,6 +19,7 @@ package org.apache.rocketmq.broker;
 
 import java.io.File;
 
+
 public class BrokerPathConfigHelper {
     private static String brokerConfigPath = System.getProperty("user.home") + File.separator + "store"
         + File.separator + "config" + File.separator + "broker.properties";

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9edaab15/style/rmq_checkstyle.xml
----------------------------------------------------------------------
diff --git a/style/rmq_checkstyle.xml b/style/rmq_checkstyle.xml
index 9dd8536..ad95030 100644
--- a/style/rmq_checkstyle.xml
+++ b/style/rmq_checkstyle.xml
@@ -29,7 +29,7 @@
 
     <!-- header -->
     <module name="RegexpHeader">
-        <property name="header" value="/\*\*\nLicensed to the Apache Software Foundation*"/>
+        <property name="header" value="/\*\nLicensed to the Apache Software Foundation*"/>
     </module>
 
     <module name="RegexpSingleline">
@@ -51,6 +51,14 @@
         <property name="format" value="@alibaba"/>
         <property name="message" value="Recommended remove @alibaba keyword!"/>
     </module>
+    <module name="RegexpSingleline">
+        <property name="format" value="@taobao"/>
+        <property name="message" value="Recommended remove @taobao keyword!"/>
+    </module>
+    <module name="RegexpSingleline">
+        <property name="format" value="@author"/>
+        <property name="message" value="Recommended remove @author keyword!"/>
+    </module>
 
     <module name="RegexpSingleline">
         <property name="format"