16 Commits

Include renames

Author	SHA1	Message	Date
邱剑	d4b544af76	Automatic merge from release/2.3.0 -> release/2.4.0 ... * commit '13a26a2316bd0d926984a3c0d9331a784113a618': 修复同步腾讯云storage type数据不准问题	2019-01-03 16:23:40 +08:00
屈轩	060ae5718b	修复同步腾讯云storage type数据不准问题	2019-01-03 16:19:41 +08:00
Qiu Jian	965e84ea36	update	2018-12-07 02:57:58 +08:00
Qiu Jian	669081f7f3	Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling	2018-12-05 01:14:45 +08:00
Qiu Jian	3e87c17e72	support prepaid server create and renew	2018-12-05 00:40:15 +08:00
屈轩	b0bbfb0f1a	解决冲突	2018-12-04 20:27:12 +08:00
屈轩	3fa55efe42	腾讯云导入镜像适配	2018-12-04 18:50:58 +08:00
屈轩	3fdc72b164	解决冲突	2018-12-04 11:42:06 +08:00
屈轩	3518527ef3	修复qcloudcli eip命令参数缺失	2018-12-03 22:01:18 +08:00
Yousong Zhou	bae1eeaa58	pkg/{aws,azure,qcloud}: fix compilation	2018-12-03 13:47:38 +00:00
TangBin	4cb87d487e	fix conflict	2018-11-29 21:37:53 +08:00
TangBin	d9d66329dc	sync skus table from cloudmeta service && aws bugfix	2018-11-29 20:18:20 +08:00
屈轩	18eedcf82c	解决冲突	2018-11-26 16:42:11 +08:00
屈轩	e98957b337	解决冲突	2018-11-26 16:27:32 +08:00
TangBin	68028cb781	fix region-dns build error	2018-11-12 20:09:01 +08:00
屈轩	9833767fb2	支持腾讯云资源导入	2018-11-03 17:32:54 +08:00