Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

vendor: update vendors as of 2016-08-25 #1671

Merged
merged 2 commits into from
Aug 26, 2016

Conversation

dongsupark
Copy link
Contributor

Update vendor tree to be up-to-date as of 2016-08-25 to fix commit IDs in glide.lock. This part has been probably broken since a month.

Note that this PR does not update google.golang.org/grpc, which should stay with 178b68e2 ("Merge pull request 556 from bradfitz/testcleanup", 2016-02-17). That's because the current gRPC logic in fleet requires ClientConn.State(), which is currently not available in gRPC 1.0. It's not trivial to change the logic.

Also update glide-update.sh to automatically clean up unnecessary directories under etcd and grpc.

Dongsu Park added 2 commits August 25, 2016 16:24
Update vendor tree to be up-to-date as of 2016-08-25.

Note that this update does not update google.golang.org/grpc, which
should stay with 178b68e2 ("Merge pull request coreos#556 from
bradfitz/testcleanup", 2016-02-17). That's because the current gRPC
logic in fleet requires ClientConn.State(), which is currently not
available in gRPC 1.0. It's not trivial to change the logic.
As fleet needs only some parts of etcd, go-systemd, grpc, and
gogo/protobuf, glide-update.sh should clean up unnecessary directories
to keep vendor trees as small as possible.

Also remove --keep from glide-vc, as internal packages are already
correctly handled by glide.
@dongsupark dongsupark force-pushed the dongsu/vendor-update-20160825 branch from 733a4be to fa2a50c Compare August 25, 2016 14:24
@dongsupark
Copy link
Contributor Author

... finally solved all build errors both locally and on travis-ci. Whew!
Though gRPC client logic change still needs to be done in the future. (See #1672)
I'll merge this PR tomorrow, as it's a critical fix.

@dongsupark dongsupark merged commit c3ec894 into coreos:master Aug 26, 2016
@dongsupark dongsupark deleted the dongsu/vendor-update-20160825 branch August 26, 2016 08:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant