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
693 Commits 27 Branches 687 Tags
96713696b82ebe866f7d91c867d051325d04deea
Commit Graph
693 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TangBin 96713696b8 add auth complete callback 2018-09-13 14:59:10 +08:00
TangBin d4ab9d8b69 bugfix import path error 2018-09-13 14:35:35 +08:00
TangBin 9b6b1a76a6 Merge branch 'release/2.2.0' into feature/tb-paramter-climc 2018-09-13 14:25:12 +08:00
TangBin b7ca29581f add yunionconf service 2018-09-13 14:24:20 +08:00
邱剑 520baa80f1 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e5c7ad38d422b2babdeb78bf57b659f53ebb865e':
  logserver obj-name 默认值
  logserver objid 默认值
 2018-09-13 12:16:48 +08:00
邱剑 e5c7ad38d4 Merge pull request #198 in YUNIONIO/onecloud from hotfix/rex-20180912-logclient-objid to release/2.1.0 
* commit '8e2d077f2aa9edd6a4ed45da1c664aef2826388c':
  logserver obj-name 默认值
  logserver objid 默认值
 2018-09-13 12:16:48 +08:00
邱剑 8cc801394b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '28a662ecc82c7c27517338ddbb51cbfdbcd8da47':
  修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability
 2018-09-13 12:16:31 +08:00
邱剑 28a662ecc8 Merge pull request #200 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-zone-capabilities-conflict to release/2.1.0 
* commit '013262e25ffc0c57f8e832e678711868c3c9924e':
  修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability
 2018-09-13 12:16:31 +08:00
Qiu Jian 013262e25f 修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability 2018-09-13 12:10:29 +08:00
周有松 019784716e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f603867960fab8c2aa57a0b7f5eea8aaf12c67c9':
  validators: add Optional() to IValidator for use in ValidateUpdateData()
  mcclient: options: set details=true when --pending-delete-all is specified
  cloudcommon: virtualresource: show pending_deleted field when queried
  cloudcommon: virtualresource: optimize list with --field specified
 2018-09-13 11:59:58 +08:00
周有松 f603867960 Merge pull request #199 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'dd38b2b53dfcc50982078ec0b0f093e6b95bc38f':
  validators: add Optional() to IValidator for use in ValidateUpdateData()
  mcclient: options: set details=true when --pending-delete-all is specified
  cloudcommon: virtualresource: show pending_deleted field when queried
  cloudcommon: virtualresource: optimize list with --field specified
 2018-09-13 11:59:58 +08:00
Yousong Zhou dd38b2b53d validators: add Optional() to IValidator for use in ValidateUpdateData() 2018-09-13 02:06:41 +00:00
Yousong Zhou 51307dedc5 mcclient: options: set details=true when --pending-delete-all is specified 
This is required to get values of pending_deleted field
 2018-09-13 02:06:41 +00:00
Yousong Zhou c66e264aff cloudcommon: virtualresource: show pending_deleted field when queried 2018-09-13 02:06:41 +00:00
Yousong Zhou 2ff04e3d97 cloudcommon: virtualresource: optimize list with --field specified 
No functional change
 2018-09-13 02:06:12 +00:00
Zhang Dongliang 8e2d077f2a logserver obj-name 默认值 2018-09-13 06:11:46 +08:00
Zhang Dongliang a4db1e57c3 logserver objid 默认值 2018-09-12 21:51:09 +08:00
邱剑 8893f3a615 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7c3dd189ba31928e3cfbd4242baab562690d6442':
  rbd类型disk需要path路径
 2018-09-12 20:23:28 +08:00
邱剑 7c3dd189ba Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7863b7c0850a1a5d3fd206df87c62ddc8b995bde':
  rbd类型disk需要path路径
 2018-09-12 20:23:28 +08:00
邱剑 7863b7c085 Merge pull request #195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk to release/2.0.0 
* commit '2bd249be264fd828b09924ffd630c6717edb9ffa':
  rbd类型disk需要path路径
 2018-09-12 20:23:27 +08:00
邱剑 24751ec50a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '329cf9aa5afa944ddacdebee004bafd3e4cdb610':
  修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
 2018-09-12 20:06:22 +08:00
邱剑 329cf9aa5a Merge pull request #196 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-20180912 to release/2.1.0 
* commit '860f6b8c0248f9d3951ae6538ae29d1bf81432a4':
  修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
 2018-09-12 20:06:22 +08:00
邱剑 883f321db7 Merge pull request #194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-choise to release/2.0.0 
* commit 'f3b4b4d3146c9ac5b12bad89eb3d48842984aab0':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
邱剑 03d7534c42 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '48dd7ffe3728516823a2de4afa93965678b5577b':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
邱剑 48dd7ffe37 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '883f321db71934a59d6b789d3febf7d8f5579def':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
Qiu Jian 860f6b8c02 修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
屈轩 2bd249be26 rbd类型disk需要path路径 2018-09-12 17:08:25 +08:00
屈轩 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
邱剑 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
邱剑 5087a48e8e Merge pull request #192 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-network-allocate to release/2.0.0 
* commit '45c7f7345dfa7b95ae6b8322adbf71a5570e5aec':
  避免append同一个network
 2018-09-12 15:21:44 +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
邱剑 4288cd0c33 Merge pull request #191 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-server-ops-auto-start to release/2.0.0 
* commit 'f90c7dce3f56c2298bacd9a904924d11b4425547':
  climc: server deploy and save-image auto_start
 2018-09-12 14:07:06 +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