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
570 Commits 27 Branches 687 Tags
b7ca29581f77f2fce9cea13c317414a108bcae02
Commit Graph
570 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TangBin b7ca29581f add yunionconf service 2018-09-13 14:24:20 +08:00
TangBin b700a7bedc fix help desc string 2018-09-10 19:27:11 +08:00
TangBin a8c70bd9a1 bugfix 2018-09-10 19:10:00 +08:00
TangBin 30f692b88d add parameter climc 2018-09-10 15:03:31 +08:00
TangBin aed6a23cfe delete&update parameter in context 2018-09-10 11:30:09 +08:00
TangBin 53a7a35f4c temp!!withbugs 2018-09-06 20:08:32 +08:00
TangBin 5f01cb9c04 add climc 2018-09-05 19:48:52 +08:00
邱剑 6d29c36abb Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dc74b221da68ed6f2e86ca6b8dcb9bab9d3d361b':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
邱剑 dc74b221da Merge pull request #161 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-elastic-ip to release/2.1.0 
* commit '82bbb2054b9d72b542ea5d4d3aea931fe1103f26':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
Qiu Jian 82bbb2054b fix log 2018-09-05 16:51:37 +08:00
邱剑 00f05a97ba Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '17c311f2ab07e1a79c81ac644a798ee04d078dd3':
  普通用户下根据zone过滤失效
 2018-09-05 16:49:08 +08:00
邱剑 17c311f2ab Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '01942d2cc023dd07d5d609c495e22967d762a1ef':
  普通用户下根据zone过滤失效
 2018-09-05 16:49:08 +08:00
邱剑 01942d2cc0 Merge pull request #164 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-list to release/2.0.0 
* commit 'c3b1d61feb6d49615f010ba33c0c8332b62b6fc2':
  普通用户下根据zone过滤失效
 2018-09-05 16:49:08 +08:00
李泽玺 08f8ae51c3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3485184266e553d278c9c68ddaae3850dbc4cc8a':
  webconsole: use external frontend
  - remove unused code - add rpm build files
  vendor added
  webterm init
 2018-09-05 16:10:36 +08:00
李泽玺 3485184266 Merge pull request #158 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webterm to release/2.1.0 
* commit '955fe9b2e34aba1de287238aaf824d8051bfb435':
  webconsole: use external frontend
  - remove unused code - add rpm build files
  vendor added
  webterm init
 2018-09-05 16:10:35 +08:00
Zexi Li 955fe9b2e3 webconsole: use external frontend 2018-09-05 16:09:04 +08:00
屈轩 c3b1d61feb 普通用户下根据zone过滤失效 2018-09-05 15:48:15 +08:00
邱剑 4ae0f01c27 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6045262e9c595cc6c6cefae1106e1dbc319351a1':
  storage-cache-image-list需要storagecache_id信息
  普通用户创建云盘时，需要storage信息
 2018-09-05 15:04:47 +08:00
邱剑 2dc4af218f Merge pull request #162 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-list to release/2.0.0 
* commit '60ad925b78e75f08cbb7779a0873fe04828382e4':
  storage-cache-image-list需要storagecache_id信息
  普通用户创建云盘时，需要storage信息
 2018-09-05 15:04:46 +08:00
邱剑 6045262e9c Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '2dc4af218f81cd67f1704f41e26f58b935eed809':
  storage-cache-image-list需要storagecache_id信息
  普通用户创建云盘时，需要storage信息
 2018-09-05 15:04:46 +08:00
邱剑 5c248ae3d5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'd6317dc0bdd5570e21ec949857ae61c55bb70792':
  避免aliyun盘循环删除失败
 2018-09-05 15:04:09 +08:00
邱剑 d6317dc0bd Merge pull request #163 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-disk-delete to release/2.1.0 
* commit '493ea8b0cb9529c3853903f6c0c498b566983cba':
  避免aliyun盘循环删除失败
 2018-09-05 15:04:09 +08:00
屈轩 60ad925b78 storage-cache-image-list需要storagecache_id信息 2018-09-05 14:57:29 +08:00
屈轩 493ea8b0cb 避免aliyun盘循环删除失败 2018-09-05 14:42:12 +08:00
屈轩 bd9e5ee682 普通用户创建云盘时，需要storage信息 2018-09-05 13:35:13 +08:00
邱剑 9e0202cb08 Merge pull request #159 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-image-cache-bucket-unique to release/2.0.0 
* commit '578d4a0cc53ddfa13aa4da1ad0f117e354d8512b':
  修正：aliyun image cache的bucket名称需要全局唯一
 2018-09-05 12:22:15 +08:00
邱剑 76a1fd0268 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dd5d9930e881d525efb13d392b7e318b292286d7':
  修正：aliyun image cache的bucket名称需要全局唯一
 2018-09-05 12:22:15 +08:00
