Merge branch 'master' into asf-site

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/5b21fc9a
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/5b21fc9a
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/5b21fc9a

Branch: refs/heads/asf-site
Commit: 5b21fc9a2d91ef1e1773671c73ecb853b228918a
Parents: 5e77c1b 539112e
Author: yukon <[email protected]>
Authored: Fri Jan 6 13:32:38 2017 +0800
Committer: yukon <[email protected]>
Committed: Fri Jan 6 13:32:38 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 _docs/06-best-practice-pull-request.md          |  46 +-
 ...23-how-to-support-more-queues-in-rocketmq.md |  30 +-
 content/404.html                                | 376 --------
 content/about/contact/index.html                | 347 -------
 content/about/index.html                        | 369 -------
 content/about/team/index.html                   | 426 ---------
 content/alibaba-rocketmq-jekyll.gemspec         |  28 -
 content/archive-layout-with-content/index.html  | 957 -------------------
 content/assets/css/main.css                     |   4 -
 content/assets/fonts/FontAwesome.otf            | Bin 124988 -> 0 bytes
 content/assets/fonts/fontawesome-webfont.eot    | Bin 76518 -> 0 bytes
 content/assets/fonts/fontawesome-webfont.svg    | 685 -------------
 content/assets/fonts/fontawesome-webfont.ttf    | Bin 152796 -> 0 bytes
 content/assets/fonts/fontawesome-webfont.woff   | Bin 90412 -> 0 bytes
 content/assets/fonts/fontawesome-webfont.woff2  | Bin 71896 -> 0 bytes
 content/assets/images/about/WillemJiang.jpeg    | Bin 4484 -> 0 bytes
 content/assets/images/about/brianm.jpeg         | Bin 2818 -> 0 bytes
 content/assets/images/about/bsnyder.jpeg        | Bin 3672 -> 0 bytes
 content/assets/images/about/justinmclean.jpeg   | Bin 4352 -> 0 bytes
 content/assets/images/about/lizhanhui.jpg       | Bin 2571 -> 0 bytes
 content/assets/images/about/lollipop.jpeg       | Bin 3254 -> 0 bytes
 content/assets/images/about/longdafeng.jpeg     | Bin 2651 -> 0 bytes
 content/assets/images/about/lukehan.jpeg        | Bin 2871 -> 0 bytes
 content/assets/images/about/stevenschew.png     | Bin 14987 -> 0 bytes
 content/assets/images/about/vintagewang.jpeg    | Bin 2366 -> 0 bytes
 content/assets/images/about/vongosling.jpeg     | Bin 2604 -> 0 bytes
 content/assets/images/about/zhouxinyu.png       | Bin 16148 -> 0 bytes
 content/assets/images/blog/rocketmq-queues.png  | Bin 46754 -> 0 bytes
 .../images/code_guidelines/author-tag.png       | Bin 42774 -> 0 bytes
 .../assets/images/code_guidelines/codestyle.png | Bin 76123 -> 0 bytes
 .../images/code_guidelines/copyright-choose.png | Bin 76573 -> 0 bytes
 .../assets/images/code_guidelines/copyright.png | Bin 125994 -> 0 bytes
 content/assets/images/community/2dfire-logo.jpg | Bin 12185 -> 0 bytes
 .../assets/images/community/alibaba-logo.png    | Bin 4627 -> 0 bytes
 content/assets/images/community/ant-logo.png    | Bin 16801 -> 0 bytes
 .../images/community/china-telecom-logo.png     | Bin 9254 -> 0 bytes
 content/assets/images/community/decent-logo.png | Bin 5358 -> 0 bytes
 content/assets/images/community/egov-logo.png   | Bin 70043 -> 0 bytes
 content/assets/images/community/media-logo.jpg  | Bin 6222 -> 0 bytes
 content/assets/images/community/meizu-logo.png  | Bin 1900 -> 0 bytes
 content/assets/images/community/shihai-logo.jpg | Bin 58158 -> 0 bytes
 .../assets/images/community/yeahmobi-logo.png   | Bin 6553 -> 0 bytes
 content/assets/images/community/yunpan-logo.png | Bin 2819 -> 0 bytes
 content/assets/images/rmq-feature-bigdata.png   | Bin 39087 -> 0 bytes
 content/assets/images/rmq-feature-finance.png   | Bin 40051 -> 0 bytes
 content/assets/images/rmq-feature-industry.png  | Bin 45315 -> 0 bytes
 .../assets/images/rmq-feature-lowlatency.png    | Bin 47445 -> 0 bytes
 .../images/rmq-feature-massiveaccumulation.png  | Bin 46075 -> 0 bytes
 content/assets/images/rmq-feature-neutral.png   | Bin 46387 -> 0 bytes
 content/assets/images/rmq-home-page.jpg         | Bin 98953 -> 0 bytes
 content/assets/images/rmq-logo.png              | Bin 6094 -> 0 bytes
 content/assets/images/rmq-model.png             | Bin 90694 -> 0 bytes
 content/assets/js/main.min.js                   |   5 -
 content/categories/index.html                   | 456 ---------
 content/collection-archive/index.html           | 684 -------------
 content/community/index.html                    | 471 ---------
 content/docs/best-practice-broker/index.html    | 483 ----------
 content/docs/best-practice-consumer/index.html  | 508 ----------
 content/docs/best-practice-namesvr/index.html   | 471 ---------
 content/docs/best-practice-producer/index.html  | 516 ----------
 content/docs/cli-admin-tool/index.html          | 544 -----------
 content/docs/cluster-deployment/index.html      | 548 -----------
 content/docs/code-guidelines/index.html         | 494 ----------
 content/docs/core-concept/index.html            | 583 -----------
 content/docs/faq/index.html                     | 557 -----------
 content/docs/motivation/index.html              | 546 -----------
 content/docs/pull-request/index.html            | 609 ------------
 content/docs/quick-start/index.html             | 532 -----------
 content/favicon.ico                             | Bin 6094 -> 0 bytes
 content/feed.xml                                | 355 -------
 content/feed.xslt.xml                           |   4 -
 content/index.html                              | 416 --------
 .../index.html                                  | 768 ---------------
 .../index.html                                  | 562 -----------
 content/sitemap.xml                             | 119 ---
 content/tags/index.html                         | 750 ---------------
 content/year-archive/index.html                 | 394 --------
 78 files changed, 51 insertions(+), 14593 deletions(-)
----------------------------------------------------------------------


Reply via email to