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
1,209 Commits 30 Branches 714 Tags
e4bb883c608ceed482f9c1961c5197bc9fc64fca
Commit Graph
425 Commits
Author SHA1 Message Date
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 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
屈轩 0a5ca41d3d Azure 计费依赖操作系统类型 2018-10-18 17:21:12 +08:00
Yousong Zhou d9173e696e loadbalancercertificates: make code compatible with go-1.9 
Upstream go commit id

	https://github.com/golang/go/commit/34920b8713fa93ee50ee8963949728c1569e6017
 2018-10-18 09:07:18 +00: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
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +08:00
屈轩 1b2db4a452 解决冲突 2018-10-17 20:39:28 +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
屈轩 ec432d1ee9 Azure禁止使用root账户登录，创建机器后返回默认用户名，避免数据不一致 2018-10-17 18:49:07 +08:00
屈轩 8df405ffd3 创建完disk后同步有用信息 2018-10-17 18:14:03 +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
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确 2018-10-17 16:18: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
屈轩 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
张东亮 c61f18d88e Merge pull request #295 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0 
* commit '44f051a9ac80308ea58b58215d2eb83cef97d2fd':
  fmt
  onecloud 增加重启的 actionlog
 2018-10-16 18:11:48 +08:00
李泽玺 6a9ba82120 Merge pull request #292 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-host-usable-filter to release/2.3.0 
* commit '98dc897eeb29c9adc2b080e87857e11b28fb73e7':
  增加：host-list增加usable过滤器
 2018-10-16 18:08:15 +08:00
邱剑 9f6db4f986 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '988adf7bd84dec69115a548bf1860af1fe1e27ca':
  add snapshot-list filter by storage type
 2018-10-16 17:23:46 +08:00
Yousong Zhou d6cd05079e dnsrecords: add enabled field 
CLOUD-586
 2018-10-16 09:11:43 +00:00
wanyaoqi 374d531931 add snapshot-list filter by storage type 2018-10-16 16:59:52 +08:00
Zhang Dongliang 44f051a9ac fmt 2018-10-16 16:16:30 +08:00
Zhang Dongliang adc306b1cc onecloud 增加重启的 actionlog 2018-10-16 16:09:14 +08:00
邱剑 8772c01004 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fb84a9e5086f74418a1f2a2352b926ff4effd34a':
  add disk-create-snapshot, bug fix
 2018-10-16 13:55:19 +08:00
wanyaoqi e0751c0e15 add disk-create-snapshot, bug fix 2018-10-16 13:52:54 +08:00
Qiu Jian 98dc897eeb 增加：host-list增加usable过滤器 2018-10-15 21:39:48 +08:00
屈轩 197f1b32ee 支持云账号主次之分 2018-10-15 18:29:11 +08:00
邱剑 219015d50c Merge pull request #287 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keypair-improvment to release/2.3.0 
* commit 'cfa4f5db945dcef09137c712370edcb3d8e33593':
  server show expired_at column
  修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 修正公有云注入userdata的问题
  Update vendor
  Update format
  Force format before build
  minor updates
  Update vendor
  改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 其他
 2018-10-15 18:20:30 +08:00
李泽玺 0cdf25150c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0f8f7e570ea1c99431a03193d55addef5f360830':
  add snapshot details
 2018-10-15 11:02:09 +08:00
Qiu Jian 23443c07bc 修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 
修正公有云注入userdata的问题
 2018-10-13 20:36:15 +08:00
wanyaoqi 383ec5966a add snapshot details 2018-10-12 17:50:00 +08:00
邱剑 d6c6b559db Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '5f8d6d5109c7dbbd4e058518cc1df444ba2b9972':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:09 +08:00
邱剑 5f8d6d5109 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '21f1c5f15f775510f08659c5b7298f1adf0b7e0e':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:09 +08:00
Qiu Jian b17b24b232 Update format 2018-10-12 12:13:35 +08:00
Qiu Jian deda9f70a6 minor updates 2018-10-12 12:09:35 +08:00
Qiu Jian 7a557668fa 在VM的diskinfo详情中增加image_id和image信息 2018-10-11 23:28:03 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
邱剑 e865fc725c Merge pull request #278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-guest-count to release/2.1.0 
* commit '749c1daac19f4f3a894488f80c1b212e9f168d6c':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
邱剑 6b25ce03b6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1c9c74461ca4b9028780f553839e29b4c57b0c26':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
邱剑 1c9c74461c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
屈轩 749c1daac1 修复查询defautl region时guests count异常 2018-10-09 21:56:39 +08:00
周有松 f7895cb29f Merge pull request #245 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-loadbalancer to release/2.3.0 
* commit 'af6946ebb5bc0f39a7c2429c9313b6b4053ec6ab':
  loadbalancer: initial version
  loadbalancer: add loadbalancernetworks
  validators: validate certs and keys
  build.sh: support specifying runtime requires
 2018-09-30 18:29:03 +08:00
Yousong Zhou af6946ebb5 loadbalancer: initial version 2018-09-30 08:37:37 +00:00
wanyaoqi bf55d0ef3e add server restart 2018-09-30 15:20:41 +08:00