Skip to content

Commit

Permalink
rebase 1.8 k8s
Browse files Browse the repository at this point in the history
  • Loading branch information
Mengqi Yu committed Apr 24, 2018
1 parent 98b9835 commit 7aa5998
Show file tree
Hide file tree
Showing 6,483 changed files with 58,584 additions and 1,501,795 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
273 changes: 65 additions & 208 deletions Gopkg.lock

Large diffs are not rendered by default.

45 changes: 15 additions & 30 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,65 +17,50 @@ required = ["github.com/kubernetes-sig-testing/frameworks/integration",
"k8s.io/client-go/plugin/pkg/client/auth",
"github.com/spf13/pflag"]

[prune]
go-tests = true

[[constraint]]
version = "KUBEBUILDER_VERSION"
name = "github.com/kubernetes-sigs/kubebuilder"

[[constraint]]
name = "github.com/golang/glog"
revision = "44145f04b68cf362d9c4df2182967c2275eaefed"
branch = "master"
name = "github.com/kubernetes-sig-testing/frameworks"

[[constraint]]
name = "github.com/onsi/ginkgo"
version = "1.4.0"
branch = "master"
name = "github.com/markbates/inflect"

[[constraint]]
name = "github.com/onsi/gomega"
version = "1.2.0"
version = "1.3.0"

[[constraint]]
name = "github.com/pkg/errors"
revision = "a22138067af1c4942683050411a841ade67fe1eb"

[[constraint]]
name = "github.com/spf13/cobra"
revision = "f62e98d28ab7ad31d707ba837a966378465c7b57"
version = "0.8.0"

[[constraint]]
name = "github.com/spf13/pflag"
revision = "9ff6c6923cfffbcd502984b8e0c80539a94968b7"

[[constraint]]
branch = "release-1.9"
name = "k8s.io/api"
version = "kubernetes-1.10.1"

[[constraint]]
branch = "release-1.9"
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.10.1"

[[constraint]]
branch = "release-1.9"
name = "k8s.io/apimachinery"
version = "kubernetes-1.10.1"

[[constraint]]
branch = "release-1.9"
name = "k8s.io/apiserver"
version = "kubernetes-1.10.1"

[[constraint]]
branch = "release-6.0"
name = "k8s.io/client-go"
version = "kubernetes-1.10.1"

[[constraint]]
branch = "release-1.9"
name = "k8s.io/kube-aggregator"
version = "kubernetes-1.10.1"

[[override]]
name = "github.com/Azure/go-autorest"
version = "v9.1.0"

[[override]]
name = "github.com/emicklei/go-restful"
revision = "ff4f55a206334ef123e4f79bbf348980da81ca46"
[prune]
go-tests = true
unused-packages = true
21 changes: 0 additions & 21 deletions vendor/cloud.google.com/go/.travis.yml

This file was deleted.

152 changes: 0 additions & 152 deletions vendor/cloud.google.com/go/CONTRIBUTING.md

This file was deleted.

1 change: 1 addition & 0 deletions vendor/cloud.google.com/go/CONTRIBUTORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 0 additions & 54 deletions vendor/cloud.google.com/go/MIGRATION.md

This file was deleted.

Loading

0 comments on commit 7aa5998

Please sign in to comment.