Commit Graph

2999 Commits

Author SHA1 Message Date
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
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
Nishant Totla 95f495b589
Fix typo in CONTRIBUTING.md
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-23 20:10:59 -07:00
Nishant Totla a8c8eb8080 Merge pull request #2159 from allencloud/fix-and-format-changelog
fix some typos and format CHANGELOG.md
2016-04-23 12:55:27 -07:00
Sun Hongliang 933ae477b6 fix some typos and format CHANGELOG.md
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-23 17:00:20 +08:00
Victor Vieux c882e5e5a7 rollback to Go 1.5.4
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-23 01:50:10 -07:00
Dongluo Chen 584e10c9f9 Merge pull request #2158 from dongluochen/bump-1.2.1rc1
bump 1.2.1-rc1
2016-04-22 22:07:54 -07:00
Dongluo Chen bf9e985d5b Merge pull request #2132 from nishanttotla/image-ops-engine-api
Moving last few image operations to engine-api
2016-04-22 22:05:02 -07:00
Dong Chen 7cca0cbcde Bump 1.2.1-rc1
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-04-22 17:57:33 -07:00
Alexandre Beslic af4474d250 Merge pull request #2086 from vieux/event_engine-api
use engine-api for events
2016-04-22 14:57:49 -07:00
Victor Vieux b352839605
@abronan's typo
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-22 14:17:32 -07:00
Victor Vieux a03b709728 fix rebase
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-22 13:49:12 -07:00
Nishant Totla 4d56ba5190
Moving last few image operations to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-22 13:47:51 -07:00
Victor Vieux a33d650edb Merge pull request #2156 from vieux/1.6.2
switch to go 1.6.2
2016-04-21 17:52:17 -07:00
Victor Vieux 7882873d0a switch to go 1.6.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-21 17:11:32 -07:00
Dongluo Chen 10106f3db5 Merge pull request #2101 from allencloud/return-err-when-assertion-fails-in-hijack
return an error when assertion fails in hijack
2016-04-21 17:05:52 -07:00
Alexandre Beslic cf9806004f Merge pull request #2126 from vieux/update_compose
update compose, remove useless bash and improve tests
2016-04-21 16:51:37 -07:00
Dongluo Chen d9beef7635 Merge pull request #2136 from doronp/Fix_Docs
Fix docs
2016-04-19 10:20:40 -07:00
Doron Podoleanu 7e119761d4 Fix docs
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-04-19 16:11:57 +03:00
Dongluo Chen 78bacff06a Merge pull request #2131 from jimmycmh/master
Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404
2016-04-15 19:25:40 -07:00
menghui.chen 4a54b63c42 Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404
Signed-off-by: menghui.chen <menghui.chen@alibaba-inc.com>
2016-04-15 19:32:29 +08:00
Sun Hongliang 4c90767e60 return an error when assertion fails in hijack
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-15 13:31:18 +08:00
Victor Vieux 7e69ac36aa Merge pull request #2120 from HackToday/fixtypo
Fix some typo
2016-04-14 22:26:55 -07:00
Victor Vieux a799f540a1 Merge pull request #2130 from atlassian/issue-2129
Teardown function needs to be declared before tests.
2016-04-14 22:11:44 -07:00
Otto Jongerius 5d66dd33a8 Teardown function needs to be declared before tests.
Signed-off-by: Otto Jongerius <ojongerius@atlassian.com>
2016-04-15 15:50:02 +12:00
Victor Vieux 622b509274 use engine-api for events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 18:11:40 -07:00
Victor Vieux ae7174fe4c godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 18:10:45 -07:00
Dongluo Chen 84a28a7de4 Merge pull request #2116 from MHBauer/volume-rm-race
volume rm integration test needs wait to avoid race
2016-04-14 17:47:30 -07:00
Kai Qiang Wu(Kennan) 7f5972124b Fix some typo
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-15 00:45:21 +00:00
Dongluo Chen a91c6e0159 Merge pull request #2128 from nishanttotla/container-ops-engine-api
Move container rename and remove to engine-api
2016-04-14 17:31:09 -07:00
Dongluo Chen a4dda5bc97 Merge pull request #2124 from vieux/vendor
move dependencies to vendor/
2016-04-14 17:12:48 -07:00
Dongluo Chen d807d97aea Merge pull request #2127 from nishanttotla/container-start
Moving start container to engine-api
2016-04-14 16:36:15 -07:00
Nishant Totla 3680a717a1
Move container rename and remove to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 16:00:36 -07:00
Nishant Totla 524f5ca79c
Moving start container to engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 15:08:39 -07:00
Victor Vieux ddd4aa2bf2 update compose, remove useless bash and improve test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 14:20:01 -07:00
Victor Vieux d006ef95f0 move dependencies to vendor/
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 13:25:16 -07:00
Nishant Totla 09deb06382 Merge pull request #2123 from vieux/migrate_go_16
bump to 1.6.1
2016-04-14 12:03:33 -07:00
Victor Vieux a764f9ac0a Merge pull request #1983 from nishanttotla/container-config-engine-api
Updating ContainerConfig to use engine-api
2016-04-14 11:48:51 -07:00
Victor Vieux d365b25558 bump to 1.6.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-14 11:41:05 -07:00