Commit Graph

7321 Commits

Author SHA1 Message Date
yunion-ci-robot
2f204e2811 Merge pull request #2705 from swordqiu/automated-cherry-pick-of-#2703-upstream-release-2.11
Automated cherry pick of #2703: fix: guest get host nil pointer panic
2019-09-02 21:41:16 +08:00
yunion-ci-robot
8100b2aebe Merge pull request #2709 from zexi/automated-cherry-pick-of-#2707-upstream-release-2.11
Automated cherry pick of #2707: scheduler: fix reserved resource out of limit bug
2019-09-02 18:53:16 +08:00
Zexi
4b7dc251b0 scheduler: fix reserved resource out of limit bug 2019-09-02 18:40:55 +08:00
Qiu Jian
b80c30dcfb fix: guest get host nil pointer panic 2019-09-02 18:20:28 +08:00
yunion-ci-robot
b5f87568bf Merge pull request #2701 from ioito/automated-cherry-pick-of-#2699-upstream-release-2.11
Automated cherry pick of #2699: fix: 忽略裸金属器删除条件
2019-09-02 17:24:19 +08:00
ioito
c9c00f3776 fix: 忽略裸金属器删除条件 2019-09-02 16:32:09 +08:00
yunion-ci-robot
7fe3d646f9 Merge pull request #2696 from Mjoycarry/automated-cherry-pick-of-#2672-upstream-release-2.11
Automated cherry pick of #2672: local snapshotpolicy
2019-09-02 16:12:17 +08:00
yunion-ci-robot
ac4d9f2b2d Merge pull request #2694 from ioito/automated-cherry-pick-of-#2689-upstream-release-2.11
Automated cherry pick of #2689: fix: 避免裸金属服务器转宿主机任务失败
2019-09-02 15:58:15 +08:00
yunion-ci-robot
957fbd66db Merge pull request #2691 from swordqiu/automated-cherry-pick-of-#2690-upstream-release-2.11
Automated cherry pick of #2690: fix: no quota check when making directory
2019-09-02 15:56:15 +08:00
yunion-ci-robot
c2ca6d2f2c Merge pull request #2681 from swordqiu/automated-cherry-pick-of-#2680-upstream-release-2.11
Automated cherry pick of #2680: fix: azure create bucket failure due to empty storageClass
2019-09-02 15:53:15 +08:00
Rain
0b3d3b02b8 local snapshotpolicy 2019-09-02 15:36:59 +08:00
ioito
94f29d7c81 fix: 避免裸金属服务器转宿主机任务失败 2019-09-02 15:33:14 +08:00
yunion-ci-robot
1f0c738fc1 Merge pull request #2685 from wanyaoqi/automated-cherry-pick-of-#2683-upstream-release-2.11
Automated cherry pick of #2683: fix glance update mindisk
2019-09-02 15:31:15 +08:00
yunion-ci-robot
7161b279ce Merge pull request #2678 from zexi/automated-cherry-pick-of-#2676-upstream-release-2.11
Automated cherry pick of #2676: baremetal: auto prepare when pxe boot
2019-09-02 15:30:17 +08:00
Qiu Jian
390d599552 fix: no quota check when making directory 2019-09-02 15:26:58 +08:00
yunion-ci-robot
febf0086c7 Merge pull request #2670 from swordqiu/automated-cherry-pick-of-#2669-upstream-release-2.11
Automated cherry pick of #2669: feature: 1. add ceph cloud provider based on generic s3 provider 2. climc support AK/SK authentication
2019-09-02 13:59:15 +08:00
wanyaoqi
5a5f10aece fix glance update mindisk 2019-09-02 13:53:48 +08:00
yunion-ci-robot
1a9800cb42 Merge pull request #2667 from swordqiu/automated-cherry-pick-of-#2665-upstream-release-2.11
Automated cherry pick of #2665: fix: 1. glance/keystone version handler fix 2. allow run glance as normal user
2019-09-02 13:48:15 +08:00
yunion-ci-robot
9d9875c1cf Merge pull request #2663 from swordqiu/automated-cherry-pick-of-#2662-upstream-release-2.11
Automated cherry pick of #2662: fix: qcloud fail to set object acl
2019-09-02 13:47:15 +08:00
Qiu Jian
f469e8a632 fix: azure create bucket failure due to empty storageClass 2019-09-02 13:47:06 +08:00
yunion-ci-robot
731dc5bb9a Merge pull request #2660 from swordqiu/automated-cherry-pick-of-#2659-upstream-release-2.11
Automated cherry pick of #2659: fix: huawei fail to import image
2019-09-02 13:45:18 +08:00
yunion-ci-robot
f9ac4ce8c7 Merge pull request #2657 from swordqiu/automated-cherry-pick-of-#2656-upstream-release-2.11
Automated cherry pick of #2656: fix: allow column search in array
2019-09-02 13:44:15 +08:00
Zexi
2577b8f2a1 baremetal: auto prepare when pxe boot 2019-09-02 11:46:37 +08:00
yunion-ci-robot
ba3c8d321e Merge pull request #2674 from swordqiu/automated-cherry-pick-of-#2673-upstream-release-2.11
Automated cherry pick of #2673: fix: provides policies info in auth token response
2019-09-02 10:21:15 +08:00
Qiu Jian
7208be9b59 fix: provides policies info in auth token response 2019-09-02 09:15:44 +08:00
Qiu Jian
5ae65cb7b7 feature: 1. add ceph cloud provider based on generic s3 provider 2. climc support AK/SK authentication 2019-09-01 19:04:11 +08:00
Qiu Jian
71f6b89155 fix: 1. glance/keystone version handler fix 2. allow run glance as normal user 2019-08-31 11:13:26 +08:00
Qiu Jian
e025e65f7b fix: qcloud fail to set object acl 2019-08-30 23:22:42 +08:00
Qiu Jian
91f16ce64c fix: huawei fail to import image 2019-08-30 23:11:56 +08:00
Qiu Jian
d510ca1994 fix: allow column search in array 2019-08-30 22:27:25 +08:00
yunion-ci-robot
53d25123e0 Merge pull request #2654 from zhasm/automated-cherry-pick-of-#2652-upstream-release-2.11
Automated cherry pick of #2652: 修改 Makefile 获取当前分支的方式
2019-08-30 18:24:15 +08:00
张东亮
b346875837 修改 Makefile 获取当前分支的方式 2019-08-30 17:57:51 +08:00
yunion-ci-robot
94b5f92164 Merge pull request #2640 from swordqiu/automated-cherry-pick-of-#2629-upstream-release-2.11
Automated cherry pick of #2629: fix: incorrect import path of options pkg
2019-08-30 17:22:13 +08:00
liuxueguo6921
0589d38771 fix: incorrect import path of options pkg 2019-08-30 16:18:14 +08:00
yunion-ci-robot
55e41c3e37 Merge pull request #2650 from Mjoycarry/automated-cherry-pick-of-#2607-upstream-release-2.11
Automated cherry pick of #2607: natgateway bugfix
2019-08-30 16:07:13 +08:00
yunion-ci-robot
65fa546664 Merge pull request #2645 from ioito/automated-cherry-pick-of-#2601-upstream-release-2.11
Automated cherry pick of #2601: fix: 避免创建磁盘时显示provider disable底下的存储
2019-08-30 16:05:14 +08:00
Rain
1c937aeee0 natgateway bugfix
only one of that snat source cidr and networkid is needed

