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
3,574 Commits 27 Branches 687 Tags
35adcede87d21100a0b331f9ebe72ebddcdfb9f6
Commit Graph
3574 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 35adcede87 Merge pull request #929 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-exclude-prepaid-fake-storage-from-available-storage-types to release/2.5.0 
* commit '7bdaac6882dc34cd8df62e584193cd86ede6cfeb':
  修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除
 2019-01-15 17:11:30 +08:00
邱剑 95e8e3ad6a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '21ac2061b8ebf2bd0525ee837968f87b52293a9f':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
 2019-01-15 17:10:55 +08:00
邱剑 21ac2061b8 Merge pull request #931 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.4.0 
* commit '4adae9bd8867c9f0249cb91f9212574656650aa9':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
 2019-01-15 17:10:54 +08:00
邱剑 46b5a90ad4 Merge pull request #930 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgorup-detail to release/2.5.0 
* commit '3b60fa1238491b1bf41b491b16adbb459cee0912':
  避免前端更改描述字段后刷新没有相关字段
 2019-01-15 17:04:07 +08:00
邱剑 a96709816c Merge pull request #932 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-zone-location to release/2.5.0 
* commit '2794f188e585e4456c7e8d34a7a743f4594c4d07':
  允许zone-list显示location字段
 2019-01-15 17:03:26 +08:00
屈轩 2794f188e5 允许zone-list显示location字段 2019-01-15 16:09:01 +08:00
Yousong Zhou 4adae9bd88 lbagent: fix typo in log 2019-01-15 08:00:44 +00:00
Yousong Zhou 10a388e6df lbagent: use encoding/json for {,de}serialization 2019-01-15 08:00:44 +00:00
Yousong Zhou 082cff6acd lbagent: 改正cloudcommon.CommonOptions使用 2019-01-15 08:00:44 +00:00
Yousong Zhou 67a9a1921d lbagent: 改正isempty()使用 2019-01-15 08:00:44 +00:00
屈轩 3b60fa1238 避免前端更改描述字段后刷新没有相关字段 2019-01-15 15:48:23 +08:00
Qiu Jian 7bdaac6882 修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除 2019-01-15 12:14:07 +08:00
邱剑 fef1f193a1 Merge pull request #925 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-os-type-case-insensitive to release/2.5.0 
* commit '98bbe1a5c3d54dfb786729e82d6abaa6dc2c0a6d':
  image os type caseinsensitive
 2019-01-15 12:03:30 +08:00
邱剑 ffc4a51b97 Merge pull request #928 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-network-split to release/2.5.0 
* commit 'f7ee73934a9047c78ea369a155bde2db35c5e0fa':
  fix network split
 2019-01-15 12:03:17 +08:00
wanyaoqi f7ee73934a fix network split 2019-01-15 11:43:29 +08:00
邱剑 aa6555c647 Merge pull request #927 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-typo-20190115 to release/2.5.0 
* commit 'd6a416acb258040a1d1b78907b357a3993744ea3':
  修正：status检查主体引用错误
 2019-01-15 11:05:08 +08:00
Qiu Jian d6a416acb2 修正：status检查主体引用错误 2019-01-15 10:51:30 +08:00
万垚奇 a1f42c990e Merge pull request #926 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-server-list-os-type to release/2.5.0 
* commit '05a69ac0be41c41e0c5583fa71df647087daae09':
  add os-type list filter
 2019-01-15 10:43:21 +08:00
Qiu Jian 05a69ac0be add os-type list filter 2019-01-14 22:39:32 +08:00
邱剑 8d9f37af4a Merge pull request #924 in YUNIONIO/onecloud from hotfix/rex-disk-attach-dettach-logs to release/2.4.0 
* commit '4a17ff0e6b75bb8f515a73dce2a223c445639f63':
  gofmt
  增加挂载磁盘、卸载磁盘日志
 2019-01-14 21:24:13 +08:00
邱剑 f099e1cbd8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8d9f37af4a42398c48256b31516b178aa5543646':
  gofmt
  增加挂载磁盘、卸载磁盘日志
 2019-01-14 21:24:13 +08:00
Qiu Jian 98bbe1a5c3 image os type caseinsensitive 2019-01-14 21:23:05 +08:00
Zhang Dongliang 4a17ff0e6b gofmt 2019-01-14 17:26:55 +08:00
Zhang Dongliang 83b6855d86 增加挂载磁盘、卸载磁盘日志 2019-01-14 17:25:24 +08:00
邱剑 55f5beb1cf Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '1570cfec28fb6967821a9b69fd7a4bc948d386e0':
  region: host list 去掉 container 计数
 2019-01-14 15:13:08 +08:00
邱剑 1570cfec28 Merge pull request #921 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-host-list-guest-cnt to release/2.4.0 
* commit 'ac02074cde9a92b8104a66db0c62536cd8fd9db9':
  region: host list 去掉 container 计数
 2019-01-14 15:13:07 +08:00
邱剑 9bb39f1a4a Merge pull request #922 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-client-package-name-error to release/2.5.0 
* commit 'affd9bde8b80626d8f7731f227a5d35e9e106db0':
  fix huawei client package name error
 2019-01-14 14:40:37 +08:00
TangBin affd9bde8b fix huawei client package name error 2019-01-14 14:20:15 +08:00
Zexi Li ac02074cde region: host list 去掉 container 计数 2019-01-14 13:40:35 +08:00
邱剑 e6a75cc1cc Merge pull request #920 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-host-set-schedtags to release/2.5.0 
* commit 'b59b1c4519f1ea59ac39a0278b182c0adf28f5da':
  region: host 支持通过 set-schedtag 接口添加删除调度标签
 2019-01-14 13:26:41 +08:00
Zexi Li b59b1c4519 region: host 支持通过 set-schedtag 接口添加删除调度标签 2019-01-14 12:32:18 +08:00
邱剑 033c7b736b Merge pull request #919 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-restrict-recycle-in-running-ready-status to release/2.5.0 
* commit 'caa7b8f25ad2c21afeaa4bcdebc875bad593e534':
  user-create default-project-id
  修正：1. 包年包月资源池添加和减少操作需要做状态检查 2. 同步时候忽略包年包月资源次的host和storage
 2019-01-14 12:25:33 +08:00
Qiu Jian caa7b8f25a user-create default-project-id 2019-01-14 12:24:54 +08:00
Qiu Jian 706238404e 修正：1. 包年包月资源池添加和减少操作需要做状态检查 2. 
同步时候忽略包年包月资源次的host和storage
 2019-01-11 21:13:40 +08:00
邱剑 befa02f7b1 Merge pull request #915 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secrule-port to release/2.5.0 
* commit 'bdcbd2a8f48b1e25971fa055bc92f9e330ab0c6d':
  避免参数ports未生效问题
 2019-01-11 12:28:44 +08:00
邱剑 c5e96e7c1f Merge pull request #917 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-spec-no-disable-host to release/2.4.0 
* commit 'b82290d12499766647382f60b731045defb3e375':
  修复: spec 显示没有 enabled 的宿主机
 2019-01-10 22:35:20 +08:00
Zexi Li b82290d124 修复: spec 显示没有 enabled 的宿主机 2019-01-10 22:40:15 +08:00
邱剑 f61434aaf5 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'c5e96e7c1f6a99c6a9ac59f9f1a39ed098eb50b4':
  修复: spec 显示没有 enabled 的宿主机
 2019-01-10 22:35:20 +08:00
屈轩 bdcbd2a8f4 避免参数ports未生效问题 2019-01-10 20:11:43 +08:00
邱剑 b31db23acf Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '082b003451edd9ad303b328494cc9ae2e2c5478b':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:27 +08:00
邱剑 082b003451 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd25457892e522e6eee2cb9fa8c0a5387e304a53c':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:26 +08:00
邱剑 d25457892e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1a0165e567a95033814eef1ce861515cf69fd4f6':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:26 +08:00
邱剑 1a0165e567 Merge pull request #916 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-secgroup-rule to release/2.2.0 
* commit 'e267a7064ed12aa6b1863422ac0c48898d43ec73':
  避免PortStart为-1时未正确设置PortRange参数
 2019-01-10 19:40:26 +08:00
屈轩 e267a7064e 避免PortStart为-1时未正确设置PortRange参数 2019-01-10 17:54:13 +08:00
李泽玺 0c640fd179 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '40eb0119ceef64af5671c771bdb9b90cd66f4dfa':
  region: isolated_devices purge action
 2019-01-10 15:59:59 +08:00
李泽玺 40eb0119ce Merge pull request #914 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-isodev-purge to release/2.4.0 
* commit '9eca0250ae6f28a66eec9058c75258bb7407c9b4':
  region: isolated_devices purge action
 2019-01-10 15:59:58 +08:00
Zexi Li 9eca0250ae region: isolated_devices purge action 2019-01-10 12:21:42 +08:00
邱剑 f5f924a0a0 Merge pull request #913 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-sync-skip-failed-host to release/2.5.0 
* commit '06c9e6eb7e395019f61f6901b6fe8deab1f8e1e3':
  make fmt
  修正：1. attach权限校验总是false 2. 增加climc user default_project_id相关方法
  修正：1. allowattach rbac compatible 2. server insert iso fail
  修正：1. vmware同步宿主机出错后应该尽力而为地同步所有能同步的机器 2. 保存镜像时，如果缺少osType报错
 2019-01-10 12:11:33 +08:00
Qiu Jian 06c9e6eb7e make fmt 2019-01-09 20:56:31 +08:00
Qiu Jian 01db84f737 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-sync-skip-failed-host 2019-01-09 20:54:48 +08:00