rename import redirect in worker/uniter #16435
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
corecharm is explicitly github.com/juju/juju/core/charm. Very confusing to see corecharm used for githubm.com/juju/charm. The two packages are no way interchangable. Uniter has its own charm pkg.
jack-w-shaw
approved these changes
Oct 17, 2023
|
/merge |
Merged
Merged
jujubot
added a commit
that referenced
this pull request
Oct 19, 2023
Merged
Merged
jujubot
added a commit
that referenced
this pull request
Oct 20, 2023
#16462 Forward ports: - #16426 - #16435 - #16445 - #16452 - #16451 - #16453 - #16455 - #16456 - #16457 - #16460 - #16461 Conflicts: - apiserver/facades/agent/provisioner/imagemetadata_test.go - environs/bootstrap/bootstrap.go - environs/simplestreams/datasource.go - environs/simplestreams/datasource_test.go - go.sum - worker/dbaccessor/package_test.go - worker/firewaller/firewaller_test.go - worker/modelcache/worker_test.go - worker/uniter/charm/bundles_test.go - worker/uniter/uniter_test.go - worker/uniter/util_test.go - cmd/juju/status/status_internal_test.go
jujubot
added a commit
that referenced
this pull request
Oct 23, 2023
#16470 Merge branch `3.3` into `main`: - #16426 - #16435 - #16445 - #16452 - #16451 - #16453 - #16455 - #16456 - #16457 - #16460 - #16461 - #16454 - #16394 - #16469 ``` # Conflicts: # apiserver/common/secrets/access.go # apiserver/common/secrets/access_test.go # apiserver/common/secrets/drain.go # apiserver/common/secrets/drain_test.go # apiserver/common/secrets/mocks/commonsecrets_mock.go # apiserver/common/secrets/watcher.go # apiserver/common/secrets/watcher_test.go # apiserver/facades/agent/provisioner/imagemetadata_test.go # apiserver/facades/agent/secretsdrain/mocks/modelstate.go # apiserver/facades/agent/secretsdrain/mocks/secretsprovider.go # apiserver/facades/agent/secretsdrain/package_test.go # apiserver/facades/agent/secretsdrain/register.go # apiserver/facades/agent/secretsdrain/state.go # cmd/jujud/agent/caasoperator/manifolds.go # environs/bootstrap/bootstrap.go # environs/simplestreams/datasource.go # environs/simplestreams/datasource_test.go # go.sum # worker/dbaccessor/package_test.go # worker/firewaller/firewaller_test.go # worker/modelcache/worker_test.go # worker/secretsdrainworker/manifold.go # worker/secretsdrainworker/manifold_test.go # worker/secretsdrainworker/package_test.go # worker/uniter/charm/bundles_test.go # worker/uniter/uniter_test.go # worker/uniter/util_test.go ```
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.
Rename corecharm to jujucharm on imports for worker/uniter. corecharm should be github.com/juju/juju/core/charm to be consistent with other juju code. Very confusing to see corecharm used for githubm.com/juju/charm. The two packages are no way interchangable. Uniter has its own charm pkg.
QA steps
Successful unit test runs.