Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

docs: Fix conflict tag introduced in PR 104 #106

Merged
merged 9 commits into from Feb 24, 2021

Conversation

Strykrol
Copy link
Contributor

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!

@Strykrol Strykrol requested a review from a team as a code owner February 19, 2021 20:04
@snippet-bot
Copy link

snippet-bot bot commented Feb 19, 2021

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.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

@product-auto-label product-auto-label bot added the api: securitycenter Issues related to the googleapis/python-securitycenter API. label Feb 19, 2021
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Feb 19, 2021
@Strykrol Strykrol changed the title docs:Fix conflict tag introduced in PR 104 docs: Fix conflict tag introduced in PR 104 Feb 22, 2021
@Strykrol
Copy link
Contributor Author

Please prioritize this small PR so I can submit the docs' updates for Security Command Center. Thank you!

@tmatsuo tmatsuo added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 24, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 24, 2021
@tmatsuo tmatsuo merged commit f4f14ee into googleapis:master Feb 24, 2021
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).
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
api: securitycenter Issues related to the googleapis/python-securitycenter API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants