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,137 Commits 27 Branches 687 Tags
e7bd5dfa66588a8e8fd2bcfb93ce401641945bc2
Commit Graph
228 Commits
Author SHA1 Message Date
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +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
屈轩 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
Zexi Li c42360a8b7 climc: k8s v1.12 option support 2018-10-13 18:05:27 +08:00
wanyaoqi 383ec5966a add snapshot details 2018-10-12 17:50:00 +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 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
邱剑 0dc3521bad Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'f813b330d2aa93e2b4ac281805661be5a7fabec8':
  fix: region task notify not work
 2018-10-11 20:39:01 +08:00
Zexi Li 84ee48335b fix: region task notify not work 2018-10-11 19:04:11 +08:00
邱剑 275803b3f2 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6fd50aac20dda17a661f925156c82b559aa04b7f':
  network list by server_type
 2018-10-10 16:37:16 +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
邱剑 4d5a9570f8 Merge pull request #275 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-ansible-inventory-scripts to release/2.3.0 
* commit '50775c36d7cc5b701d3335050d859dbb583c2ac3':
  Add hosts example
  增加ansible-inventory脚本支持
 2018-10-09 21:40:08 +08:00
李泽玺 1c0d05ad3a Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fde651b32c7864928e6ef403c6851f280fa75209':
  climc: add k8s-cluster-delete-nodes
 2018-10-09 17:32:51 +08:00
Qiu Jian 50775c36d7 Add hosts example 2018-10-09 16:41:15 +08:00
Zexi Li 77f4c6435c climc: add k8s-cluster-delete-nodes 2018-10-09 16:40:48 +08:00
Qiu Jian 0dd4f94679 增加ansible-inventory脚本支持 2018-10-09 03:43:08 +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
邱剑 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