Jeffrey Morgan
59643e1547
Merge pull request #768 from TeckniX/fix-tty
...
Fixed Tty and Stdin save
2015-07-06 12:39:29 -07:00
Doug Davis
4bb3c253e8
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-06 11:39:37 -07:00
Vincent Batts
c7492126ef
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
2015-07-06 14:07:33 -04:00
Ankush Agarwal
b0f7a1c62c
Removing .idea from .gitignore
...
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-06 10:41:38 -07:00
TeckniX
4339ba8195
Fixed Tty and Stdin save
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-07-06 13:02:38 -04:00
Michael Chiang
b5dff0f9b1
Creating readme.
2015-07-06 09:51:34 -07:00
Mazz Mosley
fc26982132
Add in memswap_limit run option
...
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-06 17:08:57 +01:00
Jeffrey Morgan
3496cd5b87
Initial OS X commit
2015-07-06 08:42:20 -07:00
Lars Kellogg-Stedman
a974789537
Update docker commit man page re: volumes
...
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.
Addresses comments in #7583
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
2015-07-06 10:16:21 -04:00
Aanand Prasad
e98caf5cf9
Show an error on 'run' when there are legacy one-off containers
...
Also warn the user about the one-off containers in the standard error
message about legacy containers.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-06 14:45:17 +01:00
Daniel Nephin
20218394b9
Merge pull request #1649 from albers/doc-completion-zsh
...
Mention zsh command completion in general install section
2015-07-06 06:41:09 -07:00
Aanand Prasad
fc8f564558
Merge pull request #1632 from mnowster/extends_file_default_behaviour
...
Extends file default behaviour and fixes circular reference bug
2015-07-06 13:28:54 +01:00
Aanand Prasad
0fa5808389
Merge pull request #1623 from mnowster/documentation-fixes
...
Documentation fixes
2015-07-06 13:25:56 +01:00
Diogo Mónica
3b75130e68
Merge pull request #27 from docker/create-keystore
...
Added a keyfilestore with encrypted PEM support
2015-07-05 22:47:56 -07:00
Diogo Monica
bddf2e1636
Fixing small nit
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-05 22:47:08 -07:00
Diogo Monica
d5cdeb93bb
Adding EncryptedFileStore and changing interfaces
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-05 21:02:16 -07:00
David Lawrence
06f2846561
fixing trailing comma in mysql
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-05 20:04:21 -07:00
Doug Davis
26a35dd09b
Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate
...
api/server: Add missing json check
2015-07-05 19:04:12 -04:00
Martin Schygulla
e7e68149e5
Enhanced driver for VMWare Fusion to support configuration data for cloud-init.
...
The userdata is injected into the VM as an ISO via the cdrom.
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com >
2015-07-06 00:44:59 +02:00
Harald Albers
2fc7cd6e03
Mention zsh command completion in general install section
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-05 19:18:24 +02:00
moxiegirl
78676e5dac
Merge pull request #1020 from fl0yd/patch-1
...
Update README.md
2015-07-05 07:25:35 -07:00
moxiegirl
21040254c4
Merge pull request #1024 from moxiegirl/add_id_install
...
Troubleshooting revealed need id if title is the same
2015-07-05 06:37:20 -07:00
Sebastiaan van Stijn
7fde07ea16
Merge pull request #14394 from moxiegirl/carry-pr-13361
...
Carries and closes 13361
2015-07-05 11:30:17 +02:00
Alexandre Beslic
814a8168ee
update libkv godeps, fix zookeeper discovery list
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-07-04 18:37:13 -07:00
Mary Anthony
2c5e044b59
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 18:12:52 -07:00
moxiegirl
7aa554c444
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
2015-07-04 16:30:17 -07:00
Diogo Monica
fd8471038c
Added a keyfilestore with encrypted PEM support
2015-07-04 12:17:54 -07:00
Sebastiaan van Stijn
57286aad25
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
2015-07-04 21:00:53 +02:00
James Turnbull
f240bb5e94
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
2015-07-04 14:57:00 -04:00
Mary Anthony
762214ccc8
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 07:32:58 -07:00
Mary Anthony
29ff252766
Troubleshooting revealed need id if title is the same
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-03 21:43:28 -07:00
David Lawrence
bce5930763
Merge pull request #25 from endophage/timestamp
...
adding timestamping and some general cleanup
2015-07-03 15:50:05 -07:00
David Lawrence
89379a728c
adding timestamping and some general cleanup
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-03 15:38:09 -07:00
Antonio Murdaca
36958ba49b
Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix
...
client/load: tiny typo fix
2015-07-04 00:24:21 +02:00
Antonio Murdaca
19e6de2654
Fix combined image events filters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-04 00:19:08 +02:00
Alexander Morozov
90bc5513a9
Merge pull request #14383 from runcom/runconfig-merge-cleanup
...
add break after key is found in for loop
2015-07-03 15:18:09 -07:00
Diogo Mónica
66aec225f2
Merge pull request #8 from docker/validate_root
...
validate root file against cert store
2015-07-03 14:23:25 -07:00
Diogo Monica
4c06233840
Fixed small nit
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-03 14:14:52 -07:00
Antonio Murdaca
a5be803458
Add break after key is found in for loop
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-03 20:37:34 +02:00
Sebastiaan van Stijn
bca32648f4
Merge pull request #14195 from ch3lo/master
...
update in Kitematic OS support
2015-07-03 18:05:27 +02:00
Marcelo Salazar
1b3bde47ef
update in Kitematic OS support
...
Kitematic now support Windows
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com >
2015-07-03 12:32:00 -03:00
Aanand Prasad
d90202399a
Merge pull request #1645 from dnephin/fix_up_race
...
Fix race condition in docker-compose up
2015-07-03 16:28:22 +01:00
Aanand Prasad
f42fd6a3ad
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
2015-07-03 16:25:53 +01:00
Yuan Sun
230179c8dc
add TestRunCapAddCHOWN test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-03 23:25:52 +08:00
Aanand Prasad
d85688892c
Merge pull request #1644 from aanand/fix-rm-bug
...
Stop 'rm' and 'ps' listing services not defined in the current file
2015-07-03 16:22:48 +01:00
Sebastiaan van Stijn
a89f4e36ab
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
2015-07-03 16:56:04 +02:00
Daniel Nephin
bd554a6fea
Fix race condition in docker-compose up.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-07-03 10:29:46 -04:00
Tristan Carel
515df52f19
Rewrite DockerHub group permissions documentation
...
On behalf of @moxiegirl
https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
2015-07-03 16:29:30 +02:00
Mazz Mosley
317bbec98c
Move make_service_dict out of config
...
This top level function is a test helper, so I've moved it into the
config_test file and updated accordingly.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-03 15:06:53 +01:00
Mazz Mosley
6e6dbdad95
working_dir is no longer optional
...
When building test data using make_service_dict, we need to include
working_dir as it is core to some of the functionality of
ServiceLoader.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-03 14:56:18 +01:00