Arnaud Porterie
693ff58cd2
Merge pull request #14758 from Microsoft/10662-pipestohcs
...
Windows: [TP3] new hcsshim stdin/out/err handling
2015-08-13 22:52:48 -07:00
David Calavera
54b50479af
Merge pull request #15065 from calavera/new_release_branch_workflow
...
Make the release process more atomic between major releases.
2015-08-13 16:10:11 -07:00
Jessie Frazelle
b93d99b25d
Merge pull request #15545 from LK4D4/refactor_pullv2
...
Refactoring of pullV2Tag
2015-08-13 15:52:14 -07:00
Jessie Frazelle
46d9fd6a11
Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
...
Tiny fix for rpm and deb descriptions
2015-08-13 15:04:50 -07:00
John Starks
ec5a73d18e
Windows: new hcsshim stdin/out/err handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-13 13:09:42 -07:00
Sebastiaan van Stijn
c6c195a465
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
2015-08-13 21:36:21 +02:00
Alexander Morozov
9b2426c606
Refactoring of pullV2Tag
...
* use downloadInfo pointers everywhere
* use downloads slice only for things that we really download
* cleanup tmp files in all cases
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-13 11:50:19 -07:00
Sebastiaan van Stijn
599b76000d
Merge pull request #15560 from docker/patch-bad-formatting
...
Fixing bad formatting reported by David via email
2015-08-13 20:26:05 +02:00
Jessie Frazelle
355f640d4d
Merge pull request #15559 from liusdu/liusdu-type
...
fix a typo in graph/graph.go
2015-08-13 09:33:00 -07:00
Jessie Frazelle
53812e51f4
Merge pull request #15563 from ankushagarwal/changelog
...
Add 1.8.1 CHANGELOG
2015-08-13 09:28:31 -07:00
Ankush Agarwal
4ac8fd98b3
Add 1.8.1 CHANGELOG
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-08-13 09:02:04 -07:00
Sebastiaan van Stijn
6b1b1ad31c
Merge pull request #15451 from liubin/liubin/fix-broken-link
...
fix broken link to wiki
2015-08-13 17:03:41 +02:00
moxiegirl
68a4beeba4
Merge pull request #15554 from HuKeping/docs-notary
...
Docs: some fix about notarysandbox
2015-08-13 07:47:35 -07:00
bin liu
f6753cd963
fix broken link to glossary page.
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-13 22:40:20 +08:00
moxiegirl
ef453f7118
Fixing bad formatting reported by David via email
...
Fixed and tested
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-13 06:42:26 -07:00
Liu Hua
883fcfe425
fix a typo in graph/graph.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-08-13 20:01:43 +08:00
Hu Keping
79aac6584d
Docs: some fix about notarysandbox
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-08-13 16:53:05 +08:00
Vincent Demeester
4fb88d2e11
Fix #8048 : make docker images repository:tag work
...
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.
Closes #8048 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-13 08:50:09 +02:00
moxiegirl
650feb29f1
Merge pull request #15541 from thaJeztah/hashtag-space
...
docs: fix fedora prerequisites heading
2015-08-12 19:33:38 -07:00
Jessie Frazelle
30cf473f26
Merge pull request #15543 from icecrime/15536_partial_manifest
...
Fix partial manifest push
2015-08-12 19:19:07 -07:00
Arnaud Porterie
72e55cb0ec
Merge pull request #15399 from Microsoft/10662-portmapping
...
Windows: [TP3] Enable NAT port mapping
2015-08-12 19:07:14 -07:00
Arnaud Porterie
697cdb8e2f
Update regression test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-12 18:46:55 -07:00
Arnaud Porterie
4f3b0d0f4a
Revert #14884
...
This reverts commit 810d3b2642 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-12 18:46:48 -07:00
Sebastiaan van Stijn
e26ee9a317
Merge pull request #15521 from albers/changelog-rollover
...
[Fix 15520] wrong feature description (rollover) in changelog
2015-08-13 02:17:42 +02:00
David Calavera
d50881e446
Merge pull request #15449 from albers/completion-help
...
Remove -h flag from completion and daemon reference
2015-08-12 17:09:51 -07:00
Sebastiaan van Stijn
2c18e1cd05
docs: fix fedora prerequisites heading
...
Fixes the prerequisites heading not being
rendered properly, because of a missing space.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-13 01:29:10 +02:00
John Howard
4393be7100
Windows: Enable NAT port mapping
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 13:17:27 -07:00
Alexander Morozov
d50d56b352
Merge pull request #15531 from Microsoft/10662-buildercommands
...
Windows: Error on unsupported builder command
2015-08-12 13:13:03 -07:00
Alexander Morozov
d8ff9ef2b5
Merge pull request #15504 from kolyshkin/zfs-nitpicks
...
zfs nitpicks
2015-08-12 11:54:35 -07:00
Jessie Frazelle
d3198fa8c4
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
2015-08-12 11:13:29 -07:00
John Howard
394ccfac07
Windows: Error on unsupported builder command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 10:02:23 -07:00
moxiegirl
8a0efadee1
Merge pull request #15450 from liubin/liubin/change-port-number-through-example
...
change port number through example context
2015-08-12 09:49:50 -07:00
Jessie Frazelle
e82358586d
Merge pull request #15183 from jfrazelle/test-install-script
...
add file to test install script
2015-08-12 09:49:35 -07:00
Harald Albers
967c50cfe9
Fix wrong feature description (rollover) in changelog
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:20:16 -07:00
Arnaud Porterie
dc945f5559
Merge pull request #15512 from moxiegirl/fix-links-checker
...
Fixes after release
2015-08-11 23:15:04 -07:00
Mary Anthony
8b09f8a302
Fixes after release
...
Adding in a link about the deprecated material
Fixing bad link to staging
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-11 23:13:14 -07:00
Kir Kolyshkin
15a232fd06
graphdriver/zfs: fix GetMetadata() comment
...
Commit e27c904 added a wrong and misleading comment
to GetMetadata(). Fix it using the wording from
commit 407a626 which introduced GetMetadata().
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-08-11 18:16:11 -07:00
Kir Kolyshkin
f5f7fee2ec
graphdriver/zfs: privatize mountPath and zfsPath
...
These functions are not part of the graphdriver.Driver
interface and should therefore be private.
Also, remove comments added by commit e27c904 as they are
* pretty obvious
* no longer required by golint
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-08-11 18:16:08 -07:00
Alexander Morozov
f5e2c6f14b
Merge pull request #15502 from mrunalp/fixup_comment
...
Fix incorrect comment
2015-08-11 16:53:23 -07:00
Mrunal Patel
d626f77e36
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-08-11 19:45:23 -04:00
Jessie Frazelle
13873e6841
Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
...
do not keep old debs for experimental
2015-08-11 16:35:55 -07:00
Jessica Frazelle
0eade329dc
fix oracle linux install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:33:14 -07:00
Jessica Frazelle
83416f68de
add file to test install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:31:58 -07:00
David Calavera
0e3674d7d0
Merge pull request #15485 from calavera/merge_release_v1.8.0
...
Bump version to 1.8.0 in master
2015-08-11 13:38:57 -05:00
David Calavera
a09ba62d18
Bump dev version to 1.9.0-dev
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:21:12 -05:00
David Calavera
e873686017
Bump version to 1.8.0
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:20:47 -05:00
David Calavera
bca8159174
Make the release process more atomic between major releases.
...
Rather than keeping a branch named "release" where we merge every release,
we want to keep "disposable" release branches for each release.
This will make much easier to create new major releases, since we always
want to start these releases from what we have in master. We create a
disposable release branch from master that we'll only use during the lifecycle
of the major release.
Once the release branch is created, the release captain will use a "bump" branch
in her own fork to cherry pick changes that will need to be applied to this
release. We'll track those changes in a pull request between the disposable release
branch and the bump branch.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:09:25 -05:00
David Calavera
3e596da9ea
Merge pull request #15474 from tonistiigi/network-ui-endpoints-windows
...
Mark network ui endpoints unix-only
2015-08-11 09:32:09 -05:00
Harald Albers
ceb11d9660
Remove -h flag from completion and daemon reference
...
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.
`-h` is not included in the help messages of the commands, though.
It ist visible in
* reference: only in `docker daemon` reference,
see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
see output of `grep -RF '**-h**' man`
For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-11 07:30:58 -07:00
Jessie Frazelle
beab255cc0
Merge pull request #15473 from jfrazelle/minor-cosmetic-change
...
minor cosmetic change to client output on pull
2015-08-10 23:20:05 -07:00