opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,209 Commits 30 Branches 714 Tags
e4bb883c608ceed482f9c1961c5197bc9fc64fca
Commit Graph
190 Commits
Author SHA1 Message Date
邱剑 a0237e1d0c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'bd44d611bdb2c7a1c0bad453ae66b270c2bebdc5':
  Azure stop默认使用deallocate
 2018-10-18 17:56:25 +08:00
屈轩 4e4d005907 Azure stop默认使用deallocate 2018-10-18 17:08:56 +08:00
邱剑 a72b479bdb Merge pull request #301 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-enable-http-tls to release/2.2.0 
* commit '575ea95525aea075b1ae8b542151185ee4ba14c5':
  改进：允许climc指定tls证书，允许服务指定tls证书
 2018-10-18 16:01:19 +08:00
邱剑 510ad125db Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'a72b479bdb8bf848b48a315fb667ec4ee38142fc':
  改进：允许climc指定tls证书，允许服务指定tls证书
 2018-10-18 16:01:19 +08:00
邱剑 93bc41c167 Merge pull request #291 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloud-account to release/2.3.0 
* commit 'e7bd5dfa66588a8e8fd2bcfb93ce401641945bc2':
  减少调用层级
  支持云账号主次之分
 2018-10-17 21:16:44 +08:00
邱剑 3fa36d3869 Merge pull request #305 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-rebuild-root to release/2.2.0 
* commit '7a5c4c990e5b038db38ffc52aac3b37f90673464':
  imageId不能更改，尝试删除之前的系统盘，第一次删除会失败，第二次一般会成功
 2018-10-17 21:09:21 +08:00
邱剑 154d6afedf Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3fa36d3869bf425ced7b80ab67b9c155e7b8f019':
  imageId不能更改，尝试删除之前的系统盘，第一次删除会失败，第二次一般会成功
 2018-10-17 21:09:21 +08:00
屈轩 e7bd5dfa66 减少调用层级 2018-10-17 21:03:12 +08:00
屈轩 7a5c4c990e imageId不能更改，尝试删除之前的系统盘，第一次删除会失败，第二次一般会成功 2018-10-17 20:32:12 +08:00
邱剑 580bc942a4 Merge pull request #303 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyuncli-snapshot to release/2.2.0 
* commit '7ca7052d11623a9a9251f561b651d385e19e3643':
  补充aliyuncli delete-snapshot命令
 2018-10-17 20:17:35 +08:00
邱剑 f32ac21e78 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '681c46e90572f7dc6d29fd69e5f5a898ee6a5fd4':
 2018-10-17 18:02:34 +08:00
邱剑 681c46e905 Merge pull request #302 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-uniq-zone to release/2.2.0 
* commit '58d6bd1ba034b277417ddd63602390d301158149':
 2018-10-17 18:02:33 +08:00
邱剑 f7ba920b90 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '20cf5be92a7df191690aeceea66a421fea0a8865':
  调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确
  增加日志服务黑名单，去掉配置服务的操作日志
 2018-10-17 17:43:46 +08:00
邱剑 20cf5be92a Merge pull request #299 in YUNIONIO/onecloud from bugfix/rex-20181016-aliyun-reset-actionlog to release/2.2.0 
* commit '1736eacb2157825a5c91daed4d977b26f18d6d92':
  调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确
  增加日志服务黑名单，去掉配置服务的操作日志
 2018-10-17 17:43:46 +08:00
屈轩 7ca7052d11 补充aliyuncli delete-snapshot命令 2018-10-17 17:23:26 +08:00
邱剑 58d6bd1ba0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
 2018-10-17 17:16:30 +08:00
Qiu Jian 575ea95525 改进：允许climc指定tls证书，允许服务指定tls证书 2018-10-17 16:45:11 +08:00
Zhang Dongliang 1736eacb21 调整带宽 task: CLOUD-561云服务器调整带宽后，操作日志记录的内容应该准确 2018-10-17 16:18:17 +08:00
Zhang Dongliang da241e9cbb 增加日志服务黑名单，去掉配置服务的操作日志 2018-10-17 15:03:38 +08:00
邱剑 26553ff096 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '94ff2fed00fa743c1035d06a4bc8c622cb951064':
  避免因大小写不一致导致同步时删除原有的数据
 2018-10-16 19:43:17 +08:00
