mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00

T

邱剑 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

build

Merge pull request #12 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-region-dns to release/2.0.0

2018-08-07 20:53:28 +08:00

cmd

Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810

2018-08-10 12:15:04 +08:00

pkg

Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810

2018-08-10 12:15:04 +08:00

vendor

Merge remote-tracking branch 'origin/release/2.0.0' into release/2.1.0