opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,135 Commits 27 Branches 687 Tags
fc777095c19cdcbe05b1165e9270381b117a5fe5
Commit Graph
1135 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian fc777095c1 改进：增加schedpolicy和dynamicschedtag支持 2018-10-17 08:12:21 +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
李泽玺 0f8f7e570e Merge pull request #289 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:hotfix/wyq/snapshot-more-details to release/2.2.0 
* commit '383ec5966a23a1f9c3826d25fef4bcbc75df8639':
  add snapshot details
 2018-10-15 11:02:09 +08:00
李泽玺 48bd15c299 Merge pull request #290 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-misc-v112 to release/2.3.0 
* commit 'c42360a8b775b7e3c81965796d4250dfe830baaa':
  climc: k8s v1.12 option support
 2018-10-15 10:31:43 +08:00
Qiu Jian cfa4f5db94 server show expired_at column 2018-10-13 22:23:50 +08:00
Qiu Jian 23443c07bc 修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 
修正公有云注入userdata的问题
 2018-10-13 20:36:15 +08:00
Qiu Jian 2063b0d385 Update vendor 2018-10-13 20:35:21 +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
邱剑 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
邱剑 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
邱剑 21f1c5f15f Merge pull request #288 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-guest-add-template-info to release/2.1.0 
* commit '7a557668faeb011b712c4abeead15eb46061695d':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:08 +08:00
Qiu Jian b17b24b232 Update format 2018-10-12 12:13:35 +08:00
Qiu Jian df2c4442f8 Force format before build 2018-10-12 12:13:12 +08:00
Qiu Jian deda9f70a6 minor updates 2018-10-12 12:09:35 +08:00
Qiu Jian ceee740315 Update vendor 2018-10-12 12:08:55 +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
邱剑 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
邱剑 f813b330d2 Merge pull request #285 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-task-notify to release/2.2.0 
* commit '84ee48335b8a644c3597fb47299280a30fd7c4e6':
  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
邱剑 dde9588613 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '360a38455f3156a7644c9079dc56d8220b42460f':
  避免因publickey为空导致重装系统失败
 2018-10-11 18:11:04 +08:00
邱剑 360a38455f Merge pull request #284 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-rebuild-root to release/2.2.0 
* commit '6433953d9fefa539e98ee323f905075187fc9d26':
  避免因publickey为空导致重装系统失败
 2018-10-11 18:11:03 +08:00
屈轩 6433953d9f 避免因publickey为空导致重装系统失败 2018-10-11 17:16:05 +08:00
邱剑 6bbcf3ef8b Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fed89b0db657f39fc4b8908f2edf4382f7e1dcd5':
 2018-10-11 15:48:47 +08:00
邱剑 fed89b0db6 Merge pull request #283 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-attach-disk to release/2.2.0 
* commit 'f702526c238132e101db002eb0529b63b925824f':
 2018-10-11 15:48:46 +08:00
邱剑 f702526c23 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-11 12:21:01 +08:00
邱剑 cc7bd6a101 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '9c8ad6fc82f288b7c53f040f67e64b1d564e0f91':
  允许list description
 2018-10-11 12:02:18 +08:00
邱剑 9c8ad6fc82 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '53e1f07f18062d249a88da0fa274c3af11daa21e':
  允许list description
 2018-10-11 12:02:18 +08:00
邱剑 53e1f07f18 Merge pull request #282 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-list-description to release/2.1.0 
* commit 'd25f48f1de7d91dd1e8f7da1e378e86324d57ab4':
  允许list description
 2018-10-11 12:02:17 +08:00
屈轩 d25f48f1de 允许list description 2018-10-10 20:01:21 +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
李泽玺 84b39c7881 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'df24f5b50f45f812e5444d80f982eb047fd0d817':
  统一返回格式
 2018-10-10 13:24:42 +08:00
李泽玺 df24f5b50f Merge pull request #280 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-get-sub-accounts to release/2.2.0 
* commit '120492b505541a2e4bf8cd661fea02fb8062ff12':
  统一返回格式
 2018-10-10 13:24:42 +08:00
屈轩 120492b505 统一返回格式 2018-10-10 13:21:59 +08:00
李泽玺 a1e8cf2950 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'e715c53d5f1e1fbf45e5d88bf138d839aae69169':
  perform class action 返回值为复数
 2018-10-10 12:07:50 +08:00
李泽玺 e715c53d5f Merge pull request #279 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-perform-class-action to release/2.2.0 
* commit '7b9e11a15de8f370e716ecc8017547b4fa870e15':
  perform class action 返回值为复数
 2018-10-10 12:07:49 +08:00
屈轩 7b9e11a15d perform class action 返回值为复数 2018-10-10 12:02:04 +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
邱剑 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
屈轩 749c1daac1 修复查询defautl region时guests count异常 2018-10-09 21:56:39 +08:00
邱剑 e67fe9e69c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '877e8ed8f0b653ad9037b9aefbb90a35fdb73e6f':
  获取aliyun region经纬度
 2018-10-09 21:41:02 +08:00
邱剑 877e8ed8f0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1116fda18bf93abb172abed5ade2758b451779ec':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +08:00
邱剑 1116fda18b Merge pull request #277 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-latitude-longitude to release/2.1.0 
* commit '11e20cebc5adf3b8371807f8d486ef4ee422746c':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +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
屈轩 11e20cebc5 获取aliyun region经纬度 2018-10-09 21:20:52 +08:00