diff options
| author | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-01-19 17:17:17 -0800 |
|---|---|---|
| committer | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-01-19 17:17:17 -0800 |
| commit | 343030e2e30f9af597e5f3a33bc3c13d1d74a647 (patch) | |
| tree | 4ea491f60839cb3a1dd7c0d59c47b1f2448e725d | |
| parent | 4843e36ddf99f472c10b9268cb795b0156e21169 (diff) | |
| parent | a32d464cc1b97a0ead97d83d541929679dc949fa (diff) | |
Merge pull request #18322 from mesosphere/licenses
Auto commit by PR queue bot
| -rw-r--r-- | development.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/development.md b/development.md index 27ce1b8a..95dccaa9 100644 --- a/development.md +++ b/development.md @@ -219,7 +219,7 @@ _If `go get -u path/to/dependency` fails with compilation errors, instead try `g to fetch the dependencies without compiling them. This can happen when updating the cadvisor dependency._ -5) Before sending your PR, it's a good idea to sanity check that your Godeps.json file is ok by running hack/verify-godeps.sh +5) Before sending your PR, it's a good idea to sanity check that your Godeps.json file is ok by running `hack/verify-godeps.sh` _If hack/verify-godeps.sh fails after a `godep update`, it is possible that a transitive dependency was added or removed but not updated by godeps. It then may be necessary to perform a `godep save ./...` to pick up the transitive dependency changes._ @@ -228,6 +228,10 @@ It is sometimes expedient to manually fix the /Godeps/godeps.json file to minimi Please send dependency updates in separate commits within your PR, for easier reviewing. +6) If you updated the Godeps, please also update `Godeps/LICENSES.md` by running `hack/update-godep-licenses.sh`. + +_If Godep does not automatically vendor the proper license file for a new dependency, be sure to add an exception entry to `hack/update-godep-licenses.sh`._ + ## Unit tests ```sh |