Merge pull request #9 from qiniu/develop

Develop
qiniu · Nov 7, 2016 · e152309 · e152309
2 parents 968e7ba + fb2ad2a
commit e152309
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,10 @@
+# QINIU KIRK
 [![Qiniu Logo](http://open.qiniudn.com/logo.png)](http://qiniu.com/)
 
-# QINIU KIRK
-[![GoDoc](https://godoc.org/qiniupkg.com/kirk?status.svg)](https://godoc.org/qiniupkg.com/kirk)
+| branch | usage | status |
+| --- | --- | --- |
+| master | (default) stable version| [![Build Status](https://travis-ci.org/qiniu/kirk.svg?branch=master)](https://travis-ci.org/qiniu/kirk) [![GoDoc](https://godoc.org/qiniupkg.com/kirk?status.svg)](https://godoc.org/qiniupkg.com/kirk) |
+| develop | develop version | [![Build Status](https://travis-ci.org/qiniu/kirk.svg?branch=develop)](https://travis-ci.org/qiniu/kirk) |
 
 # 简介
 本 SDK 基于 golang 语言， 用于与 QINIU KIRK 通用计算平台 REST API 的编程交互，提供了在开发者业务服务器（服务端或客户端）管理七牛容器云资源的能力。

diff --git a/kirksdk/qcos_api.go b/kirksdk/qcos_api.go
@@ -374,6 +374,7 @@ type ServiceSpec struct {
 	StopGraceSec  int                `json:"stopGraceSec,omitempty"`
 	WorkDir       string             `json:"workDir,omitempty"`
 	UnitType      string             `json:"unitType,omitempty"`
+	GpuUUIDs      []string           `json:"gpuUUIDs,omitempty"` // do not use. prepare for gpu service
 }
 
 type LogCollectorSpec struct {
@@ -439,6 +440,7 @@ type ContainerInfo struct {
 	Stack      string                     `json:"stack"`
 	Status     Status                     `json:"status"`
 	Volumes    map[string]VolumeUsageInfo `json:"volumes,omitempty"`
+	GpuUUIDs   []string                   `json:"gpuUUIDs,omitempty"`
 	CreatedAt  time.Time                  `json:"createdAt"`
 	StartedAt  time.Time                  `json:"startedAt"`
 	FinishedAt time.Time                  `json:"finishedAt"`