Skip to content

Commit a5f7000

Browse files
authored
Merge pull request #15234 from deads2k/rebase-02-0717
rebase to kube 1.7 on master
2 parents c70c652 + 7d969d4 commit a5f7000

File tree

6,597 files changed

+636543
-224345
lines changed

Some content is hidden

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

6,597 files changed

+636543
-224345
lines changed

Godeps/Godeps.json

Lines changed: 3968 additions & 2890 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_authorization_apis_authorization_v1.proto

Lines changed: 0 additions & 1 deletion
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_apis_build_v1.proto

Lines changed: 0 additions & 1 deletion
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_deploy_apis_apps_v1.proto

Lines changed: 3 additions & 2 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_image_apis_image_v1.proto

Lines changed: 5 additions & 1 deletion
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_oauth_apis_oauth_v1.proto

Lines changed: 1 addition & 1 deletion
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_project_apis_project_v1.proto

Lines changed: 0 additions & 1 deletion
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_quota_apis_quota_v1.proto

Lines changed: 0 additions & 1 deletion
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_route_apis_route_v1.proto

Lines changed: 0 additions & 1 deletion
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_sdn_apis_network_v1.proto

Lines changed: 0 additions & 1 deletion
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_security_apis_security_v1.proto

Lines changed: 0 additions & 1 deletion
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_template_apis_template_v1.proto

Lines changed: 0 additions & 1 deletion
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_user_apis_user_v1.proto

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)