opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
李泽玺 e49180a3f5 Merge pull request #585 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-app to release/2.3.0 
* commit 'f1fcea29f520555ad8b7d5f217019cd55af11ead':
  climc: support job, statefulset, secret create
 2018-11-28 10:47:34 +08:00
Zexi Li f1fcea29f5 climc: support job, statefulset, secret create 2018-11-27 22:07:40 +08:00
屈轩 5a33750f62 冲突解决 2018-11-27 21:13:39 +08:00
邱剑 f8d0421f7a Merge pull request #580 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-rebuild-root-2.1.0 to release/2.1.0 
* commit '957a4c074446600dd2feb1378948ef972d7ad557':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
邱剑 696a7f230c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f8d0421f7ac925df8ede2053407e88bcd875c616':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
邱剑 e65e6f4350 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '696a7f230cdd403d9f0fde127c46c83c1398f9d2':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
屈轩 957a4c0744 避免image_id未做转换后导致rebuild-root任务失败 2018-11-27 21:04:10 +08:00
邱剑 091adfee46 Merge pull request #567 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-esxi-support-complete to release/2.4.0 
* commit 'aaaba6002fb2773d7e05f2353abad494addb3c18':
  fix aliyun fail to attach disk after create disk
  minor fixes
  update vendor
  fix aliyun error code handling changes, use error message string to check message type
  修正：1. host request double token 2. cloud provider lost access url
  backport remove sysutils
  update vendor
  remote sysutils
  esxi support
  temp commit
 2018-11-27 18:07:52 +08:00
邱剑 443e55279e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'df6f57a5ca5e986e7929b53103a3024214b388c8':
  fix: scheduler nil map panic
 2018-11-27 17:34:16 +08:00
Zexi Li 743ff2ef9d fix: scheduler nil map panic 2018-11-27 17:32:10 +08:00
邱剑 4b526fb9ab Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd3d1c78a8d4b3d5262907a81e960d6cb645fe7ac':
  增加 quotas 和 usages 的缺省权限
 2018-11-27 15:10:36 +08:00
Qiu Jian 16f06ff081 增加 quotas 和 usages 的缺省权限 2018-11-27 15:04:18 +08:00
Qiu Jian aaaba6002f fix aliyun fail to attach disk after create disk 2018-11-26 23:21:11 +08:00
Qiu Jian 341e4204a0 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 21:54:06 +08:00
邱剑 eface15bed Merge pull request #573 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.4.0 to release/2.4.0 
* commit 'bf06bcdc8ae0f296ffdb4d8b0627583f8038074b':
  初始化model
 2018-11-26 20:33:57 +08:00
唐斌 de23945a9d Merge pull request #547 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-error-translation to release/2.4.0 
* commit '6dc3d879c7ffdb61a2cf27eb8bd94879635b73d9':
  add test cases
  add tranlation
 2018-11-26 19:14:12 +08:00
屈轩 bf06bcdc8a 解决冲突 2018-11-26 16:52:02 +08:00
屈轩 18eedcf82c 解决冲突 2018-11-26 16:42:11 +08:00
屈轩 e98957b337 解决冲突 2018-11-26 16:27:32 +08:00
Qiu Jian 7a82109004 minor fixes 2018-11-26 16:24:21 +08:00
Qiu Jian a964836953 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 15:04:27 +08:00
wanyaoqi 71bca99279 make dep 2018-11-26 13:50:32 +08:00
wanyaoqi 9c52c999a1 support nfs storage 2018-11-26 13:49:32 +08:00
邱剑 411195176d Merge pull request #555 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-secgroup-sync to release/2.2.0 
* commit '5dc063ee40b60dbbce48cc036053e2171dace8e1':
  初始化model
 2018-11-26 13:47:04 +08:00
邱剑 00e001d981 Merge pull request #471 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/guest-disks-backup to release/2.4.0 
* commit 'e64b71818b9f32f49ece1accce7adf011d12a4e1':
  region: support create backup guest; scheduler: support backup guest schedule
 2018-11-26 13:45:08 +08:00
