Merge branch 'master' of github.com:k8sdb/cli into rbac

# Conflicts: # glide.lock # pkg/describer/k8sdb_describer.go # pkg/printer/resource_printer.go # vendor/github.com/k8sdb/apimachinery/api/helpers.go # vendor/github.com/k8sdb/apimachinery/pkg/storage/osm.go # vendor/k8s.io/kubernetes/pkg/version/base.go
kubedb · Jul 7, 2017 · a018aad · a018aad
2 parents ea96e05 + 920d083
commit a018aad
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 3,200 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/pkg/describer/k8sdb_describer.go b/pkg/describer/k8sdb_describer.go
@@ -321,13 +321,13 @@ func listSnapshots(snapshotList *tapi.SnapshotList, out io.Writer) {
 	fmt.Fprint(w, "  Name\tBucket\tStartTime\tCompletionTime\tPhase\n")
 	fmt.Fprint(w, "  ----\t------\t---------\t--------------\t-----\n")
 	for _, e := range snapshotList.Items {
-		container, err := e.Spec.SnapshotStorageSpec.Location()
+		location, err := e.Spec.SnapshotStorageSpec.Location()
 		if err != nil {
-			container = statusUnknown
+			location = "<invalid>"
 		}
 		fmt.Fprintf(w, "  %s\t%s\t%s\t%s\t%s\n",
 			e.Name,
-			container,
+			location,
 			timeToString(e.Status.StartTime),
 			timeToString(e.Status.CompletionTime),
 			e.Status.Phase,

diff --git a/pkg/printer/resource_printer.go b/pkg/printer/resource_printer.go
@@ -270,11 +270,11 @@ func (h *HumanReadablePrinter) printSnapshot(item *tapi.Snapshot, w io.Writer, o
 	}
 
 	if options.Wide {
-		container, err := item.Spec.SnapshotStorageSpec.Location()
+		loc, err := item.Spec.SnapshotStorageSpec.Location()
 		if err != nil {
-			container = statusUnknown
+			loc = statusUnknown
 		}
-		if _, err := fmt.Fprintf(w, "%s\t", container); err != nil {
+		if _, err := fmt.Fprintf(w, "%s\t", loc); err != nil {
 			return err
 		}
 	}

diff --git a/vendor/github.com/appscode/go/wait/doc.go b/vendor/github.com/appscode/go/wait/doc.go