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,361 Commits 30 Branches 714 Tags
cb1cf77c4ee4100fc1a4f330c203011e1b35c821
Commit Graph
555 Commits
Author SHA1 Message Date
邱剑 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
Qiu Jian 8e65f740cf fix: build error because of notify and actionlog interface change 2019-02-18 15:25:53 +08:00
邱剑 af504a44ab Merge pull request #1030 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feauture/wyq/climc-auto-complete to release/2.6.0 
* commit '34242bb0fffa773077530beea4a00c119695c9bf':
  fix code
  add option auto complete
 2019-02-18 12:30:49 +08:00
wanyaoqi 34242bb0ff fix code 2019-02-16 13:38:02 +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
Qiu Jian 359c451e8e recode huawei client 2019-02-15 02:26:57 +08:00
邱剑 89c09291fd Merge pull request #1046 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-cloud-region-cities to release/2.6.0 
* commit '8656db336b578b55840028e97e20421010cca423':
  minor fixes
  add cloud-region-providers climc command
  feature: get list of cities where cloud region resides and filter cloud regions by city
 2019-02-14 17:04:27 +08:00
Qiu Jian 16bb703d98 add cloud-region-providers climc command 2019-02-14 16:28:16 +08:00
Qiu Jian e1b7854993 feature: get list of cities where cloud region resides and filter cloud 
regions by city
 2019-02-14 01:40:26 +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
邱剑 55ec95f0ac Merge pull request #1032 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/delete-backup-server to release/2.6.0 
* commit '0022d65b001c71d5d59d62de581200e6ff2708d1':
  add delete backup guest, fix bugs
 2019-02-13 21:24:17 +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
wanyaoqi 0022d65b00 add delete backup guest, fix bugs 2019-02-12 20:56:08 +08:00
Qiu Jian ddc42ce54e add action-show admin mode parameter 2019-02-12 16:29:26 +08:00
Qiu Jian eaeb41a2d7 fix misc logger bugs 2019-02-12 14:50:58 +08:00
wanyaoqi e77938c20d add option auto complete 2019-02-12 12:12:02 +08:00
Qiu Jian a425132177 fix: mcclient/module JointManager interface changes make implementation 
broken
 2019-02-12 09:14:02 +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
邱剑 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 ff4709e066 增加：补充完整通知消息功能 2019-02-08 07:42:53 +08:00
Qiu Jian 6f8ce3b32d Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-network-type-pxe-ipmi 
Conflicts:
	cmd/climc/shell/networks.go
 2019-01-30 22:19:29 +08:00
邱剑 c7da5787cf Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6970baa2a08950319069a44d75df4c4272bac775':
  1. network-list add is_private/is_public filter 2. set default image quota to 10
 2019-01-30 21:11:11 +08:00
Qiu Jian 0e3f2e160c temp commit 2019-01-30 21:06:48 +08:00
Qiu Jian ddde11f4f9 1. network-list add is_private/is_public filter 
2. set default image quota to 10
 2019-01-30 20:50:22 +08:00
wanyaoqi bbfed827dc - reserve mutli ip; - server-list order by disk 2019-01-30 20:32:04 +08:00
Qiu Jian b106ae7d12 logger service, half baked, needs more work 2019-01-30 09:30:24 +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
邱剑 b78020b332 Merge pull request #993 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-change-ipaddr to release/2.6.0 
* commit 'bb9991100eb0986d23aa3fa11a3984903136c87b':
  1. 增加server-change-ipaddr接口，允许在运行和关机更换主机的IP地址。 2. 允许主机加入一个network多次（目前允许2次）
 2019-01-29 19:45:09 +08:00
