summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1516 from ↵v1.2.1origin/release-1.2KubeEdge Bot2020-02-295-28/+68
|\ | | | | | | | | fisherxu/automated-cherry-pick-of-#1514-upstream-release-1.2 Automated cherry pick of #1514: get latest version from release instead of set the default
| * get latest version from release instead of set the default valuefisherxu2020-02-295-28/+68
|/
* Merge pull request #1512 from ↵KubeEdge Bot2020-02-283-24/+80
|\ | | | | | | | | fisherxu/automated-cherry-pick-of-#1504-upstream-release-1.2 Automated cherry pick of #1504: fix nil content of delete msg which created by syccontroller
| * fix nil content of delete msg which created by syccontrollermaao2020-02-283-24/+80
| | | | | | | | Signed-off-by: maao <maao@cmss.chinamobile.com>
* | Merge pull request #1510 from ↵KubeEdge Bot2020-02-281-1/+1
|\ \ | | | | | | | | | | | | fisherxu/automated-cherry-pick-of-#1491-upstream-release-1.2 Automated cherry pick of #1491: fix writing mistake in synccontroller
| * | fix writing mistake in synccontrollerLate Lee2020-02-281-1/+1
| |/ | | | | | | Signed-off-by: Late Lee <li@latelee.org>
* | Merge pull request #1511 from ↵KubeEdge Bot2020-02-284-14/+31
|\ \ | | | | | | | | | | | | fisherxu/automated-cherry-pick-of-#1496-upstream-release-1.2 Automated cherry pick of #1496: Remove hard code for network plugin settings
| * | Remove hard code for network plugin settingsfisherxu2020-02-284-14/+31
| |/
* | Merge pull request #1508 from ↵KubeEdge Bot2020-02-2865-993/+29524
|\ \ | | | | | | | | | | | | fisherxu/automated-cherry-pick-of-#1475-upstream-release-1.2 Automated cherry pick of #1475: refactor keadm that don't own to install k8s and docker
| * | fix keadm path for release 1.2fisherxu2020-02-281-2/+2
| | |
| * | add e2e for keadm deployfisherxu2020-02-285-0/+265
| | |
| * | if cloudcore or edgecore is already running on the host, reset firstfisherxu2020-02-285-20/+26
| | |
| * | support init & join at same hostfisherxu2020-02-285-21/+38
| | |
| * | fix for edgecorefisherxu2020-02-285-36/+44
| | |
| * | update vendor for create CRDfisherxu2020-02-2847-1/+28826
| | |
| * | create crdfisherxu2020-02-284-8/+100
| | |
| * | refactor keadm that don't own to install k8s and dockerfisherxu2020-02-2813-976/+294
| |/
* | Merge pull request #1505 from ↵KubeEdge Bot2020-02-283-19/+6
|\ \ | | | | | | | | | | | | fisherxu/automated-cherry-pick-of-#1494-upstream-release-1.2 Automated cherry pick of #1494: remove useless validation in cloudcore
| * | remove useless validation in cloudcorezhuguihua2020-02-283-19/+6
| |/ | | | | | | | | | | | | It is not necessary to check the existence of unixSocketAddress, it will be created in cloud/pkg/cloudhub/servers/udsserver/uds.go#L71. Signed-off-by: zhuguihua <zhuguihua@cmss.chinamobile.com>
* | Merge pull request #1506 from ↵KubeEdge Bot2020-02-286-186/+63
|\ \ | |/ |/| | | | | fisherxu/automated-cherry-pick-of-#1492-upstream-release-1.2 Automated cherry pick of #1492: add device e2e test
| * delete device_crd dirfisherxu2020-02-282-675/+0
| |
| * fix device update event can't send to edgefisherxu2020-02-281-2/+1
| |
| * add device e2e testfisherxu2020-02-284-3/+556
|/
* Merge pull request #1487 from ↵KubeEdge Bot2020-02-211-10/+12
|\ | | | | | | | | kevin-wangzefeng/automated-cherry-pick-of-#1467-upstream-release-1.2 Automated cherry pick of #1467: Compatibility matrix
| * Compatibility matrixYin Ding2020-02-211-10/+12
| | | | | | | | Add release 1.2 row
* | Merge pull request #1486 from ↵KubeEdge Bot2020-02-212-4/+46
|\ \ | | | | | | | | | | | | kevin-wangzefeng/automated-cherry-pick-of-#1465-upstream-release-1.2 Automated cherry pick of #1465: update v1.2 and v1.1 changelog, add download links
| * | update v1.2 and v1.1 changelog, add download linksKevin Wang2020-02-212-4/+46
| |/
* | Merge pull request #1485 from ↵KubeEdge Bot2020-02-217-31/+113
|\ \ | | | | | | | | | | | | kevin-wangzefeng/automated-cherry-pick-of-#1463-upstream-release-1.2 Automated cherry pick of #1463: fix bug for hostpath volume
| * | add e2e for hostpath volumefisherxu2020-02-214-20/+73
| | |
| * | fix bug for hostpath volumefisherxu2020-02-213-11/+40
| |/
* | Merge pull request #1484 from ↵KubeEdge Bot2020-02-211-1/+2
|\ \ | |/ |/| | | | | kevin-wangzefeng/automated-cherry-pick-of-#1461-upstream-release-1.2 Automated cherry pick of #1461: fix bug for create pod in synccontroller
| * fix bug for create pod in synccontrollerfisherxu2020-02-211-1/+2
|/
* Merge pull request #1459 from fisherxu/release-1.2v1.2.0KubeEdge Bot2020-02-092-1/+82
|\ | | | | Cherry-pick changelog-1.2 to release-1.2
| * update k8s versionfisherxu2020-02-091-1/+1
| |
| * add changelog for 1.2 releasefisherxu2020-02-091-0/+81
|/
* Merge pull request #1343 from fisherxu/reliab-proposalKubeEdge Bot2020-02-073-0/+276
|\ | | | | Reliable message delivery design proposal
| * update the reliable proposalfisherxu2020-02-071-10/+10
| |
| * Reliable message delivery design proposalfisherxu2020-02-073-0/+276
| |
* | Merge pull request #1172 from kadisi/proposal_change_config_formatKubeEdge Bot2020-02-071-0/+1236
|\ \ | | | | | | Proposal for KubeEdge Component Config
| * | proposal for change config format, highlevel design,change new config api ↵zhangjie2020-02-071-0/+1236
| | | | | | | | | | | | | | | | | | | | | | | | and support --defaultconfig, --minconfig subcommand Signed-off-by: zhangjie <iamkadisi@163.com> Co-Authored-By: Kevin Wang <wangzefeng@huawei.com> Signed-off-by: zhangjie <iamkadisi@163.com>
* | | Merge pull request #1385 from fisherxu/synccontrollerv1.2.0-beta.0KubeEdge Bot2020-02-0612-3/+612
|\ \ \ | | | | | | | | Add synccontroller for reliable message delivery
| * | | update - to . in objectSync namefisherxu2020-02-064-8/+11
| | | |
| * | | add config of synccontroller in Component APIfisherxu2020-02-066-10/+40
| | | |
| * | | add synccontrollerfisherxu2020-02-068-1/+577
| | | |
* | | | Merge pull request #1431 from kadisi/edgesite_dirKubeEdge Bot2020-02-065-8/+8
|\ \ \ \ | |/ / / |/| | | add edgesite dir
| * | | add edgesite dirzhangjie2020-02-065-8/+8
|/ / / | | | | | | | | | Signed-off-by: zhangjie <iamkadisi@163.com>
* | | Merge pull request #1440 from fisherxu/e2e-failKubeEdge Bot2020-02-063-1/+22
|\ \ \ | | | | | | | | Fix e2e failed
| * | | fix e2e failedfisherxu2020-02-063-1/+22
| | | |
* | | | Merge pull request #1441 from wuyuting1986/fix_doc_errorKubeEdge Bot2020-02-061-1/+1
|\ \ \ \ | |/ / / |/| | | Fix doc error about cross compiling for ARM
| * | | Bugfix: fix doc error about cross compiling for ARMwuyuting19862020-02-061-1/+1
|/ / /