~ubuntu-branches/ubuntu/wily/juju-core/wily

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/apiserver/provisioner/provisioner.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-02-28 16:53:15 UTC
  • mfrom: (1.1.19)
  • Revision ID: package-import@ubuntu.com-20140228165315-g8n1ds0jrtekhxq6
Tags: 1.17.4-0ubuntu1
* New upstream point release (LP: #1261628):
  - https://launchpad.net/juju-core/trunk/1.17.4
  - d/control: Prefer juju-mongodb over mongodb-server for juju-local
    package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
196
196
        result.ProviderType = config.Type()
197
197
        result.AuthorizedKeys = config.AuthorizedKeys()
198
198
        result.SSLHostnameVerification = config.SSLHostnameVerification()
199
 
        result.SyslogPort = config.SyslogPort()
200
199
        result.Proxy = config.ProxySettings()
201
200
        result.AptProxy = config.AptProxySettings()
202
201
        return result, nil