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(cdk-build-tools): backport feature flag based conditional from v2-main #13056

Merged
merged 2 commits into from
Feb 16, 2021

Conversation

nija-at
Copy link
Contributor

@nija-at nija-at commented Feb 15, 2021

This was originally commented out - d7e028a - since this was not yet
compatible with the v2-main branch.

Since then, the v2-main branch has been updated - 7554246 - with the
necessary fixes and the conditional has been enabled there1.

No effective change to master branch because of this. It reduces divergence
of the two active branches.


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

…v2-main

This was originally commented out - d7e028a - since this was not yet
compatible with the v2-main branch.

Since then, the v2-main branch has been updated - 7554246 - with the
necessary fixes and the conditional has been enabled there[1].

[1]: 7554246#diff-d325e066c7cdf5d2a8423e65b0190045defe711b4dc25adc0a94a11eef163ed9
@nija-at nija-at requested a review from a team February 15, 2021 15:11
@nija-at nija-at self-assigned this Feb 15, 2021
@gitpod-io
Copy link

gitpod-io bot commented Feb 15, 2021

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Feb 15, 2021
@mergify
Copy link
Contributor

mergify bot commented Feb 16, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify
Copy link
Contributor

mergify bot commented Feb 16, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit b984b19 into master Feb 16, 2021
@mergify mergify bot deleted the nija-at/backport-feature-flag branch February 16, 2021 17:08
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 167d764
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

NovakGu pushed a commit to NovakGu/aws-cdk that referenced this pull request Feb 18, 2021
…v2-main (aws#13056)

This was originally commented out - d7e028a - since this was not yet
compatible with the v2-main branch.

Since then, the v2-main branch has been updated - 7554246 - with the
necessary fixes and the conditional has been enabled there[1].

No effective change to master branch because of this. It reduces divergence
of the two active branches.

[1]: aws@7554246#diff-d325e066c7cdf5d2a8423e65b0190045defe711b4dc25adc0a94a11eef163ed9


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
eladb pushed a commit that referenced this pull request Feb 22, 2021
…v2-main (#13056)

This was originally commented out - d7e028a - since this was not yet
compatible with the v2-main branch.

Since then, the v2-main branch has been updated - 7554246 - with the
necessary fixes and the conditional has been enabled there[1].

No effective change to master branch because of this. It reduces divergence
of the two active branches.

[1]: 7554246#diff-d325e066c7cdf5d2a8423e65b0190045defe711b4dc25adc0a94a11eef163ed9


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants