e1ec91fc58
Add event logs for pause/unpuase
...
Fixes #6856
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-08 15:27:44 -04:00
cafb1bfd76
Merge pull request #6878 from tianon/update-travis-github-username-regex
...
Update the Travis GitHub username regex to match the GitHub username requirements
2014-07-07 09:26:32 -06:00
2ffd13bc31
Merge pull request #6573 from mheon/ps_cleanup
...
Escape control and nonprintable characters in docker ps
2014-07-07 18:23:18 +03:00
07be572f8e
Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms
...
Fix the systemd socket activation socket permissions
2014-07-07 08:56:04 -06:00
e895817ad7
Update the Travis GitHub username regex to match the GitHub username requirements
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 08:36:31 -06:00
3589f5b9c2
Fix the systemd socket activation socket permissions
...
Fixes #6836
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 08:09:25 -06:00
323e6a3cf2
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
2014-07-07 11:16:55 +10:00
cf01997ebe
Merge pull request #6846 from irbull/master
...
Fix the parent/child relationship in the docs
2014-07-07 10:27:27 +10:00
2f649301e5
Merge pull request #6860 from felixrabe/patch-7
...
run.md: Fix references to cli
2014-07-07 09:37:42 +10:00
95870ef334
run.md: Fix references to cli
...
There are now no other occurrences of `#cli-` in this document.
TODO: Find other places with wrong links.
2014-07-06 14:47:37 +02:00
29a20672c2
Fix the parent/child relationship in the docs
...
In the Docker Linking Docs, the parent child relationship
was backwards. The Web container should be able to access
the DB, not other way around. Furthermore, the output of
'docker ps' was wrong (it showed that the DB could access
the Web). This fixes both typos.
Docker-DCO-1.1-Signed-off-by: Ian Bull <irbull@gmail.com> (github: irbull)
2014-07-05 13:58:09 -07:00
02ef9437d3
Merge pull request #6852 from Odaeus/patch-1
...
Fix "Error while reading file" in Fish completion
2014-07-04 08:11:12 -06:00
6ad5fe8659
Fix "Error while reading file" Fish completion
...
An unbalanced single quote caused Fish to fail to load the completion file with `source: Error while reading file “/etc/fish/completions/docker.fish”`.
Docker-DCO-1.1-Signed-off-by: Andrew France <andrew@avito.co.uk> (github: Odaeus)
2014-07-04 15:07:49 +01:00
44d737707c
Merge pull request #6771 from LK4D4/fix_containers_list_race
...
Add synchronization in server.Containers
2014-07-03 17:53:50 -07:00
0cdda85df2
Merge pull request #6801 from cpuguy83/remove_dup_run_tests
...
Remove dup tests
2014-07-03 18:30:58 -04:00
0a3abe33f0
Remove dup tests
...
integration/server_test.go/TestCreateNumberUsername == integration-cli/docker_cli_run_test.go/TestUserByID
integration/server_test.go/TestRmi == integration-cli/docker_cli_images_test.go/TestCLIImageTagRemove
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-03 17:35:03 -04:00
8f97a1778e
Merge pull request #6842 from mrorii/patch-1
...
doc fix: remove trailing *
2014-07-03 14:30:41 -07:00
6e4b37fffd
doc fix: remove trailing *
...
The trailing `*` makes it seem like there is some kind of annotation
2014-07-03 14:02:40 -07:00
5c246c931e
docs: add Groovy Docker-Client link
...
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> (github: gesellix)
2014-07-03 22:24:24 +02:00
700880ca16
Merge pull request #6838 from vieux/merge_release_v1.1.0
...
Merge release v1.1.0
2014-07-03 11:04:26 -07:00
d55cafb72e
Change version to 1.1.0-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-03 18:01:36 +00:00
b3191bf042
Merge remote-tracking branch 'origin/release'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-03 18:01:13 +00:00
4c52272a2d
Merge pull request #6818 from vieux/bump_v1.1.0
...
Bump v1.1.0
2014-07-03 10:57:44 -07:00
e11a714f7a
Merge pull request #6827 from SvenDowideit/docker-com-theme-regressions
...
Fix 2 docker.com theme regressions on docs.docker.com
2014-07-03 07:30:18 -04:00
873241790f
Fix 2 docker.com theme regressions on docs.docker.com
...
- Hover colours of doc nav wrong
- Primary Docs Nav not active when user is Logged in.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-02 21:19:48 -07:00
79812e3646
Bump version to v1.1.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-03 01:15:11 +00:00
6eda9f3207
Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess
...
missed these merge conflicts when manually rebasing too many files
2014-07-03 11:12:13 +10:00
f8d9ecfb2c
missed these merge conflicts when manually rebasing too many files
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-03 11:07:42 +10:00
9fe95f1c5b
Merge pull request #6824 from fredlf/1-1_release_notes
...
Added Release Notes
2014-07-03 10:45:11 +10:00
c3f4972f6d
Corrected version number to 3 digits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-02 17:41:52 -07:00
65e4b57fda
Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit
...
update release checklist and .gitignore
2014-07-03 10:36:52 +10:00
f746a48fe6
Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.com
...
some docker.io -. docker.com conversions
2014-07-02 17:34:31 -07:00
fa29b1f062
I'm going to wish I didn't do this
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-03 10:31:56 +10:00
2c32c195d9
Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md
...
update cli.md
2014-07-02 17:24:53 -07:00
b07f193822
Update cli.md and man pages to match current cli
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-03 10:22:20 +10:00
b59754bcb3
Fixed numerous inconsistencies in command help text
...
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: SvenDowideit)
2014-07-03 10:22:09 +10:00
d946cae364
Added Release Notes
...
Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to
other content to make it shorter.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-02 16:33:13 -07:00
170ba7f8fe
update release checklist and .gitignore
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-02 18:54:14 +00:00
8ea3589287
Merge pull request #6808 from vieux/pr_6806
...
Add backwards READ compatibility for the old libcontainer API
2014-07-02 10:51:27 -07:00
f357b18ee3
Merge pull request #6780 from unclejack/tweak_cli_integration_tests
...
Tweak cli integration tests
2014-07-02 13:16:26 -04:00
deb57c5144
Merge pull request #6763 from folieadrien/master
...
Migrate TestGetImagesHistory into unit and CLI test
2014-07-02 19:44:21 +03:00
292483531f
Merge pull request #6814 from tianon/more-init-ulimit
...
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
2014-07-02 10:08:11 -06:00
dad4768037
integcli: add & use pullImageIfNotExist for pulls
...
This speeds up the tag cli integration tests by about 20 seconds.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-02 18:45:11 +03:00
bae79c3e72
Add NOFILE and NPROC ulimit settings to the SysV init script
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-02 09:38:19 -06:00
7abe70c0b1
Add NOFILE and NPROC ulimit settings to the OpenRC init script
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-02 09:36:57 -06:00
d403936818
fix compilation and panic
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-02 00:54:08 +00:00
cccb64e863
Add backwards READ compatibility for the old libcontainer API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-02 00:19:05 +00:00
5ff18b8155
Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms
...
expand to 'used b2d vm on any of the platforms'
2014-07-01 16:09:38 -07:00
b0824edc7c
Merge pull request #6748 from LK4D4/increase_max_patricia_prefix
...
Increase max patricia prefix
2014-07-01 19:03:30 -04:00
96e2bfe28a
Merge pull request #6781 from anweiss/6738-dscarticle
...
Add Article for PowerShell DSC
2014-07-01 15:48:19 -07:00
Brian Goff
Tianon Gravi
unclejack
Sven Dowideit
Felix Rabe
Ian Bull
Andrew France
Victor Vieux
Tibor Vass
Fred Lifton
Naoki Orii
Tobias Gesellchen
Victor Vieux
James Turnbull
SvenDowideit
unclejack