~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/worker/firewaller/firewaller.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
78
78
        // We won't "wait" actually, because the environ is already
79
79
        // available and has a guaranteed valid config, but until
80
80
        // WaitForEnviron goes away, this code needs to stay.
81
 
        fw.environ, err = environ.WaitForEnviron(fw.modelWatcher, fw.st, fw.catacomb.Dying())
 
81
        fw.environ, err = environ.WaitForEnviron(fw.modelWatcher, fw.st, environs.New, fw.catacomb.Dying())
82
82
        if err != nil {
83
83
                if err == environ.ErrWaitAborted {
84
84
                        return fw.catacomb.ErrDying()