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
屈轩 f3b4b4d314 避免只使用第一个storage 2018-09-12 16:12:47 +08:00
邱剑 09747bcd53 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f15f944e04d7212d6723e0f03a26285dcc2dd313':
  避免storagecachedimage数据库操作时panic
 2018-09-12 15:34:32 +08:00
邱剑 f15f944e04 Merge pull request #193 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-cached-image to release/2.1.0 
* commit '063a7c1b00c691ff25223ff1d2f3755a4ae9ae5a':
  避免storagecachedimage数据库操作时panic
 2018-09-12 15:34:32 +08:00
屈轩 063a7c1b00 避免storagecachedimage数据库操作时panic 2018-09-12 15:30:35 +08:00
屈轩 20381d0775 resolve conflict 2018-09-12 15:28:34 +08:00
邱剑 ff12a413f0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e8cf494496812371b4d326866d400878eb45fb84':
  避免append同一个network
 2018-09-12 15:21:45 +08:00
邱剑 e8cf494496 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5087a48e8e3720f8666972f55946c81c277db2aa':
  避免append同一个network
 2018-09-12 15:21:45 +08:00
屈轩 45c7f7345d 避免append同一个network 2018-09-12 15:17:27 +08:00
邱剑 12b1ef939e Merge pull request #183 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-lockman-enable-inmemery-lock to release/2.1.0 
* commit '0a29b0add76df86c0d5081db809631c22d728bf1':
  remove binary
  增加：镜像缓存加锁，避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
 2018-09-12 14:54:15 +08:00
邱剑 9c7b95bef5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '12b1ef939eb190af6c25790a0b8b5357aa678173':
  remove binary
  增加：镜像缓存加锁，避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
 2018-09-12 14:54:15 +08:00
邱剑 41a806cc8c Merge pull request #189 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-filter-guest-by-eip to release/2.1.0 
* commit '9a8d0e77a9794e9b52d8eb2b77ff8a00ec7da42a':
  增加：guests支持with_eip=true和without_eip=true两个过滤条件
 2018-09-12 14:53:52 +08:00
邱剑 c88f6a92d2 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '41a806cc8c71b5cd9a947a930647c6b78a5e3f2e':
  增加：guests支持with_eip=true和without_eip=true两个过滤条件
 2018-09-12 14:53:52 +08:00
邱剑 81cb8297ba Merge pull request #188 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-redundant-params to release/2.2.0 
* commit '1a30516b0f82d34401c0f78ff69317a343c0aafa':
  minor fixes
  修正：radix match params只包含匹配的参数
 2018-09-12 14:53:37 +08:00
邱剑 922f2ac07e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '8ff02cfd90495a86bad9c1d14107f9a9ca3189de':
  mcclient: options: accomodate time.Time type
  mcclient: options: allow listing all resources including pending_deleted
  validators: rework error handling
  validators: StringMultiChoicesValidator: add test case
 2018-09-12 14:09:25 +08:00
邱剑 8ff02cfd90 Merge pull request #187 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'af0603d6db82f884552644b3b78f02c8e6ffae56':
  mcclient: options: accomodate time.Time type
  mcclient: options: allow listing all resources including pending_deleted
  validators: rework error handling
  validators: StringMultiChoicesValidator: add test case
 2018-09-12 14:09:24 +08:00
邱剑 14c2bcd9a1 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2449eb333fdee2a49a27690cebcb8c50362b59de':
  - use sh to connect k8s pod - ensure required binaries exist
 2018-09-12 14:08:55 +08:00
邱剑 2449eb333f Merge pull request #190 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webconsole-shell to release/2.1.0 
* commit '1fba463cda118632c522b4bf3ee5330e2bfd5c4f':
  - use sh to connect k8s pod - ensure required binaries exist
 2018-09-12 14:08:55 +08:00
邱剑 c8f441cbb1 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f831c8daea5797745a6f5b2f8c60510b690932ff':
  climc: server deploy and save-image auto_start
 2018-09-12 14:07:07 +08:00
邱剑 f831c8daea Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '4288cd0c33d7f19efc6862d178765e96a841fc5b':
  climc: server deploy and save-image auto_start
 2018-09-12 14:07:07 +08:00
Zexi Li f90c7dce3f climc: server deploy and save-image auto_start 2018-09-12 13:46:17 +08:00
Zexi Li 1fba463cda - use sh to connect k8s pod 
- ensure required binaries exist
 2018-09-12 11:00:08 +08:00
