From 278d1dba8e7651f09d8ab372353e14c556ac1942 Mon Sep 17 00:00:00 2001
From: Tuna <ng.tuna@gmail.com>
Date: Fri, 5 Aug 2016 00:46:12 +0700
Subject: [PATCH] rebase

---
 cli/app/app.go   | 14 +++++++-------
 cli/main/main.go |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/app/app.go b/cli/app/app.go
index aaace0c3..bc3c655e 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -766,7 +766,7 @@ func loadImage(service bundlefile.Service) (string, string) {
 }
 
 // Load DAB file into KomposeObject
-func loadBundlesFile(file string, opt convertOptions) KomposeObject {
+func loadBundlesFile(file string) KomposeObject {
 	komposeObject := KomposeObject{
 		ServiceConfigs: make(map[string]ServiceConfig),
 	}
@@ -816,7 +816,7 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
 }
 
 // Load compose file into KomposeObject
-func loadComposeFile(file string, opt convertOptions) KomposeObject {
+func loadComposeFile(file string) KomposeObject {
 	komposeObject := KomposeObject{
 		ServiceConfigs: make(map[string]ServiceConfig),
 	}
@@ -1153,10 +1153,10 @@ func Convert(c *cli.Context) {
 	}
 
 	if len(dabFile) > 0 {
-		komposeObject = loadBundlesFile(dabFile, opt)
+		komposeObject = loadBundlesFile(dabFile)
 		file = dabFile
 	} else {
-		komposeObject = loadComposeFile(inputFile, opt)
+		komposeObject = loadComposeFile(inputFile)
 	}
 
 	// Convert komposeObject to K8S controllers
@@ -1221,9 +1221,9 @@ func Up(c *cli.Context) {
 	}
 
 	if len(dabFile) > 0 {
-		komposeObject = loadBundlesFile(dabFile, opt)
+		komposeObject = loadBundlesFile(dabFile)
 	} else {
-		komposeObject = loadComposeFile(inputFile, opt)
+		komposeObject = loadComposeFile(inputFile)
 	}
 
 	// Convert komposeObject to K8S controllers
@@ -1248,7 +1248,7 @@ func Up(c *cli.Context) {
 		if err != nil {
 			logrus.Fatalf("Failed to create service %s: ", k, err)
 		} else {
-			fmt.Println("Service "+ k +" has been created.")
+			fmt.Println("Service " + k + " has been created.")
 		}
 		logrus.Debugf("%s\n", scCreated)
 	}
diff --git a/cli/main/main.go b/cli/main/main.go
index af2b38cb..4d40a7b4 100644
--- a/cli/main/main.go
+++ b/cli/main/main.go
@@ -37,8 +37,8 @@ func main() {
 	app.Flags = append(command.CommonFlags())
 	app.Commands = []cli.Command{
 		command.ConvertCommand(),
+		command.UpCommand(),
 		// TODO: enable these commands and update docs once we fix them
-		//command.UpCommand(),
 		//command.PsCommand(),
 		//command.DeleteCommand(),
 		//command.ScaleCommand(),