Merge master into release/0.11

This commit is contained in:
Matt Ellis 2018-04-12 17:45:23 -07:00
commit 9edaba565b
2 changed files with 2 additions and 1 deletions
cmd
pkg/workspace

View File

@ -53,6 +53,7 @@ func NewPulumiCmd() *cobra.Command {
defaultHelp := cmd.HelpFunc()
cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
defaultHelp(cmd, args)
fmt.Println("See documentation at https://docs.pulumi.com")
url, err := workspace.GetCurrentCloudURL()
if err == nil && url != "" && !local.IsLocalBackendURL(url) {

View File

@ -312,7 +312,7 @@ func GetPluginPath(kind PluginKind, name string, version *semver.Version) (strin
if m != nil {
match = m
glog.V(6).Infof("GetPluginPath(%s, %s, %s): found candidate (#%s)",
kind, name, *version, match.Version)
kind, name, version, match.Version)
}
}
}