0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-10 21:37:56 +08:00
5c8e28ec7c
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
2015-04-10 05:46:42 -07:00
4ddc721f23
api_resize_test: fix a typo
...
s/cintainer/container
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-10 03:09:26 -04:00
296323cd6c
Merge pull request #12210 from tiborvass/carry-9916
...
Carry 9916: add comment column in docker history command
2015-04-10 00:02:00 -04:00
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-09 21:29:42 -04:00
8d682bf734
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:42 -04:00
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:41 -04:00
e690ad9292
Merge pull request #12256 from WiseTrem/remove_go1.2
...
Remove pools_nopool.go & build tag from pools.go
2015-04-09 18:25:09 -07:00
404f81011b
Merge pull request #12254 from runcom/remove-job-resize-execresize
...
Remove job from resize&execResize
2015-04-09 17:00:58 -07:00
02f6d7f98a
Merge pull request #12252 from kostickm/update-contributor-guide-docs
...
Docs cleanup - Contributor Guide
2015-04-09 16:54:08 -07:00
f01d755cd0
Remove pools_nopool.go & build tag from pools.go
...
Fix #11576
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
2015-04-10 02:32:55 +03:00
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-10 00:56:43 +02:00
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
8ad6031759
Merge pull request #12162 from daviddavis/README
...
Fixing up the README
2015-04-09 14:26:03 -07:00
e4addf1c01
Docs cleanup - Contributor Guide
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-09 14:20:03 -07:00
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
d66f868a83
Merge pull request #12247 from LK4D4/copy_no_engine
...
Removed engine from /copy
2015-04-09 14:09:00 -07:00
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 22:50:48 +02:00
dd4389fb19
Merge pull request #12109 from runcom/11625-fix-windows-test-build-cancellation
...
Fix TestBuildCancelationKillsSleep to not fail on Windows
2015-04-09 13:33:27 -07:00
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-09 13:05:31 -07:00
d38c90140b
Fix TestBuildCancelationKillsSleep to not fail on Windows
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 21:03:19 +02:00
6fb8bd0450
Merge pull request #12244 from calavera/fix_typo_in_dispatcher
...
Fix typo in builder/dispatchers.go
2015-04-09 11:51:43 -07:00
bbdf045ac1
Fix typo in builder/dispatchers.go
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-09 11:43:05 -07:00
b02cf5239e
Merge pull request #12115 from cpuguy83/fix_events_filter_test
...
Cleanup events filter by container test
2015-04-09 11:40:08 -07:00
c77ac8e29d
Merge pull request #12225 from chenhanxiao/commit-accent
...
docs: add missing accent mark around docker command
2015-04-09 11:34:07 -07:00
94fcded51b
Merge pull request #12208 from twhiteman/master
...
fix #12188 integration-cli: use "top" instead of "sleep" to avoid timeout
2015-04-09 14:30:43 -04:00
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
42d47c3136
fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
2015-04-09 10:46:57 -07:00
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 19:39:14 +02:00
2052d01b1e
Merge pull request #12240 from LK4D4/fix_attach
...
Fix regressions in attach
2015-04-09 13:34:18 -04:00
2b96bd0bb8
Merge pull request #11895 from liusdu/m
...
show the right image name in job log and docker ps
2015-04-09 10:21:07 -07:00
0fec3e19db
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-09 09:58:44 -07:00
db13cb7f98
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 18:46:24 +02:00
6b7e520aa3
Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
...
execdriver/lxc: use local rand.Random in test
2015-04-09 12:22:25 -04:00
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
f16d8db789
Merge pull request #12205 from ahmetalpbalkan/docs/remote-api-LogConfig-format
...
docs: Markdown format fix around LogConfig param
2015-04-09 09:17:24 -07:00
74b5c7b284
Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required
...
cli_info_test: Check all required fields
2015-04-09 09:07:54 -07:00
7dff1c15d2
Merge pull request #12223 from YanFeng-Adam/typo
...
Fix a typo in docker/daemon/execdriver/native/exec.go
2015-04-09 11:49:02 -04:00
ab11d60555
Fix a typo in docker/daemon/execdriver/native/exec.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-09 11:46:09 -04:00
8295bed3df
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
2015-04-09 08:28:48 -07:00
00fd226430
Merge pull request #12227 from HuKeping/rm-rename
...
Remove Job from rename
2015-04-09 11:27:14 -04:00
49c4de4aeb
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-10 01:52:55 +08:00
3ca46f29b8
Merge pull request #12232 from ahmetalpbalkan/names/kilby-joyce
...
namesgenerator: Proposing Kilby/Noyce
2015-04-09 11:25:19 -04:00
645c020f5a
fix up Image-name related issues in docker ps and CI
...
This patch include the following fixs:
- fix image name error when docker ps
- fix docker events test failure: use the exact image name for filter
- fix docker build CI test failure due to "docker events" change
Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-04-09 23:03:23 +08:00
7e70998bb8
Cleanup events filter by container test
...
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.
Added check to make sure the filtered events have the expected ID's.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-09 09:47:58 -04:00
197ec4a637
namesgenerator: Proposing Kilby/Noyce
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 04:11:06 -07:00
4c69d0dd8a
cli_info_test: Check all required fields
...
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.
If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 04:01:39 -07:00
809d99ad91
docs: add missing accent mark around docker command
...
As we did everywhere.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-09 04:37:23 -04:00
Brian Goff