Wojciech Tyczynski
b33954c45e
Merge pull request #10963 from thockin/cherrypick-fixes
...
Ignore untracked files in cherrypick
2015-07-09 11:28:11 +02:00
Wojciech Tyczynski
977b1d9579
Merge pull request #10823 from piosz/real_test
...
Added load test with pods doing real works
2015-07-09 11:26:47 +02:00
Satnam Singh
70afc829c6
Update logging getting started guides to reflect namespace change
2015-07-09 01:12:13 -07:00
Wojciech Tyczynski
9d32830040
Merge pull request #10978 from wojtek-t/fix_shell_services
...
Fix Shell services test
2015-07-09 10:08:57 +02:00
Wojciech Tyczynski
9cb7bc2e90
Fix Shell services test
2015-07-09 09:46:10 +02:00
Wojciech Tyczynski
e80a193664
Merge pull request #9943 from mamikonyana/override_ubuntu_defaults
...
Do not override environment variable in ubuntu defaults
2015-07-09 09:21:26 +02:00
Wojciech Tyczynski
e5836cc933
Merge pull request #10952 from mbforbes/JenkinsRemoveServer
...
Jenkins: remove dead 'use server version' code
2015-07-09 09:09:13 +02:00
Wojciech Tyczynski
534af353fb
Merge pull request #10895 from JanetKuo/k8s-ui
...
Update UI doc for the usage of Kubernetes UI
2015-07-09 09:08:17 +02:00
Janet Kuo
ea092fd77b
E2E tests for kubectl label command
2015-07-08 23:36:16 -07:00
Janet Kuo
d0c618a25e
Rephrase and remove redundant words
2015-07-08 23:13:52 -07:00
Tim St. Clair
d8987b3c8a
Fix reference to kube-ui proxy path
2015-07-08 19:32:28 -07:00
Zach Loafman
41f8907539
Merge pull request #10970 from zmerlynn/v0.21.1-merge-to-master
...
V0.21.1 merge to master
2015-07-08 19:30:16 -07:00
Zach Loafman
e1cccbf318
Merge pull request #10969 from zmerlynn/release-0.21
...
Release 0.21.1
2015-07-08 19:11:13 -07:00
Zach Loafman
3910893d37
0.21.1 merge to master
2015-07-08 18:52:51 -07:00
Zach Loafman
9d2691d48b
Kubernetes version v0.21.1-dev
2015-07-08 18:52:51 -07:00
Zach Loafman
539e7c8a89
Revert "Versioning docs and examples for 0.21.1"
...
This reverts commit aa618a97f4
2015-07-08 18:52:51 -07:00
Zach Loafman
906122a279
Kubernetes version v0.21.1
2015-07-08 18:52:51 -07:00
Zach Loafman
aa618a97f4
Versioning docs and examples for 0.21.1
2015-07-08 18:52:50 -07:00
Janet Kuo
de97fb8ecf
Update ui.md
2015-07-08 18:44:48 -07:00
Janet Kuo
dbc8493cab
Update ui.md
2015-07-08 18:35:30 -07:00
Zach Loafman
5c41af424f
Merge pull request #10967 from thockin/automated-cherry-pick-of-#10488-on-upstream-release-0.21
...
Automated cherry pick of #10488 on upstream release 0.21
2015-07-08 18:33:28 -07:00
Justin Santa Barbara
d306738bec
Salt: re-remove comment block
...
It had been removed in upstream, but had been kept by mistake here.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
cee489d499
Salt: have kube-addons service depend on init file
...
For symmetry with systemd
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
191528b782
Salt: Add service block for kube-proxy for systemd
...
We have the workaround for Salt's problems here, but we should still express
our intent.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
efce770fbb
Salt: clean daemon_args on RedHat, not systemd
...
I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
aff1ffc319
Salt: Add more dependencies to systemd services
...
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.
Salt bug: https://github.com/saltstack/salt/issues/16778
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
a5fa0b8bb5
Set standard bash options in services helper script
2015-07-08 18:25:23 -07:00
Justin Santa Barbara
d09c9fe355
Salt: support systemd (don't assume Redhat <=> systemd)
...
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
2015-07-08 18:25:23 -07:00
Zach Loafman
fb52d1e93e
Merge pull request #10965 from zmerlynn/trappy
...
Fix two issues in cherry_pick_pull.sh
2015-07-08 18:17:16 -07:00
Zach Loafman
1d6db553b0
Fix two issues in cherry_pick_pull:
...
* Ignore errexit in trap handler
* Check for branch (since two people have complained now..)
2015-07-08 18:16:27 -07:00
Brendan Burns
7ccc0a4ec5
Merge pull request #10910 from zmerlynn/redo_build_official_release
...
Add `build-official-release.sh` (take two)
2015-07-08 17:26:02 -07:00
Victor Marmol
7bb9cdf660
Merge pull request #10830 from jimmidyson/gc-log-symlinks
...
Fixes #8945 : Cleanup log symlinks on remove & dead log symlinks
2015-07-08 17:22:21 -07:00
Tim Hockin
c5f6525545
Merge pull request #10961 from thockin/docs-bugfix-strip-release
...
Fix quoting issue on sed
2015-07-08 17:21:51 -07:00
Victor Marmol
9f3301d6f9
Merge pull request #10799 from caesarxuchao/output-clusterdns
...
update kubectl get outputs in examples/cluster-dns
2015-07-08 17:18:17 -07:00
Victor Marmol
0dc9b041c0
Merge pull request #10871 from caesarxuchao/kubernetes-ns-output
...
update the output of kubectl get in examples/kubernetes-namespace
2015-07-08 17:17:58 -07:00
Tim Hockin
b61985ad87
Ignore untracked files in cherrypick
2015-07-08 17:09:14 -07:00
Tim Hockin
e099a7f0e0
Fix quoting issue on sed
2015-07-08 16:53:51 -07:00
Victor Marmol
dd378f148b
Merge pull request #10896 from thockin/docs-versioning-2
...
Make READMEs even more obviously versioned.
2015-07-08 16:24:40 -07:00
Victor Marmol
f427b997ca
Merge pull request #10889 from cjcullen/tokenMetrics
...
Add prometheus metrics for altTokenSource.
2015-07-08 16:13:38 -07:00
Victor Marmol
cfbc64e3c5
Merge pull request #10864 from mbforbes/gcloudUpdateJenkins
...
Fully update gcloud before Jenkins runs
2015-07-08 16:13:27 -07:00
Victor Marmol
f1e66c718d
Merge pull request #10590 from roberthbailey/kubelet-on-nodes
...
Install the kubectl binary on nodes in addition to the master.
2015-07-08 16:13:12 -07:00
Zach Loafman
a6594dc38b
Add skip/flaky arguments for the jenkins-gce-e2e-release job
...
I haven't added the job yet. Want to get the args in place first.
Related to #10676
2015-07-08 16:12:50 -07:00
Victor Marmol
1d8c064fb9
Merge pull request #10948 from satnam6502/e2e
...
End to end test for Kibana liveness
2015-07-08 16:12:21 -07:00
Victor Marmol
f5cbf5af0f
Merge pull request #10923 from wojtek-t/promote_tests_2
...
Promote ElasticSearch test to non-flaky suite
2015-07-08 16:11:56 -07:00
Victor Marmol
bad704f355
Merge pull request #10890 from caesarxuchao/node-selection-output
...
update the kubectl get command in examples/node-selection
2015-07-08 16:11:26 -07:00
Zach Loafman
51360aa350
Merge pull request #10947 from zmerlynn/automated-cherry-pick-of-#10562-on-upstream-release-0.21
...
Automated cherry pick of #10562
2015-07-08 16:07:48 -07:00
Zach Loafman
39c31bab40
Merge pull request #10939 from zmerlynn/automated-cherry-pick-of-#10884-on-upstream-release-0.21
...
Automated cherry pick of #10884 on upstream release 0.21
2015-07-08 16:06:23 -07:00
Zach Loafman
f4a8727642
Merge pull request #10942 from brendandburns/automated-cherry-pick-of-#10877-on-release-0.21
...
Automated cherry pick of #10877 on release 0.21
2015-07-08 16:05:28 -07:00
Mike Danese
57f235a99f
remove v1beta3 examples from getting started from scratch guide
2015-07-08 15:56:22 -07:00
Victor Marmol
a599d80343
Merge pull request #10941 from caesarxuchao/getting-started-output
...
update the kubectl output in gettint-started-guides
2015-07-08 15:55:44 -07:00
