github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,426 Commits 1 Branch 31 Tags 1,019 MiB
8ecea546b2
Commit Graph

3742 Commits

Author SHA1 Message Date
Janet Kuo
8fb86a3d3b Add kubectl rollout history 2016-02-01 15:32:43 -08:00
k8s-merge-robot
4eaffd2477 Merge pull request #19900 from vishh/kubelet-cpu-cfs 
Auto commit by PR queue bot
 2016-02-01 15:18:30 -08:00
Michael Schmidt
92d814725b add generated code 2016-02-01 22:31:44 +01:00
k8s-merge-robot
ad40653a47 Merge pull request #20328 from deads2k/describe-path-loading 
Auto commit by PR queue bot
 2016-02-01 11:13:27 -08:00
k8s-merge-robot
2bea9e73dd Merge pull request #20366 from pmorie/local-cluster-docs 
Auto commit by PR queue bot
 2016-02-01 10:43:52 -08:00
deads2k
a6db141216 explain kubeconfig path loading rules 2016-02-01 13:34:05 -05:00
k8s-merge-robot
91f67372bf Merge pull request #20315 from pmorie/e2e-doc 
Auto commit by PR queue bot
 2016-02-01 10:29:15 -08:00
Chao Xu
90b4662d8d Add services/status path, and let the service controller uses Services.UpdateStatus() 2016-01-31 12:39:45 -08:00
Prayag Verma
cef8672855 Fix Typos 
Minor spelling mistakes -
descibe > describe
menioned > mentioned
compatiblity > compatibility
programatic > programmatic
 2016-02-01 01:39:12 +05:30
Michail Kargakis
426ef93358 docs: kubectl command structure and generators conventions 2016-01-31 17:24:17 +01:00
k8s-merge-robot
a81fa2f926 Merge pull request #18827 from sdminonne/workflow_resource 
Auto commit by PR queue bot
 2016-01-31 02:29:20 -08:00
k8s-merge-robot
4ee1bd5b50 Merge pull request #20342 from lavalamp/doc-flaky-test 
Auto commit by PR queue bot
 2016-01-31 02:15:38 -08:00
Alex Robinson
52cc7d9b23 Merge pull request #19929 from luxas/fix_hyperkube_version 
Update docker and docker-multinode docs on master to require 1.2.x
 2016-01-30 17:40:28 -08:00
k8s-merge-robot
2ab16bda17 Merge pull request #19882 from janetkuo/kubectl-rollout-command 
Auto commit by PR queue bot
 2016-01-30 16:52:55 -08:00
Paul Morie
c2063833f2 Add docs about dotfiles in secret volumes 2016-01-30 12:47:05 -05:00
k8s-merge-robot
34f4a03f62 Merge pull request #20103 from mml/drain-followup 
Auto commit by PR queue bot
 2016-01-30 06:25:06 -08:00
mqliang
b0e06c14e5 add a knob to enable quorum read 2016-01-30 20:32:12 +08:00
k8s-merge-robot
311d8f8ab9 Merge pull request #20009 from janetkuo/kubectl-get-deployments 
Auto commit by PR queue bot
 2016-01-30 04:16:27 -08:00
Paul Morie
e33b9a9460 Add basic doc on local cluster to dev guide 2016-01-30 00:33:27 -05:00
Paul Morie
41587e2810 Add link to e2e docs from coding conventions 2016-01-30 00:06:34 -05:00
k8s-merge-robot
17490c027d Merge pull request #19582 from smarterclayton/benchmark_watch 
Auto commit by PR queue bot
 2016-01-29 20:47:43 -08:00
Isaac Hollander McCreery
89dfad4087 Add docs about the PR builder 2016-01-29 16:23:59 -08:00
Isaac Hollander McCreery
b6cb8be2bd CI testing guidelines redux 2016-01-29 16:20:53 -08:00
k8s-merge-robot
c3a9b77d41 Merge pull request #19669 from mikedanese/scheduler-config 
Auto commit by PR queue bot
 2016-01-29 15:44:00 -08:00
