← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/statecmd/status.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/state/statecmd/status.go
346
346
                status.Err = err
347
347
                return
348
348
        }
 
349
        includeNetworks, excludeNetworks, err := service.Networks()
 
350
        if err == nil {
 
351
                status.Networks = api.NetworksSpecification{
 
352
                        Enabled:  includeNetworks,
 
353
                        Disabled: excludeNetworks,
 
354
                }
 
355
        }
349
356
        if service.IsPrincipal() {
350
357
                status.Units = context.processUnits(context.units[service.Name()], serviceCharmURL.String())
351
358
        }