← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/agent/unit.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:
src/github.com/juju/juju/cmd/jujud/agent/unit.go
20
20
        "github.com/juju/juju/cmd/jujud/agent/unit"
21
21
        cmdutil "github.com/juju/juju/cmd/jujud/util"
22
22
        "github.com/juju/juju/network"
23
 
        "github.com/juju/juju/version"
 
23
        jujuversion "github.com/juju/juju/version"
24
24
        "github.com/juju/juju/worker"
25
25
        "github.com/juju/juju/worker/dependency"
26
26
        "github.com/juju/juju/worker/logsender"
119
119
        }
120
120
        agentConfig := a.CurrentConfig()
121
121
 
122
 
        agentLogger.Infof("unit agent %v start (%s [%s])", a.Tag().String(), version.Current, runtime.Compiler)
 
122
        agentLogger.Infof("unit agent %v start (%s [%s])", a.Tag().String(), jujuversion.Current, runtime.Compiler)
123
123
        if flags := featureflag.String(); flags != "" {
124
124
                logger.Warningf("developer feature flags enabled: %s", flags)
125
125
        }