opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,446 Commits 27 Branches 687 Tags
03e2db7002fc0ccd2e6a97022ffd1a583b8b5f25
Commit Graph
939 Commits
Author SHA1 Message Date
Yousong Zhou 03e2db7002 loadbalancerlistenerrules: return 409 on rule uniqueness check error 2018-10-31 12:16:41 +00:00
Yousong Zhou aefa36bd86 loadbalancerlistenerrules: fix listing with --listener 
internal error: getting model manager for "listener" failed"
 2018-10-31 12:12:53 +00:00
邱剑 4bae3769ca Merge pull request #394 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/snapshot-add-logevent to release/2.3.0 
* commit '3bfc2951fea69dfe3f5eda8baad9f1933cf15d5e':
  snapshot log event for billing
 2018-10-31 19:51:37 +08:00
邱剑 918f047cff Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '557d28244c144ac079fa3b5e12b2822c8988069a':
  support export filter
 2018-10-31 19:50:31 +08:00
邱剑 557d28244c Merge pull request #397 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/support-get-export-keys to release/2.2.0 
* commit '3151e782e990bdc9a815e64e26613982c72b931b':
  support export filter
 2018-10-31 19:50:30 +08:00
wanyaoqi 3151e782e9 support export filter 2018-10-31 19:48:10 +08:00
邱剑 8ad2298b57 Merge pull request #396 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-add-is_admin_capable to release/2.3.0 
* commit 'e83e1966d2804afe9f1057a1d4256f0cc4005fcf':
  policyManager增加IsAdminCapable接口
 2018-10-31 19:39:28 +08:00
邱剑 13078eefc6 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e1095c58433b9b8ec5ff62415c7fe0999bd82c50':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:37 +08:00
邱剑 33863514be Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '13078eefc6b2775f21c5e7262c4d44dd1ebf62dc':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:37 +08:00
邱剑 e1095c5843 Merge pull request #395 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-sync-rules to release/2.1.0 
* commit 'c8b52b0850f0aacee6cae5e55993d14e792a196c':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:36 +08:00
Qiu Jian e83e1966d2 policyManager增加IsAdminCapable接口 2018-10-31 18:38:19 +08:00
屈轩 c8b52b0850 修复同步rule规则时未处理好port内容 2018-10-31 18:13:02 +08:00
wanyaoqi 3bfc2951fe snapshot log event for billing 2018-10-31 17:42:28 +08:00
邱剑 c6a13a6326 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '614768215739d1bc846c839a77fd55abee123c97':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +08:00
邱剑 8e17da94f6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c6a13a63265d09ce4f78d6c6e5bd5e71c0277fa0':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +08:00
邱剑 6147682157 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'fd4bc440f259874c3dd152ebe211408b1d820df2':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:33 +08:00
邱剑 fd4bc440f2 Merge pull request #389 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-batch-host-create to release/2.0.0 
* commit 'b64c6dc736e9d4c207a61d6c17f46bfffe00cccf':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:33 +08:00
邱剑 a60a66e542 Merge pull request #385 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloudcommon-options to release/2.3.0 
* commit '3a1264f8da7995e1333bfdb3a0bec3126585c6e8':
  调整cloudcommon的options数据结构，把数据库相关选项合并到DBoptions
 2018-10-31 12:23:36 +08:00
李泽玺 d3dd39f88f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '4f0c608935b696dadc69abad67d593646c659d10':
  region: usage support filter by project
 2018-10-31 12:11:39 +08:00
李泽玺 4f0c608935 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '75f61cf9c86a0433b7f644d6ee1ac7e3ad79a889':
  region: usage support filter by project
 2018-10-31 12:11:38 +08:00
Zexi Li 7c04773c72 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.1.0-20181031 2018-10-31 12:10:39 +08:00
邱剑 788861b402 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c20a18dea762a30ceae5a1d754ec62361a1b268f':
  使用未更改前的bw作为old bw
 2018-10-31 11:32:06 +08:00
邱剑 099449efa3 Merge pull request #377 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '264e9dea6d61c33a82f640d585c19f7fb8b49a1e':
  loadbalancers: show backend group name on detailed list
  lbagent: add symlink to generated telegraf.conf
  lbagent: remove requirement on nmap-ncap
 2018-10-31 11:26:50 +08:00