ningyu 9767432a0d feat: 支持月累计消费报警 2019-01-29 12:19:02 +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
万垚奇 28c0452851 Merge pull request #984 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/host-baremetal-v2 to release/2.6.0 
* commit '06446f778364e97cd2df66d8ed40f3c0c4d6574e': (135 commits)
  baremetal: ipmitool passowrd EscapeEchoString
  add hostmetrics
  add hostmetrics
  types struct 符合命名规范
  修正：centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载
  add bsd raw socket code
  fix code
  fix code
  dep add gopsutil/mem
  fix dhcp server
  baremetal: quit signal handle
  baremetal: quit signal handle
  fix dhcp server
  gendoc
  remove jsonutils NewPair
  fix qmp montior cmd
  snapshot recycle, disk recycle, dhcp relay use raw socket
  fix code, test migrate snapshot, fix deploy
  add migrate presend arp
  add ethernet pkg
  ...
 2019-01-28 20:04:24 +08:00
Qiu Jian 4cd39a70c0 1. 
增加server-change-ipaddr接口，允许在运行和关机更换主机的IP地址。
2. 允许主机加入一个network多次（目前允许2次）
 2019-01-27 00:30:43 +08:00
邱剑 c97fd82409 Merge pull request #973 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aws-image-fetch-info to release/2.6.0 
* commit '878bc69358620916304e5c28d6b15d7c20d88756':
  minor updates
  改进：对Aws系统镜像分类处理
 2019-01-26 20:10:17 +08:00
周有松 5562e8a528 Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0 
* commit '409b376ebdd13086d2a5a7462ab076827dff0f25':
  修正udp,tcp后端服务器组id异常
  添加监听同步配置操作
  统一LoadBalancer函数大小写问题
  添加region driver
 2019-01-26 15:57:03 +08:00
Zexi Li a57f8e46be baremetal: quit signal handle 2019-01-26 15:39:31 +08:00
邱剑 a2414dddb9 Merge pull request #976 in YUNIONIO/onecloud from ~NINGYU/onecloud:feature/ningyu-meter-alert to release/2.6.0 
* commit 'f6a8b9de6d0dc9f3409aa4a3f3082744a978235b':
  feat: 添加余额和日消费报警功能
  feat: 添加余额和日消费报警功能
 2019-01-26 14:21:43 +08:00
wanyaoqi 4e77136adf remove jsonutils NewPair 2019-01-26 11:53:21 +08:00
万垚奇 ba7ae5641b Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '84e33c9148454b354af68f0fd7ce9f16627734c9':
  fix disk-list
 2019-01-25 17:38:45 +08:00
万垚奇 84e33c9148 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ca97105c95898f9ae357ca07b98d8caf9ca6a027':
  fix disk-list
 2019-01-25 17:38:45 +08:00
wanyaoqi 65ac44f3e9 fix disk-list 2019-01-25 17:29:26 +08:00
ningyu 0e26b9be17 feat: 添加余额和日消费报警功能 2019-01-25 16:09:42 +08:00
屈轩 409b376ebd 修正udp,tcp后端服务器组id异常 2019-01-25 15:00:45 +08:00
屈轩 53b03c1d59 添加监听同步配置操作 2019-01-25 15:00:05 +08:00
屈轩 dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00
屈轩 2df78f917f 添加region driver 2019-01-25 14:54:27 +08:00
邱剑 2031d63401 Merge pull request #963 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-create-with-eip to release/2.6.0 
* commit '4c422533236babb6ebad3b8083d5cebd67d0092f':
  fix eip-dissociate cmd options
  改进：1. 创建主机时可以绑定指定eip，或者新建eip并且绑定。2. 取消绑定eip时候可以自动删除eip
 2019-01-25 14:53:38 +08:00
Qiu Jian 96b81f40c1 改进：对Aws系统镜像分类处理 2019-01-25 12:34:07 +08:00
邱剑 d71f94c71a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6ebc5d9f02f123e62fc0d2b65d1f2f884c0d806b':
  disk-list filter public & private cloud
 2019-01-24 14:50:25 +08:00
邱剑 6ebc5d9f02 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '03499f7ccc21a131f2da7a7f7cfdf1ac8c0e5ce0':
  disk-list filter public & private cloud
 2019-01-24 14:50:25 +08:00