Prashanth Balasubramanian
63b7ba0414 [wip] CI testing guidelines 2016-01-29 15:36:50 -08:00
Lucas Käldström
75e8c3f180 Update docker and docker-multinode docs on master to require 1.2.x and use the hyperkube-arch image 2016-01-29 23:01:49 +02:00
Aaron Crickenberger
d52855cab4 Link how-to-doc.md in devel/README.md 2016-01-29 12:44:55 -08:00
Aaron Crickenberger
43e45bbe5a Copy-paste on-call docs out of wiki 
Changed links to docs/wiki where appropriate.  No content changes aside
from explicitly calling out FAQ's as living in the wiki.

Ran `hack/update-generated-docs.sh`
 2016-01-29 12:44:52 -08:00
Daniel Smith
546637dc6f add instructions to ease follow-up 2016-01-29 11:47:33 -08:00
Fabio Yeon
eb2c2d1af4 Merge pull request #20111 from fabioy/fix-tmp-tests 
Add temp directory creation method for tests.
 2016-01-29 09:51:12 -08:00
Salvatore Dario Minonne
e8cf1dc8d1 Workflow: adding controller and address 2nd round review 2016-01-29 17:09:43 +01:00
Mike Danese
bb108fb03c autogenerated 2016-01-29 00:00:59 -08:00
k8s-merge-robot
6e6974a38f Merge pull request #18600 from mikedanese/kube-proxy-file 
Auto commit by PR queue bot
 2016-01-28 23:01:42 -08:00
k8s-merge-robot
554382b503 Merge pull request #20317 from pmorie/third-party-doc 
Auto commit by PR queue bot
 2016-01-28 21:25:14 -08:00
Paul Morie
c56a51d252 Expand coding convention information on third party code 2016-01-29 00:04:52 -05:00
k8s-merge-robot
298028dc8b Merge pull request #18533 from jlowdermilk/kubectl-help 
Auto commit by PR queue bot
 2016-01-28 20:55:27 -08:00
k8s-merge-robot
259193dfbb Merge pull request #19772 from joshix/patch-1 
Auto commit by PR queue bot
 2016-01-28 20:16:58 -08:00
Janet Kuo
fa25e29cbf Update kubectl convention about title column 2016-01-28 20:11:59 -08:00
Clayton Coleman
443cafab90 Add benchmarks for watch over websocket and http 
... and a quick doc on how to run them

```
$ godep go test ./pkg/apiserver -benchmem -run=XXX -bench=BenchmarkWatch
PASS
BenchmarkWatchHTTP-8        20000     95669 ns/op   15053 B/op    196 allocs/op
BenchmarkWatchWebsocket-8   10000    102871 ns/op   18430 B/op    204 allocs/op
```
 2016-01-28 21:34:51 -05:00
Jeff Lowdermilk
734a8c0602 Change kubectl help/examples to use jsonpath instead of template 2016-01-28 16:10:48 -08:00
Mike Danese
3ebbeb3c8c autogenerated 2016-01-28 15:46:40 -08:00
Fabio Yeon
2eac20562f Update API docs. 2016-01-28 15:29:53 -08:00
Paul Morie
f2d1a20178 Regen for ConfigMap API move 2016-01-28 17:17:24 -05:00
Paul Morie
9030f16071 Move ConfigMap to main API 2016-01-28 17:07:05 -05:00
Fabio Yeon
c6253c8d5e Merge pull request #19971 from feihujiang/fixErrorCommentInNodeCondition 
Fix a small error comment in nodecondition type
 2016-01-28 14:01:54 -08:00
Matt Liggett
d4b02466b7 Add support for Job-managed pods to drain. 2016-01-28 13:23:12 -08:00
k8s-merge-robot
4e27ed67e4 Merge pull request #17191 from nikhiljindal/3rdpartyServers 
Auto commit by PR queue bot
 2016-01-28 06:20:39 -08:00
Fabio Yeon
7205a160ac Remove all instances of "/tmp" from unit tests and replace with a common 
tmp directory creator. Exception is documented.
 2016-01-27 16:11:22 -08:00
Brendan Burns
4f845ad6e1 Merge pull request #19642 from MikeSpreitzer/issue/19618 
Introduce FLANNEL_OTHER_NET_CONFIG
 2016-01-27 12:20:11 -08:00
k8s-merge-robot
86dd321c73 Merge pull request #19489 from cloudnativeapps/vsphere-support-1 
Auto commit by PR queue bot
 2016-01-26 22:27:55 -08:00
