Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a6d2f10
bump(github.com/prometheus/client_golang): 3b78d7a77f51ccbc364d4bc170…
deads2k Oct 15, 2015
05a334f
bump(github.com/fsouza/go-dockerclient): 1399676f53e6ccf46e0bf00751b2…
deads2k Oct 15, 2015
e496923
bump(github.com/ghodss/yaml): 73d445a93680fa1a78ae23a5839bad48f32ba1ee
deads2k Oct 15, 2015
2c59a8b
bump(github.com/coreos/go-etcd): de3514f25635bbfb024fdaf2a8d5f6737849…
deads2k Oct 15, 2015
6a99c8c
bump(k8s.io/kubernetes): 4c8e6f47ec23f390978e651232b375f5f9cde3c7
deads2k Oct 15, 2015
e9a1215
UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
deads2k Aug 11, 2015
97bd6c2
UPSTREAM: <carry>: Allow pod start to be delayed in Kubelet
smarterclayton Aug 11, 2015
dae0c95
UPSTREAM: <carry>: SCC
deads2k Oct 16, 2015
922d856
UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data
liggitt Aug 11, 2015
b36aeb4
UPSTREAM: <carry>: helper methods paralleling old latest fields
deads2k Oct 15, 2015
17978ff
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
Aug 11, 2015
212c015
UPSTREAM: <carry>: update describer for dockercfg secrets
deads2k Aug 11, 2015
0048df4
UPSTREAM: <carry>: Disable --validate by default
0xmichalis Sep 24, 2015
228fdba
UPSTREAM: <carry>: Back n forth downward/metadata conversions
deads2k Oct 16, 2015
c1ceb6a
UPSTREAM: <carry>: support pointing oc exec to old openshift server
deads2k Aug 11, 2015
5507f84
UPSTREAM: <carry>: v1beta3
deads2k Aug 11, 2015
7423c75
UPSTREAM: <none>: Suppress aggressive output of warning
smarterclayton Aug 11, 2015
cdbc5e5
UPSTREAM: <none>: Hack date-time format on *util.Time
smarterclayton Aug 11, 2015
82905bb
UPSTREAM: <drop>: add back flag types to reduce noise during this rebase
deads2k Aug 11, 2015
f52a224
UPSTREAM: <drop>: make test pass with old codec
deads2k Oct 19, 2015
965ecea
UPSTREAM: <drop>: tweak generator to handle conversions in other pack…
deads2k Oct 16, 2015
904886f
UPSTREAM: 8890: Allowing ActiveDeadlineSeconds to be updated for a pod
deads2k Aug 11, 2015
0f62e66
UPSTREAM: 15232: refactor logs to be composeable
deads2k Oct 15, 2015
57f9a60
UPSTREAM: 12498: Re-add timeouts for kubelet which is not in the upst…
deads2k Aug 12, 2015
01df4bd
UPSTREAM: 11827: allow permissive SA secret ref limitting
deads2k Jul 28, 2015
00ed697
UPSTREAM: 14496: deep-copies: Structs cannot be nil
0xmichalis Sep 24, 2015
52bb8f4
UPSTREAM: 15451 <partial>: Add our types to kubectl get error
smarterclayton Oct 11, 2015
a60c36e
UPSTREAM: TODO: expose ResyncPeriod function
deads2k Oct 15, 2015
5d308ee
UPSTREAM: 15807: Platform-specific setRLimit implementations
liggitt Oct 19, 2015
0d62b29
UPSTREAM: 12221: Allow custom namespace creation in e2e framework
deads2k Oct 19, 2015
6e7e750
UPSTREAM: openshift-sdn(TODO): handle boring upstream refactors
deads2k Oct 15, 2015
76d264f
UPSTREAM: openshift-sdn(TODO): update for iptables.New call
deads2k Oct 15, 2015
987aca9
refactors
deads2k Oct 15, 2015
88d4bc3
help unit tests compile
soltysh Oct 16, 2015
1eb472b
Disable v1beta3 in REST API
ironcladlou Oct 6, 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
  •  
  •  
  •  
528 changes: 287 additions & 241 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

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

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

Loading