GitHub user revans2 opened a pull request:
https://github.com/apache/storm/pull/1235
STORM-1617: Versioned Docs 1.x
This is intended to be merged and used with
https://svn.apache.org/repos/asf/storm/branches/bobby-versioned-site
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/revans2/incubator-storm versioned-docs-1.x
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/1235.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1235
----
commit d491c3ff225f6fa7a027bc04b4ebb575f4f128e8
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Date: 2016-03-19T17:15:21Z
STORM-1617: Release Specific Documentation 0.9.x
Conflicts:
.gitignore
docs/README.md
docs/_config.yml
docs/_includes/footer.html
docs/_includes/head.html
docs/_includes/header.html
docs/_layouts/about.html
docs/_layouts/default.html
docs/_layouts/documentation.html
docs/_layouts/page.html
docs/_layouts/post.html
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css.map
docs/assets/js/bootstrap.min.js
docs/images/logos/alibaba.jpg
docs/images/logos/groupon.jpg
docs/images/logos/parc.png
docs/images/logos/webmd.jpg
docs/images/topology.png
Conflicts:
.gitignore
docs/README.md
docs/STORM-UI-REST-API.md
docs/_config.yml
docs/_includes/footer.html
docs/_includes/head.html
docs/_includes/header.html
docs/_layouts/about.html
docs/_layouts/default.html
docs/_layouts/documentation.html
docs/_layouts/page.html
docs/_layouts/post.html
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css.map
docs/assets/js/bootstrap.min.js
docs/images/logos/alibaba.jpg
docs/images/logos/groupon.jpg
docs/images/logos/parc.png
docs/images/logos/webmd.jpg
commit 97f0558e13c5ab7aecc30d7cc6b88fb57aa1e98e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Date: 2016-03-19T17:33:31Z
STORM-1617: 0.10.x release docs
Conflicts:
docs/images/topology.png
commit a107b93f356f58f2db2c4ec16407052d7c1b5d85
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Date: 2016-03-19T17:56:04Z
STORM-1617: added in 1.x specific doc changes
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
