← Back to branch summary

~clint-fewbar/pyjuju/repo-from-env

« back to all changes in this revision

Viewing changes to juju/providers/local/__init__.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-02-13 16:24:43 UTC
  • mfrom: (447.1.5 local-respect-series)
  • Revision ID: kapil.thangavelu@canonical.com-20120213162443-y5zt8fw97rqyn165
merge local-respect-series, local provider now respects environment series [r=bcsaller,jimbaker][f=914392]

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/local/__init__.py
141
141
                                    log_file=log_file,
142
142
                                    juju_origin=juju_origin,
143
143
                                    juju_unit_namespace=self._qualified_name,
144
 
                                    public_key=public_key)
 
144
                                    public_key=public_key,
 
145
                                    juju_series=self.config["default-series"])
145
146
        log.info(
146
147
            "Starting machine agent (origin: %s)... ", agent.juju_origin)
147
148
        yield agent.start()