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

Jump to bottom

k8s rebase - 4a65fa1f35e98ae96785836d99bf4ec7712ab682 #6320

Merged
merged 64 commits into from
Jan 27, 2016
Merged

k8s rebase - 4a65fa1f35e98ae96785836d99bf4ec7712ab682 #6320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1ca5c50
bump(k8s.io/kubernetes): 4a65fa1f35e98ae96785836d99bf4ec7712ab682
liggitt Jan 26, 2016
1c514ee
bump(github.com/coreos/go-etcd): 003851be7bb0694fe3cc457a49529a19388e…
soltysh Dec 15, 2015
a3ad3e2
bump(github.com/coreos/go-systemd): 97e243d21a8e232e9d8af38ba2366dfcf…
soltysh Dec 15, 2015
a99cee7
bump(github.com/emicklei/go-restful): 777bb3f19bcafe2575ffb2a3e46af92…
soltysh Dec 15, 2015
4f9e0e4
bump(github.com/ugorji/go): f1f1a805ed361a0e078bb537e4ea78cd37dcf065
soltysh Dec 16, 2015
c85bf3a
bump(github.com/openshift/openshift-sdn): eda3808d8fe615229f168661fea…
liggitt Jan 26, 2016
3a71c7b
UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
deads2k Aug 11, 2015
bc5f0d1
UPSTREAM: <carry>: SCC
deads2k Oct 16, 2015
ba29761
UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data
liggitt Jan 23, 2016
ae2d43a
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
pweil- Aug 11, 2015
f584b88
UPSTREAM: <carry>: update describer for dockercfg secrets
deads2k Aug 11, 2015
3af7fb0
UPSTREAM: <carry>: Back n forth downward/metadata conversions
deads2k Oct 16, 2015
bd0f8f1
UPSTREAM: <carry>: support pointing oc exec to old openshift server
deads2k Aug 11, 2015
665e4de
UPSTREAM: <carry>: v1beta3
deads2k Aug 11, 2015
725d9c4
UPSTREAM: <carry>: Suppress aggressive output of warning
smarterclayton Aug 11, 2015
6f8293d
UPSTREAM: <carry>: tweak generator to handle conversions in other pac…
deads2k Oct 16, 2015
141eac2
UPSTREAM: 8890: Allowing ActiveDeadlineSeconds to be updated for a pod
soltysh Dec 21, 2015
80a9001
UPSTREAM: <carry>: add kubelet timeouts
soltysh Dec 21, 2015
85c026f
UPSTREAM: 15451: <partial>: Add our types to kubectl get error
smarterclayton Oct 11, 2015
7e2998a
UPSTREAM: 12221: Allow custom namespace creation in e2e framework
deads2k Oct 19, 2015
d26aeb2
UPSTREAM: 16067: Provide a RetryOnConflict helper for client libraries
soltysh Dec 21, 2015
23785d4
UPSTREAM: <carry>: OpenShift 3.0.2 nodes report v1.1.0-alpha
smarterclayton Oct 30, 2015
0deff48
UPSTREAM: 16667: Make HPA Controller use Namespacers
liggitt Jan 21, 2016
bac9493
UPSTREAM: <carry>: allow specific, skewed group/versions
liggitt Jan 21, 2016
063ffb0
UPSTREAM: 16964: Preserve int64 data when unmarshaling
liggitt Nov 6, 2015
3f86fc1
UPSTREAM: 17590: correct homedir on windows
fabianofranz Nov 9, 2015
425cc3a
UPSTREAM: 18522: Close web socket watches correctly
liggitt Dec 10, 2015
0a7d888
UPSTREAM: 18601: Implement AWS EBS dynamic provisioner.
jsafrane Dec 18, 2015
251d6db
UPSTREAM: 18607: Implement OpenStack Cinder dynamic provisioner.
jsafrane Dec 18, 2015
b6c34ed
UPSTREAM: 18621: Implement GCE PD dynamic provisioner.
jsafrane Dec 18, 2015
26812de
UPSTREAM: 18165: fixes get --show-all
fabianofranz Dec 18, 2015
b9349ea
UPSTREAM: 18042: Add cast checks to controllers to prevent nil panics
liggitt Jan 24, 2016
f86eca6
UPSTREAM: 19239: Added missing return statements
liggitt Jan 24, 2016
68ddd5b
UPSTREAM: 18083: Only attempt PV recycling/deleting once, else fail p…
liggitt Jan 24, 2016
9797766
UPSTREAM: revert: fa9f3ea88: coreos/etcd: <carry>: etcd is using diff…
liggitt Jan 24, 2016
26c5f1e
UPSTREAM: 19481: make patch call update admission chain after applyin…
deads2k Jan 11, 2016
88abe47
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
DirectXMan12 Jan 12, 2016
e89798a
UPSTREAM: 18541: Allow node IP to be passed as optional config for ku…
Jan 12, 2016
1ea62af
UPSTREAM: 18653: Debugging round tripper should wrap CancelRequest
smarterclayton Dec 13, 2015
2705556
UPSTREAM: 20095: Restore LoadTLSFiles to client.Config
soltysh Jan 12, 2016
b89b086
UPSTREAM: 17922: <partial>: Allow additional groupless versions
liggitt Jan 20, 2016
e9c182c
UPSTREAM: emicklei/go-restful: <carry>: Add "Info" to go-restful ApiDecl
smarterclayton Jun 2, 2015
ac6be3e
UPSTREAM: openshift/openshift-sdn: 253: update to latest client API
soltysh Jan 7, 2016
3529eca
UPSTREAM: <carry>: remove types.generated.go
liggitt Jan 19, 2016
d577d82
UPSTREAM: 19866: Export PrintOptions struct
liggitt Jan 20, 2016
079033f
UPSTREAM: 19887: Export transport constructors
liggitt Jan 20, 2016
25b94ad
UPSTREAM: 19892: Add WrappedRoundTripper methods to round trippers
liggitt Jan 21, 2016
b9338ba
UPSTREAM: <drop>: stop registering versions in reverse order
liggitt Jan 21, 2016
378f6f1
UPSTREAM: <carry>: Keep default generator for run 'run-pod/v1'
liggitt Jan 22, 2016
2be219c
UPSTREAM: 19988: Fix kubectl annotate and label to use versioned obje…
soltysh Jan 22, 2016
2c0d52a
UPSTREAM: 20093: Make annotate and label fall back to replace on patc…
liggitt Jan 22, 2016
7d76e2e
UPSTREAM: <carry>: allow hostDNS to be included along with ClusterDNS…
soltysh Jan 25, 2016
1fc27ee
UPSTREAM: 20157: Test specific generators for kubectl
liggitt Jan 26, 2016
f2a4378
UPSTREAM: <drop>: Copy kube artifacts
liggitt Jan 20, 2016
f638b86
Boring rebase changes
liggitt Jan 20, 2016
6b7f6f9
Add origin client negotiation
liggitt Jan 20, 2016
e633abb
Determine PublicAddress automatically if masterIP is empty or loopback
liggitt Jan 24, 2016
398ef03
Change validation to use field.Path and field.ErrorList
soltysh Jan 26, 2016
21293a9
API registration
soltysh Jan 26, 2016
943efce
Make etcd registries consistent, updates for etcd test tooling changes
soltysh Jan 26, 2016
03c2a2b
API Group Version changes
soltysh Jan 26, 2016
acec5ff
Explicit API version during login
liggitt Jan 26, 2016
f817e83
API group enablement for master/controllers
liggitt Jan 26, 2016
785de6d
Generated docs, swagger, completions, conversions
liggitt Jan 24, 2016
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
  •  
  •  
  •  
675 changes: 373 additions & 302 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Godeps/_workspace/src/github.com/appc/spec/schema/image_test.go
View file
Open in desktop

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

57 changes: 57 additions & 0 deletions Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/common_test.go
View file
Open in desktop

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

28 changes: 28 additions & 0 deletions Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go
View file
Open in desktop

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

45 changes: 45 additions & 0 deletions Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go
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/github.com/appc/spec/schema/lastditch/image_test.go
View file
Open in desktop

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

38 changes: 38 additions & 0 deletions Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go
View file
Open in desktop

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

57 changes: 57 additions & 0 deletions Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go
View file
Open in desktop

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

Loading