You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by st...@apache.org on 2016/12/20 03:20:01 UTC
[1/2] incubator-rocketmq git commit: Remove native language in
bin/README.md. reviewed by @vongosling
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master 6beb5c6cc -> 322e3d873
Remove native language in bin/README.md. reviewed 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/6fd3168c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/6fd3168c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/6fd3168c
Branch: refs/heads/master
Commit: 6fd3168cfa7bf0f1a733b4feb9243a2911cbecb6
Parents: 2e95422
Author: stevenschew <st...@apache.org>
Authored: Tue Dec 20 10:16:13 2016 +0800
Committer: stevenschew <st...@apache.org>
Committed: Tue Dec 20 11:17:04 2016 +0800
----------------------------------------------------------------------
bin/README.md | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/6fd3168c/bin/README.md
----------------------------------------------------------------------
diff --git a/bin/README.md b/bin/README.md
index 58903a1..d028475 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -1,34 +1,37 @@
-### \u64cd\u4f5c\u7cfb\u7edf\u8c03\u4f18
-\u5728\u751f\u4ea7\u73af\u5883\u90e8\u7f72Broker\u524d\uff0c\u5fc5\u987b\u8981\u6267\u884cos.sh\uff0c\u5bf9\u64cd\u4f5c\u7cfb\u7edf\u8fdb\u884c\u8c03\u4f18
+### Operating system tuning
+Before the broker deployment, you must run **os.sh**, which is optimized for your operating system.
-**P.S: os.sh\u53ea\u80fd\u6267\u884c\u4e00\u6b21\uff0c\u9700\u8981sudo root\u6743\u9650**
+## Notice
+### os.sh should be executed only once with the root permission.
+### os.sh parameter settings is just for reference. You can tune it in your target host systems.
-### \u542f\u52a8broker
-* Unix\u5e73\u53f0
- `nohup sh mqbroker &`
+### Start broker
+* Unix platform
-* Windows\u5e73\u53f0\uff08\u4ec5\u652f\u630164\u4f4d\uff09
+ `nohup sh mqbroker &`
- `mqbroker.exe`
+* Windows platform\uff08Only support 64 bit\uff09
-### \u5173\u95edbroker
- sh mqshutdown broker
+ `mqbroker.exe`
-### \u542f\u52a8Name Server
-* Unix\u5e73\u53f0
+### Shutodwn broker
+ sh mqshutdown broker
- `nohup sh mqnamesrv &`
+### Start Nameserver
+* Unix platform
-* Windows\u5e73\u53f0\uff08\u4ec5\u652f\u630164\u4f4d\uff09
+ `nohup sh mqnamesrv &`
- `mqnamesrv.exe`
+* Windows platform\uff08Only support 64 bit\uff09
-### \u5173\u95edName Server
- sh mqshutdown namesrv
+ `mqnamesrv.exe`
-### \u66f4\u65b0\u6216\u521b\u5efaTopic
- sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
+### Shutdown Nameserver
+ sh mqshutdown namesrv
-### \u66f4\u65b0\u6216\u521b\u5efa\u8ba2\u9605\u7ec4
- sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA
\ No newline at end of file
+### Update or create Topic
+ sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
+
+### Update or create subscription group
+ sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA
\ No newline at end of file
[2/2] incubator-rocketmq git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-rocketmq
Posted by st...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-rocketmq
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/322e3d87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/322e3d87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/322e3d87
Branch: refs/heads/master
Commit: 322e3d873a8e1f043f361307da55b9fa8beaf17b
Parents: 6fd3168 6beb5c6
Author: stevenschew <st...@apache.org>
Authored: Tue Dec 20 11:19:35 2016 +0800
Committer: stevenschew <st...@apache.org>
Committed: Tue Dec 20 11:19:35 2016 +0800
----------------------------------------------------------------------
pom.xml | 4 ++--
.../rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------