Closed johnmccabe closed 6 years ago
Please sign your commits following these rules: https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work The easiest way to do this is to amend the last commit:
$ git clone -b "use-dep" git@github.com:johnmccabe/infrakit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354247904
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f
Amending updates the existing PR. You DO NOT need to open a new one.
@chungers this is the change I'd mentioned a few weeks ago
Merging #877 into master will not change coverage. The diff coverage is
n/a
.
@@ Coverage Diff @@
## master #877 +/- ##
=======================================
Coverage 48.55% 48.55%
=======================================
Files 94 94
Lines 8448 8448
=======================================
Hits 4102 4102
Misses 3980 3980
Partials 366 366
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 3c87c8e...a0ef920. Read the comment docs.
@chungers I'd already rebased against master, is that what that last merge was for (wondering if its some git-fu I've never seen)
edit ah nvm I'd not seen the recent commit
This PR migrates the current Rancher Trash based
vendor.conf
dependency file to Dep.Of note in the
Gopkg.toml
:github.com/micdoher/terraform-provider-ucs
dependency has been switched to its new home atgithub.com/CiscoUcs/UCS-Terraform
where fixes to remove the relative imports breaking both dep and builds on recent Go releases have been fixed.google.golang.org/grpc
to prevent it pulling newer releases where thenewFramer
function in the transport package had started to opt into frame reuse -SetReuseFrames
. (The commit referenced invendor.conf
does not appear to exist in the repogaefc96d
so picking the nearest versioned release)The bulk of the changes in the
vendor
dir are due toDep
pruning non-Go files more aggressively, it also now excludes Licensing related files from the prune where identifiable.There has been some shift in the transitive dependencies being pulled in (with only
google.golang.org/grpc requiring
an override), and at this point all CI tests pass successfully.