You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by lo...@apache.org on 2016/12/20 03:02:50 UTC

[1/2] incubator-rocketmq git commit: Update the description for command 'updateTopicPerm' , incidentally, commit minor update for pom. Review by @vongosling

Repository: incubator-rocketmq
Updated Branches:
  refs/heads/master 59339906f -> 6beb5c6cc


Update the description for command 'updateTopicPerm' , incidentally, commit minor update for pom. Review by @vongosling


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

Branch: refs/heads/master
Commit: c30821b8385021f1924c0d17f0888a58874cc16c
Parents: 2e95422
Author: lollipop <vo...@apache.org>
Authored: Tue Dec 20 11:00:06 2016 +0800
Committer: lollipop <vo...@apache.org>
Committed: Tue Dec 20 11:00:06 2016 +0800

----------------------------------------------------------------------
 pom.xml                                                          | 4 ++--
 .../rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c30821b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93748a5..381cdb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
             <id>stevenschew</id>
             <name>Wei Zhou</name>
             <email>stevenschew@@apache.org</email>
-            <url>https://github.com/zhouwei198732</url>
+            <url>https://github.com/stevenschew</url>
             <roles>
                 <role>committer</role>
             </roles>
@@ -113,7 +113,7 @@
             <id>lollipop</id>
             <name>Jixiang Jin</name>
             <email>lollipop@apache.org</email>
-            <url>https://github.com/jinjixiang</url>
+            <url>https://github.com/lollipopjin</url>
             <roles>
                 <role>committer</role>
             </roles>

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c30821b8/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
----------------------------------------------------------------------
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java b/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
index 1938934..abff611 100644
--- a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
+++ b/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
@@ -60,7 +60,7 @@ public class UpdateTopicPermSubCommand implements SubCommand {
         opt.setRequired(true);
         options.addOption(opt);
 
-        opt = new Option("p", "perm", true, "set topic's permission(2|4|6), intro[2:R; 4:W; 6:RW]");
+        opt = new Option("p", "perm", true, "set topic's permission(2|4|6), intro[2:W; 4:R; 6:RW]");
         opt.setRequired(true);
         options.addOption(opt);
 


[2/2] incubator-rocketmq git commit: Merge remote-tracking branch 'origin/master'

Posted by lo...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 6beb5c6cc37c7af158de12ebd360e7fdf211e113
Parents: c30821b 5933990
Author: lollipop <vo...@apache.org>
Authored: Tue Dec 20 11:02:30 2016 +0800
Committer: lollipop <vo...@apache.org>
Committed: Tue Dec 20 11:02:30 2016 +0800

----------------------------------------------------------------------
 bin/README.md | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------