Skip to content
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.

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

feat(docs) prepare api docs generation (backport #1741) #1955

Merged
merged 1 commit into from
May 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2021

This is an automatic backport of pull request #1741 done by Mergify.
Cherry-pick of 9196f44 has failed:

On branch mergify/bp/release-1.1/pr-1741
Your branch is up to date with 'origin/release-1.1'.

You are currently cherry-picking commit 9196f4452.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   api/mesh/v1alpha1/circuit_breaker.proto
	modified:   api/mesh/v1alpha1/externalservice.proto
	modified:   api/mesh/v1alpha1/fault_injection.proto
	modified:   api/mesh/v1alpha1/health_check.proto
	modified:   api/mesh/v1alpha1/proxy_template.proto
	modified:   api/mesh/v1alpha1/retry.proto
	modified:   api/mesh/v1alpha1/timeout.proto
	modified:   api/mesh/v1alpha1/traffic_log.proto
	modified:   api/mesh/v1alpha1/traffic_permission.proto
	modified:   api/mesh/v1alpha1/traffic_route.proto
	modified:   api/mesh/v1alpha1/traffic_trace.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   api/Makefile

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot requested a review from a team as a code owner May 6, 2021 13:04
@mergify mergify bot added the conflicts label May 6, 2021
* feat(docs) prepare api docs generation

Signed-off-by: Bart Smykla <bartek@smykla.com>

* feat(docs) mark policy proto files to gen. docs

Signed-off-by: Bart Smykla <bartek@smykla.com>
(cherry picked from commit 9196f44)
Signed-off-by: Bart Smykla <bartek@smykla.com>
@bartsmykla bartsmykla force-pushed the mergify/bp/release-1.1/pr-1741 branch from e9cbb47 to 1058ebc Compare May 6, 2021 13:10
@bartsmykla bartsmykla merged commit e458fd3 into release-1.1 May 6, 2021
@bartsmykla bartsmykla deleted the mergify/bp/release-1.1/pr-1741 branch May 6, 2021 14:20
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.

1 participant