You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2017/10/16 13:45:11 UTC
[17/18] brooklyn-docs git commit: Merge remote-tracking branch
'apache/0.12.0'
Merge remote-tracking branch 'apache/0.12.0'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/fa1077f5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/fa1077f5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/fa1077f5
Branch: refs/heads/master
Commit: fa1077f541947c57e265e58b72940e785ed7791f
Parents: 3ebb1e6 31d3b9f
Author: Richard Downer <ri...@apache.org>
Authored: Mon Oct 16 14:29:18 2017 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Oct 16 14:29:18 2017 +0100
----------------------------------------------------------------------
_config.yml | 8 +-
guide/misc/download.md | 6 +-
guide/ops/upgrade.md | 6 +-
style/js/public.js | 22 ++--
.../release-process/environment-variables.md | 4 +-
website/download/index.md | 2 +-
website/download/verify.md | 130 +++++++++++++++++++
website/meta/versions.md | 2 +
8 files changed, 157 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/fa1077f5/_config.yml
----------------------------------------------------------------------
diff --cc _config.yml
index 5d464bc,c051d03..576b802
--- a/_config.yml
+++ b/_config.yml
@@@ -45,16 -45,16 +45,16 @@@ exclude: ['/Gemfile*','/README.md'
sass:
sass_dir: style/css
- # TODO the 0.11.0 paths must be changed!
- brooklyn-stable-version: 0.11.0
+ # TODO the 0.12.0 paths must be changed!
+ brooklyn-stable-version: 0.12.0
pdf-default-base-url: http://brooklyn.apache.org
- pdf-default-versioned-url-subpath: /v/0.11.0
+ pdf-default-versioned-url-subpath: /v/0.12.0
pdf-rewrite-prefixes:
- '/guide' : '/v/0.11.0'
+ '/guide' : '/v/0.12.0'
'/website' : ''
-brooklyn-version: 0.12.0 # BROOKLYN_VERSION
+brooklyn-version: 1.0.0-SNAPSHOT # BROOKLYN_VERSION
brooklyn-snapshot-git-branch: master # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4)
# This is auto-detected, but you can override it if needed.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/fa1077f5/guide/ops/upgrade.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/fa1077f5/website/developers/committers/release-process/environment-variables.md
----------------------------------------------------------------------
diff --cc website/developers/committers/release-process/environment-variables.md
index d2f3243,4136374..d99473b
--- a/website/developers/committers/release-process/environment-variables.md
+++ b/website/developers/committers/release-process/environment-variables.md
@@@ -9,12 -9,12 +9,12 @@@ releases. To allow these example comman
{% highlight bash %}
# The version currently set on the master branch (BROOKLYN_VERSION_BELOW)
-OLD_MASTER_VERSION=0.12.0
+OLD_MASTER_VERSION=1.0.0-SNAPSHOT
# The next version to be set on the master branch
--NEW_MASTER_VERSION=0.10.0-SNAPSHOT
++NEW_MASTER_VERSION=1.1.0-SNAPSHOT
# The version we are releasing now.
--VERSION_NAME=0.9.0
++VERSION_NAME=1.0.0
# The release candidate number we are making now.
RC_NUMBER=1