github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,465 Commits 1 Branch 31 Tags
7d47d2dcd854bf5778678ae004798ea148600a7e
Commit Graph

10716 Commits

Author SHA1 Message Date
Chao Xu
b94e15d6c1 Merge pull request #21723 from caesarxuchao/log-in-patch 
Adding an apiserver log entry when Patch fails because of a meaningful conflict
 2016-02-25 10:28:18 -08:00
Brian Grant
63feac0afc Merge pull request #21872 from kargakis/maxUavailability-fix 
kubectl: preserve availability when maxUnavailability is not 100%
 2016-02-25 09:35:37 -08:00
k8s-merge-robot
cbf5dc1228 Merge pull request #21272 from deads2k/add-priority-restmapper 
Auto commit by PR queue bot
 2016-02-25 07:26:41 -08:00
k8s-merge-robot
a7f06905c3 Merge pull request #21185 from fabianofranz/fix_spdy_roundtripper_verify_hostname 
Auto commit by PR queue bot
 2016-02-25 04:45:12 -08:00
deads2k
cf6234d219 add prioritized RESTMapper to registered 2016-02-25 07:35:23 -05:00
deads2k
9c42d219bc allow disambiguation of resouces 2016-02-25 07:35:23 -05:00
deads2k
2b84d58b6d add a PriorityRESTMapper that can choose particular group/version of a resource 2016-02-25 07:35:23 -05:00
deads2k
2e64a0d10c update multiRESTMapper to properly union constituent RESTMappers 2016-02-25 07:35:22 -05:00
deads2k
94d683e89b fix ShortcutRESTMapper and prevent it from ever silently failing again 2016-02-25 07:35:22 -05:00
k8s-merge-robot
82b0f0ff5e Merge pull request #20940 from pwittrock/volume-sync 
Auto commit by PR queue bot
 2016-02-25 02:29:31 -08:00
k8s-merge-robot
33ef7a93a4 Merge pull request #20647 from dcbw/allow-disabling-bridge-nf-call-iptables 
Auto commit by PR queue bot
 2016-02-25 01:27:47 -08:00
kargakis
9cc19102f3 kubectl: preserve availability when maxUnavailability is not 100% 2016-02-25 10:10:41 +01:00
k8s-merge-robot
5f86dd1b2f Merge pull request #21906 from justinsb/util_sets_docstring 
Auto commit by PR queue bot
 2016-02-25 00:24:54 -08:00
k8s-merge-robot
2a58c0062d Merge pull request #17913 from jtblin/jtblin/17912-pick-public-subnets 
Auto commit by PR queue bot
 2016-02-24 23:48:15 -08:00
Brian Grant
b27edde38d Merge pull request #21957 from mqliang/deployment-preserve-availability 
Deployment: preserve availability when maxUnavailability is not 100%
 2016-02-24 22:09:54 -08:00
Brian Grant
be6515ca90 Merge pull request #21935 from janetkuo/nil-pointer 
Fix the nil pointer dereference when counting RS replicas
 2016-02-24 21:58:41 -08:00
mqliang
06d57ec7f4 Deployment: preserve availability when maxUnavailability is not 100% 2016-02-25 13:30:06 +08:00
Brian Grant
63c85691bd Merge pull request #21795 from janetkuo/deployment-e2e-flake-panic 
Fix the nil pointer dereference in addHashKeyToRSAndPods
 2016-02-24 21:25:35 -08:00
k8s-merge-robot
9a4e3f8470 Merge pull request #21870 from mqliang/lookup-cache 
Auto commit by PR queue bot
 2016-02-24 20:01:29 -08:00
k8s-merge-robot
dcbeacded0 Merge pull request #21521 from mesosphere/jdef_kubelet_options1 
Auto commit by PR queue bot
 2016-02-24 18:35:10 -08:00
Janet Kuo
069e77d504 Fix the nil pointer dereference when counting RS replicas 2016-02-24 18:27:27 -08:00
Janet Kuo
3ed8426a98 When calculating pod template hash, don't include the hash label 2016-02-24 18:09:59 -08:00
Janet Kuo
96908d6de5 Add more logs 2016-02-24 16:41:36 -08:00
Janet Kuo
082702390a Fix test flake 2016-02-24 16:41:36 -08:00
Janet Kuo
020ab8813d Check observed generation only after rs template is labeled in addHashKeyToRSAndPods 2016-02-24 16:41:36 -08:00
Janet Kuo
1d1c6f19b4 Fix the nil pointer dereference in addHashKeyToRSAndPods 2016-02-24 16:41:36 -08:00
Alex Robinson
2b13bc471b Merge pull request #21892 from jayunit100/backoff-flake-fix 
fake backoff implementation for speeding up flakey test
 2016-02-24 16:26:56 -08:00
Brian Grant
80614896db Merge pull request #21509 from madhusudancs/kubectl-get-list-deployments-daemonsets 
Add DaemonSets and Deployments to valid resources list in kubectl.
 2016-02-24 15:30:08 -08:00
Brian Grant
bea349a80d Merge pull request #21856 from bprashanth/ttl_race 
Lock across item expiration in the ttl store.
 2016-02-24 15:06:25 -08:00
Brian Grant
88056edab2 Merge pull request #21902 from janetkuo/deployment-unavailable-replicas 
Fix the incorrect deployment.status.unavailableReplicas
 2016-02-24 14:48:04 -08:00
Brian Grant
0b5edab208 Merge pull request #21857 from nikhiljindal/stopDeployment 
fix deployment e2e flake: Update DeploymentReaper.Stop to use ObservedGeneration
 2016-02-24 14:26:23 -08:00
Janet Kuo
062b9f86b9 Fix the incorrect deployment.status.unavailableReplicas 2016-02-24 14:09:49 -08:00
Chao Xu
cf98bcb48a Merge pull request #21816 from caesarxuchao/fix-21763 
Fix the EventSink in HPA controller
 2016-02-24 14:09:02 -08:00
Prashanth Balasubramanian
7e88b3ec84 Remove ttl store from controllers. 2016-02-24 14:06:22 -08:00
Prashanth Balasubramanian
45eb835833 Lock across item expiration in the ttl store. 2016-02-24 14:06:18 -08:00
Brian Grant
4add4ebacc Merge pull request #21445 from janetkuo/fix-rolling-update-nil 
Fix rolling-update --image nil pointer dereference
 2016-02-24 13:59:01 -08:00
Brian Grant
832bc37ee4 Merge pull request #21713 from janetkuo/deployment-actual-replicas 
Report actual replicas in deployment status
 2016-02-24 13:55:16 -08:00
Brian Grant
b5c6341ec9 Merge pull request #21435 from janetkuo/use-intptr 
Use IntPtr
 2016-02-24 13:54:21 -08:00
nikhiljindal
2a538e317f Moving deployment deletion at the end 2016-02-24 13:00:45 -08:00
Justin Santa Barbara
2f0a56103c Cleanup of docstring for types.go 
Make it a little clearer what command actually needs to be run!
 2016-02-24 14:14:37 -05:00
jay vyas
4097cfe022 fake backoff implementation for speeding up flakey test, fake Clock Test for sleep 2016-02-24 13:50:29 -05:00
Marek Grabowski
4f12103354 Revert "kubelet: fix duplicated status updates at pod cleanup" 2016-02-24 17:57:57 +01:00
mqliang
e44e71ca87 make cache size configurable 2016-02-24 22:37:02 +08:00
k8s-merge-robot
d30c709a24 Merge pull request #21732 from Random-Liu/terminated_pods 
Auto commit by PR queue bot
 2016-02-24 05:10:25 -08:00
k8s-merge-robot
8a5c959494 Merge pull request #19043 from mqliang/lookup-cache 
Auto commit by PR queue bot
 2016-02-24 04:02:33 -08:00
mqliang
d9a35a25d7 add lookup cache for ReplicationController and ReplicaSet 2016-02-24 17:43:22 +08:00
nikhiljindal
9d7259950b Update status for paused deployments 2016-02-24 00:49:03 -08:00
Marcin Wielgus
81fcd778e3 Merge pull request #21550 from mwielgus/hpa-pending 
Don't include pending pods in metrics calculations
 2016-02-24 09:38:36 +01:00
nikhiljindal
7e50fa6df0 Update DeploymentReaper.Stop to use ObservedGeneration to remove race condition 2016-02-24 00:09:44 -08:00
k8s-merge-robot
9c1d8bf99d Merge pull request #21399 from sky-uk/disable-ingress-sg 
Auto commit by PR queue bot
 2016-02-24 00:05:47 -08:00