Release at 2017.3.19
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/92d5c5f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/92d5c5f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/92d5c5f1 Branch: refs/heads/asf-site Commit: 92d5c5f1b9ead9b3cd811bca5f7712c3a2bbced3 Parents: c2dd632 Author: yukon <yu...@apache.org> Authored: Sun Mar 19 22:49:14 2017 +0800 Committer: yukon <yu...@apache.org> Committed: Sun Mar 19 22:49:14 2017 +0800 ---------------------------------------------------------------------- content/about/contact/index.html | 4 +- content/about/rewards/index.html | 4 +- content/about/team/index.html | 4 +- .../launch-rocketmq-code-marathon/index.html | 6 +- content/alibaba-rocketmq-jekyll.gemspec | 28 - content/apache-rocketmq-jekyll.gemspec | 28 + content/archive-layout-with-content/index.html | 14 - content/collection-archive/index.html | 21 - content/docs/best-practice-broker/index.html | 12 +- content/docs/best-practice-consumer/index.html | 12 +- content/docs/best-practice-namesvr/index.html | 12 +- content/docs/best-practice-producer/index.html | 12 +- content/docs/branching-model.html | 718 ------------------- content/docs/cli-admin-tool/index.html | 14 +- content/docs/cluster-deployment/index.html | 12 +- content/docs/code-guidelines/index.html | 12 +- content/docs/core-concept/index.html | 12 +- content/docs/documentation/index.html | 12 +- content/docs/faq/index.html | 12 +- content/docs/motivation/index.html | 14 +- content/docs/pull-request/index.html | 12 +- content/docs/quick-start/index.html | 12 +- content/docs/release-manual.html | 14 +- content/docs/roadmap/index.html | 18 +- content/dowloading/releases/index.html | 14 +- content/feed.xml | 8 +- content/sitemap.xml | 6 - 27 files changed, 80 insertions(+), 967 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/about/contact/index.html ---------------------------------------------------------------------- diff --git a/content/about/contact/index.html b/content/about/contact/index.html index e24f9c3..0267358 100644 --- a/content/about/contact/index.html +++ b/content/about/contact/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -212,7 +212,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="CONTACT"> <meta itemprop="description" content="Contact."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 29, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/about/rewards/index.html ---------------------------------------------------------------------- diff --git a/content/about/rewards/index.html b/content/about/rewards/index.html index aae507b..a41d021 100644 --- a/content/about/rewards/index.html +++ b/content/about/rewards/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -212,7 +212,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="REWARDS"> <meta itemprop="description" content="Rewards."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="January 25, 2017"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/about/team/index.html ---------------------------------------------------------------------- diff --git a/content/about/team/index.html b/content/about/team/index.html index 557edd9..55c2f90 100644 --- a/content/about/team/index.html +++ b/content/about/team/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -212,7 +212,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="TEAM"> <meta itemprop="description" content="Project team."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 29, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/activity/launch-rocketmq-code-marathon/index.html ---------------------------------------------------------------------- diff --git a/content/activity/launch-rocketmq-code-marathon/index.html b/content/activity/launch-rocketmq-code-marathon/index.html index 7935fce..06f045a 100644 --- a/content/activity/launch-rocketmq-code-marathon/index.html +++ b/content/activity/launch-rocketmq-code-marathon/index.html @@ -339,21 +339,21 @@ <li>Brand New UI</li> <li>I18n Support</li> <li><a href="https://projects.spring.io/spring-boot/";>Spring Boot</a> + <a href="http://getbootstrap.com/";>Bootstrap</a> Recommended</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-console-ng";>RocketMQ Console Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-console";>RocketMQ Console Repository</a></li> </ol> <h3 id="rocketmq-jms">RocketMQ-JMS</h3> <ol> <li>Supporting JMS 2.0 Protocol</li> <li>Rich Documentation and Good Test Cases Coverage</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-jms";>RocketMQ JMS Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-jms";>RocketMQ JMS Repository</a></li> </ol> <h3 id="rocketmq-flume">RocketMQ-Flume</h3> <ol> <li>Supporting Latest <a href="http://flume.apache.org/";>Flume</a></li> <li>Rich Documentation and Good Test Cases Coverage</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-flume-ng";>RocketMQ Flume Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-flume";>RocketMQ Flume Repository</a></li> </ol> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/alibaba-rocketmq-jekyll.gemspec ---------------------------------------------------------------------- diff --git a/content/alibaba-rocketmq-jekyll.gemspec b/content/alibaba-rocketmq-jekyll.gemspec deleted file mode 100644 index 25a1cfa..0000000 --- a/content/alibaba-rocketmq-jekyll.gemspec +++ /dev/null @@ -1,28 +0,0 @@ -# coding: utf-8 - -Gem::Specification.new do |spec| - spec.name = "minimal-mistakes-jekyll" - spec.version = "4.1.0" - spec.authors = ["Michael Rose"] - - spec.summary = %q{A flexible two-column Jekyll theme.} - spec.homepage = "https://github.com/alibaba/RocketMQ/"; - spec.license = "MIT" - - spec.metadata["plugin_type"] = "theme" - - spec.files = `git ls-files -z`.split("\x0").select do |f| - f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) - end - - spec.add_dependency "jekyll", "~> 3.3" - - spec.add_development_dependency "bundler", "~> 1.12" - spec.add_development_dependency "rake", "~> 10.0" - - spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" - spec.add_runtime_dependency "jekyll-sitemap", "~> 0.12" - spec.add_runtime_dependency "jekyll-gist", "~> 1.4" - spec.add_runtime_dependency "jekyll-feed", "~> 0.8" - spec.add_runtime_dependency "jemoji", "~> 0.7" -end http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/apache-rocketmq-jekyll.gemspec ---------------------------------------------------------------------- diff --git a/content/apache-rocketmq-jekyll.gemspec b/content/apache-rocketmq-jekyll.gemspec new file mode 100644 index 0000000..f2d4a41 --- /dev/null +++ b/content/apache-rocketmq-jekyll.gemspec @@ -0,0 +1,28 @@ +# coding: utf-8 + +Gem::Specification.new do |spec| + spec.name = "minimal-mistakes-jekyll" + spec.version = "4.1.0" + spec.authors = ["Michael Rose"] + + spec.summary = %q{A flexible two-column Jekyll theme.} + spec.homepage = "https://github.com/apache/incubator-rocketmq/"; + spec.license = "MIT" + + spec.metadata["plugin_type"] = "theme" + + spec.files = `git ls-files -z`.split("\x0").select do |f| + f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) + end + + spec.add_dependency "jekyll", "~> 3.3" + + spec.add_development_dependency "bundler", "~> 1.12" + spec.add_development_dependency "rake", "~> 10.0" + + spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" + spec.add_runtime_dependency "jekyll-sitemap", "~> 0.12" + spec.add_runtime_dependency "jekyll-gist", "~> 1.4" + spec.add_runtime_dependency "jekyll-feed", "~> 0.8" + spec.add_runtime_dependency "jemoji", "~> 0.7" +end http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/archive-layout-with-content/index.html ---------------------------------------------------------------------- diff --git a/content/archive-layout-with-content/index.html b/content/archive-layout-with-content/index.html index dc46758..c923688 100644 --- a/content/archive-layout-with-content/index.html +++ b/content/archive-layout-with-content/index.html @@ -745,20 +745,6 @@ <h2 class="archive__item-title" itemprop="headline"> - <a href="/docs/branching-model" rel="permalink">Branching Model</a> - - </h2> - - <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Branching Model -</p> - </article> -</div> - -<div class="list__item"> - <article class="archive__item" itemscope="" itemtype="http://schema.org/CreativeWork";> - - <h2 class="archive__item-title" itemprop="headline"> - <a href="/dowloading/releases/" rel="permalink">Downloading the Apache RocketMQ Releases</a> </h2> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/collection-archive/index.html ---------------------------------------------------------------------- diff --git a/content/collection-archive/index.html b/content/collection-archive/index.html index 3cdbba0..9599074 100644 --- a/content/collection-archive/index.html +++ b/content/collection-archive/index.html @@ -589,27 +589,6 @@ <h2 class="archive__item-title" itemprop="headline"> - <a href="/docs/branching-model" rel="permalink">Branching Model -</a> - - </h2> - - <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Branching Model -</p> - </article> -</div> - - - - - - - -<div class="list__item"> - <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork";> - - <h2 class="archive__item-title" itemprop="headline"> - <a href="/dowloading/releases/" rel="permalink">Downloading the Apache RocketMQ Releases </a> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/best-practice-broker/index.html ---------------------------------------------------------------------- diff --git a/content/docs/best-practice-broker/index.html b/content/docs/best-practice-broker/index.html index 44cde6f..7e47919 100644 --- a/content/docs/best-practice-broker/index.html +++ b/content/docs/best-practice-broker/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Best Practice For Broker"> <meta itemprop="description" content="Some useful tips for users."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 25, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/best-practice-consumer/index.html ---------------------------------------------------------------------- diff --git a/content/docs/best-practice-consumer/index.html b/content/docs/best-practice-consumer/index.html index df3e34f..6a59680 100644 --- a/content/docs/best-practice-consumer/index.html +++ b/content/docs/best-practice-consumer/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Best Practice For Consumer"> <meta itemprop="description" content="Some useful tips for users."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 25, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/best-practice-namesvr/index.html ---------------------------------------------------------------------- diff --git a/content/docs/best-practice-namesvr/index.html b/content/docs/best-practice-namesvr/index.html index 7983c8a..1d46ce1 100644 --- a/content/docs/best-practice-namesvr/index.html +++ b/content/docs/best-practice-namesvr/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Best Practice For NameServer"> <meta itemprop="description" content="Some useful tips for users."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 25, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/best-practice-producer/index.html ---------------------------------------------------------------------- diff --git a/content/docs/best-practice-producer/index.html b/content/docs/best-practice-producer/index.html index 2664024..473811d 100644 --- a/content/docs/best-practice-producer/index.html +++ b/content/docs/best-practice-producer/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Best Practice For Producer"> <meta itemprop="description" content="Some useful tips for users."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 25, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/branching-model.html ---------------------------------------------------------------------- diff --git a/content/docs/branching-model.html b/content/docs/branching-model.html deleted file mode 100644 index d645bcc..0000000 --- a/content/docs/branching-model.html +++ /dev/null @@ -1,718 +0,0 @@ -<!doctype html> -<html lang="en" class="no-js"> - <head> - <meta charset="utf-8"> - -<!-- begin SEO --> - - - - - - - - - -<title>Branching Model - Apache RocketMQ</title> - - - - -<meta name="description" content="Apache RocketMQ Branching Model"> - - - - -<meta property="og:locale" content="en"> -<meta property="og:site_name" content="Apache RocketMQ"> -<meta property="og:title" content="Branching Model"> - - - - - <meta property="og:description" content="Apache RocketMQ Branching Model"> - - - - <meta name="twitter:site" content="@ApacheRocketMQ"> - <meta name="twitter:title" content="Branching Model"> - <meta name="twitter:description" content="Apache RocketMQ Branching Model"> - <meta name="twitter:url" content=""> - - - <meta name="twitter:card" content="summary"> - - - - - - - - - - - - - - - - <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> - - - - - - - - - <script type="application/ld+json"> - { - "@context" : "http://schema.org";, - "@type" : "Person", - "name" : "Apache RocketMQ", - "url" : null, - "sameAs" : null - } - </script> - - - - <meta name="google-site-verification" content="aand0XZkSGsziuC-UPD4ZJniFD0m0JhGx6820y2mAQY" /> - - - <meta name="baidu-site-verification" content="wD06EbDRkQ" /> - - - - -<!-- end SEO --> - - -<link href="/feed.xml" type="application/atom+xml" rel="alternate" title="Apache RocketMQ Feed"> - -<!-- http://t.co/dKP3o1e --> -<meta name="HandheldFriendly" content="True"> -<meta name="MobileOptimized" content="320"> -<meta name="viewport" content="width=device-width, initial-scale=1.0"> - -<script> - document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/g, '') + ' js '; -</script> - -<!-- For all browsers --> -<link rel="stylesheet" href="/assets/css/main.css"> - -<meta http-equiv="cleartype" content="on"> - <!-- start custom head snippets --> - -<!-- insert favicons. use http://realfavicongenerator.net/ --> - -<!-- end custom head snippets --> - </head> - - <body class="layout--single"> - - <!--[if lt IE 9]> -<div class="notice--danger align-center" style="margin: 0;">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/";>upgrade your browser</a> to improve your experience.</div> -<![endif]--> - <div class="masthead"> - <div class="masthead__inner-wrap"> - <div class="masthead__menu"> - <nav id="site-nav" class="greedy-nav"> - <button><div class="navicon"></div></button> - <ul class="visible-links"> - <li class="masthead__menu-item masthead__menu-item--lg"><a href="/">Apache RocketMQ</a></li> - - - <li class="masthead__menu-item"><a href="/docs/quick-start/">Documentation</a></li> - - - <li class="masthead__menu-item"><a href="/year-archive/">Blog</a></li> - - - <li class="masthead__menu-item"><a href="/community/">Community</a></li> - - - <li class="masthead__menu-item"><a href="/customer/">Customer</a></li> - - - <li class="masthead__menu-item"><a href="/about/team/">About</a></li> - - </ul> - <ul class="hidden-links hidden"></ul> - </nav> - </div> - </div> -</div> - - - - - -<div id="main" role="main"> - - <div class="sidebar sticky"> - - - - - - - - - - -<nav class="nav__list"> - - <input id="ac-toc" name="accordion-toc" type="checkbox" /> - <label for="ac-toc">Toggle Menu</label> - <ul class="nav__items"> - - <li> - - <span class="nav__sub-title">User Guide</span> - - - - <ul> - - - - - - - - <li><a href="/docs/quick-start/" class="">Quick Start</a></li> - - - - - - - - <li><a href="/docs/motivation/" class="">Motivation</a></li> - - - - - - - - <li><a href="/docs/core-concept/" class="">Core Concept</a></li> - - - - - - - - <li><a href="/docs/cli-admin-tool/" class="">CLI Admin Tool</a></li> - - - - - - - - <li><a href="/docs/cluster-deployment/" class="">Cluster Configuration & Deployment</a></li> - - </ul> - - </li> - - <li> - - <span class="nav__sub-title">Developer Guide</span> - - - - <ul> - - - - - - - - <li><a href="/docs/code-guidelines/" class="">Code Guidelines</a></li> - - - - - - - - <li><a href="/docs/branching-model" class="active">Branching Model</a></li> - - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> - - - - - - - - <li><a href="/docs/release-manual" class="">Release Manual</a></li> - - </ul> - - </li> - - <li> - - <span class="nav__sub-title">Best Practice</span> - - - - <ul> - - - - - - - - <li><a href="/docs/best-practice-broker/" class="">Broker</a></li> - - - - - - - - <li><a href="/docs/best-practice-producer/" class="">Producer</a></li> - - - - - - - - <li><a href="/docs/best-practice-consumer/" class="">Consumer</a></li> - - - - - - - - <li><a href="/docs/best-practice-namesvr/" class="">NameServer</a></li> - - </ul> - - </li> - - <li> - - <span class="nav__sub-title">Release Notes</span> - - - - <ul> - - - - - - - - <li><a href="/dowloading/releases/" class="">Download</a></li> - - - - - - - - <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li> - - </ul> - - </li> - - <li> - - - - - <a href="/docs/roadmap/"><span class="nav__sub-title">RoadMap</span></a> - - - - </li> - - <li> - - - - - <a href="/docs/faq/"><span class="nav__sub-title">FAQ</span></a> - - - - </li> - - </ul> -</nav> - - - </div> - - - <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> - <meta itemprop="headline" content="Branching Model"> - <meta itemprop="description" content="Apache RocketMQ Branching Model"> - <meta itemprop="datePublished" content="March 17, 2017"> - <meta itemprop="dateModified" content="February 08, 2017"> - - <div class="page__inner-wrap"> - - <header> - <h1 class="page__title" itemprop="headline">Branching Model -</h1> - - </header> - - - <section class="page__content" itemprop="text"> - <aside class="sidebar__right"> -<nav class="toc"> - <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> -<ul class="toc__menu" id="markdown-toc"> - <li><a href="#the-main-branches" id="markdown-toc-the-main-branches">The main branches</a></li> - <li><a href="#supporting-branches" id="markdown-toc-supporting-branches">Supporting branches</a> <ul> - <li><a href="#feature-branches" id="markdown-toc-feature-branches">Feature branches</a> <ul> - <li><a href="#creating-a-feature-branch" id="markdown-toc-creating-a-feature-branch">Creating a feature branch</a></li> - <li><a href="#incorporating-a-finished-feature-on-develop" id="markdown-toc-incorporating-a-finished-feature-on-develop">Incorporating a finished feature on develop</a></li> - </ul> - </li> - <li><a href="#release-branches" id="markdown-toc-release-branches">Release branches</a> <ul> - <li><a href="#creating-a-release-branch" id="markdown-toc-creating-a-release-branch">Creating a release branch</a></li> - </ul> - </li> - <li><a href="#hotfix-branches" id="markdown-toc-hotfix-branches">Hotfix branches</a></li> - </ul> - </li> - <li><a href="#references" id="markdown-toc-references">References</a></li> -</ul> - - </nav> -</aside> - -<p>A summary of RocketMQ branching model:</p> - -<p><img src="/assets/images/release-manual/14864364524873.jpg" alt="" /></p> - -<h1 id="the-main-branches">The main branches</h1> - -<p>At the core, the development model is greatly inspired by existing models out there. The central repo holds two main branches with an infinite lifetime:</p> - -<ul> - <li>master</li> - <li>develop</li> -</ul> - -<p>The <strong>master</strong> branch at origin should be familiar to every Git user. Parallel to the master branch, another branch exists called <strong>develop</strong>.</p> - -<p>We consider <strong>origin/master</strong> to be the main branch where the source code of HEAD always reflects a production-ready state.</p> - -<p>We consider <strong>origin/develop</strong> to be the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release. Some would call this the âintegration branchâ. This is where any automatic nightly builds are built from.</p> - -<p>When the source code in the develop branch reaches a stable point and is ready to be released, all of the changes should be merged back into master somehow and then tagged with a release number. How this is done in detail will be discussed further on.</p> - -<p>Therefore, each time when changes are merged back into master, this is a new production release by definition. We tend to be very strict at this, so that theoretically, we could use a Git hook script to automatically build and roll-out our software to our production servers everytime there was a commit on <strong>master</strong>.</p> - -<p><img src="/assets/images/release-manual/14864365609580.jpg" alt="" /></p> - -<h1 id="supporting-branches">Supporting branches</h1> - -<p>Next to the main branches master and develop, our development model uses a variety of supporting branches to aid parallel development between team members, ease tracking of features, prepare for production releases and to assist in quickly fixing live production problems. Unlike the main branches, these branches always have a limited life time, since they will be removed eventually.</p> - -<p>The different types of branches we may use are:</p> - -<ul> - <li>Feature branches</li> - <li>Release branches</li> - <li>Hotfix branches</li> -</ul> - -<p>Each of these branches have a specific purpose and are bound to strict rules as to which branches may be their originating branch and which branches must be their merge targets. We will walk through them in a minute.</p> - -<p>By no means are these branches âspecialâ from a technical perspective. The branch types are categorized by how we use them. They are of course plain old Git branches.</p> - -<h2 id="feature-branches">Feature branches</h2> - -<p>May branch off from:</p> -<blockquote> - <p><strong>develop</strong></p> -</blockquote> - -<p>Must merge back into:</p> -<blockquote> - <p><strong>develop</strong></p> -</blockquote> - -<p>Branch naming convention:</p> -<blockquote> - <p>anything except master, develop, release-*, or hotfix-*</p> -</blockquote> - -<p>Feature branches (or sometimes called topic branches) are used to develop new features for the upcoming or a distant future release. When starting development of a feature, the target release in which this feature will be incorporated may well be unknown at that point. The essence of a feature branch is that it exists as long as the feature is in development, but will eventually be merged back into <strong>develop</strong> (to definitely add the new feature to the upcoming release) or discarded (in case of a disappointing experiment).</p> - -<p>Feature branches typically exist in developer repos only, not in <strong>origin</strong>.</p> - -<p><img src="/assets/images/release-manual/14864367062507.jpg" alt="" /></p> - -<h3 id="creating-a-feature-branch">Creating a feature branch</h3> - -<p>When starting work on a new feature, branch off from the <strong>develop</strong> branch.</p> - -<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout -b myfeature develop -Switched to a new branch <span class="s2">"myfeature"</span> -</code></pre> -</div> -<h3 id="incorporating-a-finished-feature-on-develop">Incorporating a finished feature on develop</h3> - -<p>Finished features may be merged into the <strong>develop</strong> branch to definitely add them to the upcoming release:</p> - -<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout develop -Switched to branch <span class="s1">'develop'</span> -<span class="gp">$ </span>git merge --no-ff myfeature -Updating ea1b82a..05e9557 -<span class="o">(</span>Summary of changes<span class="o">)</span> -<span class="gp">$ </span>git branch -d myfeature -Deleted branch myfeature <span class="o">(</span>was 05e9557<span class="o">)</span>. -<span class="gp">$ </span>git push origin develop -</code></pre> -</div> - -<p>The âno-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature. Compare:</p> - -<p><img src="/assets/images/release-manual/14864368514198.jpg" alt="" /></p> - -<p>In the latter case, it is impossible to see from the Git history which of the commit objects together have implemented a featureâyou would have to manually read all the log messages. Reverting a whole feature (i.e. a group of commits), is a true headache in the latter situation, whereas it is easily done if the <strong>âno-ff</strong> flag was used.</p> - -<p>Yes, it will create a few more (empty) commit objects, but the gain is much bigger than the cost.</p> - -<h2 id="release-branches">Release branches</h2> - -<p>May branch off from:</p> -<blockquote> - <p><strong>develop</strong></p> -</blockquote> - -<p>Must merge back into:</p> -<blockquote> - <p><strong>develop and master</strong></p> -</blockquote> - -<p>Branch naming convention:</p> -<blockquote> - <p><strong>release-</strong>*</p> -</blockquote> - -<p>Release branches support preparation of a new production release. They allow for last-minute dotting of iâs and crossing tâs. Furthermore, they allow for minor bug fixes and preparing meta-data for a release (version number, build dates, etc.). By doing all of this work on a release branch, the <strong>develop</strong> branch is cleared to receive features for the next big release.</p> - -<p>The key moment to branch off a new release branch from <strong>develop</strong> is when develop (almost) reflects the desired state of the new release. At least all features that are targeted for the release-to-be-built must be merged in to develop at this point in time. All features targeted at future releases may notâthey must wait until after the release branch is branched off.</p> - -<p>It is exactly at the start of a release branch that the upcoming release gets assigned a version numberânot any earlier. Up until that moment, the develop branch reflected changes for the ânext releaseâ, but it is unclear whether that ânext releaseâ will eventually become 0.3 or 1.0, until the release branch is started. That decision is made on the start of the release branch and is carried out by the projectâs rules on version number bumping.</p> - -<h3 id="creating-a-release-branch">Creating a release branch</h3> - -<p>Release branches are created from the develop branch:</p> - -<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout -b release-4.0.0-incubating develop -Switched to a new branch <span class="s2">"release-4.0.0-incubating"</span> -</code></pre> -</div> - -<p>Please refer to <a href="/docs/release-manual">here</a> for the following process.</p> - -<p>After the Apache release process is done, remember to merge back into <strong>develop</strong> and <strong>master</strong> branches.</p> - -<h2 id="hotfix-branches">Hotfix branches</h2> - -<p>May branch off from:</p> -<blockquote> - <p><strong>master</strong></p> -</blockquote> - -<p>Must merge back into:</p> -<blockquote> - <p><strong>develop and master</strong></p> -</blockquote> - -<p>Branch naming convention:</p> -<blockquote> - <p><strong>hotfix-*</strong></p> -</blockquote> - -<p>Hotfix branches are very much like release branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version. When a critical bug in a production version must be resolved immediately, a hotfix branch may be branched off from the corresponding tag on the master branch that marks the production version.</p> - -<p>The essence is that work of team members (on the develop branch) can continue, while another person is preparing a quick production fix. -<img src="/assets/images/release-manual/14864376551544.jpg" alt="" /></p> - -<h1 id="references">References</h1> - -<p>[1] http://nvie.com/posts/a-successful-git-branching-model/</p> - - - - </section> - - <footer class="page__meta"> - - - - - - <p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> Updated:</strong> <time datetime="2017-02-08">February 08, 2017</time></p> - - </footer> - - <section class="page__share"> - - <h4 class="page__share-title">Share on</h4> - - - <a href="https://twitter.com/intent/tweet?via=ApacheRocketMQ&text=Branching Model /docs/branching-model" class="btn btn--twitter" title="Share on Twitter"><i class="fa fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a> - - <a href="https://www.facebook.com/sharer/sharer.php?u=/docs/branching-model"; class="btn btn--facebook" title="Share on Facebook"><i class="fa fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a> - - <a href="https://plus.google.com/share?url=/docs/branching-model"; class="btn btn--google-plus" title="Share on Google Plus"><i class="fa fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a> - - <a href="https://www.linkedin.com/shareArticle?mini=true&url=/docs/branching-model"; class="btn btn--linkedin" title="Share on LinkedIn"><i class="fa fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a> -</section> - - - - <nav class="pagination"> - - <a href="/docs/release-manual" class="pagination--pager" title="Release Manual -">Previous</a> - - - <a href="/dowloading/releases/" class="pagination--pager" title="Downloading the Apache RocketMQ Releases -">Next</a> - - </nav> - - </div> - - - <div class="page__comments"> - - - <h4 class="page__comments-title">Leave a Comment</h4> - <section id="disqus_thread"></section> - -</div> - - </article> - - - -</div> - - <div class="page__footer"> - <footer> - <!-- start custom footer snippets --> - -<!-- end custom footer snippets --> - <style type="text/css"> - div.columns { float: left; margin-left: 10px;} - div.clear { clear: both; } -</style> -<div> - <div class="columns"> - <a href="https://www.apache.org/";><img src="/assets/images/feather-small.gif" alt="Apache Software Foundation" style="height: 88px !important" /></a> - </div> - <div class="columns" style="width: 80%"> - <div class="page__footer-follow"> - <ul class="social-icons"> - - <li><strong>Follow:</strong></li> - - - <li><a href="https://twitter.com/ApacheRocketMQ";><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li> - - - - <li><a href="http://github.com/apache/incubator-rocketmq";><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li> - - - <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li> - </ul> - </div> - - <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. All Rights Reserved.</div> - </div> -</div> -<div class="clear"></div> - </footer> - </div> - - <script src="/assets/js/main.min.js"></script> - - - - - <script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-89603173-1', 'auto'); - ga('send', 'pageview'); -</script> - -<script> -var _hmt = _hmt || []; -(function() { - var hm = document.createElement("script"); - hm.src = "https://hm.baidu.com/hm.js?36428f2b841d08e7405724cbf7f860d2";; - var s = document.getElementsByTagName("script")[0]; - s.parentNode.insertBefore(hm, s); -})(); -</script> - - - - - - <script type="text/javascript"> - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ - var disqus_shortname = 'rocketmq'; - - /* * * DON'T EDIT BELOW THIS LINE * * */ - (function() { - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js'; - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); - })(); - - /* * * DON'T EDIT BELOW THIS LINE * * */ - (function () { - var s = document.createElement('script'); s.async = true; - s.type = 'text/javascript'; - s.src = '//' + disqus_shortname + '.disqus.com/count.js'; - (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s); - }()); - </script> - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript";>comments powered by Disqus.</a></noscript> - - - - - - - </body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/cli-admin-tool/index.html ---------------------------------------------------------------------- diff --git a/content/docs/cli-admin-tool/index.html b/content/docs/cli-admin-tool/index.html index b271d86..b6c971b 100644 --- a/content/docs/cli-admin-tool/index.html +++ b/content/docs/cli-admin-tool/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="CLI Admin Tool"> <meta itemprop="description" content="RocketMQ provides a CLI admin tool belt to query, manage and diagnose various issues."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 17, 2016"> <div class="page__inner-wrap"> @@ -405,7 +397,7 @@ <p>The admin tool is shipped along with RocketMQ. Either you download a pre-built binary version or build from source by yourself, you already have it.</p> -<p>In case you have source code, the <a href="https://github.com/alibaba/RocketMQ/tree/master/rocketmq-tools";>rocketmq-tools module</a> contains its source code.</p> +<p>In case you have source code, the <a href="https://github.com/apache/incubator-rocketmq/tree/master/tools";>rocketmq-tools module</a> contains its source code.</p> <h1 id="how-to-use">How to use</h1> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/cluster-deployment/index.html ---------------------------------------------------------------------- diff --git a/content/docs/cluster-deployment/index.html b/content/docs/cluster-deployment/index.html index fcfa8b6..76e48a9 100644 --- a/content/docs/cluster-deployment/index.html +++ b/content/docs/cluster-deployment/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Cluster Configuration and Deployment"> <meta itemprop="description" content="Prerequisite"> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 17, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/code-guidelines/index.html ---------------------------------------------------------------------- diff --git a/content/docs/code-guidelines/index.html b/content/docs/code-guidelines/index.html index 1301541..63c040b 100644 --- a/content/docs/code-guidelines/index.html +++ b/content/docs/code-guidelines/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Coding Guidelines"> <meta itemprop="description" content="Apache RocketMQ Coding Guidelines"> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 30, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/core-concept/index.html ---------------------------------------------------------------------- diff --git a/content/docs/core-concept/index.html b/content/docs/core-concept/index.html index e8a3b5e..f077014 100644 --- a/content/docs/core-concept/index.html +++ b/content/docs/core-concept/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Core Concept"> <meta itemprop="description" content=""> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 17, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/documentation/index.html ---------------------------------------------------------------------- diff --git a/content/docs/documentation/index.html b/content/docs/documentation/index.html index 795cfe3..0e08b7d 100644 --- a/content/docs/documentation/index.html +++ b/content/docs/documentation/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Documentation"> <meta itemprop="description" content="Apache RocketMQ Documentation"> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="March 02, 2017"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/faq/index.html ---------------------------------------------------------------------- diff --git a/content/docs/faq/index.html b/content/docs/faq/index.html index 1bdbd0f..68d33f3 100644 --- a/content/docs/faq/index.html +++ b/content/docs/faq/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Frequently Asked Questions"> <meta itemprop="description" content="The following questions are frequently asked with regard to the RocketMQ project in general. If you have further questions, make sure to consult the documentation or ask the community.General1. Why create rocketmq project instead of selecting other products?In some cases, slower consumers can slow down the producers. We tried our best efforts to handle this problems through throttling, circuit breaker or degradation, but it cannot scale out gracefully. So we begin to focus on the popular messaging solution Kafka at that time. Unfortunately, Kafka can not meet our requirements such as low latency and high reliability. So we decided to innovate a new messaging middleware to handle a broad set of use cases, ranging from traditional publish/subscribe scenario to demandingly high volume realtime transaction system that tolerates no message loss."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 28, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/motivation/index.html ---------------------------------------------------------------------- diff --git a/content/docs/motivation/index.html b/content/docs/motivation/index.html index d195bf6..f31e6e6 100644 --- a/content/docs/motivation/index.html +++ b/content/docs/motivation/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Motivation"> <meta itemprop="description" content="In the early stages, we constructed our distributed messaging middleware on the basis of ActiveMQ 5.x(less than 5.3). Our international business uses it for async communication, search, social network activity stream, data pipeline, even in our trade order process. As our trade business throughput rises more and more inconceivably, pressure originating from our messaging cluster also become more and more obvious."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 17, 2016"> <div class="page__inner-wrap"> @@ -397,7 +389,7 @@ <h1 id="why-rocketmq-">Why RocketMQ ?</h1> -<p>Based on our observations and research, with more and more queues and virtual topics in use, ActiveMQ IO module becomes a bottleneck. In some cases, slower consumers can slow down the producers. We tried our best efforts to handle this problems through throttling, circuit breaker or degradation, but it cannot scale out gracefully. So we begin to focus on the popular messaging solution Kafka at that time. Unfortunately, Kafka can not meet our requirements such as low latency and high reliability, see <a href="https://github.com/alibaba/RocketMQ/wiki/how_to_support_more_queues";>here</a> for details.</p> +<p>Based on our observations and research, with more and more queues and virtual topics in use, ActiveMQ IO module becomes a bottleneck. In some cases, slower consumers can slow down the producers. We tried our best efforts to handle this problems through throttling, circuit breaker or degradation, but it cannot scale out gracefully. So we begin to focus on the popular messaging solution Kafka at that time. Unfortunately, Kafka can not meet our requirements such as low latency and high reliability, see <a href="/rocketmq/how-to-support-more-queues-in-rocketmq/">here</a> for details.</p> <p>In this context, we decided to innovate a new messaging middleware to handle a broad set of use cases, ranging from traditional publish/subscribe scenario to demandingly high volume realtime transaction system that tolerates no message loss. We also created a cornerstone product based on RocketMQ, a Platform as a Service (PaaS) product named the <a href="https://intl.aliyun.com/";>Alibaba Cloud Platform</a>. Today, more than 100 companies are using the RocketMQ open source version in their business solutions. We believe RocketMQ can benefit more people, so we would like to share it around the world.</p> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/pull-request/index.html ---------------------------------------------------------------------- diff --git a/content/docs/pull-request/index.html b/content/docs/pull-request/index.html index 089ca40..1200a0e 100644 --- a/content/docs/pull-request/index.html +++ b/content/docs/pull-request/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="active">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Best Practice in Pull Request"> <meta itemprop="description" content="This page guides you through Git setup and contribution process."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 25, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/quick-start/index.html ---------------------------------------------------------------------- diff --git a/content/docs/quick-start/index.html b/content/docs/quick-start/index.html index 90eecdc..14abcd3 100644 --- a/content/docs/quick-start/index.html +++ b/content/docs/quick-start/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Quick Start"> <meta itemprop="description" content="How to quickly install and setup Apache RocketMQ."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="December 30, 2016"> <div class="page__inner-wrap"> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/release-manual.html ---------------------------------------------------------------------- diff --git a/content/docs/release-manual.html b/content/docs/release-manual.html index b641612..9aa2153 100644 --- a/content/docs/release-manual.html +++ b/content/docs/release-manual.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Release Manual"> <meta itemprop="description" content="Apache RocketMQ Release Manual"> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="February 08, 2017"> <div class="page__inner-wrap"> @@ -776,7 +768,7 @@ The Apache RocketMQ Team</p> ">Previous</a> - <a href="/docs/branching-model" class="pagination--pager" title="Branching Model + <a href="/dowloading/releases/" class="pagination--pager" title="Downloading the Apache RocketMQ Releases ">Next</a> </nav> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/docs/roadmap/index.html ---------------------------------------------------------------------- diff --git a/content/docs/roadmap/index.html b/content/docs/roadmap/index.html index 1556e6f..825f81f 100644 --- a/content/docs/roadmap/index.html +++ b/content/docs/roadmap/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="The RoadMap of Apache RocketMQ"> <meta itemprop="description" content="4.1.0~4.3.0-incubating RoadMap:"> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="March 08, 2017"> <div class="page__inner-wrap"> @@ -472,9 +464,9 @@ <p>RocketMQ, as a message-oriented middleware, plays a connector role in distributed environment, so in order to embrace the ecological preferably, RocketMQ community needs a series of external projects to integrate with other excellent projects.</p> <ol> - <li>rocketmq-console, provide a ops dashboard for RocketMQ. <a href="https://github.com/rocketmq/rocketmq-console-ng";>REPO</a></li> - <li>rocketmq-jms, provide a new client to support JMS 2.0. <a href="https://github.com/rocketmq/rocketmq-jms";>REPO</a></li> - <li>rocketmq-flume-ng, integrate RocketMQ with Apache Flume.<a href="https://github.com/rocketmq/rocketmq-flume-ng";>REPO</a>, <a href="https://issues.apache.org/jira/browse/FLUME-3058";>FLUME-JIRA</a></li> + <li>rocketmq-console, provide a ops dashboard for RocketMQ. <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-console";>REPO</a></li> + <li>rocketmq-jms, provide a new client to support JMS 2.0. <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-jms";>REPO</a></li> + <li>rocketmq-flume-ng, integrate RocketMQ with Apache Flume.<a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-flume";>REPO</a>, <a href="https://issues.apache.org/jira/browse/FLUME-3058";>FLUME-JIRA</a></li> <li>rocketmq-storm, integrate RocketMQ with storm. <a href="https://github.com/rocketmq/rocketmq-storm";>REPO</a></li> <li>rocketmq-ignite, integrate RocketMQ with ignite. <a href="https://issues.apache.org/jira/browse/ROCKETMQ-41";>JIRA</a>, <a href="https://issues.apache.org/jira/browse/IGNITE-4539";>IGNITE-JIRA</a></li> <li>rocketmq-spark, integrate RocketMQ with spark. <a href="https://issues.apache.org/jira/browse/ROCKETMQ-81";>JIRA</a></li> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/dowloading/releases/index.html ---------------------------------------------------------------------- diff --git a/content/dowloading/releases/index.html b/content/dowloading/releases/index.html index 1392f63..b3550ee 100644 --- a/content/dowloading/releases/index.html +++ b/content/dowloading/releases/index.html @@ -57,7 +57,7 @@ <meta property="og:type" content="article"> - <meta property="article:published_time" content="2017-03-17T18:12:56+08:00"> + <meta property="article:published_time" content="2017-03-19T22:48:37+08:00"> @@ -243,14 +243,6 @@ - <li><a href="/docs/branching-model" class="">Branching Model</a></li> - - - - - - - <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li> @@ -369,7 +361,7 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> <meta itemprop="headline" content="Downloading the Apache RocketMQ Releases"> <meta itemprop="description" content="Use the links below to download the Apache RocketMQ Releases, the latest release is 4.0.0-incubating."> - <meta itemprop="datePublished" content="March 17, 2017"> + <meta itemprop="datePublished" content="March 19, 2017"> <meta itemprop="dateModified" content="February 21, 2017"> <div class="page__inner-wrap"> @@ -422,7 +414,7 @@ <nav class="pagination"> - <a href="/docs/branching-model" class="pagination--pager" title="Branching Model + <a href="/docs/release-manual" class="pagination--pager" title="Release Manual ">Previous</a> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/feed.xml ---------------------------------------------------------------------- diff --git a/content/feed.xml b/content/feed.xml index 95f7e43..f588f89 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; version="3.3.1">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2017-03-17T18:12:56+08:00</updated><id>//</id><title type="html">Apache RocketMQ</title><subtitle>The homepage of RocketMQ.</subtitle><author><name>{"name"=>nil, "avatar"=>"/assets/images/rmq-logo.png", "bio"=>"A fast, low latency, reliable, scalable, distributed MOM.", "location"=>"Hangzhou, China", "email"=>"d...@rocketmq.incubator.apache.org", "uri"=>"http://incubator.staging.apache.org/projects/rocketmq.html", "bitbucket"=>nil, "codepen"=>nil, "dribbble"=>nil, "flickr"=>nil, &quo t;facebook"=>nil, "foursquare"=>nil, "github"=>"apache/incubator-rocketmq", "google_plus"=>nil, "keybase"=>nil, "instagram"=>nil, "lastfm"=>nil, "linkedin"=>nil, "pinterest"=>nil, "soundcloud"=>nil, "stackoverflow"=>"questions/tagged/rocketmq", "steam"=>nil, "tumblr"=>nil, "twitter"=>"ApacheRocketMQ", "vine"=>nil, "weibo"=>nil, "xing"=>nil, "youtube"=>nil, "quora"=>"topic/RocketMQ"}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title type="html">Four Methods to Feed Name Server Address List</title><link href="/rocketmq/four-methods-to-feed-name-server-address-list/" rel="alternate" type="text/html" title="Four Met hods to Feed Name Server Address List" /><published>2017-02-10T00:00:00+08:00</published><updated>2017-02-10T00:00:00+08:00</updated><id>/rocketmq/four-methods-to-feed-name-server-address-list</id><content type="html" xml:base="/rocketmq/four-methods-to-feed-name-server-address-list/"><p>In Apache RocketMQ, name servers are designed to coordinate each component of the distributed system +<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; version="3.3.1">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2017-03-19T22:48:37+08:00</updated><id>//</id><title type="html">Apache RocketMQ</title><subtitle>The homepage of RocketMQ.</subtitle><author><name>{"name"=>nil, "avatar"=>"/assets/images/rmq-logo.png", "bio"=>"A fast, low latency, reliable, scalable, distributed MOM.", "location"=>"Hangzhou, China", "email"=>"d...@rocketmq.incubator.apache.org", "uri"=>"http://incubator.staging.apache.org/projects/rocketmq.html", "bitbucket"=>nil, "codepen"=>nil, "dribbble"=>nil, "flickr"=>nil, &quo t;facebook"=>nil, "foursquare"=>nil, "github"=>"apache/incubator-rocketmq", "google_plus"=>nil, "keybase"=>nil, "instagram"=>nil, "lastfm"=>nil, "linkedin"=>nil, "pinterest"=>nil, "soundcloud"=>nil, "stackoverflow"=>"questions/tagged/rocketmq", "steam"=>nil, "tumblr"=>nil, "twitter"=>"ApacheRocketMQ", "vine"=>nil, "weibo"=>nil, "xing"=>nil, "youtube"=>nil, "quora"=>"topic/RocketMQ"}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title type="html">Four Methods to Feed Name Server Address List</title><link href="/rocketmq/four-methods-to-feed-name-server-address-list/" rel="alternate" type="text/html" title="Four Met hods to Feed Name Server Address List" /><published>2017-02-10T00:00:00+08:00</published><updated>2017-02-10T00:00:00+08:00</updated><id>/rocketmq/four-methods-to-feed-name-server-address-list</id><content type="html" xml:base="/rocketmq/four-methods-to-feed-name-server-address-list/"><p>In Apache RocketMQ, name servers are designed to coordinate each component of the distributed system and fulfill much of this responsibility through managing topic route information.</p> <p>The management, roughly speaking, consists two parts:</p> @@ -252,21 +252,21 @@ and fulfill much of this responsibility through managing topic route information <li>Brand New UI</li> <li>I18n Support</li> <li><a href="https://projects.spring.io/spring-boot/">Spring Boot</a> + <a href="http://getbootstrap.com/">Bootstrap</a> Recommended</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-console-ng">RocketMQ Console Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-console">RocketMQ Console Repository</a></li> </ol> <h3 id="rocketmq-jms">RocketMQ-JMS</h3> <ol> <li>Supporting JMS 2.0 Protocol</li> <li>Rich Documentation and Good Test Cases Coverage</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-jms">RocketMQ JMS Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-jms">RocketMQ JMS Repository</a></li> </ol> <h3 id="rocketmq-flume">RocketMQ-Flume</h3> <ol> <li>Supporting Latest <a href="http://flume.apache.org/">Flume</a></li> <li>Rich Documentation and Good Test Cases Coverage</li> - <li>Join by Creating Pull Requests against <a href="https://github.com/rocketmq/rocketmq-flume-ng">RocketMQ Flume Repository</a></li> + <li>Join by Creating Pull Requests against <a href="https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-flume">RocketMQ Flume Repository</a></li> </ol></content><author><name>{"name"=>nil, "avatar"=>"/assets/images/rmq-logo.png", "bio"=>"A fast, low latency, reliable, scalable, distributed MOM.", "location"=>"Hangzhou, China", "email"=>"d...@rocketmq.incubator.apache.org", "uri"=>"http://incubator.staging.apache.org/projects/rocketmq.html", "bitbucket"=>nil, "codepen"=>nil, "dribbble"=>nil, "flickr"=>nil, "facebook"=>nil, "foursquare"=>nil, "github"=>"apache/incubator-rocketmq", "google_plus"=>nil, "keybase"=>nil, "instagram"=>nil, "lastfm"=>nil, "linkedin"=>nil, "pinterest"=>nil, "soundcloud"=>nil, "stackoverflow"=>"questions/tagged/rocketmq", "steam"=>nil, "tumblr& quot;=>nil, "twitter"=>"ApacheRocketMQ", "vine"=>nil, "weibo"=>nil, "xing"=>nil, "youtube"=>nil, "quora"=>"topic/RocketMQ"}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><category term="Activity" /><category term="Code" /><category term="Marathon" /><summary type="html">ROCKETMQ CODE MARATHON January 5th 2017</summary></entry><entry><title type="html">Mastering Component Compatible Dependency</title><link href="/maven/mastering-component-compatible-dependency/" rel="alternate" type="text/html" title="Mastering Component Compatible Dependency" /><published>2016-12-23T00:00:00+08:00</published><updated>2016-12-23T00:00:00+08:00</updated><id>/maven/mastering-component-compatible-dependency</id><content type="html" xml:base="/maven/mastering-component-compatible-dependency/"><p>This article mainly includes three parts.at first,I will introduce compatibility principle(more details see <a href="http://blog.csdn.net/fengjia10/article/details/7799227">here</a>) briefly.followed by a detailed elaborating about Java component compatible dependency,including the interface-oriented programming,single component signature protection,single component compatibility protection and multi-component compatibility compile time checking.Finally is the review and pr ospect,especially about <strong>Dependency Mediator</strong> project.</p> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/92d5c5f1/content/sitemap.xml ---------------------------------------------------------------------- diff --git a/content/sitemap.xml b/content/sitemap.xml index 21d58bb..1d92d38 100644 --- a/content/sitemap.xml +++ b/content/sitemap.xml @@ -60,9 +60,6 @@ <loc>/docs/release-manual</loc> </url> <url> -<loc>/docs/branching-model</loc> -</url> -<url> <loc>/dowloading/releases/</loc> </url> <url> @@ -147,9 +144,6 @@ <loc>/docs/release-manual</loc> </url> <url> -<loc>/docs/branching-model</loc> -</url> -<url> <loc>/dowloading/releases/</loc> </url> <url>
