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

« back to all changes in this revision

Viewing changes to src/github.com/lxc/lxd/lxd/api_1.0.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:
239
239
                        if err != nil {
240
240
                                return InternalError(err)
241
241
                        }
 
242
                } else if key == "core.proxy_https" || key == "core.proxy_http" || key == "core.proxy_ignore_hosts" {
 
243
                        err = d.ConfigValueSet(key, value.(string))
 
244
                        if err != nil {
 
245
                                return InternalError(err)
 
246
                        }
 
247
 
 
248
                        d.updateProxy()
242
249
                } else {
243
250
                        err := d.ConfigValueSet(key, value.(string))
244
251
                        if err != nil {