Commit Graph
1636 Commits
Author SHA1 Message Date
Qiu Jian fdb2e8132f minor updates 2018-10-18 19:58:08 +08:00
TangBin 4c46c44020 temp files 2018-10-18 19:01:02 +08:00
Zexi Li 8180586d0b fix: scheduler cloudprovider ProjectId typo 2018-10-18 18:42:11 +08:00
Qiu Jian 99d20fe900 fix fmt 2018-10-18 18:10:48 +08:00
邱剑 4b09ae87af Merge pull request #1 in ~QIUJIAN/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-dynamictag to feature/qj-dynamic-schedtag
* commit '4d6fbcdf0c08c18dfa0ec35e18b02ef44742beef':
  scheduler: dynamicschedtags support
2018-10-18 18:04:20 +08:00
Zexi Li 4d6fbcdf0c scheduler: dynamicschedtags support 2018-10-18 18:01:31 +08:00
邱剑 a0237e1d0c Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'bd44d611bdb2c7a1c0bad453ae66b270c2bebdc5':
  Azure stop默认使用deallocate
2018-10-18 17:56:25 +08:00
Qiu Jian 3fabccaf71 parser improvement 2018-10-18 17:52:08 +08:00
屈轩 4e4d005907 Azure stop默认使用deallocate 2018-10-18 17:08:56 +08:00
邱剑 a72b479bdb Merge pull request #301 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-enable-http-tls to release/2.2.0
* commit '575ea95525aea075b1ae8b542151185ee4ba14c5':
  改进:允许climc指定tls证书,允许服务指定tls证书
2018-10-18 16:01:19 +08:00
邱剑 510ad125db Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'a72b479bdb8bf848b48a315fb667ec4ee38142fc':
  改进:允许climc指定tls证书,允许服务指定tls证书
2018-10-18 16:01:19 +08:00
Qiu Jian 352e4816a6 minor fixes 2018-10-18 15:58:09 +08:00
TangBin 0bcf42964c add snapshot sync 2018-10-18 14:54:57 +08:00
Qiu Jian dfa5a634ab 修正:cloudprovider/cloudacount的代码recode 2018-10-18 12:22:50 +08:00
Qiu Jian b319a5722b Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-dynamic-schedtag 2018-10-17 21:42:10 +08:00
邱剑 93bc41c167 Merge pull request #291 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloud-account to release/2.3.0
* commit 'e7bd5dfa66588a8e8fd2bcfb93ce401641945bc2':
  减少调用层级
  支持云账号主次之分
2018-10-17 21:16:44 +08:00
邱剑 3fa36d3869 Merge pull request #305 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-rebuild-root to release/2.2.0
* commit '7a5c4c990e5b038db38ffc52aac3b37f90673464':
  imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功
2018-10-17 21:09:21 +08:00
邱剑 154d6afedf Automatic merge from release/2.2.0 -> release/2.3.0
* commit '3fa36d3869bf425ced7b80ab67b9c155e7b8f019':
  imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功
2018-10-17 21:09:21 +08:00
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +08:00
屈轩 7a5c4c990e imageId不能更改,尝试删除之前的系统盘,第一次删除会失败,第二次一般会成功 2018-10-17 20:32:12 +08:00
邱剑 580bc942a4 Merge pull request #303 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyuncli-snapshot to release/2.2.0
* commit '7ca7052d11623a9a9251f561b651d385e19e3643':
  补充aliyuncli delete-snapshot命令
2018-10-17 20:17:35 +08:00
TangBin 661e8a6625 bugfix 2018-10-17 19:37:40 +08:00
TangBin bcc3ee1cc0 sync 2018-10-17 19:32:38 +08:00
邱剑 f32ac21e78 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '681c46e90572f7dc6d29fd69e5f5a898ee6a5fd4':
2018-10-17 18:02:34 +08:00
邱剑 681c46e905 Merge pull request #302 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-uniq-zone to release/2.2.0
* commit '58d6bd1ba034b277417ddd63602390d301158149':
2018-10-17 18:02:33 +08:00
邱剑 f7ba920b90 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '20cf5be92a7df191690aeceea66a421fea0a8865':
  调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确
  增加日志服务黑名单,去掉配置服务的操作日志
2018-10-17 17:43:46 +08:00
邱剑 20cf5be92a Merge pull request #299 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0
* commit '1736eacb2157825a5c91daed4d977b26f18d6d92':
  调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确
  增加日志服务黑名单,去掉配置服务的操作日志
2018-10-17 17:43:46 +08:00
屈轩 7ca7052d11 补充aliyuncli delete-snapshot命令 2018-10-17 17:23:26 +08:00
邱剑 58d6bd1ba0 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
2018-10-17 17:16:30 +08:00
Qiu Jian 575ea95525 改进:允许climc指定tls证书,允许服务指定tls证书 2018-10-17 16:45:11 +08:00
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后,操作日志记录的内容应该准确 2018-10-17 16:18:17 +08:00
TangBin 2848c38dee bugfix 2018-10-17 15:25:22 +08:00
Zhang Dongliang da241e9cbb 增加日志服务黑名单,去掉配置服务的操作日志 2018-10-17 15:03:38 +08:00
TangBin 2d5234a1ef add get instances 2018-10-17 12:01:11 +08:00
Qiu Jian fc777095c1 改进:增加schedpolicy和dynamicschedtag支持 2018-10-17 08:12:21 +08:00
TangBin f8d07e93c4 add get instances 2018-10-16 20:43:13 +08:00
TangBin 65ab2217d8 add instance 2018-10-16 20:37:26 +08:00
邱剑 26553ff096 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '94ff2fed00fa743c1035d06a4bc8c622cb951064':
  避免因大小写不一致导致同步时删除原有的数据
2018-10-16 19:43:17 +08:00
屈轩 e6d4050904 避免因大小写不一致导致同步时删除原有的数据 2018-10-16 19:40:20 +08:00
屈轩 8ef86da0de Merge branch 'release/2.3.0' of ssh://git.yunion.io/~quxuan/onecloud into hotfix/qx-cloud-account 2018-10-16 18:38:47 +08:00
张东亮 b3cbcc26ef Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'c61f18d88e9a967f6c780456d4ae635bb94d9485':
  fmt
  onecloud 增加重启的 actionlog
2018-10-16 18:11:49 +08:00
TangBin e587dc2a39 add wire 2018-10-16 17:39:48 +08:00
TangBin 65772ef356 add vpc 2018-10-16 17:36:52 +08:00
TangBin 0586f6184d add storage cache 2018-10-16 17:24:00 +08:00
TangBin ecfa2e45aa add disk 2018-10-16 17:14:46 +08:00
TangBin 3085df0c07 add snapshot 2018-10-16 17:03:32 +08:00
TangBin 9fc91f667e add security group 2018-10-16 16:59:17 +08:00
TangBin 2fc9f0cf65 add network 2018-10-16 16:54:18 +08:00
TangBin 37ddd6002f add instance nic 2018-10-16 16:33:50 +08:00
TangBin feead7a53d add instances 2018-10-16 16:32:31 +08:00