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/43c655e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/43c655e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/43c655e5 Branch: refs/heads/asf-site Commit: 43c655e5bbb14fa40a51f437e0ee0ddfefab320b Parents: 35d0b53 ad35d97 Author: yukon <yu...@apache.org> Authored: Tue Jan 24 13:44:54 2017 +0800 Committer: yukon <yu...@apache.org> Committed: Tue Jan 24 13:44:54 2017 +0800 ---------------------------------------------------------------------- README.md | 2 +- _about/02-contact.md | 9 +- _about/03-rewards.md | 13 ++ _data/navigation.yml | 2 + _docs/07-code-guidelines.md | 7 +- ...2017-01-24-release-notes-4.0.0-incubating.md | 146 +++++++++++++++++++ assets/images/code_guidelines/codestyle-pre.png | Bin 0 -> 216377 bytes assets/images/rewards/2016_oschina.jpg | Bin 0 -> 1739519 bytes 8 files changed, 172 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
