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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1636 Commits
Author SHA1 Message Date
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
屈轩 d992661a01 resolve conflict 2018-09-18 15:53:13 +08:00
邱剑 4d18946c1a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'fadc94ebe1db560d9213a0698462d270f01930e5':
  阿里云：不缓存阿里云的连接
 2018-09-18 11:54:50 +08:00
邱剑 fadc94ebe1 Merge pull request #228 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-disable-aliyun-provider-cache to release/2.1.0 
* commit '9c1c3c0a70662d7276ba7f476969c1ddb9f92f63':
  阿里云：不缓存阿里云的连接
 2018-09-18 11:54:49 +08:00
周有松 8831c674ac Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '0620ebe7a41be0c94c95ef4c4c549c0b1e2c9046':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
 2018-09-18 11:40:29 +08:00
周有松 0620ebe7a4 Merge pull request #226 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-printjson-tabs to release/2.1.0 
* commit 'b39963bbfcc47e52eb726b3228ee381710837ddc':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
 2018-09-18 11:40:29 +08:00
Yousong Zhou 946c0d935e printutils: add PrintJSONObjectRecursive() 
E.g. Print

	{"params": {"vrrp":{"advert_int":1,"interface":"br0","pass":"YunionLB","priority":100,"virtual_router_id":100}}}

Will have the following result

	| params.vrrp.advert_int        | 1
	| params.vrrp.interface         | br0
	| params.vrrp.pass              | YunionLB
	| params.vrrp.priority          | 100
	| params.vrrp.virtual_router_id | 100
 2018-09-18 03:39:22 +00:00
邱剑 fa5290f4e4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
Qiu Jian 9c1c3c0a70 阿里云：不缓存阿里云的连接 2018-09-17 23:51:07 +08:00
Qiu Jian 03af1fc8a2 支持将list的结果导出为excel文件 2018-09-17 22:36:08 +08:00
邱剑 18068b0c1e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:39 +08:00
Qiu Jian e460919cbe minor fixes 2018-09-15 19:44:48 +08:00
Qiu Jian c624d4ec6c 修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root 
no-account-init无效 3. 其他问题...
 2018-09-15 17:05:17 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
邱剑 86eca9166f Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
  adjust import order
  fix typos
  增加eip操作的状态变化
  network/wire/vpc增加zone/region信息
  修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
 2018-09-15 12:53:10 +08:00
Qiu Jian ee8e8bc2b5 增加eip操作的状态变化 2018-09-15 12:31:27 +08:00
Qiu Jian 8c2250517f 修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. 
billing_type字段为空导致创建主机失败问题
 2018-09-15 00:31:58 +08:00
邱剑 6511872424 Merge pull request #211 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-metadata-charge-type to release/2.1.0 
* commit 'e77106787905b3187fcbdbc24253b7b0792fd559':
  增加 billing_type 和 expire_at 字段，用于计费
 2018-09-14 18:07:10 +08:00
邱剑 4d03e9b605 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '651187242434645e6643331979fbec7de7b46959':
  增加 billing_type 和 expire_at 字段，用于计费
 2018-09-14 18:07:10 +08:00
Qiu Jian e771067879 增加 billing_type 和 expire_at 字段，用于计费 2018-09-14 17:49:29 +08:00
邱剑 2855cfbf8a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ab8d120580317d802d6a1150c86b91bd0641a341':
  server create disk
  minor fix
  attach detach isolate device
  server attach detach network, change bandwidth, some bug fix
  guest desc, guest sendkey, fix disk delete
 2018-09-14 17:04:39 +08:00
屈轩 3c5671d188 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-14 14:29:29 +08:00
wanyaoqi f910f6ada7 server attach detach network, change bandwidth, some bug fix 2018-09-14 11:50:22 +08:00
Qiu Jian 2ece630d4a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
 2018-09-14 11:26:23 +08:00
Qiu Jian 1c427f3c1b 修正rebuildroot后API获取的磁盘列表不完整的问题 2018-09-14 11:18:20 +08:00
Qiu Jian 76231936a9 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913 2018-09-14 01:47:12 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
屈轩 37e4b5d1af resolve conflict 2018-09-13 18:01:43 +08:00
屈轩 730d83b733 resolve conflict 2018-09-13 16:25:56 +08:00
屈轩 ac979bc8c1 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-13 16:22:53 +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
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
邱剑 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
Qiu Jian 860f6b8c02 修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
屈轩 20381d0775 resolve conflict 2018-09-12 15:28:34 +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
邱剑 371f9ec1cf Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5516983e0207c9b87ac8e2fb303b257ab6b6ba0f':
  同步云盘名称
 2018-09-11 21:52:20 +08:00
Qiu Jian a6d8ee1173 增加：镜像缓存加锁，避免批量创建时重复上传镜像 2018-09-11 21:40:31 +08:00
屈轩 b7be94f2d2 同步云盘名称 2018-09-11 17:00:07 +08:00
屈轩 224193248f resolve conflict 2018-09-11 16:39:49 +08:00
Qiu Jian 9a6eeb30f6 使用inmemory lockman 2018-09-11 13:07:51 +08: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
邱剑 480d7cd65e Merge pull request #170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-aliyun-account-balance to release/2.1.0 
* commit '0c79c6e4e6a907073e25dcde0645b457a151e0a8':
  增加阿里云账户余额接口支持
 2018-09-10 23:53:17 +08:00
Zhang Dongliang 7f624c46b5 go fmt. 2018-09-10 15:43:20 +08:00
Zhang Dongliang 3ffe3fc722 去掉临时调试信息; gofmt 2018-09-10 15:40:55 +08:00
Zhang Dongliang 6199b3b7a4 去掉临时调试信息 2018-09-10 15:38:20 +08:00
邱剑 5de6c10a4b Merge pull request #167 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aliyun-vm-unaccessible to release/2.1.0 
* commit '1aa1fba80111ad9fc4a9f80d99efeba47f947753':
  修正：已经绑定EIP的主机不能再绑定EIP
  修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-09 09:06:07 +08:00