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
4,737 Commits 30 Branches 714 Tags
a549cf6512ec057da83fcd488c7dfede9174703f
Commit Graph
450 Commits
Author SHA1 Message Date
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
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 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
屈轩 c9756aa6f0 添加参数，允许不直接登录虚拟机 2019-02-15 10:46:57 +08:00
万垚奇 abfe3f4c3c Merge pull request #1047 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit '3eb7c2900ec29e5b8fa2d1f1def6d469ce003de0':
  fix code
  fs driver fix
 2019-02-14 20:31:00 +08:00
邱剑 bf1720118e Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '273405782c738858c8836267119e77463e345612':
  cloudcommon using structarg.ParseArgs2 to parse arguments
 2019-02-14 17:43:06 +08:00
Qiu Jian 543c87fb84 cloudcommon using structarg.ParseArgs2 to parse arguments 2019-02-14 17:31:27 +08:00
wanyaoqi b210add54d fs driver fix 2019-02-14 10:23:10 +08:00
Qiu Jian b70de93aa8 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190214 
Conflicts:
	Gopkg.lock
 2019-02-13 21:49:51 +08:00
邱剑 b9b57e8441 Merge pull request #1033 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-bugfix-20190213 to release/2.5.0 
* commit 'dd317fb83d6540ba565558acbffdadd1d5ea63ec':
  update vendor
  fix image misc bugs
 2019-02-13 21:44:51 +08:00
邱剑 d0f2bfcad0 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e38f007c512e27f00630a34629006067660b6db8':
  implement baremetal host driver
  minor updates
 2019-02-13 18:26:58 +08:00
李泽玺 3021e37e87 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '9d6a769c8b0afe2fc5b9126f749135cf70fcd7ae':
  baremetal: host convert failed
  fix: recode host convert codes to fix scheduler failure issues
 2019-02-13 15:48:21 +08:00
Qiu Jian b11f117781 minor updates 2019-02-13 15:38:30 +08:00
Zexi Li 1fe2bbe0e0 baremetal: host convert failed 2019-02-13 15:10:10 +08:00
Qiu Jian 924ae176b8 fix: recode host convert codes to fix scheduler failure issues 2019-02-13 14:51:05 +08:00
邱剑 f893d5b256 Merge pull request #1029 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-misc-bugfix to release/2.6.0 
* commit '5c9be39f52c552e49963e95c1d2cf2eb321d934a':
  log doCreateItem exceptions
  add action-show admin mode parameter
  add action-show admin mode parameter
  fix misc logger bugs
 2019-02-13 11:45:38 +08:00
Qiu Jian 9bd15451ae fix image misc bugs 2019-02-13 00:10:03 +08:00
Qiu Jian 5c9be39f52 log doCreateItem exceptions 2019-02-12 17:08:23 +08:00
Qiu Jian ddc42ce54e add action-show admin mode parameter 2019-02-12 16:29:26 +08:00
Zexi Li 79d5e74ea9 mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp 2019-02-12 16:09:53 +08:00
Qiu Jian eaeb41a2d7 fix misc logger bugs 2019-02-12 14:50:58 +08:00
邱剑 0725f68921 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'b22ec29c0c3290fb969c28bd7f92226b0680536c':
  make both golang and python option for ssl ca file as ssl_ca_certs
 2019-02-12 09:33:44 +08:00
邱剑 808347aed1 Merge pull request #1018 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-notify-with-template to release/2.6.0 
* commit '44faf10bfd78537d97c921867e3316a216f59147':
  update influxdb in a more graceful manner
  removel logs
  minor fixes
  增加：补充完整通知消息功能
 2019-02-11 23:04:17 +08:00
Qiu Jian fa7bce7853 make both golang and python option for ssl ca file as ssl_ca_certs 2019-02-11 21:05:36 +08:00
邱剑 cf1d09ad66 Merge pull request #1006 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/log-service-golang to release/2.6.0 
* commit 'bb5aa4d3155c5dd6aca6ed06644c6e95bef8b742':
  minor updates
  update systemd unit description
  add logger rpm build scripts
  minor fixes
  logger service, half baked, needs more work
 2019-02-11 20:59:08 +08:00
Qiu Jian a5b3b233c8 removel logs 2019-02-11 08:50:36 +08:00
Qiu Jian 89c2421bf7 minor fixes 2019-02-11 08:46:06 +08:00
Qiu Jian b215c199df minor fixes 2019-02-09 06:23:23 +08:00
Qiu Jian ff4709e066 增加：补充完整通知消息功能 2019-02-08 07:42:53 +08:00
Qiu Jian 0e3f2e160c temp commit 2019-01-30 21:06:48 +08:00
Qiu Jian 77b95af988 feature: 
1. change SERVER_TYPE_* to NETWORK_TYpE_*
2. add NETWORK_TYPE_PXE and NETWORK_TYPE_IPMI specifically for baremetal PXE and IPMI
network allocation
 2019-01-29 23:38:15 +08:00
Qiu Jian bb9991100e Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-server-change-ipaddr 
Conflicts:
	pkg/mcclient/modules/joint.go
 2019-01-28 22:23:49 +08:00