You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/09/15 12:32:29 UTC
incubator-rocketmq-site git commit: First clean up for TLP
Repository: incubator-rocketmq-site
Updated Branches:
refs/heads/master e194d2beb -> 2b7aacd24
First clean up for TLP
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/2b7aacd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/2b7aacd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/2b7aacd2
Branch: refs/heads/master
Commit: 2b7aacd243969ac1f6ffe2c4ced222980ad20b48
Parents: e194d2b
Author: yukon <yu...@apache.org>
Authored: Fri Sep 15 20:32:06 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Fri Sep 15 20:32:06 2017 +0800
----------------------------------------------------------------------
README.md | 2 +-
_about/01-team.md | 21 ++++++++++-----------
_docs/06-best-practice-pull-request.md | 2 +-
_docs/08-release-manual.md | 4 ++--
assets/images/about/Jaskey.jpeg | Bin 2080 -> 2476 bytes
assets/images/about/brianm.jpeg | Bin 2818 -> 0 bytes
assets/images/about/dongeforever.jpeg | Bin 23023 -> 3239 bytes
assets/images/about/jim.jpg | Bin 7668 -> 2662 bytes
assets/images/about/lukehan.jpeg | Bin 2871 -> 0 bytes
assets/images/about/vsair.png | Bin 14747 -> 15200 bytes
home.md | 3 ---
11 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1e77b07..0e002cb 100644
--- a/README.md
+++ b/README.md
@@ -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.
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/_about/01-team.md
----------------------------------------------------------------------
diff --git a/_about/01-team.md b/_about/01-team.md
index 7a6b9ad..a1b7b5f 100644
--- a/_about/01-team.md
+++ b/_about/01-team.md
@@ -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|
|:---|:---|:---|:---|:---|:---|
-||bsnyder| [@bsnyder](https://github.com/bsnyder)|bsnyder@apache.org |Mentor| -7 |
-||jmclean| [@justinmclean](https://github.com/justinmclean)|jmclean@apache.org |Mentor| +11 |
-||jim| [@jim](https://github.com/jimjag)|jim@apache.org |Mentor| -7 |
-||ningjiang| [@WillemJiang](https://github.com/WillemJiang)|ningjiang@apache.org |Mentor| +8 |
-||lukehan| [@lukehan](https://github.com/lukehan)|lukehan@apache.org |Mentor| +8 |
-||vongosling|[@vongosling](https://github.com/vongosling)|vongosling@apache.org |Committer/PMC Member| +8 |
-||vintagewang|[@vintagewang](https://github.com/vintagewang)|vintagewang@apache.org |Committer/PMC Member| +8|
-||yukon|[@zhouxinyu](https://github.com/zhouxinyu)|yukon@apache.org |Committer/PMC Member| +8 |
-||lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|lizhanhui@apache.org |Committer/PMC Member| +8 |
-||dongeforever|[@dongeforever](https://github.com/dongeforever)|dongeforever@apache.org |Committer/PMC Member| +8 |
-||lollipop|[@lollipopjin](https://github.com/lollipopjin)|lollipop@apache.org |Committer/PMC Member| +8 |
+||bsnyder| [@bsnyder](https://github.com/bsnyder)|bsnyder@apache.org |PMC Member| -7 |
+||jmclean| [@justinmclean](https://github.com/justinmclean)|jmclean@apache.org |PMC Member| +11 |
+||jim| [@jim](https://github.com/jimjag)|jim@apache.org |PMC Member| -7 |
+||ningjiang| [@WillemJiang](https://github.com/WillemJiang)|ningjiang@apache.org |PMC Member| +8 |
+||vongosling|[@vongosling](https://github.com/vongosling)|vongosling@apache.org |PMC Member| +8 |
+||vintagewang|[@vintagewang](https://github.com/vintagewang)|vintagewang@apache.org |PMC Member| +8|
+||yukon|[@zhouxinyu](https://github.com/zhouxinyu)|yukon@apache.org |PMC Member| +8 |
+||lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|lizhanhui@apache.org |PMC Member| +8 |
+||dongeforever|[@dongeforever](https://github.com/dongeforever)|dongeforever@apache.org |PMC Member| +8 |
+||lollipop|[@lollipopjin](https://github.com/lollipopjin)|lollipop@apache.org |PMC Member| +8 |
||stevenschew|[@stevenschew](https://github.com/stevenschew)|stevenschew@apache.org |Committer| +8 |
||longda|[@longdafeng](https://github.com/longdafeng)|longda@apache.org |Committer| +8 |
||shroman|[@shroman](https://github.com/shroman)|shroman@apache.org |Committer| +9 |
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/_docs/06-best-practice-pull-request.md
----------------------------------------------------------------------
diff --git a/_docs/06-best-practice-pull-request.md b/_docs/06-best-practice-pull-request.md
index 084cbf8..0448732 100644
--- a/_docs/06-best-practice-pull-request.md
+++ b/_docs/06-best-practice-pull-request.md
@@ -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.
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/_docs/08-release-manual.md
----------------------------------------------------------------------
diff --git a/_docs/08-release-manual.md b/_docs/08-release-manual.md
index 428ef80..629753d 100644
--- a/_docs/08-release-manual.md
+++ b/_docs/08-release-manual.md
@@ -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`.
@@ -288,7 +288,7 @@ Send an email to **announce@apache.org**, **general@incubator.apache.org**, 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}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/Jaskey.jpeg
----------------------------------------------------------------------
diff --git a/assets/images/about/Jaskey.jpeg b/assets/images/about/Jaskey.jpeg
index 8fdfec1..bcda98b 100644
Binary files a/assets/images/about/Jaskey.jpeg and b/assets/images/about/Jaskey.jpeg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/brianm.jpeg
----------------------------------------------------------------------
diff --git a/assets/images/about/brianm.jpeg b/assets/images/about/brianm.jpeg
deleted file mode 100644
index 4f3c3cf..0000000
Binary files a/assets/images/about/brianm.jpeg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/dongeforever.jpeg
----------------------------------------------------------------------
diff --git a/assets/images/about/dongeforever.jpeg b/assets/images/about/dongeforever.jpeg
index 71250c0..78124fb 100644
Binary files a/assets/images/about/dongeforever.jpeg and b/assets/images/about/dongeforever.jpeg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/jim.jpg
----------------------------------------------------------------------
diff --git a/assets/images/about/jim.jpg b/assets/images/about/jim.jpg
index 159869a..f28198b 100644
Binary files a/assets/images/about/jim.jpg and b/assets/images/about/jim.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/lukehan.jpeg
----------------------------------------------------------------------
diff --git a/assets/images/about/lukehan.jpeg b/assets/images/about/lukehan.jpeg
deleted file mode 100644
index 758ae60..0000000
Binary files a/assets/images/about/lukehan.jpeg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/assets/images/about/vsair.png
----------------------------------------------------------------------
diff --git a/assets/images/about/vsair.png b/assets/images/about/vsair.png
index 5ca3fca..5107b15 100644
Binary files a/assets/images/about/vsair.png and b/assets/images/about/vsair.png differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2b7aacd2/home.md
----------------------------------------------------------------------
diff --git a/home.md b/home.md
index e12e016..36f8081 100644
--- a/home.md
+++ b/home.md
@@ -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.