Alexander Morozov
c9821d8dd6
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
2015-05-12 10:32:01 -07:00
Alexander Morozov
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
John Howard
b3bca3afc9
Windows: Start of daemon config refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 09:50:32 -07:00
Aanand Prasad
e0103ac0d4
Merge pull request #1405 from bfirsh/link-to-getting-started-guides-from-each-page
...
Link to getting started guides from each page
2015-05-12 14:40:53 +01:00
Sebastiaan van Stijn
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
Evan Hazlett
00a2f7781f
env: enable easier usage display
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-05-12 08:43:15 -04:00
Evan Hazlett
aec395502e
Merge pull request #1125 from hairyhenderson/ls-filter-1076
...
Adding --filter flag to ls command
2015-05-12 08:10:58 -04:00
Evan Hazlett
9c92fd934a
Merge pull request #1132 from ehazlett/provisioner-update-package-manager
...
provisioner: update metadata before install or upgrade
2015-05-12 08:09:04 -04:00
Evan Hazlett
68eaa5282d
Merge pull request #1152 from hairyhenderson/fix-cli-integration-tests
...
Fixing cli.bats tests
2015-05-12 08:08:20 -04:00
Ben Firshman
4d745ab87a
Link to getting started guides from each page
...
These are really hard to find.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-05-12 12:44:43 +01:00
Jörg Thalheim
2cb23527e4
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-12 13:06:41 +02:00
Qiang Huang
a8250a0b20
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-12 18:02:30 +08:00
Jeffrey Morgan
5c0dba6b07
Merge pull request #486 from kitematic/flux-1
...
Change architecture to Flux (containers)
2015-05-11 22:59:50 -07:00
Alexandre Beslic
8909dfda63
Fix zookeeper watch methods with key being formatted twice before given to GetRange
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-11 19:07:21 -07:00
Xian Chaobo
a72d37be2d
update api README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-11 21:37:45 -04:00
Alexandre Beslic
e039563c78
Fix zookeeper timeout value
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-11 18:23:40 -07:00
Sebastiaan van Stijn
a5007e5737
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
2015-05-11 21:20:44 -04:00
Alexandre Beslic
d333da5284
remove log info for default case in SetOptions
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-11 17:49:40 -07:00
Victor Vieux
52c3bb6a0e
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-11 17:39:21 -07:00
Alexandre Beslic
59e1e9b942
Change existing discovery backends to 'kv' using metatada storage backends in the store package
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-11 17:23:55 -07:00
Jeffrey Morgan
32f129c5bd
Error handling, updating state
2015-05-11 17:16:50 -07:00
Victor Vieux
38a1708e81
Merge pull request #754 from aluzzardi/jimmyxian-add-support-images-save
...
Add support images save
2015-05-11 17:16:36 -07:00
Phil Estes
95fcf76cc6
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-05-12 10:09:23 +10:00
Dave Henderson
a3c8b3474e
Adding --filter flag to ls command
...
Initially supporting `swarm=`, `state=`, and `driver=` filters.
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-05-11 20:01:50 -04:00
Andrea Luzzardi
dde47ee650
swarm IDs: Convert Swarm ID to Container ID in API Proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
b6a7c3d7f5
swarm ID: Remove backward compatibility.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
5c801d2c6a
swarm id: Handle compatibility.
...
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
b2fa060957
gitignore: Fix "swarm" pattern matching.
...
The pattern without slashes was conflicting with cluster/swarm:
```
$ git add cluster/swarm/cluster.go
The following paths are ignored by one of your .gitignore files:
cluster/swarm
Use -f if you really want to add them.
fatal: no files added
```
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
abfe5e6f4c
Add support for Swarm IDs.
...
- Every container that gets created through Swarm gets a Swarm ID
assigned (as a label).
- All API operations (start, stop, ...) can be performed by using either
the container ID or the swarm ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:07 -07:00
Andrea Luzzardi
c4c07c97ac
godeps: vendor dependency to docker/docker/pkg/stringid.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:07 -07:00
Andrea Luzzardi
054702fedc
container config: Add Swarm ID helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:56:07 -07:00
Tibor Vass
e7568ed227
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
2015-05-11 16:53:17 -07:00
Andrea Luzzardi
d88105dbfe
integration: minor cleanup of docker save multi-images
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:44:15 -07:00
Andrea Luzzardi
9e2863ec71
api: getImages: changed error message
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:44:15 -07:00
Andrea Luzzardi
7403991cac
API: Simplify getImages.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-11 16:44:15 -07:00
Xian Chaobo
42af0fadd7
fix var name and integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-11 16:44:15 -07:00
Xian Chaobo
3962f6ffdf
add-support-images-save
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-11 16:44:15 -07:00
Victor Vieux
5b3a03b852
Merge pull request #759 from aluzzardi/integration-race-fixes
...
integration: Fix API races related to delay in refresh.
2015-05-11 16:09:46 -07:00
Sven Dowideit
c49695f976
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
2015-05-12 09:07:55 +10:00
Sven Dowideit
c5e93d0950
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-11 23:07:22 +00:00
Andrea Luzzardi
abc5e4ebf1
Merge pull request #758 from chanwit/wait-for-zk-started
...
integration: wait for zookeeper to start
2015-05-11 15:44:59 -07:00
Andrea Luzzardi
7989a92161
Merge pull request #763 from snrism/etcd_discovery_test
...
etcd Integration test
2015-05-11 15:30:46 -07:00
John Howard
78604a9f3f
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-11 15:28:08 -07:00
Sriram Natarajan
e9f773f10f
Etcd Integration test
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com >
2015-05-11 21:53:16 +00:00
Stephen Day
1a829c8f51
Merge pull request #516 from burnettk/refer-to-correct-docs-directory
...
docs/spec: correct doc/spec to docs/spec everywhere
2015-05-11 14:45:58 -07:00
Sven Dowideit
34b9769538
Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
...
DHE 1.0.1 release
2015-05-12 07:34:30 +10:00
Stephen Day
f2954260a6
Merge pull request #515 from davidxia/fix-link
...
Fix broken ROADMAP link
2015-05-11 14:33:29 -07:00
Sven Dowideit
38af208da1
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-11 21:23:56 +00:00
Jessie Frazelle
a47fb5edca
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
2015-05-11 14:01:07 -07:00
Alexander Morozov
ca7219f5da
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-11 13:23:50 -07:00