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

[chore]- Merge release/v0.25.0 branch to main v0.68.0 #1792

Merged
merged 4 commits into from
Jan 31, 2023

Conversation

vasireddy99
Copy link
Contributor

Description:

This PR is created to merge changes from release branch to main.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

PaurushGarg and others added 2 commits January 27, 2023 08:57
…y#1783)

* update allowlist to include operator version 0.68.0

* Updating allowlist
…ity#1787)

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
@vasireddy99 vasireddy99 requested a review from a team as a code owner January 30, 2023 04:31
@vasireddy99 vasireddy99 changed the title [chore]- Merge release branch to main v0.68.0 [chore]- Merge release/v0.25.0 branch to main v0.68.0 Jan 30, 2023
@PaurushGarg PaurushGarg merged commit 3fed655 into aws-observability:main Jan 31, 2023
@vasireddy99 vasireddy99 deleted the rel-main branch January 31, 2023 16:58
vasireddy99 added a commit that referenced this pull request Feb 7, 2023
* [chore]- Merge release/v0.25.0 branch to main v0.68.0  (#1792)

* update allowlist to include operator version 0.68.0 (#1783)

* update allowlist to include operator version 0.68.0

* Updating allowlist

* Add ref for cache-from value (#1778) (#1787)

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

* Use us-west-2 region in prod (#1794)

---------

Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

* Limit Cocurrent jobs to 4 (#1795)

* Added retry wait time of 10 sec between failed jobs (#1796)

* Login public ECR to increase rate limit (#1798)

* Add PR build creds (#1803)

* Remove wait duration and max concurrency (#1805)

* Support version upgrade for MSI packages  (#1808)

* update windows package

* add unique product ID

* Linting

* Add unique Product ID string

* move major upgrade below package tag

* Generate GUID using GUIDgen

* Update tools/packaging/windows/aws-otel-collector.wxs

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

* Update sed search pattern

* Update tools/release/bump-version-and-create-release-note.sh

* Update tools/release/bump-version-and-create-release-note.sh

Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>

---------

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>

* bump version to v0.26.0 (#1809)

* Update Readme links for docs (#1812)

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

---------

Co-authored-by: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com>
Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
Co-authored-by: Kausik <kausika@amazon.com>
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants