Skip to content

Commit

Permalink
First clean up for TLP
Browse files Browse the repository at this point in the history
  • Loading branch information
zhouxinyu committed Sep 15, 2017
1 parent e194d2b commit 2b7aacd
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Apache RocketMQ (incubating) website

This is the website for [Apache RocketMQ]( http://rocketmq.incubator.apache.org/) (incubating).
This is the website for [Apache RocketMQ]( http://rocketmq.apache.org/) (incubating).

## About
This website is based on Jekyll and a Jekyll theme named Minimal Mistakes.
Expand Down
21 changes: 10 additions & 11 deletions _about/01-team.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,16 @@ The following is a list of developers with commit privileges that have directly

|Image| Id| Github Id | Email |[Roles](https://www.apache.org/foundation/how-it-works.html#roles)| Time Zone|
|:---|:---|:---|:---|:---|:---|
|![bsnyde](/assets/images/about/bsnyder.jpeg)|bsnyder| [@bsnyder](https://github.com/bsnyder)|[email protected] |Mentor| -7 |
|![justinmclean](/assets/images/about/justinmclean.jpeg)|jmclean| [@justinmclean](https://github.com/justinmclean)|[email protected] |Mentor| +11 |
|![jim](/assets/images/about/jim.jpg)|jim| [@jim](https://github.com/jimjag)|[email protected] |Mentor| -7 |
|![WillemJiang](/assets/images/about/WillemJiang.jpeg)|ningjiang| [@WillemJiang](https://github.com/WillemJiang)|[email protected] |Mentor| +8 |
|![lukehan](/assets/images/about/lukehan.jpeg)|lukehan| [@lukehan](https://github.com/lukehan)|[email protected] |Mentor| +8 |
|![vongosling](/assets/images/about/vongosling.jpeg)|vongosling|[@vongosling](https://github.com/vongosling)|[email protected] |Committer/PMC Member| +8 |
|![vintagewang](/assets/images/about/vintagewang.jpeg)|vintagewang|[@vintagewang](https://github.com/vintagewang)|[email protected] |Committer/PMC Member| +8|
|![zhouxinyu](/assets/images/about/zhouxinyu.png)|yukon|[@zhouxinyu](https://github.com/zhouxinyu)|[email protected] |Committer/PMC Member| +8 |
|![lizhanhui](/assets/images/about/lizhanhui.jpg)|lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|[email protected] |Committer/PMC Member| +8 |
|![dongeforever](/assets/images/about/dongeforever.jpeg)|dongeforever|[@dongeforever](https://github.com/dongeforever)|[email protected] |Committer/PMC Member| +8 |
|![lollipop](/assets/images/about/lollipop.jpeg)|lollipop|[@lollipopjin](https://github.com/lollipopjin)|[email protected] |Committer/PMC Member| +8 |
|![bsnyde](/assets/images/about/bsnyder.jpeg)|bsnyder| [@bsnyder](https://github.com/bsnyder)|[email protected] |PMC Member| -7 |
|![justinmclean](/assets/images/about/justinmclean.jpeg)|jmclean| [@justinmclean](https://github.com/justinmclean)|[email protected] |PMC Member| +11 |
|![jim](/assets/images/about/jim.jpg)|jim| [@jim](https://github.com/jimjag)|[email protected] |PMC Member| -7 |
|![WillemJiang](/assets/images/about/WillemJiang.jpeg)|ningjiang| [@WillemJiang](https://github.com/WillemJiang)|[email protected] |PMC Member| +8 |
|![vongosling](/assets/images/about/vongosling.jpeg)|vongosling|[@vongosling](https://github.com/vongosling)|[email protected] |PMC Member| +8 |
|![vintagewang](/assets/images/about/vintagewang.jpeg)|vintagewang|[@vintagewang](https://github.com/vintagewang)|[email protected] |PMC Member| +8|
|![zhouxinyu](/assets/images/about/zhouxinyu.png)|yukon|[@zhouxinyu](https://github.com/zhouxinyu)|[email protected] |PMC Member| +8 |
|![lizhanhui](/assets/images/about/lizhanhui.jpg)|lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|[email protected] |PMC Member| +8 |
|![dongeforever](/assets/images/about/dongeforever.jpeg)|dongeforever|[@dongeforever](https://github.com/dongeforever)|[email protected] |PMC Member| +8 |
|![lollipop](/assets/images/about/lollipop.jpeg)|lollipop|[@lollipopjin](https://github.com/lollipopjin)|[email protected] |PMC Member| +8 |
|![stevensche](/assets/images/about/stevenschew.png)|stevenschew|[@stevenschew](https://github.com/stevenschew)|[email protected] |Committer| +8 |
|![longdafeng](/assets/images/about/longdafeng.jpeg)|longda|[@longdafeng](https://github.com/longdafeng)|[email protected] |Committer| +8 |
|![shroman](/assets/images/about/rshtykh.png)|shroman|[@shroman](https://github.com/shroman)|[email protected] |Committer| +9 |
Expand Down
2 changes: 1 addition & 1 deletion _docs/06-best-practice-pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Each pull request should follow this checklist to help us incorporate your contr

```

Remember use `- [x]` mark a item finished in the check list and there is a [demo pull request](https://github.com/apache/incubator-rocketmq/pull/152) can be your reference.
Remember use `- [x]` mark an item finished in the check list and there is a [demo pull request](https://github.com/apache/incubator-rocketmq/pull/152) can be your reference.

# Merging a PR (yours or contributors)
Start with reading [GitHub PR merging locally](https://help.github.com/articles/checking-out-pull-requests-locally/). Remember that pull requests are equivalent to a remote github branch with potentially a multitude of commits. In this case it is recommended to squash remote commit history to have one commit per issue, rather than merging in a multitude of contributor's commits. In order to do that, as well as to close the PR at the same time, it is recommended to use squash commits.
Expand Down
4 changes: 2 additions & 2 deletions _docs/08-release-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Make sure your Maven settings.xml file contains the following:
Cleanup JIRA issues related to this release version, and check all the issues has been marked with right version in the `FixVersion` field.

### Publish the Release Notes
Generate the release notes via [RocketMQ JIRA](https://issues.apache.org/jira/browse/ROCKETMQ/) and publish it to the [rocketmq-site](https://github.com/apache/incubator-rocketmq-site), there is a [release notes](http://rocketmq.incubator.apache.org/release_notes/release-notes-4.0.0-incubating/) of `4.0.0-incubating` available for reference, include the link to the release notes in the voting emails.
Generate the release notes via [RocketMQ JIRA](https://issues.apache.org/jira/browse/ROCKETMQ/) and publish it to the [rocketmq-site](https://github.com/apache/incubator-rocketmq-site), there is a [release notes](http://rocketmq.apache.org/release_notes/release-notes-4.0.0-incubating/) of `4.0.0-incubating` available for reference, include the link to the release notes in the voting emails.

## Build the Release Candidate
Firstly, checkout a new branch from `master` with its name equal to the release version, like `release-4.0.0-incubating`.
Expand Down Expand Up @@ -288,7 +288,7 @@ Send an email to **[email protected]**, **[email protected]**, and
> The Apache RocketMQ team would like to announce the release of Apache RocketMQ \<release version\> (incubating).
>
> More details regarding Apache RocketMQ can be found at:
> http://rocketmq.incubator.apache.org/
> http://rocketmq.apache.org/
>
> The release artifacts can be downloaded here:
> https://dist.apache.org/repos/dist/release/incubator/rocketmq/${release version}
Expand Down
Binary file modified assets/images/about/Jaskey.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/about/brianm.jpeg
Binary file not shown.
Binary file modified assets/images/about/dongeforever.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/about/jim.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/about/lukehan.jpeg
Binary file not shown.
Binary file modified assets/images/about/vsair.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions home.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ feature_row1:
{% include feature_row %}

{% include feature_row id="feature_row1" %}

## Disclaimer
Apache RocketMQ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.

0 comments on commit 2b7aacd

Please sign in to comment.