k8s-merge-robot
91527c29cf Merge pull request #17382 from caesarxuchao/rewrite-linkchecker 
Auto commit by PR queue bot
 2016-01-26 17:51:44 -08:00
Chao Xu
3ec4cd423e linkchecker tool now visits the URL to determine if it's valid 2016-01-26 17:01:37 -08:00
Alex Robinson
6acf297231 Update the fluentd versions to include fixes for #19405. 2016-01-27 00:30:53 +00:00
k8s-merge-robot
6f1ec1b946 Merge pull request #19923 from pmorie/config-volume-proposal 
Auto commit by PR queue bot
 2016-01-26 13:03:12 -08:00
David Oppenheimer
af26de50e8 Merge pull request #20124 from davidopp/affinity 
Minor cleanups to anti-affinity proposal
 2016-01-26 12:36:05 -08:00
nikhiljindal
094e537e08 Adding a proposal for third party API servers 2016-01-26 12:17:11 -08:00
k8s-merge-robot
8c821700f3 Merge pull request #19389 from justinsb/internal_cidr 
Auto commit by PR queue bot
 2016-01-26 03:58:48 -08:00
k8s-merge-robot
88a72c2c9d Merge pull request #19938 from mikedanese/ipvalidate 
Auto commit by PR queue bot
 2016-01-25 21:09:51 -08:00
k8s-merge-robot
2286bd3a38 Merge pull request #19961 from mamikonyana/newrepo 
Auto commit by PR queue bot
 2016-01-25 19:51:23 -08:00
k8s-merge-robot
6e41d7a4e4 Merge pull request #19918 from kartouch/master 
Auto commit by PR queue bot
 2016-01-25 19:50:35 -08:00
k8s-merge-robot
d582fabf90 Merge pull request #19753 from jayunit100/cleanup-ha-example 
Auto commit by PR queue bot
 2016-01-25 19:48:14 -08:00
k8s-merge-robot
707b0b833c Merge pull request #19678 from bgrant0607/docfix 
Auto commit by PR queue bot
 2016-01-25 19:47:39 -08:00
k8s-merge-robot
5c52ba3e87 Merge pull request #20074 from a-robinson/brokenlink 
Auto commit by PR queue bot
 2016-01-25 19:33:39 -08:00
jay vyas
f3f167d2f9 Remove podmaster stuff, in lieu of the new least prototype 2016-01-25 18:47:00 -05:00
David Oppenheimer
8202906055 Cleanup. 2016-01-25 15:41:12 -08:00
Daniel Smith
ac5b954dce add expectations for flaky test issues 2016-01-25 14:18:17 -08:00
Brian Grant
ec83db2f46 Remove CAPS reference. Add node self-healing. 2016-01-25 18:51:30 +00:00
Brian Grant
ccc857c09a Update the description of what's not in Kubernetes. 2016-01-25 18:51:30 +00:00
Paul Morie
918a69479c Update proposal for ConfigMap volume 2016-01-25 13:48:46 -05:00
Eric Tune
99f301d0b7 Merge pull request #11980 from soltysh/scheduledjob_controller_proposal 
ScheduledJob controller proposal
 2016-01-25 08:39:16 -08:00
k8s-merge-robot
d7d601b2fc Merge pull request #18876 from erictune/dynamic-job 
Auto commit by PR queue bot
 2016-01-25 08:06:22 -08:00
k8s-merge-robot
d3b869ae14 Merge pull request #17922 from smarterclayton/split_codec 
Auto commit by PR queue bot
 2016-01-25 06:30:39 -08:00
k8s-merge-robot
1992fca62d Merge pull request #20081 from luxas/fix_apiserver_proxy_docs 
Auto commit by PR queue bot
 2016-01-25 06:07:44 -08:00
k8s-merge-robot
20273cf961 Merge pull request #20039 from ihmccreery/no-experimental 
Auto commit by PR queue bot
 2016-01-25 06:06:51 -08:00
k8s-merge-robot
33d1f6c085 Merge pull request #18265 from davidopp/affinity 
Auto commit by PR queue bot
 2016-01-25 05:57:10 -08:00