Yousong Zhou af0603d6db mcclient: options: accomodate time.Time type 2018-09-12 01:26:52 +00:00
Yousong Zhou d98e3b325f mcclient: options: allow listing all resources including pending_deleted 2018-09-12 01:26:52 +00:00
Yousong Zhou cc70be165f validators: rework error handling 
- Return httperrors by default (return ValidateError when testing)
 - Special casing sql.ErrNoRows for model not found
 2018-09-12 01:26:52 +00:00
Yousong Zhou 2b691c5dbd validators: StringMultiChoicesValidator: add test case 2018-09-12 01:26:52 +00:00
Qiu Jian 9a8d0e77a9 增加：guests支持with_eip=true和without_eip=true两个过滤条件 2018-09-12 02:02:06 +08:00
Qiu Jian 1a30516b0f minor fixes 2018-09-12 01:14:33 +08:00
Qiu Jian c8e919af33 修正：radix match params只包含匹配的参数 2018-09-11 23:57:19 +08:00
邱剑 3b6b0c3795 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a1b67853de1238e0d8ce0a569c4d8214dedca934':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:07 +08:00
邱剑 a1b67853de Merge pull request #175 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deploy-from-file to release/2.1.0 
* commit '32adce2d02d4cc820ccafc9a0cfb4f6227ec5b15':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:06 +08:00
邱剑 33884e5f75 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e2b3cbd1d09e699a2b7c7be969252b282e034134':
  region: cloudregion usage
 2018-09-11 21:53:58 +08:00
邱剑 e2b3cbd1d0 Merge pull request #185 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cloud-region-usage to release/2.1.0 
* commit 'c860812e9179dbeb1c3dbf26628e5dddd1f05566':
  region: cloudregion usage
 2018-09-11 21:53:57 +08:00
邱剑 371f9ec1cf Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5516983e0207c9b87ac8e2fb303b257ab6b6ba0f':
  同步云盘名称
 2018-09-11 21:52:20 +08:00
邱剑 5516983e02 Merge pull request #184 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-sync to release/2.1.0 
* commit 'b7be94f2d265c93df941fa98a35a15ca5b6f8154':
  同步云盘名称
 2018-09-11 21:52:20 +08:00
邱剑 c2ba894926 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '8939e971b6cbcfce69bcbbcfadc2ebab33fc00b5':
  support filter attached disk
 2018-09-11 21:51:59 +08:00
Qiu Jian 0a29b0add7 remove binary 2018-09-11 21:51:10 +08:00
Qiu Jian a6d8ee1173 增加：镜像缓存加锁，避免批量创建时重复上传镜像 2018-09-11 21:40:31 +08:00
wanyaoqi 07ef04aae2 support filter attached disk 2018-09-11 19:44:00 +08:00
Zexi Li c860812e91 region: cloudregion usage 2018-09-11 18:15:40 +08:00
屈轩 b7be94f2d2 同步云盘名称 2018-09-11 17:00:07 +08:00
屈轩 224193248f resolve conflict 2018-09-11 16:39:49 +08:00
Zexi Li 32adce2d02 mcclient: register WebConsole 2018-09-11 15:39:59 +08:00
Qiu Jian cda52bf9b8 remove binary 2018-09-11 13:09:40 +08:00
Qiu Jian 9a6eeb30f6 使用inmemory lockman 2018-09-11 13:07:51 +08:00
邱剑 e03a31a65d Merge pull request #182 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'ad67ecb7dd46cc0ecf32c3a1104da9d89b9b8054':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
邱剑 786489162b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e03a31a65d32799840888d124d61f731382569ae':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
Yousong Zhou 75f38447fd validators: add BoolValidator 2018-09-10 16:08:17 +00:00
Yousong Zhou b4f00220f9 validators: add ValidatorStringMultiChoices 2018-09-10 16:08:13 +00:00
邱剑 a42cef6e77 Merge pull request #160 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '5b5733916624792de9fe4c1aa438c0d320e80a4e':
  fix code
  - local disk snapshot create and delete - auto snapshot everyday - rewrite cornman - make dep and some fix - fix conflict
 2018-09-10 23:55:25 +08:00
邱剑 f32205086e Merge pull request #181 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-rules to release/2.1.0 
* commit '48ce6b7c0e78ee81f0d6b23ede1b49158b002e06':
  protocol为空则指定protocol为any
 2018-09-10 23:53:54 +08:00