Skip to content

Commit

Permalink
Merge pull request #942 from venezia/istio-1.1.0
Browse files Browse the repository at this point in the history
Bumping istio to 1.1.0
  • Loading branch information
k8s-ci-robot authored Mar 26, 2019
2 parents d027662 + 756c660 commit 7c93b1c
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 31 deletions.
158 changes: 130 additions & 28 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ignored = ["github.com/kubernetes/repo-infra/kazel"]

[[constraint]]
name = "istio.io/istio"
version = "1.0.0"
version = "1.1.0"

[[override]]
name = "github.com/golang/glog"
Expand Down
3 changes: 1 addition & 2 deletions source/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1224,13 +1224,12 @@ func (f *fakeConfigStore) ConfigDescriptor() istiomodel.ConfigDescriptor {
return f.descriptor
}

func (f *fakeConfigStore) Get(typ, name, namespace string) (config *istiomodel.Config, exists bool) {
func (f *fakeConfigStore) Get(typ, name, namespace string) (config *istiomodel.Config) {
f.RLock()
defer f.RUnlock()

if cfg, _ := f.get(typ, name, namespace); cfg != nil {
config = cfg
exists = true
}

return
Expand Down

0 comments on commit 7c93b1c

Please sign in to comment.