Skip to content

Bump current version to 7.17 #2333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 1, 2022
Merged

Bump current version to 7.17 #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a96e88d
bump current version
bmorelli25 Dec 30, 2021
f9406aa
Merge remote-tracking branch 'upstream/master' into 7.17.0-release
jrodewig Jan 27, 2022
357fb41
Swap 7.16 for 7.17 in attributes
jrodewig Jan 27, 2022
2cd7a3d
Update live branches
jrodewig Jan 27, 2022
af37b81
Update Java Transport Client
jrodewig Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ contents_title: Elastic Stack and Product Documentation
# <key>: &<variable> <value>
# The keys don't really matter, but by convention the are the same as the variable.
variables:
stackcurrent: &stackcurrent 7.16
stacklive: &stacklive [ master, 8.0, 7.17, 7.16, 6.8 ]
stackcurrent: &stackcurrent 7.17
stacklive: &stacklive [ master, 8.0, 7.17, 6.8 ]

stacklivemain: &stacklivemain [ main, 8.0, 7.17, 7.16, 6.8 ]
stacklivemain: &stacklivemain [ main, 8.0, 7.17, 6.8 ]

cloudSaasCurrent: &cloudSaasCurrent ms-68

Expand Down Expand Up @@ -653,9 +653,9 @@ contents:
exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ]
- title: Java Transport Client (deprecated)
prefix: java-api
current: *stackcurrent
current: 7.17
branches: [ 7.17, 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ]
live: *stacklive
live: [7.17, 6.8]
index: docs/java-api/index.asciidoc
tags: Clients/Java
subject: Clients
Expand Down
6 changes: 3 additions & 3 deletions shared/attributes.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:ref: https://www.elastic.co/guide/en/elasticsearch/reference/{branch}
:ref-bare: https://www.elastic.co/guide/en/elasticsearch/reference
:ref-80: https://www.elastic.co/guide/en/elasticsearch/reference/master
:ref-7x: https://www.elastic.co/guide/en/elasticsearch/reference/7.16
:ref-7x: https://www.elastic.co/guide/en/elasticsearch/reference/7.17
:ref-70: https://www.elastic.co/guide/en/elasticsearch/reference/7.0
:ref-60: https://www.elastic.co/guide/en/elasticsearch/reference/6.0
:ref-64: https://www.elastic.co/guide/en/elasticsearch/reference/6.4
Expand Down Expand Up @@ -61,7 +61,7 @@ Elastic-level pages
:defguide: https://www.elastic.co/guide/en/elasticsearch/guide/2.x
:painless: https://www.elastic.co/guide/en/elasticsearch/painless/{branch}
:plugins: https://www.elastic.co/guide/en/elasticsearch/plugins/{branch}
:plugins-7x: https://www.elastic.co/guide/en/elasticsearch/plugins/7.16
:plugins-7x: https://www.elastic.co/guide/en/elasticsearch/plugins/7.17
:plugins-6x: https://www.elastic.co/guide/en/elasticsearch/plugins/6.8
:glossary: https://www.elastic.co/guide/en/elastic-stack-glossary/current
:upgrade_guide: https://www.elastic.co/products/upgrade_guide
Expand Down Expand Up @@ -430,7 +430,7 @@ Legacy definitions
///////
Temporarily reroute APM Agent links to the new APM documentation book
///////
ifeval::["{branch}"=="7.16"]
ifeval::["{branch}"=="7.17"]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this. We should be able to remove this if block as we didn't have time to fix all of the broken links in 7.16, but did for 7.17. I'll wait until after the release to remove it though—just in case 😅.

:apm-server-ref: {apm-guide-ref}
:apm-server-ref-v: {apm-guide-ref}
:apm-overview-ref-v: {apm-guide-ref}
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.16.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ release-state can be: released | prerelease | unreleased
//////////
is-current-version can be: true | false
//////////
:is-current-version: true
:is-current-version: false

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down
4 changes: 2 additions & 2 deletions shared/versions/stack/7.17.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ bare_version never includes -alpha or -beta
//////////
release-state can be: released | prerelease | unreleased
//////////
:release-state: unreleased
:release-state: released

//////////
is-current-version can be: true | false
//////////
:is-current-version: false
:is-current-version: true

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/current.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include::7.16.asciidoc[]
include::7.17.asciidoc[]