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/c2dd6326 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/c2dd6326 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/c2dd6326 Branch: refs/heads/asf-site Commit: c2dd6326801daef440b8522a2cd544a8be7b745f Parents: cb9039c 9f63cc1 Author: yukon <[email protected]> Authored: Sun Mar 19 22:48:27 2017 +0800 Committer: yukon <[email protected]> Committed: Sun Mar 19 22:48:27 2017 +0800 ---------------------------------------------------------------------- _config.yml | 1 + _data/navigation.yml | 4 +-- _docs/02-motivation.md | 2 +- _docs/04-cli-admin-tool.md | 2 +- _docs/11-rocketmq-road-map.md | 6 ++--- .../2017-01-05-launch-rocketmq-code-marathon.md | 6 ++--- alibaba-rocketmq-jekyll.gemspec | 28 -------------------- apache-rocketmq-jekyll.gemspec | 28 ++++++++++++++++++++ 8 files changed, 39 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