Lucas Käldström
528910f5f4 Fix the apiserver proxy doc 2016-01-25 09:33:08 +02:00
Alex Robinson
c9471a1665 Fix broken link to logging sidecar example. 2016-01-24 17:22:35 -08:00
Dhawal Yogesh Bhanushali
f7db2c6e99 vsphere support 2016-01-24 13:52:56 -08:00
David Oppenheimer
5abfb43b64 Merge pull request #18263 from davidopp/taints-tolerations 
Dedicated nodes, taints, and tolerations design proposal
 2016-01-24 12:15:57 -08:00
David Oppenheimer
1948dc5ab0 Merge pull request #18261 from davidopp/nodeselector 
Node affinity and NodeSelector design doc
 2016-01-24 12:12:45 -08:00
David Oppenheimer
14c276306c Dedicated nodes, taints, and tolerations design doc. 2016-01-23 23:05:50 -08:00
David Oppenheimer
87f2590f37 How to build Mesos/Omega-style frameworks on Kubernetes. 2016-01-23 22:00:19 -08:00
David Oppenheimer
32fa44041b Design doc for node affinity, including NodeSelector. 2016-01-23 19:57:41 -08:00
David Oppenheimer
cea5cf42b6 Inter-pod topological affinity/anti-affinity design doc. 2016-01-23 18:39:34 -08:00
Isaac Hollander McCreery
21e3776de6 Change wording about experimental API 2016-01-22 16:03:08 -08:00
Eric Tune
53ee76fe1a Support Work Queue jobs with variable parallelism 
When job.spec.completions is nil, only
one task needs to succeed for the job to succeed,
and parallelism can be scaled freely during runtime.

Added tests.

Release Note:

This causes two minor changes to the API.

First, unset parallelism previously was defaulted to be
equal to completions.  Now it always defaults to 1 if unset.

Second, having parallelism=N and completions unset would previously
be defaulted to 1 completion and N parallelism.
(this is not something we expect people to do, though)
Now, no defaulting occurs in that case, and the job's
behavior is different (any completion causes success).
 2016-01-22 14:57:51 -08:00
Rudi Chiarito
bc0dd97a70 ECR credential provider 2016-01-22 15:03:25 -05:00
Clayton Coleman
3262d8efd8 GENERATED: all 2016-01-22 13:27:28 -05:00
Zach Loafman
4803b8a984 Merge pull request #18260 from erictune/indexed-job 
Indexed job
 2016-01-22 10:25:30 -08:00
Eric Tune
e532129f85 Merge pull request #19717 from erictune/api-groups-doc 
Mention some new api groups.
 2016-01-22 10:06:39 -08:00
Arsen Mamikonyan
8b5e9e2885 Change repository references to https://github.com/kubernetes/kubernetes 2016-01-22 10:23:14 -05:00
Zach Loafman
a5f4f3b301 Merge pull request #16889 from vishh/disk-accounting 
Proposal for disk accounting
 2016-01-22 06:22:16 -08:00
Eric Tune
3ac015887e Design doc for Indexed Jobs. 2016-01-22 00:04:47 -08:00
feihujiang
50b6d3819f Fix a small error comment in nodecondition type 2016-01-22 10:21:16 +08:00
Mike Danese
1fc630caa0 add ip validation to componentconfig command line 2016-01-21 13:33:30 -08:00
Justin Santa Barbara
58191c446c Allow non-masquerade-cidr to be passed to the kubelet 
Removing the hard-coding of 10.0.0.0/8

Issue #11204
 2016-01-21 15:18:31 -05:00
Alex Mohr
592ec2bb53 Merge pull request #19843 from ihmccreery/ga-features 
Add docs about [Feature:...] tests for experimental, beta, and GA features
 2016-01-21 10:50:47 -08:00
Vishnu kannan
214b85e708 Enable CPU CFS quota by default. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-21 10:33:28 -08:00
Alex Mohr
3a70c14349 Merge pull request #19609 from quinton-hoole/2016-01-13-improve-compute-resources-docs 
Remove accidental cruft from compute-resources.md document.
 2016-01-21 10:32:08 -08:00
Alex Mohr
eaa61a72b0 Merge pull request #17919 from justinsb/multizone_gce 
Ubernetes Lite support for GCE
 2016-01-21 10:22:34 -08:00
k8s-merge-robot
dda29bedd8 Merge pull request #18722 from deads2k/add-sar 
Auto commit by PR queue bot
 2016-01-21 07:06:05 -08:00
