Skip to content

Commit 3659383

Browse files
authored
Merge pull request #13653 from sttts/rebase-1.6.1
Rebase 1.6.1
2 parents decce00 + 0d6b11a commit 3659383

File tree

12,478 files changed

+1790244
-769294
lines changed

Some content is hidden

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

12,478 files changed

+1790244
-769294
lines changed

Godeps/Godeps.json

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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ verify-commits:
106106
#
107107
# Example:
108108
# make update
109-
update: build
109+
update:
110110
hack/update-generated-bindata.sh
111111
hack/update-generated-deep-copies.sh
112112
hack/update-generated-conversions.sh

api/protobuf-spec/github_com_openshift_origin_pkg_authorization_api_v1.proto

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

api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto

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

0 commit comments

Comments
 (0)