Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to Kube 0.14 #1659

Merged
merged 26 commits into from
Apr 10, 2015
Merged

Rebase to Kube 0.14 #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4aadeec
Update rebase-kube
smarterclayton Apr 9, 2015
b955f3c
Remove admission/resourcedefaults
smarterclayton Apr 9, 2015
6173240
bump(github.com/GoogleCloudPlatform/kubernetes):b12d75d0eeeadda1282f5…
smarterclayton Apr 9, 2015
3437546
UPSTREAM: Prometheus can't be cross-compiled safely
smarterclayton Apr 10, 2015
92a65f7
UPSTREAM: Don't use command pipes for exec/port forward
Apr 8, 2015
4214ac3
UPSTREAM: support subresources in api info resolver
deads2k Apr 2, 2015
ea5886f
UPSTREAM: Encode binary assets in ASCII only
liggitt Apr 1, 2015
d6ef1e1
UPSTREAM: Disable systemd activation for DNS
smarterclayton Mar 9, 2015
0425d31
UPSTREAM: Disable UI for Kubernetes
smarterclayton Dec 24, 2014
4809dce
UPSTREAM: Handle missing resolv.conf
smarterclayton Mar 10, 2015
a4621b1
UPSTREAM: add context to ManifestService methods
Mar 23, 2015
4af3a3b
UPSTREAM: Ensure no namespace on create/update root scope types
liggitt Mar 25, 2015
ea2fe67
UPSTREAM: entrypoint has wrong serialization flags in JSON
smarterclayton Apr 9, 2015
04a0f42
UPSTREAM: Pass mapping version to printer always
smarterclayton Apr 9, 2015
8714040
Refactor from upstream
smarterclayton Apr 9, 2015
e48d182
Update commands to handle change to cmd.Factory upstream
smarterclayton Apr 9, 2015
bd38def
Handle multi-port services in part
smarterclayton Apr 9, 2015
f9934f2
Event recording has changed upstream, and changes to master/node args
smarterclayton Apr 9, 2015
66cfefe
Use Args instead of Command for OpenShift
smarterclayton Apr 10, 2015
313d53e
Refactor tests with port, command, testclient changes
smarterclayton Apr 9, 2015
664b32d
Fix bug in error output
smarterclayton Apr 9, 2015
ecfedfe
Master should send convertor, v1beta3 not experimental
smarterclayton Apr 9, 2015
2d3b17b
Version lock e2e output tests
smarterclayton Apr 9, 2015
bab21a8
TEMPORARY: osc build-logs failing in other namespace
smarterclayton Apr 10, 2015
ee831e7
Update router integration test
smarterclayton Apr 10, 2015
726d211
fix simulator urls
Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
416 changes: 208 additions & 208 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 118 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 132 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/example_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/go1_0.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/go1_2.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 63 additions & 0 deletions Godeps/_workspace/src/code.google.com/p/gcfg/issues_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading