b744bb23c3
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 >
Upstream-commit: e9602f3561b78313c4d474a8d950f7cc562637e8
Component: engine
2015-09-09 19:37:33 +08:00
b4c2d1f576
Merge pull request #16165 from devmeyster/patch-1
...
Added periods at the end of bullet points for consistency
Upstream-commit: 6733962a2ca66d3d4d58772c378981a9e7da0c15
Component: engine
2015-09-09 08:32:34 +02:00
787635e646
Added periods at the end of bullet points for consistency
...
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com >
Upstream-commit: 2022fa81fff0d9dc49045743e82a5838f82f8bb8
Component: engine
2015-09-08 23:17:10 -07:00
154c412ece
Merge pull request #15798 from calavera/volume_driver_host_config
...
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
5f33863cc9
Merge pull request #16157 from runcom/add-missing-err-check-integration-cli-run
...
integration-cli: add missing err check
Upstream-commit: a58aa9d8899c55d328fbfcdd8f61dd72b738fa52
Component: engine
2015-09-08 17:26:10 -07:00
ebd47f0636
Merge pull request #16158 from duglin/Issue16146
...
Add --help to "docker volume inspect --help" output
Upstream-commit: 4b4597ae17d4fd8843aa9367fd1aa790cc74f7f6
Component: engine
2015-09-08 19:50:22 -04:00
2272874ccb
Merge pull request #16113 from Mashimiao/fix-bug-daemon-delete-link-remove
...
record the error of removing volumes when removing containers
Upstream-commit: 25418010efc695e695e6f86352f5f535d2e0a3be
Component: engine
2015-09-08 19:44:56 -04:00
de7b6665f3
Merge pull request #16123 from albers/completion-volume
...
bash completion for `docker volume`
Upstream-commit: 51662df329863cf0b2d9ef432af333940b7326cc
Component: engine
2015-09-08 16:21:49 -07:00
22903b10c1
Merge pull request #16096 from vdemeester/14756-final-golints
...
Final bits of enabling golint on the code base 🐹
Upstream-commit: 634a848b8e3bdd8aed834559f3b2e0dfc7f5ae3a
Component: engine
2015-09-08 15:25:55 -07:00
da721c9eef
Merge pull request #16148 from Microsoft/10662-fixlogging
...
Windows: Fix logging
Upstream-commit: 5c22cb5741fc3897734ef375150a8e9a4925cb06
Component: engine
2015-09-08 14:28:28 -07:00
74847cecc0
Merge pull request #16151 from LK4D4/light_stats
...
Don't read CPU usage if there is no subscribers for stats
Upstream-commit: fd32c471121d7dfc80b64201a98c10acbb9419fc
Component: engine
2015-09-08 14:26:54 -07:00
d879adf33b
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 >
Upstream-commit: 87255b6721f4dc02ae34696f2013537fdc967a99
Component: engine
2015-09-08 14:24:00 -07:00
4bdf1be246
integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d5a705b60036b1a914486bf700546e26e75e9e9d
Component: engine
2015-09-08 23:05:54 +02:00
03dac92f8b
Merge pull request #16153 from calavera/missing_ps_placeholder
...
Add missing ps placeholder to the docs.
Upstream-commit: 9fdb626bfbd7fc2939582fff444bfbfbc7e0c645
Component: engine
2015-09-08 13:42:10 -07:00
fc4148454c
Add missing ps placeholder to the docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 914905f4526cbaf9e8b2179df42572ed8702e432
Component: engine
2015-09-08 16:12:26 -04:00
fcbe186c1d
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 >
Upstream-commit: 0c70eb83813af6d5266769bc908593f9660b13f1
Component: engine
2015-09-08 22:07:42 +02:00
693377fda5
Merge pull request #16053 from sallyom/man-docker-tag
...
man docker-tag minor fixup
Upstream-commit: ab197f7ad220b095696e94765a437750885a542f
Component: engine
2015-09-08 21:45:27 +02:00
364794e2fe
Windows: Fix logging
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1d52c53eea22e413a42856154cc21a9f92cd5117
Component: engine
2015-09-08 12:18:50 -07:00
516a0b9247
Merge pull request #15368 from jengeb/docs-docker-start
...
[docs] Add instruction to start docker on Ubuntu
Upstream-commit: 1947ab6c1ef7517ac5a66dd11e02809f8f1cdc85
Component: engine
2015-09-08 11:59:13 -07:00
67980cf0b7
Merge pull request #16088 from jfrazelle/better-canonical-json-package
...
replace canonical json package
Upstream-commit: 479fcbb1d042a02cfc9b2d30ba844c3fdbb01d73
Component: engine
2015-09-08 11:58:24 -07:00
13060be786
Don't read CPU usage if there is no subscribers for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c486a3a6dc960dd0e6f977865a43ae0117f1545d
Component: engine
2015-09-08 11:57:22 -07:00
6d655f6a79
Merge pull request #16130 from aboch/vnd
...
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
Upstream-commit: eb5c81e79980dd7fad211724adb27e42a3295a6c
Component: engine
2015-09-08 11:29:34 -07:00
8b42f11b4c
Merge pull request #16142 from cpuguy83/stats_pass_container
...
Don't lookup container 4 times for stats
Upstream-commit: 451f4d0d3b5708108807429d6795248871b175a8
Component: engine
2015-09-08 11:19:33 -07:00
acf61856ce
Merge pull request #16144 from albers/fix-volume-optional
...
[Fix 16122] usage for `docker volume inspect` and `docker volume rm`
Upstream-commit: 2b6da0a965f3f36e88e055266da41c82897188e6
Component: engine
2015-09-08 11:18:43 -07:00
83b7660b8b
Merge pull request #16103 from HuKeping/format
...
Refactor some code to use simply format
Upstream-commit: 3fdfbd43b671ff816979eac6397b0021f00a2800
Component: engine
2015-09-08 13:08:35 -04:00
c50d0a0555
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 >
Upstream-commit: 00eaa7e1f53d9100e95af80d8a05f8e77e380464
Component: engine
2015-09-08 09:14:57 -07:00
51f6d2a64b
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 >
Upstream-commit: 4d648f924af93b6429d566120a65cb441fee692a
Component: engine
2015-09-08 07:36:35 -07:00
1b5a4c8c22
Merge pull request #16098 from thaJeztah/fix-16095-reverse-dangling
...
Fix docker volume dangling filter
Upstream-commit: 3a539c6db9c1fdaf528731dd0af7e53d5ecf49cf
Component: engine
2015-09-08 10:17:07 -04:00
4a380ba714
Don't lookup container 4 times for stats
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dc8a39036b8c9da4c21c48f492cdbb795170bb21
Component: engine
2015-09-08 10:12:46 -04:00
c805d1d6a5
Merge pull request #14488 from HuKeping/fixstats
...
Fix connection block when using docker stats API
Upstream-commit: 5f5d73d51591ca0db893e53bddbe3bbd370624e2
Component: engine
2015-09-08 10:01:11 -04:00
186096a7be
Merge pull request #16126 from calavera/remove_registry_circular_dep
...
Make RegistryConfig a typed value in the api.
Upstream-commit: be7d346504a6995ccc9a69cf95d92b8fb3847a74
Component: engine
2015-09-08 09:37:53 -04:00
358509912f
Merge pull request #16128 from duglin/TypoCP
...
Typo in cp.md
Upstream-commit: 2968558f61844c9033b3c56ba8390087786e605a
Component: engine
2015-09-08 08:14:20 +02:00
8246d3e7c0
Merge pull request #16094 from jfrazelle/bump-sqlite3
...
Bump sqlite3
Upstream-commit: a8d6b033e177fe2028434b0146c8ea1b4c906e74
Component: engine
2015-09-07 22:29:49 -07:00
95ec865100
replace weird canonical json package with one that is rebased on the standard encoding/json package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c045af833218b326621131762e4873095550035f
Component: engine
2015-09-07 18:51:33 -07:00
d9ff9abe1f
update sqlite3 vendor with fix for static builds
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 46df9e4ec3453dd6f46261e0eeb276965af20880
Component: engine
2015-09-07 18:50:56 -07:00
e62da4815d
Typo in cp.md
...
Closes #16124
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a14a31ed408357535e6c0fdd5d0d21e51042ab1e
Component: engine
2015-09-07 18:19:54 -07:00
5ad1da9bcf
Merge pull request #16064 from pachyderm/master
...
Add link to Pachyderm PFS volume driver plugin in plugins.md
Upstream-commit: 12058f3a75cf4554229a7ec0f50393a829b3475b
Component: engine
2015-09-08 10:59:57 +10:00
f91e0804c7
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 >
Upstream-commit: 719886d4352cba3f2cd0092e052bb4cb67d51417
Component: engine
2015-09-07 19:29:33 -04:00
2de855c127
bash completion for docker volume
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 57ab4a1a6c0d2305ec273eb5ccdbf816144f839e
Component: engine
2015-09-07 13:22:57 -07:00
e0cf284e09
Merge pull request #16121 from albers/doc-volume-typo-1
...
Fix minor typo in volume create reference
Upstream-commit: 13d1f0c1a18a1addc46d8703967d8fbbd0339656
Component: engine
2015-09-07 15:33:40 -04:00
65a716fd85
Fix minor typo in docs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 45368779f86c2f0e78a6703bf64a0b149251b8b5
Component: engine
2015-09-07 21:16:47 +02:00
a525ed7c4d
Merge pull request #16120 from josegonzalez/patch-1
...
Transform comma into period
Upstream-commit: b1053a752667736aa41ee67a38f87ab9b7fe87ed
Component: engine
2015-09-07 14:05:03 -04:00
f5846f0768
Transform comma into period
...
This was probably meant as a separate sentence but is now
"proper english."
Signed-off-by: Jose Diaz-Gonzalez <jose@seatgeek.com >
Upstream-commit: be304ec688e080ae6fe4c58bcc7d0f662bb240dc
Component: engine
2015-09-07 13:56:20 -04:00
936e7392bc
Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust
...
before adjusting should check whether need return or not
Upstream-commit: c1c4ccefcdbb3cf8eb00c10b21e3f0aabc005b2a
Component: engine
2015-09-07 09:16:23 -07:00
cfca396ca7
record the error of removing volumes
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 49da0290309771891a2ea9238709bc5a248609c9
Component: engine
2015-09-07 16:38:05 +08:00
983ae0ad3d
Merge pull request #16111 from Mashimiao/fix-typo-daemon-daemon
...
daemon/daemon: fix typo
Upstream-commit: 6743a6e6658406a2d463b40e2e228bba08e5b16c
Component: engine
2015-09-07 09:31:54 +02:00
b9c2a00198
daemon/daemon: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 89f99343ff3df3cc5ac243a3a056f136885d012b
Component: engine
2015-09-07 14:43:22 +08:00
e97d8f4a03
before adjusting should check whether need return or not
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 73d8af9319cb3f6183d693a4abc0ef93dabf9b97
Component: engine
2015-09-07 11:09:39 +08:00
d57ee25057
move pachyderm PFS link above rex ray link in docs/extend/plugins.md
...
Signed-off-by: Peter Edge <peter.edge@gmail.com >
Upstream-commit: f4fb4796a10d6d69f02adcca3114849ea7ef6e23
Component: engine
2015-09-07 00:36:14 +02:00
6bc8a956a6
Add link to Pachyderm PFS volume driver plugin in plugins.md
...
Signed-off-by: Peter Edge <peter.edge@gmail.com >
Upstream-commit: 23b33aef1e6c42353b1c877cdfa109fbab95efa1
Component: engine
2015-09-07 00:36:03 +02:00
