From 39c64668e459800beb99d2cb957a7e96f067f921 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 Jan 2018 23:57:23 +0100 Subject: [PATCH 1/2] Fix gofmt for auto-generated k8s code This code kept being modified by my IDE, so fixing the formatting. This is auto-generated code, but the code to generate is not in this repository, so this is a temporary fix until the code-generation upstream is fixed :) Signed-off-by: Sebastiaan van Stijn Upstream-commit: bb01064691613f6faf8fdffbeb63d404e19cd440 Component: cli --- .../compose/v1beta1/zz_generated.deepcopy.go | 3 ++- .../kubernetes/compose/zz_generated.deepcopy.go | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/cli/kubernetes/compose/v1beta1/zz_generated.deepcopy.go b/components/cli/kubernetes/compose/v1beta1/zz_generated.deepcopy.go index 65dec4bd9a..0d1398d66f 100644 --- a/components/cli/kubernetes/compose/v1beta1/zz_generated.deepcopy.go +++ b/components/cli/kubernetes/compose/v1beta1/zz_generated.deepcopy.go @@ -5,9 +5,10 @@ package v1beta1 import ( + reflect "reflect" + conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) // Deprecated: register deep-copy functions. diff --git a/components/cli/kubernetes/compose/zz_generated.deepcopy.go b/components/cli/kubernetes/compose/zz_generated.deepcopy.go index 7e1f80f220..464eb062a6 100644 --- a/components/cli/kubernetes/compose/zz_generated.deepcopy.go +++ b/components/cli/kubernetes/compose/zz_generated.deepcopy.go @@ -5,9 +5,10 @@ package compose import ( + reflect "reflect" + conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) // Deprecated: register deep-copy functions. @@ -103,12 +104,13 @@ func (x *Owner) DeepCopy() *Owner { } func (x *Owner) DeepCopyObject() runtime.Object { - if c := x.DeepCopy(); c != nil { - return c - } else { - return nil - } + if c := x.DeepCopy(); c != nil { + return c + } else { + return nil + } } + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OwnerList) DeepCopyInto(out *OwnerList) { *out = *in From e4754a59e33a5cc378fd2f992c16dd949d19f0a2 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 4 Jan 2018 12:13:07 +0000 Subject: [PATCH 2/2] Correct table html with close tag for Signed-off-by: Kat Samperi Upstream-commit: 57372d18caaffdb597a5bbd2d9bede795d91fec2 Component: cli --- components/cli/docs/reference/commandline/service_create.md | 1 + 1 file changed, 1 insertion(+) diff --git a/components/cli/docs/reference/commandline/service_create.md b/components/cli/docs/reference/commandline/service_create.md index e9da856c52..26be9244a7 100644 --- a/components/cli/docs/reference/commandline/service_create.md +++ b/components/cli/docs/reference/commandline/service_create.md @@ -764,6 +764,7 @@ The options you can specify are: Long syntax Description + published and target port