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
邱剑 f1af77bc63 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f32205086eb864ad82526162f1287b96828098c2':
  protocol为空则指定protocol为any
 2018-09-10 23:53:54 +08:00
邱剑 c4ec9a4721 Merge pull request #176 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-associate-dissociate-eip to release/2.1.0 
* commit '9365da05f64000d4bfedbecb298c3820dc7ac189':
  增加：server-associate-eip/server-dissociate-eip接口
 2018-09-10 23:53:33 +08:00
邱剑 4a53a4154b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c4ec9a47212cc1acaf010654eac7e735d35fbb7f':
  增加：server-associate-eip/server-dissociate-eip接口
 2018-09-10 23:53:33 +08:00
邱剑 480d7cd65e Merge pull request #170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-aliyun-account-balance to release/2.1.0 
* commit '0c79c6e4e6a907073e25dcde0645b457a151e0a8':
  增加阿里云账户余额接口支持
 2018-09-10 23:53:17 +08:00
邱剑 c6f4ed074d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '480d7cd65ef38407a2d1a5aff48c0d47efa84dfc':
  增加阿里云账户余额接口支持
 2018-09-10 23:53:17 +08:00
邱剑 cb4a0c0185 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'bc9979d918c926fc1fb865602ffae795ff2e79cc':
  修正：secgroup initializedb需要admin token，修改initAuth同步执行，确保admin token可用
 2018-09-10 23:53:11 +08:00
Qiu Jian 4f403ad9f2 initial commit 2018-09-10 23:30:31 +08:00
屈轩 48ce6b7c0e protocol为空则指定protocol为any 2018-09-10 16:42:39 +08:00
Zexi Li eb3ff786a7 climc: support create resource from file, raw put body fix 2018-09-10 16:32:18 +08:00
Qiu Jian 2c9e203bb3 修正：secgroup initializedb需要admin 
token，修改initAuth同步执行，确保admin token可用
 2018-09-10 16:03:42 +08:00
张东亮 b93e5d8ec2 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2ca12923c00efb4c6461431bb9410721dbd3fc1b':
  go fmt.
  去掉临时调试信息; gofmt
  去掉临时调试信息
 2018-09-10 15:47:05 +08:00
Zhang Dongliang 7f624c46b5 go fmt. 2018-09-10 15:43:20 +08:00
Zhang Dongliang 3ffe3fc722 去掉临时调试信息; gofmt 2018-09-10 15:40:55 +08:00
Zhang Dongliang 6199b3b7a4 去掉临时调试信息 2018-09-10 15:38:20 +08:00
Qiu Jian 9365da05f6 增加：server-associate-eip/server-dissociate-eip接口 2018-09-10 14:15:43 +08:00
TangBin aed6a23cfe delete&update parameter in context 2018-09-10 11:30:09 +08:00
邱剑 9eca9e0305 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '481a6a1ae6a668dba221ad748949661d271d4a9e':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:23 +08:00
邱剑 481a6a1ae6 Merge pull request #171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-general-capabilities to release/2.1.0 
* commit '3c8ea2cddf8e586d280dac8849e7e50c0dabbb13':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:22 +08:00
李泽玺 ee447e4750 Merge pull request #173 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-merge-path-params-into-querystring to release/2.2.0 
* commit '035ad926c85b8e7d5a341253253a3453ac0e4ef9':
  改进：把path中的params合并到querystring中，这样允许在listItemFilter中访问这些params参数，并且实现对数据的过滤
 2018-09-10 10:17:56 +08:00
邱剑 f5c95dc358 Merge pull request #166 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-host-vnc to release/2.1.0 
* commit 'bf71e62224bdd4a2a7d9aa2c24b2687e26aad091':
  regionv2 support vnc connect baremetal
 2018-09-09 19:13:40 +08:00
邱剑 a2e07858c3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f5c95dc358e33a5bbe20929f8638d8c078bfdd7a':
  regionv2 support vnc connect baremetal
 2018-09-09 19:13:40 +08:00
邱剑 bf28b32156 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5de6c10a4b3fbca206e53083ed59ae4b06f90668':
  修正：已经绑定EIP的主机不能再绑定EIP
  修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-09 09:06:10 +08:00
邱剑 5de6c10a4b Merge pull request #167 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aliyun-vm-unaccessible to release/2.1.0 
* commit '1aa1fba80111ad9fc4a9f80d99efeba47f947753':
  修正：已经绑定EIP的主机不能再绑定EIP
  修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-09 09:06:07 +08:00
Qiu Jian 035ad926c8 改进：把path中的params合并到querystring中，这样允许在listItemFilter中访问这些params参数，并且实现对数据的过滤 2018-09-08 17:33:46 +08:00
Qiu Jian 1aa1fba801 修正：已经绑定EIP的主机不能再绑定EIP 2018-09-07 14:32:57 +08:00
李泽玺 6fd5bf3a8e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7798b928659004dbf4b6faa8c5c2391a7f5dc513':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:32 +08:00
李泽玺 7798b92865 Merge pull request #172 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-raw-res to release/2.1.0 
* commit '87d99fca2a0193168d2b1d3dcc35d84f677d07f2':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:31 +08:00
Zexi Li 87d99fca2a climc: k8s general raw resource GET, PUT, DELETE support 2018-09-07 13:22:37 +08:00
李泽玺 4dc815ce90 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'cbd159596b32073e75786562347e4aa2b1c7c86e':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:33 +08:00
李泽玺 cbd159596b Merge pull request #168 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-cli-v3 to release/2.1.0 
* commit 'd36f20d5c923b201ca7511ae015df73eadf84f33':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:32 +08:00
Qiu Jian 3c8ea2cddf 增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单 2018-09-07 11:42:37 +08:00
Qiu Jian 0c79c6e4e6 增加阿里云账户余额接口支持 2018-09-06 23:21:01 +08:00
wanyaoqi 5b57339166 fix code 2018-09-06 20:30:08 +08:00
TangBin 53a7a35f4c temp!!withbugs 2018-09-06 20:08:32 +08:00
李泽玺 0732b80d05 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '62e269b20f3639fd21a9aeb986bbe89959aef60c':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
李泽玺 62e269b20f Merge pull request #165 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webterm to release/2.1.0 
* commit '94a5eedae4bf55055873de3d2f6b329ec7452963':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
Zexi Li d36f20d5c9 climc: k8s resource client api for nodes, namespace, statefulset, 
ingress
 2018-09-06 18:15:52 +08:00
wanyaoqi 4f2b50a869 - local disk snapshot create and delete 
- auto snapshot everyday
- rewrite cornman
- make dep and some fix
- fix conflict
 2018-09-06 16:22:36 +08:00
Qiu Jian 7c795f7975 修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 
2.
系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-06 15:10:55 +08:00
wanyaoqi bf71e62224 regionv2 support vnc connect baremetal 2018-09-06 12:13:08 +08:00
TangBin 5f01cb9c04 add climc 2018-09-05 19:48:52 +08:00
Zexi Li 94a5eedae4 webconsole: support baremetal ipmitool sol 2018-09-05 18:14:08 +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
邱剑 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
邱剑 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
李泽玺 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