Created by Roger Peppe on 2014-04-02 and last modified on 2014-04-02
Get this branch:
bzr branch lp:~rogpeppe/juju-core/axwalk-lp1300889-disable-mongo-keyfile
Only Roger Peppe can upload to this branch. If you are Roger Peppe please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Roger Peppe

Recent revisions

2540. By Roger Peppe on 2014-04-02

apiaddressupdater: fix test

2539. By Roger Peppe on 2014-04-02

merge lp:juju-core/trunk

2538. By Andrew Wilkins on 2014-04-02

Add matching comment

2537. By Andrew Wilkins on 2014-04-02

Disable --keyFile in mongo upstart config

We can't enable this yet, because shared-secret
isn't written until after Mongo is started. This
will change when EnsureMongoServer is landed.

(FWIW I did test this with local, and it worked.
I don't yet understand why - it shouldn't be any
different to cloud providers. I suspect there's
a race here with upstart restarting Mongo, and
the machine agnet writing the shared-secret.)

Fixes lp:1300889

2536. By Ian Booth on 2014-04-02

[r=jameinel],[bug=1299588] Disable retry watcher on container provisioner

The container provisioners were attempting to
use the machine retry watcher which is
verboten. This fixes that.


2535. By Andrew Wilkins on 2014-04-02

[r=axwalk],[bug=1300264] environs/manual: don't require resolvable hostname

This change makes it so that the hostname provided
during manual provisioning is not necessarily
resolvable from the machine provisioning. If this
is the case, the machine will not be given a public

There's another change here, which is that we no
longer perform a reverse lookup or record the
resolved addresses in state; we only store the
input address if it's an IP or if it's a resolvable
hostname. All other addresses will come from the
machine agent itself.

Fixes lp:1300264


2534. By Dave Cheney on 2014-04-02

[r=dave-cheney],[bug=1298770] instance.NewAddress now requires an explicit scope

Update LP 1298770

Update instance.NewAddress and all callers to pass an explicit scope. This fixed cases where the Address was bodged after creation. More importantly it has now exposed the dozens of places where an Address is created with scope NetworkUnknown. I hope this makes you as uneasy as I.


2533. By Dave Cheney on 2014-04-01

[r=dave-cheney],[bug=1300538] Fixes LP 1300538

Compare the result as a set, not an ordered list. If the results of the watch are supposed to be in order, then the code itself is broken.


2532. By Curtis Hovey on 2014-04-01

[r=sinzui] Increment trunk to 1.19.0.

Increment juju and the win installer in the trunk branch to 1.19.0.


2531. By Dave Cheney on 2014-04-01

[r=dave-cheney],[bug=1300530] Fixes LP 1300530

Compare the result as a set, not an ordered list. If the results of the watch are supposed to be in order, then the code itself is broken.


Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.