opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,112 Commits 27 Branches 687 Tags
4d1d4e56fd55f8e10a14206feff6ef93e7ca8d15
Commit Graph
403 Commits
Author SHA1 Message Date
邱剑 8c15c06a31 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'add76e5228cfbea3dcb4e6cef451820f3be8b31e':
  修正：删除主机时，在停止主机时，如果宿主机不响应，应该导致删除失败
 2018-10-20 13:50:05 +08:00
邱剑 add76e5228 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'a0e78bd6eb0564dc6d5da0b208437dc2bf0c90c8':
  修正：删除主机时，在停止主机时，如果宿主机不响应，应该导致删除失败
 2018-10-20 13:50:05 +08:00
Qiu Jian db7183976b 修正：删除主机时，在停止主机时，如果宿主机不响应，应该导致删除失败 2018-10-20 13:14:38 +08:00
李泽玺 6e67bce0ec Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '81fbc232ef26bc2b942b5bca8db8587e33ad2472':
  fix: kvm find vnc port index out of range
 2018-10-19 12:17:49 +08:00
Zexi Li 0c46305d8e Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-10-19 12:11:58 +08:00
Zexi Li 83f09321ca fix: kvm find vnc port index out of range 2018-10-19 12:07:57 +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
屈轩 0a5ca41d3d Azure 计费依赖操作系统类型 2018-10-18 17:21:12 +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
邱剑 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
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确 2018-10-17 16:18:17 +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
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
wanyaoqi e0751c0e15 add disk-create-snapshot, bug fix 2018-10-16 13:52:54 +08:00
wanyaoqi 383ec5966a add snapshot details 2018-10-12 17:50:00 +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 7a557668fa 在VM的diskinfo详情中增加image_id和image信息 2018-10-11 23:28:03 +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
邱剑 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
wanyaoqi bf55d0ef3e add server restart 2018-09-30 15:20:41 +08:00
邱剑 ec7f2ee981 Merge pull request #272 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit '7c217bc49d7525050f73a87ec73866a642849be4':
  避免/tmp目录容量不够
 2018-09-30 12:13:34 +08:00
屈轩 7c217bc49d resolve conflict 2018-09-30 12:10:58 +08:00
邱剑 de7038f000 Merge pull request #238 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-save-image to release/2.1.0 
* commit '3eea07f2791c9251da1bb504bb3d07de5216b718':
  避免/tmp目录容量不够
 2018-09-30 12:05:40 +08:00
屈轩 3eea07f279 避免/tmp目录容量不够 2018-09-30 11:55:15 +08:00
邱剑 28f806819c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a563dc78e3740ddd13b9f39201e0f20820b37e4f':
  显示安全组规则
  fix: climc prompt for macos
 2018-09-30 10:27:31 +08:00
Qiu Jian 127302cb3b Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180930 
Conflicts:
	pkg/compute/models/secgroups.go
 2018-09-30 10:21:22 +08:00
邱剑 1a36186284 Merge pull request #267 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-detail to release/2.0.0 
* commit '8fc8d892fae001d5e5e988113a40d8bf4e1b84ad':
  显示安全组规则
 2018-09-30 10:15:01 +08:00
邱剑 3b2f688d80 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6ec41ea388fcc9a50b4d412a842a788e482c18b9':
  添加region对guest统计数据
 2018-09-29 20:01:51 +08:00
邱剑 6ec41ea388 Merge pull request #261 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-region-guest to release/2.1.0 
* commit 'eb95ee71562c287c915cf4f4402bc71604bce3a0':
  添加region对guest统计数据
 2018-09-29 20:01:50 +08:00
屈轩 8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
邱剑 32598e4f5d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9f84448d2e964869edb4ad27395b054cbc3fffe2':
  修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机
  Add baremetal agent support
 2018-09-29 12:32:30 +08:00
屈轩 eb95ee7156 添加region对guest统计数据 2018-09-29 11:50:13 +08:00
Qiu Jian de45cf507e Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180928 
Conflicts:
	pkg/compute/tasks/guest_delete_task.go
 2018-09-28 23:19:32 +08:00
邱剑 abd31a2fb8 Merge pull request #255 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-sum-guest to release/2.1.0 
* commit '873724b1fbdef79890367951896768b24fd849e7':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
邱剑 5f6033fcae Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'abd31a2fb8c9622d5b0d531b3df914101832eb33':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +08:00
Qiu Jian 3ff40b8178 修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机 2018-09-27 18:02:14 +08:00
邱剑 944cf624b2 Merge pull request #249 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure to release/2.2.0 
* commit '072c4b8a1f741094b0040f2ed242933779ed23b1':
  全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建
 2018-09-27 17:38:21 +08:00
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +08:00
邱剑 2e23a840ad Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4e7702f0ae7a0ca5f70cf408d3129da76300ac61':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
邱剑 4e7702f0ae Merge pull request #250 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup to release/2.1.0 
* commit '13c576672baa713385c7a14fabf73aca4ec91f85':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00