Updating mgo dependency to bring in latest changes. #15510
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
- Specifically testing fix for macos
hpidcock
approved these changes
Apr 20, 2023
|
/merge |
2 similar comments
|
/merge |
|
/merge |
Merged
jujubot
added a commit
that referenced
this pull request
Apr 23, 2023
#15523 Merge 3.1 into 3.2 4d12a59 (upstream/3.1) Merge pull request #15520 from ycliuhw/merge-3.0-20230421 4e9c2e9 Merge pull request #15510 from tlm/mgo-update There were some conflicts. Please @jack-w-shaw take a look at the firewall and spaces_ec2 to be sure it makes sense the changes I did. ``` Auto-merging apiserver/facades/client/application/application.go Auto-merging apiserver/facades/client/application/application_unit_test.go Auto-merging go.mod CONFLICT (content): Merge conflict in go.mod Auto-merging go.sum CONFLICT (content): Merge conflict in go.sum Auto-merging provider/openstack/provider.go Auto-merging state/application.go Auto-merging state/migration_import_input_mock_test.go Auto-merging state/migration_import_tasks.go Auto-merging state/migration_import_tasks_test.go Auto-merging tests/main.sh CONFLICT (content): Merge conflict in tests/main.sh Auto-merging tests/suites/firewall/task.sh CONFLICT (add/add): Merge conflict in tests/suites/firewall/task.sh Auto-merging tests/suites/spaces_ec2/util.sh CONFLICT (content): Merge conflict in tests/suites/spaces_ec2/util.sh Automatic merge failed; fix conflicts and then commit the result. ```
Merged
jujubot
added a commit
that referenced
this pull request
May 9, 2023
#15561 Merges the following patches: - #15558 - #15554 - #15555 - #15553 - #15552 - #15549 - #15538 - #15541 - #15534 - #15537 - #15535 - #15533 - #15529 - #15530 - #15522 - #15527 - #15523 - #15514 - #15524 - #15515 - #15520 - #15518 - #15510 - #15506 - #15500 - #15508 - #15497 - #15499 - #15492 - #15490 - #15487 ### Conflicts None.
Merged
jujubot
added a commit
that referenced
this pull request
May 10, 2023
#15565 Merges the following patches: - #15561 - #15558 - #15554 - #15555 - #15553 - #15552 - #15549 - #15538 - #15541 - #15534 - #15537 - #15535 - #15533 - #15529 - #15530 - #15522 - #15527 - #15523 - #15514 - #15524 - #15515 - #15520 - #15518 - #15510 - #15506 - #15500 - #15508 - #15497 - #15499 - #15492 - #15490 - #15487 ### Conflicts None.
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.
Updates the mgo lib in 3.1 onwards. This to bring in the latest change that deals with some macos testing issues.
Checklist
QA steps
Run juju tests
Documentation changes
N/A
Bug reference
N/A