You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2018/09/10 10:06:34 UTC
[camel-k] 04/04: Fix rebase errors
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5b3bf764fa804e709821e29ba9422d56e7b84fcd
Author: nferraro <ni...@gmail.com>
AuthorDate: Mon Sep 10 11:50:07 2018 +0200
Fix rebase errors
---
pkg/client/cmd/root.go | 7 ++-----
pkg/client/cmd/run.go | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/pkg/client/cmd/root.go b/pkg/client/cmd/root.go
index 4014a20..f310f10 100644
--- a/pkg/client/cmd/root.go
+++ b/pkg/client/cmd/root.go
@@ -20,17 +20,14 @@ package cmd
import (
"os"
- "github.com/apache/camel-k/pkg/client/cmd/run"
- "github.com/apache/camel-k/pkg/client/cmd/version"
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/client/cmd/get"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/pkg/errors"
)
type rootCmdOptions struct {
- KubeConfig string
- Namespace string
+ KubeConfig string
+ Namespace string
}
func NewKamelCommand() (*cobra.Command, error) {
diff --git a/pkg/client/cmd/run.go b/pkg/client/cmd/run.go
index 083300d..1fb90d4 100644
--- a/pkg/client/cmd/run.go
+++ b/pkg/client/cmd/run.go
@@ -80,7 +80,7 @@ func (o *RunCmdOptions) run(cmd *cobra.Command, args []string) error {
integration := v1alpha1.Integration{
TypeMeta: v1.TypeMeta{
- Kind: "Integration",
+ Kind: "Integration",
APIVersion: v1alpha1.SchemeGroupVersion.String(),
},
ObjectMeta: v1.ObjectMeta{