Граф коммитов

18246 Коммитов

Автор SHA1 Сообщение Дата
Antonio Murdaca 104d30f946 Merge pull request #16177 from HuKeping/leading-tab
Use TrimSpace to instead of Trim
2015-09-09 14:12:36 +02:00
Georgi Hristozov e514fabfac Linux 2.6.26 is now 7 years ago :)
Signed-off-by: Georgi Hristozov <georgi@forkbomb.nl>
2015-09-09 15:06:02 +03:00
Doug Davis 8ff67b9c1a Merge pull request #16176 from HuKeping/typo
Kind of typo
2015-09-09 07:37:37 -04:00
Hu Keping e9602f3561 Use TrimSpace to instead of Trim
String.Trim(string, " ") can only get ride of the blank, but actully we need
to remove all leading and trailing white space include "\t" for example.

Prior to this patch, one can login with "[Tab][Tab]username", and it will
not be consider as the same with "username".

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-09 19:37:33 +08:00
Sebastiaan van Stijn bab424aa34 Merge pull request #16170 from devmeyster/master
Minor formating changes
2015-09-09 13:11:56 +02:00
Hu Keping fd5c33194c Kind of typo
It seems the author foget to change the variable name after copying
from the valid testcase.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-09 19:03:53 +08:00
Vincent Demeester 1cca5ee98c Golint only on changed files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-09 09:37:47 +02:00
devmeyster f8308a4965 Minor formating changes
- Changed ";" to "." at the end of bullet points for consistency

Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
2015-09-09 00:21:22 -07:00
Sebastiaan van Stijn 6733962a2c Merge pull request #16165 from devmeyster/patch-1
Added periods at the end of bullet points for consistency
2015-09-09 08:32:34 +02:00
Artur Meyster 2022fa81ff Added periods at the end of bullet points for consistency
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
2015-09-08 23:17:10 -07:00
Brian Goff 9ca4aa4797 Merge pull request #15798 from calavera/volume_driver_host_config
Move VolumeDriver to HostConfig to make containers portable.
2015-09-08 22:05:40 -04:00
Brian Goff 8d27417bfe Ignore stat errors on volume rm.
Underlying volume data may have been removed by some other tool.
Ignore and remove the reference in this case.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-08 22:01:02 -04:00
Alexander Morozov a58aa9d889 Merge pull request #16157 from runcom/add-missing-err-check-integration-cli-run
integration-cli: add missing err check
2015-09-08 17:26:10 -07:00
Alexander Morozov 8845eb4345 Remove -lpthread and -ldl from ldflags
There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-08 17:01:14 -07:00
Brian Goff 4b4597ae17 Merge pull request #16158 from duglin/Issue16146
Add --help to "docker volume inspect --help" output
2015-09-08 19:50:22 -04:00
Brian Goff 25418010ef Merge pull request #16113 from Mashimiao/fix-bug-daemon-delete-link-remove
record the error of removing volumes when removing containers
2015-09-08 19:44:56 -04:00
David Calavera 51662df329 Merge pull request #16123 from albers/completion-volume
bash completion for `docker volume`
2015-09-08 16:21:49 -07:00
Jess Frazelle 634a848b8e Merge pull request #16096 from vdemeester/14756-final-golints
Final bits of enabling golint on the code base 🐹
2015-09-08 15:25:55 -07:00
David Calavera 5c22cb5741 Merge pull request #16148 from Microsoft/10662-fixlogging
Windows: Fix logging
2015-09-08 14:28:28 -07:00
David Calavera fd32c47112 Merge pull request #16151 from LK4D4/light_stats
Don't read CPU usage if there is no subscribers for stats
2015-09-08 14:26:54 -07:00
Doug Davis 87255b6721 Add --help to "docker volume inspect --help" output
Closes #16146

While in there, modified the testing infrastructure for the help text
so that we can get commands with nested commands - like "volume".

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-08 14:24:00 -07:00
Antonio Murdaca d5a705b600 integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-08 23:05:54 +02:00
Jess Frazelle 9fdb626bfb Merge pull request #16153 from calavera/missing_ps_placeholder
Add missing ps placeholder to the docs.
2015-09-08 13:42:10 -07:00
David Calavera 1666fbe287 Remove Steve Francia from maintainers.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-08 16:28:03 -04:00
David Calavera 914905f452 Add missing ps placeholder to the docs.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-08 16:12:26 -04:00
Vincent Demeester 0c70eb8381 Update validate-lint to find go files by itself
… and fixes the last bits that were missing :3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-08 22:07:42 +02:00
Sebastiaan van Stijn ab197f7ad2 Merge pull request #16053 from sallyom/man-docker-tag
man docker-tag minor fixup
2015-09-08 21:45:27 +02:00
John Howard 1d52c53eea Windows: Fix logging
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-08 12:18:50 -07:00
moxiegirl 1947ab6c1e Merge pull request #15368 from jengeb/docs-docker-start
[docs] Add instruction to start docker on Ubuntu
2015-09-08 11:59:13 -07:00
David Calavera 479fcbb1d0 Merge pull request #16088 from jfrazelle/better-canonical-json-package
replace canonical json package
2015-09-08 11:58:24 -07:00
Alexander Morozov c486a3a6dc Don't read CPU usage if there is no subscribers for stats
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-08 11:57:22 -07:00
Madhu Venugopal eb5c81e799 Merge pull request #16130 from aboch/vnd
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
2015-09-08 11:29:34 -07:00
Jess Frazelle 451f4d0d3b Merge pull request #16142 from cpuguy83/stats_pass_container
Don't lookup container 4 times for stats
2015-09-08 11:19:33 -07:00
Jess Frazelle 2b6da0a965 Merge pull request #16144 from albers/fix-volume-optional
[Fix 16122] usage for `docker volume inspect` and `docker volume rm`
2015-09-08 11:18:43 -07:00
Doug Davis 3fdfbd43b6 Merge pull request #16103 from HuKeping/format
Refactor some code to use simply format
2015-09-08 13:08:35 -04:00
Harald Albers 00eaa7e1f5 Fix usage for `docker volume inspect` and `docker volume rm`
For both commands, volume is _not_ optional. Several volumes may
be specified.
Both commands now use the same name (VOLUME) for the command argument.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-08 09:14:57 -07:00
Alessandro Boch 4d648f924a Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
+ Fix a couple of bugs introduced by previous vendoring:
  - in bitseq which prevents to use experimental overlay networking
  - in docker service ls cli o/p
+ Add missing http subrouter for newly introduced sandboxes
+ Fix fragmentation issue on vxlan header addition for overlay network driver
+ Remove libnetwork test code utilities from vendoring

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-08 07:36:35 -07:00
Brian Goff 3a539c6db9 Merge pull request #16098 from thaJeztah/fix-16095-reverse-dangling
Fix docker volume dangling filter
2015-09-08 10:17:07 -04:00
Brian Goff dc8a39036b Don't lookup container 4 times for stats
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-08 10:12:46 -04:00
Brian Goff 5f5d73d515 Merge pull request #14488 from HuKeping/fixstats
Fix connection block when using docker stats API
2015-09-08 10:01:11 -04:00
Brian Goff be7d346504 Merge pull request #16126 from calavera/remove_registry_circular_dep
Make RegistryConfig a typed value in the api.
2015-09-08 09:37:53 -04:00
Sebastiaan van Stijn 2968558f61 Merge pull request #16128 from duglin/TypoCP
Typo in cp.md
2015-09-08 08:14:20 +02:00
Alexander Morozov a8d6b033e1 Merge pull request #16094 from jfrazelle/bump-sqlite3
Bump sqlite3
2015-09-07 22:29:49 -07:00
Jessica Frazelle c045af8332 replace weird canonical json package with one that is rebased on the standard encoding/json package
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-07 18:51:33 -07:00
Jessica Frazelle 46df9e4ec3 update sqlite3 vendor with fix for static builds
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-07 18:50:56 -07:00
Doug Davis a14a31ed40 Typo in cp.md
Closes #16124

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-07 18:19:54 -07:00
Sven Dowideit 12058f3a75 Merge pull request #16064 from pachyderm/master
Add link to Pachyderm PFS volume driver plugin in plugins.md
2015-09-08 10:59:57 +10:00
David Calavera 719886d435 Make RegistryConfig a typed value in the api.
Remove possible circular dependency that prevented us from using a real
type.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-07 19:29:33 -04:00
Harald Albers 57ab4a1a6c bash completion for `docker volume`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-07 13:22:57 -07:00
Doug Davis 13d1f0c1a1 Merge pull request #16121 from albers/doc-volume-typo-1
Fix minor typo in volume create reference
2015-09-07 15:33:40 -04:00