0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17149 commits 14 branches 412 tags 338 MiB
Commit graph

17149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessie Frazelle
303345dc6a Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs 
daemon/graphdriver/btrfs fix lint errors/warnings
 2015-07-27 10:28:50 -07:00
Jessie Frazelle
70842ea942 Merge pull request #14899 from mountkin/fix-exec-resize-panic 
fix the panic caused by resizing a starting exec
 2015-07-27 10:27:29 -07:00
Jessie Frazelle
b48b6de623 Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go 
Remove pkg/systemd/booted.go
 2015-07-27 10:22:58 -07:00
Jessie Frazelle
5329d28536 Merge pull request #14971 from moxiegirl/man-page-carry-14637 
Carry man page for the load command
 2015-07-27 10:18:44 -07:00
Jessie Frazelle
912bafcf36 Merge pull request #14981 from calavera/bump_api_version 
Bump api version to 1.21.
 2015-07-27 10:17:24 -07:00
Jessie Frazelle
35250b685c Merge pull request #15009 from larchunix/devel 
Fix docker-rm man page formatting
 2015-07-27 10:16:57 -07:00
David Calavera
c451d597f2 Merge pull request #15028 from vbatts/typo 
api/client/build: typo in error
 2015-07-27 10:13:05 -07:00
David Calavera
e89aec0dfb Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano 
Format times in inspect command with a template as RFC3339Nano
 2015-07-27 10:08:21 -07:00
Jessie Frazelle
f0f753d70a Merge pull request #14988 from ChanderG/master 
Fix minor typo in Debian installation docs
 2015-07-27 09:51:58 -07:00
David Calavera
0eb88a0751 Bump api version to 1.21. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-27 09:48:47 -07:00
Alexander Morozov
b2930933c9 Merge pull request #14974 from duglin/BetterTrustErr 
Show exact file being parsed on error.
 2015-07-27 09:39:48 -07:00
Alexander Morozov
ec8173b517 Merge pull request #14917 from srust/14915-empty-hostconfig-on-create 
Check for nil before using HostConfig to adjustCpuShares
 2015-07-27 09:38:32 -07:00
Alexander Morozov
ae5c8e3b69 Merge pull request #14786 from brahmaroutu/lint_image 
image fix lint errors/warnings
 2015-07-27 09:25:30 -07:00
moxiegirl
6c0c6b120a Merge pull request #15007 from cles/arch-systemd-network-issue 
Add arch install docs warning about systemd-network
 2015-07-27 09:22:01 -07:00
moxiegirl
a65f7acbbf Merge pull request #14987 from vdemeester/fix-cli-import-docs 
Add missing documentation to cli/import.md
 2015-07-27 09:19:57 -07:00
Vincent Batts
7b4e6fc47b *: s/direcotry/directory/g typo 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-07-27 11:29:28 -04:00
Vincent Batts
0e697ebe6e api/client/build: typo in error 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-07-27 11:01:26 -04:00
root
b061572916 /image - fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-27 05:40:57 +00:00
Alexander Morozov
39999edcc9 Merge pull request #14992 from runcom/remove-unused-funcs 
Remove unused functions
 2015-07-26 18:36:37 -07:00
Jessie Frazelle
23b0fdc896 Merge pull request #14998 from jfrazelle/fix-systemd-debs 
fix deb packaging systemd files
 2015-07-26 17:49:19 -07:00
Stephen Rust
c358a4cd35 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>
 2015-07-26 20:33:04 -04:00
Oriol Francès
26fa9b0d0d much improved wording for manual network config setup on arch install docs by @moxiegirl 
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
 2015-07-26 19:11:27 +02:00
Vincent Demeester
3101941120 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>
 2015-07-26 18:39:42 +02:00
James Turnbull
77adf6abf1 Merge pull request #15012 from johnktims/patch-3 
Fix typo
 2015-07-26 11:04:17 -04:00
