Merge branch 'master' into alerting_definitions

pkg/cmd/grafana-cli/commands/install_command.go

@@ -17,7 +17,6 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
-	"github.com/lunny/log"
 )
 
 func validateInput(c CommandLine, pluginFolder string) error {
@@ -89,7 +88,7 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
 		return err
 	}
 
-	log.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
+	logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
 
 	/* Enable once we need support for downloading depedencies
 	res, _ := s.ReadPlugin(pluginFolder, pluginName)
@@ -172,7 +171,7 @@ func downloadFile(pluginName, filePath, url string) (err error) {
 
 			src, err := zf.Open()
 			if err != nil {
-				log.Errorf("Failed to extract file: %v", err)
+				logger.Errorf("Failed to extract file: %v", err)
 			}
 
 			io.Copy(dst, src)

pkg/cmd/grafana-cli/main.go

@@ -8,7 +8,6 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
-	"github.com/lunny/log"
 )
 
 var version = "master"
@@ -24,7 +23,7 @@ func getGrafanaPluginDir() string {
 	pwd, err := os.Getwd()
 
 	if err != nil {
-		log.Error("Could not get current path. using default")
+		logger.Error("Could not get current path. using default")
 		return defaultNix
 	}