868d5dca74
Merge pull request #12844 from hqhq/hq_fix_inspect_format
...
fix a minor inspect format issue
2015-04-28 08:50:52 -07:00
67da055ceb
Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json
...
Fix undead containers
2015-04-28 08:11:40 -04:00
6ac481296d
Merge pull request #12723 from moxiegirl/carry-11296
...
Integrating Windows Testing Material
2015-04-28 04:56:17 -07:00
c7812f01c7
fix a minor inspect format issue
...
Before, inspect cont1 cont2 shows:
[{
xxx
}
,{
xxx
}
]
After, it shows:
[
{
xxx
}
,{
xxx
}
]
Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.
To get symmetry, above is our choice.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-28 18:51:04 +08:00
af8efab756
add initial docs for windows client testing
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
docs: crop and optimize images
Cropped and optimized images.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Testing and updating the Windows material
Signed-off-by: Mary Anthony <mary@docker.com>
checkpoint
Signed-off-by: Mary Anthony <mary@docker.com>
Fitting the Windows specific material into the contributor guide
Signed-off-by: Mary Anthony <mary@docker.com>
Entering James comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-27 21:21:53 -07:00
779939e334
Merge pull request #12817 from WeiZhang555/man
...
improve docker man page
2015-04-27 22:59:11 -04:00
aebeefa886
Merge pull request #12798 from dnephin/add_missing_docs_about_labels
...
Add missing API docs about filtering by label
2015-04-27 17:37:10 -07:00
9018f873c8
Merge pull request #12796 from moxiegirl/add-to-docs-maintainers
...
Adding James and theJeztah to the list
2015-04-27 16:32:15 -07:00
a07e963526
Merge pull request #11882 from hqhq/hq_warn_device_cg
...
add devices cgroup check as hard requirement
2015-04-27 18:42:57 -04:00
13895173eb
Merge pull request #12801 from thewtex/doc-test-ubuntu
...
Do Debian installation verification with hello-world image.
2015-04-27 15:09:25 -07:00
0153edcda1
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
2015-04-27 17:05:46 -04:00
62a85fe202
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
2015-04-27 17:02:27 -04:00
c3c08f76be
Fix undead containers
...
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-27 16:45:51 -04:00
3941623fbc
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
2015-04-27 13:35:08 -07:00
2f513db31d
Merge pull request #12719 from fntlnz/12675-test-events-emit
...
Parallelize TestEventsLimit
2015-04-27 16:02:33 -04:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
40779b28bb
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-04-27 21:14:00 +02:00
531ec3cac9
Merge pull request #12532 from ankushagarwal/eliminate-json-marshal
...
Eliminate json.Marshal from graph/export.go and volumes/volume.go
2015-04-27 13:54:20 -05:00
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
b6cfe7ca07
Do Debian installation verification with hello-world image.
...
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.
Signed-off-by: Matt McCormick <matt.mccormick@kitware.com>
2015-04-27 13:53:30 -04:00
f9c27bda1e
Merge pull request #12819 from Microsoft/10662-volumesrefactor
...
Windows: Refactor volumes
2015-04-27 10:25:41 -07:00
4ddd448490
Merge pull request #12793 from runcom/bye-unmarshal
...
Replace json.Unmarshal() with json.Decoder().Decode()
2015-04-27 13:19:43 -04:00
97b35bab81
Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows
...
Windows: Info no containerized check
2015-04-27 12:56:28 -04:00
ba1725a94e
Windows: Refactor volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-27 09:27:15 -07:00
6856c69c41
Merge pull request #12807 from jmzwcn/patch-2
...
Remove dead code from daemon/daemon.go
2015-04-27 12:10:30 -04:00
5305e675b5
Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws
...
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
2015-04-27 08:59:47 -07:00
9f684c8592
Merge pull request #12714 from noxiouz/fix_race_stats_collector
...
statsCollector: fix data race in run()
2015-04-27 10:57:56 -05:00
02d73d910f
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
2015-04-27 08:46:22 -07:00
ab97303cae
Windows: Info no containerized check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-27 08:38:01 -07:00
8ec22ae87d
Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall
...
remove useless http call from export
2015-04-27 11:33:13 -04:00
29f379ea6e
improve docker man page
...
fix issue #12708 :
"docker man page is misleading about format of commands"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-04-27 23:27:35 +08:00
8dc07af52f
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
2015-04-27 10:50:14 -04:00
325c0404c8
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
2015-04-27 10:42:40 -04:00
9e0ffae864
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-27 10:14:29 -04:00
f30d1c1835
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-04-27 14:57:37 +01:00
c7b2632dc8
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 13:56:55 +02:00
accbbfeae4
Remove dead code from daemon/daemon.go
...
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-04-27 15:50:47 +08:00
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-27 12:41:03 +08:00
cfd0f53b03
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-26 15:36:01 -04:00
6cba3109c2
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
2015-04-26 10:40:18 -07:00
ba79f0ca1f
Adding James and theJeztah to the list
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-26 10:32:43 -07:00
26543e0309
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-26 15:02:01 +02:00
92f4bd59ce
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
2015-04-25 20:33:55 -07:00
fefb836766
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
2015-04-25 17:01:10 -07:00
fa9299f4c0
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-04-25 15:01:05 -04:00
b5ccfca565
Merge pull request #12784 from duglin/RaceCommit
...
Fix race condition in API commit test
2015-04-25 10:03:03 -07:00
cd4f507b42
Fix race condition in API commit test
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-25 05:46:47 -07:00
bc149be69c
A fix for = in env values in linked containers
...
Closes : #12763
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-25 04:42:43 -07:00
8f752ffeaf
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-25 17:19:57 +08:00
2188c8d2f4
Fix documentation typo in articles/basics.md
...
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
2015-04-25 11:32:17 +03:00
Alexander Morozov
Phil Estes
moxiegirl
Qiang Huang
Jessica Frazelle
Sebastiaan van Stijn
Brian Goff
Tibor Vass
David Mackey
Antonio Murdaca
Lorenzo Fontana
Jessie Frazelle
Matt McCormick
David Calavera
John Howard
Zhang Wei
Doug Davis
Aidan Hobson Sayers
jmzwcn
He Simei
Daniel Nephin
Ed Costello
Doug Davis
Hu Keping
Sergey Alekseev