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,229 Commits 27 Branches 687 Tags
182db4cd4e16a384be25ad05ffbe63df2a7f3efa
Commit Graph
229 Commits
Author SHA1 Message Date
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
李泽玺 a534b14586 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
李泽玺 a5f9d9c687 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b1dade9701606d505315271a09ef1c88cfc48827':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
Yousong Zhou 1da2255d4f 2.0.0: make qunar happy 2018-11-05 08:27:14 +00:00
李泽玺 4f0c608935 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '75f61cf9c86a0433b7f644d6ee1ac7e3ad79a889':
  region: usage support filter by project
 2018-10-31 12:11:38 +08:00
Zexi Li 7c04773c72 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.1.0-20181031 2018-10-31 12:10:39 +08:00
Zexi Li 25c712e213 region: usage support filter by project 2018-10-30 21:39:50 +08:00
李泽玺 b2cfcf9f0f Merge pull request #384 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/monitor-add-treenode-change-project-type to release/2.2.0 
* commit '3feb2839aec46dc6f6b3889c6ac889e655d09041':
  change-project-type
  change-project-type
 2018-10-30 10:18:23 +08:00
zhengjiajie 3feb2839ae change-project-type 2018-10-30 09:31:02 +08:00
zhengjiajie 751f0b39cb change-project-type 2018-10-30 09:14:24 +08:00
邱剑 8909d40566 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'd05d50d680b62a5b49ab3998b4cfa2294ff5864d':
  允许创建host时候不指定zone
 2018-10-26 15:16:38 +08:00
Qiu Jian 97ae236e31 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181026-2.1.0 
Conflicts:
	cmd/climc/shell/serverdisks.go
 2018-10-26 14:54:30 +08:00
Qiu Jian ec9ca59aa1 允许创建host时候不指定zone 2018-10-25 23:07:58 +08:00
Qiu Jian 46a39b5612 allow snapshot-list --manager <cloud-provider-id-or-name> 2018-10-22 12:04:55 +08:00
Qiu Jian b27be13cc3 修正：补充2.2.0 purge eip/snapshot接口 2018-10-22 11:24:54 +08:00
Zexi Li 0101570c86 fix: scheduler start auth interface 2018-10-18 19:32:12 +08:00
Qiu Jian 575ea95525 改进：允许climc指定tls证书，允许服务指定tls证书 2018-10-17 16:45:11 +08:00
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