opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 23:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1011 Commits
Author SHA1 Message Date
Qiu Jian 051f5fcb6b minor fixes 2019-01-05 16:22:09 +08:00
Qiu Jian e5aa26f0af 修正：1. storagecache.CacheImage接口需要指定format 2. 
PerformAction默认返回ActionNotFound Error
 2019-01-04 17:36:54 +08:00
邱剑 f920267721 Merge pull request #876 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-server-require-override-pending-delete to release/2.4.0 
* commit 'd1d032411efb09a65ce6076ada84ddef172f8146':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
邱剑 3f08aab84a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f9202677218c02f3f5e7683a7ccab25c1db2d7db':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
Qiu Jian 5b63de31bc 修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. 
joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-03 19:39:22 +08:00
邱剑 9422e59ed1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9918896ac3aaf67572338b66eb1133c99142265a':
  补充admin resource列表
 2019-01-03 12:28:11 +08:00
Qiu Jian e6c93767f0 补充admin resource列表 2019-01-02 21:25:46 +08:00
屈轩 adb95b27df 更新vendor 2019-01-02 17:38:59 +08:00
屈轩 54e3e2fba2 获取openstack compute api version 2019-01-02 17:37:51 +08:00
Qiu Jian f413e9c6b4 修正image和yunionconf默认权限 2019-01-01 00:48:04 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
Qiu Jian 1e4789285d minor improvements 2018-12-28 20:24:23 +08:00
Qiu Jian df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
Qiu Jian a99ded14e3 minor fixes 2018-12-27 00:07:15 +08:00
Qiu Jian cd3f46871a minor fixes 2018-12-27 00:05:57 +08:00
Qiu Jian dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian 7d8cb846f9 move version, qemutil, qemuimg from cloudcommon to util 2018-12-26 22:59:59 +08:00
Qiu Jian b2f4c667eb fix bugs 2018-12-26 22:59:59 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian f9d9617220 update fmt & doc 2018-12-26 22:52:25 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
Qiu Jian c70201b177 temp commit 
Conflicts:
	Gopkg.lock
	Gopkg.toml
	vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go
	vendor/yunion.io/x/structarg/structarg.go
 2018-12-26 22:44:03 +08:00
邱剑 7bc741d973 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '32095aa1e7385930598c9dfbc0aeb54c39839b40':
  修正：rbac每次获取policy失败后，会time.After两次回调
 2018-12-26 21:14:10 +08:00
Qiu Jian f489e67af6 修正：rbac每次获取policy失败后，会time.After两次回调 2018-12-26 18:50:31 +08:00
邱剑 da088e5999 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'fed631c9d6e296941a54fa4113fda2b8428718e9':
  在2.4把owner_allow的权限表示从allow改回owner
 2018-12-26 11:41:55 +08:00
Qiu Jian c7ac542061 在2.4把owner_allow的权限表示从allow改回owner 2018-12-26 11:39:58 +08:00
邱剑 d591107841 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0160435badff246450843911e38d971136b2e7fd':
  修正：可以通过SyncOnce方法强制刷新policy缓存
 2018-12-25 20:16:55 +08:00
Qiu Jian 957bc822ac 修正：可以通过SyncOnce方法强制刷新policy缓存 2018-12-25 20:13:31 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
邱剑 f10b31c0bd Merge pull request #834 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/client-session-add-ctx to release/2.4.0 
* commit '742a67b0f847813c5fa7245514330f44bbef0486':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 fd9861c4a4 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '53a03de0e9df3cbc762b6d4d26861f37ca9ce4b4':
  修正：policy默认采用json解码，只有climc才采用yaml
  minor updates
  fix admin resource list
  修正：由后端来确定一个资源是否是管理资源（无owner的资源）
 2018-12-24 23:34:31 +08:00
邱剑 53a03de0e9 Merge pull request #823 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-admin-resource-info to release/2.4.0 
* commit 'de2ecb6be7f9a1aff867c2cec09cf10a89f17572':
  修正：policy默认采用json解码，只有climc才采用yaml
  minor updates
  fix admin resource list
  修正：由后端来确定一个资源是否是管理资源（无owner的资源）
 2018-12-24 23:34:31 +08:00
Qiu Jian de2ecb6be7 修正：policy默认采用json解码，只有climc才采用yaml 2018-12-24 23:31:24 +08:00
邱剑 9b6ec1285b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5b562dcb0a07116a5f2d32d0ebddf3f0d02a779e':
  treewide: 重新组织cloudcommon options
  cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY
  appsrv: FetchStruct(): 使用jsonutils
 2018-12-24 12:54:24 +08:00
Qiu Jian 396fda7cf8 minor updates 2018-12-24 12:33:58 +08:00
Qiu Jian d83171906c fix admin resource list 2018-12-24 12:30:40 +08:00
Qiu Jian 7e423bc882 修正：由后端来确定一个资源是否是管理资源（无owner的资源） 2018-12-24 12:16:13 +08:00
Yousong Zhou 603e1be98c treewide: 重新组织cloudcommon options 
将cloudcommon.Options从cloudcommon.DBOptions中拿出来，并改名为CommonOptions
 2018-12-23 15:31:11 +00:00
Yousong Zhou cf639cf6dd cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY 2018-12-23 15:26:50 +00:00
邱剑 d1cb0e88ed Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '55e6c0c1f4a6c32c5c1b52d4e505b61c5f0746f8':
  minor fixes
  改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 将owner，admin统一为allow
 2018-12-22 16:45:59 +08:00
Qiu Jian 71a789f70e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-rbac-policy-test-single 2018-12-22 09:57:57 +08:00
Qiu Jian 3f758e193a minor fixes 2018-12-22 00:17:29 +08:00
邱剑 ec77b6928b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '09c830d67dc466a2ff86947e58af74ab6ca793e3':
  在rowsToArray中进行defer rows.Close()
  修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接 3. app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 22:14:46 +08:00
Qiu Jian cdec7fa2b7 改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 
将owner，admin统一为allow
 2018-12-21 22:02:04 +08:00
Qiu Jian a6b865e7a2 修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 
服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接
3.
app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 17:10:34 +08:00
周有松 65430a7d49 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '4d727c434842aaee2efdde7d6370dfc53ea70c72':
  appsrv: remove debug code
  appsrv: use copy() for copying slice
  appsrv: rewrite TestRadixMatchParams()
  appsrv: fix TestWorkerManagerError()
  appsrv: fix fmt verb
  appsrv: use RWMutex for rootLock
  cronman: 改正app context key appname拼写
 2018-12-20 10:28:30 +08:00
Yousong Zhou 537a590d69 cronman: 改正app context key appname拼写 2018-12-19 13:15:59 +00:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
Qiu Jian 739ef05c86 minor fixes 2018-12-14 00:00:56 +08:00