opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1120 Commits
Author SHA1 Message Date
屈轩 4b53845421 resolve conflict 2018-08-29 21:22:08 +08:00
wanyaoqi e2d4054367 extend joint filter 2018-08-29 17:55:13 +08:00
邱剑 4c24df8d85 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1a02439127328a272105bfb62c48b4dfa312ba8e':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
 2018-08-29 16:43:49 +08:00
邱剑 1a02439127 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7c19d8e062abb99dd04e260ffc258bea8effd032':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
 2018-08-29 16:43:49 +08:00
Zexi Li 19d0afae86 climc: k8s-deployment-create support network 2018-08-29 14:43:53 +08:00
Zexi Li ad7c4ac5ad climc: k8s cluster import and addnodes 2018-08-29 14:43:53 +08:00
Zexi Li a61c37501a climc: k8s resource table print 2018-08-29 14:43:53 +08:00
邱剑 9a691d9e16 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '805711ae8433e68b7c4cec291c702fba3a994ce9':
  climc: server-rebuild-root support keypair and passwd
 2018-08-29 13:57:52 +08:00
邱剑 805711ae84 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6b4261b7345367a5df59e523e24be18a4d36bca0':
  climc: server-rebuild-root support keypair and passwd
 2018-08-29 13:57:52 +08:00
Zexi Li 876f4ce1fa climc: server-rebuild-root support keypair and passwd 2018-08-29 11:21:21 +08:00
屈轩 a75dc1b729 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-08-29 10:38:55 +08:00
TangBin bbe0c66dd6 add notice climc command 2018-08-28 11:49:57 +08:00
屈轩 3625987932 添加Azure安全组同步 2018-08-25 18:50:12 +08:00
邱剑 4c07ae8a1e Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5359543470e4d351ba03ffd90f3e2ee9d5d4e004':
  增加：通过cloud provider来过滤虚拟机的功能
 2018-08-23 14:51:20 +08:00
Qiu Jian 0d6a9f33c6 增加：通过cloud provider来过滤虚拟机的功能 2018-08-23 13:32:11 +08:00
Qiu Jian b77f39d194 minor updates 2018-08-22 16:11:18 +08:00
Zexi Li 5e8b7b3ce3 fix auto-merge conflict 2018-08-21 20:49:42 +08:00
Zexi Li b95af3dc79 climc: helm api 2018-08-21 20:33:53 +08:00
Zexi Li 9cdbeb943b climc: k8s resource cli 2018-08-20 11:45:10 +08:00
wanyaoqi e3e341561c reserve args 2018-08-20 10:58:28 +08:00
wanyaoqi cca134d32e dep ensure pkg, fix climc parse input args 2018-08-20 10:39:01 +08:00
Zexi Li 8e8a636d23 climc: secure options rename to insecure 2018-08-17 12:35:52 +08:00
Zexi Li 13aa7b81e9 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-17 12:16:15 +08:00
Zexi cbc0c234f2 - climc: 设置 option 没有 subcommand 的情况下进入交互模式, 代码逻辑变清晰 
- make fmt
 2018-08-17 12:11:08 +08:00
Qiu Jian 9d20909625 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180817 
Conflicts:
	Gopkg.lock
 2018-08-17 02:14:53 +08:00
邱剑 15b65a63e5 Merge pull request #65 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dep-ensure-update to release/2.0.0 
* commit 'f65acc402b999fcbbca8c53d6f17080f0a0b5583':
  dep: update for recent changes
  scheduler: fix wrong import path
 2018-08-17 01:27:02 +08:00
Yousong Zhou f65acc402b dep: update for recent changes 
- Gopkg.toml: restore constraint on yunion.io/x/pkg to master branch
 - treewide: convert optional:bool to positional:!bool
 2018-08-16 13:09:26 +00:00
邱剑 d77ece1248 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5f391e2227ef05f5bcc3ab8030ab9028bc8cf974':
  climc: server-deploy password
 2018-08-16 20:51:57 +08:00
邱剑 5f391e2227 Merge pull request #64 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-server-deploy-passwd to release/2.0.0 
* commit 'cf39f5ed4482912405381c1a4347e82f5ac21d8f':
  climc: server-deploy password
 2018-08-16 20:51:57 +08:00
邱剑 03002aca3c Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'de75c8b308b71e06a4f1452c408a60ec6c4f6cd9':
  scheduler: network container server_type
 2018-08-16 19:04:57 +08:00
Zexi Li cf39f5ed44 climc: server-deploy password 2018-08-16 18:47:10 +08:00
Zexi Li 7cad0d54f3 scheduler: network container server_type 2018-08-16 16:19:52 +08:00
邱剑 81b7b329ab Merge pull request #55 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-reset to release/2.1.0 
* commit 'f991bd67f15f73efa54cd765e19848879027ddbc':
  region: kvm server reset, fix climc parmas
 2018-08-15 21:02:56 +08:00
wanyaoqi f991bd67f1 region: kvm server reset, fix climc parmas 2018-08-15 14:05:16 +08:00
李泽玺 815ec7f94f Merge pull request #46 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-server-secgroup to release/2.1.0 
* commit 'bc73e77e3594992110e74f05a9774ef49952f5ad':
  更改sync算法
  同步阿里云安全组规则到本地
 2018-08-15 12:32:36 +08:00
屈轩 bc73e77e35 更改sync算法 2018-08-14 22:48:11 +08:00
李泽玺 bee99e7972 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '764978e994735df30cf9401df81546f3ce9df386':
  climc list add joint filter
 2018-08-14 11:09:05 +08:00
wanyaoqi 20fd01adc3 climc list add joint filter 2018-08-14 11:07:12 +08:00
屈轩 cb62883e5d 添加disk provider过滤参数 2018-08-13 20:10:57 +08:00
wanyaoqi 9474752c05 fix server create 2018-08-11 18:34:21 +08:00
Zexi Li 090a9c5e86 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-11 15:11:24 +08:00
Zexi Li e6788bb75e add doc.go for each package 2018-08-11 14:41:38 +08:00
Zexi Li 22411ffb53 path move: github.com/yunionio -> yunion.io/x 2018-08-11 14:28:18 +08:00
李泽玺 238ef9e5d6 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6f5845eef4acead6ff5b69bcc58964a4a6349ffb':
  climc: k8s api moved
 2018-08-11 11:24:21 +08:00
李泽玺 6f5845eef4 Merge pull request #32 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s to release/2.0.0 
* commit '869c2ee141297d59b6f8f092b8c3e07d9a05b4a0':
  climc: k8s api moved
 2018-08-11 11:24:21 +08:00
Zexi Li 869c2ee141 climc: k8s api moved 2018-08-11 11:16:35 +08:00
李泽玺 cbd1b1c6aa Merge pull request #31 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-create to release/2.1.0 
* commit 'c0a213556796acd2854a298fd5b2df3abd7e6ef8':
  kvm server create
 2018-08-11 10:29:31 +08:00
wanyaoqi c0a2135567 kvm server create 2018-08-11 10:21:28 +08:00
Qiu Jian 6d81914119 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810 
Conflicts:
	pkg/cloudcommon/db/taskman/subtasks.go
	pkg/compute/models/guests.go
 2018-08-10 12:15:04 +08:00
wanyaoqi f04463b526 server-stop, server-detach-disk, server-syncstatus, server-monitor, server-purge, 
fix code, add server-suspend, server-cancel-delete
server-change-config, fix disk-resize
server-deploy
 2018-08-09 10:17:04 +08:00