1237e8ea97
Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go
...
Remove pkg/systemd/booted.go
Upstream-commit: b48b6de623cb45509e4cf45d3b5b1b5d29a7e9d9
Component: engine
2015-07-27 10:22:58 -07:00
e610dff696
Merge pull request #14971 from moxiegirl/man-page-carry-14637
...
Carry man page for the load command
Upstream-commit: 5329d28536c5b75a42d5cb54a5b21e1f8791e914
Component: engine
2015-07-27 10:18:44 -07:00
9093f9669d
Merge pull request #14981 from calavera/bump_api_version
...
Bump api version to 1.21.
Upstream-commit: 912bafcf3636ce1de242177a144c727e965b97be
Component: engine
2015-07-27 10:17:24 -07:00
64e4bbc853
Merge pull request #15009 from larchunix/devel
...
Fix docker-rm man page formatting
Upstream-commit: 35250b685ccd2f1632064a0cf106fd7f592514a4
Component: engine
2015-07-27 10:16:57 -07:00
ae24227f7b
Merge pull request #15028 from vbatts/typo
...
api/client/build: typo in error
Upstream-commit: c451d597f2abef42bd26212d18844a03c3773818
Component: engine
2015-07-27 10:13:05 -07:00
704cf2735f
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
Upstream-commit: e89aec0dfb2dd4a5decc11ea008f3ab179e8d5f8
Component: engine
2015-07-27 10:08:21 -07:00
56f08785e1
Merge pull request #14988 from ChanderG/master
...
Fix minor typo in Debian installation docs
Upstream-commit: f0f753d70aee870a1d5b2c5638b1ead108353100
Component: engine
2015-07-27 09:51:58 -07:00
a4c7971630
Bump api version to 1.21.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0eb88a0751365050cb177e16196622fd1d322efc
Component: engine
2015-07-27 09:48:47 -07:00
2f4d49931d
Merge pull request #14974 from duglin/BetterTrustErr
...
Show exact file being parsed on error.
Upstream-commit: b2930933c903c74644edc506bfc45989d470886e
Component: engine
2015-07-27 09:39:48 -07:00
af395c292f
Merge pull request #14917 from srust/14915-empty-hostconfig-on-create
...
Check for nil before using HostConfig to adjustCpuShares
Upstream-commit: ec8173b5171b7f7cd4816453bdf714fec8d22353
Component: engine
2015-07-27 09:38:32 -07:00
f054a3e5b4
Merge pull request #14786 from brahmaroutu/lint_image
...
image fix lint errors/warnings
Upstream-commit: ae5c8e3b69fbde82390f8665c0110896a90e14bc
Component: engine
2015-07-27 09:25:30 -07:00
d4728ca93c
Merge pull request #15007 from cles/arch-systemd-network-issue
...
Add arch install docs warning about systemd-network
Upstream-commit: 6c0c6b120ac4ea05301b584c3b84f7e875f542e6
Component: engine
2015-07-27 09:22:01 -07:00
264f05bb5c
Merge pull request #14987 from vdemeester/fix-cli-import-docs
...
Add missing documentation to cli/import.md
Upstream-commit: a65f7acbbf5e543c9389ff0497eb966fefc00f1d
Component: engine
2015-07-27 09:19:57 -07:00
7eed677896
*: s/direcotry/directory/g typo
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7b4e6fc47b5b4b25f74f12419005098478e16ce7
Component: engine
2015-07-27 11:29:28 -04:00
b62ae3048a
api/client/build: typo in error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0e697ebe6eddc02b0fd2f35bf7bb4557b068be18
Component: engine
2015-07-27 11:01:26 -04:00
d3974d0227
/image - fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b061572916c5bb959a24f8382b21429c9d81620c
Component: engine
2015-07-27 05:40:57 +00:00
74ff66528e
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
Upstream-commit: 39999edcc9c966b07f9f1826e5beef767b725a2f
Component: engine
2015-07-26 18:36:37 -07:00
defa38f468
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
Upstream-commit: 23b0fdc896fe300c3a63810f604ef3966560720a
Component: engine
2015-07-26 17:49:19 -07:00
dec1a0e3c4
Check for nil before using HostConfig to adjustCpuShares
...
Fix #14915 . Add unit test for #14915 .
Thanks @runcom for the test case: when the client calls 1.18 api
version w/o hostconfig it results in a nil pointer dereference.
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: c358a4cd3597ac330674c9d93b6038e8f455c8f7
Component: engine
2015-07-26 20:33:04 -04:00
b39a60e323
much improved wording for manual network config setup on arch install docs by @moxiegirl
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 26fa9b0d0d23700ba87aba7862fcf2baa5c26f1e
Component: engine
2015-07-26 19:11:27 +02:00
1e7a75140d
Add missing documentation to cli/import.md
...
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3101941120db54dde89933d76d3ea23c4bde0f7c
Component: engine
2015-07-26 18:39:42 +02:00
624235bebb
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
Upstream-commit: 7b552c7a3782d2cb8270c5c3ca05d7b34b1ea407
Component: engine
2015-07-26 10:53:07 -04:00
0fccf757d0
Format times in inspect command with a template as RFC3339Nano
...
In 1.6.2 we were decoding inspect API response into interface{}.
time.Time fields were JSON encoded as RFC3339Nano in the response
and when decoded into interface{} they were just strings so the inspect
template treated them as just strings.
From 1.7 we are decoding into types.ContainerJSON and when the template
gets executed it now gets a time.Time and it's formatted as
2015-07-22 05:02:38.091530369 +0000 UTC.
This patch brings back the old behavior by typing time.Time fields
as string so they gets formatted as they were encoded in JSON -- RCF3339Nano
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: c9207bc0aa57745876a3422d2cbc290be7c53da8
Component: engine
2015-07-26 15:25:08 +02:00
0560ee0b45
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: e1b57b2a87a763fc9fac5fbd59f64dcf1e541e7e
Component: engine
2015-07-26 13:27:35 +02:00
a41b93c9fb
Add arch install docs warning about systemd-network
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 6bd15a68cf59043e05bd69fccbafcfed25d7c22e
Component: engine
2015-07-26 13:27:07 +02:00
29208c0bdb
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
Upstream-commit: 5297a25b4eabb0bd6b76a09ea8f63d3e18329243
Component: engine
2015-07-26 13:03:45 +02:00
10ca606a3c
Fix typo in JSON config example, in the CLI documetation
...
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com >
Upstream-commit: 09a9958e22640e1bcfec1c0c274a8c42ebc88b4a
Component: engine
2015-07-26 12:09:31 +02:00
6591e5b614
Update faq.md
...
Fix case for PostgreSQL.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c6816dfc677a639361320274760d956eea200a29
Component: engine
2015-07-25 22:03:20 -07:00
f12a258842
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
Upstream-commit: b04dd6b7bc1fab74fd5854ae8aef3224fca9a178
Component: engine
2015-07-25 19:20:48 -07:00
eda33e0513
Fix docker-rm man page formatting
...
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com >
Upstream-commit: 93560496806c2f7fad273fe83d936c898bc7ab9e
Component: engine
2015-07-26 04:18:48 +02:00
a56deec7d3
Fix minor typo in Debian installation docs
...
Signed-off-by: Chander G <chandergovind@gmail.com >
Upstream-commit: ceeb22dc6e341da413926a5f972d54f5a3ca8715
Component: engine
2015-07-26 03:49:18 +05:30
3ff45b92dd
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
Upstream-commit: 6b2b6cb3fc1a047e701b7884d98c89338144fb0a
Component: engine
2015-07-25 23:25:48 +02:00
b1920b91e3
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a2ea8f2ad8b93c53253b9c86537dad95e14bd599
Component: engine
2015-07-25 14:04:39 -07:00
861b01ab9e
Fix go vet errors
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
Upstream-commit: 04f76b67c9f0a4559ef91e24873f51b81c81b957
Component: engine
2015-07-25 17:00:10 -04:00
869b9fcdec
Remove unused functions
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 0e69318b27e06d25e1d02736ab8c598547d8113a
Component: engine
2015-07-25 19:54:05 +02:00
f26f8b4a2b
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com >
Upstream-commit: 547d6c6656f161c3ad60c85ac0f19cf3d80571c7
Component: engine
2015-07-25 14:08:38 +02:00
ed5b93d380
Merge pull request #14720 from icecrime/14662_document_branches_tags
...
Document branches and tags
Upstream-commit: c051ed795347762fd53b3f9286c0f85402df5c42
Component: engine
2015-07-25 13:12:47 +02:00
7a78f67eef
Merge pull request #14941 from hqhq/hq_cli_remove_cleanup
...
Remove unnecessary container cleanup in integration-cli
Upstream-commit: 6b12d37cedc3c4c9287d1dcdb1fc831f46e49ee6
Component: engine
2015-07-24 20:38:15 -07:00
abb442b01d
Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName
...
Fix TestRunNonRootUserResolvName flackiness
Upstream-commit: afb831d35e62139c9e7a214a471c3dd956076223
Component: engine
2015-07-24 21:50:44 -04:00
32e08b641b
Merge pull request #14966 from mrjana/vendor18
...
Vendoring libnetwork
Upstream-commit: 5bdd4d0ec46ab071bbb633dde60b97b28911ade6
Component: engine
2015-07-24 17:58:23 -07:00
6a640c48bd
Fix TestRunNonRootUserResolvName flackiness
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 30d4c70d282248ac218c6c505d5a316e5cc9ac01
Component: engine
2015-07-25 02:45:17 +02:00
4f2862dc8f
Merge pull request #14546 from dmcgowan/trusted-notary-integration
...
Notary integration
Upstream-commit: 4f5b677fd9808b34382061c458e13d3930516889
Component: engine
2015-07-24 17:44:14 -07:00
d3667a22b6
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
Upstream-commit: 542685d856cad45b602e018baf36d7b268cbdfdc
Component: engine
2015-07-24 17:31:28 -07:00
2e3d5aed9b
Vendoring libnetwork
...
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 2ad81da856c123acf91eeff7ab607376bd27d9ba
Component: engine
2015-07-24 17:11:47 -07:00
b150028a1c
Document branches and tags
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e4c77b047d7b9e69b7d569b867f4dd314128feda
Component: engine
2015-07-24 16:56:30 -07:00
520269a284
Merge pull request #14935 from stevvooe/registry-moratorium
...
Impose moratorium on remote registry access
Upstream-commit: 78906612a2e2081a517ab0cbfe6cb4b7b7787911
Component: engine
2015-07-24 16:45:05 -07:00
6574e4057c
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
Upstream-commit: 935810bd20cca725d52c10ca7759353681af961e
Component: engine
2015-07-24 16:43:46 -07:00
61a71388a8
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3add7dcd48830060652554e7ae43d11881.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 94ab0d312fedaf063a6487c6b1b8b7b97221d24a
Component: engine
2015-07-24 16:35:51 -07:00
99a373ceb8
Rename to flags and environment variables to content trust
...
Update help line to allow 90 characters instead of 80
The trust flag pushes out the help description column wider, requiring more room to display help messages.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 259cadb0b19a9049302e78fec529b0105efabb1d
Component: engine
2015-07-24 16:31:18 -07:00
e5887c6923
Added tests for expired snapshots and timestamps
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: 3e90b12d42f6f937639edafa4b2ddc12badf8895
Component: engine
2015-07-24 16:31:18 -07:00