屈轩 e6d4050904 避免因大小写不一致导致同步时删除原有的数据 2018-10-16 19:40:20 +08:00
屈轩 8ef86da0de Merge branch 'release/2.3.0' of ssh://git.yunion.io/~quxuan/onecloud into hotfix/qx-cloud-account 2018-10-16 18:38:47 +08:00
张东亮 b3cbcc26ef Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c61f18d88e9a967f6c780456d4ae635bb94d9485':
  fmt
  onecloud 增加重启的 actionlog
 2018-10-16 18:11:49 +08:00
Zhang Dongliang adc306b1cc onecloud 增加重启的 actionlog 2018-10-16 16:09:14 +08:00
屈轩 197f1b32ee 支持云账号主次之分 2018-10-15 18:29:11 +08:00
邱剑 219015d50c Merge pull request #287 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keypair-improvment to release/2.3.0 
* commit 'cfa4f5db945dcef09137c712370edcb3d8e33593':
  server show expired_at column
  修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 修正公有云注入userdata的问题
  Update vendor
  Update format
  Force format before build
  minor updates
  Update vendor
  改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 其他
 2018-10-15 18:20:30 +08:00
Qiu Jian 23443c07bc 修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 
修正公有云注入userdata的问题
 2018-10-13 20:36:15 +08:00
Qiu Jian b17b24b232 Update format 2018-10-12 12:13:35 +08:00
Qiu Jian deda9f70a6 minor updates 2018-10-12 12:09:35 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
屈轩 6433953d9f 避免因publickey为空导致重装系统失败 2018-10-11 17:16:05 +08:00
邱剑 fed89b0db6 Merge pull request #283 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-attach-disk to release/2.2.0 
* commit 'f702526c238132e101db002eb0529b63b925824f':
 2018-10-11 15:48:46 +08:00
邱剑 f702526c23 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-11 12:21:01 +08:00
屈轩 120492b505 统一返回格式 2018-10-10 13:21:59 +08:00
邱剑 877e8ed8f0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1116fda18bf93abb172abed5ade2758b451779ec':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +08:00
邱剑 1116fda18b Merge pull request #277 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-latitude-longitude to release/2.1.0 
* commit '11e20cebc5adf3b8371807f8d486ef4ee422746c':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +08:00
屈轩 11e20cebc5 获取aliyun region经纬度 2018-10-09 21:20:52 +08:00
邱剑 ec7f2ee981 Merge pull request #272 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit '7c217bc49d7525050f73a87ec73866a642849be4':
  避免/tmp目录容量不够
 2018-09-30 12:13:34 +08:00
屈轩 7c217bc49d resolve conflict 2018-09-30 12:10:58 +08:00
邱剑 de7038f000 Merge pull request #238 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-save-image to release/2.1.0 
* commit '3eea07f2791c9251da1bb504bb3d07de5216b718':
  避免/tmp目录容量不够
 2018-09-30 12:05:40 +08:00
屈轩 3eea07f279 避免/tmp目录容量不够 2018-09-30 11:55:15 +08:00
邱剑 abb9cb6ea6 Merge pull request #251 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-storageaccount to release/2.2.0 
* commit '23a4087c6c5c286be87ced31d248e8c65c473747':
  storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查
 2018-09-27 17:38:34 +08:00
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +08:00
屈轩 23a4087c6c storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查 2018-09-26 20:43:35 +08:00
屈轩 f0ad662ec0 修复获取network时未加认证信息 2018-09-21 13:28:05 +08:00
屈轩 6a54305eb2 resolve conflict 2018-09-20 16:29:20 +08:00
屈轩 c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
邱剑 b5ed2666eb Merge pull request #232 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '1b44153b1e8c2d6f957f44c0e066398dce026320':
  add validate snapshot name
  aliyun snapshot sync, create, delete; disk reset
 2018-09-20 00:12:52 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00