Merge branch 'develop' into 'master'

Huawei · Jan 15, 2016 · af08b22 · af08b22
2 parents cade17c + 9e1c700
commit af08b22
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 607 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ Dockyard 0.5.0 is an incremental release with new features,bug fixes and new sup
 
 #### New features
 
-- New support for rkt image storage,support rkt fetch&pull,adapt to rkt 0.15.0 version and acpush pre-release version.
+- New support for ACI storage,support rkt fetch&push ACIs from Dockyard,adapt to rkt and acpush client.
 - New support for OSS that is a distributed replicated object store.See [OSS](oss/README.md) documentation.
 
 #### Bug fixes

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json