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

Move the serving-info-setter manifold. #9786

Merged
merged 1 commit into from Feb 26, 2019
Merged

Conversation

howbazaar
Copy link
Contributor

Moves the serving info setter manifold into the worker directory.

The rationale for this is to be able to soon add a real worker as well that is responsible for updating agent config with the intent that we have one worker that updates the agent.conf information.

QA steps

  • bootstrapping a controller
  • enable ha

@@ -543,10 +544,10 @@ func Manifolds(config ManifoldsConfig) dependency.Manifolds {
NewWorker: singular.NewWorker,
})),

// The serving-info-setter manifold sets grabs the state
// The agent-config-updater manifold sets grabs the state
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

@howbazaar
Copy link
Contributor Author

$$merge$$

@jujubot jujubot merged commit 1c555f1 into juju:2.5 Feb 26, 2019
@jameinel jameinel mentioned this pull request Mar 1, 2019
jujubot added a commit that referenced this pull request Mar 1, 2019
#9819

## Description of change

Another ratchet of changes in 2.5 that need to be in develop.
 prdesc Merge pull request #9793 from jameinel/2.5-cleanup-volumes-1800872
 prdesc Merge pull request #9788 from babbageclunk/raftlease-application-leaders
 prdesc Merge pull request #9786 from howbazaar/2.5-move-worker
 prdesc Merge pull request #9782 from jameinel/2.5-network-exit-1807615
 prdesc Merge pull request #9781 from timClicks/2.5
 prdesc Merge pull request #9778 from anastasiamac/current-controller-saga
 prdesc Merge pull request #9776 from SimonRichardson/lxd-sub-acceptance-test
 prdesc Merge pull request #9777 from anastasiamac/storage-err-fix-machine-removal-25
 prdesc Merge pull request #9759 from wallyworld/k8s-ephemeral-storage
 prdesc Merge pull request #9773 from achilleasa/emit-errors-for-invalid-credential-names
 prdesc Merge pull request #9774 from achilleasa/backport-leader-unit-support-for-juju-run
 prdesc Merge pull request #9764 from manadart/2.5-maas-container-inherit-props
 prdesc Merge pull request #9761 from Veebers/update-cloud-controller
 prdesc Merge pull request #9770 from hmlanigan/2.5-lxd-profile

## QA steps

See individual patches.

## Documentation changes

See individual patches.

## Bug reference

 prdesc https://bugs.launchpad.net/juju/+bug/1800872
 prdesc https://bugs.launchpad.net/juju/+bug/1807615
 prdesc https://bugs.launchpad.net/juju/+bug/1786140
 prdesc https://bugs.launchpad.net/juju/+bug/1813079
 prdesc https://bugs.launchpad.net/juju/+bug/1702538
 prdesc https://bugs.launchpad.net/juju/+bug/1816826
 prdesc https://bugs.launchpad.net/juju/+bug/1815636
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants