Skip to content

[7.1][DOCS] Backport: Fix asciidoctor build#13460

Merged
dedemorton merged 5 commits intoelastic:7.1from
dedemorton:fix_asciidoctor_7.1
Sep 4, 2019
Merged

[7.1][DOCS] Backport: Fix asciidoctor build#13460
dedemorton merged 5 commits intoelastic:7.1from
dedemorton:fix_asciidoctor_7.1

Conversation

@dedemorton
Copy link
Copy Markdown
Contributor

Backports the following PRs to the 7.1 branch and adds additional commits to get the asciidoctor build working in 7.1.

#12006
#12434

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review
* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update
@urso
Copy link
Copy Markdown

urso commented Sep 2, 2019

@dedemorton looks like make check fails. Running make update might resolve the issue.

@dedemorton
Copy link
Copy Markdown
Contributor Author

dedemorton commented Sep 4, 2019

merging because the doc checks now pass. The other failures are already described in the list of flaky tests, so I am ignoring.

@dedemorton dedemorton merged commit 99e4fbe into elastic:7.1 Sep 4, 2019
@dedemorton dedemorton deleted the fix_asciidoctor_7.1 branch September 4, 2019 17:23
dedemorton added a commit to dedemorton/beats that referenced this pull request Sep 5, 2019
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
dedemorton added a commit that referenced this pull request Sep 5, 2019
* [7.1][DOCS] Backport: Fix asciidoctor build (#13460)

* Asciidoctor migration (#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test

* Run make update

* Fix code formatting

* Remove attributes not used in this branch

* Remove unwanted section added during backport

* Revert to 6.8 version of journalbeat example
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants