From 894cdb03bddfe580291f44d76d254da44b737d3c Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Tue, 21 Jun 2016 11:26:36 -0700
Subject: [PATCH] fix(cli): resolve flag name conflict

---
 cmd/helm/helm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 2b505905b..efa5ab589 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -64,7 +64,7 @@ func init() {
 	p := RootCommand.PersistentFlags()
 	p.StringVar(&helmHome, "home", home, "location of your Helm config. Overrides $HELM_HOME.")
 	p.StringVar(&tillerHost, "host", thost, "address of tiller. Overrides $HELM_HOST.")
-	p.StringVarP(&tillerNamespace, "namespace", "n", "", "kubernetes namespace")
+	p.StringVarP(&tillerNamespace, "namespace", "", "", "kubernetes namespace")
 	p.BoolVarP(&flagDebug, "debug", "", false, "enable verbose output")
 }
 
-- 
GitLab