Commit Graph
212 Commits
Author SHA1 Message Date
wanyaoqi 374d531931 add snapshot-list filter by storage type 2018-10-16 16:59:52 +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
Zexi Li 84ee48335b fix: region task notify not work 2018-10-11 19:04:11 +08:00
邱剑 6fd50aac20 Merge pull request #281 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-network-list-by-type to release/2.2.0
* commit 'f6b87be132258e01a97a0cf8de396648377ce9a8':
  network list by server_type
2018-10-10 16:37:16 +08:00
Zexi Li f6b87be132 network list by server_type 2018-10-10 16:18:56 +08:00
Zexi Li 77f4c6435c climc: add k8s-cluster-delete-nodes 2018-10-09 16:40:48 +08:00
wanyaoqi bf55d0ef3e add server restart 2018-09-30 15:20:41 +08:00
邱剑 306b9d770c Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'dcf7c00dcb3725e7745036e7c977d6fe4e06bcd7':
  添加超时处理
  添加admin参数
  支持ssh webconsole
2018-09-30 10:15:24 +08:00
邱剑 dcf7c00dcb Merge pull request #259 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-webconsole to release/2.1.0
* commit '28d59c5ebd6258a80b98e41b58038d098220d31a':
  添加超时处理
  添加admin参数
  支持ssh webconsole
2018-09-30 10:15:24 +08:00
李泽玺 fa1475132b Merge pull request #268 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/meter-dashboard-data-api to release/2.2.0
* commit 'e15bcc9d371e828097b0be29de12ec35dbda5a09':
  add meter dashboard data api
2018-09-29 19:33:59 +08:00
zhengjiajie e15bcc9d37 add meter dashboard data api 2018-09-29 19:20:09 +08:00
屈轩 28d59c5ebd 添加超时处理 2018-09-29 16:50:08 +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
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
Zhang Dongliang 1bf9478693 autoupdate support for onecloud 2018-09-28 11:24:51 +08:00
Qiu Jian f80ebd9f91 Add baremetal agent support 2018-09-27 17:07:33 +08:00
TangBin c0437db69c fix created_at & add license 2018-09-25 12:20:18 +08:00
屈轩 18f6c065e1 支持ssh webconsole 2018-09-21 15:05:24 +08:00
邱剑 3ad67f0845 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'b93d949e9d9e0ebe985b60775655af5276728428':
  zhengjiajie add the post method of project_host
2018-09-20 19:33:48 +08:00
邱剑 33ec552f15 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '3ad67f084545e115a4ed896a57785045bfb12771':
  zhengjiajie add the post method of project_host
2018-09-20 19:33:48 +08:00
zhengjiajie 8716cf3122 zhengjiajie add the post method of project_host 2018-09-20 19:10:51 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
邱剑 ad3544901a Automatic merge from release/2.1.0 -> release/2.2.0
* commit '923a5490f9a05a771febf8b5ebc5c82b3f643bb2':
  climc: batch delete k8s resource
2018-09-18 16:26:31 +08:00
Zexi Li 56e24ec218 climc: batch delete k8s resource 2018-09-18 16:08:21 +08:00
邱剑 d4890dd46c Merge pull request #221 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/meter-resource-query-export to release/2.2.0
* commit 'f653f2b4993b1e00263457e23baa0c31c109b3ad':
  zhengjiajie delete old param
  zhengjiajjie modify code
  zhengjiajie add param
  modify fmt
  modify params
  zhengjiajie modify list method
  zhengjiajie modify list method
2018-09-18 12:30:29 +08:00
zhengjiajie f653f2b499 zhengjiajie delete old param 2018-09-18 12:29:27 +08:00
周有松 8831c674ac Automatic merge from release/2.1.0 -> release/2.2.0
* commit '0620ebe7a41be0c94c95ef4c4c549c0b1e2c9046':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
2018-09-18 11:40:29 +08:00
周有松 0620ebe7a4 Merge pull request #226 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-printjson-tabs to release/2.1.0
* commit 'b39963bbfcc47e52eb726b3228ee381710837ddc':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
2018-09-18 11:40:29 +08:00
Yousong Zhou b39963bbfc climc: add printObjectRecursive() 2018-09-18 03:39:22 +00:00
邱剑 fa5290f4e4 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
  不序列化export_file和export_texts
  修正:qutoa的images使用量不准确
  支持将list的结果导出为excel文件
2018-09-18 10:26:15 +08:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正:qutoa的images使用量不准确
  支持将list的结果导出为excel文件
2018-09-18 10:26:15 +08:00
邱剑 ab18249465 Merge pull request #177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-paramter-climc to release/2.2.0
* commit '96713696b82ebe866f7d91c867d051325d04deea':
  add auth complete callback
  bugfix import path error
  add yunionconf service
  fix help desc string
  bugfix
  add parameter climc
  delete&update parameter in context
  temp!!withbugs
  add climc
2018-09-18 10:03:37 +08:00
Qiu Jian 03af1fc8a2 支持将list的结果导出为excel文件 2018-09-17 22:36:08 +08:00
邱剑 34420c83ab Merge pull request #197 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0
* commit 'c02425506d02960a60d849be53d9904b4062d20b':
  fix convert
  if disk resized, update disk size to snapshot size did not auto snapshot when guest not in status ready or running add snapshot-show
  disk reset minor fixs
  fix code
2018-09-17 12:16:15 +08:00
邱剑 69f9492e2d Automatic merge from release/2.1.0 -> release/2.2.0
* commit '1a733935b2a43641cb501d4f64a40c54c9fc32d1':
  修正:eip操作失败后没有正确恢复状态
2018-09-17 11:43:58 +08:00
zhengjiajie 61868bcc9d zhengjiajjie modify code 2018-09-17 11:39:20 +08:00
zhengjiajie e686d2996d zhengjiajie add param 2018-09-17 11:33:45 +08:00
Qiu Jian c2111bcc6e 修正:eip操作失败后没有正确恢复状态 2018-09-17 09:16:49 +08:00
邱剑 18068b0c1e Automatic merge from release/2.1.0 -> release/2.2.0
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正:1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
2018-09-15 21:30:39 +08:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正:1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
2018-09-15 21:30:38 +08:00
zhengjiajie 04aaf35132 modify fmt 2018-09-15 19:44:27 +08:00
zhengjiajie 94748d1cdc modify params 2018-09-15 19:41:35 +08:00
zhengjiajie 175f01e5c9 zhengjiajie modify list method 2018-09-15 19:31:08 +08:00
zhengjiajie f44ae64773 zhengjiajie modify list method 2018-09-15 19:25:48 +08:00
Qiu Jian f43c278d90 guestdisk support index filter 2018-09-15 18:04:08 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
邱剑 86eca9166f Automatic merge from release/2.1.0 -> release/2.2.0
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
  adjust import order
  fix typos
  增加eip操作的状态变化
  network/wire/vpc增加zone/region信息
  修正:1. 主机创建/rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:10 +08:00