{{ page.title | markdownify | remove: "
" | remove: "
" }}{% endif %} + {% if page.read_time %} + + {% endif %} +diff --git a/_about/01-team.md b/_about/01-team.md new file mode 100644 index 0000000000..151801ea9d --- /dev/null +++ b/_about/01-team.md @@ -0,0 +1,31 @@ +--- +title: "TEAM" +permalink: /about/team/ +excerpt: "Project team." +modified: 2016-12-28T19:55:43-04:00 +--- + +The RocketMQ team is comprised of Members and Contributors. Members have direct access to the source of RocketMQ project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to RocketMQ are greatly appreciated. + + +### Members + +The following is a list of developers with commit privileges that have directly contributed to the project in one way or another. + +|Image| Id| Github Id | Email |Roles| Time Zone| +|:---|:---|:---|:---|:---|:---| +|![bsnyde](/assets/images/about/bsnyder.jpeg)|bsnyder| [@bsnyder](https://github.com/bsnyder)|bsnyder@apache.org |Mentor/PMC Member| -7 | +|![brian](/assets/images/about/brianm.jpeg)|brianm| [@brianm](https://github.com/brianm)|brianm@apache.org |Mentor/PMC Member| -8 | +|![WillemJiang](/assets/images/about/WillemJiang.jpeg)|nianjiang| [@WillemJiang](https://github.com/WillemJiang)|nianjiang@apache.org |Mentor/PMC Member| +8 | +|![lukehan](/assets/images/about/lukehan.jpeg)|lukehan| [@lukehan](https://github.com/lukehan)|lukehan@apache.org |Mentor/PMC Member| +8 | +|![jmclean](/assets/images/about/jmclean.jpeg)|jmclean| [@jmclean](https://github.com/jmclean)|jmclean@apache.org |Mentor/PMC Member| +11 | +|![vongosling](/assets/images/about/vongosling.jpeg)|vongosling|[@vongosling](https://github.com/vongosling)|vongosling@apache.org |Committer/PMC Member| +8 | +|![vintagewang](/assets/images/about/vintagewang.jpeg)|vintagewang|[@vintagewang](https://github.com/vintagewang)|vintagewang@apache.org |Committer/PMC Member| +8 | +|![zhouxinyu](/assets/images/about/zhouxinyu.png)|yukon|[@zhouxinyu](https://github.com/zhouxinyu)|yukon@apache.org |Committer/PMC Member| +8 | +|![lizhanhui](/assets/images/about/lizhanhui.jpg)|lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|lizhanhui@apache.org |Committer| +8 | +|![stevensche](/assets/images/about/stevenschew.png)|stevenschew|[@stevenschew](https://github.com/stevenschew)|stevenschew@apache.org |Committer| +8 | +|![lollipop](/assets/images/about/lollipop.jpeg)|lollipop|[@lollipopjin](https://github.com/lollipopjin)|lollipop@apache.org |Committer| +8 | +|![longdafeng](/assets/images/about/longdafeng.jpeg)|longda|[@longdafeng](https://github.com/longdafeng)|longda@apache.org |Committer| +8 | + +### Top Contributors +There are a lot of contributors who improve the RocketMQ project through submission of patches and suggestions to the Members, top contributors to be added. diff --git a/_about/02-contact.md b/_about/02-contact.md new file mode 100644 index 0000000000..2cc6f8583f --- /dev/null +++ b/_about/02-contact.md @@ -0,0 +1,19 @@ +--- +layout: about_single +title: "CONTACT" +permalink: /about/contact/ +excerpt: "Contact." +modified: 2016-12-28T19:55:43-04:00 +--- + +## Mailing Lists + +These are the mailing lists that have been established for RocketMQ. For each list, there is a subscribe, unsubscribe, and an archive link. + +|Name|Description|Subscribe|Unsubscribe|Archive| +|:---|:---|:---|:---|:---| +|Issues|For tracking issues| [Subscribe](mailto:issues-subscribe@rocketmq.incubator.apache.org)|[Unsubscribe](mailto:issues-unsubscribe@rocketmq.incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-rocketmq-issues/)| +|Development|For discussion on development.| [Subscribe](mailto:dev-subscribe@rocketmq.incubator.apache.org)|[Unsubscribe](mailto:dev-unsubscribe@rocketmq.incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-rocketmq-dev//)| +|Commits|For tracking commits. |[Subscribe](mailto:commits-subscribe@rocketmq.incubator.apache.org)|[Unsubscribe](mailto:commits-unsubscribe@rocketmq.incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-rocketmq-commits/)| + +Besides, we hold tagged questions on [stackoverflow.com](http://stackoverflow.com/questions/tagged/rocketmq) where you can launch an interactive discussion. Also, you can try to find answers to your question about RocketMQ on Quora [here](https://www.quora.com/topic/RocketMQ). diff --git a/_config.yml b/_config.yml index b344334aa5..9e3145f4dc 100644 --- a/_config.yml +++ b/_config.yml @@ -114,6 +114,7 @@ include: - .htaccess - _pages - _docs + - _about exclude: - "*.sublime-project" - "*.sublime-workspace" @@ -247,6 +248,9 @@ collections: portfolio: output: true permalink: /:collection/:path/ + about: + output: true + permalink: /:collection/:path/ # Defaults @@ -307,4 +311,15 @@ defaults: layout: single author_profile: false share: true - +# _about + - scope: + path: "" + type: about + values: + layout: single + read_time: false + author_profile: false + share: true + comments: false + sidebar: + nav: "about" diff --git a/_data/navigation.yml b/_data/navigation.yml index a17008d291..c69f539f3a 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -7,7 +7,7 @@ main: - title: "Community" url: /community/ - title: "About" - url: /about/ + url: /about/team/ # - title: "Sample Collections" # url: /collection-archive/ # - title: "Sitemap" @@ -56,4 +56,10 @@ docs: - title: "Virtualization" url: /docs/cli-admin-tool/ - title: "Frequently Asked Questions" - url: /docs/cluster-deployment/ \ No newline at end of file + url: /docs/cluster-deployment/ + +about: + - title: Team + url: /about/team/ + - title: Contact + url: /about/contact/ diff --git a/_layouts/about_single.html b/_layouts/about_single.html new file mode 100644 index 0000000000..9035528590 --- /dev/null +++ b/_layouts/about_single.html @@ -0,0 +1,74 @@ +--- +layout: default +--- + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
" | remove: "
" }}{% endif %} + {% if page.read_time %} + + {% endif %} +These are the mailing lists that have been established for RocketMQ. For each list, there is a subscribe, unsubscribe, and an archive link.
+ +Name | +Description | +Subscribe | +Unsubscribe | +Archive | +
---|---|---|---|---|
Issues | +For tracking issues | +Subscribe | +Unsubscribe | +mail-archives.apache.org | +
Development | +For discussion on development. | +Subscribe | +Unsubscribe | +mail-archives.apache.org | +
Commits | +For tracking commits. | +Subscribe | +Unsubscribe | +mail-archives.apache.org | +
Besides, we hold tagged questions on stackoverflow.com where you can launch an interactive discussion. Also, you can try to find answers to your question about RocketMQ on Quora here.
+ + +The RocketMQ team is comprised of Members and Contributors. Members have direct access to the source of RocketMQ project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to RocketMQ are greatly appreciated.
+ +The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.
+ +Image | +Id | +Github Id | +Roles | +Time Zone | +|
---|---|---|---|---|---|
+ | bsnyder | +@bsnyder | +bsnyder@apache.org | +Mentor/PMC Member | +-7 | +
+ | brianm | +@brianm | +brianm@apache.org | +Mentor/PMC Member | +-8 | +
+ | nianjiang | +@WillemJiang | +nianjiang@apache.org | +Mentor/PMC Member | ++8 | +
+ | lukehan | +@lukehan | +lukehan@apache.org | +Mentor/PMC Member | ++8 | +
+ | jmclean | +@jmclean | +jmclean@apache.org | +Mentor/PMC Member | ++11 | +
+ | vongosling | +@vongosling | +vongosling@apache.org | +Committer/PMC Member | ++8 | +
+ | vintagewang | +@vintagewang | +vintagewang@apache.org | +Committer/PMC Member | ++8 | +
+ | yukon | +@zhouxinyu | +yukon@apache.org | +Committer/PMC Member | ++8 | +
+ | lizhanhui | +@lizhanhui | +lizhanhui@apache.org | +Committer | ++8 | +
+ | stevenschew | +@stevenschew | +stevenschew@apache.org | +Committer | ++8 | +
+ | lollipop | +@lollipopjin | +lollipop@apache.org | +Committer | ++8 | +
+ | longda | +@longdafeng | +longda@apache.org | +Committer | ++8 | +
There are a lot of contributors who improve the RocketMQ project through submission of patches and suggestions to the Members, top contributors to be added.
+ + +Project team. +
+Contact. +
+Project team. +
+Contact. +
+This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github’s apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up “origin” to point to your remote fork on github as the default remote. So if you perform “git push origin master” it will go to github.
To attach to the apache git repo do the following:
@@ -456,11 +456,11 @@git checkout master # switch to local master branch
git pull apache master # fast-forward to current remote HEAD
-git pull --squash https://github.com/cuser/incubator-rocketmq.git cbranch # merge to master
+git pull --squash https://github.com/cuser/incubator-rocketmq.git ROCKETMQ-xxxx # merge to master
–squash ensures all PR history is squashed into single commit, and allows committer to use his/her own message. Read git help for merge or pull for more information about –squash option. In this example we assume that the contributor’s Github handle is “cuser” and the PR branch name is “cbranch”. Next, resolve conflicts, if any, or ask a contributor to rebase on top of master, if PR went out of sync.
+–squash ensures all PR history is squashed into single commit, and allows committer to use his/her own message. Read git help for merge or pull for more information about –squash option. In this example we assume that the contributor’s Github handle is “cuser” and the PR branch name is “ROCKETMQ-xxxx”. Next, resolve conflicts, if any, or ask a contributor to rebase on top of master, if PR went out of sync.
If you are ready to merge your own (committer’s) PR you probably only need to merge (not pull), since you have a local copy that you’ve been working on. This is the branch that you used to create the PR.
diff --git a/content/docs/quick-start/index.html b/content/docs/quick-start/index.html index ff49715b2d..9db6c114bd 100644 --- a/content/docs/quick-start/index.html +++ b/content/docs/quick-start/index.html @@ -57,7 +57,7 @@ - + @@ -129,7 +129,7 @@