← Back to branch summary

~ubuntu-branches/ubuntu/vivid/juju-core/vivid-proposed

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/environment/environment.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-09-29 19:43:29 UTC
  • mfrom: (47.1.4 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150929194329-9y496tbic30hc7vp
Tags: 1.24.6-0ubuntu1~15.04.1
https://launchpad.net/bugs/1500916
https://launchpad.net/bugs/1497087
Backport of 1.24.6 from wily. (LP: #1500916, #1497087)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/environment/environment.go
6
6
import (
7
7
        "github.com/juju/cmd"
8
8
        "github.com/juju/loggo"
 
9
        "github.com/juju/utils/featureflag"
9
10
 
10
11
        "github.com/juju/juju/cmd/envcmd"
 
12
        "github.com/juju/juju/feature"
11
13
)
12
14
 
13
 
var logger = loggo.GetLogger("juju.cmd.juju.machine")
 
15
var logger = loggo.GetLogger("juju.cmd.juju.environment")
14
16
 
15
17
const commandDoc = `
16
18
"juju environment" provides commands to interact with the Juju environment.
29
31
        environmentCmd.Register(envcmd.Wrap(&SetCommand{}))
30
32
        environmentCmd.Register(envcmd.Wrap(&UnsetCommand{}))
31
33
        environmentCmd.Register(&JenvCommand{})
 
34
        environmentCmd.Register(envcmd.Wrap(&RetryProvisioningCommand{}))
 
35
        environmentCmd.Register(envcmd.Wrap(&EnvSetConstraintsCommand{}))
 
36
        environmentCmd.Register(envcmd.Wrap(&EnvGetConstraintsCommand{}))
 
37
 
 
38
        if featureflag.Enabled(feature.JES) {
 
39
                environmentCmd.Register(envcmd.Wrap(&ShareCommand{}))
 
40
                environmentCmd.Register(envcmd.Wrap(&UnshareCommand{}))
 
41
                environmentCmd.Register(envcmd.Wrap(&CreateCommand{}))
 
42
                environmentCmd.Register(envcmd.Wrap(&UsersCommand{}))
 
43
        }
32
44
        return environmentCmd
33
45
}