Zexi Li 25c712e213 region: usage support filter by project 2018-10-30 21:39:50 +08:00
屈轩 5fe5c3c25b 使用未更改前的bw作为old bw 2018-10-30 20:06:27 +08:00
TangBin b64c6dc736 bugfix 2018-10-30 19:57:21 +08:00
TangBin 97c06ee0bf add rpc batch host create 2018-10-30 19:36:15 +08:00
wanyaoqi 2874b808d8 fix perform action call allowfunc 2018-10-30 16:17:22 +08:00
李泽玺 3a14eeb842 Merge pull request #386 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-get-wrong-vncport to release/2.2.0 
* commit '6959ae4da3a9db68d0eab1375bddcbc5b8f1efff':
  fix get qemu 2.12.1 vnc port error
 2018-10-30 15:24:20 +08:00
李泽玺 2d8ab8722e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3a14eeb8426f14da5ceda0cd13b4df552b80ac1c':
  fix get qemu 2.12.1 vnc port error
 2018-10-30 15:24:20 +08:00
李泽玺 2a7775dcf9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '72b3e390960980ca665030b631b0ab7697e35d7b':
  设置sshpass默认安装路径
 2018-10-30 14:30:40 +08:00
屈轩 a3453a414c 设置sshpass默认安装路径 2018-10-30 14:29:46 +08:00
wanyaoqi 6959ae4da3 fix get qemu 2.12.1 vnc port error 2018-10-30 12:08:38 +08:00
邱剑 fc8c5a129e Merge pull request #382 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-webssh-key-login to release/2.3.0 
* commit '24a6a47ebcce06e176ea175298de32c7831a4553':
  支持ssh秘钥尝试登陆
 2018-10-30 12:01:28 +08:00
Qiu Jian 3a1264f8da 调整cloudcommon的options数据结构，把数据库相关选项合并到DBoptions 2018-10-30 11:59:11 +08:00
邱剑 908111bcf2 Merge pull request #383 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-restruct-policy-code to release/2.3.0 
* commit '33f546aafd9455f228db22d4bc01e62039382105':
  重构代码，将policy从db中分离出来，代码更干净一些
 2018-10-30 10:24:39 +08:00
李泽玺 b2cfcf9f0f Merge pull request #384 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/monitor-add-treenode-change-project-type to release/2.2.0 
* commit '3feb2839aec46dc6f6b3889c6ac889e655d09041':
  change-project-type
  change-project-type
 2018-10-30 10:18:23 +08:00
李泽玺 b6bcf301a9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b2cfcf9f0ffe5e67eb1ae6003320b4f7cc48ae03':
  change-project-type
  change-project-type
 2018-10-30 10:18:23 +08:00
zhengjiajie 751f0b39cb change-project-type 2018-10-30 09:14:24 +08:00
Qiu Jian 33f546aafd 重构代码，将policy从db中分离出来，代码更干净一些 2018-10-30 00:12:19 +08:00
屈轩 24a6a47ebc 支持ssh秘钥尝试登陆 2018-10-29 23:23:56 +08:00
邱剑 39dbc8830d Merge pull request #378 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-env to release/2.2.0 
* commit '46dc114e7684269f241d761c6bc9d350aad2e9f5':
 2018-10-29 22:38:43 +08:00
邱剑 36adeccbb7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '39dbc8830d69b5e61f82f731227d8ab8f6d9917a':
 2018-10-29 22:38:43 +08:00
邱剑 46dc114e76 Merge pull request #376 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit 'd525cea91689fcd47e68d836c1900bab1563a7bf':
  避免instance 缓存disk数据
 2018-10-29 22:37:29 +08:00
邱剑 926fc3a3dd Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0 
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
  改进：rpc支持
  make fmt
  remove slice nil check
  fix quota check rbac check logic
  增加 usages get 和 quotas get/update 的RBAC检查
  JointModel support
  改进：model资源支持rbac认证，需要打开enable_rbac选项，默认关闭。非model资源还不支持
 2018-10-29 22:22:31 +08:00
Qiu Jian 5a8bd48485 改进：rpc支持 2018-10-29 22:10:00 +08:00
邱剑 88db5a8901 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'bf744d8429dfed9e905ad2b862e73e408f45e1f4':
  snapshot fixs
 2018-10-29 19:54:32 +08:00
wanyaoqi 724169ef44 snapshot fixs 2018-10-29 19:41:43 +08:00
邱剑 a4dfaf2b23 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'cf095f2d9dca164f8b4013e6041d282f00705741':
  避免host name使用中文
 2018-10-29 16:58:53 +08:00
屈轩 1fbb35ae67 避免host name使用中文 2018-10-29 15:47:59 +08:00