This repository was archived by the owner on Sep 5, 2023. It is now read-only.
docs: Fix conflict tag introduced in PR 104#106
Merged
tmatsuo merged 9 commits intogoogleapis:masterfrom Feb 24, 2021
Merged
Conversation
added 8 commits
December 11, 2020 17:56
…ace unpublished entirely.
|
Here is the summary of changes. You are about to add 1 region tag.
You are about to delete 1 region tag.
This comment is generated by snippet-bot.
|
product-auto-label
bot
added
the
api: securitycenter
google-cla
bot
added
the
cla: yes
Strykrol
changed the title
Contributor
Author
|
Please prioritize this small PR so I can submit the docs' updates for Security Command Center. Thank you! |
tmatsuo
approved these changes
Feb 24, 2021
tmatsuo
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
gcf-merge-on-green bot
pushed a commit
that referenced
this pull request
May 19, 2021
🤖 I have created a release \*beep\* \*boop\* --- ## [1.2.0](https://www.github.com/googleapis/python-securitycenter/compare/v1.1.0...v1.2.0) (2021-05-19) ### Features * add canonical_name and folder fields ([16a33f4](https://www.github.com/googleapis/python-securitycenter/commit/16a33f4c994b80d9c50537f2e1299282d525171e)) * support self-signed JWT flow for service accounts ([16a33f4](https://www.github.com/googleapis/python-securitycenter/commit/16a33f4c994b80d9c50537f2e1299282d525171e)) ### Bug Fixes * add async client to %name_%version/init.py ([16a33f4](https://www.github.com/googleapis/python-securitycenter/commit/16a33f4c994b80d9c50537f2e1299282d525171e)) * fix retry deadlines ([#116](https://www.github.com/googleapis/python-securitycenter/issues/116)) ([15c28e8](https://www.github.com/googleapis/python-securitycenter/commit/15c28e88f5b52a6e4f608198446b0753bf48734e)) ### Documentation * Fix conflict tag introduced in PR 104 ([#106](https://www.github.com/googleapis/python-securitycenter/issues/106)) ([f4f14ee](https://www.github.com/googleapis/python-securitycenter/commit/f4f14ee32602aad7b7a4837e330919b4276d7b18)) * standardize new tag with existing tags from other languages ([#104](https://www.github.com/googleapis/python-securitycenter/issues/104)) ([55582ac](https://www.github.com/googleapis/python-securitycenter/commit/55582acd814f7cd290580d5caa531725d2ff58b8)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Last one hopefully.
Fixing a conflicting tag introduced in #104 . I overlooked this and added the same tag twice, sorry about the PR blast, but this should round out the work needed to update all user docs. Thank you for handling these with expediency!