Christophe Augello
38e845af02 rename anchor tl;dr to Abstract 2016-01-21 13:19:05 +01:00
Josh Wood
3d83686857 docs/getting-started/rkt: Clarify flannel prerequisites: need flannel + another etcd 2016-01-20 23:12:13 -08:00
k8s-merge-robot
4e04a289d8 Merge pull request #19793 from MikeSpreitzer/issue/19221 
Auto commit by PR queue bot
 2016-01-20 18:52:56 -08:00
Josh Wood
54a416fcc1 docs/getting-started/rkt: Add default route to k8s_cluster.conf example 2016-01-20 17:25:50 -08:00
k8s-merge-robot
5b5065c525 Merge pull request #19558 from idvoretskyi/patch-6 
Auto commit by PR queue bot
 2016-01-20 16:26:34 -08:00
Janet Kuo
183b7f4d6d Add kubectl rollout 2016-01-20 16:17:42 -08:00
Justin Santa Barbara
2958ea253a GCE: Allow for reuse of master 
This is for internal use at the moment, for testing Ubernetes Lite, but
arguably makes the code a little cleaner.

Also rename KUBE_SHARE_MASTER -> KUBE_USE_EXISTING_MASTER
 2016-01-20 15:37:00 -05:00
deads2k
14396fc464 add subject access review types 2016-01-20 08:24:15 -05:00
k8s-merge-robot
1c861d43ac Merge pull request #18298 from pmorie/secret-env 
Auto commit by PR queue bot
 2016-01-20 03:55:40 -08:00
Josh Wood
d6d2f6f203 docs/getting-started/rkt: Correct spelling error 2016-01-20 02:10:40 -08:00
Josh Wood
75fcbbf2c6 docs/getting-started/rkt: Improve sans flannel example 2016-01-20 02:06:54 -08:00
k8s-merge-robot
864065be97 Merge pull request #19621 from mikedanese/retrofit-controller-manager 
Auto commit by PR queue bot
 2016-01-19 17:22:42 -08:00
k8s-merge-robot
2a79ac4a31 Merge pull request #18322 from mesosphere/licenses 
Auto commit by PR queue bot
 2016-01-19 17:17:17 -08:00
k8s-merge-robot
501f770401 Merge pull request #17958 from sils1297/patch-1 
Auto commit by PR queue bot
 2016-01-19 17:15:37 -08:00
k8s-merge-robot
b80ed11cc2 Merge pull request #15998 from cilium-team/updating-vagrant 
Auto commit by PR queue bot
 2016-01-19 17:13:03 -08:00
Isaac Hollander McCreery
2794ee092f Add docs about [Feature:...] tests for experimental, beta, and GA features 2016-01-19 16:51:18 -08:00
André Martins
0515b4c7c9 Updated Vagrant VMs to Fedora 23 
Signed-off-by: André Martins <aanm90@gmail.com>
 2016-01-19 16:52:54 +00:00
Mike Spreitzer
bf671f5723 Fix reference to kubernetes release 
Replace old repo name with https://github.com/kubernetes/kubernetes.
Update default release to the latest, which is 1.1.4.
 2016-01-18 23:54:36 -05:00
Mike Danese
a885d84cc9 leaderelection: retrofit controller-manager with leaderelection client 
Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-18 14:05:55 -08:00
Paul Morie
394a7bb4d0 Regen for secrets in env 2016-01-18 12:32:32 -05:00
Paul Morie
c548054560 Add ability to consume secrets in env vars 2016-01-18 12:20:51 -05:00
Tim Hockin
1a5bd79dc3 Merge pull request #15353 from tpounds/cleanup-scratch-doc-formatting 
Minor documentation formatting cleanup.
 2016-01-17 23:46:08 -08:00
Josh Wood
bb6bb9f18e docs/getting-started/rkt/: Add and tune rkt network setup info 
Add info about rkt CNI networking setup to README.

Supersedes https://github.com/kubernetes/kubernetes/pull/19745.
 2016-01-17 11:57:16 -08:00
k8s-merge-robot
7d02cf6310 Merge pull request #19691 from piosz/doc-cleanup 
Auto commit by PR queue bot
 2016-01-16 19:46:40 -08:00
k8s-merge-robot
d5dde09e10 Merge pull request #19465 from thockin/docs-nit 
Auto commit by PR queue bot
 2016-01-16 13:32:36 -08:00
