Skip to content

Commit a5e424d

Browse files
authored
Merge pull request kubernetes#72923 from saschagrunert/dedent-update
Update dedent to latest release
2 parents b8d6de3 + ba7aaa9 commit a5e424d

File tree

39 files changed

+99
-96
lines changed

39 files changed

+99
-96
lines changed

Godeps/Godeps.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/LICENSES

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/kubeadm/.import-restrictions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"github.com/prometheus/procfs",
165165
"github.com/PuerkitoBio/purell",
166166
"github.com/PuerkitoBio/urlesc",
167-
"github.com/renstrom/dedent",
167+
"github.com/lithammer/dedent",
168168
"github.com/russross/blackfriday",
169169
"github.com/shurcooL/sanitized_anchor_name",
170170
"github.com/sirupsen/logrus",

cmd/kubeadm/app/cmd/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ go_library(
6565
"//staging/src/k8s.io/client-go/util/cert:go_default_library",
6666
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
6767
"//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library",
68+
"//vendor/github.com/lithammer/dedent:go_default_library",
6869
"//vendor/github.com/pkg/errors:go_default_library",
69-
"//vendor/github.com/renstrom/dedent:go_default_library",
7070
"//vendor/github.com/spf13/cobra:go_default_library",
7171
"//vendor/github.com/spf13/pflag:go_default_library",
7272
"//vendor/k8s.io/klog:go_default_library",
@@ -106,8 +106,8 @@ go_test(
106106
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
107107
"//staging/src/k8s.io/client-go/testing:go_default_library",
108108
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
109+
"//vendor/github.com/lithammer/dedent:go_default_library",
109110
"//vendor/github.com/pkg/errors:go_default_library",
110-
"//vendor/github.com/renstrom/dedent:go_default_library",
111111
"//vendor/github.com/spf13/cobra:go_default_library",
112112
"//vendor/k8s.io/utils/exec:go_default_library",
113113
"//vendor/k8s.io/utils/exec/testing:go_default_library",

cmd/kubeadm/app/cmd/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cmd
1919
import (
2020
"io"
2121

22-
"github.com/renstrom/dedent"
22+
"github.com/lithammer/dedent"
2323
"github.com/spf13/cobra"
2424
"github.com/spf13/pflag"
2525
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha"

cmd/kubeadm/app/cmd/completion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"bytes"
2121
"io"
2222

23+
"github.com/lithammer/dedent"
2324
"github.com/pkg/errors"
24-
"github.com/renstrom/dedent"
2525
"github.com/spf13/cobra"
2626
"k8s.io/klog"
2727

@@ -50,7 +50,7 @@ var (
5050
The shell code must be evaluated to provide interactive
5151
completion of kubeadm commands. This can be done by sourcing it from
5252
the .bash_profile.
53-
53+
5454
Note: this requires the bash-completion framework.
5555
5656
To install it on Mac use homebrew:

cmd/kubeadm/app/cmd/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"io/ioutil"
2424
"strings"
2525

26+
"github.com/lithammer/dedent"
2627
"github.com/pkg/errors"
27-
"github.com/renstrom/dedent"
2828
"github.com/spf13/cobra"
2929
flag "github.com/spf13/pflag"
3030
"k8s.io/klog"

cmd/kubeadm/app/cmd/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"strings"
2929
"testing"
3030

31-
"github.com/renstrom/dedent"
31+
"github.com/lithammer/dedent"
3232
"github.com/spf13/cobra"
3333
kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
3434
"k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs"

cmd/kubeadm/app/cmd/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"text/template"
2727

28+
"github.com/lithammer/dedent"
2829
"github.com/pkg/errors"
29-
"github.com/renstrom/dedent"
3030
"github.com/spf13/cobra"
3131
flag "github.com/spf13/pflag"
3232
"k8s.io/apimachinery/pkg/util/sets"

cmd/kubeadm/app/cmd/join.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"path/filepath"
2525
"text/template"
2626

27+
"github.com/lithammer/dedent"
2728
"github.com/pkg/errors"
28-
"github.com/renstrom/dedent"
2929
"github.com/spf13/cobra"
3030
flag "github.com/spf13/pflag"
3131
"k8s.io/apimachinery/pkg/util/sets"

0 commit comments

Comments
 (0)