Skip to content

Commit

Permalink
Merge pull request #459 from asteris-llc/feature/update-hcl
Browse files Browse the repository at this point in the history
vendor: upgrade all deps
  • Loading branch information
BrianHicks authored Nov 2, 2016
2 parents c982126 + a7ab883 commit a129cc1
Show file tree
Hide file tree
Showing 20 changed files with 918 additions and 178 deletions.
6 changes: 3 additions & 3 deletions glide.lock

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

22 changes: 0 additions & 22 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
package: github.com/asteris-llc/converge
import:
- package: github.com/BurntSushi/toml
version: f0aeabca5a127c4078abb8c8d64298b147264b55
- package: github.com/braintree/manners
version: 82a8879fc5fd0381fa8b2d8033b19bf255252088
subpackages:
- test_helpers
- package: github.com/davecgh/go-spew
version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
subpackages:
- spew
- package: github.com/fsnotify/fsnotify
version: ^1.3.0
- package: github.com/hashicorp/errwrap
version: 7554cd9344cec97297fa6649b055a8c98c2a1e55
- package: github.com/hashicorp/go-multierror
version: d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5
- package: github.com/hashicorp/hcl
version: 6f5bfed9a0a22222fbe4e731ae3481730ba41e93
subpackages:
- hcl/ast
- hcl/parser
Expand All @@ -29,57 +23,41 @@ import:
- json/scanner
- json/token
- package: github.com/hashicorp/logutils
version: 0dc08b1671f34c4250ce212759ebd880f743d883
- package: github.com/hashicorp/terraform
version: dce175459a9b0bc1f42b1b0f919aae294a73a138
subpackages:
- dag
- vendor/github.com/hashicorp/go-multierror
- vendor/github.com/hashicorp/errwrap
- package: github.com/inconshreveable/mousetrap
version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
- package: github.com/kardianos/osext
version: 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
- package: github.com/magiconair/properties
version: ^1.7.0
- package: github.com/mattn/go-isatty
version: 56b76bdf51f7708750eac80fa38b952bb9f32639
- package: github.com/mitchellh/mapstructure
version: d2dd0262208475919e1a362f675cfc0e7c10e905
- package: github.com/pkg/errors
version: cc5fbb72d9b1b5f664ff3c11ed7896ee23ad9276
- package: github.com/pmezard/go-difflib
version: ~1.0.0
subpackages:
- difflib
- package: github.com/spf13/cast
version: 27b586b42e29bec072fe7379259cc719e1289da6
- package: github.com/spf13/cobra
version: f368244301305f414206f889b1735a54cfc8bde8
- package: github.com/spf13/jwalterweatherman
version: 33c24e77fb80341fe7130ee7c594256ff08ccc46
- package: github.com/spf13/pflag
version: cb88ea77998c3f024757528e3305022ab50b43be
- package: github.com/spf13/viper
version: d8a428b8a30606e1d0b355d91edf282609ade1a6
- package: github.com/stretchr/testify
version: c5d7a69bf8a2c9c374798160849c071093e41dd1
subpackages:
- assert
- require
- vendor/github.com/davecgh/go-spew/spew
- vendor/github.com/pmezard/go-difflib/difflib
- mock
- package: golang.org/x/net
version: 4876518f9e71663000c348837735820161a42df7
subpackages:
- context
- package: golang.org/x/sys
version: d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03
subpackages:
- unix
- package: gopkg.in/yaml.v2
version: a83829b6f1293c91addabc89d0571c246397bbf4
- package: github.com/streamrail/concurrent-map
- package: github.com/stretchr/objx
- package: github.com/mitchellh/hashstructure
Expand Down
14 changes: 14 additions & 0 deletions rpc/pb/mocks/Grapher_GraphServer.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,20 @@ func (_m *GrapherGraphServer) SendMsg(m interface{}) error {
return r0
}

// SetHeader provides a mock function with given fields: _a0
func (_m *GrapherGraphServer) SetHeader(_a0 metadata.MD) error {
ret := _m.Called(_a0)

var r0 error
if rf, ok := ret.Get(0).(func(metadata.MD) error); ok {
r0 = rf(_a0)
} else {
r0 = ret.Error(0)
}

return r0
}

// SetTrailer provides a mock function with given fields: _a0
func (_m *GrapherGraphServer) SetTrailer(_a0 metadata.MD) {
_m.Called(_a0)
Expand Down
2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/backoff.go

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

25 changes: 7 additions & 18 deletions vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go

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

6 changes: 5 additions & 1 deletion vendor/google.golang.org/grpc/clientconn.go

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

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

69 changes: 56 additions & 13 deletions vendor/google.golang.org/grpc/grpclb/grpclb.go

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

Loading

0 comments on commit a129cc1

Please sign in to comment.