opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
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
屈轩 e744b8d6a9 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-05 14:55:08 +08:00
屈轩 493ea8b0cb 避免aliyun盘循环删除失败 2018-09-05 14:42:12 +08:00
屈轩 bd9e5ee682 普通用户创建云盘时，需要storage信息 2018-09-05 13:35:13 +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
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
邱剑 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
屈轩 9dae032f75 image cache 2018-09-03 21:53:02 +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
邱剑 9b27a0bfe0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1607b9a88a61520420b460471978c8965830a69b':
  避免aliyun磁盘循环删除失败
 2018-09-03 20:47:11 +08:00
屈轩 289db3be8e 避免aliyun磁盘循环删除失败 2018-09-03 18:27:17 +08:00
屈轩 67fc4d1ba9 支持server-save-image 2018-09-03 17:25:59 +08:00
邱剑 e3d4e271ac Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '449dfa0d7d4bc31f342c4c72c2f7b085b80dfe86':
  添加同步log信息
 2018-09-03 12:22:17 +08:00
邱剑 449dfa0d7d Merge pull request #148 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sync-server-disk to release/2.1.0 
* commit '4f024ad28223386d0581d3d0a6c1f6038ba8f44e':
  添加同步log信息
 2018-09-03 12:22:16 +08:00
邱剑 3565cec769 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dc1d036b0deb5d51245bc966aeca84a9e572d80c':
  region: 支持 container network
 2018-09-03 12:21:52 +08:00
邱剑 dc1d036b0d Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '0351e02a2aa0f070954aff5d9eccc2c51fbdaf30':
  region: 支持 container network
 2018-09-03 12:21:52 +08:00
Zexi Li 6a5ad9208d region: 支持 container network 2018-09-03 12:18:53 +08:00
屈轩 4f024ad282 添加同步log信息 2018-09-03 10:53:19 +08:00
邱剑 21a7e31f05 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7af93208dd1283087754b91919ba5e1d345fb01e':
  只有guest.DisableDelete==true的时候才设置
  调度失败后主机自动允许删除
 2018-09-03 10:07:24 +08:00
邱剑 7af93208dd Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'cb59e27e6aecb290d2c0278d9d9acec1ea55f985':
  只有guest.DisableDelete==true的时候才设置
  调度失败后主机自动允许删除
 2018-09-03 10:07:23 +08:00
邱剑 cb59e27e6a Merge pull request #147 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-delete-after-schedule-fail to release/2.0.0 
* commit '6eee82ab3fca515d58026b9ba548524aa8597326':
  只有guest.DisableDelete==true的时候才设置
  调度失败后主机自动允许删除
 2018-09-03 10:07:23 +08:00
Qiu Jian 6eee82ab3f 只有guest.DisableDelete==true的时候才设置 2018-09-02 19:58:33 +08:00
李泽玺 97bbb6a91d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ca9684b48a2e3eef98a6f96a557ca46cb021df2c':
  修正：region刚启动未获得token时，验证API请求报500错误
 2018-09-01 10:57:31 +08:00
李泽玺 ca9684b48a Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b452cceb2c7104629bbd048e786aecb3b72f1818':
  修正：region刚启动未获得token时，验证API请求报500错误
 2018-09-01 10:57:31 +08:00
李泽玺 b452cceb2c Merge pull request #146 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-token-verification-internal-error to release/2.0.0 
* commit 'a301ee4243dce93e2508532251cec744c0a95a9b':
  修正：region刚启动未获得token时，验证API请求报500错误
 2018-09-01 10:57:31 +08:00
李泽玺 c5abaaeb71 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c43c79c178e9b654599de672a7782849d0f3daf5':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
 2018-09-01 10:57:09 +08:00
李泽玺 c43c79c178 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b8bbd34001d2248eca3ceced5428900c9ddd0fd1':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
 2018-09-01 10:57:09 +08:00
李泽玺 b8bbd34001 Merge pull request #145 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.0.0 
* commit '0094a5cffc925796cc7ef1095f0c12592054c30e':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
 2018-09-01 10:57:07 +08:00