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
5,070 Commits 30 Branches 714 Tags
fcd4fd62e2a68f6945728dff50db9787055df419
Commit Graph
479 Commits
Author SHA1 Message Date
Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 
Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go
 2019-03-13 16:32:18 +08:00
邱剑 9448fde22d Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0 
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:28:32 +08:00
周有松 3abb73a9b0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f0f6172156f0c693117ee6dc77c9c54bc4f942ba':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
 2019-03-12 16:47:25 +08:00
Qiu Jian f7c61a9750 fix: 1. usage hide system servers 2. host undo convert shows wrong 
status
 2019-03-12 13:39:22 +08:00
Yousong Zhou c6e4fff0d0 lb: 不记录来自lbagent的GET查询请求 
要求

 - _orig=lbagent
 - userCred.HasSystemAdminPrivilege()
 2019-03-12 03:39:20 +00:00
Yousong Zhou 07f98779ad treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g 2019-03-12 03:39:20 +00:00
Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 
Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go
 2019-03-11 15:03:25 +08:00
Qiu Jian 53435a2528 feature: nic binding support 2019-03-11 04:43:12 +08:00
Zexi Li c94ec06dc2 Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309 2019-03-09 14:02:36 +08:00
万垚奇 1649454d3f Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'eb825342799c2b4a43a822cba84b0906887cd35f':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
 2019-03-08 21:26:05 +08:00
Zexi Li 57a2a475ef 修复: joint 的对象创建时没有检验是否存在，会被重复添加 2019-03-08 19:08:35 +08:00
屈轩 8a117aac75 更新成功后才添加日志记录 2019-03-07 17:22:01 +08:00
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
Qiu Jian 8eb4a74c8b Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-06 01:39:17 +08:00
Qiu Jian cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
wanyaoqi 46e85d5249 kvm guest support hotplug cpu mem, fix hmp monitor 2019-03-05 14:29:12 +08:00
邱剑 fb5adf56c0 Merge pull request #1156 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-external-project to release/2.7.0 
* commit '0ce6b70998e5646b7f1a1f0f610b003132fab980':
  更改ProjectSource -> ProjectSrc
  同步openstack项目
  同步azure项目
  腾讯云加入debug信息
  external_project去掉cloudregion属性
  补充其他资源项目同步
  映射表默认指向provider的project
  init
 2019-03-05 12:12:54 +08:00
屈轩 0ce6b70998 更改ProjectSource -> ProjectSrc 2019-03-05 12:05:02 +08:00
邱剑 f258a2a4b9 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bb03d950ee1bf7028a619ac81e081c3efac3515f':
  获取pool限额
  挂载后端校验
  避免挂载ceph磁盘失败
  修复删除磁盘失败bug
  避免rbd磁盘不存在时，无限删除磁盘失败
  添加rbd包
  host支持ceph
  minor updates
  改进：对Aws系统镜像分类处理
 2019-03-05 10:53:43 +08:00
Qiu Jian ef197ca3d0 improvements: autonomously adjust sync interval according to resources in region 2019-03-05 02:35:20 +08:00
屈轩 0514c725d7 挂载后端校验 2019-03-04 18:42:14 +08:00
屈轩 173034cd26 映射表默认指向provider的project 2019-03-04 16:36:47 +08:00
屈轩 10d4ca66c0 init 2019-03-04 16:36:47 +08:00
Qiu Jian abb4181871 skip objects that is undergoing a task 2019-03-04 14:08:15 +08:00
Qiu Jian 605cbb2558 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-04 01:42:39 +08:00
Qiu Jian 62ebc90f2a feature: allow auto sychrnoization of cloud account 2019-03-04 01:09:34 +08:00
Zexi Li fc3b748039 rbac: SharableVirtualResource only allow GET method 2019-02-28 20:59:49 +08:00
Zexi Li 9312401932 cloudcommon: virtualresource ProjectId visible when user list 2019-02-28 20:41:45 +08:00
Qiu Jian df0474e25a fix: break dependencies of climc/mcclient on compute/models 2019-02-27 16:40:13 +08:00
邱剑 0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +08:00
Qiu Jian 7c51f211e1 fix: validate delete condition returns nested httperrors 2019-02-22 10:18:10 +08:00
Qiu Jian bf071e2fea fix: specify notify user&groups domain as prefix 2019-02-22 09:27:05 +08:00
Qiu Jian 3de16f096c fix: server list filter by manager returns 500 2019-02-22 01:15:33 +08:00
Qiu Jian d3e1f32535 fix: adjust notify template 2019-02-20 16:18:13 +08:00
邱剑 a4ce38c4fe Merge pull request #1013 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-image-p2p-distribution to release/2.6.0 
* commit '4c6f196ec541d1b8c8e2d79ea69c7bd7f9fcf1a6':
  temp commit
  minor updates
  torrent recode
 2019-02-18 23:03:55 +08:00
张东亮 cdb12a1354 Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0 
* commit '9f35039209c5a9251d05ad720012531a50f8cc8b':
  add service tag for actionlog
  make fmt
  fix: logger did not record start time of events
 2019-02-18 12:25:16 +08:00
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +08:00
Qiu Jian 8554d13c4a make fmt 2019-02-16 15:17:31 +08:00
Qiu Jian 066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +08:00
Qiu Jian a72ae86082 fix: send system notification to specific users or groups 2019-02-16 01:46:39 +08:00
Qiu Jian a7faa9b318 minor changes 2019-02-16 01:25:16 +08:00
Qiu Jian 4c6f196ec5 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution 
Conflicts:
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/policy/defaults.go
	pkg/util/sysutils/sysutils.go
 2019-02-15 22:46:01 +08:00
李泽玺 cf3631983c Merge pull request #1058 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit 'c886b09982d97c24709f384ead1b69a20f38fae0':
  fix remotefix close body bug
  move ethernet from cloudcommon to utils
  rootfs drivers: linux, macOS, Android, ESXi etc.
 2019-02-15 21:19:51 +08:00
wanyaoqi 853d9dbb5e move ethernet from cloudcommon to utils 2019-02-15 20:29:30 +08:00
Qiu Jian f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215 
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
 2019-02-15 19:47:56 +08:00
邱剑 a747ad2c20 Merge pull request #1049 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-login to release/2.5.0 
* commit 'c9756aa6f0da02ac8e211dbf7bb88606cadb1aa3':
  添加参数，允许不直接登录虚拟机
 2019-02-15 12:12:19 +08:00
邱剑 256b6e9841 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '220df08a486d2a5e725c64e3f7cc42437c7ca41f':
  log日志记录external_id
 2019-02-15 12:11:56 +08:00
邱剑 220df08a48 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ab97a01b9ccaaa1b2af46fd9bc744e256ccea69e':
  log日志记录external_id
 2019-02-15 12:11:55 +08:00
屈轩 2d7a17464c log日志记录external_id 2019-02-15 11:56:12 +08:00