Skip to content

Conversation

@hpidcock
Copy link
Member

@hpidcock hpidcock commented Dec 5, 2023

Bumps github.com/juju/charm to v12.0.0 to include new metadata.yaml options from juju/charm#420 and juju/charm#421

QA steps

Can deploy a charm.

Links

Jira card: JUJU-5151

@hpidcock hpidcock added the 3.4 label Dec 5, 2023
@hpidcock
Copy link
Member Author

hpidcock commented Dec 5, 2023

/merge

@jujubot jujubot merged commit 8dc6826 into juju:3.4 Dec 5, 2023
@hpidcock hpidcock mentioned this pull request Dec 7, 2023
jujubot added a commit that referenced this pull request Dec 7, 2023
#16674

Forward ports:
- #16666

Conflicts:
- api/agent/caasoperator/client.go
- api/watcher/watcher_test.go
- apiserver/common/charms/appcharminfo_test.go
- apiserver/common/charms/charminfo_test.go
- apiserver/common/charms/common.go
- apiserver/facades/agent/caasoperator/mock_test.go
- apiserver/facades/agent/caasoperator/operator.go
- apiserver/facades/agent/caasoperator/state.go
- apiserver/facades/agent/payloadshookcontext/unitfacade_test.go
- apiserver/facades/client/application/application.go
- apiserver/facades/client/application/updatebase_mocks_test.go
- apiserver/facades/client/application/updatebase_test.go
- apiserver/facades/client/charms/clientnormalize_test.go
- apiserver/facades/client/charms/interfaces/downloader.go
- apiserver/facades/client/machinemanager/upgradebase_test.go
- apiserver/facades/client/payloads/facade_test.go
- apiserver/facades/client/resources/base_test.go
- apiserver/facades/client/resources/facade.go
- apiserver/facades/client/resources/repository.go
- apiserver/facades/client/resources/server_addpending_test.go
- apiserver/facades/client/resources/server_listresources_test.go
- apiserver/facades/client/resources/server_test.go
- apiserver/facades/controller/caasfirewaller/firewaller_test.go
- apiserver/facades/controller/caasoperatorprovisioner/mock_test.go
- apiserver/facades/controller/caasoperatorprovisioner/provisioner.go
- apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go
- apiserver/facades/controller/caasunitprovisioner/mock_test.go
- apiserver/facades/controller/caasunitprovisioner/provisioner.go
- apiserver/facades/controller/caasunitprovisioner/provisioner_test.go
- apiserver/facades/controller/charmdownloader/interfaces.go
- apiserver/facades/controller/charmrevisionupdater/interface_test.go
- apiserver/facades/controller/crossmodelrelations/crossmodelrelations_test.go
- apiserver/facades/controller/remoterelations/remoterelations_test.go
- caas/kubernetes/provider/operator_upgrade.go
- cmd/juju/ssh/ssh_container.go
- cmd/juju/status/status_internal_test.go
- core/cache/unit.go
- core/cache/unit_test.go
- core/charm/downloader/mocks/charm_mocks.go
- core/charm/kubernetes.go
- core/charm/kubernetes_test.go
- core/charm/repository/mocks/charmhub_client_mock.go
- environs/jujutest/livetests.go
- juju/testing/conn.go
- state/devices.go
- state/podspec_ops.go
- upgrades/upgradevalidation/validation.go
- worker/caasfirewaller/application_worker.go
- worker/caasfirewaller/worker_test.go
- worker/caasfirewallersidecar/worker.go
- worker/caasfirewallersidecar/worker_test.go
- worker/caasoperator/client.go
- worker/caasoperator/localstate.go
- worker/caasoperator/localstate_test.go
- worker/caasoperator/mock_test.go
- worker/caasoperator/remotestate/mock_test.go
- worker/caasoperator/remotestate/snapshot.go
- worker/caasoperator/remotestate/watcher_test.go
- worker/caasoperatorprovisioner/mock_test.go
- worker/caasoperatorprovisioner/worker.go
- worker/caasoperatorprovisioner/worker_test.go
- worker/caasunitprovisioner/application_worker.go
- worker/caasunitprovisioner/worker.go
- worker/caasunitprovisioner/worker_test.go
- worker/firewaller/firewaller_test.go
- worker/metrics/collect/context_test.go
- worker/metrics/collect/handler_test.go
- worker/metrics/collect/manifold.go
- worker/metrics/collect/manifold_test.go
- worker/metrics/sender/sender_test.go
- worker/metrics/spool/manifold.go
- worker/metrics/spool/metrics.go
- worker/metrics/spool/metrics_test.go
- worker/uniter/charm/bundles_test.go
- worker/uniter/runner/context/mocks/hookunit_mock.go
- worker/uniter/runner/factory_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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants