docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,040 Commits 25 Branches 28 Tags 826 MiB
Commit Graph

3040 Commits

Author SHA1 Message Date
Nishant Totla 5bbecbc13b Merge pull request #2212 from nishanttotla/update-release-checklist 
Updating Release checklist
 2016-05-06 13:25:31 -07:00
Nishant Totla 54863df074
Updating Release checklist 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-05 18:22:04 -07:00
Nishant Totla 372ad21097 Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1 
Bump version to 1.2.2-rc1
 2016-05-05 17:49:03 -07:00
Nishant Totla 777964583f
Bump version to 1.2.2-rc1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-05 16:53:47 -07:00
Nishant Totla 502c00b150 Merge pull request #2210 from dongluochen/swarm_hang 
Do not allow double RLock() of RWMutex
 2016-05-05 16:37:50 -07:00
Dong Chen d6e6703e29 Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-05 10:45:34 -07:00
Dongluo Chen 5925814d84 Merge pull request #2180 from ogryzek/typo-edits 
Edit typos in 'Try Swarm at scale'
 2016-05-04 22:33:31 -07:00
Charles Smith 7ab56957a6 Merge pull request #1978 from troyfontaine/discovery_node_docs 
Added node discovery warning
 2016-05-04 19:12:37 -07:00
Dongluo Chen 9a968f5c5d Merge pull request #2207 from dongluochen/bump-1.2.1 
Bump version to v1.2.1
 2016-05-03 16:41:40 -07:00
Dong Chen 63418b2d63 Bump version to v1.2.1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-03 15:36:07 -07:00
Dongluo Chen b2de64872b Merge pull request #2205 from dongluochen/containerslots 
Containerslots
 2016-05-03 15:11:39 -07:00
Nishant Totla 31909bf847 Merge pull request #2200 from allencloud/use--cpu-shares-instead-of--c-since-deprecated 
use --cpu-shares instead of -c in integration test
 2016-05-03 14:44:49 -07:00
Dong Chen c4007e9507 Carry over pr/2137 with minor updates. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-03 14:29:38 -07:00
michael.freund 0ccc958b50 Filter for containerslots-label 
Signed-off-by: michael.freund <michael.freund@shopgate.com>
 2016-05-03 09:54:51 -07:00
Sun Hongliang 50be8f4802 use --cpu-shares instead of -c in integration test 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-04 00:12:58 +08:00
Charles Smith e8cb44fe81 Merge pull request #2072 from allencloud/update-docs-about-kernel-version 
update docs about kernel version support in production
 2016-05-02 20:50:26 -07:00
Nishant Totla 8cbb1b27a4 Merge pull request #2191 from dongluochen/testhang 
Update stats test to stop connection
 2016-05-02 13:32:04 -07:00
Dongluo Chen 1baec48803 Merge pull request #2199 from dongluochen/pstestfailure 
Fix api/ps tests
 2016-05-02 13:28:18 -07:00
Dong Chen 116748e7bc Fix api/ps tests. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-02 12:26:56 -07:00
Nishant Totla b69728a2c5 Merge pull request #2196 from allencloud/fix-typos 
fix typos in test and other files
 2016-05-01 16:54:33 -07:00
Sun Hongliang 6cd8a06c8f fix typos in test and other files 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-02 07:29:33 +08:00
Alexandre Beslic 2a722a4058 Merge pull request #2194 from allencloud/use-engineapi-to-replace-dockerclient 
use engine-api to replace dockerclient
 2016-04-30 15:43:08 -07:00
Sun Hongliang eafd9d658d use engine-api to replace dockerclient 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-01 00:14:00 +08:00
Dong Chen 92834d1fa1 Update stats test to stop connection 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-29 17:58:52 -07:00
Dongluo Chen 04b70bff15 Merge pull request #2154 from xianlubird/master 
Fix the bug that start container mess the host config
 2016-04-29 17:02:08 -07:00
Sebastiaan van Stijn 31fe6179ab Merge pull request #2185 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
 2016-04-30 01:05:26 +02:00
Alexandre Beslic dd90e08024 Merge pull request #2176 from allencloud/close-http-response-body-to-avoid-memory-leak 
close http response body to avoid potential memory leak
 2016-04-28 18:23:25 -07:00
Victor Vieux 9dd298589d Merge pull request #2177 from jimmyxian/add-support-ps-filter-volume 
add support ps --filter volume
 2016-04-28 17:59:44 -07:00
drew ogryzek d2c9f8bc9a Update Edits 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
drew ogryzek 354a71b4cf Edit typos in 'Try Swarm at scale' 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
Sven Dowideit 77e88346c5 convert docs Dockerfiles to use docs/base:oss 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-04-28 12:57:35 +00:00
xianlubird a3986cac05 Fix the bug that start container mess the host config 
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
 2016-04-28 10:32:41 +08:00
Victor Vieux c07a84529d Merge pull request #2175 from nishanttotla/remove-type-conversions 
Remove type unnecessary type conversion
 2016-04-27 18:09:51 -07:00
Dongluo Chen 797bdd5775 Merge pull request #2169 from allencloud/add-NodeID-in-docker-info 
add NodeID in docker info
 2016-04-27 13:08:12 -07:00
Xian Chaobo f39ac0e2c2 add support ps --filter volume 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2016-04-27 15:10:54 +08:00
Sun Hongliang b5a74ee875 close http response body to avoid potential memory leak 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 12:14:36 +08:00
Dongluo Chen d0bc1833d0 Merge pull request #2165 from nishanttotla/change-of-context 
Change context.TODO() to context.Background()
 2016-04-26 17:49:20 -07:00
Sun Hongliang 8cca29e9a9 add NodeID in docker info 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 08:30:30 +08:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-26 13:42:17 -07:00
Nishant Totla 5cb4faad2b Merge pull request #2171 from allencloud/add-return-when-getting-an-httpError 
return immediately when getting an httpError to avoid response mixture
 2016-04-26 13:07:20 -07:00
Alexandre Beslic 258e9d6752 Merge pull request #2173 from vieux/fix_tests 
fix swarm build in tests
 2016-04-26 11:19:52 -07:00
Victor Vieux ef7e2777a8
fix swarm build in tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-26 11:16:37 -07:00
Sun Hongliang 4d9e8dc42d return immediately when getting an httpError to avoid response mixture 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 01:00:10 +08:00
Nishant Totla 6998163ab1
Change context.TODO() to context.Background() 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-25 13:59:21 -07:00
Victor Vieux e19990d2f5 Merge pull request #2164 from vieux/rollback_to_1.5.4 
rollback to Go 1.5.4
 2016-04-25 13:57:53 -07:00
Alexandre Beslic 2044af6949 Merge pull request #2143 from allencloud/remove-empty-vendor-in-stretchr-testify 
remove empty vendor in stretchr testify
 2016-04-25 11:34:36 -07:00
Nishant Totla e4bab6cf07 Merge pull request #1942 from allencloud/api-response-status-code-comparison 
add documentation describing the difference in api response status code.
 2016-04-25 10:36:09 -07:00
Sun Hongliang 61e0ccd243 add documentation describing the difference in api response status code. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-26 01:21:23 +08:00
Alexandre Beslic 0524ead8da Merge pull request #2160 from nishanttotla/fix-typo-contributing 
Fix typo in CONTRIBUTING.md
 2016-04-24 16:04:40 -07:00
Sun Hongliang fa8b2737a1 remove empty vendor in stretchr testify 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-24 14:55:56 +08:00