Skip to content

Commit dad44aa

Browse files
authored
Merge branch 'master' into improvement/load-siva-git-depth
2 parents adb1156 + 93e2292 commit dad44aa

File tree

1,016 files changed

+179512
-75353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,016 files changed

+179512
-75353
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
[[override]]
2727
name = "golang.org/x/sys"
2828
source = "github.com/golang/sys"
29+
revision = "f0d5e33068cb57c22a181f5df0ffda885309eb5a"
2930

3031
[[override]]
3132
name = "golang.org/x/crypto"
@@ -39,6 +40,10 @@
3940
name = "golang.org/x/net"
4041
source = "github.com/golang/net"
4142

43+
[[override]]
44+
name = "google.golang.org/grpc"
45+
version = "1.14.0"
46+
4247
[[override]]
4348
name = "github.com/satori/go.uuid"
4449
revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"
@@ -49,7 +54,7 @@
4954

5055
[[constraint]]
5156
name = "gopkg.in/bblfsh/client-go.v2"
52-
version = "2.6.0"
57+
version = "2.8.0"
5358

5459
[[constraint]]
5560
name = "gopkg.in/bblfsh/sdk.v1"

vendor/github.com/gogo/protobuf/.gitignore

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

vendor/github.com/gogo/protobuf/.travis.yml

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

vendor/github.com/gogo/protobuf/Makefile

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

vendor/github.com/gogo/protobuf/README

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

vendor/github.com/gogo/protobuf/Readme.md

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

vendor/github.com/gogo/protobuf/_conformance/Makefile renamed to vendor/github.com/gogo/protobuf/conformance/Makefile

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

vendor/github.com/gogo/protobuf/_conformance/conformance.go renamed to vendor/github.com/gogo/protobuf/conformance/conformance.go

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

vendor/github.com/gogo/protobuf/conformance/conformance.sh

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

0 commit comments

Comments
 (0)