Next release conflict fixed #1996
Merged
Conversation
This file contains 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
…ipeline DROTH-3228 add missing webhook
…Formation for lambda and it's pipeline
…for creating and updating job def
…RoadLinkCache batch
…oup rules, renamed resources
…rod_batches_on_prod_account Droth 3214 run prod batches on prod account
…rod_batches_on_prod_account Droth 3214 run prod batches on prod account
…e_caching_job_def Droth 3259 enable caching job def
… errors found when creating stack on prod account
…rod_batches_on_prod_account Droth 3214 run prod batches on prod account
…rod_batches_on_prod_account DROTH-3214 Fixed JobDefinition
…need for multiple resources on same account
…rod_batches_on_prod_account DROTH-3214 batch fail topic and event rule moved to own template, no …
…eIncomplete_refactor_new_branch Droth 3198 update incomplete refactor new branch
…asicAuth_vvh Droth 3258 add basic auth vvh
…eIncomplete_refactor_new_branch Droth 3198 update incomplete refactor new branch
pull image with test tag, default was latest
anttiahopeltositowise
requested review from
sasuolanderSito,
reetta-kivisto and
SWJPTulijoki
|
Tehty siis masterista haara, mergetty siihen NextRelease, korjattu confliktit, tehty uusi haara NextRelasesesta, josta nyt tämä pullari/merge NextReleaseen |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Noniin nyt pitäisi olla confliktit ratkottu, näyttäisi omaan silmään ainakin oikealta