邱剑 97dc17ff08 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '98a2d9a212ee03cca3a8f1beba13a337e77fb610':
  scheduler: 兼容 v2 region 的输入
 2018-11-26 13:37:51 +08:00
邱剑 98a2d9a212 Merge pull request #569 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-regionv2-compatible to release/2.3.0 
* commit '87a5c43ef364c63df22992c983393fe20a04d99d':
  scheduler: 兼容 v2 region 的输入
 2018-11-26 13:37:50 +08:00
Zexi Li 87a5c43ef3 scheduler: 兼容 v2 region 的输入 2018-11-26 13:35:22 +08:00
邱剑 6be6de02bf Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4469e92e1dc93b58c22ba9d404dc425ddb835a81':
  为yunonagent的通知增加缺省策略，避免前端报权限不足错误
 2018-11-26 12:35:42 +08:00
屈轩 5dc063ee40 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-secgroup-sync 2018-11-26 11:10:43 +08:00
Qiu Jian c398301eba fix aliyun error code handling changes, use error message string to 
check message type
 2018-11-26 02:58:51 +08:00
Qiu Jian 855c115b45 为yunonagent的通知增加缺省策略，避免前端报权限不足错误 2018-11-26 01:53:59 +08:00
Qiu Jian 3b2b4d59e0 修正：1. host request double token 2. cloud provider lost access url 2018-11-26 01:42:16 +08:00
Qiu Jian 9e5aee6e6e backport remove sysutils 2018-11-25 23:21:16 +08:00
Qiu Jian 1b1cc8ed94 Merge branch 'feature/qj-esxi-support-complete' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-25 09:35:10 +08:00
Qiu Jian df4adb6a6f remote sysutils 2018-11-25 09:34:18 +08:00
Qiu Jian dcbc3daf49 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-25 08:27:09 +08:00
Qiu Jian 94c49ded2e esxi support 2018-11-25 08:21:24 +08:00
邱剑 5d07de78ac Merge pull request #563 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-routetables to release/2.4.0 
* commit '593219e0103030b781b9d9ac7b9745327d539b41':
  aliyun: 同步routetables
  routetables: initial version
  aliyun: add SVpc.apiRequest() method
  aliyun: region: rename ecsClient to sdkClient
  aliyun: rename jsonRequest to ecsRequest
 2018-11-24 11:32:01 +08:00
邱剑 13593beee7 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a087c33c88312c8a1dbcc0bdbdb464a99c6bef21':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:08 +08:00
邱剑 be38bf62f3 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b70be6be0f4007fea7b93b039c77d37a6e6f6208':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
邱剑 c8bc4c0598 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'be38bf62f3bb8444948a1fdbc267553fc884a8e1':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
邱剑 a087c33c88 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c8bc4c0598bb35f4c26245ebd503428f5a72a1e4':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
屈轩 58962cf2d2 避免localtask failed时error一直是Task failed due to unknown remote errors 2018-11-23 19:07:20 +08:00
邱剑 410c498599 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '78e9154b4fcfa02725f8fc16a337039b137e37d7':
  minor updates
  1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status check
 2018-11-23 15:04:09 +08:00
邱剑 78e9154b4f Merge pull request #561 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resize-opslog-notes to release/2.3.0 
* commit '46b67e9dc97834baae30515e55170311d13450a6':
  minor updates
  1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status check
 2018-11-23 15:04:09 +08:00
Qiu Jian 46b67e9dc9 minor updates 2018-11-23 15:03:22 +08:00
邱剑 07ec657fa6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c67e949e68b27e937e532e2ab907d2814aafb805':
  host ping catalog add elasticsearch service
 2018-11-23 14:56:17 +08:00
Zexi Li bec79cde6a host ping catalog add elasticsearch service 2018-11-23 14:18:41 +08:00
Yousong Zhou 593219e010 aliyun: 同步routetables 2018-11-23 03:17:41 +00:00