You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2020/08/20 07:59:24 UTC
[rocketmq-site] 01/02: Merge remote-tracking branch 'origin/master'
into asf-site
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/rocketmq-site.git
commit d4bb49d5e248b359ffb1266159bb6805d9a876d7
Merge: a3e2450 92ecd37
Author: RongtongJin <79...@qq.com>
AuthorDate: Thu Aug 20 15:57:31 2020 +0800
Merge remote-tracking branch 'origin/master' into asf-site
# Conflicts:
# content/NOTICE
# content/about/contact/index.html
# content/about/rewards/index.html
# content/about/team/index.html
# content/activity/launch-rocketmq-code-marathon/index.html
# content/archive-layout-with-content/index.html
# content/categories/index.html
# content/collection-archive/index.html
# content/community/index.html
# content/docs/batch-example/index.html
# content/docs/best-practice-broker/index.html
# content/docs/best-practice-consumer/index.html
# content/docs/best-practice-namesvr/index.html
# content/docs/best-practice-producer/index.html
# content/docs/broadcast-example/index.html
# content/docs/cli-admin-tool/index.html
# content/docs/cluster-deployment/index.html
# content/docs/code-guidelines/index.html
# content/docs/core-concept/index.html
# content/docs/create-pull-request/index.html
# content/docs/documentation/index.html
# content/docs/faq/index.html
# content/docs/filter-by-sql92-example/index.html
# content/docs/how-to-contribute/index.html
# content/docs/logappender-example/index.html
# content/docs/motivation/index.html
# content/docs/openmessaging-example/index.html
# content/docs/order-example/index.html
# content/docs/pull-request/index.html
# content/docs/quick-start/index.html
# content/docs/release-manual.html
# content/docs/rmq-arc/index.html
# content/docs/rmq-deployment/index.html
# content/docs/roadmap/index.html
# content/docs/schedule-example/index.html
# content/docs/simple-example/index.html
# content/docs/system-config/index.html
# content/docs/transaction-example/index.html
# content/dowloading/releases/index.html
# content/feed.xml
# content/index.html
# content/maven/mastering-component-compatible-dependency/index.html
# content/release_notes/release-notes-4.0.0-incubating/index.html
# content/release_notes/release-notes-4.1.0-incubating/index.html
# content/release_notes/release-notes-4.2.0/index.html
# content/release_notes/release-notes-4.3.0/index.html
# content/release_notes/release-notes-4.3.1/index.html
# content/release_notes/release-notes-4.3.2/index.html
# content/release_notes/release-notes-4.4.0/index.html
# content/release_notes/release-notes-4.5.0/index.html
# content/release_notes/release-notes-4.5.1/index.html
# content/release_notes/release-notes-4.5.2/index.html
# content/release_notes/release-notes-4.6.0/index.html
# content/release_notes/release-notes-4.6.1/index.html
# content/release_notes/release-notes-4.7.0/index.html
# content/release_notes/release-notes-rocketmq-client-cpp-1.2.3/index.html
# content/release_notes/release-notes-rocketmq-client-cpp-1.2.4/index.html
# content/release_notes/release-notes-rocketmq-client-cpp-2.0.0/index.html
# content/release_notes/release-notes-rocketmq-client-cpp-2.1.0/index.html
# content/release_notes/release-notes-rocketmq-client-cpp-2.2.0/index.html
# content/release_notes/release-notes-rocketmq-client-go-1.2.4/index.html
# content/release_notes/release-notes-rocketmq-client-go-2.0.0/index.html
# content/release_notes/release-notes-rocketmq-spring-2.0.4/index.html
# content/release_notes/release-notes-rocketmq-spring-2.1.0/index.html
# content/rocketmq/Field-Report-Meetup-Beijing/index.html
# content/rocketmq/Meetup-Beijing/index.html
# content/rocketmq/filter-messages-by-sql92-in-rocketmq/index.html
# content/rocketmq/four-methods-to-feed-name-server-address-list/index.html
# content/rocketmq/how-to-support-more-queues-in-rocketmq/index.html
# content/rocketmq/the-design-of-transactional-message/index.html
# content/sitemap.xml
# content/tags/index.html
# content/the-correct-posture-of-submitting-pull-request/index.html
# content/users/index.html
# content/year-archive/index.html
_about/01-team.md | 1 +
content/.htaccess | 10 -
content/404.html | 411 -------------
content/about/index.html | 404 ------------
content/apache-rocketmq-jekyll.gemspec | 28 -
.../attachment/launch-rocketmq-code-marathon.pdf | Bin 135771 -> 0 bytes
.../launch-second-rocketmq-code-marathon.pdf | Bin 95267 -> 0 bytes
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
.../assets/images/ApacheRocketMQMeetupBeijing.jpg | Bin 165204 -> 0 bytes
content/assets/images/about/Jaskey.jpeg | Bin 2476 -> 0 bytes
content/assets/images/about/StyleTang.jpeg | Bin 2172 -> 0 bytes
content/assets/images/about/WillemJiang.jpeg | Bin 4484 -> 0 bytes
content/assets/images/about/XinWang.jpeg | Bin 2274 -> 0 bytes
content/assets/images/about/bsnyder.jpeg | Bin 3672 -> 0 bytes
content/assets/images/about/chenguangsheng.jpg | Bin 3126 -> 0 bytes
content/assets/images/about/chengxiangwang.jpeg | Bin 2021 -> 0 bytes
content/assets/images/about/chenhoudao.jpeg | Bin 2233 -> 0 bytes
content/assets/images/about/dinglei.jpg | Bin 4058 -> 0 bytes
content/assets/images/about/dongeforever.jpeg | Bin 3239 -> 0 bytes
content/assets/images/about/duhengforever.jpeg | Bin 2466 -> 0 bytes
content/assets/images/about/fangjian.jpeg | Bin 2972 -> 0 bytes
content/assets/images/about/feihongjian.jpeg | Bin 2025 -> 0 bytes
content/assets/images/about/hujie.png | Bin 12470 -> 0 bytes
content/assets/images/about/huzongtang.jpeg | Bin 13035 -> 0 bytes
content/assets/images/about/jim.jpg | Bin 2662 -> 0 bytes
content/assets/images/about/jinrongtong.jpg | Bin 9605 -> 0 bytes
content/assets/images/about/justinmclean.jpeg | Bin 4352 -> 0 bytes
content/assets/images/about/liaotian.jpeg | Bin 2402 -> 0 bytes
content/assets/images/about/liqipeng.jpeg | Bin 13822 -> 0 bytes
content/assets/images/about/liwei.jpeg | Bin 2181 -> 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/rshtykh.png | Bin 5591 -> 0 bytes
content/assets/images/about/siyue.jpeg | Bin 2460 -> 0 bytes
content/assets/images/about/stevenschew.png | Bin 14987 -> 0 bytes
content/assets/images/about/tcrow.png | Bin 8152 -> 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/vsair.png | Bin 15200 -> 0 bytes
content/assets/images/about/wangwenfeng.jpeg | Bin 2827 -> 0 bytes
content/assets/images/about/xujiang.jpg | Bin 2166 -> 0 bytes
content/assets/images/about/xujianhai.jpeg | Bin 9983 -> 0 bytes
content/assets/images/about/yinweihe.jpeg | Bin 1956 -> 0 bytes
content/assets/images/about/zhangke.png | Bin 9214 -> 0 bytes
content/assets/images/about/zhaoqun911.png | Bin 4070 -> 0 bytes
content/assets/images/about/zhouxinyu.png | Bin 16148 -> 0 bytes
content/assets/images/blog/banner.jpg | Bin 96315 -> 0 bytes
.../images/blog/checking-transactional-message.png | Bin 88792 -> 0 bytes
.../assets/images/blog/filter_build_cq_apache.png | Bin 16104 -> 0 bytes
.../assets/images/blog/filter_structure_apach.png | Bin 21027 -> 0 bytes
.../assets/images/blog/meetup_beijing_group.jpg | Bin 199250 -> 0 bytes
content/assets/images/blog/meetup_opening.jpg | Bin 184739 -> 0 bytes
content/assets/images/blog/meetup_topic1 | Bin 284380 -> 0 bytes
content/assets/images/blog/meetup_topic2 | Bin 243204 -> 0 bytes
content/assets/images/blog/meetup_topic3 | Bin 238454 -> 0 bytes
content/assets/images/blog/meetup_topic4 | Bin 302888 -> 0 bytes
content/assets/images/blog/meetup_topic5 | Bin 234579 -> 0 bytes
content/assets/images/blog/meetup_topic6 | Bin 240942 -> 0 bytes
content/assets/images/blog/meetup_topic7 | Bin 205007 -> 0 bytes
content/assets/images/blog/rocketmq-queues.png | Bin 92415 -> 0 bytes
.../images/blog/sending-transactional-message.png | Bin 90913 -> 0 bytes
.../images/blog/transaction-execute-flow.png | Bin 50469 -> 0 bytes
.../images/blog/transaction-outline-design.png | Bin 53166 -> 0 bytes
.../assets/images/bright/rmq-feature-bigdata.png | Bin 6460 -> 0 bytes
.../assets/images/bright/rmq-feature-finance.png | Bin 6386 -> 0 bytes
.../assets/images/bright/rmq-feature-industry.png | Bin 8845 -> 0 bytes
.../images/bright/rmq-feature-lowlatency.png | Bin 10207 -> 0 bytes
.../bright/rmq-feature-massiveaccumulation.png | Bin 7417 -> 0 bytes
.../assets/images/bright/rmq-feature-neutral.png | Bin 9485 -> 0 bytes
content/assets/images/bright/rmq-home-page.png | Bin 543732 -> 0 bytes
.../assets/images/code_guidelines/author-tag.png | Bin 42774 -> 0 bytes
.../images/code_guidelines/codestyle-pre.png | Bin 216377 -> 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
content/assets/images/community/alibaba-logo.png | Bin 4627 -> 0 bytes
content/assets/images/community/ant-logo.png | Bin 20481 -> 0 bytes
content/assets/images/community/beibei-logo.png | Bin 21439 -> 0 bytes
.../assets/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/didi-logo.png | Bin 6079 -> 0 bytes
content/assets/images/community/egov-logo.png | Bin 16971 -> 0 bytes
content/assets/images/community/fenqile-logo.png | Bin 1683 -> 0 bytes
content/assets/images/community/gome-logo.png | Bin 18321 -> 0 bytes
content/assets/images/community/huawei-logo.png | Bin 4235 -> 0 bytes
content/assets/images/community/iqiyi-logo.png | Bin 15922 -> 0 bytes
.../assets/images/community/kedaxunfei-logo.png | Bin 8267 -> 0 bytes
content/assets/images/community/media-logo.jpg | Bin 5023 -> 0 bytes
content/assets/images/community/meizu-logo.png | Bin 1900 -> 0 bytes
content/assets/images/community/mingsheng-logo.gif | Bin 5308 -> 0 bytes
content/assets/images/community/mingsheng-logo.png | Bin 11269 -> 0 bytes
content/assets/images/community/mobike-logo.png | Bin 13080 -> 0 bytes
content/assets/images/community/mogujie-logo.png | Bin 8293 -> 0 bytes
content/assets/images/community/shihai-logo.jpg | Bin 25110 -> 0 bytes
content/assets/images/community/shouqi-logo.png | Bin 5281 -> 0 bytes
content/assets/images/community/shunfeng-logo.png | Bin 13829 -> 0 bytes
content/assets/images/community/tree-logo.png | Bin 21687 -> 0 bytes
content/assets/images/community/webank-logo.png | Bin 1988 -> 0 bytes
.../assets/images/community/wensihaihui-logo.png | Bin 10679 -> 0 bytes
content/assets/images/community/yeahmobi-logo.png | Bin 15178 -> 0 bytes
content/assets/images/community/yhsoft-logo.png | Bin 18076 -> 0 bytes
content/assets/images/community/yunpan-logo.png | Bin 13018 -> 0 bytes
content/assets/images/dark/rmq-feature-bigdata.png | Bin 39087 -> 0 bytes
content/assets/images/dark/rmq-feature-finance.png | Bin 40051 -> 0 bytes
.../assets/images/dark/rmq-feature-industry.png | Bin 45315 -> 0 bytes
.../assets/images/dark/rmq-feature-lowlatency.png | Bin 47445 -> 0 bytes
.../dark/rmq-feature-massiveaccumulation.png | Bin 46075 -> 0 bytes
content/assets/images/dark/rmq-feature-neutral.png | Bin 46387 -> 0 bytes
content/assets/images/dark/rmq-home-page.jpg | Bin 98953 -> 0 bytes
content/assets/images/eco.png | Bin 116702 -> 0 bytes
content/assets/images/feather-small.gif | Bin 129292 -> 0 bytes
content/assets/images/how_rip_work.png | Bin 50776 -> 0 bytes
.../images/release-manual/14864364524873.jpg | Bin 347275 -> 0 bytes
.../images/release-manual/14864365609580.jpg | Bin 84289 -> 0 bytes
.../images/release-manual/14864367062507.jpg | Bin 45304 -> 0 bytes
.../images/release-manual/14864368514198.jpg | Bin 87040 -> 0 bytes
.../images/release-manual/14864376551544.jpg | Bin 103860 -> 0 bytes
content/assets/images/rewards/2016_oschina.jpg | Bin 572055 -> 0 bytes
content/assets/images/rewards/2018_oschina.jpg | Bin 1879523 -> 0 bytes
content/assets/images/rmq-basic-arc.png | Bin 69606 -> 0 bytes
content/assets/images/rmq-basic-component.png | Bin 69730 -> 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/favicon.ico | Bin 6094 -> 0 bytes
content/robots.txt | 1 -
134 files changed, 1 insertion(+), 1548 deletions(-)