lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-22 12:32:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,209 Commits 36 Branches 631 Tags
e4bb883c608ceed482f9c1961c5197bc9fc64fca
Commit Graph

749 Commits

Author SHA1 Message Date
Yousong Zhou
e4bb883c60 region-dns: priority, weight for srv records 2018-10-18 15:59:38 +00:00
Yousong Zhou
a8d4cb2513 dnsrecords: support multiple srv records 
- multiple srv records with SRV.n
 - deprecate but maintain compat with SRV_host, SRV_port
 - update records support
 2018-10-18 15:59:37 +00:00
邱剑
2fd597681c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd08b1721617b2be3be7f136c675e98fcc5aad73b':
  Remove local terraform code
  卸载磁盘时，磁盘状态跟随变化
  guests: allow change nic bandwidth to 0
  处理卸载磁盘失败后情况: 重新挂载原有磁盘到虚拟机上
 2018-10-18 18:37:04 +08:00
Qiu Jian
cb92fb4e67 Remove local terraform code 2018-10-18 18:06:15 +08:00
Qiu Jian
13abef3725 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20181018 
Conflicts:
	pkg/compute/models/guests.go
 2018-10-18 18:04:40 +08:00
邱剑
a0ff487d68 Merge pull request #311 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-detach-disk to release/2.1.0 
* commit '15a5c91cf17537ad51a7e2b81bb18577913715ee':
  卸载磁盘时，磁盘状态跟随变化
  处理卸载磁盘失败后情况: 重新挂载原有磁盘到虚拟机上
 2018-10-18 18:00:23 +08:00
邱剑
eeb1969349 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c353ad31339bebd26d4270e1886ce374dc3bbd5b':
  Azure 计费依赖操作系统类型
 2018-10-18 17:58:26 +08:00
邱剑
c353ad3133 Merge pull request #315 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-meter to release/2.2.0 
* commit '0a5ca41d3d8e0166521fe307e0f4c38d27231aa6':
  Azure 计费依赖操作系统类型
 2018-10-18 17:58:26 +08:00
邱剑
4b67ba65ec Merge pull request #313 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-go-1.9-compat to release/2.3.0 
* commit 'd9173e696e7515085d9c14cf41473cd796fbe646':
  loadbalancercertificates: make code compatible with go-1.9
 2018-10-18 17:56:51 +08:00
邱剑
bd44d611bd Merge pull request #314 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-instance-stop to release/2.2.0 
* commit '4e4d0059076f88fa0dd6823e60c0a2e0e899c78d':
  Azure stop默认使用deallocate
 2018-10-18 17:56:25 +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
屈轩
0a5ca41d3d Azure 计费依赖操作系统类型 2018-10-18 17:21:12 +08:00
屈轩
4e4d005907 Azure stop默认使用deallocate 2018-10-18 17:08:56 +08:00
Yousong Zhou
d9173e696e loadbalancercertificates: make code compatible with go-1.9 
Upstream go commit id

	34920b8713
 2018-10-18 09:07:18 +00:00
张东亮
b188bc85ce Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b3e50aa7ec3bba20a7702b3d4fd65b5381d9a181':
  mcclient: fix wrong import path
 2018-10-18 16:58:59 +08:00
Yousong Zhou
7bad696855 mcclient: fix wrong import path 2018-10-18 08:52:45 +00: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
屈轩
15a5c91cf1 卸载磁盘时，磁盘状态跟随变化 2018-10-18 15:30:44 +08:00
Yousong Zhou
c96849e334 guests: allow change nic bandwidth to 0 
To restore the default no limit behavior
 2018-10-18 07:18:58 +00:00
屈轩
7c4caed984 处理卸载磁盘失败后情况: 重新挂载原有磁盘到虚拟机上 2018-10-18 12:03:09 +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
屈轩
1b2db4a452 解决冲突 2018-10-17 20:39:28 +08:00
屈轩
7a5c4c990e imageId不能更改，尝试删除之前的系统盘，第一次删除会失败，第二次一般会成功 2018-10-17 20:32:12 +08:00
邱剑
78a4c1ba87 Merge pull request #306 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-account to release/2.2.0 
* commit 'ec432d1ee9f16e8be0ab9218cfd4bf7362065cbe':
  Azure禁止使用root账户登录，创建机器后返回默认用户名，避免数据不一致
 2018-10-17 20:21:30 +08:00
邱剑
67add2b108 Merge pull request #304 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-create-sync-data to release/2.2.0 
* commit '8df405ffd38d65e8efdc3d629cce4cf5aaea285c':
  创建完disk后同步有用信息
 2018-10-17 20:18:40 +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
屈轩
ec432d1ee9 Azure禁止使用root账户登录，创建机器后返回默认用户名，避免数据不一致 2018-10-17 18:49:07 +08:00
屈轩
8df405ffd3 创建完disk后同步有用信息 2018-10-17 18:14:03 +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
邱剑
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
邱剑
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
屈轩
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
邱剑
f0e712e8d1 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'a5dfd52413ab09c3842320a210badfeee56d703b':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +08:00
邱剑
084d2f1cdd Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +08:00
邱剑
442040d030 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '084d2f1cdd7b2b3b674ed168a31f015088d105be':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +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
屈轩
42176ea948 修复parallel task未初始化subtask 2018-10-17 16:12:35 +08:00
Zhang Dongliang
da241e9cbb 增加日志服务黑名单，去掉配置服务的操作日志 2018-10-17 15:03:38 +08:00
邱剑
26553ff096 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '94ff2fed00fa743c1035d06a4bc8c622cb951064':
  避免因大小写不一致导致同步时删除原有的数据
 2018-10-16 19:43:17 +08:00
邱剑
05efb6c116 Merge pull request #296 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dnsrecrods-enabled to release/2.3.0 
* commit '7e3e8a01ce2c0a2251c4f05d12b1cfdda71b26a0':
  dns: fix compilation error
  climc: add dns-enable, dns-disable
  dnsrecords: add enabled field
 2018-10-16 19:42:29 +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