summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1860 from fisherxu/automated-cherry-pick-of-#1670-upstrea...•••Automated cherry pick of #1670: fix too long time to get node ready when reconnectorigin/release-1.3KubeEdge Bot2020-06-226-174/+187
|\
| * clean up goroutines when delete egdenodefisherxu2020-06-224-56/+64
| * use one goroutine to send eventsfisherxu2020-06-222-144/+111
| * fix too long time to get node ready when reconnectfisherxu2020-06-223-16/+54
* | Merge pull request #1852 from GsssC/automated-cherry-pick-of-#1809-upstream-r...•••delay the volume mount until the pods are retrieved from metaManger a…KubeEdge Bot2020-06-222-8/+15
|\ \
| * | delay the volume mount until the pods are retrieved from metaManger and added...GsssC2020-06-222-8/+15
| |/
* | Merge pull request #1853 from GsssC/automated-cherry-pick-of-#1765-upstream-r...•••fix wrong use of e.namespace when get imagePullSecretKubeEdge Bot2020-06-221-1/+1
|\ \ | |/ |/|
| * fix wrong use of e.namespace when get imagePullSecretGsssC2020-06-221-1/+1
|/
* Merge pull request #1784 from fisherxu/automated-cherry-pick-of-#1782-upstrea...•••Automated cherry pick of #1782: use v1.3.1 as defaultKubeEdge Bot2020-06-061-1/+1
|\
| * use v1.3.1 as defaultfisherxu2020-06-061-1/+1
|/
* Merge pull request #1760 from fisherxu/automated-cherry-pick-of-#1697-upstrea...•••Automated cherry pick of #1697: fix kubectl logs certsv1.3.1KubeEdge Bot2020-05-307-52/+62
|\
| * fix kubectl logs certsLiangshuang2020-05-307-52/+62
* | Merge pull request #1759 from fisherxu/automated-cherry-pick-of-#1757-upstrea...•••Automated cherry pick of #1757: fix edgemesh caching serviceList bugKubeEdge Bot2020-05-302-8/+80
|\ \ | |/ |/|
| * fix edgemesh caching serviceList bugliuzhiyi19932020-05-302-8/+80
|/
* Merge pull request #1750 from fisherxu/automated-cherry-pick-of-#1708-upstrea...•••Automated cherry pick of #1708: fix using same namespace while sync podstatus to cloudKubeEdge Bot2020-05-291-12/+9
|\
| * fix using same namespace while sync podstatus to cloudGsssC2020-05-291-12/+9
* | Merge pull request #1749 from fisherxu/automated-cherry-pick-of-#1705-upstrea...•••Automated cherry pick of #1705: Improve certsfunctionKubeEdge Bot2020-05-298-62/+82
|\ \
| * | Improve certsfunctionLiangshuang2020-05-298-62/+82
| |/
* | Merge pull request #1748 from fisherxu/automated-cherry-pick-of-#1702-upstrea...•••Automated cherry pick of #1702: configure tls use ECDSA cipherKubeEdge Bot2020-05-292-2/+3
|\ \
| * | configure tls use ECDSA cipher•••configure tls use ECDSA cipher to match the cipher used by private key generating. Signed-off-by: luogangyi <luogangyi@cmsr.chinamobile.com> luogangyi2020-05-292-2/+3
|/ /
* | Merge pull request #1755 from fisherxu/automated-cherry-pick-of-#1709-upstrea...•••Automated cherry pick of #1709: fix E2E_UPDATE_DEVICE_3 failureKubeEdge Bot2020-05-291-0/+24
|\ \
| * | fix E2E_UPDATE_DEVICE_3 failureluogangyi2020-05-291-0/+24
|/ /
* | Merge pull request #1747 from fisherxu/automated-cherry-pick-of-#1663-upstrea...•••Automated cherry pick of #1663: expose checkerKubeEdge Bot2020-05-293-1/+17
|\ \ | |/ |/|
| * expose checkerPoor122020-05-293-1/+17
|/
* Merge pull request #1713 from fisherxu/automated-cherry-pick-of-#1701-upstrea...•••Automated cherry pick of #1701: update keadmKubeEdge Bot2020-05-2212-25/+237
|\
| * fix ci issuefisherxu2020-05-219-29/+71
| * update keadmXujiejie2020-05-219-19/+189
|/
* Merge pull request #1684 from fisherxu/automated-cherry-pick-of-#1682-upstrea...•••Automated cherry pick of #1682: change tunnel port from 10002 to 10004KubeEdge Bot2020-05-154-3/+4
|\
| * change tunnel port from 10002 to 10004•••Signed-off-by: kadisi <iamkadisi@163.com> kadisi2020-05-154-3/+4
|/
* Merge pull request #1680 from fisherxu/automated-cherry-pick-of-#1666-upstrea...•••Automated cherry pick of #1666: Add tips to clean up certificates in secretKubeEdge Bot2020-05-151-2/+5
|\
| * Add tips to clean up certificates in secretLiangshuang2020-05-151-2/+5
* | Merge pull request #1679 from fisherxu/automated-cherry-pick-of-#1661-upstrea...•••Automated cherry pick of #1661: modify logs for node reconnectKubeEdge Bot2020-05-151-1/+1
|\ \ | |/ |/|
| * modify logs for node reconnectfisherxu2020-05-151-1/+1
* | Merge pull request #1678 from fisherxu/automated-cherry-pick-of-#1656-upstrea...•••Automated cherry pick of #1656: update the doc kubeedge_configureKubeEdge Bot2020-05-151-6/+76
|\ \
| * | Update docs/setup/kubeedge_configure.md•••Co-authored-by: Fei Xu <xufei40@huawei.com> XJangel2020-05-151-1/+1
| * | add the advertiseAddresss in the doc kubeedge_configure.mdXujiejie2020-05-151-0/+15
| * | modify detailsXujiejie2020-05-151-3/+3
| * | update the doc kubeedge_configureXujiejie2020-05-151-6/+61
| |/
* | Merge pull request #1671 from fisherxu/automated-cherry-pick-of-#1628-upstrea...•••Automated cherry pick of #1628: keadm: fix get version issueKubeEdge Bot2020-05-151-3/+5
|\ \
| * | feedback•••Signed-off-by: Xiang Dai <764524258@qq.com> Xiang Dai2020-05-151-1/+2
| * | feedback•••Signed-off-by: Xiang Dai <764524258@qq.com> Xiang Dai2020-05-151-1/+1
| * | keadm: fix get version issue•••Signed-off-by: Xiang Dai <764524258@qq.com> Xiang Dai2020-05-151-3/+4
| |/
* | Merge pull request #1677 from fisherxu/automated-cherry-pick-of-#1655-upstrea...•••Automated cherry pick of #1655: add env status.hostIP for podsKubeEdge Bot2020-05-151-1/+6
|\ \
| * | add env status.hostIP for podsqingchen12032020-05-151-1/+6
| |/
* | Merge pull request #1676 from fisherxu/automated-cherry-pick-of-#1652-upstrea...•••Automated cherry pick of #1652: update generate certificates docsKubeEdge Bot2020-05-151-1/+3
|\ \
| * | Apply suggestions from code review•••Co-authored-by: Kevin Wang <kevinwzf0126@gmail.com> LiangShuang2020-05-151-1/+1
| * | Apply suggestions from code review•••Co-authored-by: Kevin Wang <kevinwzf0126@gmail.com> LiangShuang2020-05-151-1/+1
| * | update generate certificates docsLiangshuang2020-05-151-1/+3
| |/
* | Merge pull request #1675 from fisherxu/automated-cherry-pick-of-#1651-upstrea...•••Automated cherry pick of #1651: fix a bug about loading certificates from local dirKubeEdge Bot2020-05-151-4/+26
|\ \
| * | fix a bug about loading certificates from local dirLiangshuang2020-05-151-4/+26
| |/