John Tims
7b552c7a37 Fix typo 
Signed-off-by: John Tims <john.k.tims@gmail.com>
 2015-07-26 10:53:07 -04:00
Antonio Murdaca
c9207bc0aa 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>
 2015-07-26 15:25:08 +02:00
Oriol Francès
e1b57b2a87 Change of wording, rearrange section ordering 
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
 2015-07-26 13:27:35 +02:00
Oriol Francès
6bd15a68cf Add arch install docs warning about systemd-network 
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
 2015-07-26 13:27:07 +02:00
Sebastiaan van Stijn
5297a25b4e Merge pull request #15004 from charleswhchan/patch-2 
Update faq.md
 2015-07-26 13:03:45 +02:00
Sebastiaan van Stijn
a059701fa5 Merge pull request #15006 from czerasz/patch-1 
Fix typo in JSON config example, in the CLI documetation
 2015-07-26 12:56:38 +02:00
Michał Czeraszkiewicz
09a9958e22 Fix typo in JSON config example, in the CLI documetation 
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com>
 2015-07-26 12:09:31 +02:00
Charles Chan
c6816dfc67 Update faq.md 
Fix case for PostgreSQL.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-07-25 22:03:20 -07:00
Arnaud Porterie
b04dd6b7bc Merge pull request #14996 from chrisseto/master 
Fix go vet errors
 2015-07-25 19:20:48 -07:00
Denis Ollier
9356049680 Fix docker-rm man page formatting 
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com>
 2015-07-26 04:18:48 +02:00
Chander G
ceeb22dc6e Fix minor typo in Debian installation docs 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-26 03:49:18 +05:30
Sebastiaan van Stijn
6b2b6cb3fc Merge pull request #14940 from coolljt0725/add_vxfs_magic_number 
Add VxFS magic number, fixes #14847
 2015-07-25 23:25:48 +02:00
Jessica Frazelle
a2ea8f2ad8 fix deb packaging systemd files 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-25 14:04:39 -07:00
Chris Seto
04f76b67c9 Fix go vet errors 
Signed-off-by: Chris Seto <chriskseto@gmail.com>
 2015-07-25 17:00:10 -04:00
Sebastiaan van Stijn
2d61de4625 Merge pull request #14245 from gs11/master 
Clarifications in usage
 2015-07-25 22:48:48 +02:00
Antonio Murdaca
0e69318b27 Remove unused functions 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-25 19:54:05 +02:00
gs11
547d6c6656 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>
 2015-07-25 14:08:38 +02:00
Sebastiaan van Stijn
c051ed7953 Merge pull request #14720 from icecrime/14662_document_branches_tags 
Document branches and tags
 2015-07-25 13:12:47 +02:00
Alexander Morozov
6b12d37ced Merge pull request #14941 from hqhq/hq_cli_remove_cleanup 
Remove unnecessary container cleanup in integration-cli
 2015-07-24 20:38:15 -07:00
Tibor Vass
afb831d35e Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName 
Fix TestRunNonRootUserResolvName flackiness
 2015-07-24 21:50:44 -04:00
Arnaud Porterie
5bdd4d0ec4 Merge pull request #14966 from mrjana/vendor18 
Vendoring libnetwork
 2015-07-24 17:58:23 -07:00
Antonio Murdaca
30d4c70d28 Fix TestRunNonRootUserResolvName flackiness 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-25 02:45:17 +02:00
Arnaud Porterie
4f5b677fd9 Merge pull request #14546 from dmcgowan/trusted-notary-integration 
Notary integration
 2015-07-24 17:44:14 -07:00
Arnaud Porterie
542685d856 Merge pull request #14976 from calavera/revert_unconfined_aa_policy 
Revert "Introduce a dedicated unconfined AA policy"
 2015-07-24 17:31:28 -07:00
Jana Radhakrishnan
2ad81da856 Vendoring libnetwork 
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-07-24 17:11:47 -07:00
Arnaud Porterie
e4c77b047d Document branches and tags 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-07-24 16:56:30 -07:00