1
0
mirror of https://github.com/docker/docs.git synced 2026-11-12 16:32:36 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Darren Shepherd
f2e5207fc9 Add --uts=host to allow sharing the UTS namespace
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-13 17:56:32 -07:00
Brian Goff
f2bc54f796 Merge pull request #13201 from Microsoft/10662-fixdebugtrap
Fix package on debugtrap_unsupported.go
2015-05-13 20:44:13 -04:00
Victor Vieux
f9b457f152 fix image.Match
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:36:08 -07:00
Victor Vieux
ac8c210384 Merge pull request #785 from vieux/fix_apiversion_case
APIVersion -> ApiVersion to match docker API
2015-05-13 17:27:19 -07:00
Nathan LeClaire
333b7e88a7 Implement docker-machine scp
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-13 17:22:42 -07:00
Andrea Luzzardi
e6d4a5733c Merge pull request #782 from abronan/fix_init_etcd
Call SyncCluster at etcd client initialization
2015-05-13 17:17:41 -07:00
Victor Vieux
b73f54def4 APIVersion -> ApiVersion to match docker API
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:12:16 -07:00
Alexandre Beslic
959bd0adbb Add call to SyncCluster at etcd client initialization
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-13 17:10:52 -07:00
Brian Goff
feb0fa8dbf Merge pull request #13112 from hqhq/hq_fix_oonkilldisable
Fix oom kill disable issue
2015-05-13 20:03:33 -04:00
Victor Vieux
0cf32ec0a5 Merge pull request #784 from vieux/fix_heartbeat
fix heartbeat default value
2015-05-13 16:50:15 -07:00
Victor Vieux
69bdf1a87b fix heartbeat default value
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 16:50:01 -07:00
Alexandre Beslic
2180a703cb Merge pull request #777 from aluzzardi/store-locks
store: Improved Lock support.
2015-05-13 16:45:29 -07:00
John Howard
1e78eec826 Fix package on debugtrap_unsupported.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-13 16:38:59 -07:00
Andrea Luzzardi
cde1550a13 Merge pull request #774 from vieux/cluster_opt
add --cluster-driver and --cluster-opt
2015-05-13 16:31:54 -07:00
Andrea Luzzardi
f4bd5834fa store: Improved Lock support.
- New interface: `store.CreateLock` returns a `Locker` interface with
  `Lock` and `Unlock` functions.
- Consul: New locking implementation leveraging helper lock
  implementation that comes with the go library.
- ZK: Lock support using the library helpers.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-13 16:15:19 -07:00
Antonio Murdaca
b37abf2528 Merge pull request #13146 from rajdeepd/dry-run-test-1
Modified Test Case to include check for Memory and MemorySwap
2015-05-14 01:10:35 +02:00
Alexandre Beslic
8e7447c040 Merge pull request #779 from vieux/watch_varargs
user varargs in store the watch callback
2015-05-13 15:49:55 -07:00
Victor Vieux
59cd11b946 change swarm.heartbeat to swarm.discovery.heartbeat
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:48:07 -07:00
Victor Vieux
0b45fa5154 user varargs in store the watch callback
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:42:44 -07:00
Victor Vieux
5db3a9cd0e remove options struct, yay!
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:36:30 -07:00
Alexander Morozov
64ea54c0ed Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
Minor typo: remove redundant dot in error message in runconfig/parse.go
2015-05-13 15:24:01 -07:00
Victor Vieux
54dfabd252 Merge pull request #778 from mavenugo/store
GetRange and WatchRange to return {key,value,index} tuple
2015-05-13 15:14:28 -07:00
Michael Crosby
677d76cd4a Update test for /sys mounting
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-13 15:02:53 -07:00
moxiegirl
32f8a40398 Merge pull request #13193 from moxiegirl/dhe-commercial-release
adding release note for 1.6.2
2015-05-13 14:51:50 -07:00
Alexander Morozov
31c8112285 Merge pull request #13194 from crosbymichael/merge_release_v1.6.2
Merge release 1.6.2
2015-05-13 14:01:40 -07:00
Michael Crosby
87c35d0e0a Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-13 13:55:26 -07:00
Mary Anthony
6c17b4818d adding release note for 1.6.2
Signed-off-by: Mary Anthony <mary@docker.com>

ugh, cut n paste

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-13 13:54:30 -07:00
Michael Crosby
cec64ebef8 Bump to version 1.6.2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	VERSION
2015-05-13 13:51:39 -07:00
Harald Albers
db5b4a2a69 respect -H in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-13 13:39:25 -07:00
Rajdeep Dua
1eea2c589d Modified Test Case to include check for Memory and MemorySwap
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
2015-05-13 13:39:07 -07:00
Evan Hazlett
37bfe3a1dd Merge pull request #1166 from ehazlett/amazonec2-instance-profile-env-var
amazonec2: instance profile env var
2015-05-13 16:36:28 -04:00
Alexander Morozov
877461bc20 Merge pull request #13190 from unclejack/precompile_regexp
Precompile regexp
2015-05-13 13:00:14 -07:00
David Calavera
3da0013ac4 Merge pull request #13155 from coolljt0725/fix_validate_tag_name
Fix validate tag name. Fix #13149
2015-05-13 12:03:22 -07:00
Michael Crosby
c46c8f4e40 Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase
Fix mangled hack/vendor.sh rebase
2015-05-13 12:02:07 -07:00
Evan Hazlett
cb6eb6bb77 amazonec2: instance profile env var
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-13 15:00:52 -04:00
Tianon Gravi
c2d6187811 Fix mangled hack/vendor.sh rebase
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-13 12:52:59 -06:00
unclejack
cb08c1173f pkg/stringid: precompile regexp
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 21:48:48 +03:00
unclejack
8f57e7d2ef image: precompile regexp
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 21:47:43 +03:00
Alexander Morozov
1b678f86b3 Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
integ-cli: Fix race in TestLogsSince
2015-05-13 11:35:17 -07:00
Jessie Frazelle
ebe9a85486 Merge pull request #13183 from runcom/fix-typo-tests-grouping
Fix typo to run tests grouped by RunUnprivileged
2015-05-13 11:33:14 -07:00
Madhu Venugopal
0130c2262d GetRange and WatchRange to return {key,value,index} tuple
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-13 11:24:03 -07:00
David Calavera
951c2ef2c9 Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
daemon: Logging drivers architectural refactoring
2015-05-13 11:00:50 -07:00
Evan Hazlett
29256e907c Merge pull request #1161 from nathanleclaire/cert_fixes
Fix a few issues with certs
2015-05-13 11:01:08 -04:00
Evan Hazlett
f29c5fc4dc Merge pull request #1086 from zchee/ec2-add-monitoring-flag
[EC2] Add Monitoring flag
2015-05-13 10:49:14 -04:00
Evan Hazlett
e999ebb824 Merge pull request #1129 from ehazlett/easier-env-display
env: enable easier usage display
2015-05-13 10:40:07 -04:00
Brian Goff
8eac7d0779 Merge pull request #13180 from unclejack/fix_test_name
integcli: change Dettach to Detach
2015-05-13 09:07:18 -04:00
Antonio Murdaca
a36f6a140b Fix typo to run tests grouped by RunUnprivileged
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 14:24:54 +02:00
unclejack
fdec5197f1 integcli: change Dettach to Detach
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 12:49:19 +03:00
Jeffrey Morgan
8cea67beed Merge pull request #494 from SvenDowideit/mention-installing-node.js
Add info about what the pre-requisites are
2015-05-12 23:31:45 -07:00
Lei Jitang
e00cfbb6f2 Fix invalid tag name
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-13 14:28:52 +08:00