summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2399 from threestoneliu/automated-cherry-pick-of-#2392-up...•••Automated cherry pick of #2392: fix message send problemorigin/release-1.5KubeEdge Bot2020-12-071-8/+10
|\
| * fix message send problemThreestone2020-12-041-8/+10
* | Merge pull request #2377 from daixiang0/automated-cherry-pick-of-#2334-upstre...•••Automated cherry pick of #2334: CI: switch amd64 tests to Github ActionKubeEdge Bot2020-12-0415-116/+204
|\ \ | |/ |/|
| * Sync latest config•••Signed-off-by: Xiang Dai <long0dai@foxmail.com> Xiang Dai2020-12-041-7/+14
| * CI: switch amd64 tests to Github Action•••Signed-off-by: Xiang Dai <long0dai@foxmail.com> Xiang Dai2020-11-3015-116/+197
* | Merge pull request #2394 from threestoneliu/automated-cherry-pick-of-#2387-up...•••Automated cherry pick of #2387: fix msg in nodestore compare errorKubeEdge Bot2020-12-041-2/+1
|\ \
| * | fix msg in nodestore compare errorThreestone2020-12-031-2/+1
|/ /
* | Merge pull request #2376 from threestoneliu/automated-cherry-pick-of-#2373-up...•••Automated cherry pick of #2373: fix resource version compare errorKubeEdge Bot2020-11-301-1/+1
|\ \ | |/ |/|
| * fix resource version compare errorThreestone2020-11-301-1/+1
|/
* Merge pull request #2359 from GsssC/automated-cherry-pick-of-#2349-upstream-r...•••Automated cherry pick of #2349: upgrade klog@0.4.0 to klog/v2@2.2.0KubeEdge Bot2020-11-23202-2233/+206
|\
| * fix licenseGsssC2020-11-233-196/+9
| * upgrade klog@0.4.0 to klog/v2@2.2.0GsssC2020-11-23199-2037/+197
|/
* Merge pull request #2320 from tangyanhan/cherry-pick/bugfix/less-edge-message•••Print less verbose message received from cloud-hubv1.5.0KubeEdge Bot2020-11-121-1/+1
|\
| * Print less verbose message received from cloud-hubTang Yanhan2020-11-121-1/+1
|/
* Merge pull request #2311 from GsssC/automated-cherry-pick-of-#2170-upstream-r...•••Automated cherry pick of #2170: fix re-dowload bug when use keadmKubeEdge Bot2020-11-113-33/+198
|\
| * upgrade DefaultKubeEdgeVersion to 1.5.0GsssC2020-11-102-6/+3
| * add test for func downloadServiceFileGsssC2020-11-102-1/+151
| * fix re-dowload bug when use keadmGsssC2020-11-101-31/+49
|/
* Merge pull request #2305 from gccio/automated-cherry-pick-of-#2304-kubeedge-r...•••Automated cherry pick of #2304: cloudhub: fix /readyz panicKubeEdge Bot2020-11-091-0/+7
|\
| * cloudhub: fix /readyz panic•••cloudhub api /readyz always panic if set leaderelection.LeaderElect to false. LIYUNFAN2020-11-071-0/+7
|/
* Merge pull request #2293 from fisherxu/k8s-update•••Update K8s version in node status and related docsv1.5.0-beta.0KubeEdge Bot2020-11-053-6/+6
|\
| * update the docs for k8s 1.19xufei 004169462020-11-032-5/+5
| * upgrade the k8s version showed in node statusxufei 004169462020-11-031-1/+1
* | Modbus mapper refactor (#2282)•••* Add modbus mapper. * Add modbus mapper. * Address comments. 1. Set client to each RTU port instead of each RTU device. 2. Add README 3. Refine the dockerfile * Refine device instance & model example files. * Fix verify and lint issues. * Address lint & verify issues. * Add license * Remove whitenoise * Fix error * Address lint errors * Refine as the Fisher's comment * Remove serial license * Add more license * Address conflictsailorvii2020-11-0565-2/+4840
* | Merge pull request #2009 from shenkonghui/feat/keadm-debug-collect•••Add command ”keadm debug collect/check/diagnose“KubeEdge Bot2020-11-05137-6/+13280
|\ \
| * | remove check archshenkonghui2020-11-053-27/+2
| * | Optimize keadm debugshenkonghui2020-11-0574-1341/+2237
| * | add diagnoseshenkonghui2020-11-05125-221/+11552
| * | add debug check and add keadm debug collect•••修复合并问题 shenkonghui2020-11-055-2/+920
| * | init diagnoseshenkonghui2020-11-056-4/+158
|/ /
* | Mapper proposal (#2147)•••* Mapper proposal Reconstruct the mapper desgin. * Refine the gramma errors. * Refine message image * Refine a minor issue * Refine as Kevin's comments * Rename as Kevin and Fisher' comment. * Update docs/proposals/mapper-design-v2.md Co-authored-by: Fei Xu <xufei40@huawei.com>sailorvii2020-11-054-0/+140
* | Merge pull request #2098 from qingchen1203/keadm-debug-get-local•••Add command ”keadm debug get“ KubeEdge Bot2020-11-05435-0/+61699
|\ \
| * | Add keadm debug getqingchen12032020-11-04435-0/+61699
* | | Merge pull request #2294 from soyoo/patch-1•••edge/cmd/edgecore/app/server.go: fix a typoKubeEdge Bot2020-11-041-1/+1
|\ \ \
| * | | Update server.go•••fix typo error.soyoo2020-11-031-1/+1
| | |/ | |/|
* | | Merge pull request #2296 from zqzzq/fix-typo•••Docs: fix typoKubeEdge Bot2020-11-041-1/+1
|\ \ \ | |_|/ |/| |
| * | Docs: fix typoQiang Zheng2020-11-041-1/+1
|/ /
* | Merge pull request #2182 from jidalong/master•••fix bug: cloud send twin_update confirm message to edgeKubeEdge Bot2020-11-033-0/+31
|\ \
| * | fix bug: cloud send twin_update confirm message to edgejidalong2020-09-213-0/+31
* | | Merge pull request #2292 from fisherxu/bump_kind•••Bump the kind to latest versionKubeEdge Bot2020-11-032-2/+2
|\ \ \ | |_|/ |/| |
| * | upgrade the kind to latest versionfisherxu2020-11-032-2/+2
|/ /
* | Merge pull request #2223 from dingyin/1.19•••update Kubernetes version to 1.19.3KubeEdge Bot2020-11-032443-159666/+198736
|\ \
| * | Revert doc about Docker version (#13)•••* Revert doc about Docker version * reverted functions in edged_podsRio Zhu2020-11-022-50/+15
| * | Sorted imports, deleted extra file (#12)•••* Moved logManager and runtimeClassManager to start at the Start() function. Fixed typo * Sorted imports * Delete extra fileRio Zhu2020-11-013-19/+13
| * | Moved logManager and runtimeClassManager to start at the Start() function. Fi...Rio Zhu2020-10-301-5/+5
| * | Add doc about Docker version requirementYin Ding2020-10-291-1/+7
| * | fix lint issueYin Ding2020-10-291-8/+8
| * | update base VM to focal•••- remove the code upgrade docker version manually Yin Ding2020-10-291-13/+1
| * | clean up the commitsYin Ding2020-10-292-5/+1
| * | update docker to stable versionYin Ding2020-10-291-0/+12