Brian Goff
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
Ben Firshman
4926f8aef6
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
...
Fix vars in volume paths
2015-04-09 14:44:07 +01:00
Daniel Nephin
927115c3d4
Merge pull request #1271 from sdake/master
...
Remove stray print
2015-04-09 09:41:27 -04:00
Ahmet Alp Balkan
197ec4a637
namesgenerator: Proposing Kilby/Noyce
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 04:11:06 -07:00
Ahmet Alp Balkan
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
Ahmet Alp Balkan
a4b7a9e1e5
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 02:12:44 -07:00
Chen Hanxiao
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
Victor Vieux
76808b8509
Merge pull request #605 from jimmyxian/master
...
Update api README.md
2015-04-09 00:12:31 -07:00
WiseTrem
0fc75a3136
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
2015-04-09 09:13:16 +03:00
Xian Chaobo
6306fe3b64
Update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-09 10:44:28 +08:00
Doug Davis
d045b9776b
Remove Job from docker images
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-08 19:33:01 -07:00
Liu Hua
663d913011
Show the right image name/ID in job log
...
When we tag an Image with several names and we run one of them,
The "create" job will log this event with
+job log(create, containerID, Imagename).
And the "Imagename" is always the first one (sorted). It is the
same to "start/stop/rm" jobs. So use the correct name instand.
This PR refer to #10479
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-04-09 09:41:23 +08:00
Ahmet Alp Balkan
c2c45d7769
execdriver/lxc: use local rand.Random in test
...
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-08 18:13:07 -07:00
Brian Goff
91abff41dd
Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay
...
cleanup/fix integration-cli for overlay in overlay
2015-04-08 20:52:58 -04:00
Sriram Natarajan
b174aa26de
Change heartbeat type to unsigned int
...
Check if heartbeat value is greater than zero
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com >
2015-04-09 00:04:50 +00:00
Jessica Frazelle
255b84444a
cleanup/fix integration-cli for overlay in overlay
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-08 16:59:36 -07:00
Ahmet Alp Balkan
b66597eef1
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-08 16:16:37 -07:00
Tibor Vass
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-08 18:50:29 -04:00
Alexandre Beslic
caa5fd0351
Merge pull request #596 from vieux/fix_docker_inspect
...
fix node field in docker inspect
2015-04-08 14:12:16 -07:00
Victor Vieux
d1c41e0d43
fix node field in docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-04-08 14:09:57 -07:00
Yestin Sun
7bb4b055ab
Improve test accuracy for pkg/chrootarchive (part 1)
...
Check test correctness of untar by comparing destination with
source. For part one, it only compares the directories.
This is a supplement to the #11601 fix.
Signed-off-by: Yestin Sun <yestin.sun@polyera.com >
2015-04-08 14:07:31 -07:00
Arnaud Porterie
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
Michael Crosby
56a2c58760
Merge pull request #12194 from icecrime/update_maintainers
...
Drop shin from MAINTAINERS
2015-04-08 13:43:01 -07:00
Michael Crosby
66a68e378c
Merge pull request #12171 from cstivers78/patch-1
...
Proposing Seymour Cray
2015-04-08 13:42:13 -07:00
Arnaud Porterie
d0c1fba73e
Drop shin from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-08 13:31:42 -07:00
Jeffrey Morgan
1b8bff01cc
Update README.md
2015-04-08 16:26:20 -04:00
Chris Stivers
5206f76f44
Proposing Seymour Cray
...
Signed-off-by: Chris Stivers <chris@stivers.us >
2015-04-08 13:17:22 -07:00
Alexander Morozov
776b7e8559
Merge pull request #12191 from kostickm/12189-fix-json-tags
...
Fixing JSON Tags
2015-04-08 13:11:54 -07:00
Steven Dake
1d7247b67e
Remove stray print
...
A previous commit introduced a stray print operation. Remove it.
Signed-off-by: Steven Dake <stdake@cisco.com >
2015-04-08 12:49:37 -07:00
moxiegirl
57536d82e7
Merge pull request #12187 from moxiegirl/docs-makefile-update
...
Adding environment variables for sub projects
2015-04-08 12:48:09 -07:00
Anton Tiurin
2b4bbf1ef2
[SwarmCluster] Add RLock to Cluster.Pull
...
Use sync.WaitGroup (go-way) to wait for a collection
of pulling goroutines.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-08 22:30:23 +03:00
Anton Tiurin
b221baf4ed
[SwarmCluster] Add RLock to Cluster.hasEngine
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-08 22:25:54 +03:00
Mary Anthony
ef8b917fac
Adding environment variables for sub projects
...
Fixes issue #12186
Fixing variables per Jess
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-08 12:23:50 -07:00
Megan Kostick
88119bb276
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-08 12:05:12 -07:00
Dave Henderson
9f98a06cdb
Adding quotes to the suggested eval
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-08 13:48:26 -04:00
moxiegirl
26e83832c7
Merge pull request #11855 from nfirvine/master
...
Add some new graphics for mac installation with boot2docker
2015-04-08 10:41:50 -07:00
Doug Davis
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-08 10:30:17 -07:00
moxiegirl
ebc1e5ec9f
Merge pull request #12176 from YanFeng-Adam/typo
...
Fix a typo in /doc/sources/reference/run.md
2015-04-08 10:08:05 -07:00
David Davis
f9d323d712
Fixing up the README
...
Fixing some small issues I found in the README like missing punctuation,
trailing whitespace, etc.
Signed-off-by: David Davis <daviddavis@redhat.com >
2015-04-08 12:57:19 -04:00
Arnaud Porterie
b8a7fdade6
Merge pull request #12178 from fschindler/fix-typo
...
Fixing typo.
2015-04-08 09:10:53 -07:00
moxiegirl
254d6f7752
Merge pull request #12133 from xiaods/fixed-issue-11500
...
fixed #11500 Add tip about filter proxy
2015-04-08 09:09:54 -07:00
Arnaud Porterie
a6d39e2a2d
Merge pull request #12168 from cpuguy83/remove_dup_file_creation
...
Remove duplicate config file creation.
2015-04-08 09:03:43 -07:00
Evan Hazlett
ca19f14dcc
updated readme with driver contribution guidelines
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-04-08 11:42:50 -04:00
Alexander Morozov
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
Yan Feng
64fd944e30
Fix a typo in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-08 11:23:47 -04:00
Arnaud Porterie
94ade35e46
Merge pull request #12183 from runcom/remove-job-diff
...
Remove engine.Job from diff
2015-04-08 08:21:43 -07:00
Ben Firshman
a1cd00e3f0
Merge pull request #1251 from aanand/extends-guide
...
Add tutorial and reference for `extends`
2015-04-08 15:47:39 +01:00
Jeffrey Morgan
5884b9201b
Merge pull request #370 from kitematic/jeffdm-windows
...
Updating Windows Branch with latest changes
2015-04-08 10:20:43 -04:00
Antonio Murdaca
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-08 15:52:10 +02:00
Doug Davis
7cfe438151
Merge pull request #12132 from sunyuan3/d
...
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
2015-04-08 08:09:22 -04:00