eip auto bind natgateway when not in aliyun
2019-08-30 15:11:41 +08:00
ioito
34ec4c3751 fix: 避免创建磁盘时显示provider disable底下的存储 2019-08-30 10:55:22 +08:00
yunion-ci-robot
1fd2fcefe5 Merge pull request #2642 from swordqiu/automated-cherry-pick-of-#2608-upstream-release-2.11
Automated cherry pick of #2608: feature: 1. ak/sk auth support 2. a full feature s3gateway works with Cyberduck
2019-08-30 07:35:12 +08:00
Qiu Jian
6441069a73 feature: 1. ak/sk auth support 2. a full feature s3gateway works with Cyberduck
注意:以下两个文件的修改还未被官方合并,所以下次make
mod的时候会被覆盖,需要注意checkout恢复:

vendor/github.com/Azure/azure-sdk-for-go/storage/blockblob.go
vendor/github.com/tencentyun/cos-go-sdk-v5/object_part.go
2019-08-30 00:27:36 +08:00
yunion-ci-robot
95e59f67d0 Merge pull request #2627 from swordqiu/automated-cherry-pick-of-#2626-upstream-release-2.11
Automated cherry pick of #2626: fix: compatible with minio s3
2019-08-29 23:52:12 +08:00
yunion-ci-robot
751740a655 Merge pull request #2636 from wanyaoqi/automated-cherry-pick-of-#2635-upstream-release-2.11
Automated cherry pick of #2635: bugfix:
2019-08-29 22:46:12 +08:00
wanyaoqi
825b92f1b4 bugfix:
- fix guest vnc connect failed on host unsupport ipv6
- fix cirros qemu args conflict with windows
2019-08-29 21:24:37 +08:00
yunion-ci-robot
9632f45d35 Merge pull request #2632 from ioito/automated-cherry-pick-of-#2630-upstream-release-2.11
Automated cherry pick of #2630: fix: avoid not release pending-usage
2019-08-29 20:45:13 +08:00
ioito
facb566c88 fix: avoid not release pending-usage 2019-08-29 20:30:11 +08:00
yunion-ci-robot
3cdeb52dd1 Merge pull request #2624 from zhasm/automated-cherry-pick-of-#2619-upstream-release-2.11
Automated cherry pick of #2619: 新增 s3gateway s3cli的 rpm 描述文件
2019-08-29 18:59:14 +08:00
Qiu Jian
44c1115ce2 fix: compatible with minio s3 2019-08-29 18:51:04 +08:00
rex zhasm
70c686e254 Merge branch 'release/2.11' into automated-cherry-pick-of-#2619-upstream-release-2.11 2019-08-29 17:33:32 +08:00
yunion-ci-robot
a87fd32c65 Merge pull request #2617 from ioito/automated-cherry-pick-of-#2615-upstream-release-2.11
Automated cherry pick of #2615: fix: avoid rbd image exist when rebuild-root
2019-08-29 17:32:14 +08:00
yunion-ci-robot
6da30aa260 Merge pull request #2622 from ioito/automated-cherry-pick-of-#2620-upstream-release-2.11
Automated cherry pick of #2620: hotfix: add aliyun request user-agent
2019-08-29 17:18:11 +08:00