opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
146 Commits 27 Branches 687 Tags
bee99e79721dd5512560a0ad3f3ecbf224b7cbbc
Commit Graph
146 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李泽玺 bee99e7972 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '764978e994735df30cf9401df81546f3ce9df386':
  climc list add joint filter
 2018-08-14 11:09:05 +08:00
李泽玺 764978e994 Merge pull request #51 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/climc-list-add-joint-filter to release/2.0.0 
* commit '20fd01adc35789e8afe9f03ea16c6cd46d0dabab':
  climc list add joint filter
 2018-08-14 11:09:04 +08:00
wanyaoqi 20fd01adc3 climc list add joint filter 2018-08-14 11:07:12 +08:00
邱剑 160eea8146 Merge pull request #50 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-disk-resize to release/2.1.0 
* commit '1afa94c200aa1ebc3295075bc1c535c60910d79c':
  添加aliyun disk resize内容
 2018-08-13 22:17:41 +08:00
屈轩 1afa94c200 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-disk-resize 2018-08-13 21:33:21 +08:00
屈轩 f8a299e167 添加aliyun disk resize内容 2018-08-13 20:27:29 +08:00
邱剑 72d8111048 Merge pull request #47 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-filter to release/2.1.0 
* commit 'cb62883e5da15475de7097d958ed5044ec291d27':
  添加disk provider过滤参数
 2018-08-13 20:23:45 +08:00
屈轩 cb62883e5d 添加disk provider过滤参数 2018-08-13 20:10:57 +08:00
邱剑 6762e86dbf Merge pull request #45 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-specify-network to release/2.0.0 
* commit 'c7656041a5eb21dcf88a3ce930de78552a5a8273':
  修正: 调度器指定网络批量失败的bug
 2018-08-13 14:59:09 +08:00
邱剑 b2c0bc8e63 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6762e86dbf52baa63b280257506480e793ff7c7e':
  修正: 调度器指定网络批量失败的bug
 2018-08-13 14:59:09 +08:00
Zexi Li c7656041a5 修正: 调度器指定网络批量失败的bug 2018-08-13 14:47:58 +08:00
邱剑 b340a66adf Merge pull request #44 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-conflict-resolve-20180813 to release/2.1.0 
* commit '72be6d8eddd50a68a878e888bf2eda075409b4ee':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 13:16:14 +08:00
Qiu Jian 72be6d8edd Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-conflict-resolve-20180813 
Conflicts:
	pkg/compute/models/disks.go
	pkg/compute/service/service.go
 2018-08-13 12:34:48 +08:00
邱剑 a4f252bbb2 Merge pull request #42 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-server-pending-delete-clean to release/2.0.0 
* commit 'f7d815eb641d531eaa5e21d6ff07113d056bdcd4':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 12:30:45 +08:00
Qiu Jian f7d815eb64 forget to update cronjob lastRun 2018-08-12 09:11:22 +08:00
Qiu Jian 1f8bf7fa04 修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描 2018-08-11 22:50:53 +08:00
邱剑 ed8ccfd158 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e0f42e6e3c3216602403476704e8304c48169a2f':
 2018-08-11 22:25:57 +08:00
邱剑 e0f42e6e3c Merge pull request #41 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-validate-create-data to release/2.0.0 
* commit '7c030147e8bcd221fb065f12a3c69c7d46552a59':
 2018-08-11 22:25:56 +08:00
邱剑 75d566a4cb Merge pull request #38 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-kvm-server-create to release/2.1.0 
* commit '9474752c05352f989b02b6e57b0cb6a5eef91c8a':
  fix server create
 2018-08-11 22:24:39 +08:00
Qiu Jian e112524185 minor updates 2018-08-11 22:24:06 +08:00
Qiu Jian f52557a3f8 修正：阿里云主机清理回收站功能 2018-08-11 22:21:25 +08:00
屈轩 7c030147e8 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-validate-create-data 2018-08-11 21:15:06 +08:00
张东亮 4044ec5d6f Merge pull request #37 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-ldap-delete-fix to release/2.0.0 
* commit '534d3d3d7785900c34abc4e6a3f4a0197986e989':
  use httperrors lib
  return fast
  allow delete ldap
 2018-08-11 21:13:56 +08:00
张东亮 3fda9e6451 Merge pull request #37 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-ldap-delete-fix to release/2.0.0 
* commit '534d3d3d7785900c34abc4e6a3f4a0197986e989':
  use httperrors lib
  return fast
  allow delete ldap
 2018-08-11 18:50:33 +08:00
张东亮 2b903d5fc1 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3fda9e64513397ace37698b3e1b822a6d37f13b9':
  use httperrors lib
  return fast
  allow delete ldap
 2018-08-11 18:50:33 +08:00
TangBin 534d3d3d77 use httperrors lib 2018-08-11 18:40:45 +08:00
wanyaoqi 9474752c05 fix server create 2018-08-11 18:34:21 +08:00
邱剑 d3ca14ea72 Merge pull request #36 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-alloow-server-update-name to release/2.0.0 
* commit '53caf371f5b15441c47501e8b5ae308a92e07fc3':
  改进：同步python和golang的validateupdatedata实现，允许修改主机名
 2018-08-11 18:19:17 +08:00
邱剑 787191aa22 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'd3ca14ea723208afb9085064a8f4a43cd27326f5':
  改进：同步python和golang的validateupdatedata实现，允许修改主机名
 2018-08-11 18:19:17 +08:00
TangBin e7503d8d0a return fast 2018-08-11 17:58:08 +08:00
TangBin cae8d734e1 allow delete ldap 2018-08-11 17:22:45 +08:00
Qiu Jian 53caf371f5 改进：同步python和golang的validateupdatedata实现，允许修改主机名 2018-08-11 15:19:50 +08:00
李泽玺 4b28c2a201 Merge pull request #35 in YUNIONIO/onecloud from ~LIZEXI/onecloud:release/2.1.0 to release/2.1.0 
* commit '090a9c5e869c6770a43f12ab3dc0af1d180b5172':
  add doc.go for each package
  path move: github.com/yunionio -> yunion.io/x
 2018-08-11 15:16:39 +08:00
Zexi Li 090a9c5e86 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-11 15:11:24 +08:00
李泽玺 68d4b2caef Merge pull request #33 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-path-change to release/2.0.0 
* commit 'e6788bb75e65a823c18777163e8c79983ed1698c':
  add doc.go for each package
  path move: github.com/yunionio -> yunion.io/x
 2018-08-11 14:43:54 +08:00
Zexi Li e6788bb75e add doc.go for each package 2018-08-11 14:41:38 +08:00
Zexi Li 22411ffb53 path move: github.com/yunionio -> yunion.io/x 2018-08-11 14:28:18 +08:00
李泽玺 238ef9e5d6 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6f5845eef4acead6ff5b69bcc58964a4a6349ffb':
  climc: k8s api moved
 2018-08-11 11:24:21 +08:00
李泽玺 6f5845eef4 Merge pull request #32 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s to release/2.0.0 
* commit '869c2ee141297d59b6f8f092b8c3e07d9a05b4a0':
  climc: k8s api moved
 2018-08-11 11:24:21 +08:00
Zexi Li 869c2ee141 climc: k8s api moved 2018-08-11 11:16:35 +08:00
李泽玺 cbd1b1c6aa Merge pull request #31 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-create to release/2.1.0 
* commit 'c0a213556796acd2854a298fd5b2df3abd7e6ef8':
  kvm server create
 2018-08-11 10:29:31 +08:00
wanyaoqi c0a2135567 kvm server create 2018-08-11 10:21:28 +08:00
邱剑 7222464c59 Merge pull request #30 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-release-2.1.0-conflict-resolve-20180810 to release/2.1.0 
* commit '6d81914119c33d9f582e05e4af18d0faca9f2840':
  修正：阿里云回收站主机恢复后无系统盘
  修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 3. 其他一些BUGfix
  temp commit
  temporary commit
 2018-08-10 12:18:38 +08:00
Qiu Jian 6d81914119 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810 
Conflicts:
	pkg/cloudcommon/db/taskman/subtasks.go
	pkg/compute/models/guests.go
 2018-08-10 12:15:04 +08:00
邱剑 4c2e94ac2b Merge pull request #25 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-bugfix-20180808 to release/2.0.0 
* commit '1585d24302c5f0bfe28f769ad2aeef86a8afed9c':
  修正：阿里云回收站主机恢复后无系统盘
  修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 3. 其他一些BUGfix
  temp commit
  temporary commit
 2018-08-10 11:38:23 +08:00
Yousong Zhou fd26ec4620 Merge remote-tracking branch 'origin/release/2.0.0' into release/2.1.0 2018-08-10 03:17:25 +00:00
周有松 757dc35c03 Merge pull request #26 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.0.0 
* commit 'f76609e91da3f668700b9ed7535e502bbf712401':
  dep: remove constraint on github.com/coreos/etcd
  cloudcommon: db: rename argument name
  cloudcommon: db: make master, slave id explict in joint resource base
  treewide: make explicit calls to JSONDict.Remove() and JSONDict.RemoveIgnoreCase
  scheduler: fix test compilation
 2018-08-10 11:11:47 +08:00
Qiu Jian 1585d24302 修正：阿里云回收站主机恢复后无系统盘 2018-08-09 23:58:11 +08:00
Qiu Jian f0ec8a563e 修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 
3. 其他一些BUGfix
 2018-08-09 17:49:17 +08:00
李泽玺 094600ae65 Merge pull request #23 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-deploy to release/2.1.0 
* commit 'f04463b5269157e03739412952ee0c38c2688bac':
  server-stop, server-detach-disk, server-syncstatus, server-monitor, server-purge, fix code, add server-suspend, server-cancel-delete server-change-config, fix disk-resize server-deploy
 2018-08-09 17:33:57 +08:00