邱剑 dd5d9930e8 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '9e0202cb082bc11c608a11d8f1a8803c3e227de7':
  修正：aliyun image cache的bucket名称需要全局唯一
 2018-09-05 12:22:15 +08:00
Qiu Jian 45f7f6febe Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-elastic-ip 2018-09-04 23:46:43 +08:00
Qiu Jian c3f5e8289d 修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录 2018-09-04 23:29:33 +08:00
Qiu Jian 578d4a0cc5 修正：aliyun image cache的bucket名称需要全局唯一 2018-09-04 23:06:40 +08:00
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
Zexi Li 2c28b22f67 - remove unused code 
- add rpm build files
 2018-09-04 19:21:52 +08:00
Zexi Li f027ceeff7 vendor added 2018-09-04 19:12:11 +08:00
Zexi Li a6736da35e webterm init 2018-09-04 18:44:52 +08:00
邱剑 0f30bcbbb0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '031ed3a3e8c9704e2545eb61ca3a5c45350b2875':
  支持server-save-image
 2018-09-04 16:35:26 +08:00
邱剑 031ed3a3e8 Merge pull request #151 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/kvm-save-image to release/2.1.0 
* commit '67fc4d1ba9b8fbfb9e59292ee64d09319056e929':
  支持server-save-image
 2018-09-04 16:35:25 +08:00
邱剑 c5c5a3ead9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5646b88f78e9fdedbf116d6b2262571902debef6':
  climc: k8s resources cluster in query or data
 2018-09-04 16:34:49 +08:00
邱剑 5646b88f78 Merge pull request #157 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-cli.v2 to release/2.1.0 
* commit 'b0c62d55124f8aeed565342c76fdbe81787c72c3':
  climc: k8s resources cluster in query or data
 2018-09-04 16:34:49 +08:00
Zexi Li b0c62d5512 climc: k8s resources cluster in query or data 2018-09-04 16:25:38 +08:00
邱剑 18e4ab9902 Merge pull request #155 in YUNIONIO/onecloud from release/2.1.0 to release/2.2.0 
* commit '283077f9599cd7d13da316516f1a1a3b9156e4d0':
  storage-list显示详情信息
  增加network-set-static-routes等命令
 2018-09-04 10:18:55 +08:00
邱剑 d5115be140 Merge pull request #156 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20180903-2.2.0 to release/2.2.0 
* commit 'f8ecb006da56f47b4a44ed021bac7ef5f8aa2e0c':
  阿里云服务器同步、全量同步操作日志。
  阿里云解绑
  rm log
  日志接口重构；阿里云修改密码、变更配置加日志
  阿里云变更配置增加日志
  更改项目
  接口重构，与OpsLog.LogEvent 保持一致
  阿里云重装系统、开机关机、同步状态日志
  阿里云虚机删除日志
  阿里云创建虚机失败时记录 actionlog
  增加logclient; aliyun server crud 操作
  增加logclient
 2018-09-04 09:38:48 +08:00
邱剑 283077f959 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '041bf5c2311260af3f3d2991a875e4f5971c2253':
  增加network-set-static-routes等命令
 2018-09-04 09:23:51 +08:00
邱剑 041bf5c231 Merge pull request #154 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-network-add-static-route-etc to release/2.0.0 
* commit 'dad762db6143a7475176d36bf4592cd21094d94a':
  增加network-set-static-routes等命令
 2018-09-04 09:23:50 +08:00
邱剑 c6de590c38 Merge pull request #152 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-list to release/2.0.0 
* commit '77d4b477bf739700b95934bc85624bb2ece83c4a':
  storage-list显示详情信息
 2018-09-03 21:58:16 +08:00
邱剑 9664545842 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'c6de590c38af668386031ec2da3f83444f96832f':
  storage-list显示详情信息
 2018-09-03 21:58:16 +08:00
屈轩 77d4b477bf storage-list显示详情信息 2018-09-03 21:55:50 +08:00
Qiu Jian f8ecb006da Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20180903-2.2.0 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
 2018-09-03 21:22:16 +08:00
邱剑 fa50e68031 Merge pull request #150 in YUNIONIO/onecloud from feature/rex-logclient-20180822-1018 to release/2.1.0 
* commit '4249e2486a04bd080218b59fc12ffe1f416ad6fa':
  阿里云服务器同步、全量同步操作日志。
  阿里云解绑
  rm log
  日志接口重构；阿里云修改密码、变更配置加日志
  阿里云变更配置增加日志
  更改项目
  接口重构，与OpsLog.LogEvent 保持一致
  阿里云重装系统、开机关机、同步状态日志
  阿里云虚机删除日志
  阿里云创建虚机失败时记录 actionlog
  增加logclient; aliyun server crud 操作
  增加logclient
 2018-09-03 21:13:41 +08:00
Qiu Jian dad762db61 增加network-set-static-routes等命令 2018-09-03 21:06:54 +08:00