k8s-merge-robot
f2d273d481 Merge pull request #19128 from resouer/qps-limit 
Auto commit by PR queue bot
 2016-01-16 10:03:00 -08:00
k8s-merge-robot
3816c1798f Merge pull request #19411 from eparis/boolflag-def-val 
Auto commit by PR queue bot
 2016-01-16 06:23:48 -08:00
k8s-merge-robot
fab5fbde7c Merge pull request #19507 from mikedanese/kubelet-config 
Auto commit by PR queue bot
 2016-01-15 18:14:53 -08:00
Yifan Gu
e6c4234bd2 docs: Add more info about the networking setup for rkt. 2016-01-15 17:41:53 -08:00
Mike Danese
fe8ae1a28a autogenerated 2016-01-15 16:05:49 -08:00
Mike Danese
1162cfd3b1 kubelet: move most of kubelet server configuration to a config object. 
This is part of migrating kubelet configuration to the componentconfig api
group and is preliminary to retrofitting client configuration and
implementing full fledged API group mechinary.

Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-15 15:31:59 -08:00
k8s-merge-robot
df90bb44d9 Merge pull request #19679 from NanXiao/patch-1 
Auto commit by PR queue bot
 2016-01-15 13:24:43 -08:00
Eric Tune
021cfe8e09 Mention some new api groups. 2016-01-15 12:40:25 -08:00
k8s-merge-robot
21aa683fb5 Merge pull request #18974 from pmorie/config-env 
Auto commit by PR queue bot
 2016-01-15 06:42:56 -08:00
Piotr Szczesniak
04040e72dc Remove autoscaling.md outdate proposal 2016-01-15 11:06:19 +01:00
Nan Xiao
59df63d8a7 Update mesos.md 
#18954 should also be merged into master branch.
 2016-01-15 10:27:02 +08:00
Mike Danese
9745d1cbf0 Merge pull request #19626 from mikedanese/kubelet-labels 
kubelet: use ConfigurationMap instead of json
 2016-01-14 14:08:53 -08:00
Isaac Hollander McCreery
f6fe6949d5 Merge pull request #19505 from ihmccreery/label-documentation 
Add documentation for labels
 2016-01-14 13:11:31 -08:00
Mike Danese
b3d035e16f Merge pull request #19278 from philips/minor-edits-to-apiserver-watch-scaling 
docs: apiserver-watch: minor cleanups
 2016-01-14 11:51:48 -08:00
Isaac Hollander McCreery
2d09e07ae6 Add documentation for test labels 2016-01-14 09:54:23 -08:00
Mike Danese
35a3785cf6 kubelet: use ConfigurationMap instead of json 2016-01-14 09:32:42 -08:00
Karl Isenberg
6125f539b6 Add hack/update-godep-licenses.sh to generate Godeps/LICENSES.md 
- Add Godeps/LICENSES.md
- Add verify-godep-licenses to verify that Godeps/LICENSES.md is up to date
- Trigger verify-godep-licenses in the pre-commit hook only if the Godeps dir has changed
- Exclude verify-godep-licenses in verify-all
- Add verify-godep-licenses to make verify (used by travis)
- Add verify-godep-licenses to shippable
- Update dev docs to mention update-godep-licenses
 2016-01-14 09:05:25 -08:00
Paul Morie
17c8c8f9fc Regenerate for configMap in env 2016-01-14 10:40:56 -05:00
Eric Paris
aad4b4477d Make "BoolFlag" booleans not require =true 2016-01-14 09:07:00 -05:00
Maciej Szulik
10de4c2d51 ScheduledJob controller proposal 2016-01-14 12:09:24 +01:00
Salvatore Dario Minonne
8b3895def3 To address review feedbacks 2016-01-14 12:08:06 +01:00
Salvatore Dario Minonne
e368636b1d DAG Workflow with Workflow resource 2016-01-14 12:08:06 +01:00
k8s-merge-robot
2655e1f767 Merge pull request #19361 from tombenner/add_current_context 
Auto commit by PR queue bot
 2016-01-14 01:09:12 -08:00
Mike Spreitzer
d4ab9663c4 Introduce FLANNEL_OTHER_NET_CONFIG 
.. so allow configuration of other fields in, usually,
/coreos.com/network/config in etcd.

Fixes #19618
 2016-01-14 01:27:13 -05:00