From b027a3d6d21aca941148bf584b6b1b03f888b8d0 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Thu, 8 Aug 2019 14:42:09 -0400 Subject: [PATCH 001/160] Add notes about step 2 Signed-off-by: Traci Morrison --- ee/dtr/admin/install/index.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 07206b19ae..8b7b39e892 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -15,6 +15,11 @@ infrastructure meets the [system requirements](./system-requirements) that DTR n ## Step 2. Install UCP +>**Note:** Before installing UCP: +* UCP should be upgraded to the most recent version. +* UCP should be installed or upgraded to the most recent version before an initial install of DTR. +* Docker Engine should be updated to the most recent version before installing or updating UCP. + Since DTR requires Docker Universal Control Plane (UCP) to run, you need to [install UCP](/ee/ucp/admin/install/) on all the nodes where you plan to install DTR. From 0dd95b0bce0c56f8bfdc4474f0604583e30889e7 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Mon, 5 Aug 2019 08:41:53 -0700 Subject: [PATCH 002/160] Adding docker0 and docker_gwbridge information UCP plan-installation section --- ee/ucp/admin/install/plan-installation.md | 49 ++++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index bf1e1b404f..6a946d17b0 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -42,11 +42,56 @@ this. ## Avoid IP range conflicts +### Engine + +There are two IP ranges used by the engine for the `docker0` and `docker_gwbridge` interface: + +#### docker0 + +By default, the Docker creates and configures the host system with a network interface called `docker0`, which is an ethernet bridge device. If you don’t specify a different network when starting a container, the container is connected to the bridge and all traffic coming from and going to the container flows over the bridge to the Docker engine, which handles routing on behalf of the container. + +Docker configures `docker0` with a configurable IP range. Containers which are connected to the default bridge are allocated IP addresses within this range. Certain default settings apply to `docker` unless you specify otherwise. The default subnet for `docker0` is `172.17.0.0/16` and the default maximum transmission unit (`MTU`) is `1500` bytes. + +The recommended way configure the `docker0` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the `docker0` network: + +``` +{ + "bip": "172.17.0.1/16", + "fixed-cidr": "172.17.0.0/16", + "mtu": 1500 +} +``` + +`bip`: Supply a specific bridge IP range for the `docker0` interface, using standard CIDR notation. Default is `172.17.0.1/16`. + +`fixed-cidr`: Restrict the IP range for `docker0`, using standard CIDR notation. Default is `172.17.0.0/16`. +This range must be an IPv4 range for fixed IPs, and must be a subset of the bridge IP range (`bip` in `daemon.json`). For example, with `172.17.0.0/17`, IPs for your containers will be chosen from the first half of addresses(`172.17.0.1` - `172.17.127.254`) included in the `bip`(`172.17.0.0/16`) subnet. + +`mtu`: Set the maximum packet size in bytes for `docker0`. + +#### docker_gwbridge + + The `docker_gwbridge` is a virtual bridge that connects the overlay networks (including the `ingress` network) to an individual Docker engine's physical network. Docker creates it automatically when you initialize a swarm or join a Docker host to a swarm, but it is not a Docker device. It exists in the kernel of the Docker host. The default subnet for `docker_gwbridge` is `172.18.0.0/16`. + + If you need to customize its settings, you must do so before joining the Docker host to the swarm, or after temporarily removing the host from the swarm. The recommended way to configure the `docker_gwbridge` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the network: + + ``` + { + "default-address-pools": [ + {"base":"172.18.0.0/16","size":16} + ] + } + ``` + +`default-address-pools`: Set the default address pools for local node networks. + +### Swarm + Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-address-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md). > **Note**: Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be installed using this flag and UCP must be installed on top of it. -### Kubernetes IP Range Conflicts +### Kubernetes There are 2 internal IP ranges used within Kubernetes that may overlap and conflict with the underlying infrastructure: @@ -54,7 +99,7 @@ conflict with the underlying infrastructure: - The Pod Network - Each Pod in Kubernetes is given an IP address from either the Calico or Azure IPAM services. In a default installation Pods are given IP addresses on the `192.168.0.0/16` range. This can be customised at install - time using the `--pod-cidr` flag. + time using the `--pod-cidr` flag. - The Services Network - When a user exposes a Service in Kubernetes it is accesible via a VIP, this VIP comes from a Cluster IP Range. By default on UCP From 5fa99e3bf3361cea63a619b8dbdbed182694ab80 Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Tue, 13 Aug 2019 13:19:05 +0100 Subject: [PATCH 003/160] DDE changes for August patch --- ee/desktop/release-notes.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ee/desktop/release-notes.md b/ee/desktop/release-notes.md index 98df3e02ea..139dd76c4a 100644 --- a/ee/desktop/release-notes.md +++ b/ee/desktop/release-notes.md @@ -15,6 +15,17 @@ For information on system requirements, installation, and download, see: For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes). +## Version 2.1.0.3 +2019-08-21 + +### Upgrades + +Mac: [Hyperkit 0.20190802](https://github.com/moby/hyperkit/releases/tag/v0.20190802) + +### Bug fixes and minor changes + +Restricted the `cluster-admin` role on local Kubernetes cluster to `kube-system` namespace. + ## Version 2.1.0.2 2019-07-26 From 32cb0f7f9e777f220d2f2c2cd705fee011c0c1cb Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Tue, 13 Aug 2019 10:01:16 -0400 Subject: [PATCH 004/160] Additional edits --- ee/dtr/admin/install/index.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 8b7b39e892..653ee5abe1 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -15,8 +15,9 @@ infrastructure meets the [system requirements](./system-requirements) that DTR n ## Step 2. Install UCP ->**Note:** Before installing UCP: -* UCP should be upgraded to the most recent version. +>**Note:** Before installing DTR: + +* When upgrading, upgrade UCP before DTR for each major version. For example, if you are upgrading four major versions, upgrade one major version at a time, first UCP, then DTR, and then repeat for the remaining three versions. * UCP should be installed or upgraded to the most recent version before an initial install of DTR. * Docker Engine should be updated to the most recent version before installing or updating UCP. From e1038078bf9de8caece3128a690415fb141855c7 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Thu, 8 Aug 2019 14:42:09 -0400 Subject: [PATCH 005/160] Add notes about step 2 Signed-off-by: Traci Morrison --- ee/dtr/admin/install/index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 07206b19ae..653ee5abe1 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -15,6 +15,12 @@ infrastructure meets the [system requirements](./system-requirements) that DTR n ## Step 2. Install UCP +>**Note:** Before installing DTR: + +* When upgrading, upgrade UCP before DTR for each major version. For example, if you are upgrading four major versions, upgrade one major version at a time, first UCP, then DTR, and then repeat for the remaining three versions. +* UCP should be installed or upgraded to the most recent version before an initial install of DTR. +* Docker Engine should be updated to the most recent version before installing or updating UCP. + Since DTR requires Docker Universal Control Plane (UCP) to run, you need to [install UCP](/ee/ucp/admin/install/) on all the nodes where you plan to install DTR. From ab81d0e43b24fcecee37ab853edbc4bad9a8fe13 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Tue, 13 Aug 2019 07:52:23 -0700 Subject: [PATCH 006/160] Updates from review --- ee/ucp/admin/install/plan-installation.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 6a946d17b0..468dc0e566 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -45,14 +45,14 @@ this. ### Engine There are two IP ranges used by the engine for the `docker0` and `docker_gwbridge` interface: - + #### docker0 -By default, the Docker creates and configures the host system with a network interface called `docker0`, which is an ethernet bridge device. If you don’t specify a different network when starting a container, the container is connected to the bridge and all traffic coming from and going to the container flows over the bridge to the Docker engine, which handles routing on behalf of the container. +By default, the Docker engine creates and configures the host system with a network interface called `docker0`, which is an ethernet bridge device. If you don't specify a different network when starting a container, the container is connected to the bridge and all traffic coming from and going to the container flows over the bridge to the Docker engine, which handles routing on behalf of the container. -Docker configures `docker0` with a configurable IP range. Containers which are connected to the default bridge are allocated IP addresses within this range. Certain default settings apply to `docker` unless you specify otherwise. The default subnet for `docker0` is `172.17.0.0/16` and the default maximum transmission unit (`MTU`) is `1500` bytes. +Docker engine creates `docker0` with a configurable IP range. Containers which are connected to the default bridge are allocated IP addresses within this range. Certain default settings apply to `docker` unless you specify otherwise. The default subnet for `docker0` is `172.17.0.0/16` and the default maximum transmission unit (`MTU`) is `1500` bytes. -The recommended way configure the `docker0` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the `docker0` network: +The recommended way to configure the `docker0` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the `docker0` interface: ``` { @@ -73,7 +73,9 @@ This range must be an IPv4 range for fixed IPs, and must be a subset of the brid The `docker_gwbridge` is a virtual bridge that connects the overlay networks (including the `ingress` network) to an individual Docker engine's physical network. Docker creates it automatically when you initialize a swarm or join a Docker host to a swarm, but it is not a Docker device. It exists in the kernel of the Docker host. The default subnet for `docker_gwbridge` is `172.18.0.0/16`. - If you need to customize its settings, you must do so before joining the Docker host to the swarm, or after temporarily removing the host from the swarm. The recommended way to configure the `docker_gwbridge` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the network: + > **Note**: If you need to customize the `docker_gwbridge` settings, you must do so before joining the host to the swarm, or after temporarily removing the host from the swarm. + + The recommended way to configure the `docker_gwbridge` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the interface: ``` { @@ -87,7 +89,7 @@ This range must be an IPv4 range for fixed IPs, and must be a subset of the brid ### Swarm -Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-address-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md). +Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-address-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md). > **Note**: Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be installed using this flag and UCP must be installed on top of it. @@ -98,7 +100,7 @@ conflict with the underlying infrastructure: - The Pod Network - Each Pod in Kubernetes is given an IP address from either the Calico or Azure IPAM services. In a default installation Pods are given - IP addresses on the `192.168.0.0/16` range. This can be customised at install + IP addresses on the `192.168.0.0/16` range. This can be customized at install time using the `--pod-cidr` flag. - The Services Network - When a user exposes a Service in Kubernetes it is From 6e7614d3f5d8ad3035f7167a17b6c46c693f0095 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Tue, 13 Aug 2019 08:01:20 -0700 Subject: [PATCH 007/160] Cleaned up markdown --- ee/ucp/admin/install/plan-installation.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 468dc0e566..0bd4deca06 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -54,7 +54,7 @@ Docker engine creates `docker0` with a configurable IP range. Containers which a The recommended way to configure the `docker0` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the `docker0` interface: -``` +```json { "bip": "172.17.0.1/16", "fixed-cidr": "172.17.0.0/16", @@ -77,7 +77,7 @@ This range must be an IPv4 range for fixed IPs, and must be a subset of the brid The recommended way to configure the `docker_gwbridge` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the interface: - ``` + ```json { "default-address-pools": [ {"base":"172.18.0.0/16","size":16} @@ -98,13 +98,13 @@ Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If t There are 2 internal IP ranges used within Kubernetes that may overlap and conflict with the underlying infrastructure: -- The Pod Network - Each Pod in Kubernetes is given an IP address from either +* The Pod Network - Each Pod in Kubernetes is given an IP address from either the Calico or Azure IPAM services. In a default installation Pods are given IP addresses on the `192.168.0.0/16` range. This can be customized at install time using the `--pod-cidr` flag. -- The Services Network - When a user exposes a Service in Kubernetes it is - accesible via a VIP, this VIP comes from a Cluster IP Range. By default on UCP +* The Services Network - When a user exposes a Service in Kubernetes it is + accessible via a VIP, this VIP comes from a Cluster IP Range. By default on UCP this range is `10.96.0.0/16`. From UCP 3.1.8 and onwards this value can be changed at install time with the `--service-cluster-ip-range` flag. @@ -143,8 +143,8 @@ DTR, your load balancer needs to distinguish traffic between the two by IP address or port number. * If you want to configure your load balancer to listen on port 443: - * Use one load balancer for UCP and another for DTR, - * Use the same load balancer with multiple virtual IPs. + * Use one load balancer for UCP and another for DTR, + * Use the same load balancer with multiple virtual IPs. * Configure your load balancer to expose UCP or DTR on a port other than 443. If you want to install UCP in a high-availability configuration that uses @@ -180,6 +180,6 @@ manager nodes joining the cluster or being promoted to a manager role. ## Where to go next -- [System requirements](system-requirements.md) -- [Install UCP](index.md) +* [System requirements](system-requirements.md) +* [Install UCP](index.md) From 869bdc2680e36bcff64904f6fb29f7bb6d248948 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Sun, 18 Aug 2019 19:57:15 +0200 Subject: [PATCH 008/160] [sec] nginx/compose: Drop aforementioned loophole --- registry/recipes/nginx.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/registry/recipes/nginx.md b/registry/recipes/nginx.md index 07ed4b62be..b3f85ea9f1 100644 --- a/registry/recipes/nginx.md +++ b/registry/recipes/nginx.md @@ -181,8 +181,6 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow registry: image: registry:2 - ports: - - 127.0.0.1:5000:5000 volumes: - ./data:/var/lib/registry ``` From a929f43fc098c6febf4fc97fc559e7eb6005756c Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Mon, 19 Aug 2019 08:48:42 -0400 Subject: [PATCH 009/160] Add pre-logon message info --- ee/ucp/admin/configure/ucp-configuration-file.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index 3601a45fa5..fbb2cf9b7e 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -234,3 +234,10 @@ Configures iSCSI options for UCP. | `--storage-iscsi=true` | no | Enables iSCSI based Persistent Volumes in Kubernetes. Default value is `false`. | | `--iscsiadm-path=` | no | Specifies the path of the iscsiadm binary on the host. Default value is `/usr/sbin/iscsiadm`. | | `--iscsidb-path=` | no | specifies the path of the iscsi database on the host. Default value is `/etc/iscsi`. | + +### pre_logon_message + +Configures a pre-logon message. +| Parameter | Required | Description | +|:------------------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `pre_logon_message` | no | Sets pre-logon message to alert users before they proceed with login. | \ No newline at end of file From e9159dc1479b66690759404eb175849630fbcd55 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Mon, 19 Aug 2019 09:13:14 -0400 Subject: [PATCH 010/160] Another edit --- ee/ucp/admin/configure/ucp-configuration-file.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index fbb2cf9b7e..5f44a9eabb 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -236,8 +236,7 @@ Configures iSCSI options for UCP. | `--iscsidb-path=` | no | specifies the path of the iscsi database on the host. Default value is `/etc/iscsi`. | ### pre_logon_message - Configures a pre-logon message. | Parameter | Required | Description | |:------------------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `pre_logon_message` | no | Sets pre-logon message to alert users before they proceed with login. | \ No newline at end of file +| `pre_logon_message` | no | Sets pre-logon message to alert users before they proceed with login. | From 9e5971598fcc59383925e7ac096cba37cfc9bd6a Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Mon, 19 Aug 2019 11:07:58 -0400 Subject: [PATCH 011/160] Fix spacing issue with pre-logon message --- ee/ucp/admin/configure/ucp-configuration-file.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index 5f44a9eabb..5347c56a99 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -237,6 +237,7 @@ Configures iSCSI options for UCP. ### pre_logon_message Configures a pre-logon message. + | Parameter | Required | Description | |:------------------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `pre_logon_message` | no | Sets pre-logon message to alert users before they proceed with login. | From 59fe504b3fbf7b0ea77a34233ef57656ca4becd9 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Mon, 19 Aug 2019 10:08:21 -0700 Subject: [PATCH 012/160] Made updates based on customer feedback --- ee/ucp/admin/install/plan-installation.md | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 0bd4deca06..1c9ea51193 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -42,6 +42,12 @@ this. ## Avoid IP range conflicts +Engine `fixed-cidr` - CIDR range for `docker0` interface and local containers, default `172.17.0.0/16`. +Engine `default-address-pools` - CIDR range for `docker_gwbridge` interface and bridge networks, default `172.18.0.0/16`. +Swarm `default-addr-pool` - CIDR range for Swarm overlay networks, default `10.0.0.0/8`. +Kubernetes `pod-cidr` - CIDR range for Kubernetes pods, default `192.168.0.0/16`. +Kubernetes `service-cluster-ip-range` - CIDR range for Kubernetes services + ### Engine There are two IP ranges used by the engine for the `docker0` and `docker_gwbridge` interface: @@ -50,7 +56,7 @@ There are two IP ranges used by the engine for the `docker0` and `docker_gwbridg By default, the Docker engine creates and configures the host system with a network interface called `docker0`, which is an ethernet bridge device. If you don't specify a different network when starting a container, the container is connected to the bridge and all traffic coming from and going to the container flows over the bridge to the Docker engine, which handles routing on behalf of the container. -Docker engine creates `docker0` with a configurable IP range. Containers which are connected to the default bridge are allocated IP addresses within this range. Certain default settings apply to `docker` unless you specify otherwise. The default subnet for `docker0` is `172.17.0.0/16` and the default maximum transmission unit (`MTU`) is `1500` bytes. +Docker engine creates `docker0` with a configurable IP range. Containers which are connected to the default bridge are allocated IP addresses within this range. Certain default settings apply to `docker` unless you specify otherwise. The default subnet for `docker0` is `172.17.0.0/16`. The recommended way to configure the `docker0` settings is to use the `daemon.json` file. You can specify one or more of the following settings to configure the `docker0` interface: @@ -58,7 +64,6 @@ The recommended way to configure the `docker0` settings is to use the `daemon.js { "bip": "172.17.0.1/16", "fixed-cidr": "172.17.0.0/16", - "mtu": 1500 } ``` @@ -67,8 +72,6 @@ The recommended way to configure the `docker0` settings is to use the `daemon.js `fixed-cidr`: Restrict the IP range for `docker0`, using standard CIDR notation. Default is `172.17.0.0/16`. This range must be an IPv4 range for fixed IPs, and must be a subset of the bridge IP range (`bip` in `daemon.json`). For example, with `172.17.0.0/17`, IPs for your containers will be chosen from the first half of addresses(`172.17.0.1` - `172.17.127.254`) included in the `bip`(`172.17.0.0/16`) subnet. -`mtu`: Set the maximum packet size in bytes for `docker0`. - #### docker_gwbridge The `docker_gwbridge` is a virtual bridge that connects the overlay networks (including the `ingress` network) to an individual Docker engine's physical network. Docker creates it automatically when you initialize a swarm or join a Docker host to a swarm, but it is not a Docker device. It exists in the kernel of the Docker host. The default subnet for `docker_gwbridge` is `172.18.0.0/16`. @@ -80,18 +83,25 @@ This range must be an IPv4 range for fixed IPs, and must be a subset of the brid ```json { "default-address-pools": [ - {"base":"172.18.0.0/16","size":16} + {"base":"172.18.0.0/16","size":24}, + {"base":"###.###.###.###/##","size":##} ] } ``` -`default-address-pools`: Set the default address pools for local node networks. +`default-address-pools`: A list of IP address pools for local bridge networks, the default is a single pool `{"base":"172.18.0.0/16","size":24}`. This allocates `/24` network from the `172.18.0.0/16` CIDR range for local bridge networks. Each entry in the list contain the following: + +`base`: CIDR range to be divided up for bridge networks, the default is `172.18.0.0/16` + +`size`: CIDR netmask that determines the default overlay network size to allocate from the `base` pool, the default is `24` ### Swarm -Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-address-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md). +Swarm uses a default address pool of `10.0.0.0/8` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-addr-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md). -> **Note**: Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be installed using this flag and UCP must be installed on top of it. +> **Note**: The Swarm `default-addr-pool` setting is separate from the Docker engine `default-address-pools` setting. They are two separate ranges that are used for different purposes. + +> **Note**: Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be initialized using this flag and UCP must be installed on top of it. ### Kubernetes From e42615d6ccaab9ca74a9fefbee03fe12c54bce47 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Mon, 19 Aug 2019 10:11:52 -0700 Subject: [PATCH 013/160] Added default for service-cluster-ip-range --- ee/ucp/admin/install/plan-installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 1c9ea51193..a4d3047fa1 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -46,7 +46,7 @@ Engine `fixed-cidr` - CIDR range for `docker0` interface and local containers, d Engine `default-address-pools` - CIDR range for `docker_gwbridge` interface and bridge networks, default `172.18.0.0/16`. Swarm `default-addr-pool` - CIDR range for Swarm overlay networks, default `10.0.0.0/8`. Kubernetes `pod-cidr` - CIDR range for Kubernetes pods, default `192.168.0.0/16`. -Kubernetes `service-cluster-ip-range` - CIDR range for Kubernetes services +Kubernetes `service-cluster-ip-range` - CIDR range for Kubernetes services, default `10.96.0.0/16`. ### Engine From f16a7ad1d932d7ace92ca35399cca26b1d70ca33 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Tue, 20 Aug 2019 09:46:23 -0700 Subject: [PATCH 014/160] Removed overlay reference in bridge network section --- ee/ucp/admin/install/plan-installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index a4d3047fa1..97bbb34606 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -93,7 +93,7 @@ This range must be an IPv4 range for fixed IPs, and must be a subset of the brid `base`: CIDR range to be divided up for bridge networks, the default is `172.18.0.0/16` -`size`: CIDR netmask that determines the default overlay network size to allocate from the `base` pool, the default is `24` +`size`: CIDR netmask that determines the default network size to allocate from the `base` pool, the default is `24` ### Swarm From b0985d9575cdddfc4dbeeb7ec62a46e964988236 Mon Sep 17 00:00:00 2001 From: Nathan Jones Date: Fri, 23 Aug 2019 10:55:44 -0400 Subject: [PATCH 015/160] Included Docker engine CLI as pre-requisite Pre-requisites stated that Docker Desktop is required, but `docker cluster` commands also work on Docker CLI installations on Linux. --- cluster/aws.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/aws.md b/cluster/aws.md index 7a002c8ecf..3a0626285b 100644 --- a/cluster/aws.md +++ b/cluster/aws.md @@ -16,7 +16,7 @@ This topic discusses working with docker clusters in AWS, including how to: ## Prerequisites -- Completed installation of [Docker Desktop Enterprise](../ee/desktop/). +- Completed installation of [Docker Desktop Enterprise](../ee/desktop/) on Windows or Mac, or the [Docker CLI](https://docs.docker.com/ee/supported-platforms/) on Linux. - [Access keys](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) to an AWS subscription. You can provide these credentials in many ways, but the recommended way is to create an `~/.aws/credentials` file. Refer to [AWS CLI configuration](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) for details on creating one. ## Create a cluster From 2c95feab220d21c58f490a535aae0d1346db3d73 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Fri, 23 Aug 2019 15:29:25 -0400 Subject: [PATCH 016/160] Changed the format for the Note --- ee/dtr/admin/install/index.md | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 653ee5abe1..6a52f7779f 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -15,11 +15,12 @@ infrastructure meets the [system requirements](./system-requirements) that DTR n ## Step 2. Install UCP ->**Note:** Before installing DTR: - -* When upgrading, upgrade UCP before DTR for each major version. For example, if you are upgrading four major versions, upgrade one major version at a time, first UCP, then DTR, and then repeat for the remaining three versions. -* UCP should be installed or upgraded to the most recent version before an initial install of DTR. -* Docker Engine should be updated to the most recent version before installing or updating UCP. +>**Note** +> +> Before installing DTR: +> * When upgrading, upgrade UCP before DTR for each major version. For example, if you are upgrading four major versions, upgrade one major version at a time, first UCP, then DTR, and then repeat for the remaining three versions. +> * UCP should be installed or upgraded to the most recent version before an initial install of DTR. +> * Docker Engine should be updated to the most recent version before installing or updating UCP. Since DTR requires Docker Universal Control Plane (UCP) to run, you need to [install UCP](/ee/ucp/admin/install/) on all the nodes where you plan to install DTR. @@ -32,7 +33,7 @@ You cannot install DTR on a standalone Docker Engine. ## Step 3. Install DTR -Once UCP is installed, navigate to the UCP web interface as an admin. Expand your profile on the left +Once UCP is installed, navigate to the UCP web interface as an admin. Expand your profile on the left navigation pane, and select **Admin Settings > Docker Trusted Registry**. ![](../../images/install-dtr-2.png){: .with-border} @@ -57,7 +58,7 @@ installed on the ucp worker defined by the `--ucp-node` flag. As an example, you could SSH into a UCP node and run the DTR install command from there. Running the installation command in interactive TTY or `-it` mode means you will be prompted for any required additional information. [Learn -more about installing DTR](/reference/dtr/2.7/cli/install/). +more about installing DTR](/reference/dtr/2.7/cli/install/). To install a specific version of DTR, replace `{{ page.dtr_version }}` with your desired version in the [installation command](#step-3-install-dtr) above. Find @@ -87,8 +88,8 @@ DTR listed as a stack. To verify that DTR is accessible from the browser, enter your DTR IP address or FQDN on the address bar. Since [HSTS (HTTP Strict-Transport-Security) -header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is included in all API responses, -make sure to specify the FQDN (Fully Qualified Domain Name) of your DTR prefixed with `https://`, +header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is included in all API responses, +make sure to specify the FQDN (Fully Qualified Domain Name) of your DTR prefixed with `https://`, or your browser may refuse to load the web interface. ![](../../images/create-repository-1.png){: .with-border} @@ -103,11 +104,11 @@ After installing DTR, you should configure: ### Web interface - * To update your TLS certificates, access DTR from the browser and navigate to **System > General**. + * To update your TLS certificates, access DTR from the browser and navigate to **System > General**. * To configure your storage backend, navigate to **System > Storage**. If you are upgrading and changing your existing storage backend, see [Switch storage backends](/ee/dtr/admin/configure/external-storage/storage-backend-migration/) for recommended steps. - + ### Command line interface - + To reconfigure DTR using the CLI, see the reference page for [the reconfigure command](/reference/dtr/2.7/cli/reconfigure/). ## Step 6. Test pushing and pulling @@ -128,7 +129,7 @@ you can add more replicas to your DTR cluster. Adding more replicas allows you to load-balance requests across all replicas, and keep DTR working if a replica fails. -For high-availability, you should set 3 or 5 DTR replicas. The replica nodes also need +For high-availability, you should set 3 or 5 DTR replicas. The replica nodes also need to be managed by the same UCP. To add replicas to a DTR cluster, use the [join](/reference/dtr/2.7/cli/join/) command: @@ -149,13 +150,13 @@ To add replicas to a DTR cluster, use the [join](/reference/dtr/2.7/cli/join/) c --ucp-node \ --ucp-insecure-tls ``` - + > --ucp-node > > The `` following the `--ucp-node` flag is the target node to > install the DTR replica. This is NOT the UCP Manager URL. {: .important} - + 3. Check that all replicas are running. In your browser, navigate to UCP's From 77f8c6e856033636986382f51ee202426df5c727 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Mon, 26 Aug 2019 11:44:46 -0400 Subject: [PATCH 017/160] Change API URL to 3.2 --- ee/ucp/admin/configure/external-auth/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ee/ucp/admin/configure/external-auth/index.md b/ee/ucp/admin/configure/external-auth/index.md index 821640870b..1b359da723 100644 --- a/ee/ucp/admin/configure/external-auth/index.md +++ b/ee/ucp/admin/configure/external-auth/index.md @@ -17,13 +17,13 @@ all manually created users whose usernames don't match any LDAP search results are still available. When you enable LDAP authentication, you can choose whether UCP creates user -accounts only when users log in for the first time. Select the +accounts only when users log in for the first time. Select the **Just-In-Time User Provisioning** option to ensure that the only LDAP accounts that exist in UCP are those that have had a user log in to UCP. ## How UCP integrates with LDAP -You control how UCP integrates with LDAP by creating searches for users. +You control how UCP integrates with LDAP by creating searches for users. You can specify multiple search configurations, and you can specify multiple LDAP servers to integrate with. Searches start with the `Base DN`, which is the *distinguished name* of the node in the LDAP directory tree where the @@ -44,7 +44,7 @@ and servers. server is considered the default domain server. Any others are associated with the domain that you specify in the page. -Here's what happens when UCP synchronizes with LDAP: +Here's what happens when UCP synchronizes with LDAP: 1. UCP creates a set of search results by iterating over each of the user search configs, in the order that you specify. @@ -82,7 +82,7 @@ Here are three user search configs with the following `Base DNs`: For this search config, two of the domain servers have a domain which is a suffix of this base DN, but `dc=subsidiary2,dc=subsidiary1,dc=com` is the - longer of the two, so UCP uses the server `ldaps://ldap.subsidiary2.com` + longer of the two, so UCP uses the server `ldaps://ldap.subsidiary2.com` for the search request. - baseDN=`ou=eng,dc=example,dc=com` @@ -127,7 +127,7 @@ remain unchanged for all existing users. ## LDAP enabled -Click **Yes** to enable integrating UCP users and teams with LDAP servers. +Click **Yes** to enable integrating UCP users and teams with LDAP servers. ## LDAP server @@ -198,7 +198,7 @@ You can also manually synchronize users by clicking **Sync Now**. ## Revoke user access When a user is removed from LDAP, the effect on the user's UCP account depends -on the **Just-In-Time User Provisioning** setting: +on the **Just-In-Time User Provisioning** setting: - **Just-In-Time User Provisioning** is `false`: Users deleted from LDAP become inactive in UCP after the next LDAP synchronization runs. @@ -225,9 +225,9 @@ LDAP directory. As of UCP 3.1.5, LDAP-specific `GET` and `PUT` API endpoints have been added to the Config resource. Note that swarm mode has to be enabled before you can hit the following endpoints: - `GET /api/ucp/config/auth/ldap` - Returns information on your current system LDAP configuration. -- `PUT /api/ucp/config/auth/ldap` - Lets you update your LDAP configuration. +- `PUT /api/ucp/config/auth/ldap` - Lets you update your LDAP configuration. -See [UCP API Documentation](/reference/ucp/3.1/api/) for additonal information. +See [UCP API Documentation](/reference/ucp/3.2/api/) for additonal information. ## Where to go next From f7c0d9745c58bb4239f2b5c2fc7b13cdb396576e Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Mon, 26 Aug 2019 17:49:15 -0400 Subject: [PATCH 018/160] Change URLS to 2.7 version --- .../storage-backend-migration.md | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md index b8eca97dde..85606fd03f 100644 --- a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md +++ b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md @@ -8,7 +8,7 @@ Starting in DTR 2.6, switching storage backends initializes a new metadata store ## DTR 2.6.4 and above -In DTR 2.6.4, a new flag, `--storage-migrated`, [has been added to `docker/dtr reconfigure`](/reference/dtr/2.6/cli/reconfigure/) which lets you indicate the migration status of your storage data during a reconfigure. If you are not worried about losing your existing tags, you can skip the recommended steps below and [perform a reconfigure](/reference/dtr/2.6/cli/reconfigure/). +In DTR 2.6.4, a new flag, `--storage-migrated`, [has been added to `docker/dtr reconfigure`](/reference/dtr/2.7/cli/reconfigure/) which lets you indicate the migration status of your storage data during a reconfigure. If you are not worried about losing your existing tags, you can skip the recommended steps below and [perform a reconfigure](/reference/dtr/2.7/cli/reconfigure/). ### Best practice for data migration @@ -18,50 +18,50 @@ Docker recommends the following steps for your storage backend and metadata migr ![](/ee/dtr/images/garbage-collection-0.png){: .img-fluid .with-border} -2. [Back up your existing metadata](/ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-metadata). See [docker/dtr backup](/reference/dtr/2.6/cli/backup/) for CLI command description and options. +2. [Back up your existing metadata](/ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-metadata). See [docker/dtr backup](/reference/dtr/2.7/cli/backup/) for CLI command description and options. 3. Migrate the contents of your current storage backend to the new one you are switching to. For example, upload your current storage data to your new NFS server. -4. [Restore DTR from your backup](/ee/dtr/admin/disaster-recovery/restore-from-backup/) and specify your new storage backend. See [docker/dtr destroy](/reference/dtr/2.6/cli/destroy/) and [docker/dtr restore](/reference/dtr/2.6/cli/backup/) for CLI command descriptions and options. +4. [Restore DTR from your backup](/ee/dtr/admin/disaster-recovery/restore-from-backup/) and specify your new storage backend. See [docker/dtr destroy](/reference/dtr/2.7/cli/destroy/) and [docker/dtr restore](/reference/dtr/2.7/cli/backup/) for CLI command descriptions and options. 5. With DTR restored from your backup and your storage data migrated to your new backend, garbage collect any dangling blobs using the following API request: ```bash curl -u :$TOKEN -X POST "https:///api/v0/jobs" -H "accept: application/json" -H "content-type: application/json" -d "{ \"action": \"onlinegc_blobs\" }" - ``` - + ``` + On success, you should get a `202 Accepted` response with a job `id` and other related details. This ensures any blobs which are not referenced in your previously created backup get destroyed. - + ### Alternative option for data migration If you have a long maintenance window, you can skip some steps from above and do the following: 1. Put DTR in "read-only" mode using the following API request: - + ```bash curl -u :$TOKEN -X POST "https:///api/v0/meta/settings" -H "accept: application/json" -H "content-type: application/json" -d "{ \"readOnlyRegistry\": true }" - ``` + ``` On success, you should get a `202 Accepted` response. 2. Migrate the contents of your current storage backend to the new one you are switching to. For example, upload your current storage data to your new NFS server. -3. [Reconfigure DTR](/reference/dtr/2.6/cli/reconfigure) while specifying the `--storage-migrated` flag to preserve your existing tags. +3. [Reconfigure DTR](/reference/dtr/2.7/cli/reconfigure) while specifying the `--storage-migrated` flag to preserve your existing tags. ## DTR 2.6.0-2.6.4 and DTR 2.5 (with experimental garbage collection) Make sure to [perform a backup](/ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-data) before you change your storage backend when running DTR 2.5 (with online garbage collection) and 2.6.0-2.6.3. If you encounter an issue with lost tags, refer to the following resources: - * For changes to reconfigure and restore options in DTR 2.6, see [docker/dtr reconfigure](/reference/dtr/2.6/cli/reconfigure/) and [docker/dtr restore](/reference/dtr/2.6/cli/restore). + * For changes to reconfigure and restore options in DTR 2.6, see [docker/dtr reconfigure](/reference/dtr/2.6/cli/reconfigure/) and [docker/dtr restore](/reference/dtr/2.6/cli/restore). * For Docker's recommended recovery strategies, see [DTR 2.6 lost tags after reconfiguring storage](https://success.docker.com/article/dtr-26-lost-tags-after-reconfiguring-storage). - * For NFS-specific changes, see [Use NFS](nfs.md). + * For NFS-specific changes, see [Use NFS](nfs.md). * For S3-specific changes, see [Learn how to configure DTR with Amazon S3](s3.md). -Upgrade to [DTR 2.6.4](#dtr-264-and-above) and follow [best practice for data migration](#best-practice-for-data-migration) to avoid the wiped tags issue when moving from one NFS serverto another. +Upgrade to [DTR 2.6.4](#dtr-264-and-above) and follow [best practice for data migration](#best-practice-for-data-migration) to avoid the wiped tags issue when moving from one NFS serverto another. ## Where to go next - [Use NFS](nfs.md) - [Use S3](s3.md) - CLI reference pages - - [docker/dtr install](/reference/dtr/2.6/cli/install/) - - [docker/dtr reconfigure](/reference/dtr/2.6/cli/reconfigure/) + - [docker/dtr install](/reference/dtr/2.7/cli/install/) + - [docker/dtr reconfigure](/reference/dtr/2.7/cli/reconfigure/) From a25d693706a7ea07b724b31187218b9c417f5b94 Mon Sep 17 00:00:00 2001 From: Olly P Date: Tue, 27 Aug 2019 11:47:43 +0100 Subject: [PATCH 019/160] Fixed the DTR CLI References (#9309) --- _data/toc.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index ac5387e71d..c695bc6de2 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -2868,25 +2868,25 @@ manuals: path: /datacenter/dtr/2.6/guides/admin/disaster-recovery/restore-from-backup/ - sectiontitle: CLI Reference section: - - path: /reference/dtr/2.6/cli/ + - path: /datacenter/dtr/2.6/reference/cli/ title: Overview - - path: /reference/dtr/2.6/cli/backup/ + - path: /datacenter/dtr/2.6/reference/cli/backup/ title: backup - - path: /reference/dtr/2.6/cli/destroy/ + - path: /datacenter/dtr/2.6/reference/cli/destroy/ title: destroy - - path: /reference/dtr/2.6/cli/emergency-repair/ + - path: /datacenter/dtr/2.6/reference/cli/emergency-repair/ title: emergency-repair - - path: /reference/dtr/2.6/cli/install/ + - path: /datacenter/dtr/2.6/reference/cli/install/ title: install - - path: /reference/dtr/2.6/cli/join/ + - path: /datacenter/dtr/2.6/reference/cli/join/ title: join - - path: /reference/dtr/2.6/cli/reconfigure/ + - path: /datacenter/dtr/2.6/reference/cli/reconfigure/ title: reconfigure - - path: /reference/dtr/2.6/cli/remove/ + - path: /datacenter/dtr/2.6/reference/cli/remove/ title: remove - - path: /reference/dtr/2.6/cli/restore/ + - path: /datacenter/dtr/2.6/reference/cli/restore/ title: restore - - path: /reference/dtr/2.6/cli/upgrade/ + - path: /datacenter/dtr/2.6/reference/cli/upgrade/ title: upgrade - sectiontitle: User guides section: From c80e991c20ec209e3f4acb522f9d20be6d6f7269 Mon Sep 17 00:00:00 2001 From: Rolfe Dlugy-Hegwer Date: Tue, 27 Aug 2019 10:39:58 -0400 Subject: [PATCH 020/160] Fix broken link Added forward slash to beginning of directory path. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9c125d19f..89d5f282ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ help. If a reviewer realizes you have based your work on the wrong branch, we'll let you know so that you can rebase it. >**Note**: To contribute code to Docker projects, see the -[Contribution guidelines](opensource/). +[Contribution guidelines](/opensource/). ### Files not edited here @@ -121,5 +121,5 @@ know. ## Style guide -Docker does not currently maintain a style guide. Use your best judgment, and +Docker does not currently maintain a style guide. Use your best judgment, and try to follow the example set by the existing documentation. From a8db0c47b687e177ae7ad8445cce23ed9665b686 Mon Sep 17 00:00:00 2001 From: "gonzalo.contador" <35504372+gonzalo-contador@users.noreply.github.com> Date: Tue, 27 Aug 2019 11:15:37 -0400 Subject: [PATCH 021/160] Added Warning to specify scope of support for EE Warning: This implementation DOES NOT qualify under the scope of Docker-ee support. {:.warning} --- notary/getting_started.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notary/getting_started.md b/notary/getting_started.md index 45d783ad78..52562d2e74 100644 --- a/notary/getting_started.md +++ b/notary/getting_started.md @@ -8,7 +8,10 @@ This document describes basic use of the Notary CLI as a tool supporting Docker Content Trust. For more advanced use cases, you must [run your own Notary service](running_a_service.md). Read the [use the Notary client for advanced users](advanced_usage.md) documentation. + > **Warning**: This implementation DOES NOT qualify under the scope of Docker-ee support. + {:.warning} + ## What is Notary Notary is a tool for publishing and managing trusted collections of content. From 448dad1e274213269a962e31a7580234f23875c3 Mon Sep 17 00:00:00 2001 From: Aaron Rueth Date: Tue, 27 Aug 2019 08:25:11 -0700 Subject: [PATCH 022/160] Fixed formatting on Avoid IP range conflicts section --- ee/ucp/admin/install/plan-installation.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 97bbb34606..c6ccf82b68 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -42,10 +42,10 @@ this. ## Avoid IP range conflicts -Engine `fixed-cidr` - CIDR range for `docker0` interface and local containers, default `172.17.0.0/16`. -Engine `default-address-pools` - CIDR range for `docker_gwbridge` interface and bridge networks, default `172.18.0.0/16`. -Swarm `default-addr-pool` - CIDR range for Swarm overlay networks, default `10.0.0.0/8`. -Kubernetes `pod-cidr` - CIDR range for Kubernetes pods, default `192.168.0.0/16`. +Engine `fixed-cidr` - CIDR range for `docker0` interface and local containers, default `172.17.0.0/16`. +Engine `default-address-pools` - CIDR range for `docker_gwbridge` interface and bridge networks, default `172.18.0.0/16`. +Swarm `default-addr-pool` - CIDR range for Swarm overlay networks, default `10.0.0.0/8`. +Kubernetes `pod-cidr` - CIDR range for Kubernetes pods, default `192.168.0.0/16`. Kubernetes `service-cluster-ip-range` - CIDR range for Kubernetes services, default `10.96.0.0/16`. ### Engine From 750287332f77f2a5f31f511189983f488d265bdb Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Tue, 27 Aug 2019 16:48:55 +0100 Subject: [PATCH 023/160] Adding buildx content (#8818) docs for buildx multi-arch images --- .../images/desktop-buildx-version.png | Bin 0 -> 98048 bytes docker-for-mac/images/localhost-arm.png | Bin 0 -> 34885 bytes docker-for-mac/multi-arch.md | 143 +++++++++++++++--- 3 files changed, 122 insertions(+), 21 deletions(-) create mode 100644 docker-for-mac/images/desktop-buildx-version.png create mode 100644 docker-for-mac/images/localhost-arm.png diff --git a/docker-for-mac/images/desktop-buildx-version.png b/docker-for-mac/images/desktop-buildx-version.png new file mode 100644 index 0000000000000000000000000000000000000000..c686bfac7cc067e09f8d3215d5b47568ebf7d864 GIT binary patch literal 98048 zcmYg&WmKD6w>4Uzcqvfa3Y1dZodU(BEydje!QF!tiWYZoix(#WN^weYr$|B}xI?f6 z3-IyY@4V;U9~l|hBR`((z1CcFuDNz%-)gH6Kc;<*fq_A+rmFNF0|N{F@WR4>^soZ% zrrCOU!}NNuqJU95PQQzRA&;S^^!kH8=0OKRw(XD}Jm|Y;6==7%cKHI@!U&{F5PqUS z$81YrvS2MV5r#{O9(q=Y8+=TZlyq^@{i^>_X!bUzemL=<0--Wh>ZIUwg$Uc&X8=6w zXctrk8X5f_cyICdbF~RH$H+*}NH0f^Txd2Y!0i?19l6+%oOZtWlqdS~B!G~GnT!k{ z9|s2u3o|@SUY_~k<3c(<#C6#ClREDIUH$)GA_*@USOp=1iZ&aC=Gt7kmyeG^U0XV? zWJLXsjlr2z;HzF%3^>8{()6%T=U!2&IM20=oSZ=n9q31>%}Lzu?V%wJ;jWDxMcwlb zowdeexu={Z7nk#KOvFYGF_fz<{kyxqg9flWZ-JxM#KCd}i7W0hgR%{pX#=-=WcNhN zrurgZNmAh_<73^RW(Wj^&X+&C4b`4da4NZPbws~%xd*7%*-I4_fm0f|^2WDBOn2lA zwDfvA+WuCsyn2ifrvBxuy=&S;s2CY<+!ro99O*|t|8y@$Hb+zGu()~k*7#NPTdH4_ zV_Uz=_s=4H<2Q_c?5@91`}2qQ=uw#p*(b`8F1_itZ2`x1{04=aS>tHCG`{e@f~hT}Y`bVX;(l9L6!LN@Uvjcq(vZVSbYa#pqM&9j#arjyD$P4v zpFyL|pa9rG-(Y^cT)BP3c_P!#$1f80Ge4a!$rKhL^o8BU7DBN#M z3)RnbPfW)o4zMUJ1f#)Mzh%a;sb#VMd*+ik_{W|T+iAX54lr#qMzC{;z89T&LIT|r zR(qFSNYft0G^2vNr3C(H8-Y`NlYQ!3=Foy^Rqg2ZOZ%R6GKBp#@sv(%64PP|WbqM& zZ=mxsqhuC1tr+ZU7q|>KC8t4XHZ3&W)|3S_fmUs`(;|m|e`wczQB(qy$?I^*HGBc@ z4^iiy1FX9`RBJ$NtHr=@*NMc%ye(enR0sB(fVjx6w$N_Zo7GS^zVp98ieG7%JFH5p z8vhfn`1rznSY&DX`-l5Ywq;A^t^Cf^Dx3wVCp@+`QAXg{{HAi<>G3ibbI(U>@NAx0 z|Mz1WQiYJjW{4dHSDvSIXuvD_M!CslYlL`uBWQ^rXzl&O;}^9w9JCWRx4;q;_4lW5 zr*Z3IayM)>I39Q6hLY0xDmN3CgRjl*f%d4XQoL}#iO1(wn3D{gt6-Q5i+XWQ4$ zqn}uZX_p-S>|Qp$Y<-<#Z*PBinZdibC}}I!q@wVYAatwQuZrBxPcOn9T%(rf(`@jm z>|NC)|BwV!wboKNS9h;9!1IM@6SyHYqw?sLY1M0C>eA(_S!352>VHrrAwH~yi*e@= zvRvyc6%_C%=gJZej{(SLvstOg2*}v%nku19jP15&evsh}&Cy_9W3|_SWn5^;LC|ou zna)N=tXPDLQ$uL5OMls$J-KUVeHfbRhPvg21ug{5M>Gce0YRK=#9X^Vkwr8E0Qj5A zE2ih8sx@$U=8IfJwdP)K{NMNFz@%#0b2^(_R;z5dHT}zI4G`kYoi9ncFDfElopIWyz>o(mPW3y~< z0~8`7x8%Y%;c5_|=CcL+`C7V*E*)O0w`HKgppgF$m^$#{FmtPQkdqRjXg2OkMuW#m zb;Q5@dDsE>%6wtp)*&v9a@ICyQR!;}O|P#^B{g_h#|+nROw=P=J9uE}BflwAL8;%q zh7RYg(fqDn`` zrLANH;o;em4SFH?NR^e~PH;9b#5#V3C#Z znPP199+H&_S%}(_(z+Qb#-Y4JUUk$a!^cz69M)IF^T`&Uta~^ATV8PR#Zy^OQ-x|! z*YNhKd@fSp*P-@Oa7-IU!6S8WA9&UU{#whBnLXcM{MbrA7c_WxLI13& zIgzA=jot+}^p#EX@bC8uZNpswqE4Y6SG0MKQ$)?`^UPiIr8)~YB%k%hb<&bmAS385 zGufZEA(VY2S^uE1B?W63K#tFD<`eh2@7i>X*4UtuUR=F8qAwu|qcQ!dq7(Irjzij3 zTzj#zH@m{sh(dQ$>$Pp0=tfynolOX_e!$;;6J(8)FMEyLjP*sqFw~D;doiU`-@fYp zk6n#$C3y9S;;>!zyDVGbq+dlHDt@PBNV{mIj*l>mEWijq%%hIOP7ZwIk(Ef0MK}v^ zSU5m*UAEtL6Ba>~$_HgpDB5Rc@hNN_WT!<(5R=pGgEq#Sn6W9smpIM`c*e>H4A=(r z5))O?UuQ2y(t;aT<-Jtf>{NP>T&47U_-(ddr^DTmXj?|_{Y3pXAzhiS$JWs!|8S3b zHS+FJyy-6cF9YUYwk-^koF!5F3D5k0k2^+hUjBjT_m%q2NH(ho6Q1id<*u5U z<=|EFMcF{}P7AvVJr2v3P#eIYFRGbRT){$MO zNIN>#)bGVUaf4797f934bbyE2YZO86ZeGaXnwZtj>MCvtoV1FI*oR(e&Y4erHO{{J z%i<=pxRDDs4x>s9$s6@Ud9xR^X=P%5KN)qr`V>?p&;026BXMXGI(=nwFm@0CzYrEY z;gB)bf7x7O9N_NSd(FuU%~&>@?#L3_&uKB+<$@lRzp@ydNb~MnX=AE4G>6ritrzeJ ziCSG!#i{9RC@d6AMZrs)p^x`-XHS21IY+;_!VSe^>^Y|S=QlEUJH`5`x*6mxO*hQ& z5{-;*uf=GMZv1Ui`&;@I>+~3qpDtEZ(tf3cx(#HaTCO8zcP1<2z}X319s{TYOcr+C zBB4|uLdHi|0|z(1bjB7c4$wAn>(-#1h`xcMkfK3Z7^wDyx>uQ{J}e~Vm`@~(eKVol znb1NH59%}I8_K04(`j2-8anFXzdaXjN9S zp0`xmnUHFj$=Xd66?Vm+N-AEjr1m~U+irZEv0y8-_sBjtAGskZ-{`MvV_Gdrc+D&- z#9ceG^0nOf+0jB&&zEm~xin+4p^MXlvg)qsGq@+NvWabG(Wg9_;Jqs|J^3I1W$`9YFqid!t#Zp_2H4K+geQj10-zH2eJYpx3Yt4YZC@I(Am`duZ(9mGa5?2{n%rcSn=LLzBR zCu-1(?Z)5pehy>(3SoC?bK215anb#Qbhvlxi#p}=6h@&uwvHOq(tP>hxLJx@@WIwR zH?vSW=?ufcc@T04p&UXrN0_I~!`a`=9Y09$Gl@Phf&uZfzjfI*c8EMgG7Dh|f!r14 zW;Z0kkIf{*G$Ma0B+X)FbO^WoV(j>{X6n|j_A?9XNzyGWBSr0IZ{f@4rquxT=K7@$ z$yVIyj2Ejx;p}N!H99c~;f)ulH$1UT_rHvrOr_fi>38l2YhY_T*clH|nL{J}|0-XO zw>^cH*}~re3IQ;u@X|(*?L?@R8lOb+di=#|G z1P)2YzRR~c4mFmElLg*Mmd?T167GC~D2iMl&NmB+U^-f0__0CB%-YG`YqCo@|0SJ; z^;580+Iq^QCMU~%@bJLx#=;NK4h+%kM&D_`d8{w%AD@^@5q|$?!7At=AN9x~R9;<5 z;R)*{!DiMU`|m#HwxOf40U>!E(qe|l6`r5QbDMsHj0Pb*l&5Xd^qUvM`Q!NbqG&qU ziNfmtB-fXm|3JIkC7vH@C}Ep-ahAHk0b0?=RDH&Jv#zTv$|F|DBS5hLaE%6}FQu)M zFkH{gECDNhTcJ-+>N2X+3bh~<-*oQJepkzc+Uav1H7{fUTg5MO>M;3j3sSTuv|FKn zxy15vKIV;yym)DA#D`;j%W`se(RH6SbWvr~=B(_blzieDt_5Z*xJ7jzNjU?8rvp{^ z3L$qKnoXr2s zNI8Zii9hX4msdyZ1^w=g9T>hk>YrH^Tjv)tQlTD0`wyy{Jj3)et{Xfz3OJSU0sbj# z4B+|5htyvZ@1{?giIXfxHd~8zdVF)fPMuoj{5>qCbgBz%)ig_WF(W1jm{cAmXI`m; zr!`U(gCDZf?f_vi1Y4)}G3A0yNa7B&w(+(?`;_Gpl#Ak7gmJNi_3E@W?sCkMBm$g# zM|Pd&B{}_UuLb_dIAjI+wvJ?@SK_={ZHxLA;4_Gm2032DC61=I@y7owLXhK0(u)6f zH@e^BTaHJ_oZT^Wh%zVKSDh|}YRjU}8o>^#Vujz6!9OLgP6w!vFBhPB+1m zRE3n}*b_pGpWE5FiVl_Q0;F85U9#+crlq}P^1P4gP?M4qu%8&NE;qL=YRoQcj$gUZ zsG8tpIVZ$ZoVn9|j+R9G8nLk6ZIa9y>x=##OstrH*Yy^Gj{6wJ_ixRq2*a?AJ+pw> z7J-&JG3gEtAqGn5=>Brk$D&iB)+>Vw)&|2u|E7gO)K=k!3j*2b0RLi z%gl{`p4-Bt30>{fmy(i22;bcNG_kXuabyYr^q1Mbi3%E><$b|oZk%)8)MT6`SkhMe zc7yVd;PXm3EW&lIl;dcs8o5!Hf&a4eTzvU!7Ilzh{r=qeXR~K(kmYxI8xV8y@1N$~ zZB`C5Ax-(6+l)kpACk4ImN~$Ey^`>MgdPfm`(lx=c zWbz2YDR1mg@|(7{N4U*2;Y9=pLna%cS~cPKP`ed`*y<-g5=M6A>{Hm1{wt2LS;KNj zjc=D0gPik7KJ+#h%>;T$lDAlm1;>>mhbiL02-0%o+;kH>Xb!DdTyK+@Ezq@2X7t z;Q=eb%naQOzWh@~-S!_61R;pkf>5W`p!3$9_D`o0W+2L| zK_-`wu2ZD%H8S~TZ@M=Fscb2`)lA@pelZA;jr?b4{u4)gNf>={1=q?j-fc$#oXk^Ri{8OXh6jFggaSeK(@zx6*j8W$_Yfy|G^qfw z9JQiGkY%s^KP``kM~TI-eXPr*{h{N^vY$6mb8ysNsq>^X!$n?*$>L(yS>IKf?dHx_ zaFZ9Wd1Wf4HR0fFksm(QZ|`oTG5xuh$}fLBGt_#ypgHKqa@w3G2V7pdn#Deqig^WT zl4mr1GRH%~=+n`Cm#I`E!8&=r!zM{FmJ{MZ3nqQj%k&h@nEEfv!whdy>;@v=H2S*k zH{LzSd{DrjTf5C^Fw0nQNsaQB8t^(Twq58x4{(t-S0Y$hLd}vpi*VpT&eqU|l68HkX@J)c!ZG3?E}^?`sYDULV(nEV8)Ca`F-_{+?1( zsijM~eAu}Cv3!J5{z)SAd&GVX>ulNhQHxXbovS!*huc?p>fto&AELEmk2W2G)!x zSAKLK^s>enAF!WSEU$*Z#kQ<*|AT#857Bn*5?9dWM-u4_I_I1eB0NDc)Ig^AAGLl+)j!!jw5q-{Lh)B>MSE-tc2n@r)~5W>RRPYRn) zE#5_>CCC*9Yn#!6b4+at=Lj3*0f>Hz``cKpKx4ji0 zM6>IS8YJ3JzKji+-#5euY$s9>yGb(>&Wp3Os5D;(Z_|dd2#aCWG9XFIcNmj*#}gB& z<~vJiL5?(j7^ctBDFZ88k62Wh{@ojZGKR@jN%r5K9@(5L?}gYiHs9BILH0f!}roE-2DokcNSyO+tI$4v8z4rwPcvN(4x3;)6Mj*Jd;Ml-%bdwYbPF)Zj{q zBmpL^9zoMbas@&jp}Ox-NUs1Xp;{1AgCm?|-}C_0~AwsBhZOwnHLDgMAZ+J0D<)v#g+>ve zs`{`0)|qbOVbW;uu{6$WU~|}@{O7zeQI}ztp5Sr?8D`_`_rWWPqBq~r8|&OfX^vB! z%_Cb|5PS)b1Zp?hZ$!?HkDhT4Ejhb1&TjgE zREfLF!M{-&Rd5cJ_M&IUTs^;l^CV`;TwJ98zoEaNiEkpPp9!OV9M!t(L?78WQUB`DE{$^j z$A7Q{vxVj8R4rcz`JFHL=3KSEbh(Fq^%xO526lL*x;#9%m*+Y(DksVOqr-DL5oVJO zfDoHl9#=}`>6TRKX_~78?0~y&3n^jn+^TLV1CodL1eFD!-NavPlM~d>^@et_gq&dH zCx?vs)zA7-keE4HX0NZ+?X;P&zrz*tV!(VPt7g{HqC)3+(`3C-*T&a$M}h4aemuZC zm#Y&)&C*SDKVCpEcDzYgsriFn!v6k*&WLWrI>LxU;m6Z|gPENy?9$%b7||5eqJp|T z-SVPCd>Zysr&(Th3 zmpS>1ai<&`)uUJ##HQ86@o3D@f+P74VOo8J;1W%Y%b=OdA}`sU7QvF^Y9)^hv3Etw zZ&zBw`sBEB>13A%-T)rDvHrR!#J^!=$cRPGlHDT9urNC_1)z=^C;;8}K^_WC8J%9a zuuSnx;HC#Y{PxF*^V7!6l-Q@se(iZ<#v2MZae!MNNsRrLWti1A=N6I0W%LI2?KWb! zIrNN_!dJWbCX%mkbP*vdY&NBGcWNxh8sYMiUM!D+6%Fy@5#(#hSB}-WmG^XZoQv9w zcseb&ELf%3zg1(wsqs~5i3nLvBE47u%LmERdHMkrc?+{M8yStXr6>vHzC_h~;(X6J ztH-LRk=z)bBH;R`t@fo5|I1PC0+vdon4o+ZFVNnxl zux~F1}I^ke2*vVh@H&{IC)0 zAhP1>ZhZa0I89tX4mG4-MB%xwb`C;5Nb2R{eMIEM{~;Z;w3soW#+-r-Q1IBJ$K^SoVPNwKAm$lB(rqCR(iIq} ztmJJ@$3@{gUl<9xJfXQ#a%-|^Z&}K*Men7}j8~E1xRzpGF<;0m>}pgMJrO8j9LWeO z-E>ouR0V1OP}m!=2NXngrGGmOQcnx_S~p6$E8#F7vtLuRP>4?o(n9b0QECs`Mfff$ z5dHY%YB+(l#{nFC@vrE?40psA$EpYoloa$m>v`QKEC_t4#v??mi<1CZqkxm4iD3?t zJX?v$Ve(^<4b~sfK5cjoq9Q-zDK5<~kuA=`5y`Xo76x@_XsBbqEK*_oG9+P8&dSvI zmak~IW+5F9y5h+21L~|X=qh9F3PA#h|ByYAe)&yKkcYYsi|&+Z7QJWe#aD+z-S3r4 zG-guQ{#0bmh_WxjR5MPG+HQCa}%h*sW*OUYX9GE(QPf!heYAXt`EiAjQx|T#Ua+vN&0Fg03fF zKwY}9;-G8Bc0mh+CNyZn@oc1S>tLPr4ljrTWh`-YTtaWeC@JPNVV2_q5TCW>_9IP< z;=2z4o=cTNqviViOfpa(0OCOtT zg2V(27|GBPFoeLD4Avj(xn#HBstIN6!;f2DnZD{Lv~W}i(+&vnTsEhF&slo$8%vIF zXW3RZ`R>`PRi}SQK{Ywn<*ts}jJJb9*Wu30SF>r9Me7w`rGy z1jsS>HhXea#t&%qpXUxJ7RURmMacrx9ZP{{y!XYC#?WW`lXxbq3+n0X?Q?c)!Ww~O z3x(%cq&zZ>vz%P>my6YyvpvJ#1D^kpij)|b_R?}@X{su?GNx)7CjU+Og6y( zU+{9mVRcz+_Zf`b?7x+)Y4KC<3ss{1qbyfrP-y6F?Pd&+1-fm4iR%5!sh6Aq?%2k8 z58xFSMwp)&G}e$4(B>LcHR@;m^krrb=yd4*ibB$(MY%C)bP^lAdjV8*r4`HjIfxvi zrLTJ;(CcmQ%z+T6ns+Q!v;6fEU#UwsjcrZt^&XosO^P)ipN^|JiwV{ufwXiB%qM%2C&?+oJkKf6c|oZ#Vlhz?n{}NB4w{cPpI#cjAE(-Pk&OsvfuND7R zKJ0>wHq_M0yd|{z5h3bUks^PN+srbe(~$pUXuCYWnQ0BN1Uz*GJelDDmqPwJ*XrSR z6BpfRq}(P+r_BZhDwlEKc8>%nQ$Lm-^$UE1g4)Z={OB~oUW&UVVw041lFsuB21=L_ z2g7Xdm*)#TqZ7h)i&t^+Hm-J^xbu_ScXM!$XQINj6O=0c4EO ze2}9O5RDQhu|iE#emHQpQa`!3iRiuhVukZX&`XEQE_YV9F3+xUxnwf3>*`>8x+ zyvDH*iGRLJER5e2Od!`?$swDe(8)ZxXJSK2xXjd?)BCR4&!|5YWnLuK5VvC-G2P%2$1#& zmyaJoK7^QBj#8F(CZgH()BKAXIvY1X#5O|^w^}ykzx{Kp;>G*Dz6mS8HP=kKAdv>x zB>tDvyi^|cvW1)7OCts$OABS|XS+Ri0dDV|AuQ&i%6{AENW*eN%FFqKd@iejYEEeZ z;E^uTib&J{#8pkqL(?Kn8zvIevY5CA?3iISPjG@KjqX$WPb8>eUu^4)JJgx0yo(4` zpa_GfjNJ_sPW<%yN<~YB`&{#-M_sy)Ge0|1ZB5Zee4kMk)A3gttzhLcgDn6BixlMX zG@sP1X1ITijqZFT`Cq)LhmjeCy<)8ct)SqQ(?-4gr9rPMT`NFjP&vb>?4j|J-*D1w zS}rL@-ntUFH(fnbKd_!$_=s_;GRR@kg0|4BO!P#w{H(5zR1S8#k7s=N)?x_%o1hUd zI%V-aYVgXa?OP*_(wxvFlxE?PU2%VGgl9q9kzjRMr*?={6k@}QXR47VutUH!0nOs_ zKSixV46A*SAGv$z3^pM-g2clnZ{kEz+A%+x9KuYu=QTU3TK3SB8+S?e;BmZrv$j+e zdb0X9!qlxWgIe~fn@8{pM!W7$!Y!$Uim&D(%Ll#M4N|LM;KD&ed#jYI2-+`8v+LHimE(^mFX zqXn>BuC{PF;5jh#RH@cFe_C+wgs#<{0X5@SdMFye9{7ef5uR)^J)*lWcVegpO71c{ zz5i1HY%|jUb1H8iz~v^TPwPs?_j95;ndmI$z&mgCANJ`j9!~z2De1}ho$Efrv1KM} z;9TtcMgCLccHtIxc__+{Z|lI#VvtJz&V;HXl;$44-R9a3-oyFz37&^o9-7HfwPWDT zsl=gZl_G?Gs;;3bxp@bmo83S_*DjrzfI%8rD2b#N-EhrnB-3+NqyUkc5)I<^GPUij zi`;N-T;sWELuG=}SpUXz$4FJz?YMvL3gESu^D$7?5aKZqVZ2376b{0wY|cYq`^N?WPGvEl>i{d-HaIEzy!s4Xr_{8z;nYNBkkcaF8jRb zUUst8@a1=^W!9U!B(*yNEp^i`mZim-w_P0JLnCHV#)ma{#kE3{DfMDU8Zecj&Eymj zuEyG&z$ZiKABAl9rzy7aCWssXJCG`0f)l5Lj`lDU1tuAA^xVNiQh$@;H@zJ1s=n0c zEIChyXv!|g1%y#}mO@noMx@xraq~*qA9xSPL9XzelP|{sN5Bs*>V7c6FOs`LnT*?G zrn%R2Hj=L+#HG78v3yN0SNWDk*Vhw~aOew91Hw5jNBRbIG@h5FMMw(ErFJAyqgpWFfbCHTOuyn*Z# zw62~>&5CSBT$9~Ifqj)FJ?7sjk~2NU+l$}7;IyamvB~K6I@NF+{XuaHdt;qKY9ye$ z<_*8m-a4#$P&5S~c4(EY#fg69hjggs*AIWE;bR}Nl#??;KyT9~oNi3an7TSF_e8!@ zaB^#<(!F-IUD*t-;#iYvQX&j*Rf~7NC^*#saHpl7bVmnjH-icvtjqdk{7d3Ssg0H{ z9nm}c#{k)x)1)rF2mU;|szsmsd)4U0;SZ`H^n6>+T)Xt%$fYR9OhL-*4`}*!0k6vw z`(S6`_6nxI!)}9z4ynYgO~Mbp_QXsoi!c$EG>!vp)?)`w4Qy`g=s+LKEPeL+cLRR+ zAVG`A8^up6kJ}jW<@Xx&?7p0H2+&Il)sE7E3}5?dJ1ZSg-3kbpA9{JlbC79bqiT;}@*lF8AoT`a>6VudjTw|JPacOVrP09{_#% za@y%+4_E69?jifSJx@5~bJc@)ObK=C`_=Cs%CfF~m?T|7+-j)xWppD@H`bfS$Ch!Fr2Q0 z&t|t@K(B@*T3}R#9UMFOulsVzRswoP%gv(Am+C{Kwf74=0kXf+W^z~DT!omHM~;|Z z0M8}3vbKMkud8USxXC}i#G89Wc1z%5T+-R(`6NlJoZ}7Xp^`?$RbH`m6Ak96~mP1a|)#3no>q{0PXjp>gJg1)9@dh#<>JXJs2 zzL+uCIw)yhp+A^SqI?9q4(&)^L>Es#J|P&w!a^#9+1Dtty-aE~5ty_u&z9>PeQ=+g zMRAyKBM)U5#xu5CzX}8)*DADz%G#P>gbf7YU&=mIsyy#9h_-ima4!Xyj56}H$ZxfI z3IusYr&VKKd9S**uowUeV9^9B5j$e3`BkB&RE}WzOQVTp+i((8zN(N=%QVab@#bpG zz@mA(o#{>xDQ9u~>;ByCYSoVq@jGRQzWDS_l5&#n<)9ejCCHrfTxtw92P*hD{E;posqW zH{KiW0EI~OL1F9@(gjC2afU5#ffA3&iXg#)(`$yoHW#-i%MZp(8_aIQD@i~rrvy(PJ=Y)qzyIs_8sjF!l;bM%6}&@{_Dn9DEi@Ob0Gmv8rTZi8aErEAmOT+lVOTGE_O>rmyPKAJ#k@l zr1s}x3be`9s!ruV7Hgm7z^a+3Eo$dYrZ6>LhZa6|*D6m4jI}Rb} z0e%hLvS_K9U4Cv*$W1(9n$skA37D&AHGfI1DvOg!{PL9(a#x-}YqVgVnPgs4NVeSO zS8=qp#A#R-XZ5QLtJ5$SdQ468jA$0rOZU?B$)BovcPtjLM}C!UDMl1h34G&vd!>~U z+uC|0nWmj&TeCRBm_=;HEJ-1xlq{?7BnlvwtEh*G@| z`J_ABli$D&t~OVA7#IxL#5U1VmM0&Wn0|NfcUpqo^y< zfk1wHSJAZD9ra@=kig5IDyaBd$ZOsNa(}+e#pIC(dAz2_ecBDsKUPFRoiB9i)L>ek zL9z1~7HYDs7QFnAre3#Nu*9*wFR5YIF4b0~32CpQ!kc~sJfsq^U3W=Ry->$eI?EwZN4!SWj~$mBpqMHgk<${Cry?l+f3^7{AwggwOgxMgBnSnYe{oHdZ8 zOxhHYJP~w9LaEw%@k~iHc`JH+?B_4d!Z~%qXU7ISZzZ>x=x2Lu5%2Qgyz^C3!a4E) zCgsh_oz0Yhn}ZRFn`ti7XdvYy%FD-Cb{^lBZ(LPjer9=|8etPoZ??8O#Sf)fGln&S z`8P&C%_G!cyjo<2qUU`f$`l2v;_a&<(hW46ft^xH^T~1khkiI`6NMd=(Uo0kUU^1vUj^RRc8YOfon@0k~P;> zc$G$dH84_>DJOXCN~813r`Pi|?)`_m`K8pp7hescWeeO2Id}Ck?P$zu-kUM|3azm9xZK`^8^7FKEq(ATC z{(eTz6!d)-x;{PVDq2apPJ1*%s;c&=Wer5bG*UI&kb~giZ_Qqt7c&;pC$hfkq|-&& z419~I%WWV*Ce!fTQm{sb-fGSz7E$egz^hY6f$Z;(_H~cK8r4JYS*p-xi$%?DvvJs4 zS{k_e+{~A9C%KR_st>%fq$|8KVPxwqjG7L0ua{-d9kc=Zvm)CiHz7?I7x47&;#_Ot zvZ8|){hen!`BLrJjmDpkTg7bnx0CB&|^{l2)yM zH$FkK>sCpb5L!%^2avoS|Eo2@SI8yO~B?Ud5yxO+Dn_xb`DX5C{)R=U{O?7~D2e`*y?F=F$;(^@#P=yehjtSYCEn{JD7er}Ukam!0N>*LvaH2>5lEy%4Xf=nQT0t&px$M;;F&(vE0g zjKlZ(vk-)C-icskT~y$~b1J2#v!N3gRsZ68*AatF(Jy1Mt(@Xfvl-K(^6ppH+^1UL zo#SiaN)s+i^RwyWYBm)cK`Co5zKt_nU?Gd{9gkMs{{FC-A^1TVfK~5iM#2$^9PzgQ4DV_WH_Z> z7RcE6Rdxw+p}0lj_IjPz7qu3f_9`rX@CNIrX^-}(k6cWwTUqtmrnU#jYIs<&4nB{H z7&Ct_yXnsLv||TbIt3v*G!b8Sek{H5^_Au`0kI&{xCjprALtRa9c>5>PNqD@TG5=M zhc`l$ZYP6oBL0`}n`pnvZO3YE(6_8X=LFXq`wYLgT`}B6k(b~W~Jth?4ZRCJs=2GIDmzi({ zs~7r(+^<&ew@X(^S0wB7ztoZZzWRC~I@|gQ1!;Fo>*HqR!h#~2*+0AD&y!@_v5Sc= zSuZ_WNZLjMRSE%t?GsN5i%&oNEP7>=H5T3C&S$=Let`c(bn$>Fq2;_A@i|0Wg2_w2 zQdxL~Hf|Gw(#C@;jAfXWH!h+&rl+f3L5@pTFaWQKSRf--!8r|Vol+BaE2lIs$244`)xO~5dcVxF{2wZ*Nr07z) zt;=%u8*VBgdF>7Jf~BM5UA~G#pqPhR3$q#1N@sf@t`q57ziX=JDAxi~4;Q&Izo`|I z>z$wQxDm!rJ=kiC9v*X@At4P?;!D2RmmQ9}*U5B)K2sw*BO8*TnvagA)rmpt+>(YP zh^&*7@1Ru1H9`)tcz!mf`Rwy!zldS`Q!MSD2S-_#uuurO% zb*L8tau27d~rWiu)RK_u~;ie?=2WPJ~YoC6LRHMK#?hk*CM}NzGBM#o+5|o_b(yA%FFcu@U-xR`qmDKzkCRsD@VY< zI+JwBDoLLG^y9%G0gIBxeXY}bl0|13X=fK{;BB4l71E)_T2KaT^ktn#_b^Rc`XhU6rD!XRP~U)A@?1o}&E~ccU%k zUqUNfa;v$wzJ!E>!r}hWO}l|FvmopC!fLU+Z9y4#U+J&UWdzf{z1qX)aK7xapuj`v z*BilF!d>|u$A@q)WnW_kTzC7aUYdwBSbf_P*p{WR;TXEY+RDDDA5fWfUl17D(PTe7 zleCFA9np(MlR8?X%0N>uDW6R?r+vr&k)#&#+Hw02GK1N*+H(&-wx6e1<$t>=>ZACm^*tO~Wb=E>f>)2nSkYUy#cFoj}*U#tH z89~i%yAjBPIm$f!U?co#e6{=pKN(x6|{ z-OPh47pMp>AX3+ELPnl@^zLJp?UB4uC&|W}M7Wot<5ZayN&-E6D|7_W)6`${7qq&G zreJ-ax|BpD9Qv7o5yM%9?TN90rRI(~^2n)HD0`mv z*;6CjR*k;QO6sm5CWIzDo#yG5NZ}t(h9t##HI2}`LGeQvU!(EirYK*lTPBpy7M`XJ z86f?Bt0J88jTlXsik=*=rw$*Yy;}Z`iLQ3OzWx5#Wkuv>FoLs^uPWj4+%vUEKW}L$ z*6+JBeiLu&&ij%HW3IG0E#D?~Ai_e1ox{IVel7+P%-@*?b?l7`4HnfYrn92y$P8()^5^p2 zZ%abj;J%hyURDdd!=v^x+WW|);H*dP?Ff0x)~%w1j9CX3%H_MZp?v&#+0-;?)G|;J3UNqPh?urwlt{Ok|f zN@k;93}D~x>6Dh)UIPjLz35DN@sK{WYCUa=e=U zFmQ|Pc(*&@1ked_u277a@PmCG!tSGOU-x9a;eHt(i-9_C$A4(`ccv+=F38l)0A@JaqDxpgGgfcWFvVq-59BJOPZ;-!V%HhVVQper1`D zK`V|o{eWgW)DBxv=_J#0H56Yyy^Dvd14!aeyyv9%s$*7Tax4Lg;=9~eh!&J6xQGL) zDQFmA^ZB)juV%ocKFhNs%;_UARC@*6wGwWb7%(2FF_3J

Qys>})GFQ1AMSq9A`}-I`gp*mTbVD*M4PLI zIl+6?NWK)%^45aq_gog`!`%(;H{ER~wu*=bHmSp0v)e>^@Z-027;^I59cFz#ep#dM z9`i+9XRNThG<rcWam2V)4b{N+Xq7-#^)RtWG#U4(5OAf>Vg$V~MMuO>ckRE8xh)?6|?l_crNdK@GM^tKYH@%_gZ=yTuzl>aG znF})!pL>!tY(59z!7O`SbNDPPms5!l@=)2gUFzZ9n%WC1u&;u< z^JEq%CCj-_yUbk%bT7&+(q8XjKO)KEP8k_1g=L-cISAr}UjVcsPWK|(2e(gcT3GA+lQJ`e5Lp&5BK8>_HQmq2yEur|9@S;gYcgy-Zhb^xV zTZJ?|j&1IJ?{lBR8%CcM^A25UpxGXcVe_#%Mh{b7{?sny|55dpVR1D}+cp*;5Q2pe zbZ`w4TnD${9^Bm_$OLzH5AMMU?iSqLVQ|;M{hQqTefGV-U+d2t$E;P|U0qdO*V#)U zgz@v3-m^AthF@<@%UarG_pps?%>@0y_y{qEe0cHqV<8-3IIGrk$fOn-X|fqFiTa!}u7`b3%4e+ZmegLrzO1q0-z>U+v~P9eMFz65~AW4N@-BKHW#+p(D_8 zh&wbHu5a`s{9q34qxmCB(+> zdj9A>l+PO2_W@y3&vIyMm`wNJ{>}Pw^2L{=SE+}Q-+-9g9-fNV7NUVpab&|s&W zh@Pk0E@%T_72ld9C&6EsK^#Fc?l}1dcr#(*{Jl9r+rjRmq@xc-DAGNAk97!B&9Woi zsJzd03q9K5grs9jWC|2d>^I?ciKc-~c^8Hv00LBAXTxLDcWy%W=kc*8UJOhpmY;f% ze!_u&eS9u~cF%3;1Y*{I#}{0?sID0LwGGFB3&>_(^jSzS-Q2g&NW-(a=r<;KJ++D- zE5x5%Sb1`~H9iIpdJEv6eZ?;S(IL6tzazYoXw>vb-zLucJ4}e*TuYMNCF`_YL!>a@ z|66>t+jVXyKb3UU=fjp4S84<>Mv5D!+=+HkS%m@KtP!;fZO}QNEvt zhbt9@nUe2}mv7JpWp=RGQafv&CEQ%qPQ5KfP%6Yh;`K~;cXdnCKo_b8LS;c;9N%5w z($fK2-*X2xX8K||;R}k_-kWN}B9gMoh zUsf~tml3~1Vc#|tl^r}A28l(s~C1~!Pk$l;t#~&sfQz>aJqb#Orv$Z{o{z;)N^-MQ}QsF z83K+0zhXN&gh~xmw$g5mC`$$;UG0fIc)zscnayikiU+LB2oT%%57PBGni$21)x0P! z9=ID4jJuAuqe9@KUBtNj+D5ub${apyGQAsk5iS+S>px>sP3Vtp=L|$_iSaqQT9)sK zi^r1_PHX2DQu9g{%jaGR_Yzq=F8GwtHq7uf+><9Q)-$ufL>UQ!gsx7l)9A@eJC)^{ z=Do$0Sg3PqclZa;>5J5OSu-aHo__7csKf@RX4_|(O*B}P-}8bDQ5T<=_Y$PvYJRKTvwsN-z!R-p}kc6`}VxpNH-IN{ZQY zHKeo3W7*RPJ7$gbJua#R^~+n9?6l4BW5DELg4Q+?RuY>RkK>c_M5KRiH_W*)s216K zqhVwlpyo*4rL`4+8UZun^$mm*%U;Q3m;HAT24_u>^$n65G`FsBSBXhI*X$U~{f=7kEq> zvg~(|sQaa3ebo>BNN|K3T<6Q)yxprYNgV(SmRsRR(XvvJyTRNCr8`D z$&czas$nUX?@j&5v%rN>i=_p2<#LeI^;L#yay)AC$H7NMk^M1Ssl z{Cmu-Z%WWB4rbN#lsP$p=@%xn!RL(%8lx3Nugdqg-8DIQk3D}>DQ_TS!)U1=;q+F0H6aOqEH{i9 z4Js$a^=r3mtFxtc&1!#k_I(4t08bnRVpCb^P?(!s_CUqX1(7a>>3JO_dNV<&r2q%e zhuM>GA%o7K*KdhilVRY{ajwox7%^9yKGFGM&4^F!2ncg;eM4dnSJ!4u|Ms*$O*FRs z0Ikq=)mvRheF+x?>r{5Kj+n0Cp;1Uj#xL~P#k*v=&6pJUYL4yq`rf~XN*d`(?x(mP zpl5fDlZTw~X`=;JxP~g?`Z<3tULu9d+xq(Ls^ldJdM>|YV6|w#Y0ke=yk42d9El-( zaTSDrZbVK-Z(R_e5x7bp2(AAB!9d5*eo6WCG*J%e09X}8l;+ic2ooG|??ZGq zjv~L}tRygGoPF#4RA_U7cH?9FRHiYQ^r-87)A~S zn;f?Ak_)3@nxezm2I?}@jZ(@#9MPPm=UsM0? zYNfg1U71=);~2YI?8Fn(RUwT86YrAelt9T|z}s^92A$`t%6q%iVFi}L*4 zwX5?t%_76cTk*tw9J|<$oM~p_HPy4x#M_i%E+CNh68kT1&NN8H2LDIZ&!1PI(65=h z9~M!~mxhnEPdzQk`c5I*s$buGG@q%Mpnp-tR&N}H@wFNi0DabEKcB2f{&>}}Hf8%N zx{X~)9mQ-VLkdKCv}c}0IvWzjKN8NR-gd$6M&~BW7J8~yLpek-a zTn{02i>;YAkdmJ9#npo6x|Cfd;}78-fMv~j#gzOk<`FdlUVKMW4{i+u#`{neiR~GX z4h@~9^cy57Tj-nj@lEaXQrhwf()W^crnTkWkraq=yJ$Aw2XTNGnOV9b2Kw1#{vNca zjC(#1NR7DpTFC$L;t!ZB^?JUeZZsA&BJ+#Mdmy;}u5G?hyX}=zHrwk^j_9FawA);d zlgtM`QQoEKrT}+cw_F64EbqC8JEc&L=CJuTE{}C)EdQ*kYIv z)`q(+5h^%``&5mohRo`w1o@)F1wtFy&hG4(3)lR+W2?;t)IOKk9E#U#?TCf`aKGOK zJ)8}6Ie}W#ge3oDjUC4-2kdKHT|hOV`sC22vj&T~BY969JB?4%j7L>f1!Jh|i)S(O zIhi~u5Cw@54PK*bM%H%>etwX}9zGIx)d8;-MCqx|iMEPV8xqRo7Y^pMPC|( zZhhEZFZ>Ha(3_q!?DhrGEk16sSQ6I0KAlIrcd(?lJq=`QJyDp-5SL!Imt5iiDXy#N ztk5L|MIV;=jt`en+3E&}V?%le+XTqsj^W)Ayl$NF+`*Af)tAvpT!XkB8wD?y=x&j} z=C)<{B~j~UHX zIUA&Q2(N}Qu1uEMXcWly2$S@Yt_^ER`e->c9O8+qBsFWLmBSDoZB}6y5FxJYPogZ2V+} zHsFB0G+20;WM)x*sn|mmE#Jry_A3c6zZra*vuK{4I%ld={i-)$Z=F56otm3uiEG$-^kemYAdk#b93s^J&!ADa11)Q2ETy%43?-MIl zTf;Y)(Ma231h4rJV4+8wyys>Ny6Kzw0~H0nyB_p|O`!h_cz}I3m<@BoU7HH3i^x=H zmjRyN6Qjpi8H{{4aJp3>xC`C9Q zTr#ce>GsumPX>lVdzLqb@=-4)lB3AuX%BEX3Hv!l{n=FF4HKps4Kp=p^)!Fl%_;h7 zp~G9Ol-JEFEIg#P%-RQS`{VtAcS>YcSCacNuAmcI)b@Cem22os^+nnsX0W6KGVX~` zI&a{YXTiaA2HwWp!Q9Wf-PTuy9h0~d)?n>@rh!0y9wcc{Q>CJJw#*cnkq35twZkL9 zCuJIct^l35y=pZvk4L9S_nE+(T@`(Z8MwQh5t+@5sOmQ}Br$p=_Vc7AmNNw~o^Xhi z7y&kYfIF{VA8XhW<$9ypmiO~Q%aw4~RmcLu17^`#UmL$7Zl+Bp|EWYNCqo7Qx6o{F z!|EQ^@XtLPDtc7NGRRT@C<~CDypx=nTy{Z>2&G=-To=^5JY7olSYYxcsNPD7$i`a} zp3LaYWB%PX_ep}9T{f%5!VwcYE$wJasy8cDZi=s200ya`-lBl_-19em>@)--WE#<9 zX=?270VP%y^tkIi7L$9{`(`S3nK-B5Ph~+t4t%}YBijlB?CyNixQU-aNwI>wQxFW^uC)nZ0?YUg9&bC!}*|klOgs zTdZi{W!Q*TA}EhH@zo^n>P#Tr8G)@`NjS;ec1!3z-iMNTPGavSaMz)44G8l&L6QTh zS2T^&?&CqbuBM3`*KVLNKY7;KBpnpShW%m^>uJ5qPkaGsa*@M-*s=_tKcd*=(8=bJ zu_Vb}$Py8>a8+{|$U3{?ejz!>T#efFUFHCdT{v*DZpeY6heoMty-6VQ^48s)?n*#iTxK^g z?Dpjw7&i8QrhVEyQ+)0dNdSL~kde{m*7@0nq45^oOU51}l}{s9b#^7lfulCwuAr0u zMm5G(zU!KyCo>V*bnTRA`< z509*!jO5xJ$h~#fQ`nr3vdf^kJYjucUxx_1u6>P$T~8Xfz`U0Bn=t&Bt*P_JNS9G< zcH_Ok>-5&%75Ym20?lpla)LFnh3rRx%u*S*BZd}g67wihE9;e+1yVmOi)WhXEC-yzHI>y2GK!ppz{^CDW#L|v*QS%({0 zc(T14<#?IHaVKGS1;92%3=%f$(kCa@LlKhp{&(EEN*(0($##53GH!_5UlV{LI$Q*S zz~Su>o_m*UJHZ(cBC(REBp@-DDKL9q3{BvZ4`~>N14inJs4_KkHvhed*Y;NYk-lfv zNK;CF>|cRic@zvnmTWUQ``yZ3D#7uQ3xV_e8&3YbRxREF2C4q!}1{V@bo`xM0tE?ganr9i@Y=FwuYU4cl`R>%B+U&o-z5G zTk2%grV~+aK*aW_XrL$Jz*mq%Dk;ap?O9SNf+#YY7lVm1x{N3@$e_lg_~2`6v?Ag* z-U*94If)krEhKv_Mj`}oExzmM%a=l7u(r7>J4a^L)SBcJSwHn^d%gW@fSFO5bniln z_&QrpFe)pN2v~}lc&Mn!ae~O0Qc-pBQRYkW1w}ffE2O^bgzgb8r6+MN!=rOAd&Hm> zPbLi#Dxdia$yUe#FT5yoYP3jyr0_f2TKaLsZrcoB-!Py~BD_tv_+APhJ-Egau;8PJ$E z-gIMmSLN69LcZk|-jz!=O3Ox7GlWln6yWap<($XbX=_CAevGgDk-Pb{(J{Jc_0ZKp zYo$iUmjAl^p85owf;bVGS_ z3;~_@8x90nC0@CVTUDAC!KTt`2;q2jz9m5iwMHAK2z=CyYwB6VjFhYtKp!Swi$eN9Yqx znhxB`2s7zD+JB|Fod+S@wks``b&g1;@l^@{Fa|fG9^BseUbSakcr-u5M*Wc3PI|0( zqJ%^>w2dPu5HkV||2iqr)ttXtPZl^U>1N?cYsMXY@^u>yeX88#n_R}cQWR8> zk{yfLnXnhOV&5HA!XJn6v=+s&=PD5MEN(l=K&2Hi2Q7%t)o@z)sC3Y^%U!D zrIFY-Z2Swd>fT#Vc?c1NTzEk!ZMJ&=+>)GO;@;&)0LZ_zB4x5{job5{1fhrIsneo3 z$k6oaTEgr*VLLR0k5C0qCDZUah7HFEe_2P{l4LMJ$GlYy@yqg}f@ZW28XhB+9&u`e z1k?6)k!-N0PA73{0c4i3e_o_7M&f@^Es2==fi{Le`oyiyhx|8I>nmKiIo1VRM@#w2 zBh(tF-yuVBy`KBFM(U|NKSp^Nv0ud*nFa2J*FdG6@rXqkj?5G9o5+u2vz$3-t9d#R zc{t#O=kO3nuE$y3qa`qoLqd@T_oDfP|4Yvj6wJQBOqo4= zO8k-v+2_|CZGG7{#+W=dx&R{yk+8;(f3an57bEnlv4;Jb- zqlq~KXrF!dFN046Wh*OVZ9q56MD4 z)~2VpLOv;r>&er2Dw^B0%5u)O9*k*W8Z0kwgHlhw!1?a}BSs0Hq~IB=uL|k!nwTCW zLM8hFJ;0bpF2@abs0piLk(n7C5E1qi?mWN#3B>8IQgkKPqDokOhb*{KWcqzzqvtBl z7~nV&O)F1_CjBAqGd^d#zUH&EV`3km|0oLMr*j?{k6A!;FC zS{=Rh&<_SE!9$}>q4*!kZ52DF&$``AD!CT+g~E}kxX+%6xTyEHU~7gt{66tj8LhO9 zFld`Ic!zHiDdla5cHJR9I}DGY)=ks*U}11!cH!s0kgC zcUA}cN0hoW|54?#vBL4x^xyp>csKVzsECl$Xh&2gwz8;em$Sar`nclE>2>WFp!LZY zg^GXUq&DzT^w*ESl12%Hn}h9Ba-KTg_WNj&=WdGZD3ahZIOyqAXDUQybfHJ4o=Q3M zz0J&tEjod-`dfF&b|K^s>`z@5%ZPP?G#t?JSzv=os@$g-ZtDGM-IsmyPY$ddD6(vP zczHCB>wN=w>)fYRxKt=eCVG&!FKfoo%oq;GL|JxZK;0Y8vMcLa+E;HH(z^=H!d(Lu zo}nYAUx%DMnU!?(cp2|BS4iI4UlU6gxN+TQ^R~rHs}xEDtEs`h9OHbk97a9(Yc(9Q z>|jWk$ElgvLn%>}*y#_=^2)r?rMPl~yi=5o_k$eBzMmTONSc}O1+xQ_ui#ByfZHB}GvBTd~u zJXrlRDZUZG@r7e6YY@b9k53tc%NXM8*KQKrqtw+MC5bS;nIX7^e&~kV*el2S4}J;* z4nrA~QDbAnFlAZCg~iLpZl_FE^4MtEoN^c6+|!za4;seT6X3y5T;5TH|aGYgPo*`5wIBaXMxgtKrxvf+Qb9pM;1F9 zCKn+44%yolr6D68sA`At>5nHQk!*ah$7G=E{SIg0)8yK1v4=6qonz>h$@Y&HX80mS z)fm2edbF90>R;H^{nOaVY_&o~#zb*t&~6~;?2+)2UDwb#@=G#UiyMHMoc99a~@4{58mw3#gval z!naCTJo-d(LC8koWWpS7aP$D$kmWH(+{|p1Ooi&;d?M-HeY%!WHQmg)FiBTU&?ZPN zdJJe|Hp^S&UX|w&9`)tWh&@sl-#xxdZ9PcZ5Z(IOuIB!nnV+Fbyu75v?i&J08A;`L zu~5VI<#s0mnNPu3Nc{0~{62Q7PR#l+hWeP~n_mhx(;d_?(e%H0MjPtTI}o@x9E-70 zFn;BIUvQi-MA7jl&Q}WFK&g|@2{hIYa;R@K6e7Mo#c}!h!Q<&ZJ#AryJeA~D-{q{` zd>VWy;$*v7rA6Q&aIGYF9bFae7-ih%32leJp*)_ByEcTC_7?cZ`wWY~RA7Xwdpaem?*%lNCY#U`;H0lf2E{%O z?0S+V+s~WhvF&X;2!hgy(`xz|$21y3uAG0$tk5=@B_d%51}6m5)ac|LNhH3C0uA(d z$+dKnB`Al9iOK15vrwvWO?KyU8q2C2m1NnAO1)qHC>KJ?{6!xJ_8l|k&w<>~h|@stzusYo zv@?&jXwS}AGwe<5b1QMx$KTI$`F%u~FZUW2?{=@58Bu=pP2(+|A}MEzRRsWK!=WtM z%UqOytl5k#$bxi1K^_TBnX}x*f+q)NC{Ud0y&HRNF}{c`kE@2z83SampNlRz5~D{n zGtEjVg}n0?zZbNYg16u=!trBDSMlI#dgoFox_^eT5&R46O2;JoLxqY! zt7FT4NEU;5y2nWA-U$iqfqV6_6|#tF)bK}`;dRtkm)Cjv8N&Bc?a>?Fl!lLUz%+=g-E)T|HQijJ8d7S+|n@R+1`lO=Xn>0sh1 zsR#>T2e*>%#{luZv>UhiGO^znniS({L*Cr-ToYUtIHZ2~k`tz?=lTy4HA&cKFKYI8 zxMQNT0iQa>W8zd@$a+KJlJTy;c!%oC&2pKtzX8c(A_nSw8XT-HO<=aV;s1l{kb&D+ zqJ`okk0g;T_yl=~E@oi-h6i0NvVz6jemg~DLwlC_t@gxPNzYOW?~s=$|iO)74fx zy$4$(cv!fNmBSGxCUxk2Q*40$>GqrZ(#hc%Kn-> zRt_LG8p=zmRtV^t^Xe7jWvxPPd97Gh{O@QI`vx{l!EIFTSeQSA1*81+=*}XY7nh~{ zt9MWQQVbjGFE>G+jOH83ocpSgF9$9J4fMJyR2T*^vkSMY?3G5(I z{*WPNmX2Z|=;!B!A&1aX}b}!^Xi^j(B zvRnHBQTSS)}}7hR}(v?lKQngW=F#x2N? zBgvk?j7)-+mP*~0Z??S~2DlO<_VkKJELjrc38H~+9L=i45iW;>a8+LWtxvwFtQ^EO zsrL!Y2=d0;pZ)Jp!kL)L_pW z&-sC1ekP^X{i?UPeqpYJn>mRuo24LL4s!4NYVQ6FYS?%@h?|Tp^OtKclHodxfO16H7b+^M7+6DU6H8m=1VReuYMEqWc!Hyrmqx^AHy8j*gDf0rf^rjJK;=!eQL*1GT9u%wtaB(QmDUg7O~&lW;Je8 zp!xFge87$5GX@ejM!8105wG-931lM8ONJd2F7<|X$e5EnrLZcVCD0uVQvh#X8t?L6 zbb%GvLxTY;>p|%kFcpN`fn_p?Po9R(7C1Yr64T8k{^`u+HqtF=W!n!OXoFXT`Y5m^igNC zUu&~UCgQ4+chAIEmmlGUJu`J38eyxgv;vyhxKQhl>5Wv6L$}a zE4>(XN>~w7KW2BapBl7ptw=aBxajDG`*wX2xX0L@f?2!)-Mfp5AaWo-vTgh7dA=_9 z@5E1=)3&lbPVt3E6AtBRr@l0IvWLLvJ{5|6-ZW9@P`b}mnWPggmXYD%`sBlQ0plfu zZ;JAW|KzDg$u*cf*e|lj74bQaGLz%)7mFdd1(^1(iC-%?d}WNk{5oz(3&h7IXbbk4kuSeGH`Yx>1gxJNF$39d3s< zUlvkU!EFW&`_P|X!zFMPTwknykP_D71ao+RbCJ*Q1V{SwM**0Vu7!5ZYCOaV{{5_Y z$CtmS`*orBtRzdIyu33d7iW?-DF7;6&41l1Xs zW68syygVrNGD~%iQsH~DJ@QHW?lWa07LSh^7yK5mGBat9AKuFl2N-r>)K<_>Or=6E zwpzBe(P?WA>_~P?4_w&Lf+xqYs)m9S@LBjiqODj9)&9+0vB^5!A_gav$sXl(`aaS? z8wuw`Va8IK77p?j%~%Mx=v9S$+XPSDMIr75v+{>X^Khl1`j@-Bd*fO2g)6KaU$_ry zZ+B`R2J@+;`IpP`iolxjw6U*E*^8A+kN9_{$FR^IXqmnL)|{NhVB$9U@AS9E&;C}N z-@-PxE@zSd1uv02$GmD1zez#8sBo-lf`#d;+qQPG30OD5Pi%nR?@;*;o%i<;rspOU zM&){A*I-PyB?&YZ2pIM4gxdfUUcasTPgzSg7-lNwi+l5OJf~K6iWH!6_<(pa)T5*utXg8?M$S<=x#VJQ(N|(no3(e{vq#0y*m@%*Kag8O;epA!#EGQiLo5mNvA2@ zJyv!dXK#F|HU!o$otZ#dnj)PT%n0vb|9RYy!0dHm+>VhpFY;LmqfGAAG*=&b&dZOF zuzAcgHA++txjqk633wAuc^%f(w{KKONcP*<5>t1scT z_g;CIdePyxpJswRV3nFLHhg8he#$_Jd3pd{xeq~vfvfCENztK$3y?IDK;eH z?4fv&mXi^FVZ8;I_!T6wkgN;pWng3&bbY1_mV0tQ`0Qty8g|qRwzHAylmLd1p2uds z_*`8f@g5%hK|QFfuGc(c+SL|ci}G6+zsCYt0lMFSx{$>g5RrPjDK$( zu+@Yra&TjV{0T0|hg2W>C?fXlJyFUi~c(fDAmfF_i zf;)!;Zi@-etQg;8IlI2LomlCRj_87DPaPJqFHh-7Dr(x5zyj#GNlogI%iMHP{e8p@ z)BbRiAxCal&f8k&JhjWdj#^CB9NzHo(^!d$X3UcTX=aO#;ElW2UfY&W8_~VQ-ZKc4|^00pJR8Nv2d>{(vWSx{MQ=@@LbLcsoV0)5#?i>8?Plr z-ZP;L>mnY(Wu_O&Yni3BdEHh)vaXACnWc8~_SVgT8n3f4a_vK-*xiAolfJXDj{Y0G z{~8Ss);!R)hSp!3;_-IdRGCjqyL!h|IUlfzH?XI;xl6f3KwvA}GP>67+BU%8kO{*{ zKQ$4WJk!d?e2j8efdunw79QERZ%0|CFgN#9H=^QDN=$|cmLiy+>{hk-Oz>vfqCnYL zQe1g%Zf<2^L6(!B_h{T#2wA_Yq_6Q^z;je)=k8FcS1G0C+%)p_+zXMAB5q7{p z$M2~iC~b7~5sFf$t|M|89F>YhawG`ZQ}lz&DK8~eo>J_fz0PR4uQ>ZtutS`2_s8rB z8jxl@8Wx|5LwHa794lMu$hsNq;|f5t_|B3n!1YfRw7XNfo=EJ(!rGKbEFI0dPD~yz zIOKB&$Efs*;hM>5ZpO56wFWvUK7k@=tog5G=OmRPe|q znQ*GTg!~#^a@wc2=2%se=>|WNSiqzYy2%UlItmOUoG>;t8VQpCXRWYa-g|n;sMZ>y z{l`5(y~KJx3CtoC2Z7i$tOWK|#&C@hT&fLm5__OEk@{JHbvn53aE^t{hgiJTK=ppV z#cRQYa*?X1U=!HgAENf^iW`nBn_1QPX@!>^|2^o7v!ji_}aM-a~>lo1FJK19nMrHjLn$Km0nMmIdL1~4G z?I)O`n)c@tX5{(h+evba7BTJkbATs%ndtxcm_g(a&Ssm?OhvH9jG1&tC@=D2a70W6 znbFG7mzKqRbduVmx&c>D8;~z@W$Abm4FbO>UhNO?wd&j2+glyISh=TX#B<+(I4D~FT5AE%wcgTBrxZCf@@#J)*|sZm>ZjtWumMZ98E2fe6+v;INA_U$)q=C* zeN=5O4jdlf<_vt^ahN;)jlAJ6tC=TB2IBd zS!285WFnHdHeK48q*Z)8??5_{a4r#T)%Yf=lt-=NABX>snZL8bp~mfxAHa9fA}Qc!9#*m$VT3GG{&ql-Q}%c;B8N{@?BHhkI$TZ7zaQD3lrHE zBq-HFoqdtkyr!ns-MDs%8D(r*z>89Gxx(W<6t7tu-k(o zRqdc~G6}}k4MVrx>I`L@(d>WYjAnG-PNKP;Uc}kR?>ywiu1hw~`ff2@Wyps<`43_) zgR1d76rSsmXrkV_j2w2ul`o4Il@6JZP}(P*67LS5LW}_1QqDxgp&)}|7`m-e!AtVb`dna zFAG~)Yvn#IG&9|nl6*w?%-AeZq3x2Fm-o_2U0OoHa~GX?;L2&1Kfc!G%0Ff6F`rDi z2nJWxd9soo`SoN#0~~0t*s*_C@SPjU`_WX`4L9-7iD|oJ#xmqq7qfnT_8c46vyTZD zIVvs(GHUtWy*5^R`Y3Sz2_CsO>O;1I@uZR+{U$Amr2PTv@hcFfg>xCo_dUg*nqRb2oA+U6jzTxq8Ytzi|vtlO6Elk*vk0 z@azzO$bXoxY%66R=&b}ApifdO6)E`RGZeKgPq`eBENPP1PnYtZrViTN9%eM_*%-jt zHweaQ1J76%%Sy}3nLs)^K$@0&LY{94!>jw96+bp}oRAI7>g7-_q5Y5JTMMFE5DyTa}vzzn4O z@q_JO2@goyzQKt;6jA4O2`Mj-z9{z>msNg&niDn3d}>Cyo564?*qjR-BDR-lFZ+Sp zL~T92EP^;=f%R(o9HMj-gr5Of1XF(huJTWCx6y(jri$%q@v?0j@bDLHoE+(`F`ni zP>}Vvm)oX1RV4VOANJK(8X306-WsgqBUtKgU9`%$|GxBpUbpovg5Sf~_I5r&R?2q* zsFUF$rF56H5N|#zcp+8)d@D^|*ie4Ot74LT_%(#DlQTc zkAjx8Odu#{m$m+z>$r?{3xTwvxI?b|yZgkN1;k@f-b=cQxMi10hO6dc)pE-oWc^m+ z46n1}fo~0w^iw{ioPO<|%Ne|`x`^$G_2Ls5kor4vL6T-!40Doy`yD}`wAvUT`Su3{jOd; zMzEb*6pi75KB-O|<5XExN#wYg<`W~+U-#>PWbifr>PqitCGQESUfP*jd*0Se_t?hd z=qPi)vgK=ie_Q=8_)+38O_y)eNp)IUKDom-CX7omaTxq@<93*(99u_0`hSi73C%`2}BSl*loatg05ou9VQ8$3BiA@`kr}yI?$BxP29wK(uRGgUie29pk z8PGvsY2^Ih4FMWi>H`p3AEH!TsPdbgtQ@;-tcOG}O1O3H7n?B-JUNnGcYF=-3f0JZ zZzvwsAgi_Y&d);LLKUQYF;CJ{v&rOH{P}6ElEL9qlPw1a(#YsYuPfH8{0zk}5v}JF zwfPV4LDl4EIGFdad@oRd!WDNV4d9zpqr#wM33v<0lcNy;#{qA`fND&606tIqCFO~f z3ziF%IGEpFy6S`G8~!!{QCso!RT9@o&U8(Dj?rOP5~b7$#v6?o$j|ckvfW_pX#R?y z8cqKOZTiTyLL_8~yzk$#9`X*ej8QVm@io26O-%})Xg~A;`mgEyqRx6-Jx+?ynmd|* zN_}@M+M~GK^qK#eF2Fon;Qv?vi!|f>`C1MbH(sHy62o{>^W?4tgWpTS8mJrVpuZh# zcJ~yrWFM+FkY6q%n;$$X&eBd#BxS~WHP)q|Vyx8Y{-qMMkeZAWoG9xUA$%u>uXoMB zKwA4&zqMJ-X&(4mviwaaPF$h387t1Oyks4vH*TgtT)U#u+E~EHX#{*&Y>M_XK;XN_ zWyJIU4%d1LrjI>DLsQeyNC})O;wj;5DRD)b*XuZ&NHIHZjH-K>p1|hB!1jw`J`H|} zHaW8PG!Q=aWA%8DhIKmoXXl?T`MmiedM`529ZY1b7&ZT8>>x>S;}3 ziL!CS1nY=T9E+OfSYfOazk?=QA_4!uOltxS+R4FbNpL#X6X3Bc57Kei+(clPOmPa# zb*%{vNSzpKd51t#BwIuB(5o%#yO}?r*ElX9$y#y8^x-Je?J}*AA~kAi!<6+TXvYTt zIi03J@$amZ3g4|Ed&o+Xe-6}yUPZ(>i=JE+=hF{R!y;K4WC?};lz(r=-bG`cJIS~T z99_Qs5MPlYqu5O9sN9@0n>dQ2J{Q&I32{sKYNo2j?6<~AzzfPp4rrmSm~zU;sp|fJ z1)6^z=Fx)DS6VJT=0&w%=46Y{$|SuByBFn3#u=Lm4r7i=-*I`IQd2%8z+8x#wdLwK z-d9;wP!F7hgRxPY#CQ6R4#K~O_dg!R=cgIX1O%B7x{HT0LuY5|-#CJMlK5am1#|)na#e9V(cMPUp?D)7By5KNT(I6xr>pzY-Cs-f0uq z0W@k1tMW5I7kAT)K97YfR$~mG-HD!aUc#uvS}qqoGf)nsPP)?Ac#LvTF++;4?4`eP zIvW5q68~=ie3heN5Qtw-8*If6dGB29pp(AnQ^=+#b?K_30b>R4*fCR{$bIgkBSDt=+*D;6xRvqVPX0iA; z^9kT~UQO7`i_IxHCeUP?lrK!kygY%sj)=%swLsMg7A&Raz1E*sU8FPqH+n6411ss- zrt2CXuWUB(x7yMf}}7hkr-VgMl;wLyXW;h|KqyunLjTb@9N$C#kx{MOzU}VUAy=79~P#Hj-H+_UYlveeg>~@IEOKS#!J3iO0W}}+{~+ljf7Ejv#ne|zoC8^L2nuk&h@-;wl3XA!`Ai-+iY?a@z@#Y^{X zg*Z<&4%D~KB96%8b~$FD-YIoybhf>0$Q3Z>u?^mk#T2I#F z&KJw4K}*i$!-82-oQsc63#TW#pjs}S(DCM#?5u8*lwE=6^*j_eH=bLFuiw7Gx4q>G zq1X3k$|gTDKBrqsgx{0sZriRe3F0=!1e*Zc+35rue{hWKyAHUW$h;i)1E&T3eG$K#Nk_ar#m&O!zUtJdxOT2qe#Q3+kb?*}qv+rG7)+gM zWm`c$UnOR@B;euJ==nd2F~Q#Fa7=1ez$J7rbDy0{HW^RL7ifauaLf1RV7~ z<|5&Ke5msUw{oRy`}?+^pSXMGoQXN405ViKBF-G*v$h7%wPldP$?%MqS`2*gdMeYM znX4e1@dxE)y%gKh-?)-~6LHKIGp3-(my>p(fj@(cgAZ2KDBn|qT@6V7dk?-LmU&OW z+TE-%f1ySJtBpy_V+SJOqORgZ7P>q#-3vljqrO_qcTxQ|Cot>o|mRqwF)V8sXQH_;PJND!-{eO)FPbrTfYfV1=8Fcvt zn%DF7e4X!fbL~M@g%h89rg2T5CGYN4&VGIcfhvh^gF%2&pO?|q&9&*~j>X9gLkz@Nn=klU%iC0d6aGqajTld@&{s2F-59Mc!pcxq@o|OVn0sXF?@Wc| zuqjD~1PLAyY=S2zlt$EY(i}(9kUeON3Fvd3hLVnM@lx(sx2u+xUt5dC@jxL%WOypZ zhd6(=?JtIgAO6y)aMm zDszv8u+P`C5ya#+GELzsZspbpk+)1Y85xb~HKK}EzAQSKtr5R6-Stj$%29(~S^m%p zHuFd12f@^tGcP5n-e35|AA16p&uTy9C4O!AU&5IE&fS&yxCFVy=DSsRB5$W_UbYAS zS_@W9Jyi2M4XDp49&Vq1AtC1d53>CsBPI0I_(rQYSf9ITSVXCBf}>_A5&52RD9+ojz|473(zx%8F){YujOo;BO(VK(-eyWZ(8|7_zm{{!^n2A?K3qm>=+*;w&SfA_Tqt_=-OwFc*^qLqkAUHE zT8?zj+qqS48lM*whU>8VZ?1ZURo_9cINVKye~crcxUcoHXL5M2>ydI=y_isDLO`inIBM1~-NJ=Hke$+ft&O*-9pKeqiGv zx10a@DI4Qq@`+tz(9?RNp<@sDOtKr{rxf5=8PR>x9L}wKUah#`EL;LrUE&bntf;$G z^G~I}>@~OWs(ELM+IHGi6DsRh3GCvL{l8yFUY<2UbJjfhe3FZc|I&}z-=42ja_J}# zHhf>ts(N;*HtxQ}ix*qstu0+jKsoa05v5F~K%!`ip86?wLDIR}!%`UUm;>^Z*UYsf z(cQUWHr?Ic5PTzH2EGApfZBwAX5E^AE+(@86GKD7FQt+nVAMUmk@rCt_Dyk*j_`>C zi4!(v++J5H_}x_6l=#{T*B{?1^i zJ=uKIr_N7LoQ7{D!xuadtP6?36MvpJH}xFeF0gQK!dC!h!Xp!aFd^Vm_RnzYZ`@LVcVRSHp6 zX-i8>Lu_C1wN_cYi*o|ZBBd`KTbJK8H(R@j-rto$xpTko_6ksK>Ssj^^*)~r?3JsS zT6IlJ8A$q;*T7v?n2b9o(S1b%9}fLZ_N3e9H)SEecuV(b7>a&r@hIjmv-E^t9?fw4 zTj#V|(#eb?@4g^_Ylpo26a2HR2@Mr+=_mxd>o>w z>mobor>=8ck9|wi=Js#*=ysG0n)hLcV!mb~Uc*&Uog97fW!ieNz+=C`;A<}LoFul+ z-b+*_+P84=9G@}boy>=%*$elUQ@fiNnC6*wk!K{0PSfnQ-SlWm1OrZ0VN62Qr z2}AZ8sAvcsaNFwzHrdMvQ8~msSR)`j>C-!2L5+J$^fH5DB%z!;&@O@fo@0$sOf$C5 zGshrku9NGr-si6VAo8Fumr&f)ttE<=5YiIX z2a!f67#qonTJb#g3ZBdFv(7W^uyn~kLI?Q^U5S0^F$H&!U@jsxq8VmP!Ae=!y>@`Yb$CdskZ%tnjF( zv$+`1WXboVu&ZBNC!%c)SibeuE!Zp>poqQR(iAw1JeCpq%X^yPQ9qLShp&BR{Vpf7 z!&3_Sxv6t`u;k^=!x1;Ux#K>?nb-#uLh#?^xs>iVMF6LUDif-e>vM0X(UzDdZH~9mEg5EEk;*GDOlb76qNmr}t9a zP7XO01X-nc9iZj%kheM5H13k~{i7bpB~3=ivnh-N+>zRdORt!@>pk`d+7nS;=hC(^ zsZ<0!T3W&AEMwMMZI`rz0;Vxp#^Nxygb|5`ULKG6ORBZwdnM0$b0`-SIzzHXuk|#a zw?W$g{<=3Gk8jrMM>~@f-5l86+tOB4G7kRXFfDq#gunzUI#dA6Ht{D|!_eH%jmg)O ze$H`!-}UBCWNt_BV&D>7>6|2(%NW7pGp}HE?&`AP&Ye(5`VCetW0yqmM?f6 zwelz|;N@n_aa$esaplgs%zVKet7~&eq7uLrl_^&+%<9Nom|LqJMWnE> zktN$|bFM#g;18NI;>5a5+idhh{wS>fy+yS?-Z~bfaQL~F%e7`(?4i#|cPjOiHi^#r zW^7J^N#r&r?0lMKZY$t`NI8YA^o?hr?V@Zo*MvZd4T^4t0&FzX22<0|ln$%j+hDnQ zJ&w7b>RAVWNUzp=o0@=r0k@VbkzqRk`nybH2Igp&q@(pLtC+dpl78lx(#NbuHJw@_ z2?|bcXGwAqoxM-@Z(;GWmKWUVM5*A;(>Hq8G=!V!2~RsMnD% z(R4GW760ll@hY+|HGQEKKApxQ04Fi^Mv>P#-VoJ7f-ohi==M;tzu+_@1ItgD`u6{D zFpdc9`_%t8;w8VeWA7jU?*vB8y0qU+=6iTn-?1=SY|rD~aFju7xZ=#e69?`wnC)z2 zd!{8Ce)2@3FhikfDqFI9UvRVpfp}im_97KSmJ0qopRx#@EUFqCt+oG3#R>)v_k9xl z;tQKTtxSFs-}mW>LR*iOVZ<)Q^3P^_5udK=|#&5!vDnTApqjGg_ zg4>NvO`FCp+csX^-L?7g-Z#Uu)vh)+ZPr%I#`)Uj?Q4U2Kg}Ww0c(+juFk`90}s}3 zk=z}Pd9JJ zl+Sxr^&C05(xDL;GM=3n;5S5B&FgdQTPh$oxl9GUO6s-~bKFuv(GRw@3q`8;+`$z) z%S7jEG0I(VC?#DeE7PYUIsCd8WXt&o^L5?Iu$$XOsB3_1prGCQ(B-DKnk^A*gi=QL z&n78wY-4ZZYeQdTB#u7CuUWkcGoYJvW073km#}7-yTfc0UJ>$IIiP7_!}t>z)yUXW zph3yH)yr{2k-Yn4PXjm4R%`4HzPejYzH;NYP%UaPD|^KSnZgEA`IfS#GmVxPSo!Em z6+`Z@UD&Vxke#>&qL&j2hlTH6<0rRTs^o>}L4ROt&hSlT->6@uSoMAH!2!!vFOEJ* z*6Z|;BlF3t;lG2DDV&M0aJ>D(<^)n#^>_XI>W|;Jv&2Ec_fIz8HF93$7kga<>N~K| z#rjnM54SAzp4oH(J}11cFJ2(TPE3x>HhW71+K<%MsfMS175e*e-A&82J@xxXUfQ$3 zo2wxa!_2N3e{sEDIi3an+FS+_c_y z<;&E-+Y&wf(BqOt%(Q@O>{s=Uy6*>Pjf<9LL<$$GWsKvimuXP9w!(n7ijdm`G#Gvr zf?k|LSVR6OqKH{!3QzglZ*z%dAUD3rmjMmQj=xu~YrT7wRF?I5y^*op_`AMmlZ95{ z)_8a3u^|Q%&{q(2U>Pu}2bUH?E=FxO`ts;;+!6G>!iihi28PUS#P1?SKzAO9VZZfY zVHSQg2o${eN{o2H$A_JkaLfnDk~;1|F?jfIO@jLd?n78cS96pT*EF`*Bg(Yvk@pAZ zNJnw1j4QtFPaw;U%j2E4!W2ZWhy5Z_HjRYPrqp(&cs4inU47u9PBOY|PMk@c@R_Z6 zsVC*dQGoHF#Z0N*?AhT}s=fG)>}cdV%PZLfq8|369#lg@y(pDU!>PI{T&;@6{YEo~ z{zLNer1uN4^e*gg8i%9&wQ_HmnPIPAf907|PTy+xTZ0R;ipsa{Z-T}S3URnFPlbTK zmwxA%F~o#l+(g$#IZPxGfbzu6_QAPo;+C;X-veOOCk`&CzzyS!xfMq>ZBbi>g#hYZ8~IUSZ_^i9f>ZF%JHT5f?~K%C=j#)? zx|$h|HdK>=-=hoWFt4FFiBAzgPAp^?49JapYEfDaWG^v~lpf$(d}-;lPUcLhlHG;$ z(;ghtXxXYrW)w0{4qUh>^+Zha(#`()ovUiGF|BWz zc6`)brftO0J~;_eQQmQZELoc# zL}lI$NB&7>5Ffj~^G+4oD8_XR4MrYMNHZkbiKeY`8GAf~?-~>Fm{!VvD7ni=wHo8_ z4F>M+QopVt=Gy3?K7muV5Db=zV@=I6_{(r)_t~<1hW+Q>6+>Ryxz0we3s`hjvd@7F z>I6EH+)KdQ%P0L@@;ndI?$ zH;;()nO2mMP90Ocwc+e(s z&MyBB3cJHLq_uWb32P$@PCihQE6ynBy1>bVVRr<)xgT9Yx4}0l2EXJu(9{MQ!x0@t0XE@XbpzCws2AyRs`a7g4{ihNs42&W~Q*Z~TCzdmTf2j#G7qadO z_wMN@){S#WbF11m&(GJH4^r|zLSwbE>Mn0zr6>DaU z*yu$UKzn(I6|lot`vF_c~X~4=7FnH8Wd5fxuSp4yIiQRq#NNDVzsA(3{Ysq@}b5+_% z2bn)%6;58}QM4LOL}acN{XG&hqfX%Oxdog6>{46}-lM{h;M5FzR6_t}NxL+DpAjaW zFQ&XS-;~n7qdyAWyqI@bbM(~QQzQyj9c&2r3}izs2AnMAv~9UMMl^Y^fy|{V!76^% z@wye~`(5VR)f<=n*I`CCqPEPPz3(D{j{+4K$Hs3>QhCK2LP@FQxV@Q~35e+#rCvVO zEs|fC(px$oge0pc60mGx71BZ}{XQ#%rhsc@kZ%}69SNzgk5d$O)fnYSzpCj1c{pAr zcwtY8JeH-QF`L)-4D+pYuW6*PSMr>b$ytj2Y=t_P4pn6pSl zgpi}b0>e^pZP%!b*tacN?n717$Pwf;;tjUAi-}Lo7;9X%kt9WH3DK#?Rk{njf;!m7 zczo)6tA4UCF(c98dwdlM$Y%lb2$P}}wQZCZT4ANA#Fyd(!?MhIb))=g}bF^~iLY|iEh{&yR_ zzL?^Qq26?`IJ1oo`a11s1m#I@ydF$+bsgz+J{{xZzP99mv6Ht}ChWJ*%)#$z%1Q*? zW}YvYFkCk-5XZybrRs1n+`k*n!XgQmHnRMR@AqoYLVc?BEhOsjClGDn4}>dXwnDI* z(Z(C>h4pC<=$CT^QD3zGrawR@Vb7e(&dT~e{sP_(3>J*gZ-HO+q+`=jS@-cB-#U9- zP_=)LJa?<=p+_~$Gx~e5G<-bomDTqQ0U?*OEYo%4@Enz}2k_yH9k=&WVPvDgo6&G9 zmp2))cd@F4wj1?o0yMJ#8C}fk&>SXsrmZ{J^0vp25oZqBOh-#==)JgLzCN%Q{!Z{Y zewnIg;y*MOg5oY24Y+2PMmKVIL+&y4up})D$B_VXqx(UC2e|EkaP%H7d%U3fLqNDnJhhPCRlr$?j7=Do5F8!5kg*0RiN9}cgh4fO8Al+G(Dyax!w zWocY-Qs)-IW%Y9oS&Tv@`$hiStP$E^ET@Z5-{6Mg;G<(ZgK7{JO#99h0M z1V8bmJ;R3DFl*z=RX@~iUFh|B-Eew=XwdI+l|wv8l%;sbUpDza$9q3wq;ul#1$Yt= zKaEW88Uc`g1*brkIeAzH(h3?z;$uX?WG5PGu^RzC8k%y)Mf~M(GtJr1zZ~A_?~6I# z=TJx<#-vjZMTUkY89q)@l>c}y+k$GEY_6Ckj$E2KW4IsLtJR<^V;T55ENmbqYmLF* zrFcb%nwtU@PRqva@x;0>(W?L)PjqSvIo-&izj3o8{{{lQ9lbyAGLl@ zKBqX4db(N`Bjfshm3-{mleEl^q=x}p?r(<@;Q`LF74=$Z;kI6(gKo3coR5O*mfN@6 zmY9?JXIErhx6|sK0Bzr~u?d{7M&6gbPjcu}RO83^$E~j!Y@SFT+<}|VytxvYvs>&b zd`g{_m8F96O`MJ~q!4&v#CA63MLPhj{TN!V5o zF3yF94|!Ev(p&^NKL*Ab<~AG%E%ebfxPT)7d8_eFjw{?_b{#QrqP$JT3+-#}efx(2 z3?1{Z{K5Vuk?nOxir{otWaN41Z4fV-*`#Jx7YmdGM`khj#Rx%&7 z-~Q5KYK!UBt!6Ms^VX|g@}4wZF8-U@9^p|w86+ool4YCaB}M8XjeN=lZD6 z#jloL4&JtS1H;vphZ)9_g>2(Xea{?kPUXaxozY?EI8G36z{hY(3QXjlj z#{$tLkCbFsL71WnK^8Ki-!uo(zUVU_qC^V-y{Vr{gd>Icc)!^kojK`i-Iz`_@n(sd z?~Nf+RL_EB`pJ7iB+LYsJQ9z5mVnnvwe9aH^S@zntlI|&WvHMq_;X=MGtZGws?Q$t zJAcT6mw>l&K2d|Vng`uF8^qJ|43YRv2qzeiug-`Rt;jpK@j!f2<(IH0lLQW*e`)UE zLH7;_k0hCYKsd*T0bX518q6~20C6ghWK@y@WH-hOLne`1L6^pzope&zwr^Tyx56B$ z*3>c`_?zyJGL|*_Aba&wx=USKK_abjCbC4&8y5vH*_vM<7dtulWzxGpF>k0Qe!*v| ziW(NDTbmn+EfxE*=S1v9f;S8Yaz|KmGbH-zv>Lc*%f6=mk_6cL`K|o!qqoE|1H=SB zBw3s9Is5BqMqL5!Z}dN)DrLUN&lP?c^-J+)Ly5&a)|&MB@F7R84=u_E?H|L+rYxYY z%ES93`Ou)WhhsKO{PuQ4pPK*yneoLfXcufkQUJj*;9C>8r_t%F(i9EV?p_gM`fo)`=f) zS%2d-fUb^~{bO{$ZoMVWlOyo+Nhv6de4~WrJcrCqQvOZ6Q}0Yn$s-LuQ<-PF_b!_= zv9mr%GKuxV>~z^vy-K?E1NL>be=&>EUAzY=7-yr>2B04A$uHqNji87ZNfO7UEse95 zJ2T~Qn7g(?i@70Z!G=x92My+aVSYx$s$E(!L$0oBuw|0`@pd#(pR4}L8uNJ?SFLl2 z>F7}>5x--_5hrz;RlS|$Y$v@1fWNUnP#&k_OipS2XO8{<%a?Gz7dKlq-Dy_i4wUmA zahwMASY5?2l`%Ud>N*-Vu?`_sR#rg1y0FF1eAU@A8oFOi4(gTRGv~%Yz5@if_^ z{}XQFh(k%L&?gG0iMY)TA<`r3wcdR5%_Wz~aJ`$%d?R>^PkOq4BO&h^N zq`G9D5 zop}NT>^1$>A*Y%0=^>T<+INoM>^DpP|NG7VQif{0EKn(H@x(z=umJfiH;6vDHhjqZ zgU(8J3Tnbn^@6Ds$)33&)XG_0D3IAb(9SdoB%X^*|1pSEUsPLv^w?E)#kc5h<}V1j zUb1h8w$s@VUFnZTwhQ`o$vM6vZx+XXLH{QY7^Ck=+Z{9UA%-=ZxOpL$&_C>Pas=3Q zwV!Js_~3bQuH{m0P|OYdqQ@@qc!5W<3I# zlgY7pQjf)zJ1_NuR6ARH*a}hc@$m%%t@otA&pQkd2GkYqaZYQ{Q4rgpl7|4i{R1gaRiQ*7f(({k-NOo zk_5#Bo`@_s?P@&R0f!n`gLC{SYp$Rsv$m~;2Fyl* zmg6K)h~epcv?hV82C^6%#Jyqu^LLS?#|yh*ec7!CdLfP%Nw4q~!nyzEML~}N55Z$rt!$@2sn;1NZeOw`uA9d=Hb*{^t&vq8%E;;>(PxyingOVpWOQO;4*#p- z5F_T83KsW~7OEJw(^!Mdt6z@5Cr95aCbdo_vzh(aFLQhUUbS>Pe^9 z;pgY77Fq~#4rgTe?n&mYB*e~ZygjAOkJV}2=+7V6Qa)E}2ebd~eOqdvcr#puu&Qn* zE9<*UeeV3P_S^GlbCIKogsz#g0?H7*090Y&zLrGpl3NOzWI^zNJpdK{1s1IKByEyv z9w2}2d8$lyiH6mq53?zUU|^u%Khu*|M)TJ;Qjvs+%}{qN7yM&2uyvl*uo6)=OYB5YnPvriR?Oia|$hQSO*bc2Lv zN_Bt&akuNIRZ!jv>Yvj^>y2N#wjcO|>bT&ROA~F)9WoQK=X8M*GWVnD>&Ke6#o)U@ zfCZ*(5V7mG1<$<0Z{YLVQQEk)M}LG^UzzJjaZ1R)^1V-hQ71lf5>0Ew%=Lryj1AMZ_cltwKN`i<)Wm_b^lMqGmOp71MOwd4ovG=b-tN#3Cyh7 z!Kg53ue`|&0q$%q?wOupp<6B3Z3(khXA%v%b&I|7rckxxF=( zW7sTo8>e-tFjd4MonAweguG{=#2-Ax71EAlh|%KzcXn~MD8)V+jcz}pvqUD33o>;L z>Y9Gs7`9DtZ`!=sJ`?*G|3^>j*u zdHZ(NUu(Ro>7={C$I zsZUPi^FDj`zX~;Ak;U{WuEU3&)E$6;PJ&CS-G>3k?>XgNp&CxTkq*9VKm6zFLHgax zr+d?I(|8~$fhp4x`%M9+MeB)*&`_#so6vk|Y0b-)FX#{c)?%uv!ZX_N~i`$L%%G=Oq4I#H-)*N=o8WZjN7DP5)pUY^kQiSlj%1te*>Hd+i|_K$$&N= z>X~a#DX5)Rgx^Z);|IZgfXLx9t~DNE6adG*+(vy802;BCL)$nO@w`w=hFUI544TFKw5cK^fU$TD$EE>)7Hh zckR?{7v(#`PEiNGtKq;#w-$1~(v{b-wtgZN`!?G#n8C%$4$c0S=VVSj&^^v{zTkyIT6 zebZlV>wb5x#$%k~;#Y3cUp~gOMK?Sg@(mK#=A zVD_C51c@htCAfI|k=XCAr1#}Yckq+m#0avJN)1HNt<)S-?iPkVgU2OPyiXqyOV|E< zb1ePwKN#i>v6o7yP~^#OjW~OU9$YA5X+j5f#xQv4sc3ucDG+-u&`~MP8=$RZ8K5(N z^6x?|2`g~V7b>7E{l&}6>#Cu*o!$PTTYum6rQS|;mOy)>JrpI1RNVIUX)(;Sd~8AA zM&}Q(q?`l_&=zP_t50^e43Rk*NpZ>sb5{-gTuBtAnE2t^2X$!tsy(tn*-1b{w_JG_ zPYr{!ujS_Cd0203xO%&cZ>R?mgHOxkKIIg+%Vu{4j%CF22%NuGvt5aalHZgR8?Ak| z284f5{L^!t+5|wi+R|c?;6PaS^AR}-j4jCIHF({Q{G|#Sq1`3D!OU{tO(TUo(>wa~ zIyE4MS`c*gbw*)XDE(B$NCbihe9^NdS7dmXIeJYY8Lj9x?pN3$k-3N1H{>6Dz1x5Z zKQ)<*_+EorEEpbD=tZ!ktROR+d`kBxs}x{GS_99sv+y~QFvxny_0J~XN%6WHux8cM z`U(Vv`ke@0Qe+23f%?d&ilK4P`1VFCXYd?<O%A>rnXz6xdNWav@d={;8%Ma~a3cbuKd5Gt}M@8`zdUHlue#nnZ5-Zr=0 z3R4|wEdg2Np4ajoX5p5!G6%$db;a(*4k^`0{4n3BsD8yzn3?B%Q{c_bXPj_%>FNN& z8#_Yo0GO-!3-~bP&%x=buhRNYa`gEMt;%r;I0 zpt=gJXjuFM-Yt4^Ef;}`wJjr~q)A*4wm;=srR*C-Nlxz2ze_%G{bruwTlO|fAj8M^ zaoqDKJa{LaZJ;ZP=1A*dQsHET_}Y%;yw}{9X8%Yv3B4fk&Nt! z#bf*ubdm91__zf6$7^Z7=fvIamux}oWxSf+P`w`9SoH37QSw|6tmjm3G#DCV!&>TD z?<9O|ODBSG5)HeO?rlaC6e4=={*3UA#eS;jKEg=@Gbn7j&qGIMrDOD6O;@TNfoZ&` zI(Ay7o@~yyg(tPzrLb^k5j)X#bmouqRQbU2aBZkuZvQKBGCYQ|i@=1c;%JGU(Nlej0q3QcQ_OKFgO6;( zHj>Re@s1PKE1BCPow2*{osx1OYjCi_sU@kTKQ7y4 zGjqUpp=?8zM4*F@?P&n2LK*)a(pNZizk~ByV#p2TSZ|TSwU%s+o5?lj9Xy+gdC5pS z^Oh>5+J#`V?js3@S1FXlzA@a6Y^qWlrG&0~4cxmCWFw>MVXM=uVj9q+0>LuIYk}K^ zs!pB;WG~ocxm%s{teDV+n~44lj0`cG9=D`3@kMC&0QPa&H4I2Y$Q|sdx83DL?Z;=u zfZHQrEBy8Xr{6+4D)e!#$J@R!^JmN9t9LN3xO`Dd?%c^j>#r1!k&vUWe3DpEN1t%} z&DXa3?HusxZ^zsu)`x)>dyU-ToSab8c9nPmn~v3|e7VwXMtx&Kb;EL%pTmM*eAhTP zv*H?SSk0D9ao$nb)dIgbG|4WK4mlplvEq6uw(~6Y>IkFfulu|7qv7KTj&D~xh2}`k z0^S}pPOdt%ob3+P5`H}tLEK|RWtn=8MK|#b5Ugg^BRg2oIpIeXh?r7Q4sbIDH&uqk zklZDsx@GE<^!~QQQ4i?WoQnp9UwmNm^s0q52l6r%--+94{D_(ucmEge6lZ64TIqG~ zaM6g=|z4cj%i06A{5t8 z1G3lr?LSjqPbZ5p5@R~k_Om#p1GVs4ap@qvJmdq?DH#!dcZ|EuZg_3 znr-y>cwJ&oT4S#-$FQIrrx;t;(}GY0-R0HgShdGJ`w#L5*+D{obqVKWO*Q?cQ&Rr? zM_IL|a%UH z25{L9$wyJ1u1QE>at6LLzPpssFwYA5tu`c9N}?oOTJ)=!S%>*GHxb8F8KVIw99Slt zo$$NPFI&oc4=*^>3*&Y(*n!4)WL(oNXL(m#+_V`f#cC4{-x^zK1v<#`zDV1{E&h7& z-@ReWh>Pvc^oX+7{E?lGN;p*z243xdnhpKP?U`l!Ue%QP#<(&H_IhfHbLbyDTrE-w zbAZgm#nDG==kYq&v)J&|XGT2e+vw^JZ3A1_RP~uTWfMd6gn8B&sp; z@yEVBJIQt8ZpECjt779CD{?cubGZ!2#f7PWmNjdpO6g5EjzJcTXTj6tU{=8zjPN|( zu};v6suRu{?b-pnuFFG*&bUL0ESL|cnmQ}}S#{thlS=o*GFbe-Y+I(l?$Y3wF332m zed+K2^b0AKOSw&3t|7TRhoyTYv- zu(2{DlnDu*zw=c=K?)Bhv+BZKOiPU*o9R}I&!OEc=o`ah((J+pX*e2VRjw!L2#hQ~ z5qmv8FE+Sb`L{+8!Am$v;H@Bew@)*p!Vv%b2?yRDO#;wZS#HR6*=t$^U40}khf6qn ztH{@Z;Cz)`5}8<; zk3R+|m&TZ^Qf=PTy`9gJfEj~O=twne@=ZZkf_(F@GQR|Q>@~pY^rqp^EW1XFh5{36 zQ&PpjmV}0#ZecHrn2}6VD*(}HG4N1w|Fz$f-i@IXQ5l1Zyqm$lnP@xsK6Z;@b4g&d zpF&%Z*{NU}|Eh4dfD&>Yd6jlM9uZQ++001g+;uA7Q$Hq843+sjG)lHCzz;J1;|3{v zojGIDvnlc%!+XH=K=1o~d=>(%OT@xgjln-12i7zbc)0YR?T@}1^w#8=@nr#& z#JFr5GsK@6zH9$NuYE?bdOBu6p%-)Tr!=p2nWr4OsoKl6E+ab;6`O23Bf$XVm8JJi zp3E_8EPGO*D08f}{gSSK3w`>7u$(Rc*^vmsHZoCC!r!vcwu#cKm}Z{BR?X)~yuq+G zbNEd_FbE>_49%;P?5wB_6fmr`WRMN4p`qRUYE0ep(Y(S4-JsW>80oFZ;Vaj<7H^tf~w<#M&hYG0n2z^G_ zo>SeIB`az;;PVc))aWU31v-U7>abjhRk!cwHcQ4!KFol8bj~#Pq>>EybZzh4n(8MCz?3?coS9_E(7%8&e95kS*F6Mo^WUI4UxQ#m`zBl%C%zcIv4{GVr z{Z}C<-Q9^t0SfitPq?5$#wjLyB4fgxZXPa=rj&^`J?~*!Ui>#czmtMd~VO5^a(7fT&8=c|f_Zk(`1OViPNOs5$6PQ;^|EA>FXfOg-Z9dKC9^ z`0#=3g$L;~0Mt>jK235Wm5{pQ^S=ME-`CiZUmut#cpNHuA@2=9$BGni05irb!PkMv zRlfbQ>E4H;!?sl$1yTMH)W-v%6oub(K^vNJZrpcDi$Yl8^orA}2UQv@5h8@GVwgLD zG6GaFW18HW>B=&gK3Vw{T|$iD^VR_SbGDF6kG_@OdpHitPm=Nt=_<_KG60pp_?>l5 zCCmsb;=?~0yZ|-Nb&@pmbg``CXHZpz!IG$MBqR{b@FM*(BTLfQkc013K#-Ca5NV{8 z5|A8WXhb9g=~5c$?x94GE7@$>!t_g>feW3IW*oY{Nr zwbxqvUhCY;R*n&Ea*!VZVo1h0{Mz=(E|fsahI57tSuhWvZ#xE1bPCM^u27|*-N%Y6 z!bgXfp~l250qF0|Dyfz)QbVa#F>PdKm53$0TLc&(J94s@^ai?y7|RqRSC15txeXz= zG6~6R3zpSX6tczeN$RLfF1o$^hsB?gl=6(2l~H-)UwF%0;ZXhvbXujj@)JZeLFVyV z(fv1vFh%_kyvT@DH56q9)#k}yw>{d!8YbSZz2A*r%?l^_XOFq`T$A&Turg|zCPxQ*=9u9)MJh4o*o=f*N4{C37}m?}fpb!ikj{b9)i4Uc-l{vVI-7Y&IC7ev zT@+sS;z(5X&94XK^FQsVQvAHsV-R!~N91j{eh=UxU&8W;Upnl~Js`Je8G9&|p}eq_ zkP4E9taEmKm~Sbe8)Cf4&LyaR4xAtL%C2bf3MYz2Q2z*A91RSZa((R`yg!DyRDVx@)3hbtMB*Jzn$K<+ z6`Br|l#O`>P9=lP#*1wUl#w4^87>o=Kh-_qT6-j+Y8CW5?P8hlaI z!RM{*{1JnR#b-J_OosSc_$|62VvO-dR;%&5$$tq*Doiv&GORZ*yG(*~nXd_-FLOAt zpdG}6k<7erl$m2v`pi$?39?=ffm;8^SCWxkCIJ z^WOa-!ZdQGz`?Vc4~>Ir583dx4)qQ3#rw?|p7TnPp2^*@Jn*>V+avZ=tvgmUUn#VX zzQLeCH>h#y1_L~Qt^5|}fq06XIll)Fjdu2%LT9arW6l}27RS|Uwhle6UOKfijf(fk z1qFm;OPv@bG*DXjdsx+j=m(MYZHdNi2Dc@zg(4w$655ySXSIpiSnQOKBDCsWs`N(?McM{(1P=gAxJ%}er9Ntg_Fi9 zm*sS-WXa>Ij28xiQZSdjLtCa_)ruxM_R^a?dRBJF!P6cJru8--HxWky@OT>uTM{%1(?rMRYyk|CZdCA2Z&e$ zZho1W>DltbX*^dQuGdf@SM#^gwuP>pBKp&DRf1bpc_VTy{q{0tzC_O_2;@6u$F1vx zn;ROQ7dcECM}>NB0~iqRXoPd&<;QD~d=V2*O4RQPmu^B%Gr3a%us4tNzaZZQKV3;x zb@TInyrVP?z4b% z6-#Y|Ian#91>v;rp=#B*ULei)zv zt6|8TeZh}ree`JSg|_uaWXDX)?{l0B#zHQ$b67dO$w+#JWNu`mzyH$C;>f;M0oBEa zLrl5*X)OWeBrS1_3M@HV>f=w)HX}Axlh#X)1N2?JyjVm7vPdA3V-NG zo5F9?=y9JhgO*GF)3akKhDFbr$$GhqnsoNR^&u?SsKM`M=`{AC;hT^w{Q96;3FNEX zZ?2~MuwBBUK){&V(t37eQI3rbXg;AlVRy2D>+Yzjn5`=Tm@mL^b*@|@Ga`17Z9@K% zsUrOt*>1KOwdPz369hrI%g{?ry7Vb%BlO_!y-EqQhs0muQ+g0j%6SL1`yIz@LTr)m zieJ7#G7#`4VLa-kbJgS&ZCw?Nc;=ju;-;IYezucEhs1PP>=VFo6PhCb5|z*hqtkKd z3n2T&>_x#?wnSGMTupG z@9&_!A;7lEOj9ojLh38#Cz-f*Gr9fO+~}qbB?Vq&eACr0&Qr|*)#q6l;3L@=gWZ&& zfRWJ!7bE%MtaR$(?4B3%o;S_yEHu8s@}jt+U}p3Hl~vi_5M(q^=S1keH@&9cmT>na z-=E{28k86WjTk$e0FYW&$ownq6gzY}?kIYssxMKyqmM5T;m-G{{|tpp;y1_}mhcUJ zamKAl8FP6N@Qibk-0PAAhC}$t3hg(DDV-E@(;k8fy0M*0Isn~NRaVybD8DsXnLi%i znVidDMne`6z6LpFPxjla>-u=K{v@GM6(m?njdi6uIROgjoUbNV8>e-Q9n;zHr@L-$ zK!&Z-!crS093+|?+uJ^&8Qd~l*&otM6bhjl$5kYbe6R#XZtU2PQm#{pJ7Owy7+ELhB% z&cgydOiF-nhjbA(ZW{_$ZW5_klX+@~Y+^2;3wD{PZUp}J9 zCblm!fSTq-*#wBp6buEPgS9(~T!I4mVx?3Wyx8E>;uTHIN-QW`-NyMZxs#YHU6T%W zOQ86^$zGIa;h;;`UPP*pTt#p-9^mAR>`K={OvPJzkN!GDK2-0#x4}$H-*NG+Tq(gf z7Ised9;}OB$p)GSok+@4bobaw&EK^Scg2tVuU)>&awa>p06FA*8d>&mYOLX=$3`nK z8xKC7a_ej)15Hqh!Q*Zy>nXLpn?dJlTf$1YX-Wz?tbnM{UNWTv6?_p zQ=OVohJyaS$jk%=mu06Wx3y9PDLFyZ6`$PE`-Q}MZ&=ZV2~P>0lqVZA?u-<4ma`1^*%WM-jO9sRME-PR8~e|EPKApx zg4Yt^$fKPOj*$QOBTPKY|7^qT0fqxKt=L-T>a5(w}awM9Mpx=^Fbq zRC3n&&g*RhjQgY*o~O%(g?+eu>yED^$ICJY(CS|pFn zi1@)^9B(0mi1$oN3L#;qm!bMRNc6eU;vlj?wZ%*>-t*~iSR7&HN9o+H5}wHN7U*%o z)U8A)-+%QL_#~*om|rjvUM^h)Gx#+@*l@}3;hA)Sfh+oN2dObGwbZO~ zzqv->-;5qH6*Xpht*m)5Kl@>!u@D9p++Uzh7SQn~8; zqgr_$eSSv_5mYBQhBGfI%>oH{nI~NSRgGs-O(Z1TF@9ggIcePb=+3bKi*aNaLO=mc z;&i07VL-&<7EpV0~ooftDXMPvXpUhvSv!MqT6MYvZ;#yg+?Hm3rSHnilochHF{QT z&``TYwPzgmWZY&(UofpCz=d*J=|p8W-kSJU3fVjKKjG4_qIm$X6JCj)L=S++dnu_6 z^=HnOL1{z4SBclu9!y&VfRp(o9S5YFef0J>MCSLP!Vj!BXNOC7H}aEn>)ROy*jOF4 zjCe8Ex{Zs-ch5Cls!{L`4|lsDVBb6pejFI^%SL)q;3m9Ud~1gUskk|gavoP^(kIuN z50yuZg|WE3;PEHNkkr|jc zkbL>0zZ($C?_i_@i(JH;x2poMBF=z9w2>O>vf1zMk41#vR--pfc+qbqU3=xQvE_YH zdIQ?$mRL(n_RRodxH5J6e+hb%@6v9kC-e}d?EzL?<8j;*D?@;D`#%aTUoJ3k? zuYRXDYc>C^W;(z7i6$-z2#v7kwZ#I>vv7(87u)dKWhhOQ#){32IzeZ5*B=OOk zi#^k)NJ6%lWCitJ#nKIG!iRM+%mQH)W=zv&60ueQH_a(pR4u_*B(Jc6C^~-$`S2gy zD-zu#wA@6uv(yW)wfZT}%>4;kP`K}g^c7~V4Y}Z8uBhDc;YI9Daktuyc47DFesyPW z^3iuLX9&MkycxRW!mvsY9vQNhY~@m!b8xf=$z=|z-3PKcv_BXIb{j8L>Fw3BX861> zL$CBGipXdA6zsy>3rlJWXKjlr!La1CyD$#xi`iE1{ zd=)?xA*pXI$qs(W7eD&Lt{a{?xRonC{XXd-#I1nKYazTomarS`fg zvnMCs%sQc_n{uwwFOnz4dhTpyL;7B4gUk}9Z@uYF9&!tC$KFz2XzpLnUUlCnD}(K4 z)lH+5&O8ria^HDdb38I?mfqU&Xg>{;B#HRee17V(!|P?cPT{|0+bpE0O7Gfa4pQya zwgLLW*+!lgkTIGH4;CWd;?}T(B?FEg7U;e$7Bcd81hZT)TvgdFxTvaD&0QXEAgT7# zQiBjRq?dtF?{JW{gzLwuu>EP(RZ|iNpT@`5)fz7alGCqgH(f&yI^orr+F2$x|KK%t zF+{$NV(SvfotQeT#x}I#-%0{McHPuNV84H7x@3jlYprp)MtDb|?0!NFFlZp0! zq{}SmsQP_xR+M3%f@X2{k3Jx|{vc8K<)3L@pb>hvw6yqZEYv(hb}>rXbPU5Gv~O2| zvZ)2>l@v`eUZ=1mDD*#!I^jAu$DEt3^i&wRiHxwVt64NH<8xh%At8N2`=cqvHjHw& z(@%H0BYb72gLx^^W@#la_`B6V%ReN7bs=rg@Z_OM)Q)S{xBz>*{?y#4ta@ywGzuED zvU0tn)3zpe%c6<{+s773qWhV+{%93fTI1=(-LxkG%JYaxf8@O37YG9bXdCR073_-@EapY>F`)m9F4VS5IzYikr}nX6 zdeK*gM%oC$evv?sy?qI_uu~U4)obGf9GsL>(Ud7AMa7c7*{k@}@02Myl&t)z^<22o zp7jy0WJfc&Uq5qV_^8?uPR&;q7osm9AVU==0ed%A_bA=Xl{~{8&TYL1fpl2h9srK2WfbXJHsb)bXj^f?WCT>}&bKT(fU- z&!=44tt0V>*EamYqyumZ)bs`7V^5XzlbZgWwm6^4v-uBb`BOz0ki~QB)3a?=bSW`( zDY|v+;!nS-ZDZ{B@M@BxD38x|De`|b1>%xh0hw260HEch9Iib}l9SQFE{AAWoxP1NM3B28SE0Zm1&8%?Yo=j^6R8(jzAn z-SijTqLG=AJ}w@mB-e6;2>PHnDk`RhA1v#BwjI`qYM8b?3U-CB2gI7dI294Tca`WE zK3#RRpY<}n)BW?;l+PCVrsi?&o_?0t4@VuJ=2lw#tfE&xPnH2a@Mn6wrlT&y%)G{5 z`~?ei^|)>5GCnoN*qtIbKIxHx&=+&^>&K^Fy<99S4zHpzAnqgPANM%X+%TP9`iVCW zeiak{XRXe#ia};8eb_Y|LmwR-s9B~<(wGxl;umiXN`4G{f zE}nQawUh_x5G{de>^pPvD^A2vm=i4hT2b+{nAq?6oB^}l^>$J>j|YdC7tv$e{JKep~F zbeRMc2&~HNfIrk)#-Ly{`m_`RIpS2t6e)_=N4;4vT1|&JPZEJPU@`o0r$+^ZP_Vet!zKsyFbZ)-k!4T3OF?05C9$@f6&4M5{I2?xi1xL-`^^*lPu<_h%dI6a3?BoLfub$Nb_O|K@AA=zE^lP z(i(jZpSo>h1B661Kl4%u#E?Xh8bZWg^s?;(C6y2E_V;TG&&j9qq4$%dL#qf!!O%!6 zDYSmB>aiTy)Lhoi@6LhuMH3<_!?X8A^zqQQ6_(whrPhgZ3lhtrG(SDRi^z3lHwrjb zQ%L%GxqPXdUTlH5$Hxr&R~vE`MKApFDoxcEQ_>a(+g?WgGYh28@x_v2P!`B}%0Nw| z2P65|4|Up#*@IOr;M0oWOs?m-@BI_d*Uuu4Oki!9&Hq)oInz zAo^o1?wu9}x_JfEZiylP>UwwcaD`KPcAenyEsG+!GOJd$KoX{2;h{$2(h{=RC<#Oa z0hpEyN_D(DA++A)sMsKp2mc88UKNy@%I0ZBz1q$sb`4&z+NmQ{D1w|J={DN6CgYY? z7Kw=!+PjVtHaJ%=jI@ykqJ3sPe!n`dCmGa6jS2-Mq5I6vflM_27)vqq2I+tdh3z}SC3`oD|Jk=ciu5OhDJM)rJzoAPp#$|U(ra|%JQzT+ zIz|grM$@;7PShLZp+6&ujd>tJ3$xTolLlhT(N4S`PW6X?1gZ~NgT+j+F7PgiZ@$z2 zGP;iy{#+R$CKm$$K60pJ?0I{Cp9OVM9nQ zIDLL}Om`Ohx#{D}p<+{NNP(rHOp=omm;-~5|#DYfDICHZrWv7*|B z*tlPP-RFHycu~G>))F4%2eVOI0qGO`{S6GEwZkt&|HK*h zc07qrEEbqc)NXkg96=vgTcUa0(iuT5JZmc7lb9GSJnaTvm z?)gQ?#fQRi80^ZB1G?+4^<5_YZ~GGZ=_vRf)qJw4)v?%E{O0JgXe_GV;ykW(pc+HW z!NuFoqf(@GYWr!qy3Z6x_ZVJNnF`X;JSUYxLOM~4(CIIv(7ziboG`6v<1N7Y>4tVg z{wo0bFa(^6Rs#9_t$ceyqO4KJl*ACKk%{g}wzIV`{{eKxcck35CCzlPa?-&D`_~Q- z5}>ngf10eyce>bW4eZ3Ndb>NS1W`wjX*pXNPCl-yQ^*)!OD=ybwMa&c{QtmW=jZSl};-U!o)Ex&6!ZK^N2j~nOAKOXmwVV{)tWrN$P z92~@dL$0{qcCYtFt=M)JCBq_o_3gm|;af2K|8^)U+B{D(c!xrMD!>tiJ>C4K9g6LRtF1qR8sTC=|t zI7RF|cfQ;I9r6zSB1c&wSi6&E|A#Sw>)Xou+M`h@O}y~N1PNB{$%Q9sl_*7R#(xX# zi#4W*b~38;wUTy}xtqCJ3F@7Cb7HvxR{709goSha2GhLmfA_XM^Xq-NGa8ufi9q*! z2)YVLlH+e*aU{fbpNOTzb$##t&v5Tu2|t>yX&Iq9;unSUY!BePT%pt{>4H>>?kzSt z22_3P+Xx`XIP|}5^Z^%jPzm^KdiOS>o4-W9l<(`N2BDuh3sP)HOOab)#XCv zEYrfA0hu35dDeQCI$NgwbS+HyIgsa#++ol&CWYt3|A~#zFInDK^y=|7^-H4jT$^qe zvph!msP}j45*oWzDZc1;9I}PDe=Wh-E7Yqk$5U#~f=fYN*L_Qfv95!vIJ#jpQq$Py z)z;+xHJnm(45&DW5Bd2*zx0UpQ@>jkIF|RBN@>mzk)ShP7%lVviH82!1EfUNkJ2OW z3Y0RXJn?(2&aByih>#x^K30TLi;>~iIl6x>i4>g}5RuVqTHt`(ogs7M%)=@qYmFqR z3H+T{sD({i7}%i5FQR{~pkWBg8h#*1JwynIkOi>lAYNf3e$;mNy!(mu=0F1{7XPmh zf|>8v*WdE?O@1veb{^d6HwzG9UhDIAC!FMu68o&YCJp#+jm0?V?I=vWueMzaAik$3 zs#cn~ms^uDI+?~}bbe`zlgTcY2b`ND|L$<)!BEO~A6cGv6+XH%MWSiyNEJWb_a^>& z08f0p`@Mpg=*@fY>o~Xnv=bGGS_{u={vt%f0O_^j?~l8VfJ8QSvY^(Sv~7566#hFs zx?flacr}k6Br(pEX_}VFO4h*9gExz?;+P4YwhqtH-qL0m{2c*a@hs{2c+&0ZAG}^xmHK(`=;}61co6ovkIl0?Ax) zqAek17nGS{{rA}wAt-^MdsAsac`#~=yVHn_@5I)Sh8L;9xl}Kynf@~yH+T)y?u?e zDz|_Yyt+9LqQqBNVH(_ zD>jvE;!VH2PiaewL|(vM4=xq>W}r+-D;s~W2k`D1>BlpCQ4*%5qAQo&0Q;(L@;2o4 z9QS{_*n!>Fun2WKjM1yM8&>zKn9=69HSO;1RtFzbaO&5aw)rUun$vb`%TN>4{8a>Tvm-?1-D z#(?vYUug0C80+nIByHdl?gjeH4>XM=C&gHuZjZA$irkgVpNA%JY7rOqdgc-~poe^1 z<6>v`hwqcVR$`T;r$;^iah~YEaL3;q)yiD2ThFOBumZjD#( z;GnE~PkWB+98RoK|Ev>awRb8*?kdRRJ0%H3F%4nAm-$;}>SJpGY zqum*Uo z<~Ry0IvBPmgccapxt#U2$@T(Eh&=}-A3?8&S<>)wcoJ8NjV0E+&Ns) zNTU~~6(0yyu(aV5!}a4LI$WSY{Vppm|y`jsb{o z#_U)yniF;n`4JWngb&N+HJ!dZCf5}edduU|mlNDcE9}t5487y-F^mwoJCT~44sk1X z2^M3*D%N9{I<$^b@1zNW+%~wW+Ni&^kW^vH7^X+6Iw@hWPV-=g{mvP+%fSJW8Q*+^ z87+Fd8q14MoK9000z?dHM%OMAS@xMY%3l}yiN4gyE?6LJcUIa$%MLU?p5oK0P8Vot zC7xx%LA}^JrJi{{z0pRUyA6?|&Jtl0j@l0!#8PRM5PjQ|y=AsQK)04IFqw~>+E=MH zgqh~9IWAYxY7TJ5$;QrFKDppNxGqtwobR~kE3pgO?fv3&_ER3?Y(@t@mG6#g#UMMv%Y1uGl*`}9s&S6a2ds1{HtmBFK&=}^$w zZB_cE6-o;lEN#`?Q%V)K_K`?@%2N!*+xG#W`&{-n&zw?PPuv9l;EI0#dsibcI)W5w zn2}zUJfO)4#x&hl*xk`xb8kz=Wqq}Kan~jf=HGLlbbs@8KHwL{{{%f+2NYX@UE>>s z3D00IyG}wJ%|-*?eaT8`B{WrUH29RO9X0_exC9)tb?5tKl?6J}Bj59O`w|@sjkvwK zniiE`>)|#^Jp(N+(r1<7KV5sgF+5u!&*C~CqL!y;=I=Zg&W<6Ekj@TY=NTys`B+$MTP39eJpZulPYbl%HWp`)Y;HkY4LB0EP za^a{xZWc9rAf=?WYf$n$Jm4D7RGU5wY8HmL=JMGPR(lM;73*E@9?iBMS&0;MWvpck zf5PAPYcRzq6Hc|y9^4xA2q!frG1>+!Tv^2dtHi9jgg%yBG|S4Ku0le4;XJwx_@PBW zQSTymwEUb4I8Wyl(K_eF>{*)RWRCcQI^-c%(aEDzSLrha8_N|wt#Fs=fZpOd%1}Wc zZaQ1SVWQsc_+;U}xiYj7kMebs0-32$^7W-5ti-WOp)==k?{$b)4k3EmLHO`583)QLur6QWM_EOTyhZ|SDF|I8cO!9NiGGD*-0y^%x-z!HnQMbOC zPpY82sXNg_|1ITP2w?X?JY|`26j907$oySZpjMlPPv$4cv}oJ8To`A4Wtz7)+W^DH z<{vxB&V~qagxstGuP{9CF6x>Ts9v!sZ#n9Ziw*DJbw;CqRVA#aZGJI8?~EVqYPB#i zVLfF|>m@A0`U{A#iZ6gwceC~(r?J8wU9LY0JZH$C$4&6EFk33>Ew&ug_gn!JSgmdI zO=M`PTKWlLtD5z>fU#XsZrQIK5=l-|io_P~o{ySU3)b8jHZvKS`4$Q-p#^pgi9bjg z%D{N+o%k`0kE|g?rE$oK?TsH?L@!CA^-wiC#m9*`KTtm{>Y1fW$Bkb`1WDd=T@R<7 zMUpK@zwLpLd$j}i(9xMw=kucBo#k>Q1OU@ z>Uw7NJdBNy+iIbr_d8h9be9hj4-f~gADjK>y8wWl4D-fS4E(onkY^tmRO)H467DDI$A>RAW@UuX_( zLjv4ia5bF$N^WhrlyYLrh&G(n%S>7HIT{YqlZCMz>(9Po9rAuD!Z8P16&2c+u4*4@ zs*y@q)4=WO3CLR5`kU?D9G+o{-@t&9zhyj*s{2@4A& z4y{Z0)#Einx)hDM?=0GibP{4T#IsmvD}86!bXfc7%74W=ih#lY7q{XTG!jks4`vsF&8ZFK4#NlH=-NOFivOLbWey1>{H>kC=W9eRr8_W zSW74$EF{TKM&y;-jJNRp)@}D!dpzgDfPr(IG*dY6pNW~?M&|MHb0B7zG|ZO=~Eq$4y4tXtb5g_FFLIY?Sio4%{swjsVb68F3LtKD^b!j+w_IMAx%d=1Jv z^suuIm{Is0j9v=Gi8gNxfE_a+hP=--|*k4;iV3O)CN}$pC4e@%;uz@ z`uCgD>@E=6jF^KdVTuB z*S|h{OJFo|X=?x)?-yCBqj%$|ov<$tC$ozOa@oar;4}AnHp|oc9AA4?Uz}{tkdlNw zun~K_kfPcu*o&*n>^7g#ZsUJt)7P7La`EK|-}PG4mCs^!=xi4TpAD~$wh%n!Hxn2d@J7>#O ztM>)>g6Gt`>P>+I5ju8=_r zqH{Ivbq1n?!?z`a%m)~-c-8TM-Q&4y|X3z zj_sMoqop1uUDUQRI?j$8RK=&JA6e2AdgJ*YG!Rw)u#U5CLlSA)zP!M&&)hHZhvUy1OUQ%HK#~jx6gi)ejadplAt>>7A+;kUp=3ZoWM`7;k*iurJNw2(f~>yvkVInOXC71 zT-dj5(u6n-1$wZF!r?odMuhHMwp!>&uX!z2A>uH57z$>K=}Q4DD0KW(JK?@~=vuSx z*|$=yDA?XYy(!2&NU#8$7rk*xLaav?Rqufh9exh~XzFVk=>Kq`TK1sBL{!Kxfh6Hl zg>JnLg$<`btE!oYK0?^l3O;antNhYkKEMNZLZOF#5oZ4?+{RV6W_`27sPNHI%~DzO z03D$Dbp(u}t_D}*Zv6J{bVHsFQSjvH z05(UF4d$&K@yi9d=F;V#ktRWxjs64Z;RO1x=Y@2y&KgUMUJiT5@1WQR=F3Hj5Igx8 zWhcePOk-yQ20y;@huR(bH(c&x7QVA5K5Ubvb$FIkAFuNXs}m26z~>`aV!;Q42#aZ` z%svG1+3RB)zY_$61X0J>{emT|&MPvjlhi$}u7r2~~#{^nv z8K+Gh1UYJ|$AJ@-iNsw}-t~2dYrRp;q2<+}UQXIb=X$j4ZoG@lbXRdAB8)}#l?mZm zRKK3Tduzt7yS+tvcQdL~YhvBH$7M??+pEbhQPez8$(DRDdX5?4uP0#^`z$csB&5?` zDkSgSVZji)B-QEi2zd8Pty+#U8JHHTp>L0`k%xnadGK{BLEmTe7LBXF$4@?;T+@`| z#$*Dv;ay5HSlU58QR29ZvCcvZr^W`Www{!deE*)Pw(S-%R`RGM>{2pIxZNkL@gIbG z3?HpG9^*Bee*uNGu6d>gAjZQ|wYlSExp;l_<1Zu_`d(HSBwmIPm^;C1RCxiq+SUt= zn)F3hiB>SCc=IB4FMLVLgK>%S#fiJ9q{-2~lF?#*lL1b`RUmc^Pfe1hx6R2b&2P&>qqrXoSGsY z$zZ!|x5&qWN$cS`hfiE~F9#lR6&vjY+O2)Rp2AM#b`{k}pJ<q5&9`$d*wXWJ#rgpM{x})wsT4@k*6QUu@h2+P z*en++!*y8GevM}B{Id#e50R;DZ4j-{tA&z){L6|P{^#xtcCF}wJ-?&tC_8en{>fCf z5VG2{;+3f;|4m%}^C2S{3HduM0DtQL2l@X=KK3vn^Fy38dyoI-7my$PHlH<-3O3L+ z!=s1(sfqb7snLdodWVxje8cUa`W^3o_%kv&f+Z{F52PZs{+r*qPn-BXp+}}WKtRZo z?&MPX|A6H`nJs&{rlP$7e;}tE>*zf&{P!XZKwoX84G>V%`V05}d6XTxKN-k}i*DBM z-?jSRFYdD>z^j+>O@HZ=QFFraMBtGsFwkkV)Ka~G-9S}t=o;MF^{6Aj?^Pv&nl(@)#r~QAv z{{MfkUp333fuE{B)W4Jd?#BJv>g=`7;rQp{fV{<5d;ioy{W}O`eh+ykZ*GUmdt6Sh zwI0$Hpii~OINffM=G(U+;NHQiNoJ@mCGt!GO@8&+ygO&SDOgvfRWfH0x+1M2Ocih3`X!dLu8bz>=p-^2i!W-x9>T3mDQ2@%y{!^0z z`dtIhYY|wfb25{pl(C7a=3K3F(RB?gCue1B_TZFz*psa6pIVA8{LAtU`xk~wZ457; zv$7WVg@xgiIUbE!06h1ps!g=?ZEV_Bxb$m{$vJh4J>1>b;nQCMe$>MAqsGC~fisee zv0J>>L_MYw5^I=rS~k}wyPpQ%d5sa1kmRK#qB(IYf<>*#x%3?djrdc`J~&$H?IUaIm|;Qqy9TCQ0KJX(5v4r5 zy>Xex8(dESnz^~8$3jSm+q=;?QK8!B_4aTQhuP)j#$H>lYJ76+-u41dB7WHt(#zbJ zLdX{-n}$E-$8wbVI4acU{j`&bajfL)=?>t*`?i1z$@|^**;lOip{ddPXtCdZCv$P~ zJVnPq11p&89)3sz+my`kLDN)SfyuGy*)|L=v1{v^@r)#Vo|lA{tEz>IE1j~+%ZPV_ zv-rjm?U-1~M&AYrCyz-@rp3G3tN zrV4rDw-naRc@F;I@sFYo1~za{4;a*&1HG5(h%hMOce8<^$U1Vr4HkuRPOxy>i}jpd z^1$_YYnYza$@ViFqv@=u$T93ik-0|4gc2*0tZa?v3%wfN*0|(c+#$EMxw$T=8BmkZ z^|RU7NTE+UKf8K_ew-?#@v4aULrl`sikqJDVPOqtWH2Q2Sbx38m3L;-y@j4*@6OcS ziTRp6Y4$;X#?IAnTZveUY_vt<)<2g$b{Yr@NS2|;5%fPRgRaFBx)gHmXlh-ps^_Y# zDB*`G7!Vx~kEETk`?Q42BTA~ntL(v)3Z-9z#hIN-)dQ;hPu_W0NhA)eBC%?I=LsrU zjU{<1xVA&M>*d>juPsZb0YMSf zpWuy1Y!yj7LS&t-w9+g^{UV8H(aMwZw(ieIffpb!GUgA*BVXI>lyMIRh-~G z{;Y6639IRzqK|5Gc=WL!5z(^xkxNhV4SClGs_czqv|1mY&hg(tBLvGhC3itAIFR#8d7^h1$Iht-W3&Xp_H99P5k@#IDCfxhxr6 zC?qP(9st&yygip-gW3oW_evzx&CJT(-7jiXZ?N;a!h;~Ctar<)KkmdCogRJwT=5pUG~Jh4cp`c_Wu-? zin>mZ%FbohyFy5wcRw@b;ow+^BBL|i`Y;;-P`z&^ zJ!d4s?0h+MXjk9?M1AARk^tgP<}o>3meP|dd>Ti43DTE6&&L>w7{Gw|3F~qq)=WPf zSNqPFxh71zH?twWH+VrzG{wNn-+JB{Cj6}V^#sHDa`A*^(MTopLeq2~pULh7)Gn}i znqI`SqV+82BM%W%e^5@lY2W(xY*s#FIZfs&JZS-lzmJg$i@Oiz6^WQOw7R)Xjp|)0(Y}7{ z&dzmnmD!~|Lj-4w`a1GCyf5V8wU<}cgVXcK5Kr_bg`WhA2_aFWvBn)TeB4iPWH23+ zH)&SA+{nQ+SL@?wjep|u ziG}bKBdFx=0AwJH1nGUhIIg=yCt@rWd01y>tS(eYBnJ8e*L!}woP;>ha`9rYWWGYE z1a<{-U-hMFbf$G0R+`FPU!4aIB6&eCn9BzC1QBC-=CZ3NE#AE^Xt|Q|$zfnp$%*Mw zRq+@U)|6H3n?|@~KG?RVq@>|Dz_+KRqvAk2eOv1Og0A=&=w{dtP?_C~?cBQB0`=Y9paPrm?tg4+_F8_5B&XmJJN}x z<3GC))dd|k5>HQitJnGWrsgPqY)bvJ3Y}6~LTK1bc@-H4j->Dyj6MJ3m8^=6iLx6n zB%9+PTf}#|5*+MaD>r}zPEESaQ`a~fJYvXtlR+HE%GLIa&`I36QdnZY{bq)UTnv0) z#nXKu-3#8Vl0gM@?03eh$1@(H+gv#o0HBK?ykjf<@~~B?p!2X=C7A6-YO+KZ`?3kP zetyyZquwcA&Z7D^r`$0)&K2n#Hqorba+5iNyI{u9OPL*j4l|1YZI6Pn=O2pG{;CDw zTV@xE-f#gf`K8psExO9QhS!gz$e0#hsDMr&?G2Cl)rn{XJTP9z(B5r`kyn}KPU=W? zAMiD&X_9=IMvK%}1cA;jWc6x=$IUQ~X4qNQw6h^hUr+D*0vRo%7RDU&<~&<^!OH@} zgrJmN<#zMrUqEe!T=YcXhwD2LN{`&l_prn$Ekp-! z-XPC>kXtX&PyjmRtGS%t)tjF>THt(MlH)9guf-N(dP4zl^3 z%LuQF72&R5I%4Wix#qsK`!lT0X0j(=ZP?2(5iPCc}LmknQVYEXm?!T>Tg`A5M_;5;2NF zpF`cLh+18oKRYZG3=-l3ppFyYPrnGo9$}Uk9>tYHP7zih?OiX9G)7Ggjp}fRC8-)0 z>>Z;Z}=Vrf$p&ID$T6q5{wd7FqRKWLgC!QP=?a;0ap2GN^HJzrZDr~KMO@kWT zxVB1a8ThUP4Gm3Wkoh0#Kn{F``^=nJiBCpxBTIb)z+s1@%Y|A56M!sm*N4(scTdS& zKx%j*`IY(4Fo)uwZDFKD*bD0pb z&R-pjW|oKB_!roq&jOQfsL^l1K}bq|1!ClA`cg}_wtIplu!Lh~%*Ik`T5UC^4DiWd z5!=VzQH!x?DVR{x!sE!+&!T~HTKNG;BG&UBe_A`Lo2PvL3y-CPr3@q3syM6=%bP7j z%q!9B=2*%iAHG?C`;eP|i{Wc&>kh>7EMj@h7Z?dUkvaWFU(e(=<2m9-As+LJSze~E zAOg(*oA^V^hY^U8YI%i%bzW8^Q&QJXlINODp%q2?H}R}|yvJG?RPY&9?{L;tuC&3!gX!((;VTV3IQ{}x zyq@gA(0%Z0m(B2CLj9|h&C7&NAcL>|7CzKIyrArRKC?1Y+RL>@>Ip0C@nxU9)|+1P z;kycp9gV-;rFSTdYpz;^G|SYJgHvtxivdlv4hh9PY=iF&JZGvL#vAgbBd+Y}c+9wh zR0FF%p@024nh=csd39=&NVaMW33(|mng;qlr;hSYR}0@fi;hfJ4^xR(jPc@knfv6^ zS=#}0H+qS;QRr4>iC5e z`S`Gd?&0?1Rqnztmo%dJWl6l;oqs|gaa}cyT*~gguYM`odEs9fiF4bii~Zj>%pRP>Qrwc zT8G}k_GZB7pU_UX;ERKbAwRMBn*FP8lu~rq{$0}nHw@`Qg(!cjQ-TD&jAeLNQem8k z+UQz!Q0j-j>8}Xn%yY6(p1aR}4U;;tncCT?$uaC@6cS&eVio_!)efx;FRZPE`*8Z%v@mDs#H74yH9zmsdw|)tDiRdayV65 zdv$He7OLuRQ2PPB2Rug-C8UkQ6<~gw; zFJGkH{|z3&hpuDc1P5IZG-2gn@L%aE>2KV}PRMRL>FcSrO>Sx7Zb7TYrxYi0V}6S) zhUh>hoXNB|B17WuW&}R@3jVmV{Le9w#ncVoMY3=Dp^0 z_w+8<>A{KTNs(0Tzs)9f40Gzt{`Q1a=o76LL*e81OXo9osTWVVY%L3e3&Biy<#(!? zOHnN+%hZJj(p=ddVRQy1c?3(}#i_C4Ec3tCe&Ctc$QA9s>I&i)$+BN^dy~$evqL8G z<*Hujre$Az&adGYWQgGzvSSXLDn^nmu^*aK-?5(VxTGVCD=N(fyf;?IByEO5r*wPt*zfSrs@|GXQrBA+2=f=`T2>=&_j1JwF1bn!=Q?cV8~?TXnWjlK z63<-vlhdXU!b}*)-|aFfS-d^$8G1)_M@S8r;KjBqYeHlo?P>wBD%@GZ-RCIlf2{)n zhV(7S4r~OYA~mCl@T8Huf}UsDW>cKmdaoeYSJ*!WmGBn#H-?;_N!n$19(UO)U0okP z^UMm>t|yiAgD-`T+^YxDw7Li7E|w=tk#W4sDp9{+MuZBJ5QD3A5lvth@Vh}7PJFCS zUiuAsB&vjTSkM~ew$y6Y_28)x(}X?L?|}X=iu!>?sL9ghXnQ=5>EV7yJ$g*#Sex4Z)wtPL=9sx9f)xoRS&HxHd=D4 z2Jfl~u^^P9fD_oJ;%0B5u(=sO%Rqj_G}0b_->uy#Thv#=Uv_es*pHZbZNqTX?EUT~ zv1cu(+n09&E^7t2#4>5^SM#IU(aDv?7)<&ClBHKjy>EGQD^CK`KP0a?oU){UyEcwe z$W~-Dbv2VRM*6yBiM~tjYyiTKD=N#y=&eXu zlA4`rq*FoF7+~uy%_5$02lw07`+$aQ)K61zAB6Szq;9d*dF%Lf`SKScsBEDM9@m`i zt_*T*)zy}z{6*(#qi1hK(7xx($uw0!9oDljLb+1#Mb%>_9 zdvjZPXWJ_|hkKRunUIQl7T25U4q;Hump~@&17qMSXBzIS5?P!}UXq3%0xI4#Qu%v+ zwkO5o?b!t%3uR47KO|3;QX*E3Yr3E&4bwi%{``Z*CdQQfQt?Ua0wTn8f*lE1AtEWI zy$>bo0Zne+n4EmdBdydM|83$=N#eZsnO>Lg3$G-0c2+B^pF@(F{j!6axT~&(w8?B9 zKgUaCk1$VD{7i)~Vt%myK#G6|H#j0dtU_M!Lc!jzq!hcQ@!rLvEIrQ+@NIk0mMFZf z3j>&#juvNw%lXTYUAT+*h^nBocjyOS;{=9m@|q_g{>?|lB}5IL4@gMLi27Ds*7-7R zTq$wn60pr>PP5@91PNqiR7L_vxQ2|9Z&(lPx#Xh8dW>QYd<ECCofD? zLnqx6c~cr4DL!`CM;;V3d?+H{qE}Xz?ByL~Q(BrKLXSV%hd(ry+u4Sms~E?r~3~Y}c3zvcoU(6d{HpVk77*DenoW=QD7^Y7_2Z`EVJy`*# zOm{}{>8x##A4q^8ldyA#r;)%{_-Yuw@HlV?bLKOPuzDWGSG zAI|aY1J<(^Ktxc^78W&qmsuJHV^%MYw9VlNGAH8lu1H)#N7 zV$({Psya#}qfMF`D=9HA$U9f|2{`hwuvHeDpe#4H?tk=ZS6FM3Z29`!ar!WxK_>C& zST1_eY5(Od-T|IfWOc;_Fm!_JVfrTf;p2ZJN`F*BRh$HRek@(w>DlHA*5WYQw-JR7 zq+x)yJV$+uFBpgceP=J`>%fmO`Pk&?a8m+kNIw2 zo5*)?x&+3^cN+Ck|3GN}{$$m<6-&UNTw2HF&i_%`+%6O3H7F0AkasITQo*!4BY5Q29@OwO>!S<>~XR*#EDQTS}!mL>_W29G6aw6YWd8kG2^$&DS~4xt@7?xlHHXorDC5tE;J% z7d_Um{_Bf*)|k#ZIKX`cG~Q*b!ccd)PN!VvoiVUe&FQK4TtHyO-h6Gpah>yi1PEp> z%PT4>>ihIZ)@@AuKSvJL@pFv^FR= zt<4Wd%*}YgcdsLfeDQL3#9gZ~si~@-9%ZM+ns={jZM+dfMp-tgpQv|DB-8S#FrpGO zZ+1$`fs60fO^e9OmxBXCHS<}!4UK@Q%&`gk5ksu~`v(Tk@*5ha7o2=I*cYaFmOz)A zy78x94D});1iEo|dwwPRZXQzbaP!s>d((6D8t7)!peHHv+*ZF$*q2q7jHdLu8`xd7 z`fq)l194oOUcRF`KdPadY*a$(`GC+91~PLp$T-Za&^_oHL=T1KLyXt*(~cz z$?qHk$EsjGq0;tY@w&^egIT#pcH|fqh5-QRme!LoYRpDd>l@Se4S5EMV0qYQzfRL9 z378~e9~__}a+KJrF)4nh&{cC=YFV8@$ZK`_;38X03t4>$UW%~2wi?RvCH5?<9`0|FU z?Z;frj9z8#i9fq6N0Amc9DiprcHrnUh2Q+4&w!fZH#07+EN@%C@j|LH^m&)@i1UP8k(m&dlf2`JRQ>gc><4_%`E{ z_bO1SU`qR6lNgx%b~YBU&b`C3#WJK-@qCZ38!_(^{F5{iK~?SFQHBgvJp4ALctfU&OIG9*Bb= z!;K%}TWm_2??BtVzja{v;FkDgOdhEaX*MkfwR1((6;Yl05v?x{iMZK|hIX}871s-? zhDVPICpt!kuAiy9n+G=^GyS~|U%rZ;oZIi9)zZ?|VOkdH292M>L zSAw3*8%J3`^~%)e+Z&qkI{#%aEJRohYh?6*T{f$l`0A%JMF$PSEqFzZueaCNXMajZ z;VyjGWETRB(fU&M{{~CH#IT05M_(uuqL+U=PBvI6F^Ku+rSV-fVnho2UOMQI&OK92 z$NjKp`=(7a-p*4aQ5{S>Y3-nIies;3!6@lF#4S=vk6~mu3+dmPt@BC?b{ePB zstodQ?yqyJJ2(w#(oW=c4)qx$qP~XE0{4MGk>~qhyxPRE*D?I~#Jj{T=abE!z1}BT zUCC(yNA+ItFk>%hVQ{L|2!-f6moh44x$Y*C%-yqk802J=cYd;&iyp=)c6F2F3~dW` z1^k$GYrDvoZnrovpM21De)j7?`bgXA_XBqDK56!By&pTcAXjb-)K&Y~6~V!Wn|8}} zTog*g)5&X%yxe>-#=@`F+T`am<*`CCIf+gFc9%B-Zv(_^>a&U2bv3q-#H7umt$oIQ zkY32Sa_6_skO6g*-_{#5Dc?$Vf;yeC&206l$gi68(wznbM;5xQrCnX@F=^R}78otf z6RBrNC4xiqLvyYIj^|_QY>Apy*u8F~8#Oxf#}=+yT9s5xTRBm2FuA?U3*J!&o+khIPvnZ1S8Vx8M48D&KFg48?NMT5U0LpYI^LuPkz!4 z&XhG0nMyV>AteSb#ReEAI^?^%>|~~hfnxANZ0MEr5Z8i>|Gbl1tNm{L)5@~e}8WPT!;U&LA2 z=nKPwDwW1#)^z&mA$U4yM)b^A*pJ9RHEk%U@xrTBu{Pxa?ME(@j4ut4_Rk zsXri<`d*Pah=73evEN%GZ#4$baT^wYYifF=9zhPpZEb#nULOtHVPpQyr$*Q%5F^rI zsjf-fTwzgSKV|yeX1)NtrnIu1PqVuh9I2Druey2ay#E-8xejsL3#|!h%ZhdG9gyVr zsCk`^F@c~Drk>}9)!s;B2*il9;}-R1=-0#cV%tTcnsc|gwn2>Gb1RiwHi{w~je-M6 zjR_ z_6F=Dc%&Nu-jjo2BfjYmMO`)f9*`J6Y&UOS^wAr44TA}AIYM4uhQo8c)CgJu=1ncy zgcTTCM5y|-n)vt5v1ER$dG?moGrIIU&%|p()k@}o!$r$a zjAQxS0uk%EVsGWpt2#M&iyW**9Px;X8&Lj;z;(bz#jlyR|dP0e{npkh1hD`^Ep35k3+UU)f|T{rBT8 zgN@uTEO#ZIJ(a4*LDZ%@Jv#p|A+rq(MTLm>j6_{vMg5ipE@H`jQ^G&5KdWqjC={+I z!C#5#=!}wBc41%44mF-+KX--IY1(T0^*=HU^C~>b{Y~#GYHAj4h0a&(yr%z&#Jw(r8l!WWm?#ov-;K~d9ay;+ljL7%We(fVE0)5Qaip?y{D0DI<$|$<}R!l@okWrbgxGJpe%sh{W&H!m;Dcc8H#tI17 zZMi8c-9%tBz9y7O+FHUQU}Unr>5w`Q2VEx%OO3jy{bTx;XLqkBd&z#a2QPb4scAwd zPYyBKI%4d5FfH^TcJUovb2y(#)qsN<9QEjP=&#p4)6)>P(ieHG%weS1!KYgjDAFh- z2oZkJu)f{muQ)f=@q)RiJ_@l^&32)GoyT)8dVVWp>0XHMlWQtk$wmmBqiT2U^+0jLqqW_>Ydx$W7kU@2C+OaW&$X~gI>O6A7gy+KH@To!HutA*7+42|7O zHLfT$+mjW#*oe*OAowmvs~t?WuBkw!E&43lWKewK=Q-R5Mj6bvo-aCoqIFi)Bj zbnHP(*2|_!bq%I*CL|Cz1R{_KY_8RSu$%-rz94L5iZ90@3rH45C-AHlq*w)D=KR3K z-TwNI`pXjaaI}op+hFo!J4sJPt10{w{FVS*)ao_NaqA1u9}E*_K8OOLMtaP>f3^J-;i z%N1mD_Ia6}VwhzL;#=CS^D^SO#Vyq|TjRS+z`L~Ea)sts3$^ySndG~lRi%W6d~={9 z7kA@D5ZI~+2}IF9i3%NIoNK9v`#69PFtE>&wzW$zV$M@d!r0BE&S9SuzDR`L!6L5m zN^hDWqLI455_1@?%;TV(Hd8n7{HW!!7n|9!lEs~MPJ-&lbkdIZck&;{* z3s^O|7>u8V+blXxMNBT|ZJ+-qD=fq9?gmc#0pKED`U^`LY*4?vdJD2aZ%}O&n3OHy zDrq$1TEuLgyG1~PstG_|&o#WoH#p8$hjKTFKe9evzUR%`P(Ye?PzVs_Vt1Ws`g29= zwcygU<-W4CB9LYgL{ zcw;@A-_HEwQ}TnDi`o+3~X%~!yr+la+Ef*|p2>K^?^gS}Pohd=RQ#;oAr^MYe9*vRG z=wD5zI~JjRnQcG3=d21}v(VIF6|o>2)^^{MgU#q?PYRrPxl(PxOLGG}9473Bt4RFq?<|mU zJF`S}*yh=`{H*Uvn2P~;n-Byyb8-m=CVzZvnFHFsSKkF4bkp!H$k$RVNa%kfk5{e@ zEmGRTgS@$V;vK{6TTbyt)Cq-U5{uzUKrb7TTy>o<0T@q$)}E3FuCFiR+a`vSmprn# z8C-G6{e-T!?osrO&;@^K6$wPPXdizK0t4I&&PcuAH-sf=A2gFPAAD< zQ*}UK)42}+i8Oo#7?pUo;a1la2);> z+RC=>oTQ)Uphtt_bKy_H!Y#uNl&4xk+D{&w#EzPXn){gk?n3g#HL#}0imyVAVk6|Y);>DIsMIwE4tL= z$ks;#z(qCjBO1(P<(t(y5{v0^Ue$clmSDs`3D*+2e;^i>ANVA(0I=fD>8*-hR2i%? z#n3@UAZz{g?A)jUb_ynM$mvj-hW!lk@Ym-Pizm)%=y%DvljO~8rp~R>a?*0yqTQ73 zo`^NIa#23m@Sp{@Smi2B@7}&AFkYp>BCQxNemZN4_nu}(!|?J3>}We*^BI9XvANQ9 zlry~?VjhmwK{bW)YB~7O@TorcM3j3-mIBT+2#sAK@*{>*2qv7;UYrY82v#=Tf1xPZ z9DZ7?PuY-z)TU*YD>W|`Hf031ZA~1c*dIvV3l_VEA4`Y(#e;I^z<}jC4~vHCKJV(6 znjRMBc_nZml;`kHWmXi!So|kE^Khgou%z(16kCX?*Dx_HIZ;U|;3$&0^k3v8R;8}GDZo(>Csnw-#6tlO24-tm$_W6IiE4&a{st~SNY~dda8Z{@UKk$fAhXH zSRy677H#v7#9hq-TQdJ(JSvdC$l6wUU(RnBO|{(odkFsh1+W9h(o_w`+NL!V9=+l+ z@wd1|SsEOQE$PYD$*@V}7caJBBCrW=X}BLADA#@r;%KWTb0>oMBD+7lytt7!4l zPT}~gn1B+~oc3I8_lmavmpuS;Qm zL4l~fot8Xk=2hZf{lF@RaaRKY?JOGqR=!MgvUak}T^Ka}ui_}i>o!rJ`-=gt@hSN4 zAE3jW!I)NkZY&;%`9F=uT;DzJ|2CnA7z4C?ZcO<bdzuK ze-|5Jy3ID-;a^na|C~`4{Ri{V4dzMtuZ!62&2p=Ev||-ax8oQ^;o)Kh8)G$c_Dr{y<)sGi+;o?o=JeRTTV^ z8?d938e9GfxL!Z?`36}Kn^Zc&p}#AP9CWnfy+|R6OdCcagdtEr{c~a_E-djRd5WC= z9}bWa+SInbsuMeb3K3}ooxmWMOP>wBJoAzljin@8`t;Vhx04@i)sj@4MU(+iFca?f zS<{~i268*+jClUcYQz^3+5AN6JL1AZ{t*D>^X0_PE=Vh-2fbr!2NJ7Y^ZVjPEl?3+ zt8d7-Mc_gU-r+jD@EQ(87th4=-S4k@Q!#Vu_C&5+Drq{PYj>|UW#>IkMV!`oGs94w z{F^^-8X}$|JxLzWy?qL8@-@PWhNdR~f5m4Tfby0=EKo-m>T5JYayt?&h;%Om^p2r} z&-Eb{WXd496-j)xqpU0cLF8+Z4eCx%;82-n`3wkXbq=%tyfD#OX7!bhZ`&eYe!_F6 z_?r=jv(0lg;%lPor_$b&&a%9jXTn1W(Th5~I=852ZFgv%<-kOwD-RfXnRzGgUM~ zzo-4O^Yk3l^lKNLodnym%cf8F>8YigWE7DO(+y)z7|wv>)Csw03>tl@)yy%1N7?=Q zSsz9a!6Dx%cV~sl%QgIZY-C#LM3e}6o1KU3q{kHaC-z^?4B0jv! zI`DF$tV7rof8F}dfa1bhN0qs0zenr7zq!d$!1_rWMfQc3e~$3W;RZKxl@`N|kM5{8 zVQvoYm%KJU!BZ_^Ppb&m*F**`_V|Xj^G*H1Sh*aI@xnZh$jL5_jCpkU4Y@=V=#5mp zRgI+Hwb(Ar*4XVU_J=vz1lYG}S;1VmqXXJ5#hDeZpWE1H4IcMa?!3txg45ziJ#g7s zMp*V%BiVZ90eQQ1ono$T(V!p?xgDnJt*GOzKLX(CQ*oMml_Zw%r1cIKS`luG3gWY1E%ca@6Vz`+u!fISnFXqP;dp}B3N51&=o&8p-*LL^}9P-S&pNm++A z50MWCrnSE8B#ME(qj-elx4CEezY5^{^zUil^LLy(kqxL4eNsq0il_ck6`7u9XI??O zjW1A1YMGfHTP<>@zbc_URKl>&xF9jV5}zgw>fO_OeheCUHfxMu2O)jl-AFk0tYeB% z*`OH`6^nN4DKU}oYS>KUuZzc#H<11J~;O;S-3uv zxZ0kd20f6HOFS*GZo#QKT}=MTk*G@!cE_;;Qu({0Nuj?d{1dmV`|Q)8s3bX|%vwIy z5@~sV;H7sS(4P+t;uS;QJcT^wX2CxKRs&B}C8c9jQo4}&uA83#l;nHyaZE&F)6@cJ zpWK_Un;rHBqI@84AR8-9Na*n|(w$9T@F$4#Q!{})px2jtxrnZ3 z*C7n+KX~Z(>-95ldPN9!TI4eVvX!%xmWQirFJ8$rwzdmdGFqlz^+%Gc<6~v-Fma#w zxL-f`&9%e2Ym_J@-VxL1b=N~V4$h(rT@A`&dBujvXh% zBZAUss-sMOUcz<95_KS30m|}55+r9U zgM+H0#?GIImKt-BtNVeHmhP5w&-rbntzfH%IED$;Bx2s!i%}SyojhL0f?Jsu9I^SL zTrWroN5^Aa@uJz5ywhuJNs$0l0g|5{iINWpVnXG+L(#4sD~H-~FUmLmG=gLYopsb9 zxG-TP-;)drHh%qAWuHJ`LiZ!GrIkY&oIYD%fnMRL1@VU?10@Q95vy=5^#O(wd55#y zBi@y+Gw!G6inz4&4pxlgv%AeVScMcdD-f!sB6w{DHtJ(sJK11gl9iFO>p6gR`|%`5 zM1pk*&KeSnO-eMuw3$?LxxvO4oSA-efO|I%4t(_+x=Ige3kSheaI@$#C~s)MckUW9 zIJPoG_qi)KhrZqmC&6sGi|~GTMGZZh&0R?k`Lf37>ug~bd0fxP9%L;~FuEN=Kyv!? z+-@+$;XHSBbf)KuSDZI_H*3Uy#Q7>|v})7l9LDPW@#q>hMzii{koU6kEoe!+LQ}k< zHkvI;3V%SVVq|AzHnu@5|3v7qPMhRxN3~A8CnAX(8#*6#d}MEjhBL=|Dm?V(z|Acn z7A8y1?IBR4BFHA?emMhfNXk-@R0*zHiwu>3d2#Bb1|+25>k7!bk9`~%K>#?+Q_)A3 z=YC#Tg?=q~KfYDS5;}2|YdWDAoUl@n2Mf$gO%FWK-VVRGyIDBpfy>jmBxLS?V3!X& z5V_fUskn0J_GfcPggJ$x++HG+Z}Jnaq-)%2^iLXXn#Jh$=8jv*=l#zyygHMkM>!P+ z9*aYJf^yje-jv**L2-$lFKW0z(o%v=9d#cISDY^#2!g2AL3AsGBo(Vytqitr+;`;r z&%)2Z91?*oD|g1Ds*jdmg1tRny)U#Z!O9xs#q6=F>!y>1c1ulf#&&F{wY_p1Gl!IU ze#y)Zs7tTNH*JgZ{ZvRjL^Tm?FKvqN)0>2E%`$$R+{tYM5Mr1n#1s9JzMM-gKDem3 zwr=yqmU9~~@x>ReLVm?`=Gi{y$J+%kh2Nm2M}lD&Ha$vUG(aT}a{Qyiudhf4dHVv_ zV^ct`jZ@AJ$s!nB1X4zHpcRU`I@r3Trmx6KrnyU!@|S{Kap$4S>ap)y9rEJhhM9wT z1Vz%*!)$cNOqFeJGK)%dbgRY^mh==l+COsK10@cu*iY!{7GNRfK7a?_(`2ysoV;|l z=URL6L|ET&8B3ZB6n?_}C8X*hdAlE@G)b_o$HYP?IQ6<+F{|d3;}`#^-YsfUA8lV79C`^^wuXTI0#Lu$}o#bv3qnwoxJ@`V2}e(~lx-MK7Q7 z+0Krt4-!Aje$3=R=g>rA=3viF_wjK)NuwG#lhhI0MQ_)!TeBgKPoVnEVD-5f=2IQr zezFae3cLv(FCI><$nECpL#9^Z`qOdXp?42cuis60ccB^ zvL7XmGfp5FqGMh4`=%S}zkA&@NBnw45nP&c!m3C@) zLF}ltB;J*{WMZ5w$j$dY|3E6|_lc$+aR=TMZdpVe;(8cxe~WTC)Pe7<^HWZ>Rp~hq zUxSG+ISmACOJU@AyK;x#*7t96EYjAGHR%g8$XK~Klf<#gUYD7X!{JSoyzVERnnMRN z-#Dy{?4wKdR%6?=(0wj@Nd0a=Au90sg}Vu|^Cf$q9`WK4i>>a|g?32p_;19WdjgXU zS4(bOHXL8>7bYDe{>XiBN^tRQws(!0&;9fHrA6lR z@qzGzrjV0$Wi_iIOP%iVq#bj*RfYAA`{(c5gjs$&mgzqZHgzTMvxM}mnSA10y-APi zArGx8FgTg|v;ti76KOlmWFj~9b+=$A@f9H75InZ#*P}EyEY)P@!&%{S|DKsCBSzp* zX?_0+exUjMX0FEnY2(cwd&-ZxMemMj7eDY$8s0g?Chk%Ohjnz=OQW#ewDy;f(Y<7) z>+Mo}M19eefO$V+t~jaukTcop98gfT=2aVXfL$OCJI==`p^W4}i}@wd zamaaY&3p9bOQ(I$rd=efQ4i6!Zc&mOzXzS4)pC(r`;Gs~D(Snvm5ZF@S*FY6HCB$0 z&V~^RXdHW?^3wKU+<``)&??EZv>H~NhD#i9302w=dP+pxk`8FLn(lGk65~hSN1~Yi zm}T`|{=Nb$D!x58AZX>q^9Lcx0## z=)=?-w8}Hq(^}+qv0Q`|p(2?Yzi#d`MgLEC$`(#_5tP#HRO~CKN|TB`7Z$;)jXke7 z20>=h9cd!^=w{zGR4KLQnJ^CS-Cn6LKCc{mkAqr&H7GpplO@5rc{EIfwrAB8X}PX&|P>*kgZGkxeVvfMb4<$QezKge?&)}EEP_4I4gyr zfcbcjpHV6SCqBVgT*V_8tf;~8g68z1n|pbcRb;%o z`!y{ry8$cs^h6C*%z}_>%LsW;Xc}(0q~7YweLT_7h3~^y z0e#<`rZcTxC7n-d(SW{-tbxQG`c)qt8-_tv8yudc_Uk~;X)?d|ws&vxxe_YO)PT8w zOBXdJj|+v*RF_0yDNlF5c<`+a<|__dt?V?F0O_0<`IW;`09Ungn#>RGBwBp*6wM1* z*};|?WTl++dN^a$0S62bv9$%a2~l)>9G0X(bRE2v@%Vf{KS{^{mVg3m@4A`An{H(cwYwZ4)>mv%=&fKqxTrNJ92c@pzoP%g2X=$-ScK7~7ROwq6|{YzM|Np&7bA?~RE>;?k( z&c$*qp!vDNp>t}jAFLd~WiP+>!6G2(8r}Xxy+2JPz=3_~v8*8@YSQoLc!*i*HIyqF z3_9O?C%{hyZAZ7W^JnDkJ9=KdrpVEH%+T=UdNycXl{c=x{f5d&@Dr;2a!`$V8AOf8 z+5SXRgdjE1BGBOJy^|Ui9F}d+i2)_(4K?1+5kQE&Cm9T#6kBp#2>7kP_tJCbDx^`? zfpUXfASCV+oCTPcGg+vXE{vD}A|RBglLbqs>}jSTNlt{&ie^x&r_zxAKN}=kj9z9>m#!{bVOX9{JPw@!<;Guj8NN| z3SkW}NB4(_d+;r>y4S8e&H2pJ#*1}YtMDQFD&o}ZLE2IOJ~q}n)?nTQ0^4HJ-;wRG z$6<3nOtM4as1JoXD zCHoMkVQ7_#XdKz&CGi0P{?gp**uKbei2C`#Vp{wMZ5a%liVOnfVM5fbw%*Yhzf(d* zie)U2ifD&@HA{7^Ix~K5AuTYucB6T2edC<15ys7z^ME=cTY}lSv#IwpxE`(f=PF1P zvrRHyKVOhvKbd(ES^4<^mh>}LllHiYi1?lxfwnYMBCdNqfou6u-{(Xm3P!8DA_Nvd z8S2sJj2}&+S$k0j57!=>^$mxtKI!4NtP{%MagAs5*FBei>)BhilO%xU0lLSXcUaAj zTO?%)J!{kjbk7bO4vGJG-+zKO!mAumZrqqXPzPTf2{^#7BF~cgNtV0q%Z0j)qyL1I zt`lq>tI4W?AhmLd-HZw?3mI`MHG9ZKHusGox?KO*@;$St)ML~$)|HmF_g5Ns$iqJ~ zM$FoBAm`^CJ}i<{Ycn^-C}-?aiJ34}ZDQKi94TKHLR*|IFvB(C%3s;oXA&rL@_9s{ zg|l?g;Nwx4NiY8NkI}QepT0lUFwJlgNpddMpn)eu%FkOU4hueYDLQcZ4W0JkpT%?P zx}RVc3p)Purk})shNE8@_>C>;rZIk|&p+kRP9TFbxO+nI!993@!99Tx+&#Fv2M7*Ha0tQO z-F7L&GeJ#6t^|xxTs^jJ8P(99niETq9pA9fXqhm&6 za2q~p2^)FpQJ!rO<{H^#15&zZ){`-PW?2EDLGfJf6{eRP+ewAMV2v?UqB3M!Xt?vA9 zk>_km!+^(ZQ5zzXf85O@`U~zuQ_rmZ|0q-cZ3a0pqSQ5r_&llN-!1jG@#Q>#PNkJM z?JYcnIzRtmLaVqqg*Rd$?nCf2#(x+5|5z78c~_A+BF-FX_O~wW|FqQ8Y>=YZx+H3E zS%1%p@DIOQab^hsDcFzA<|xbo|FrW8V9Ih=0W80o)5iLTonI)ADR6pm9#CUbH;w+$ zHH3)RKm_VLY@p4+(9=L5r$BttS+;xndVk>qrxaV46xUvJXn^ZpK1`SB+#oF`a%4xi zBp!wJH>hc8)g8j1byX9lmrkC0u2--{FFh&d^e4jvzXD7Fj~WEg(pB{upPsy!wM6=` zy`_5;7!IqhYJ%N$fnCnFhJ*&}SN5`W8tte*!aH(vVenq_>01}r2Azidz<{;wPCfN~ z(M%Auea(3K4G?HkE1!%Com)bO&5zm!1&F`9Ez@<{9yYKwS;yO78)j!=ShU2VA`NI9 ze)0N&4O@3E=A2X0fB$r-B-SM%vuc~&I>nh`L_@f+;3M?77eY6$O=MFqX@n|8@?!NC zj{5e1SretKE;O{SxUW$KA7S3x{li;JvcsG|4J{x_A$~m+>_g9?t^4H9Gv6m|+1Rmx z(!FD&8R+B=6I1^pamk`r#3##7y1Ty5Qv;6j?HgFvGKP%%xdCo(#e3S@b9!%`G~ITx z9+{b0ov3q7uvF8M=H|3qjt%Q9KMC$h_4F)`9*1Bf+I46z%#NU`CwsT*7>%H z9u^d9t;{JhUOp}3fU{i=c9qh3#a%E)J5Mxpv~gFNq`d%TjF ziN&!ex;l(O)75fo@F3l#q3x%BiK|r!D@@g(#nQsUe$&kC+Z%n=de$L@rFI=EKVd$; zO>LdDMJTk9nTgF_Qc@DuzYZM_SUdYR!NhvKN8x zD}1$8DCFB!ZRYqHIz|5Dq(#Zm#cdq4CVGsfK3ou#yE^Wbx#Hrs@{`@h%`KHa5VVMSS+?W&{UJE-nOVH#q5Wt9wy5NiU9+y;2nARObI;g zmqlgJ_dd0>`9C053)%KL7^9k7`7w(S?Ne87hO(l{yZC8^L)TI3m8bWTsi~{~uw-o( zybB)Zcq7Qvhz`BG^Ai|b+=Uf0`NSM{BqlaLs(|M`Zni2<*)?voC$X9GCKX)s6(U*E z(;DNtv9MOR6ZBV{!bN}9nY+vtJHDne2WyyuC`^M|Pur6ZyjRcY9x zn@rEcyq=!=zCDP(5rK~t-%HfTpN7IEhOfvS6E>)x9a|St{&4B&T+6Rj;lZwd3bY1H zjUJcxnm6t5nJ4FajN=XF^un{3{J2CX(INUPpljpzoaea%* zN-mI!_iXcfp=3(db5=WoOLWZV+)AG*uThz?!l1t`cyhSZ^!J{%1>cD^D_%Ofy?ikz zL6n-7ITE1Y2Az+z<5Ko{lL-Xm)Bu<7x_awCX-Iu_b7qSFzkGo@Gt59EC&Z~pH?^* z5*7Io9M^ZaUpi@NT!f5#Jrzd=d+p~B`upV;$Kd=*3^pMLqGFW!F)l3W()*S|TAx0B zc6@!!#SFXN$fGZWoX9?=^pYdt6mfOFfkf9y4A6#i@eQ8CxqO zR87AuwQ2Kja7_j!36o*kF_RBB0eF@#yW1hO-%7n7lx=n{?K6`!i zo=so#uFLVbXd8`FQ!}n42sRM{w_=>7zaRW6UQ0|w^;%@=ACTnV7xI>;+S}-WA)}%A z1W5C_Z(dYAxT{V#G+S9OC2Z;-fp}{(*SQdjS9I`A92S*+8BR5+CUU1Uu#<*XQ?P*b`5AbukHtvfEoXkqi?YTqcwtOdQny*q6}03b zt3LV5TODCCeIZ7wz~0 z?1l^%pV^u4<7 zepHe^t%1QAY1FDB$~67?-;q=w3+NU5y>?=b_U(j}H5C5r^k&hKK0D8$zh_ktU*VK^ zMx{=_|60kfjT_}OIvi1zn%TRY!r}TAVn9By(mxT;l77S7)3ZOA7OQzBncd(duSgf| zSsb0sDo-9dIurN;Vp9vfGuYRf*#=9cPD zE|F{FwktAAK{oOMd7h>;lxah()2N*v+=d)n{IH3L^)9pa{=o_Fat72Q_UScXn)PZY$H!h1nEdgn2H#;-xE;Q6P^T`I#os-Hghw z^0LZGRmsvldQBQ+?M=R4m3v*O3Bl=oc-_8*dW}ZC0+d1+9^r1c|R8 zc+AJy85{q#`)qZ_4cRWJZW=!<_;B*4S0IvE@()9T;1fTrJ~28UYoWYM3TrnEfvv;C)(%&=^=P zkC0vaHc5ll&9U5agX)j6biB5LOuMA#T>;L*-tSOrriA^J$;+|ZkKz{>A5^|m{{#^_ zzrapF%4|V|H&eaqOLG=1JHwXw0d@H%=+=J4+1}}whGk`7kbF)w|3hzE5k5(egY{K- zY~pZ2T$FEnq57Ry@sdfus4@9jzgwj1Rjc&x$3Okli|6Z#_18JT8_QCU%ejwd5!P-0 znpUI;0L}oWq;qbp)wS2ds}O*;ry=hC?f&*~gN+CLhl1=#(Z`WcL2h?i-@93}Rx?EA z6DhdRZ}Lpymp@LxWYQb z0RxHN>D`Jg@jW~SZbQtJzd)xYng+@FEh-yYsL?z)%Sn4S-&L9yuS?+@%ocZy=qaX_ zc&BJE$(sUDyB!uqnvS-6u^^yPJoRAWX)m)>3rOd4=+?9zIzQ>xU?8zg^f6T6C7Wt3n-!g%&X&I! zf0H9=e_S(gtg^2WQM4}4NtJ?7sku*{{y`?L>tJ^u?DSJ4T=BQ3a}jN?Xf#W!;O z;KLvwfjWZ^m9|~zm3CEx;|6Y%J_9e-ifvF?-sF8WA}2>At=*F4W3axiJ#)-=-QHeJ z9JGJ?7ldCK6MJS2q7lFDK)!wRCqb05RlZnmaX!3Qta(?wXcaD%8FN=nzh{F#4mui)cW?xl?SWt8uR}y z7>&!(-V#mH6ZYXB==1>p3H?Vaoxv)pIef2I+PPvfx# zf6h*C;M8}^8M4khD?gcK@!6Bn10{?m^X$v(untt}%WW;&lL*-v61BpKrvs2!M;UfpbwT zEKA1_-x;nhKeM)v+JI-o6O7d z-*gA2OeFuFXr4P=@j@!g*uOZUtHrw@TJjtq(RL#_+4N<$w)O_=oGX+mC=TtERL;D` ztkHTlA6hd3(`e!uu*tm*C$@R+erwAX+T&EpvCy<6Y&)eeGF%)!Op+QLBt5OSu!G8e ziN-rTG}HjDK5{lyy*b@lg#=wxHUxHcUB^9w1-Z8Ly_z(Awn>dHQV&E$^y>+xqa05sLwW4VKC7L`7Jh8O^!5B}725lyJt!$Ol`4aqgxn|HEwbIq&Oh7a#>2v$Z&WK4>$9) zXL?;2xX%#XSX)~6qmBD5>EeV7fkGZagg zcNxuH9VZn=2A2rZ?T>S~r~Pu;b8cY^$l``&IOW^NN3SZQMeCpNHS7tHm+g+#^Iv@| z%eX-ImUqYn;%m*8Vtq1h*?!vH>-C(xee8bE(hs4gv`1xT($(y-Q|hHKbKy=k*gJ9= zij0JK<;-d;y(b=__=Pkd5xa@lHr-$UAy@(ILT%h2ntXy&e6LtlUEBxkVJ zJ_dC0UC>cxCi=$F4OgZ7C7Gp#b7xyUKTpj{SQxsVw2qFwf*C)>>1$5DU2|$+D#c0Z z(#~}N$waCDgq%xWLHAe?%e%a~tPD&5YWT{DNr}Eu8x`sCXB9m+Sq+wh6kS}4>`a;bB`i+E3OSL-eU1Xj6%1$;`_8*v7wNIG8+D4Y{hcC0HS0gLz? zX~#Jw1>Go0fTX14MIqeK;mdXK5bf&pjPQzUfk$dNBLk$$>KJGMH0BU2_3j#IqUhi7 zrSkCD{B6@>ft!!aSRGS6s${{=0z2n~ON1{Wy?cZtsAuxy6TE8R*F)8LD6hvWY^drm zn#)_-kcS54UZlF8ni<<`Cn;%Zs0-^$ITu$;hMniJGqX|sLOt<|0kh{DlT!R@V=l{3 z6PR%?R?+zQ(d>c%Fx1W%kcP9G%aZ3(T&;C)V0IzHcPOa9J0EqDbZ!CP5GtGW7rw{2 zbDdyG+U7_SOZC)dnn~#&BK?wsTp<0k$ZMH0&0I?GgUzsZ8q{MYAu zpSGL0BuVr&L0Qo}<`Eou;pRi`bR%Q&#?K)K6Zm9{2h zM+NHd6K?I=gq$e>`v$~?oCE>jcHQ>731tIzjQ)UitL4l&Mw;l-DCcDq2IS|&!spQ) z!Ps?gFH&7~Z;yVo+p=PbH~+%5;l=WzNuZsfKRZ6SOYa^e8+xViP%>>ec-QRdpyjY% zc~ms$54h^4qZ8bU82WrPmz5F!ka@nDltkAu!I9VO7f$NMyXzuf8Ff|UvvhnP#}^9E zn$7wJRr8UYGqHZw!8df<`O!0T2i8BC;cViaHb%%ePH5ParSxTcZ5%U@`P`L!`c}vs zZ!1L^w8jZ~?US9(sTq%Lax0;foGC67To=Xng(oQ26d1NL!ai6u6n(>2my-Qjk2XLvlW7pDw6X5eK4!>=GB&<;8+)*dBo_Ppvbjd(PvRD1K^|$enw6%qQcZ5USd45#ol64@&*31fRT6d;#R+d02Di_OhHrWr`pr7n1JO<- zDKOL7H$|-sp=<+swi*_OCge8qUe!PuOi>+B7W0yax{+d=#aq-3!DXH_j$j^G!wCG; z5BVNQLM5{xE>U6YN54S?wIHy0p+0XYLT13{q3EW00~XiuLl*lQql^Cx=$^m^pbUH0 zG+(7o6X-7HNjaFD=O|)MNunvawqt4dF2mT@_9A>x?1AC+z43cUU=8L3s=qy1Pxvi9 z+8a4uni%)-phdkySgj0&HC+OpOYT6?O?u2r4My6eH?1MZ9n{p#potH)o}#^NpBx>b zt4V&w&ti=lm9YT|+O;*`>nEmhXhOJ5oZFb6)j%aL2zp670mTk4B)&OkA5scFZ%?rw zE0oKFRGj&*AzL4w>jmb5#y|4La};?8srtr^Qr)@N*WU@*=8&bmuSqJPJ0h1B$bL6b znul7agDaa?x`Gu{JEj*$5(J_zT2=04qz`%lN0#H30Bdmk0LkHpy+(|s#<zdD(H$r6#eLli2>ZLd-oP8t7&0cjkDpKjC=Kvz#hj;7np#8NE_8T(Q z?CAHWl@WA+faJR8lGSR5zU^*mDPuLex0A^?eqdMj%?Bd5&uxW?J|9Z1-BjT3&g+Tn zT6NXw_h!-5n};y-D+iKINnEqRn(E(hX9}Bc5SnZY2HnBW-va=#WsLUpjRl2!UhzwA z(Bil*!tfw--fj=?MeA%i(=S@5TuctG#Kfcb<$ zE$MEOuQdHgUcK8t9z@bqL2v;9Hv0MoPmJq!nFyics7lf0NPCR|{?zRB6EQ^^~ml-gKvJZV`O98nl3 zSaB*+3Lz?IOI~Ka5_o=5?X)yLxW>!>cJ&1Up4)75P(p7n1b?pJ|-X8?$@LxbL8I;X$Q#rat$nMl9H{VCYD<4Fiqo?W7Fo3TUK;uoh^zGv6mLz7~mgBD271PcG^X?4|`?4 zoi!V;1>kr(;`UtKeJISG8x4cIKl9svs%9|30uWnJ|)!OgsPzV4aLT zHEPR;{X#(eu<@Ky3?MI%J1b&-pADW$I~t-_x_)buP>JYE!7^>ek#FFOt+De3uhe1^ zwJQX!sj1G~vQbioBS3E*W{+Bt6Fml!i5HeJ8rria&^R=kT7PvTmN{vR>Fe(*wnQln zxgFogc$=jdAW1=zz;~{+r=;^VgOcqP(6Pq>RsnJR+>su>&e#b(^*nP-FXaduL`E8K z7;V&pSw!7c%4cb7S(8B_uXYWcqHj%0xw2bxBB&T#AX>=*JQtm7EvXz^t!RF*1w|)6 z$e1R@as;3A(@S6?ys877pQ8&Yu80_{k_)iKu)<%YT>oOs!)xiLcUAGbRKi&NNKF;u*X5g>Cl0Kv-67+&7nMW5rOUQ+cvodYRlU*Da#* zLd>?Xr`eWWsv-9Uj?|v+ByWOwN0=KygcKP4*7PB(>{jqTqxv!B^&BReSAqb;Wd@m5 zd-LR@k*=X0#nGsDz`(DYjV1;h352wqq(5?xpCn&c>ZpuYR;vtnJ72B(2$^{_o zfa7)&x*Dn{)s5}dbYkwWlulYzhhBE3dB)%iL*@Hd`XMQh}$+RgJ^_i^u#LS|50WhzntU68AoM(wv+v7fVYAMJv_(7G1WCBawpp%0LAyF#OeO#2Gg zf-g#g?+vxE2l>Py09BbTs`wBGEWUwBkYDl10)dPNu&O2!U6RSqRt-18qLh>8YfF_KAS zWc7@Pfns6R=?{c7F1064PJW|SG?PVNIBBx=&f2IWHhJ~>J`mdq@Pp@jR|vr z95~)Gm9V)abc_D?h3L#hs4cqWvm$=NFBYu#>Sp3bT^C$M*TyBAvV;avP7Y~oaQk8< z-^F3uy6@&*#QS1WHDQ~di0%iGat|2zvmcGJo?UfL70F4Z?=NxK?}g&IT_nD1zwE-n zK|Gm{9ppy|r!2=rD%Und?(FZ>;8`Y-9IUYCY^yRf?lauSe>oB`h=`@q9)?hdoe|4= z^Fb?eZa84Ha%YX+KqUzh7Shu$bB#mK#LWr#fpXjU4XUT-&W-zvA}8TetR$1$#}Ez ze8Cv0z2L6QuCJCEWQY27yRY?K`}XkydHq^~fK#JgTFiv!HeHI0 z&(ottjIwkQe8B#rZyADcY+0Jm$=0%vPH1R23PIyMy=77w9{5PT%x1Y6T)dLI-EIL# zlO4%gkY!w1QvymI-MwByS5+jCUxca{Np_Y|S7#)WrH4#%y)9X$Da-yZZk;>PIfVw{ zfOJqqwy@;LWjmL&^@Tdz%i^N3Yc9c=}NP_8`u6cOX=$$)un9atb zQ15}`Bc;#fR-_{|lVRdkio1lil?Y4p{dJ*J2D|dw_xjV6USG^q#c!#jn zgNyD`j08u67##9I^65#BmNng<1NF0+0G{ZgK7 zl>h1se$fL%a==&*{FSP+lY34Hr*AMjC*Uwt%r!vP%!}DdhpYa;N1ylqB}34sp$NB* zgp;MjpjyFP7PzV$;+RSk2Z_$*;YcvUPLqfHbcO{=FR(uiq}Py!mLL#gvJEj;gk!jK zRa_8kp>&%4E+LYPWa}jd0;==kb#XENZ+pG8)YLO0#&vwF#;*{lcXk9+?1xEDAXqAP z-4=>%H20z)y3#{ZIDhyYp|k>p)KX!1qP!zg)c|#~2Hid5vk}W`f`g3D{>jha4P7b|zBZuo0lwb&3Q~ zu3RsRqx6m}&zNo#+$GS4duq7`1qI*d4JtlwKzTPwO0h2JyDT@=K8!SI+}>_$W!~A~ zj|0lVu!}+koK%!^%#jO1U<97+6dTfz-gzV3NKrCEf78_{2_f0nfPUN=KL2O>ERzqd zWk9;|ES8yz0K8+r;`Jjm{S{ssgf;UoT=$Ayf{Y2B)E4nCcL=53h;UK{_c# z^M6WfLweop0YEjVQ!BAc;s(coiV~nN`3=Ks3pFJfB-7X~d%18bjkc9AG4hqc)i<^# zb^#LEA;*1`kTo@)0C+|DX$pA0t~ReXd1iUiCx#ek0;?j-DIQZ~2>@Kwm%c3o*<|?bMOuLCdTvX2KV|=2j40qnG?Vf-Ectp_=rd^TJ7Z)Y_SI{6r3XI*>DhbWzAnZ zzt@=Lf!tX*1T?#!X}oNavU;YtF>raeGaJy09(<|IH@0|gKLAjI`^@yle z*Bq;1PsB0~<2-&~dSw?PXKtBo5~^fCd0wz>#t8t+>?eINIirA+A7RBlF4PL3lt~9V zMi=1U0KxmOuLCrTJF@kAIe9rX%x$nfiAz~HoEi`NHmDg~S9uYyfp(h}0*oc6h9eHKj_AS5_<*^?wPw~+zOesPJQ4@f)d z^>PML#!XPs{?B2r+p@qQv@nTf2%&6+eas z3?&xLypbNd<_o+Dc3Ta@+MWO=@Br44(tEM(wN><2Z=XZ_u&pALmHMBP|6=fp;tO6L zTgVYSDFUjUiY-y$`Qhi_ z0HT)8?LO5A$}J4&o9(HG2(2wa=U|y+x4@f3aK|i`)xiuwq_~X0VU4{Gn&jf^>v$TNu#~=}Fq*4n~ zYUDzt%nyPMA2Yp@u<^tVHE~<_UfP@mbyDV~S$W|lg~s}jG7U;okgiQtR}d%DOX3TjP)At4L-mdRysA3Tx+L$$-b0^Gz4Ax zj5{Ys^gG_CfC64g;@Y)qb>R_#45W2_H|yKh4yb4+CZ@q6DecNkTa50oo(8@B;4b_b#{xRFhtu?VsSi*&_qqOfMRv;+^-3j(W431>c(tmaCz3SI#;Y=LK~7)i zg}h4DX7VAiQO(y&jrF_y7K0(@!>GyjA|zC43b*1Fje;wOVVwGJgY zr+F^%5Njn8k}rC>O=L?&kso$dYPFt-rGNfitZ5#3tP}kgK`R}wV$lCY!YntyZ3Qg~ zGZ?l2NBhnGgj>NP6zd1+mgttCgt4&y#Wego4znQfL~W}fTF&`HJNV!EtzfBEz$4h2 zl=qhweuf%$*x z!0-(Y7P&)Ge4;#-k+FRI!*%<0-1=i0itWpUf3Fg7YxqeOU$DOg0#X zmb3qNZ9A05B{p6IUhs*`VSGXH>%xKpXpiuN-BqNGC$+;w^M6;L>;FvmA&@}dmYSM6 zRg56m1{I6cwyCKJ)&Y7bzwMO z-!(h?ZT=A^ fBt*QTK7K?%;jB561zik0d-}*qDoT`!8T$P{T~iH% literal 0 HcmV?d00001 diff --git a/docker-for-mac/images/localhost-arm.png b/docker-for-mac/images/localhost-arm.png new file mode 100644 index 0000000000000000000000000000000000000000..40978c7f7b6eaa6265905ef41d472aa108ac7859 GIT binary patch literal 34885 zcmV*MKx4m&P)W_SkrHr_Z6Q0M} zixI&62?CD$RxJoHo6V*kGY`49VHHacT=jbS3)y(ccVXvoI2`1waXOt~1v&nZ^m@Hk ztM&f<`y@#kjYh3jt5&OGK@^n~VyoqH14N-tg%U&yZr zTVjqu;6yIJeg52YLeWErsa4Xqcxt@nG0&uDM#hAJ=g-CHtDA+xqmi7bxjK2ZT+~*V z_)Jk+^o_zS6cRO;yH+SXtx(8iq2ScInF(ty(qp^Bb{;azSSZc4$Jh$RHY${&WXI1C@VHPmS0`W8v{IS(ks~8Q#gDPKEY$!1JKvcMB-%M6 zSWt%bUGNfZoDU$BJ^Zsms0#2P)CA3DGf9#UA3n6(?S8+1@W2-(r{9uJr}OI7t9rfu z^y#yE_Z~QRyHIe2!mYHq)PAz%(+2L)^5o2?U3VdAOdv7f*P$E_bzPTpuOcs9cDm0f zdNtIgx#(ik?#0O!!zz8AP-rossI;TH0g;13k(gnHxhS_EAXM5oi=Dw;yUum-6UC92 z#-5N+p|eL_7Z8fNG}LDwI0zyTLeq`?~kQ~XGC|pNTTP`rW%J~1w z%*?yP7&y!)7&yT68Tv9EG(3md=T=R|>ySEX7F_Py$cQXOTAANqOHWj?w)g*fdw&i4 z{r4lskDoku?)=4zmmWTR`1tW-$cIyu$Z5&br%&(Se{lBfxu1Ui<-PYmoJ{Ba!MNKS zI#W|qQ&Usx^@flJ2n1x}r=NZ~eflhfPcs3d&FkYXq*if%#J8i49Dm;wY}T;)FvoARLenhzJgSMR@MryZ6J7KP~_F=2k1N zXuy?i)kRICan=>sahc+ZD^55h1H$pc4?jUfaFRH}bLY+- zEP+jDOUXWoH&)Lp3$Ef6EN*-By_m*DGE- z4&i`&+_-TAx3fgJx#ilmYa}NXXQjxhqYcEXkIlI=*GbmvkBWS{$Y;x9{y&&=$`UoR zRi&7h#!!*Bz$p?~gjMiM7o2+4T5D0?W^oL)7XoVqPZkSOoVcqS7C=+G%K2fcr9kRg)ZNir0cWIe~~^W)k6oNtvC55AX9^ zV+SXYlu=DnasNnMsjO*tFe+yGd`V4WiLx{vH6yyJ;RK2*UN4?Iy`jpL?@EMF`cW9q zY!t5r$3U$&%x#>7TB0+5bC{!LgH^m9+{p<<1X2>=;^M1Uue#X@-#fy`VEmWteOdGO zJSm|;xOWVJEY5o4$)fDqP{L@uoVywtqe%isH;F4g^OMPDj7!>5Iz+|m!67QWVbQXQ zKlr1X;B^UJlV3BgxZ8?{oZx!=2sh*7!eQP!36!N-DkIPIN4MDR^5 z5iYEU2YH$DL1BL*fz9~72U0?#aO=HlQ@;G!9gJ5C@osvKQWopUDJV)MMK^~l&WeJv zR2o@<;T;!Aljy3xR$OtcDq{>+aZD!M<#GPnaK-7p6D)C+a)NKl!e`VX!?&t?d2KjK z-EmWKl4~1h!(vv<_s`b(pph%dp#+L<5LcXbR%ji@vrs}_JFYl`zH@k}$5HYrx@KJQ>E7N6LSCgg#>MWBjoD&0kM7+&+{gDDNlwn;vOwd|9zLao-Iq=7wQF(M zzGa5(3&IwR>sgQ%*e%fO>uga7=v;%9O_rk78~kbDZn#P(>arz8G;^*+{seG0T&`vM9vN{#`@6#3 za6u_Qp1e~^YfF|H_f(pEzz%=Y)?;E&sUmOPVH@r z^u&zE)f%G)4M@6{&L-{)n+93Q11Ptb|H zBL7jCcReLJ)Z15wtB2Klg?OLb9`UZl_WmQ0{3?{+cN8F)XD2N4$My{H_tN3=-oEM5 zwR>7XYNZj{5JZyCm9i*wNY;_aUVVdT{0W@$XI?q3SSP>w>-8mBxl1y~Do*|6N9>UePMz5H3X@UDx*3>h;LHu0>R>8~&$&e=&*Q z^@Wf8%#5tOfrCqey7%Zj-0|pcxQLxVA`c!s@VI~f{;*-g1f2*XQLn7sI-ZEg41?hx z@^acaBNyqQliW`Xlz+?5Jr)-mhJoTFD;LwGV!7dMv#s3_5iEjTVrQlx6keRNjxP%4 zY`O|pGqU{5zA1ad^A*!XkOv~UMAT#+hzw2-_yn#O)PaPvOYW-l1zm(3RV_8p$pJD+@5 zL{xTOVQOYhPlM59jUHH35*?rPdAN(C!M8_xgGDJu%K)TJy$wM2ToXV|<(d`^%GAyjzg49Y9QniR1 z?jl?^Z~#X-IlA0~I`-g8t@8kYY!De`+rGQ<=*i}SJ_9-rcRacqF6rdny?Y*a@7{$@ z_$6e1{LrQId`i|0-xodj#%-p_xObRx9|lcm0)amTLR zBSwvBZfUKou4WB&2G`GZ$0j75ZfdEht~FU>q}Elq^Y%$;87EGi*;7#!X^9?OT>8UL zKTn-8%XPT3(R+nQX5|$QE-5ocSslXXEn0G_srl5IrgmwjJaf)Gr~<7eCVu*?IcJ(% z@7{md(spk7sx{{5I02-=kkX-*HMO_z-oJJC-oC1uK}Ds#jV8ff$>~{}wr;z8_1f)w z_YWR9Hg>`!C|ns`^_2;aioFk0ZD8jjqk$Xl5}aRwpD!*kgGCZhj2NNgvTZ(pMivG>!1@kI)A;0L%2{0xH5U_jUDxZPBKrP zZrWQ}O}9fz%YXd&mua)+IEO3s%DqclM2>E|E|!9$|7nFLVi~Q)`Zen5A`MC=XWQI;l8M6h`EFt)-&hjiBqQc88DcS z(!W$Xbi|bDGbc`&hEt0k9MZ|0`3sB7hS6rs_({oWnb41bN0@CzWkV-ToiTp$)P94C zdK-WXi@}sz*muI@X;Y@p8a`@_H8$Q5X)YT!@>EmH^Ovs{EnSWQK{LoEBFcuLViiUY4zb0{ zR=j-kcIKS<0QnN&r=urM+Ts#f)R;fU4ZI?6-$@uh?6axHXv18GyWwHRkN@`eRn~0X zzH7jsBFQDQ<}RqIYk+1jf?Xfoi3?h;R4!;8(@AIHjvKh)f=(cj+qZ9jq?7XUaz0b* z(21n;7@_s~M&m!`=ZF+xnI%jpp0dg%P|m6NIF8EeGZX!X_427%9S&8zZV_*m6PA6sB~ySzX618gc%W+lmaW% zHtaV>S-2g5Tet80@cj>r!m3nNTL%fjUSgeM3(R-0b;mAagH80p}MwVZ$(vppZ>7>thw{~SFvp6 z>eP&Eeo)s(w|5n28)SL4Z-!_GxuKKzs=5PB(%I!Y-1+EkxS$hA1S;_$EG+57-h<}! z$z2>e$qefDGBf=*iv%J;G}GiC^Kup&jXZNjg{y8jFVC*ihxd4S+S(pIQB4z@8b0CU z)w-yZ7&5yQxIN+VNEO?>UimHU>03f1k(@L0Q8G=^7K3+BAIE&@IF8b8ou~;&TGk^H ztZ5~kNG;N{-6JIB$e0v1BR4LoiY3F{Rdb8ki>6vVu=}2@{vwn zzJ9~jKCiIfuDum6UcDxy0TGU$H09NscSnw$z|pu;i*-eH4eSLZ zGq-?X2J8Ea`mnJm&fA#Y?yc-xSdr*n*`WpA`&| zn40nZPe0@40wV5x^7NTM{qp}YiC~Ch#Ce)qX%o`nsRPLE$0j7#)HQzh!;h?A(w1V6 zeEI72%$z*?+yQOVZU5vC*+6}_N`}ij&r}gPOP|BEblMWm?fpxNA@p833D?6WDFFhQMxIX$H7B1-oD)G2> z?OJJRskBbC*t%S@A)1V{kleuZ`bhiaV8rg|Nj7o#lJ1yT4zu4hYSHLKn*aJc$u$>na+*db z8vL=O6Ado=*Xe}q-i}>+ScMDw4HTPn{5&^q-Pygjl0e1bV<%p}druCSu!k@>7A{#% zyq)~0+=9N$ip^t8LNd{8j0~DdI-!1WJDpV4)QK1gghUKu+s@sr4*L%s!KUduaIhG0 z(zNN{|M=6A1{cRA zrS=RpGS6o(UVZrf$8EcI4<9|2(dn(KwjP>+lVAnH?;R;yhVtPffBye}GjHMIth@pu zF2_%uj!#ZQg^=RaaNr=$v6PIggNKj4dG`TxM|^d#HSra=t+4-~UrAa!X7BXXzZC4X zZg^+m{FL}wkDoks^!UlmTX(eY6^xx7-T5&($LoO9#>OR8*B^vD+T|iwg7BhDp-Gh6 z<=Ckfc03ZUcJBJ^QmW*-7i3rH1H8-*3Nl09QNb0V?6cg0l{p^4qlJ zuJ$WI_{fPpx(0YTgzHZumR>J=XP3-*)r<*6i>P#hID|_&(cyakDxEYOIE39mjZkG| z=i#BkpMXh$7mIaYw{^_XvBW};pFDl@&RvM){deC#ef}b^PybJxT|fNv3+9LzeZb(N zE7xx9-d72o;K;(ziHeRDbHh-0_4eJqs%lG29EJ;a4;)4t44SgxBf}%jQ5|%W37u&7 z&Mhooy=L6R$-?mk#~e6(1h*LEMDouMigkiaX}3^95{4@-48Z&sL|Bf z(N$0T=U-YbDy5h$F&nn*sBJh@+jtnEu>a8U)6M6b+b$hGex|m8O5~$A0LzY)(tZ&;-$aBRBcD+7o%e>Gen_t(i zPT`6>t_$ZA4MT%dc89|pc`fGrvxp_H)y&7V3Zn@w3G#Ffr^aDqUeHOX{fnFQM-ssS zib{!{NUaW+bfUv$|5B^c3C!{O?K@Up(IG}g+qnzXb@kc#eON%BJbO+o8aOHntoSU= zqsEShfzT3ZSh`{r3Am4+KGW$$W_AJZFX*J=Bb~q{H*Vj-_z*M11R=t)WA`3IJ97}& zU%Y%J&JDa<1YL;3OFH2ch`e_Z9YJuB;il`zlMch0*|}#Q9y5##sD+>l+`!D+jg0V( zTeoAc;6Ou#1MR})tC(4$x5EAdNf+L}YY&arZrDuhWW<^3|gc z>UjuJkPT$^s%+qfy95sj4UdUWB3^=zi+J0tIrGW5!$2X>1*3Fobp2qR*wKWC6D9^O7M>u8xp-VG-0CwiCGpJIlf1? zzUSEW(T9r;z+R!tv5LK&Zb|DVol1_BE-oK<1^7mJ)UiHBxtfZuA5z5AxSh;2$5K^I_4gRpPW?&sVIk}c%m@cSd;JF$!Gah!7cN~PGXN(T)J4WHF@NaL5E;eC zMaz~GkC{Dh0nRig|MvZNhmW7I#U&UbqWA{LJJ`BoC(V9)_OR-pSKid51y}Ud(+zhC z&JWE`EMo6#)@@|RK&sxTu@m-IRBzg{t^c4Q*p04_E>lb?=>C0e;nO_+3S68!5t&_` zhdUnK4Tm_O59kCc@wjy9lB5%KpBHr_FT3vgZP%V&z81fLSieAQa3_hv&A*1?iJA}$zx&|fj@^4%=vnk}H{k+i{T)#{@pz(vpPZ%*JJ&Q05 zJ|!GzoFIYE&Rx93F%kNK=iofDcn=;q3fnQU8FS{IzjS%-g2nJ3OALdeB~-g&&DsNp zk78`C-LQ$>YcE42=P0=ayjmMJZ6Wwih=rseR7?qPUfcN#c-8QRA($pmtVr~tPqxF5 z9A6PCW&#P3TwwPQfnG9ONxo)7J6a(N^2>L_U4~;Oj+-!9o0MVS9ML)>qS9N6m}i%Y;-qV&rJ=SveeCyfsdn>Ep43<>Vj(01(14o9H@7ktAInFK+JEpcC)L9uOg(xVur~HoR>4WvZr*A=dydtIU9Iqj5yqcB zdoIbxSFYcHJXWk;C(gd1;>JHtqwxS~X_u~EBcGT=HQ|&8n~#X6h}T}6ink9b zJInA^f-BT3D`uzQZaBY1QEB4U5V8~!S&IdI^Oj^UbTTEt)P=8 zNhhwuosaH@_w0qUD-ja8aN&Xn|5L*G1)Zq-aY;%J)4d#}emPy%|Ki|UOhtVJqqLj^&t2zll7(1o(naI|HxB+K99%4#{OL+Kf(3vzgM^#R^3N4G zj-Z%?Br2f?0_Hu!jPygFqFZvVL{|brfgvy~1e`2qp6Z1;0y9z1!y;uw1QcYDkdnr@ z5>6%$qre1I0*81g$N)QVI^n@(SXvlQf@9>((u~RH7WConn4A3S#H{EC=HnqQ6a)iF zEq#*4hL&CM|FL%#$gvwi7~Z3pX`k6jO_-S(%=SIPoI8Y*VlXpaB2b)nk@W6l+yCg- zYE8;W^}4FP)l$#5X8oF0&$N8TV57-kPMKZ2qyu>2p5d3l{qIhGW%7GL9M50=vr`!> zU(qzA1H>|J4RLmIbv*mC8}2K+R##UWa&mrtF7p&96c(e^E8Od`eJ+cl6~o0yob=g= zmR<3)kc_Cv$=3GHN1uG=9)8p(`o+X|;s$@%e6t#{&;O^qACo$FMdp%1TR4=sAAa z%Uz@V>>3A9v{E?!;Alr-F}UHPlov#0yd=904v$Vw&wly!_jdNr-MgQC@l_^{No27r zeRjqT*BJ~gq`+l#sy!I>pDO}xc)N@=)h1Dt>QtrHOV(Sx`r2E=BcoTxX@KESC@dm! zc6L@fIXPKgUiOdT>DdduU7#`O=m4rDt0FFj2rpx7JI$YjS8tMR`RbeRe*F0tu^;3W z95mU)mvMeFf7Q=!I8$Lm6kP1hDy3|znMw@Y@T^1vyyjl=#EQcWM>!D@5hY9aT3X^Ah4Yt;}o#baIB4sk@xz>%jns8XghHw)P4li`$2AX5a8A z_;7tJd$k0f$&D6@8$R8dog5q-)b{uH7Zw&E*@dM|y?o1``HuNJh*b?w&&m3S>f=*M zt2L~%v&+I;W|4JDXH!3 z?99*4XRV6o{YdT&18M0W92uLOfodXfa;k|aWnUKD@Wgq8RK7-afR+@C86F>(Gb5uD zk|)6AOlVxy$^-g}zztV95hr-2+ zc~emx;G^Zk4fj6P4Fdwp>GcpD!z1G!9G#dRs*lNf6iI*S#Y&y49U6XPT!cg9LqtTR zq_(xSCEi=_zAtSsCKG1{SEbzDhY~ukRQYhjxt9#?cgu?;!l(`~JU(t0s8X5qTYBr= z_e4ZQN*c2hFDFku`vR2fsncdJ9X6!EDuzP|3SPOe{}m3P4p-&H4R3)CL!dxPVM&tH zDC343ZunDPPWHbz!2f0MDzsb2f#`nHa;V|tF*7qAT4rWuW@ct)=Euw!hQ|GXyp; zran{6y^%vRl4c^S*IEKbknRsfaC>n*K+)hpMmU$u6_5XBQuJXyYa?ZPF?r_Y)j zO^y@4)i>w=>n-A6VfA+`-3}-77A{(}$POp(zyH1rC&m(frwm*#^XH{N0t85_BDNA; z=8AaxaanIl0Ij_N!%gRX9xuG)vgcoV<+~q$+PZz`p(966WOJEZA)7B`@;ECcZ_CLR z=uW$^Itts{olcAd8naF5)>_leo{sVvhz460OKD+1s2Ny42$%P6?vt{K& zqWgkf$@KW~6DLidF?05uISa&rmMK%GMdHa&BsNUFyGvKI69f^=OzhbS0*jVA>3gpm zshf5N6#yy(v<}@ot!V@>taM)}JY)7eeDpVN*_tnwD&4his|Ql8;j9!(DHK}GfR3RP zQ^nb`Y@IBcAkZBEtvD0Vo^+31s#K4j$b9M=Cv44#zC3 z-mY089Z08@j;7`yIgC}h1kegy0Xl&0(XB$M{L62DTypu9@zi*cs}|D_RdJzs^v30dyvA#}el1huAv-+Qqv| zXE=HH-FHvHA2j4r&}!bhf*x64_m@`cQd*C$KYe<33DEHj0PfQ#O`G}Jn{T5KMK0{v zXH!N|TA@g<>d|Ffsn$plOX?22?oDX*=p9Q(>DT2~U5injvmG+Wd=Nbq>HuhEEE$f7 zGHCBo3>WVnU8UlkaPrPO@5se2pmqPt*$p?$F>Sv?t_*HyZ#6m-P+9;`3xxzg5mo|R zrH7)4+wZ!E`4Z*~`>%JR)iPQ=I>U@<`qH13(aWQ^D!o#(Q~^t)bWr}qmQz=p`Kq~!0`qB zp@=UO;Wafx=hJI~euh7EW*~$jsOIPdXzNZg&w)k)&h&@;UD04T4!<9a#PO8TwWI@p z79(BDolqwo#O15j{=IRN`eZvvMW&-gA*=?dRBMHDC08gT*Mg*CsiMljhD4{8E}PbN zpo`RNJp$Rfu&Qh=0m}OS=pMb&ZRfW!Fxq$U@ZJLlG22FRVk9sAcsBRbufL<~Cg}Jc zz4-F0s2a&Xzt!-}A)&)zJ6Uz1U`3psK8e2@U{^Bhi9iObKsZU5w3kr?& z3kr)#NG>cX?;RMr``{rjun~6oUP(I=d6AEvJX2fe&n}B`b{34Jk|AiQXL@9oJ$&+1 zCHO5y7lMO=)Ob@PrImh>t%8z&1_=sGTaR6yK=Aa%i#YuDzi1qIAZzzGyOkzEwn=DlSvn!(P!`*ZUP?mv83QeMG=-J~6V4U=6=V*h5*(gWZB z=B=_$||ew+`Tt@>sJ53U{_Di;PCLBd-o`X#UoqHyyrWKcfhA~I}M2gMcx?NaY=IrKW&V%ph>gwUc zdu#9P&QBYAm+Z3_M#jdq+2y;WoUo9Lj*TxaDMK>K(dW-D$&62acyufTb5^folT#xTld_CX+?c&}XHNROVS#37biB2*ySr~- za(Wg~DA~mjx9>d|92swJ@9gRuU>W{YT*#YN@Dc&qH#pqd(bYRRJbU|&0$PeeUzwg{ zH$M3fnf>8Cf|i*Q|dN1*-c6V)^F2YNhOdUw@+LIrrMUooOkTmKaGm^^5y*p z4}AOsATWhp``QJZFqzldi4L47fntheSNS!I8RC2QzJr(Z@@Hme8?IhGe9Qt(MYbAe zm#zA0fhp`F(eJ2*m4}b-NgLa>8#hy9>gW`y*2to`TTmK+clWODo*PqB`2|IuK7L2c zEx-He7jvtVK_Ow)wRMQa#^#oc?3{_o8)Fj_5>E8MNfy0`GC8_$K+v2%p(^_ZmK>>% z&)mA5bMB&@qno>z|M`o#R~wrVd3^&zO|9+uMJ0hD5xl)25z&Z9`c&BsJEsT_jijmz`Qc;tbmK~Rz9-oq#o^zqAw;!+( z?A+CJ^`qHa*&@bvVcv$_LlaJeTTl6FR8lQt`hYmvP@RJH#i{^MR#;5z{OF2dTdZOG&1u1#f#aS zH{CqFX*G#m^V%hx=xZm^ODtE)uXuEw8KQ`v%7U7S78I4-y?3v!q2ZUK$1w*95StIX zG$^U9Z^8cMHw)R!N+620y~Fy=+o&{sbX_O8BJuh8)8V7ty}e`O6Oqxeo3`#?bs#|N zOS6S2k^pMsy16nWu+c`L~vNJxqCObdpGx?gj zhCluJZ?SQS)ZiuBv2*unYg<-=#@S6B9kp!V{zJ#jEx{F7R1HQ#QSFuMf#ETT`-+-+ zQNWVUp8iL#unmH|;g+JTy0R#DwnP;&w4NFFZ0D zV;7S*iCy#BC7b{yb8xb6-#&HEE@{fw3rv=q-O3^}DmQQ2SyEPh@BaP9re+)lI1fat z=*JklB-1B&OLqR>%T}#9ZgtWpAkfy)dF{q6)R-{3gcB`uA6*rfmSN*cN=aL_b^}2N zN-G5y*XqcaSm5O4E8Tf)d>lAY2#j^EmTkNCj*LwRORh||Qcn~o^FMKo*gJc;dir5S zdH(CKqBXa$%wSZf_eFNBtp7L8sVh7!`Fft0AV9UOB=PqJMP96clPfQtI-ArLn%n&I6I5oGlt=q6^@4kaW!=v}^OCQqQ z6-kj%Rd*#SJ_QRq^oSb@N)lHgq{*$j_mKW*9ureDjKXGu&T*ZaFLjTaH>n-ildSmGLk@dz2K1}w9 zkDo@yBv_oZ;hu<2xJxM+*#pC)V%5*n;^h~F0SY_qI~iU6Tlp7olUZgxe)^n;HZ>#1 z$<-76G&n5E+QEhAN<^vfB0vT`T>o)&D5GNIF?1_F25k$+{`dID_FwAg`g2oGRQCxV z-bGRgXf&1G@Y<#CWDZX9^Yeidp`B>CNu*g#oahipENN_NdiMM|SaR@(pRjSMtrVl| z5*Ss2|CSxMjroaFAc~!n^M)v+koj%&!S1_D@|Jk26bz9f1tj9P;@OU=l(JY|vRSoG|(vob1?r z4>Bk>`zGd4E?5<2cDLIw-{QeJr{=*;t^4aHKowByYBSlvoJ$*Pi00!6*Iz?rb z$>}+$ZcLZ}1XaEOd)4*V{DLFUR|J63dh^a*;v6F5laW>spxpQdN6?|fDok4msaY9k zE&z@EypUHE8Wq>l-YIV~ZWzCi$g`L71?)*|rs$3?enOz{F_HuyCOeOivzs?2)?Z(~ z1X@^6pscW_sk?G*Y~luhdiVZAbOle}z=5IBcQQJyJayG|4J@Qk$3r4w@%*2*bvkBo z3ecLKy;)LTWpT>R3MIwO%Rh((LUPub^La(3eFMY%Y&Aalw_;a~UHWh$`Hka>Y{KAESX2U*j89Bjowh+USh{KrN5d12OO~(t zYQbVH&{Ew&YQ6U8;3^6b_Ov%eoa+?)DEQ?4f`YMn5$lB}A=!#A)MX4 z@sy~oY`fjo(Zx$E*?BkogTqhRI9_XNk?geU7>=~y1Pvi8=PY=zV&!V^(%Z*>-TF;P ze4;0XH{x1j69BVt@lppT7Y{F=)oa${5eW_rXY}#O8z)X#fAzK5F>}j=q+|z2=P$qd z*6PG*>Qy*lbO9%fLRUV%{;+S_yba>)oU_84(s1?Kij`{?FJ12B>>3al0$?yoNLa+f zCv(QVwDio+KmYo`!SCV|lLLc7z?JPgceC>ng|5C`u!zZHpDe4W0vZu*xHnKZx_Srb z8B-N{Lwe46Y+UDa3%~%ZUY))D0`n+Xx&lI@AXXD6V-wTp0mTJ8D6g*Ld|-G?>QXof z&gT}!CZ+KYq7rC{Nlcxbnw58c=GL9?*u;!8=kGsy{H9y=Xe_rzuY8#7gCk=o%_-?w z{CCvY! z2rRkQ*vvF0rlvD<&iMs}JGyutHGfS5o?(Kc)%fU~*VZ=> YqEJcT`{Qn0hoaoO@ zPVaRkYkfY9#Ous^x_tFoYD{9+ympbs_%Ar&Or|kvMz0#~MXfZL%7^g+miPyUaB}#VIr@rZH#+*i{gf>A zIcLvt6>c70Uzsh`>jVOkhN2cQ<||-Kdae|lH)N+?w)zDIOP~20525ys>m%b6yrKai z5lAJqwXwOa;aVdKgvySk%iPMkptwx3OMA3*Ya7DJ=-9;8Z97@x4-StAGXnUrdCT@4 zJNMw^MAkbvxD!j4f{ zRYPP%OIrt*hIMY!mTiZ=|B<@^K2U?^hxYIrJWGY4utdX zAbJ=IKG^fFMu(nmFXa|m+c}@Gw$Cjn;=vOZEzvDc4o^sDPoIx}FsKtA9Y65uss4|n zQwY@Dyp7;m!>=pp*wQgTy;nFj}cmnWiZ-MM>YbQD>A>-KGTT=BG;!mfGk;(I5| z1SpyFok;CO_)C<<3GnCY3wxYh_s-boQoP78FPdI7CKy-5O&<~bYr!Zt85kCI(b3W2T;GCR!Oll7BsK_m58HK1VA%;*CP)dloy3*J} z1Tg5**xC{I%9lPiIgPA2f4KlhNZ;UyU>6c6HS1hp*j%t2UoFcmDvgLs;vBdVVu)J= zoZ!6|hy^?SBSR%SRRrON#6bqyzknC!n&4uW=1Qet993Xh7udHeRAJ9lE@;_)sJTcump$#XuUi9(~Y zf3Euc^=jk<3`Xb3!e1%@h6TJKrP0aF-P6~PkmaQ-*L?ABx*}T@ zI2lseiKQV8g;*NNE?Y&7rgoB-U-@hbppZ~}A#EL0WTv&qR9e29QF3e^4nfXtZRMrGX#^Mek0ztH5Qp13Td!Oh4 z=76If!`Jl9Taq2nib_ZYu~>BJGw~1t*EZWvW9i{dUGq7Aqc>J{Qs=L2nrxZ8FS|R zuf5^wbzW+1p`=J;KC}4V;DnDh>W!|R$e$7q@W6*fMq@X|(6VR$AzDphH@tS~iU&kq zyW;iI7&+?gQ7<_S_sXTHba@JH1qtsiU1`mE)2q`p^8$+N)0JSF>))<~M zzSFZ2Wh&Z1guD|fd)&!;zMt4K53?E@E8=>-;|!yQXhO?u*OFvZzj+kYgj0ZkRD1_EBPuNzuCfC(HDYLQUgiO4jE41=guC z*GCheMP@Slg53N(e=`qX*8h>SPRP6WW4&+mbILP9(|6bsFB)Yu0*eV)KP7=HSb52y4Sm%sDZbNQ^UFVGP&D7!t2Dh0UGPNsr%gJxDet$C`)(fud>-U3s?`luhlv~*1Ro@OsT|Cmg^g=_eQOG2% zh)nrD*&Ytgh2MlHn%y%)xEO_#&bSj*O$_XmMV^!A#`O#Ag_=A}PUUujjYdo6#wqDz zg3L3rrZnAS$KJ%a@E9a%R$WB~=F8x)+0Le%g=7#z+^gFyejyV*{3H8- z13KcEcw=q-=`RKK|JUVu+U>3FOgA}(YtH?~ZHp?%OS&8BcekkYoCG;!ynBR6S5J7- zI~b9@OT0mOHv&okGsXDqfLLN8QM6QaB)j=@hrdY$?XtN_99MIc{Jo|*} z6*6NQDVNH^ddgjNTnuH&e(O-lIP!M};>ytTU8J~pjm=s#3sqcvnz)vY*D!R zouK~hs@`s{=9^+49(@w|7ql7N-WE>}P_f14B-qNE5{V3gMGd!!V=j4gnT%nY&LHB;$*1RbDjUszTrHpQEB6%FFdnl|>MRRp(U5RG!;%lR76xVzW%F!E&hTIAa?k23=dbs>(pi;=^6K3ME>V*_}llQ?G2k<+-P&jxR{8;GF+p_E_6t=3W&O^S(o&mU0Mo9b)!i%8O4ck!Sd`LkLsRW`4s>4@Snr z!7T_^ORd{tauB z@bOWcCl_hVFlIP0X%h*ewJy)jiRz-u`?<^OC!T-4sYcifE#uI}{NrrCxrfT!eG8|O z_#I_MWf0k?>+m*;;7=LTa+=N4c7>zV-O-oNzdVJS8iNJ-R#!#eX)tIZb8nr^?of$* z9^x310q;sb-!_DOBUS=ACQXvOioNPc$CyWjL9!c%IR}~=sxPt7k(mdn)3Kk)Wyn6x z2+Gud7WbGPT#Hg;eZ4$36jy%|Qt^BLPAcQ`GItESW5AM2cGM_O1($TWGqPz`x1?>~iz-7844WU8o zH+9bALq?`%kO}o}I8R%U60!%^sv)j?-#75PJz6uRWfqo{f06elSt(zWJi$QK3lrzS z>gGI|>!8djMbt&BGss6L-~YFz7K1^+*~zN?>^2xe!@w^v{j%!3O7vXR^CQLAgH5Oq zE@}VH(ZVhCZ`X75X=zc#7j>Ow#PQ#=Lkb?pb|Qs2=x0CRnpDHA?9!In=kO19Oy=9Q zkcGu1Ucv}gt>r5NbyLtoSXYCdEPzG7y4vOpsdk1mHyKq#_!fp3IVG(u$>HC_0d<$$ zD{muNJKvEhgBG!lc8N}Z1cA>URntNk%hPaU3Zl?^@w=xc+V0X5&c=3-(B!l|^z9C7 zn3+owea!InIi?tEOfcz-Vj$>q#?iI+zZUf5$_E|P>^-R z#g5x8@X;+oBC+P(tq)_gPI9v7eN~)IqWVcus6&&s4jjD~_hCo^H1m>4t)x?tcNl(E zQEh*x1A{686o88SV`oJmR*T&wjH17`%iYe zZx&i=6Px%t8O~1OInG-10?tcV-0!mtb;GrrWM(;(joZzHe#uD?vCp?>^!^i}+O-Qp zh)m>m>@mSMw%?5La6H(ZKJf+GA02XC@1Jku*gt#3;ah0(qPz8vDg4F&MI4>YaS&2{ z@Q9aF-M+mp;;c{^^LdYoX8+nXR)%^tx^ ztunk4*YX`1`0=B;&XX}!Q`$}t{maPj4{R;TgS|bXCB0H;bOJj-kJ10T zp8HKV(W(u{eO8}Jgc}3Co^uqpHZr-RbgfdTR_PimuS}}9tVhQL)RIU(J$~`((2r>) zH#$n>%MN$k{t>$TQMp!FeD`B9X)jGYxp7Tp1INGQZZVI>(||MnH`0Ypdd^(2$Kt~2 zI{_D7V3}xoefl!nR4GO8$agVtXH=HXjf}J1)h4d; z`BPlWT7)b5U#efwLD{k_kCT5NYn@iyY(tX7(|2`s?bJ3E5TZkQFhOc*6Zj_G%y2{J zpr}wiSP0gNOl)_ofaaUVcf!={Pdgf7KoeH^&o2%sayXxKSZG-*2Ewy4h`R)nuKxAX zIE)FW#Bu4jGtSsu@Al6eNorQG)8Mciu9P=4UwPzw(Xme_etAqTp0ERcwRrqj6*i)x z)A%l(u9)dAW7OW%hlNETGG&v}DrHoS+M>%3%!p}2G&{iX@-+3f7yg?btzL%)7sGnn zoOOB(HkYV5{ZG78%!&GSkvwTO<#iOsmTZ`8I*Ie-svZMc$P(%SuW`e}zow4U_D?sG zH@}Uy(dwDd87|1UtFLfgeYn=;rR#QLr}2=y+l6(Uv{xKMwpaeDROuFk{weRX)(7`t zzJ4stbtd)ct2B|8@=jzAUSZhRkpu(XHIZR(-YBtJlI=5&Ugu`);T$yD0Jop3I5g_k zw3U}CU%5q*?NBxuJl{(n^;?6F=6>I2eWG6M7FM27qYozCVPy%L*|tHl_}pbKoeici|yBOmOSwTJAZ7c@^(w3 z>O+t#2dy{}CP+QfP%`XbC!dz~Q}tr2yvBPc;X0eF0=*2SVs|IO#cXHc;goL7dVDI% zQLTXDf;9K$diml_`I3XLMfmE&a-+5)^!3d&Yg-GNVa+SN-Ou~+9jEIr`SNJ{@97!| znTBA;_Tk!S(;YA`@ZTQ_A%BUj%mm~nWkr-#`wGa={bJ_TszO~|0){f(M{=DAmq|9f z9%!&%WNS{11D7g-Bf;|cRBKe!Y|83~pK(hgwHS^~tTVXNi|9Wid$xw-$95s~fc8_R zu8v&OjGTYwJ{;i%T>62H@GiJNeaR#K%wgvhzDWs5w+Pol$B!VGmn3GbKJf7SlQOA_ z;}G-h+&hOjs@jnsjNaF~-D$fXfrKk{*$RX7rS4^4@QU5^e=&qYSy{<){C}gAW(VvO zDARTPGJ41#!J>FGEq77=>UZp9%pk5+(}ZpR7f(=TCJ)5Z^;T0ml~f|P@yC^1BsU(~ zIm`Vwe8bni$4$BqzU8Fn9kc6*3Kddr<2D!;@jd{U28PyU>tH*;*aa>G1vq zPqQrruPFshIA^zb1(E?#*gUVM2RExNOJoMNC)l-#Aa&$-VyI3Vcx?-p%u5R_E0*g4 zdUbi0;*}eO7%lWlskCPPjhvH|(!vhwD{tZ$KSkH{F{j88R$oHdQo%a8%gv=NT+h~C zOC5fX2 zf%{t9y|L1c7Bbpe|GVD4!v`-qu2r#TuQ~0gi>&)i06k*I+y7m!W&0!~!xBoI;J`W* zwt1OQ;Ez2%|K+_z_IrZGpP9suf!8N&OX}oN{bxJ`1{%i4?%x#M!?Vo6lo@GWCxPEM z+uEKpFAFGofu1dV!pXy{Lv!}-6!y!khj?pHSgJJh(5Y47!6UjwPa z?W#_DMEmZP*#)fh5q}S#%N5rQ^uV$vyTz$-r6*JabsoJvw$-WL`n4iwGsjSWfa;cz zX5d8*C>z;*PMDc<*=BOIx7D49$!3N;^7ZF7^lzO#o3ZbiAAegETP!>{WW$0#GHeYH zjBGizrowiV$D^N=rt`cA!fOUVsejzDBL{Z&26?^qH-6$9M}+W>>;%eZ4{V(=)i+c) z5?g%|vy1u|ynsERA40RARqO(osT}ZyPL`uCc~d!MGi>zbaOsC z#AVvChT+Tc6p44(R;5YO`DfjXI_hryU5eYZ3Vq|GJUqJPc zWI>A5X!Hyn*jm-pqs!Z?Aga({R^A?g1|U-7F1ffo9zC2;EgU#dj=D3nW&k7Yh22m5?ajUTYRKvCu0mKV&ulj5#`>%p$a#aQ~ZxD;`NXJdG^|W z=@0=Cz4YXsM8cEkEWS;0)BF;!3$2B6X(D!mI;9Tx;c3SebmGrBRb-De~eyt>XGl?=LDa;B;rSk3fX#k z@``R}+4WMpjB0=bLY=@ST^py=Bf&4m&%>+MK*MmjDci(rMa`K5*uh;rm$Y=m$pdXM zLky#8a?7t{KdBe%)3@~hd{@Cnp8|h1&eO86vlEBcJ8HgXOOj++d7l*aj&ZIenfXn# z%BpJ0JB+V3O?DdSD;szNtv#-n;Gf6aj(})?Ju`zACKFCl6kGoO{@Sc;Y-Pp8is~WB`6|X$M`@CMG7Z z9-jL9<#@?dH8k?Fv;BO0-e2_noK?6R8d4PA@9ysY&i92~{4zQk!?tk3E~$yhR>^eH zB&Cz8Y zA|hWOpXEQm-uQ`zh6Z4J*ISlfqF7B z^gw86Xke$GlvA6(S67pR4-XG-^M!IurXIOKdVyl4M2wQvZrg*i2NGCv9^ybd9UVtA z@{X<8)}k@+{+<{s2c%+mq}g7oA3l8b(D=Euw6V6v7uuag?d9bKY!J)L%ai8g>n#n3 zJVRs23F7$~A%vffw!dJ;h z2Swk+%LH7tbbae4{xev(#|bvQ-r6#)uMJ`%|ARc|exFK+P>nL(Yd5aI^n~2=(b>5! z9AeR$O>jUBaLBX9k;3d4?+b`zWBISbC^i0{!8ux*b`V310FSS)FEg^1X~~}M3|S@7 z$?9JP8yX)+N5>UZ7oUhnPCsJiTTWc3?(G4_nwlCnG3z%`@n!7}=`19Mjlsyb{0lJD#4L%+B!6b)C*`sDU{J1UQsZHZDo~ zCLs2z{0B|Z@Qd-zlrKY6;PAG7C$5l+zpU*k%9Dou1sd08N z9q#^CUHwjBI@86;iGF&-rI)%Mx&Hm`?Vv2TUL?)@{CuXDo1~~{aDfmtBg5GGx*=Rv zGh{D6w(PK}sVOoN%|w5qW?8rs<*4&``;aUR=WErA+32tEQ6yF`Od=tEPIS)h zkK-uJO#}du09G^Wz7oCFK;&$%m;HUxNt;ncvciQy6!vzVH2R10gEl%6X5A?a2HV-$ z(H9lapPHE=ig)y7_~jz=J&%e{o&?!P4~3(>z5O*CzmG~_KtOe{-xn3+)vD_1OeI1v zwrK;f$&jY!_hxT^Sl@`Tu`vLVe+FM}hohsTfkeX4lVhS7DAw|i8T{Ly;R7PS!J{oM zHVu_+YXk?WMo>69PsZOYV93%|HPgS zP<^lVo^VcB2K~eSz7^rs$nY@Xq_BWMLw7gNPZ?2har38FY4h`1Ur?+Gm}GXR60iQw z5YMToq!&C9qZNKoM^Sy=oRhfQ9->APlFvu0X_EOa!A+I}oe}8y}GoP*_=pVcn5>Ybp{%A^m;RnKW zigx1ny;oRMa;R2no$)N8NX~?a{(B>dRGoi#mT`5N1}}=-3ok|JZa3ag3ONeV2{{(? z-*@CZE%W@lGypAczgQ70Azx80VhBx9F(EsTg=@A8oJ89x)o{JekJzaK&f}WazfB`& zDfuRfSx{g{xK=PbAg+?rsV2ZbhMK(ik|nwhqpVO3N$(p0DEa251=t_1mbHJMA7l-W z$?WgVC#+QN%Ev*i!viFcdbA9@P;HfrjO@<6KGrh0676bAOJ3R#1|?0$qCj9FVy@ip z0lzO8Qk#sp`Y{zn$+}4eeeIUc)C!fu%lJCTSB4F5?5?OL$|eW-pwW9ePw^ZM9pI_+`Wxl31P3vV< zJ48`vKtu>e%1JQ}NaSOtM_CaN;k&%PCcW{=z+DcX_@e$U3aJ@A#@_^rKVXikF7rJz zKW1%{mk3lKD42g(MA7=<3?KJv9)R~DSv^IFA+|42%(>eJ$ zbQ_XO;pXe@t*XHP?$w_l20fpWQ8d9%+Ym#4EQ*AL1aryTwlE`{-caOP+?=E1;}0@b z{ZZIrFv6Prv5_X5h^V}CT{k&rZ$Cd~rI;Qhb8AUx5;^_vl@-}v*C}DX37CQOmWcco z88 zT{7*P7l zvT6uM(%-?Zdta~{|$W?B-i&v%fN+v?{B6J^`)GE#tvI)YP}X@n*FNf@@rEwdVDT6~voPB+%MIq-}8 z-~LIz05KJR7cSE0yFfA5>XE4K?s~XgR#j3qRr|cl4LU?t3+pH*M_;b&IF@;B&Y8{7 zmqBB<8x4!|?%OF<=JFA*-er+dQvF$sAuqAK$o|^SbO37CmK7JVKt~S zQqV>Q+fi5Scd?vBq_Edwv;tpT)JpZ_WcXQ&c6KmHSR$jgWtuv<8Bt>l&ig_zb&6u6 z-(pw>!9;glrQlZpP-;A4ou9}FOJXA=N|G3Vby6eUSb;@}K(u--bWhrVp}#tlZ)1_(Fw>Pt!~0DTrLshtfe@93IrmpT?Wltzktyr7ZLpe z8{5>1un9-t?0ruzs0?~u1WZ_CQH$ne%{dEqxhI+fA@+Ns1m6?eP^~O)4bXVhC>Hr< zn-q)P9vPH{0>fQg8kzo*w(r+*_`0T$l@pEypTq!BiIyLCg$o|7iy`7!6rn)$s7x2u zJS~all`__uu;tN2sQHz!K%i*EmPtclOjs1%nBSL$Ybx;H0WOm3HSTG7AOJ8#W}xoA79zFQ!kmDcT-8?SZ#^JGDx zB6-EMNetfF5|nmLOBS&!>hkS674aTd4>*Z2?)H4$Kju`i7Y2g{Do8P7UeM~%o=0D_ z6XWf}E{r`rFqA=)w0Pb4{bSo~6U>_OD~UC~cu}?Uwk%krw+4rfgMF42rJ@=xj^jRD z9$7@U@w-95E2B*KZL799_ITM&uW$UhEwaxoJIB}d+8J0r7S26>dqY*zKcOB= z;driI7Z)bkTKnkVuSy>n2{T`nsn_dusk9_)d6HK~1+)Le05Mn_o@eocF+m5E@uiw4 zs-q;B!2uLZr*n4kKVE3UxB4m4-=)6lUhe+V{~*@HT8~FjD8FG1&w6AbMR|Qg@P*r}@2dp6hTsEo9)RvW z>H;E2bBmV567<#Fv7hfH6!O>%(~2*nGy?@#gU^BN;JPvIAH5X&&97B!vfP6NHP>lw zwD~spe0*5OR(baD6F53ap>;&eH2Qlgg5bB&8K-14EATAALs=%<+r<$*2~hgi6)qAC z$4(3W#lQ+DzXBmN9$GDrx>J!h7g*ln7;Q|?v*OP~r`L%ybwms>2gHqQ>+FMu#zPGr0o2E>kjvaExb*zoiaS^#b}x+ zS}#h-nm-DJaDw3y2eX7BA(d|cLq|d(DpjP4k(2nk69E(2|tP-@IHNfYS|Txh*XJ*ec(p9sgPj~S`i%-%8W&#;u{if*7+Q5I>~C_ zC)oQA@hkEAkz)+`d-?Nz0VlB~=hGp_Q%-?9^#GVghM_zK7gKoYXeL*-o}xh8G392d z({^tx$@w55_YmvH=np@dTH=!m?t3$s$~xM!_Lnif6G7lI$g<4gL+o4yTBTo={qT(l zJ}{1j>iEX|?T?0h8opW{D|uP`T$qDvmL%r4f2K;`TpIRcqd61st0&X!<~xB77yk%Y z+iAY`Bh!=I&@@{%o2r}u4kE~2eHQ^c1NU!;Q&N&4=aMX$E_m!ppy5!xm&wC-QUkk0 zy~dU{-zE&&JuNfUk-lOXTaWKEafhgvDe9<`cZiEUN-(O*N4TslRWpKocMLNo3V)f_ zy?2CXNhr&lpe^A2ZsZIfZIG`5kt8c%U$?2Bg~EU0^g{MlA-46Mt|E*|uY|?%DphGs z13TnKK%^K?gshGDqH<1wPxmBacg`CT^kuTm^9d@C#b^-Hns_-qCV)u&7C0Hthwc-cU4 zjd|AL7rBAgg(XE*hN0_*fc#~}%FpZ=J`4f#*zu!(b;njoBJIUH78RQrEzDEEai5&$ zBJb&`D=CydMW^5lvjkYR68$>uhJ7CK{Yg;5jq4^|sl%Vymn>_I?-by}bP^p_vqinH z4~^0b^WC4c>ZIK3jYf4++;<=1^X=}`F10ZIY(W21;Nlzo8OI~R7fkT@hwkt zJ52*Ds`=idwxMO4HDX!@&i~n|t^X!kBdi=5h@vDCSQNwkITk(&uJYK*sOhXV`V;eYKFVNtN@R94aC{9A;)?} zrybH_M_Bbtd1E5#a<(#GHqLlliC>xJW;!C<-=@3>szzTz`7ELBB@m<7}YBu4!jdF^^+&Y^wey>RGC z>p~Pf@J;h4aWg-xYl7qTJtfkuE3RL;pn=^yR>F#6E6sz|PP>6AuRqGz{ris=D-9GZ z(N6?{B^%kwX|BdnfzN9=$rlmZD?pCPQ#)+~#Ki^rC<5e-D2ZLDt&)M~;=Abzn*uV} zs>3;%ul>}j3&Ay5viQuLC2`ZF_sx7OIAW~!-%{OnURBt{hcMOu!GV?OtU#ZpiZTU+UQJHf0o3hr<)h`id!z;q>J*qtAK?2ZwG@NT%P z5L-g+s|`cPxP$zrBb>69U}M*$%D}$#83`MsPw>)*m5F}^nQ|r*ft$nrbC6aAbwgPw z>+-m51`WRAnYrD!I^lb+s%3s|$)rAmSTCg&Ud#S+5ar?^G|}p}ZRy`MJU@&vh1LUv zBKBG|(0kRSug>Ltts{unHMVhxpH+tuD#tY!hwb|R5NLcteq^l1)076NMeD1dNwmM^hxEgpT0IAKK#^c>aGCSz)Mge z>4T}pc-kMa$cP(#;REv5xM2h3% z9|Ut=x|WwDJhPHr_fyY=Uy`>k6?1F@E+|k_pQVy#-}3CJB=$)khmo#g6e6oE3;xv( z#_{cPt}qtC@Y%%4J;#)vMngBV861}DmfSQ(u%1e1F|iP-!=hXf(Pzu4q5GjYv1Z+$#~sRf>d6^n z7h4u=w|KsuL6qY0il$y)4Z*)=lUf3MC;vXboQ?(w)3 zAkeG3VfgILQ`)snM6rbH&|83G+&8udhqC!SpRRJ|Iy#Y_#I~RLKYtr>f6K6-E_{zT>>$fLE{W!ZW-e-0q!#m*N zb=Aonu1n7KJ5;hGc)|#|Ks!;o_=>X({y%bv8ft84%Yn-+ie4^P%EX?8XT9DK3)SWB z@Lx|cmb3})6J`!fU(fn$q8`z-1CcTH+B<&M^P?^U@J9)l7ftWSD?aZc)yso4;@VR zjItj&6yQIv>6GS`9Ai$K*g3H{@+8c9cy_c1-RsGceC9aVz_FnRCL%ICn*)9}_b~X0 zGo)YWF9^(iHmBD-7O7(_S(k0y+mC$Po*66xe0&k!|5aA-*_J!w!L zI!_QkNnUGU=Uy_ExfBWQ5v3<+_76Ww>n?nc2QzbQ&xNPHzIC3vVzKkZt#K_&pzYBU ztpi?u`>9_fj=y$?mzY%y3Cff9V(t09)4s+LX(h<9);+lMdHK!LG2mBRk1iu#ws(On z@$#Y1e#zzkX7&!v+g#ct_92CZe3eyxt2X)03!J#5l)E3>pb+07Yg>b88KE7c>>Ag$ zVBo>0eIq>^8ymI$r2d{KO(lUj5Af$h!QGw*I>2TlTIY3br~S5SHY@Ss{@fzNekL`y zpXPB`Gh-F;byzO|_Yjw9cnsNcp3BFkaku(iS1Fm`JYTj#dGb<%!q&-Y&iN9i?;F2C zd1m^m?F!Dm71r_tNB!Gq^Q4U!oqKyCt}o$g44l(r^zuMyKi1R&V|t$qlABMyfv%7| zb)%)n~bPyjn%@%jh0_G~r}-RSGMjz_ex) zJ^OR7Nc&;(0Sh^AN&+fi30sf2KAwQs*~=$$4r}yc&(=MXHfXLZ=wrTA-1@+umbT!> zW@@8;E&W;g|K`1P1YaE73(9ipK8)-N{4aElAW*i)Tf{3Da;^v(npVJSk%Wnf;iY5x zF6j{=R$Z-Y{woH4}3NHg5?*^(_vLh~&Hr80_*MC0AcC>5_ew^;~Y8vvq z0frI2*$eMKqm>9-kN5S2+dIVG#Z4YSDowAR8MW^uy`7V#x&I5}ui^dCcZhk$!h7?C zQ}d{BolduzamiHRU4h=LoU?LHzh(?NWfMniFM3FTHLY^$KgzMau|4x1q7z8}fc~V{ zX|-Pmd1=mK8x%Lx@Qj9PB)lJPGlsTBs{)|64SBcm*NT1M#-k<=b=pQMubZ}?4o}*J z(fP`YeM6wJ+w9@5^NG{posIAYz-6M9M=o1Os7tjnxO9?Ukm&^XcI{mvZSbIBCnTIi_1UNg?Yxy^!wyRZ9Ba`NZn|~x=E;6BiDNSiQ_lkw?OY>;oB|%!VV|mwC0Z)Yl}{$ zETzNb=KnlFZMuG!bU}w&8~%6qv`=u>Y$_SxMu}l?JM6DR?9QGFZ30!u$>VH?`#5(! z+?yv&qh$M#vtyez!um1moZD=e7sE~aD}dw9)tm*pOREO^AITT&CkK0;dl+e?Z-7uu za;>#H@=WgFx6){m5?)WaD7U9~9Kp)L|Bqr}UE5eF|L6$Ky*R~aWq}va3hdsN#*p z8X%#HCa!TxVJ?h-en7zHvHTIb9y#T4h;a*crcIj~$GCe}j6}28K&}E%>Q-9;C(D=- z-mT7B4XV*KNSfFiYZKo(8x^8+93bOy+4C3u&x3;pp@x&2Sgr0csK>1XZ@TVIU(f(< z8w&t2ka2igQo4-9?+&Nm+{EOGTn*gCa-!e$ui{k8F#ux}oH*OlJqDmn@v94)Vs9#RUT2UWAM0c zx0nKaLl6Y_czoji1HkoX4)qBC34}CPoFBkUb=P)-OqZHU8!?(lD`#3lrNfL69W`K4 z2~V?0qdM{iX!r0=`7K?jA=a16tj zgc$Rrq0Jy(L53V_+iIwFJmPx&HU7f^pJ#nQ)rdebj(4w*2-9ibMgl*pnoO>HhZ#q} zqg|cAMM`h6&QqZRfMQ(_nvo>HELtt^Ho#PuTi!90yHx9`6Qvty|JH`ofDrpHb&ifF znlA238^CcKns?7ps3X$=CT)lDJ?a@hnQuht=9&eg-t4+ipT05r{GYa{@e(--_3awn zEQ;$yI0)Xne|7^5+x?C_V(d0G+`wZ?{AiA?hF3gSnI~<)==|WNddhztuc`hqWhPK=W4V5!$h=7A|m9t6g$Bon7cJYj(VVe?^&nD`&f~^c` z1DPrjvqn5=^J`A`GO#i)II&|;epYkUg zUeLb~n4B3kIG-^t0VL@f=kpOnX^JPH^yf=RiJ$40UU66Nr|;XCt^i+Zod-T$>8|C3 zZ8-G~O0b@B*7?-20y^S<5~F@X!Y@GOdH-zzln2nBuCB(k4%L^RR`MAFduUTS$!gMc zfH=6A@^2F_f7#o6>O7e-gmN0&0S5k5<8{&dlhVa}^7NDhZ(a4OKku-&5m?z(9&Jl! zf6|x8FBg=H1u)?0z*J*iWyP&lap(M3zGQ#mc5!ZdG=Kv>InpM~IRe~3 zO@>Y76TzOx{c)b$XYXl~CTdPB?DLv_YIpM28ooKN1m@TQTa)6n=z7ol3)L@FIdK=N z$0*Irw382|h32l0HR(#|rtF3rt>uGehMnI04$=)&g`)#jcs8%`>K1oai@j}=4;6R4 z`#R%c2%zEhGD?Tjsn*`#HZ`H$#j>;s=`r&HzLX%htjf8B_rJrHy^!u~UI97&K+ZH> z95^UY;ogOoB=|+zVRG*bp^a*qiBq1;dUz1knRB zf54lexRwoDFzZj*QpSN~Jn90pWDr3VngrJBRKBD-FZKj1yOo_s(7Tx1$< zt(PZ8ccL6P3~=be9j zKI?ItAa(aa8>xMYnuhiOviS$8x6*Ay?>V^S!tFaK2dWvr$e-gYfVr?ehSpR+opMQ0 z@&0lK(%aRe7ss>y%2yV8fnVH}`{d@aV=?{n;r&(x246k5t`vjdQBd6Vv2^j^IQeZm za-k4{22zQH1dGtW=K%gk(vSd*{DBOwVbtEQEK0m!bMIC|aT_jwumTxU*`D z>A*T@D<9uzdT_lf^@b;2Hiqjk z#B+v~hO=t6LB74pftzEO9EqDfG7=!_B^n zo__ti79f}sPQKl)jj^&n|0!6JY@=SpSt|YUUzK3T@w_T!S9z4#ywhIQX(dY8xOqM# z_h0;5r=JBssl?THA;Axi>xexk+Vc9Jd4H)i|3#;$qQEr$cG6h7A~Ik7uuL< zrF#t`2QF;BXuLZ>Ap_hi>e>HOIdzHsX8S+Qx77ywEPUy1zh3#W3itykX5By%t-?4< zeU8ISic)i-6Tq?w;QXgHSn(=JmACUa*|k$AC`}ht<*)}2NDDe1-Y5s=)EfKY8VkE% zK(|U6ub^NJ#pF48t$fKkC=RI8fvy00#bxhu=r^}PLbcmr& zw(W=~6*#%)g&_rq`y5`m_7^`uaNOPU5L} zaxTFFXXjilm*-RQlg)jdq%}_tPr31Nxm*sdG}gI)8|-#a{&Qy+zgQ#a@GH;WL<^fijP-R zbjpU=wsZU#wmpz_{{zB_$KlhSJ!)hcP4lkpV5GS-bN<2_YtOLVW&VP7`d1Uc^ z;BYv+#>qU-Whq{KT+@nwg+1}XilW`wzjHVb_uX!{7A1Aa-F;NP)65Wc#VdQW)+&2m@qm%Ni zc<~L(fuW@3p8Yi*_Xbl;nG>p>3|HR5UJO)p^SbtRH za5%i|?5c6{<+I|G&F=I2FFWF&H~fNs$EHa*9PV*acXsKUHk!Y(JLBOUaY0`kuE(R| zY`g#thx=iTlk@p(f7!9_fUi4BihTk-@nMR}4{pR|a5y~1iH}a&d$PU@u@3kk&r^ec zLwg=L9A4tYqGWTqT*OA<>IZmcM)UnB-Enw6sNit8;66IBC<&8Y;}whB@P=Pba5&uW zieKX7dcE#;JBt&&%%J~y-GQ+qo-c}@4sbZUj!ryIeC>n<%t4C$NZu6;hr}cj0 zIdC}KC%dL;vM5>N#E#>o<8(lySTf1ak;38dI6Cn-siPArId%3f(pSsjQDxddz~OMg z%jjf@ll%R?-|xSSlac!hQ=eC&tz;~}UR(f&!%Li4h**?t9*>8|iG$1(TmGFjb7FE3 zE)J8M%Oi)w;T|UzB}<&dwG(H|tv4)Bt&qd5{^Q011oX_XcX!LWOIF9pp zHVvojxD3cw8?eqg z>-fH^s>x&$h9LkLQp&|*VOdt5=aFphIQ7j z*K3~VmSx3pETuHEEK8DPKA(@r&u0#qoF) zLIgpu+wIac{XR~llb})_*B463EX%Seisf?Yd0r3%tJMksvMe(W zhl7+70Jht06h*deo2KcyuJ8MwztC>_sKL0Q-Rjpg0Y331#)#r#pBfkA4rmV~gdn?g za9nz~6qmsN7E09kLjnuc?KH0W^KOaLnBWe7y+7R;)lC(1w63}v*R*@XSV7sz5wu*_ pHBHlToG6Mmn+*V@X}aIqemu-static from the **Docker for Mac VM**. Because of this, you can run an ARM container, like the `arm32v7` or `ppc64le` -variants of the busybox image: +variants of the busybox image. + +## Buildx (Experimental) + +Docker is now making it easier than ever to develop containers on, and for Arm servers and devices. Using the standard Docker tooling and processes, you can start to build, push, pull, and run images seamlessly on different compute architectures. Note that you don't have to make any changes to Dockerfiles or source code to start building for Arm. + +Docker introduces a new CLI command called `buildx`. You can use the `buildx` command on Docker Desktop for Mac and Windows to build multi-arch images, link them together with a manifest file, and push them all to a registry using a single command. With the included emulation, you can transparently build more than just native images. Buildx accomplishes this by adding new builder instances based on BuildKit, and leveraging Docker Desktop's technology stack to run non-native binaries. + +For more information about the Buildx CLI command, see [Buildx](/buildx/working-with-buildx/). + +### Install + +1. Download the latest version of [Docker Desktop](https://hub.docker.com/?overlay=onboarding). + +1. Follow the on-screen instructions to complete the installation process. After you have successfully installed Docker Desktop, you will see the Docker icon in your task tray. + +1. Click **About Docker Desktop** from the Docker menu and ensure you have installed Docker Desktop version 2.0.4.0 (33772) or higher. + +![about-docker-desktop-buildx](./images/desktop-buildx-version.png) + +### Build and run multi-architecture images + +Run the command `docker buildx ls` to list the existing builders. This displays the default builder, which is our old builder. -### arm32v7 variant ```bash -$ docker run arm32v7/busybox uname -a +$ docker buildx ls -Linux 9e3873123d09 4.9.125-linuxkit #1 SMP Fri Sep 7 08:20:28 UTC 2018 armv7l GNU/Linux +NAME/NODE DRIVER/ENDPOINT STATUS PLATFORMS +default * docker + default default running linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6 ``` -### ppc64le variant -```bash -$ docker run ppc64le/busybox uname -a +Create a new builder which gives access to the new multi-architecture features. -Linux 57a073cc4f10 4.9.125-linuxkit #1 SMP Fri Sep 7 08:20:28 UTC 2018 ppc64le GNU/Linux +```bash +$ docker buildx create --name mybuilder + +mybuilder ``` -Notice that this time, the `uname -a` output shows `armv7l` and -`ppc64le` respectively. +Alternatively, run `docker buildx create --name mybuilder --use` to create a new builder and switch to it using a single command. -Multi-architecture support makes it easy to build multi-architecture Docker images or experiment with ARM images and binaries from your Mac. +Switch to the new builder and inspect it. +```bash +$ docker buildx use mybuilder + +$ docker buildx inspect --bootstrap + +[+] Building 2.5s (1/1) FINISHED + => [internal] booting buildkit 2.5s + => => pulling image moby/buildkit:master 1.3s + => => creating container buildx_buildkit_mybuilder0 1.2s +Name: mybuilder +Driver: docker-container + +Nodes: +Name: mybuilder0 +Endpoint: unix:///var/run/docker.sock +Status: running + +Platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6 +``` + +Test the workflow to ensure you can build, push, and run multi-architecture images. Create a simple example Dockerfile, build a couple of image variants, and push them to Docker Hub. + +```bash +$ mkdir test && cd test && cat < Dockerfile + +FROM ubuntu +RUN apt-get update && apt-get install -y curl +WORKDIR /src +COPY . . +EOF +``` + +```bash +$ docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t username/demo:latest --push . + +[+] Building 6.9s (19/19) FINISHED +... + => => pushing layers 2.7s + => => pushing manifest for docker.io/username/demo:latest 2.2 + ``` + +Where, `username` is a valid Docker username. + +> **Notes:** +> +> - The `--platform` flag informs buildx to generate Linux images for AMD 64-bit, Arm 64-bit, and Armv7 architectures. +> - The `--push` flag generates a multi-arch manifest and pushes all the images to Docker Hub. + +Inspect the image using `imagetools`. + +```bash +$ docker buildx imagetools inspect username/demo:latest + +Name: docker.io/username/demo:latest +MediaType: application/vnd.docker.distribution.manifest.list.v2+json +Digest: sha256:2a2769e4a50db6ac4fa39cf7fb300fa26680aba6ae30f241bb3b6225858eab76 + +Manifests: + Name: docker.io/username/demo:latest@sha256:8f77afbf7c1268aab1ee7f6ce169bb0d96b86f585587d259583a10d5cd56edca + MediaType: application/vnd.docker.distribution.manifest.v2+json + Platform: linux/amd64 + + Name: docker.io/username/demo:latest@sha256:2b77acdfea5dc5baa489ffab2a0b4a387666d1d526490e31845eb64e3e73ed20 + MediaType: application/vnd.docker.distribution.manifest.v2+json + Platform: linux/arm64 + + Name: docker.io/username/demo:latest@sha256:723c22f366ae44e419d12706453a544ae92711ae52f510e226f6467d8228d191 + MediaType: application/vnd.docker.distribution.manifest.v2+json + Platform: linux/arm/v7 + ``` + + The image is now available on Docker Hub with the tag `username/demo:latest`. You can use this image to run a container on Intel laptops, Amazon EC2 A1 instances, Raspberry Pis, and on other architectures. Docker pulls the correct image for the current architecture, so Raspberry Pis run the 32-bit Arm version and EC2 A1 instances run 64-bit Arm. The SHA tags identify a fully qualified image variant. You can also run images targeted for a different architecture on Docker Desktop. + + You can run the images using the SHA tag, and verify the architecture. For example, when you run the following on a macOS: + + ```bash + $ docker run --rm docker.io/username/demo:latest@sha256:2b77acdfea5dc5baa489ffab2a0b4a387666d1d526490e31845eb64e3e73ed20 uname -m + aarch64 +``` + +```bash +$ docker run --rm docker.io/username/demo:latest@sha256:723c22f366ae44e419d12706453a544ae92711ae52f510e226f6467d8228d191 uname -m +armv7l +``` + +In the above example, `uname -m` returns `aarch64` and `armv7l` as expected, even when running the commands on a native macOS developer machine. From 5ea036786311369a48b972afb052dd593e6b990c Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Wed, 14 Aug 2019 13:58:18 -0400 Subject: [PATCH 024/160] Add install Helm on Docker EE section Signed-off-by: Traci Morrison --- ee/ucp/user-access/kubectl.md | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/ee/ucp/user-access/kubectl.md b/ee/ucp/user-access/kubectl.md index a94173b91d..16f97b708b 100644 --- a/ee/ucp/user-access/kubectl.md +++ b/ee/ucp/user-access/kubectl.md @@ -4,9 +4,9 @@ description: Learn how to install kubectl, the Kubernetes command-line tool, on keywords: ucp, cli, administration, kubectl, Kubernetes --- -Docker EE 2.0 and higher deploys Kubernetes as part of a UCP installation. +Docker Enterprise 2.0 and higher deploys Kubernetes as part of a UCP installation. Deploy, manage, and monitor Kubernetes workloads from the UCP dashboard. Users can -also interact with the Kubernetes deployment through the Kubernetes +also interact with the Kubernetes deployment through the Kubernetes command-line tool named kubectl. To access the UCP cluster with kubectl, install the [UCP client bundle](cli.md). @@ -28,10 +28,10 @@ To use kubectl, install the binary on a workstation which has access to your UCP > Kubernetes only guarantees compatibility with kubectl versions that are +/-1 minor versions away from the Kubernetes version. {: .important} -First, find which version of Kubernetes is running in your cluster. This can be found -within the Universal Control Plane dashboard or at the UCP API endpoint [version](/reference/ucp/3.2/api/). +First, find which version of Kubernetes is running in your cluster. This can be found +within the Universal Control Plane dashboard or at the UCP API endpoint [version](/reference/ucp/3.2/api/). You can also find the Kubernetes version using the Docker CLI. You need to source a client bundle and type the `docker version` command. -From the UCP dashboard, click on **About Docker EE** within the **Admin** menu in the top left corner +From the UCP dashboard, click **About** within the **Admin** menu in the top left corner of the dashboard. Then navigate to **Kubernetes**. ![Find Kubernetes version](../images/kubernetes-version.png){: .with-border} @@ -91,14 +91,31 @@ curl https://storage.googleapis.com/kubernetes-release/release/$env:k8sversion/b -## Using kubectl with a Docker EE cluster +## Using kubectl with a Docker Enterprise cluster -Docker Enterprise Edition provides users unique certificates and keys to authenticate against - the Docker and Kubernetes APIs. Instructions on how to download these certificates and how to +Docker Enterprise provides users unique certificates and keys to authenticate against + the Docker and Kubernetes APIs. Instructions on how to download these certificates and how to configure kubectl to use them can be found in [CLI-based access.](cli.md#download-client-certificates) +## Install Helm on Docker Enterprise + +Helm is the package manager for Kubernetes. Tiller is the Helm server. Before installing Helm on Docker Enterprise, you must meet the following requirements: + +* You must be running a Docker Enterprise 2.1 or higher cluster. +* You must have kubectl configured to communicate with the cluster (usually this is done via a client bundle). + +To use Helm and Tiller with UCP, you must grant the default service account within the kube-system namespace the necessary roles. Enter the following kubectl commands in this order: + +```bash +kubectl create rolebinding default-view --clusterrole=view --serviceaccount=kube-system:default --namespace=kube-system + +kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default +``` +It is recommended that you specify a Role and RoleBinding to limit Tiller’s scope to a particular namespace, as described in [Helm’s documentation](https://helm.sh/docs/using_helm/#example-deploy-tiller-in-a-namespace-restricted-to-deploying-resources-only-in-that-namespace). + +See [initialize Helm and install Tiller](https://helm.sh/docs/using_helm/#initialize-helm-and-install-tiller) for more information. + ## Where to go next - [Deploy a workload to a Kubernetes cluster](../kubernetes.md) - [Deploy to Kubernetes on Docker Desktop for Mac](/docker-for-mac/kubernetes.md) - From a765e84efccb4ff028e8a6b79a02bff53f1dd949 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Tue, 27 Aug 2019 14:54:22 -0700 Subject: [PATCH 025/160] removing section for Chinese mirror --- registry/recipes/mirror.md | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/registry/recipes/mirror.md b/registry/recipes/mirror.md index cdaeff225e..a06b59290d 100644 --- a/registry/recipes/mirror.md +++ b/registry/recipes/mirror.md @@ -115,36 +115,4 @@ Save the file and reload Docker for the change to take effect. > ``` > > It's telling you that the file doesn't exist yet in the local cache and is -> being pulled from upstream. - - -## Use case: the China registry mirror - -The URL of the registry mirror for China is `registry.docker-cn.com`. You can -pull images from this mirror just like you do for other registries by -specifying the full path, including the registry, in your `docker pull` -command, for example: - -```bash -$ docker pull registry.docker-cn.com/library/ubuntu -``` - -You can add `"https://registry.docker-cn.com"` to the `registry-mirrors` array -in [`/etc/docker/daemon.json`](/engine/reference/commandline/dockerd.md#daemon-configuration-file) -to pull from the China registry mirror by default. - -```json -{ - "registry-mirrors": ["https://registry.docker-cn.com"] -} -``` - -Save the file and reload Docker for the change to take effect. - -Or, you can configure the Docker daemon with the `--registry-mirror` startup -parameter: - -```bash -$ dockerd --registry-mirror=https://registry.docker-cn.com -``` - +> being pulled from upstream. \ No newline at end of file From 28b8a15b828558a9b9f1a66e25c8ba9f9983fe2c Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Wed, 28 Aug 2019 10:49:23 -0400 Subject: [PATCH 026/160] Update links to the DTR 2.6 CLI page --- .../configure/external-storage/storage-backend-migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md index 85606fd03f..1aa05db279 100644 --- a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md +++ b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md @@ -51,7 +51,7 @@ If you have a long maintenance window, you can skip some steps from above and do ## DTR 2.6.0-2.6.4 and DTR 2.5 (with experimental garbage collection) Make sure to [perform a backup](/ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-data) before you change your storage backend when running DTR 2.5 (with online garbage collection) and 2.6.0-2.6.3. If you encounter an issue with lost tags, refer to the following resources: - * For changes to reconfigure and restore options in DTR 2.6, see [docker/dtr reconfigure](/reference/dtr/2.6/cli/reconfigure/) and [docker/dtr restore](/reference/dtr/2.6/cli/restore). + * For changes to reconfigure and restore options in DTR 2.6, see [docker/dtr reconfigure](/datacenter/dtr/2.6/reference/cli/reconfigure/) and [docker/dtr restore](/datacenter/dtr/2.6/reference/cli/restore/). * For Docker's recommended recovery strategies, see [DTR 2.6 lost tags after reconfiguring storage](https://success.docker.com/article/dtr-26-lost-tags-after-reconfiguring-storage). * For NFS-specific changes, see [Use NFS](nfs.md). * For S3-specific changes, see [Learn how to configure DTR with Amazon S3](s3.md). From b4306976adc39b5443ca0a33459d174a4d4750d3 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Tue, 27 Aug 2019 16:58:57 -0400 Subject: [PATCH 027/160] Update for August patch release for UCP --- ee/ucp/release-notes.md | 78 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index 69d539b602..1727d682e0 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -23,7 +23,36 @@ upgrade your installation to the latest release. **Note**: For archived versions of UCP documentation, refer to [View the docs archives](https://docs.docker.com/docsarchive/). # Version 3.2 -(2019-7-22) + +## 3.2.1 +2019-08 + +### Kubernetes +* Kubernetes has been upgraded to version 1.14.6. +* Kubernetes DNS has been upgraded to 1.14.13 and is now replicated for HA. + +### Networking +* Calico has been upgraded to version 3.8.2. +* Interlock has been upgraded to version 2.6.1. +* Added `azure-ip-count` at installation. + +### Security +* Upgraded Golang to 1.12.9. +* Added CSP header to prevent cross-site scripting attacks (XSS) + +### Bootstrap +* Fixed various issues in install, uninstall, backup and restore. + +| Component | Version | +| ----------- | ----------- | +| UCP | 3.2.0 | +| Kubernetes | 1.14.6 | +| Calico | 3.8.2 | +| Interlock | 2.6.1 | +| Interlock NGINX proxy | 1.14.2 | + +## 3.2.0 +2019-7-22 ### Security Refer to [UCP image vulnerabilities](https://success.docker.com/article/ucp-image-vulnerabilities) for details regarding actions to be taken, timeline, and any status updates, issues, and recommendations. @@ -337,8 +366,25 @@ In order to optimize user experience and security, support for Internet Explorer # Version 3.1 -## 3.1.9 -(2019-07-17) +## 3.1.10 +2019-08 + +### Kubernetes +* Kubernetes has been upgraded to version 1.11.0-docker-2 that is built on Golang 1.12.9. +* Kubernetes DNS has been upgraded to 1.14.13 and is now replicated for HA. + +### Networking +* Calico has been upgraded to version 3.8.2. +* Interlock has been upgraded to version 2.6.1. + +### Security +* Upgraded Golang to 1.12.9. + +### UI +* A warning message will be shown when one attempts to upgrade 3.1 to 3.2 via GUI. + +## 3.1.9 +2019-07-17 ### Bug fixes @@ -778,6 +824,20 @@ The following features are deprecated in UCP 3.1. # Version 3.0 +## 3.0.14 +2019-08 + +### Kubernetes +* Kubernetes has been upgraded to version 1.8.15-docker-7 that is built on Golang 1.12.9. +* Kubernetes DNS has been upgraded to 1.14.13. + +### Networking +* Calico has been upgraded to version 3.0.12. +* Interlock has been upgraded to version 2.6.1. + +### Security +* Upgraded Golang to 1.12.9. +* ## 3.0.13 2019-07-17 @@ -1133,8 +1193,7 @@ Azure Disk when installing UCP with the `--cloud-provider` option. | Calico | 3.0.1 | | Interlock (nginx) | 1.13.8 | -## Version 3.0.0 - +## 3.0.0 2018-04-17 The UCP system requirements were updated with 3.0.0. Make sure to @@ -1293,7 +1352,14 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads. # Version 2.2 -## Version 2.2.20 +## Version 2.2.21 +2019-08 + +### Security + +* Upgraded Golang to 1.12.9. + +## Version 2.2.20 2019-07-17 ### Bug fixes From c84dc26f99d8d223b3dc6daefad91594fd7d205f Mon Sep 17 00:00:00 2001 From: Dawn W <51414965+DawnWood-Docker@users.noreply.github.com> Date: Wed, 28 Aug 2019 13:38:25 -0700 Subject: [PATCH 028/160] Add files via upload --- cluster/release-notes.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 cluster/release-notes.md diff --git a/cluster/release-notes.md b/cluster/release-notes.md new file mode 100644 index 0000000000..dad646ba10 --- /dev/null +++ b/cluster/release-notes.md @@ -0,0 +1,35 @@ +--- +title: Docker Cluster release notes +description: Learn about the new features, bug fixes, and breaking changes for Docker Cluster. +keywords: cluster, whats new, release notes +--- + +This page provides information about Docker Cluster versions. + +# Version 1 + +## Version 1.1.0 +(2019-08-29) + +### What's new + +* Support for Azure cloud provider +* Support for RHEL 8 operating system + +### Bug Fixes + +* Container file permissions on linux (DCIS-346) +* License check failure with non-Docker subscriptions (DCIS-465) + +## Version 1.0.1 +(2019-07-19) + +### What's new + +* Support for SLES 12.4 +* Support for Windows Server 2016 + +## Version 1.0 +(2019-06-25) + +First major release. \ No newline at end of file From 324687b029d040210a39f48f89e04676ff319c53 Mon Sep 17 00:00:00 2001 From: Dawn W <51414965+DawnWood-Docker@users.noreply.github.com> Date: Wed, 28 Aug 2019 13:41:21 -0700 Subject: [PATCH 029/160] Update toc.yaml --- _data/toc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/toc.yaml b/_data/toc.yaml index ac5387e71d..d2c7a5c759 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1296,6 +1296,8 @@ manuals: section: - path: /cluster/ title: Overview + - path: /cluster/release-notes/ + title: Release notes - path: /cluster/aws/ title: Docker Cluster on AWS - path: /cluster/cluster-file/ From fbe93c9da66d01b7691253018cacc3b6a97b8f70 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Thu, 29 Aug 2019 11:11:45 +0200 Subject: [PATCH 030/160] Fix invocation of `dockerdesktop-admin` --- ee/desktop/admin/install/mac.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/desktop/admin/install/mac.md b/ee/desktop/admin/install/mac.md index ea1d5dbc4f..adaa62e7e7 100644 --- a/ee/desktop/admin/install/mac.md +++ b/ee/desktop/admin/install/mac.md @@ -84,7 +84,7 @@ When you install Docker Desktop Enterprise, the command line tool is installed a Run the following command to install or upgrade a version pack to the version contained in the specified `.ddvp` archive: - dockerdesktop-admin version-pack install [path-to-archive] + sudo /Applications/Docker.app/Contents/Resources/bin/dockerdesktop-admin version-pack install [path-to-archive] >**Note:** You must stop Docker Desktop before installing a version pack. @@ -92,7 +92,7 @@ Run the following command to install or upgrade a version pack to the version co Run the following command to uninstall the specified version pack: - dockerdesktop-admin version-pack uninstall [version-pack-name] + sudo /Applications/Docker.app/Contents/Resources/bin/dockerdesktop-admin version-pack uninstall [version-pack-name] >**Note:** You must stop Docker Desktop before uninstalling a version pack. From 03d813536906a17b8b38f8b9ba0e259752d40da9 Mon Sep 17 00:00:00 2001 From: Olly P Date: Thu, 29 Aug 2019 12:51:24 +0100 Subject: [PATCH 031/160] Added the new Azure IP Count install variable (#1296) --- .../cloudproviders/install-on-azure.md | 109 ++++++------------ reference/ucp/3.2/cli/install.md | 1 + 2 files changed, 34 insertions(+), 76 deletions(-) diff --git a/ee/ucp/admin/install/cloudproviders/install-on-azure.md b/ee/ucp/admin/install/cloudproviders/install-on-azure.md index 8d6ca5de10..76781a269c 100644 --- a/ee/ucp/admin/install/cloudproviders/install-on-azure.md +++ b/ee/ucp/admin/install/cloudproviders/install-on-azure.md @@ -205,98 +205,55 @@ for each virtual machine in the virtual machine scale set. ### Adjust the IP Count Value -If you have manually attached additional IP addresses to the Virtual Machines -(via an ARM Template, Azure CLI or Azure Portal) or you want to reduce the -number of IP Addresses automatically provisioned by UCP from the default of 128 -addresses, you can alter the `azure_ip_count` variable in the UCP -Configuration file before installation. If you are happy with 128 addresses per -Virtual Machine, proceed to [installing UCP](#install-ucp). +During a UCP installation, a user can alter the number of Azure IP addresses +UCP will automatically provision for pods. By default UCP will provision 128 +addresses, from the same Azure Subnet as the hosts, for each Virtual Machine in +the cluster. However if you have manually attached additional IP addresses +to the Virtual Machines (via an ARM Template, Azure CLI or Azure Portal) or you +are deploying in to small Azure subnet (less than /16), an `--azure-ip-count` +flag can be used at install time. -Once UCP has been installed, the UCP [configuration -file](../configure/ucp-configuration-file/) is managed by UCP and populated with -all of the cluster configuration data, such as AD/LDAP information or networking -configuration. As there is no Universal Control Plane deployed yet, we are able -to stage a [configuration file](../configure/ucp-configuration-file/) just -containing the Azure IP Count value. UCP will populate the rest of the cluster -variables during and after the installation. +> Note: Do not set the `--azure-ip-count` variable to a value of less than 6 if +> you have not manually provisioned additional IP addresses for each Virtual +> Machine. The UCP installation will need at least 6 IP addresses to allocate +> to the core UCP components that run as Kubernetes pods. That is in addition +> to the Virtual Machine's private IP address. -Below are some example configuration files with just the `azure_ip_count` -variable defined. These 3-line files can be preloaded into a Docker Swarm prior -to installing UCP in order to override the default `azure_ip_count` value of 128 IP -addresses per node. See [UCP configuration file](../configure/ucp-configuration-file/) -to learn more about the configuration file, and other variables that can be staged pre-install. +Below are some example scenarios which require the `--azure-ip-count` variable +to be defined. -> Note: Do not set the `azure_ip_count` to a value of less than 6 if you have not -> manually provisioned additional IP addresses for each Virtual Machine. The UCP -> installation will need at least 6 IP addresses to allocate to the core UCP components -> that run as Kubernetes pods. That is in addition to the Virtual -> Machine's private IP address. +**Scenario 1 - Manually Provisioned Addresses** If you have manually provisioned additional IP addresses for each Virtual -Machine, and want to disallow UCP from dynamically provisioning IP -addresses for you, then your UCP configuration file would be: +Machine, and want to disable UCP from dynamically provisioning more IP +addresses for you, then you would pass `--azure-ip-count 0` into the UCP +installation command. -```bash -$ vi example-config-1 -[cluster_config] - azure_ip_count = "0" -``` +**Scenario 2 - Reducing the number of Provisioned Addresses** -If you want to reduce the IP addresses dynamically allocated from 128 to a -custom value, then your UCP configuration file would be: +If you want to reduce the number of IP addresses dynamically allocated from 128 +addresses to a custom value due to: -```bash -$ vi example-config-2 -[cluster_config] - azure_ip_count = "20" # This value may be different for your environment -``` +- Primarily using the Swarm Orchestrator +- Deploying UCP on a small Azure subnet (for example /24) +- Plan to run a small number of Kubernetes pods on each node. -See [Considerations for IPAM -Configuration](#considerations-for-ipam-configuration) to calculate an -appropriate value. +For example if you wanted to provision 16 addresses per virtual machine, then +you would pass `--azure-ip-count 16` into the UCP installation command. -To preload this configuration file prior to installing UCP: - -1. Copy the configuration file to a Virtual Machine that you wish to become a UCP Manager Node. - -2. Initiate a Swarm on that Virtual Machine. - - ```bash - $ docker swarm init - ``` - -3. Upload the configuration file to the Swarm, by using a [Docker Swarm Config](/engine/swarm/configs/). -This Swarm Config will need to be named `com.docker.ucp.config`. - - ```bash - $ docker config create com.docker.ucp.config - ``` - -4. Check that the configuration has been loaded succesfully. - - ```bash - $ docker config list - ID NAME CREATED UPDATED - igca3q30jz9u3e6ecq1ckyofz com.docker.ucp.config 1 days ago 1 days ago - ``` - -5. You are now ready to [install UCP](#install-ucp). As you have already staged - a UCP configuration file, you will need to add `--existing-config` to the - install command below. - -If you need to adjust this value post-installation, see [instructions](../configure/ucp-configuration-file/) -on how to download the UCP configuration file, change the value, and update the configuration via the API. -If you reduce the value post-installation, existing virtual machines will not be -reconciled, and you will have to manually edit the IP count in Azure. +If you need to adjust this value post-installation, see +[instructions](../configure/ucp-configuration-file/) on how to download the UCP +configuration file, change the value, and update the configuration via the API. +If you reduce the value post-installation, existing virtual machines will not +be reconciled, and you will have to manually edit the IP count in Azure. ### Install UCP Run the following command to install UCP on a manager node. The `--pod-cidr` option maps to the IP address range that you have configured for the Azure subnet, and the `--host-address` maps to the private IP address of the master -node. Finally if you have set the [Ip Count -Value](#adjusting-the-ip-count-value) you will need to add `--existing-config` -to the install command below. +node. Finally if you want to adjust the amount of IP addresses provisioned to +each virtual machine pass `--azure-ip-count`. > Note: The `pod-cidr` range must match the Azure Virtual Network's Subnet > attached the hosts. For example, if the Azure Virtual Network had the range diff --git a/reference/ucp/3.2/cli/install.md b/reference/ucp/3.2/cli/install.md index a5022020b1..e9b826c1f3 100644 --- a/reference/ucp/3.2/cli/install.md +++ b/reference/ucp/3.2/cli/install.md @@ -49,6 +49,7 @@ If you are installing on Azure, see [Install UCP on Azure](/ee/ucp/admin/install | `--interactive, -i` | Run in interactive mode and prompt for configuration values | | `--admin-password` *value* | The UCP administrator password [$UCP_ADMIN_PASSWORD] | | `--admin-username` *value* | The UCP administrator username [$UCP_ADMIN_USER] | +| `--azure-ip-count` *value* | Configure the Number of IP Address to be provisioned for each Azure Virtual Machine (default: "128") | | `--binpack` | Set the Docker Swarm scheduler to binpack mode. Used for backwards compatibility | | `--cloud-provider` *value* | The cloud provider for the cluster | | `--cni-installer-url` *value* | A URL pointing to a kubernetes YAML file to be used as an installer for the CNI plugin of the cluster. If specified, the default CNI plugin will not be installed. If the URL is using the HTTPS scheme, no certificate verification will be performed | From c3780fa88610a548e2b3aa1873d0fbcd0a67537b Mon Sep 17 00:00:00 2001 From: Olly P Date: Thu, 29 Aug 2019 12:51:47 +0100 Subject: [PATCH 032/160] August Patch Offline Bundles (#1304) * Simplified EE variables in _config (#9260) Before we had 2 UCP configuration variables. 1 for pages under "ee" and 1 for pages under "ee/ucp". We had the same pattern for DTR. THis commit removes the variable at the ee/ucp level, in the hope that all files will take it from the /ee variable. * Added Offline Bundles and Bumped Config --- _config.yml | 39 +++++++++++++--------------------- _data/ddc_offline_files_2.yaml | 36 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/_config.yml b/_config.yml index f5e07694ed..77b4854621 100644 --- a/_config.yml +++ b/_config.yml @@ -111,38 +111,43 @@ defaults: - scope: path: "install" values: - win_latest_build: "docker-19.03.1" + win_latest_build: "docker-19.03.2" - scope: path: "datacenter" values: enterprise: true + # Latest Enterprise Platform Release - scope: - path: "ee/dtr" + path: "ee" values: + ucp_org: "docker" + ucp_repo: "ucp" dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.7.1" + ucp_version: "3.2.1" + dtr_version: "2.7.2" + # Previous DTR Releases - scope: path: "datacenter/dtr/2.6" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.6.8" + dtr_version: "2.6.9" - scope: path: "datacenter/dtr/2.5" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.5.13" + dtr_version: "2.5.14" - scope: path: "datacenter/dtr/2.4" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.4.13" + dtr_version: "2.4.14" - scope: path: "datacenter/dtr/2.3" values: @@ -166,42 +171,28 @@ defaults: values: ucp_version: "1.1" dtr_version: "2.0" - - scope: - path: "ee/ucp" - values: - ucp_org: "docker" - ucp_repo: "ucp" - ucp_version: "3.2.0" - - scope: # This is a bit of a hack for the get-support.md and /ee/admin/ - path: "ee" - values: - ucp_org: "docker" - ucp_repo: "ucp" - dtr_org: "docker" - dtr_repo: "dtr" - ucp_version: "3.2.0" - dtr_version: "2.7.1" + # Previous UCP Releases - scope: path: "datacenter/ucp/3.1" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.1.9" + ucp_version: "3.1.10" - scope: path: "datacenter/ucp/3.0" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.0.13" + ucp_version: "3.0.14" - scope: path: "datacenter/ucp/2.2" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "2.2.20" + ucp_version: "2.2.21" - scope: path: "datacenter/ucp/2.1" values: diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index 529ca2fefe..a025a83786 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -6,6 +6,12 @@ - product: "ucp" version: "3.2" tar-files: + - description: "3.2.1 Linux" + url: https://packages.docker.com/caas/ucp_images_3.2.1.tar.gz + - description: "3.2.1 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.2.1.tar.gz + - description: "3.2.1 Windows Server 2019 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2019_3.2.1.tar.gz - description: "3.2.0 Linux" url: https://packages.docker.com/caas/ucp_images_3.2.0.tar.gz - description: "3.2.0 Windows Server 2016 LTSC" @@ -15,6 +21,14 @@ - product: "ucp" version: "3.1" tar-files: + - description: "3.1.10 Linux" + url: https://packages.docker.com/caas/ucp_images_3.1.10.tar.gz + - description: "3.1.10 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.1.10.tar.gz + - description: "3.1.10 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.1.10.tar.gz + - description: "3.1.10 Windows Server 2019 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2019_3.1.10.tar.gz - description: "3.1.9 Linux" url: https://packages.docker.com/caas/ucp_images_3.1.9.tar.gz - description: "3.1.9 Windows Server 2016 LTSC" @@ -108,6 +122,14 @@ - product: "ucp" version: "3.0" tar-files: + - description: "3.0.14 Linux" + url: https://packages.docker.com/caas/ucp_images_3.0.14.tar.gz + - description: "3.0.14 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_3.0.14.tar.gz + - description: "3.0.14 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.14.tar.gz + - description: "3.0.14 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.14.tar.gz - description: "3.0.13 Linux" url: https://packages.docker.com/caas/ucp_images_3.0.13.tar.gz - description: "3.0.13 IBM Z" @@ -227,6 +249,12 @@ - product: "ucp" version: "2.2" tar-files: + - description: "2.2.21 Linux" + url: https://packages.docker.com/caas/ucp_images_2.2.21.tar.gz + - description: "2.2.21 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_2.2.21.tar.gz + - description: "2.2.21 Windows" + url: https://packages.docker.com/caas/ucp_images_win_2.2.21.tar.gz - description: "2.2.20 Linux" url: https://packages.docker.com/caas/ucp_images_2.2.20.tar.gz - description: "2.2.20 IBM Z" @@ -344,6 +372,8 @@ - product: "dtr" version: "2.7" tar-files: + - description: "DTR 2.7.2 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.7.2.tar.gz - description: "DTR 2.7.1 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.7.1.tar.gz - description: "DTR 2.7.0 Linux x86" @@ -351,6 +381,8 @@ - product: "dtr" version: "2.6" tar-files: + - description: "DTR 2.6.9 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.6.9.tar.gz - description: "DTR 2.6.8 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.6.8.tar.gz - description: "DTR 2.6.7 Linux x86" @@ -372,6 +404,8 @@ - product: "dtr" version: "2.5" tar-files: + - description: "DTR 2.5.14 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.5.14.tar.gz - description: "DTR 2.5.13 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.13.tar.gz - description: "DTR 2.5.12 Linux x86" @@ -401,6 +435,8 @@ - product: "dtr" version: "2.4" tar-files: + - description: "DTR 2.4.14 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.4.14.tar.gz - description: "DTR 2.4.13 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.13.tar.gz - description: "DTR 2.4.12 Linux x86" From 075458e9ba4285e7b2e9b1b7bb5ae346de4fbc9c Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:55:00 +0100 Subject: [PATCH 033/160] DTR and Desktop relnotes for August patch (#1299) DDE and DTR changes for August patch --- ee/desktop/release-notes.md | 20 ++++++++++ ee/dtr/release-notes.md | 40 +++++++++++++++++-- .../admin/configure/ucp-configuration-file.md | 7 ++++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/ee/desktop/release-notes.md b/ee/desktop/release-notes.md index 98df3e02ea..ffda2e0f4f 100644 --- a/ee/desktop/release-notes.md +++ b/ee/desktop/release-notes.md @@ -15,6 +15,26 @@ For information on system requirements, installation, and download, see: For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes). +## Version 2.1.0.3 +2019-08-29 + +Docker Desktop Enterprise 2.1.0.3 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. + +### Upgrades + +- [Docker 19.03.2](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0 +- [Kubernetes 1.14.6](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.6) in Version Pack Enterprise 3.0 +- [Go 1.12.9](https://github.com/golang/go/issues?q=milestone%3AGo1.12.9+label%3ACherryPickApproved) in Version Pack Enterprise 3.0 +- [Qemu 4.1.0](https://github.com/docker/binfmt) to cross-compile ARM devices +- Application Designer 0.1.6 +- Mac: [Hyperkit 0.20190802](https://github.com/moby/hyperkit/releases/tag/v0.20190802) + +### Bug fixes and minor changes + +- Restricted the `cluster-admin` role on local Kubernetes cluster to `kube-system` namespace. +- Mac: Docker Desktop checks the `admin-settings.json` file and enforces the CLI config whenever Docker Engine is restarted. +- Windows: Updated the Access Control List (ACL) on `cli-plugins` and `version-bin` folders to ensure only administrators have read/write access to these folders. + ## Version 2.1.0.2 2019-07-26 diff --git a/ee/dtr/release-notes.md b/ee/dtr/release-notes.md index 2ae77064e9..9bf9b9189a 100644 --- a/ee/dtr/release-notes.md +++ b/ee/dtr/release-notes.md @@ -22,10 +22,24 @@ to upgrade your installation to the latest release. # Version 2.7 +## 2.7.2 +(2019-8-29) + +### Bug fixes + +* Fixed a bug which prevented non-admin users from creating or editing promotion policies. (docker/dhe-deploy #10551) +* Fixed an issue where promotion policy details could not be displayed. (docker/dhe-deploy #10510) + +### Security + +* Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10570) + ## 2.7.1 (2019-7-22) -### Bug Fixes -* In 2.7.0 users may see ```vuln_db_update``` jobs fail with the message ```Unable to get update url: Could not get signed urls with errors``` -- 2.7.1 addresses this issue. With it your vulnerability database update jobs should succeed. + +### Bug fixes + +* In 2.7.0, users may see ```vuln_db_update``` jobs fail with the message ```Unable to get update url: Could not get signed urls with errors``` -- 2.7.1 addresses this issue. With it your vulnerability database update jobs should succeed. ## 2.7.0 (2019-7-22) @@ -90,6 +104,13 @@ Refer to [DTR image vulnerabilities](https://success.docker.com/article/dtr-imag # Version 2.6 +## 2.6.9 +(2019-8-28) + +### Security + +* Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10557) + ## 2.6.8 (2019-7-17) @@ -395,12 +416,18 @@ Refer to [DTR image vulnerabilities](https://success.docker.com/article/dtr-imag # Version 2.5 - > **Important DTR Upgrade Information** > If you have manifest lists enabled on any of your repositories: > > Upgrade path from 2.5.x to 2.6: Upgrade directly to 2.6.4. +## 2.5.14 +(2019-8-28) + +### Security + +* Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10558) + ## 2.5.13 (2019-07-17) @@ -987,6 +1014,13 @@ specify `--log-protocol`. > Upgrade path from 2.4.x to 2.5: Do not opt into garbage collection, or directly upgrade to 2.5.10 if you need to opt into garbage collection. > Upgrade path from 2.5.x to 2.6: Upgrade directly to 2.6.4. +## 2.4.14 +(2019-8-28) + +### Security + +* Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10554) + ## 2.4.13 (2019-07-17) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index 3601a45fa5..5347c56a99 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -234,3 +234,10 @@ Configures iSCSI options for UCP. | `--storage-iscsi=true` | no | Enables iSCSI based Persistent Volumes in Kubernetes. Default value is `false`. | | `--iscsiadm-path=` | no | Specifies the path of the iscsiadm binary on the host. Default value is `/usr/sbin/iscsiadm`. | | `--iscsidb-path=` | no | specifies the path of the iscsi database on the host. Default value is `/etc/iscsi`. | + +### pre_logon_message +Configures a pre-logon message. + +| Parameter | Required | Description | +|:------------------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `pre_logon_message` | no | Sets pre-logon message to alert users before they proceed with login. | From 160f06d085bcd28b139aaea76e48a925041092f0 Mon Sep 17 00:00:00 2001 From: Adrian Plata Date: Wed, 28 Aug 2019 07:54:41 -0700 Subject: [PATCH 034/160] Engine August patch release notes Signed-off-by: Adrian Plata --- _data/toc.yaml | 38 +++++----- engine/release-notes.md | 150 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 19 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 2ee37e8adb..87abea92c3 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1481,7 +1481,7 @@ manuals: - title: Offline installation path: /ee/ucp/interlock/deploy/offline-install/ - title: Layer 7 routing upgrade - path: /ee/ucp/interlock/deploy/upgrade/ + path: /ee/ucp/interlock/deploy/upgrade/ - sectiontitle: Configuration section: - title: Configure your deployment @@ -1503,15 +1503,15 @@ manuals: - title: Using context or path-based routing path: /ee/ucp/interlock/usage/context/ - title: Specifying a routing mode - path: /ee/ucp/interlock/usage/interlock-vip-mode/ + path: /ee/ucp/interlock/usage/interlock-vip-mode/ - title: Using routing labels - path: /ee/ucp/interlock/usage/labels-reference/ + path: /ee/ucp/interlock/usage/labels-reference/ - title: Publishing a default host service path: /ee/ucp/interlock/usage/default-backend/ - title: Specifying a routing mode - path: /ee/ucp/interlock/usage/interlock-vip-mode/ + path: /ee/ucp/interlock/usage/interlock-vip-mode/ - title: Using routing labels - path: /ee/ucp/interlock/usage/labels-reference.md/ + path: /ee/ucp/interlock/usage/labels-reference.md/ - title: Implementing redirects path: /ee/ucp/interlock/usage/redirects/ - title: Implementing a service cluster @@ -1531,7 +1531,7 @@ manuals: - title: Deploy a Compose-based app path: /ee/ucp/kubernetes/deploy-with-compose/ - title: Using Pod Security Policies - path: /ee/ucp/kubernetes/pod-security-policies/ + path: /ee/ucp/kubernetes/pod-security-policies/ - title: Create a service account for a Kubernetes app path: /ee/ucp/kubernetes/create-service-account/ - title: Install an unmanaged CNI plugin @@ -1547,7 +1547,7 @@ manuals: - title: Use Azure Files Storage path: /ee/ucp/kubernetes/storage/use-azure-files/ - title: Use AWS EBS Storage - path: /ee/ucp/kubernetes/storage/configure-aws-storage/ + path: /ee/ucp/kubernetes/storage/configure-aws-storage/ - title: Configure iSCSI path: /ee/ucp/kubernetes/storage/use-iscsi/ - title: Deploy a CSI plugin @@ -1555,13 +1555,13 @@ manuals: - sectiontitle: Cluster Ingress section: - title: Overview - path: /ee/ucp/kubernetes/cluster-ingress/ + path: /ee/ucp/kubernetes/cluster-ingress/ - title: Install Ingress path: /ee/ucp/kubernetes/cluster-ingress/install/ - title: Deploy Simple Application path: /ee/ucp/kubernetes/cluster-ingress/ingress/ - title: Deploy a Canary Deployment - path: /ee/ucp/kubernetes/cluster-ingress/canary/ + path: /ee/ucp/kubernetes/cluster-ingress/canary/ - title: Implementing Persistent (sticky) Sessions path: /ee/ucp/kubernetes/cluster-ingress/sticky/ - title: API reference @@ -1758,7 +1758,7 @@ manuals: - title: Offline installation path: /datacenter/ucp/3.1/guides/interlock/deploy/offline-install/ - title: Layer 7 routing upgrade - path: /datacenter/ucp/3.1/guides/interlock/deploy/upgrade/ + path: /datacenter/ucp/3.1/guides/interlock/deploy/upgrade/ - sectiontitle: Configuration section: - title: Configure your deployment @@ -1780,9 +1780,9 @@ manuals: - title: Using context or path-based routing path: /datacenter/ucp/3.1/guides/interlock/usage/context/ - title: Specifying a routing mode - path: /datacenter/ucp/3.1/guides/interlock/usage/interlock-vip-mode/ + path: /datacenter/ucp/3.1/guides/interlock/usage/interlock-vip-mode/ - title: Using routing labels - path: /datacenter/ucp/3.1/guides/interlock/usage/labels-reference/ + path: /datacenter/ucp/3.1/guides/interlock/usage/labels-reference/ - title: Implementing redirects path: /datacenter/ucp/3.1/guides/interlock/usage/redirects/ - title: Implementing a service cluster @@ -1818,7 +1818,7 @@ manuals: - title: Use Azure Files Storage path: /datacenter/ucp/3.1/guides/kubernetes/storage/use-azure-files/ - title: Use AWS EBS Storage - path: /datacenter/ucp/3.1/guides/kubernetes/storage/configure-aws-storage/ + path: /datacenter/ucp/3.1/guides/kubernetes/storage/configure-aws-storage/ - title: API reference path: /datacenter/ucp/3.1/reference/api/ nosync: true @@ -2086,7 +2086,7 @@ manuals: - path: /datacenter/ucp/2.2/guides/admin/configure/run-only-the-images-you-trust/ title: Run only the images you trust - path: /datacenter/ucp/2.2/guides/admin/configure/use-trusted-images-for-ci/ - title: Use trusted images for continuous integration + title: Use trusted images for continuous integration - path: /datacenter/ucp/2.2/guides/admin/configure/scale-your-cluster/ title: Scale your cluster - path: /datacenter/ucp/2.2/guides/admin/configure/set-session-timeout/ @@ -3753,7 +3753,7 @@ manuals: title: Docker Enterprise Architecture - path: /ee/supported-platforms/ title: Supported platforms - nosync: true + nosync: true - path: /ee/end-to-end-install/ title: Deploy Docker Enterprise - path: /ee/upgrade/ @@ -3779,7 +3779,7 @@ manuals: - path: /ee/admin/restore/restore-ucp/ title: Restore UCP - path: /ee/admin/restore/restore-dtr/ - title: Restore DTR + title: Restore DTR - path: /cluster/reference/restore/ title: Restore clusters with Docker Cluster - sectiontitle: Disaster Recovery @@ -4102,6 +4102,8 @@ manuals: title: Image manifest v 2, schema 1 - path: /registry/spec/manifest-v2-2/ title: Image manifest v 2, schema 2 + - path: /registry/spec/deprecated-schema-v1/ + title: Update deprecated schema v1 images - sectiontitle: Registry storage drivers section: - path: /registry/storage-drivers/ @@ -4133,7 +4135,7 @@ manuals: - path: /registry/spec/auth/token/ title: Token authentication specification - path: /release-notes/ - title: Release notes + title: Release notes - sectiontitle: Superseded products and tools section: - path: /cs-engine/1.13/release-notes/ @@ -4305,7 +4307,7 @@ manuals: - path: /swarm/swarm-api/ title: Docker Swarm API - path: /release-notes/docker-swarm/ - title: Docker Swarm release notes + title: Docker Swarm release notes - sectiontitle: Docker Toolbox (legacy) section: - path: /toolbox/overview/ diff --git a/engine/release-notes.md b/engine/release-notes.md index da265c1b46..10d6ed1ce9 100644 --- a/engine/release-notes.md +++ b/engine/release-notes.md @@ -30,6 +30,77 @@ in which new features cannot be adopted as quickly for consistency and compatibi > `sudo apt install docker-ce docker-ce-cli containerd.io`. See the install instructions > for the corresponding linux distro for details. +## 19.03.2 +2019-08-29 + +### Builder + +* Fix `COPY --from` to non-existing directory on Windows. [moby/moby#39695](https://github.com/moby/moby/pull/39695) + +* Fix builder-next: metadata commands not having created time in history. [moby/moby#39456](https://github.com/moby/moby/issues/39456) + +* Fix builder-next: close progress on layer export error. [moby/moby#39782](https://github.com/moby/moby/pull/39782) + +* Update buildkit to 588c73e1e4. [moby/moby#39781](https://github.com/moby/moby/pull/39781) + +### Client + +* Fix Windows absolute path detection on non-Windows [docker/cli#1990](https://github.com/docker/cli/pull/1990) + +* Fix to zsh completion script for `docker login --username`. + +* Fix context: produce consistent output on `context create`. [docker/cli#1985](https://github.com/docker/cli/pull/1874) + +* Fix support for HTTP proxy env variable. [docker/cli#2059](https://github.com/docker/cli/pull/2059) + +### Logging + +* Fix for reading journald logs. [moby/moby#37819](https://github.com/moby/moby/pull/37819) [moby/moby#38859](http://github.com/moby/moby/pull/38859) + +### Networking + +* Prevent panic on network attached to a container with disabled networking. [moby/moby#39589](https://github.com/moby/moby/pull/39589) + +### Runtime + +* Bump Golang to 1.12.8. + +* Fix a potential engine panic when using XFS disk quota for containers. [moby/moby#39644](https://github.com/moby/moby/pull/39644) + +### Swarm + +* Fix an issue where nodes with several tasks could not be removed. [docker/swarmkit#2867](https://github.com/docker/swarmkit/pull/2867) + +### Known issues + +* In some circumstances, in large clusters, docker information might, as part of the Swarm section, + include the error `code = ResourceExhausted desc = grpc: received message larger than + max (5351376 vs. 4194304)`. This does not indicate any failure or misconfiguration by the user, + and requires no response. +* Orchestrator port conflict can occur when redeploying all services as new. Due to many swarm manager + requests in a short amount of time, some services are not able to receive traffic and are causing a `404` + error after being deployed. + - Workaround: restart all tasks via `docker service update --force`. + +* Traffic cannot egress the HOST because of missing Iptables rules in the FORWARD chain + The missing rules are : + ``` + sbin/iptables --wait -C FORWARD -o docker_gwbridge -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT + /sbin/iptables --wait -C FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT + ``` + - Workaround: Add these rules back using a script and cron definitions. The script + must contain '-C' commands to check for the presence of a rule and '-A' commands to add + rules back. Run the script on a cron in regular intervals, for example, every minutes. + - Affected versions: 17.06.2-ee-16, 18.09.1, 19.03.0 +* [CVE-2018-15664](https://nvd.nist.gov/vuln/detail/CVE-2018-15664) symlink-exchange attack with directory traversal. Workaround until proper fix is available in upcoming patch release: `docker pause` container before doing file operations. [moby/moby#39252](https://github.com/moby/moby/pull/39252) +* `docker cp` regression due to CVE mitigation. An error is produced when the source of `docker cp` is set to `/`. +* Install Docker Engine - Enterprise fails to install on RHEL on Azure. This affects any RHEL version that uses an Extended Update Support (EUS) image. At the time of this writing, known versions affected are RHEL 7.4, 7.5, and 7.6. + + - Workaround options: + - Use an older image and don't get updates. Examples of EUS images are here: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/rhel-images#rhel-images-with-eus. + - Import your own RHEL images into Azure and do not rely on the Extended Update Support (EUS) RHEL images. + - Use a RHEL image that does not contain a minor version in the SKU. These are not attached to EUS repositories. Some examples of those are the first three images (SKUs: 7-RAW, 7-LVM, 7-RAW-CI) listed here : https://docs.microsoft.com/en-us/azure/virtual-machines/linux/rhel-images#list-of-rhel-images-available. + ## 19.03.1 2019-07-25 @@ -263,6 +334,35 @@ The missing rules are : - Import your own RHEL images into Azure and do not rely on the Extended Update Support (EUS) RHEL images. - Use a RHEL image that does not contain a minor version in the SKU. These are not attached to EUS repositories. Some examples of those are the first three images (SKUs: 7-RAW, 7-LVM, 7-RAW-CI) listed here : https://docs.microsoft.com/en-us/azure/virtual-machines/linux/rhel-images#list-of-rhel-images-available. +## 18.09.9 +2019-08-29 + +### Client + +* Fix Windows absolute path detection on non-Windows. [docker/cli#1990](https://github.com/docker/cli/pull/1990) +* Fix Docker refusing to load key from delegation.key on Windows. [docker/cli#1968](https://github.com/docker/cli/pull/1968) +* Completion scripts updates for bash and zsh. + +### Logging + +* Fix for reading journald logs. [moby/moby#37819](https://github.com/moby/moby/pull/37819) [moby/moby#38859](https://github.com/moby/moby/pull/38859) + +### Networking + +* Prevent panic on network attached to a container with disabled networking. [moby/moby#39589](https://github.com/moby/moby/pull/39589) +* Fix service port for an application becomes unavailable randomly. [docker/libnetwork#2069](https://github.com/docker/libnetwork/pull/2069) +* Fix cleaning up `--config-only` networks `--config-from` networkshave ungracefully exited. [docker/libnetwork#2373](https://github.com/docker/libnetwork/pull/2373) + +### Runtime + +* Update to Go 1.11.13. +* Fix a potential engine panic when using XFS disk quota for containers. [moby/moby#39644](https://github.com/moby/moby/pull/39644) + +### Swarm + +* Fix "grpc: received message larger than max" errors. [moby/moby#39306](https://github.com/moby/moby/pull/39306) +* Fix an issue where nodes several tasks could not be removed. [docker/swarmkit#2867](https://github.com/docker/swarmkit/pull/2867) + ## 18.09.8 2019-07-17 @@ -609,7 +709,37 @@ Ubuntu 14.04 "Trusty Tahr" [docker-ce-packaging#255](https://github.com/docker/d ## Older Docker Engine EE Release notes -## 18.03.1-ee-10 +## 18.03.1-ee-11 + +2019-08-29 + +### Runtime + +* Fix [CVE-2019-14271](https://nvd.nist.gov/vuln/detail/CVE-2019-14271) loading of nsswitch based config inside chroot under Glibc. + +* Fix a potential engine panic when using XFS disk quota for containers. [moby/moby#39644](https://github.com/mony/moby/pull/39644) + +* Fix overlay2 storage driver getting "device or resource busy" on mount. [moby/moby#37993](https://github.com/moby/moby/pull/37993) + +* Update to Go 1.11.13. + +### Logging + +* Fix for reading journald logs. [moby/moby#37819](https://github.com/moby/moby/pull/37819) [moby/moby#38859](https://github.com/moby/moby/pull/38859) + +### Networking + +* Fix cluster connectivity issue caused by high qLen in networkdb. [docker/libnetwork#2216](https://github.com/docker/libnetwork/pull/2216) + +* Fix possible nil pointer exception. [docker/libnetwork#2325](https://github.com/docker/libnetwork/pull/2325) + +* Fix service port for an application becomes unavailable randomly. [docker/libnetwork#2069](https://github.com/docker/libnetwork/pull/2069) + +### Swarm + +* Fix swarm overlay networking not working after `--force-new-cluster`. [docker/libnetwork#2307](https://github.com/docker/libnetwork/pull/2307) + +## .1-ee-10 2019-07-17 @@ -770,6 +900,24 @@ with directory traversal. [moby/moby#39357](https://github.com/moby/moby/pull/39 + Support for `--chown` with `COPY` and `ADD` in `Dockerfile`. + Added functionality for the `docker logs` command to include the output of multiple logging drivers. +## 17.06.2-ee-24 +2019-08-29 + +### Runtime + +* Fix [CVE-2019-14271](https://nvd.nist.gov/vuln/detail/CVE-2019-14271) loading of nsswitch based config inside chroot under Glibc. +* Fix Fix a potential engine panic when using XFS disk quota for containers. [moby/moby#39644](https://github.com/moby/moby/pull/39644) +* Update to Go 1.11.13. + +### Logging + +* Fix for reading journald logs. [moby/moby#37819](https://github.com/moby/moby/pull/37819) [moby/moby#38859](https://github.com/moby/moby/pull/38859) + +### Networking + +* Fix cluster connectivity issue caused by high qLen in networkdb. [docker/libnetwork#2216](https://github.com/docker/libnetwork/pull/2216) +* Fix service port for an application becomes unavailable randomly. [docker/libnetwork#2069](docker/libnetwork#2069) + ## 17.06.2-ee-23 2019-07-17 From 5873cc5bd704d4a5cbdf01c9c7de4b854036b5f1 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 29 Aug 2019 16:28:48 +0100 Subject: [PATCH 035/160] update GA date in UCP relnotes --- ee/ucp/release-notes.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index 1727d682e0..daf8dd3265 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -25,7 +25,7 @@ upgrade your installation to the latest release. # Version 3.2 ## 3.2.1 -2019-08 +2019-08-29 ### Kubernetes * Kubernetes has been upgraded to version 1.14.6. @@ -367,7 +367,7 @@ In order to optimize user experience and security, support for Internet Explorer # Version 3.1 ## 3.1.10 -2019-08 +2019-08-29 ### Kubernetes * Kubernetes has been upgraded to version 1.11.0-docker-2 that is built on Golang 1.12.9. @@ -825,7 +825,7 @@ The following features are deprecated in UCP 3.1. # Version 3.0 ## 3.0.14 -2019-08 +2019-08-29 ### Kubernetes * Kubernetes has been upgraded to version 1.8.15-docker-7 that is built on Golang 1.12.9. @@ -1353,7 +1353,7 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads. # Version 2.2 ## Version 2.2.21 -2019-08 +2019-08-29 ### Security From 6a19d309b0d6e7eee0396459e8e43f44b5e101ed Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Thu, 29 Aug 2019 14:03:19 -0400 Subject: [PATCH 036/160] Add cluster and persistent storage --- _data/glossary.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 659648bd26..1b05505b1f 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -1,4 +1,4 @@ -amd64: | +amd64: | AMD64 is AMD's 64-bit extension of Intel's x86 architecture, and is also referred to as x86_64 (or x86-64). aufs: | @@ -26,6 +26,8 @@ cgroups: | of processes. Docker relies on cgroups to control and isolate resource limits. *Also known as : control groups* +cluster: | + A cluster is a group of machines that work together to run workloads and provide high availability. collection: | A collection is a group of swarm resources that Docker Engine - Enterprise uses for role-based access control. Collections enable organizing permissions for resources like @@ -219,6 +221,8 @@ parent image: | in the image's Dockerfile. All subsequent commands are applied to this parent image. A Dockerfile with no `FROM` directive has no parent image, and is called a **base image**. +persistent storage: | + Persistent storage or volume storage provides a way for a user to add a persistent layer to the running container's file system. This persistent layer could live on the container host or an external device. The lifecycle of this persistent layer is not connected to the life cycle of the container, allowing a user to retain state. registry: | A Registry is a hosted service containing [repositories](#repository) of [images](#image) which responds to the Registry API. From a1c16611160754dd2c72d0a19465dd84f1b19030 Mon Sep 17 00:00:00 2001 From: ada mancini Date: Mon, 2 Sep 2019 06:36:56 -0400 Subject: [PATCH 037/160] fix formatting around persistent-volume-binder (#9334) * fix formatting around persistent-volume-binder * Update release-notes.md --- ee/ucp/release-notes.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index 69d539b602..d240f11e13 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -256,24 +256,24 @@ In order to optimize user experience and security, support for Internet Explorer $ sudo yum downgrade container-selinux-2.74-1.el7 ``` - Attempts to deploy local PV fail with regular UCP configuration unless PV binder SA is bound to cluster admin role. - - Workaround: Create a `ClusterRoleBinding` that binds the `persistent-volume-binder` serviceaccount - to a `cluster-admin` `ClusterRole`, as shown in the following example: - ``` - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRoleBinding - metadata: - labels: - subjectName: kube-system-persistent-volume-binder - name: kube-system-persistent-volume-binder:cluster-admin - roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin - subjects: - - kind: ServiceAccount - name: persistent-volume-binder - namespace: kube-system - ``` + - Workaround: Create a `ClusterRoleBinding` that binds the `persistent-volume-binder` serviceaccount to a `cluster-admin` `ClusterRole`, as shown in the following example: + + ``` + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + metadata: + labels: + subjectName: kube-system-persistent-volume-binder + name: kube-system-persistent-volume-binder:cluster-admin + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin + subjects: + - kind: ServiceAccount + name: persistent-volume-binder + namespace: kube-system + ``` - Using iSCSI on a SLES 12 or SLES 15 Kubernetes cluster results in failures - Using Kubernetes iSCSI on SLES 12 or SLES 15 hosts results in failures. Kubelet logs might have errors similar to the following, when there's an attempt to attach the iSCSI based persistent volume: From 56722dd4a0fcbcc8f03d7df60743bf3537345862 Mon Sep 17 00:00:00 2001 From: Affinito Alessandro Date: Mon, 2 Sep 2019 12:40:18 +0200 Subject: [PATCH 038/160] Added chmod +x for the binary (#9330) --- machine/install-machine.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/machine/install-machine.md b/machine/install-machine.md index 7882eae3e5..2330dc7da7 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -34,7 +34,8 @@ on GitHub. ```console $ base=https://github.com/docker/machine/releases/download/v{{site.machine_version}} && curl -L $base/docker-machine-$(uname -s)-$(uname -m) >/tmp/docker-machine && - sudo mv /tmp/docker-machine /usr/local/bin/docker-machine + sudo mv /tmp/docker-machine /usr/local/bin/docker-machine && + chmod +x /usr/local/bin/docker-machine ``` If you are running **Windows** with [Git BASH](https://git-for-windows.github.io/){: target="_blank" class="_"}: From 38400b7884d84ea79e22d2407691cc56e4aab6f9 Mon Sep 17 00:00:00 2001 From: Olly P Date: Mon, 2 Sep 2019 18:49:07 +0100 Subject: [PATCH 039/160] Expanded SELinux UCP install documentation (#9299) * Expanded SELinux install documentation Added a bit more context installing UCP on a system with SELinux enabled at the daemon. * Added a list for cloud providers --- ee/ucp/admin/install/index.md | 9 +++--- reference/ucp/3.2/cli/install.md | 52 ++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/ee/ucp/admin/install/index.md b/ee/ucp/admin/install/index.md index 76a0d94540..dc2b9ff1fc 100644 --- a/ee/ucp/admin/install/index.md +++ b/ee/ucp/admin/install/index.md @@ -78,10 +78,11 @@ To install UCP: --interactive ``` - This runs the install command in interactive mode, so that you're - prompted for any necessary configuration values. - To find what other options are available in the install command, check the - [reference documentation](/reference/ucp/3.2/cli/install.md). + This runs the install command in interactive mode, so that you're prompted + for any necessary configuration values. To find what other options are + available in the install command, including how to install UCP on a system + with SELinux enabled, check the [reference + documentation](/reference/ucp/3.2/cli/install.md). > Custom Container Networking Interface (CNI) plugins > diff --git a/reference/ucp/3.2/cli/install.md b/reference/ucp/3.2/cli/install.md index a5022020b1..5f8d8a2078 100644 --- a/reference/ucp/3.2/cli/install.md +++ b/reference/ucp/3.2/cli/install.md @@ -9,9 +9,12 @@ Install UCP on a node ## Usage ```bash -docker container run --rm -it \ +docker container run \ + --rm \ + --interactive \ + --tty \ --name ucp \ - -v /var/run/docker.sock:/var/run/docker.sock \ + --volume /var/run/docker.sock:/var/run/docker.sock \ docker/ucp \ install [command options] ``` @@ -34,11 +37,48 @@ firewall: * 12376, 12379, 12380, 12381, 12382, 12383, 12384, 12385, 12386, 12387 * 4789 (udp) and 7946 (tcp/udp) for overlay networking -If you have SELinux policies enabled for your Docker install, you will need to -use `docker container run --rm -it --security-opt label=disable ...` when running this -command. +### SELinux -If you are installing on Azure, see [Install UCP on Azure](/ee/ucp/admin/install/install-on-azure/). +If you are installing UCP on a manager node with SELinunx enabled at the daemon +and operating system level, you will need to pass `--security-opt +label=disable` in to your install command. This flag will disable SELinux +policies on the installation container. The UCP installation container mounts +and configures the Docker Socket as part of the UCP installation container, +therefore the UCP installation will fail with a permission denied error if you +fail to pass in this flag. + +``` +FATA[0000] unable to get valid Docker client: unable to ping Docker daemon: Got +permission denied while trying to connect to the Docker daemon socket at +unix:///var/run/docker.sock: Get http://%2Fvar%2Frun%2Fdocker.sock/_ping: dial +unix /var/run/docker.sock: connect: permission denied - If SELinux is enabled +on the Docker daemon, make sure you run UCP with "docker run --security-opt +label=disable -v /var/run/docker.sock:/var/run/docker.sock ..." +``` + +An installation command for a system with SELinux enabled at the daemon level +would be: + +```bash +docker container run \ + --rm \ + --interactive \ + --tty \ + --name ucp \ + --security-opt label=disable \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + docker/ucp \ + install [command options] +``` + +### Cloud Providers + +If you are installing on a public cloud platform there is cloud specific UCP +installation documentation: + +- For [Microsoft Azure](./cloudproviders/install-on-azure/) this is + **mandatory** +- For [AWS](./cloudproviders/install-on-aws/) this is optional. ## Options From 3279c447b6dc424b176c8dff5f30b9ca0b1afb26 Mon Sep 17 00:00:00 2001 From: "Jose J. Escobar" <53836904+jescobar-docker@users.noreply.github.com> Date: Mon, 2 Sep 2019 13:50:06 -0400 Subject: [PATCH 040/160] Update dockerfile_best-practices.md (#9335) Just two typos --- develop/develop-images/dockerfile_best-practices.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/develop/develop-images/dockerfile_best-practices.md b/develop/develop-images/dockerfile_best-practices.md index 33ca9a15eb..567bcff101 100644 --- a/develop/develop-images/dockerfile_best-practices.md +++ b/develop/develop-images/dockerfile_best-practices.md @@ -222,7 +222,7 @@ docker build [OPTIONS] -f- PATH ``` This syntax can be useful in situations where you want to build an image from a -repository does not contain a `Dockerfile`, or if you want to build with a custom +repository that does not contain a `Dockerfile`, or if you want to build with a custom `Dockerfile`, without maintaining your own fork of the repository. The example below builds an image using a `Dockerfile` from `stdin`, and adds @@ -898,7 +898,7 @@ image. For example, you would use `ONBUILD` for a language stack image that builds arbitrary user software written in that language within the `Dockerfile`, as you can see in [Ruby’s `ONBUILD` variants](https://github.com/docker-library/ruby/blob/c43fef8a60cea31eb9e7d960a076d633cb62ba8d/2.4/jessie/onbuild/Dockerfile). -Images built from `ONBUILD` should get a separate tag, for example: +Images built with `ONBUILD` should get a separate tag, for example: `ruby:1.9-onbuild` or `ruby:2.0-onbuild`. Be careful when putting `ADD` or `COPY` in `ONBUILD`. The "onbuild" image From 311b38050f1d69ff885738d181c8e7f7533c5946 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 3 Sep 2019 08:04:52 +0100 Subject: [PATCH 041/160] update the release date --- cluster/release-notes.md | 2 +- ee/desktop/release-notes.md | 4 ++-- ee/dtr/release-notes.md | 17 +++++++++++++---- ee/ucp/release-notes.md | 8 ++++---- engine/release-notes.md | 8 ++++---- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/cluster/release-notes.md b/cluster/release-notes.md index dad646ba10..e705b49417 100644 --- a/cluster/release-notes.md +++ b/cluster/release-notes.md @@ -9,7 +9,7 @@ This page provides information about Docker Cluster versions. # Version 1 ## Version 1.1.0 -(2019-08-29) +(2019-09-03) ### What's new diff --git a/ee/desktop/release-notes.md b/ee/desktop/release-notes.md index ffda2e0f4f..de6c4694c2 100644 --- a/ee/desktop/release-notes.md +++ b/ee/desktop/release-notes.md @@ -15,8 +15,8 @@ For information on system requirements, installation, and download, see: For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes). -## Version 2.1.0.3 -2019-08-29 +## Version 2.1.0.4 +2019-09-03 Docker Desktop Enterprise 2.1.0.3 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. diff --git a/ee/dtr/release-notes.md b/ee/dtr/release-notes.md index 9bf9b9189a..da716d7304 100644 --- a/ee/dtr/release-notes.md +++ b/ee/dtr/release-notes.md @@ -23,12 +23,13 @@ to upgrade your installation to the latest release. # Version 2.7 ## 2.7.2 -(2019-8-29) +(2019-09-03) ### Bug fixes * Fixed a bug which prevented non-admin users from creating or editing promotion policies. (docker/dhe-deploy #10551) * Fixed an issue where promotion policy details could not be displayed. (docker/dhe-deploy #10510) +* Fixed a bug which can cause scanning jobs to deadlock. (docker/dhe-deploy #10632) ### Security @@ -105,12 +106,16 @@ Refer to [DTR image vulnerabilities](https://success.docker.com/article/dtr-imag # Version 2.6 ## 2.6.9 -(2019-8-28) +(2019-09-03) ### Security * Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10557) +### Bug fixes + +* Fixed a bug which can cause scanning jobs to deadlock. (docker/dhe-deploy #10633) + ## 2.6.8 (2019-7-17) @@ -422,12 +427,16 @@ Refer to [DTR image vulnerabilities](https://success.docker.com/article/dtr-imag > Upgrade path from 2.5.x to 2.6: Upgrade directly to 2.6.4. ## 2.5.14 -(2019-8-28) +(2019-09-03) ### Security * Updated the Go programming language version for DTR to `1.12.9`. (docker/dhe-deploy #10558) +### Bug fixes + +* Fixed a bug which can cause scanning jobs to deadlock. (docker/dhe-deploy #10634) + ## 2.5.13 (2019-07-17) @@ -1015,7 +1024,7 @@ specify `--log-protocol`. > Upgrade path from 2.5.x to 2.6: Upgrade directly to 2.6.4. ## 2.4.14 -(2019-8-28) +(2019-09-03) ### Security diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index daf8dd3265..07304f024a 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -25,7 +25,7 @@ upgrade your installation to the latest release. # Version 3.2 ## 3.2.1 -2019-08-29 +2019-09-03 ### Kubernetes * Kubernetes has been upgraded to version 1.14.6. @@ -367,7 +367,7 @@ In order to optimize user experience and security, support for Internet Explorer # Version 3.1 ## 3.1.10 -2019-08-29 +2019-09-03 ### Kubernetes * Kubernetes has been upgraded to version 1.11.0-docker-2 that is built on Golang 1.12.9. @@ -825,7 +825,7 @@ The following features are deprecated in UCP 3.1. # Version 3.0 ## 3.0.14 -2019-08-29 +2019-09-03 ### Kubernetes * Kubernetes has been upgraded to version 1.8.15-docker-7 that is built on Golang 1.12.9. @@ -1353,7 +1353,7 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads. # Version 2.2 ## Version 2.2.21 -2019-08-29 +2019-09-03 ### Security diff --git a/engine/release-notes.md b/engine/release-notes.md index 10d6ed1ce9..638c327992 100644 --- a/engine/release-notes.md +++ b/engine/release-notes.md @@ -31,7 +31,7 @@ in which new features cannot be adopted as quickly for consistency and compatibi > for the corresponding linux distro for details. ## 19.03.2 -2019-08-29 +2019-09-03 ### Builder @@ -335,7 +335,7 @@ The missing rules are : - Use a RHEL image that does not contain a minor version in the SKU. These are not attached to EUS repositories. Some examples of those are the first three images (SKUs: 7-RAW, 7-LVM, 7-RAW-CI) listed here : https://docs.microsoft.com/en-us/azure/virtual-machines/linux/rhel-images#list-of-rhel-images-available. ## 18.09.9 -2019-08-29 +2019-09-03 ### Client @@ -711,7 +711,7 @@ Ubuntu 14.04 "Trusty Tahr" [docker-ce-packaging#255](https://github.com/docker/d ## 18.03.1-ee-11 -2019-08-29 +2019-09-03 ### Runtime @@ -901,7 +901,7 @@ with directory traversal. [moby/moby#39357](https://github.com/moby/moby/pull/39 + Added functionality for the `docker logs` command to include the output of multiple logging drivers. ## 17.06.2-ee-24 -2019-08-29 +2019-09-03 ### Runtime From 10e9cb9f413a9c2f70cd9a50ab8b588521ee2dc8 Mon Sep 17 00:00:00 2001 From: ollypom Date: Tue, 3 Sep 2019 10:56:07 +0000 Subject: [PATCH 042/160] Updated UCP release notes for August Patch --- ee/ucp/release-notes.md | 210 ++++++++++++++++++++++++++-------------- 1 file changed, 135 insertions(+), 75 deletions(-) diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index daf8dd3265..c72e9f957c 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -24,32 +24,38 @@ upgrade your installation to the latest release. # Version 3.2 -## 3.2.1 +## 3.2.1 2019-08-29 ### Kubernetes * Kubernetes has been upgraded to version 1.14.6. -* Kubernetes DNS has been upgraded to 1.14.13 and is now replicated for HA. +* Kubernetes DNS has been upgraded to 1.14.13 and is now deployed with more + than 1 replica by default. ### Networking -* Calico has been upgraded to version 3.8.2. +* Calico has been upgraded to version 3.8.2. For more information see the [Calico Release + Notes](https://docs.projectcalico.org/v3.8/release-notes/). * Interlock has been upgraded to version 2.6.1. -* Added `azure-ip-count` at installation. +* The `azure-ip-count` variable is now exposed at install time, allowing a User + to customize the number of IP addresses UCP provisions for each node. + Additional information can be found + [here](/ee/ucp/admin/install/cloudproviders/install-on-azure/#adjust-the-ip-count-value) ### Security * Upgraded Golang to 1.12.9. * Added CSP header to prevent cross-site scripting attacks (XSS) ### Bootstrap -* Fixed various issues in install, uninstall, backup and restore. +* Fixed various issues in install, uninstall, backup and restore when UCP + Telemetry data had been disabled. -| Component | Version | -| ----------- | ----------- | -| UCP | 3.2.0 | -| Kubernetes | 1.14.6 | -| Calico | 3.8.2 | -| Interlock | 2.6.1 | -| Interlock NGINX proxy | 1.14.2 | +| Component | Version | +| --------------------- | ------- | +| UCP | 3.2.1 | +| Kubernetes | 1.14.6 | +| Calico | 3.8.2 | +| Interlock | 2.6.1 | +| Interlock NGINX proxy | 1.14.2 | ## 3.2.0 2019-7-22 @@ -59,21 +65,21 @@ Refer to [UCP image vulnerabilities](https://success.docker.com/article/ucp-imag ### New features -- Group Managed Service Accounts (gMSA). +- Group Managed Service Accounts (gMSA). On Windows, you can create or update a service using ```--credential-spec``` with the ```config://``` format. This passes the gMSA credentials file directly to nodes before a container starts. -- Open Security Controls Assessment Language (OSCAL). +- Open Security Controls Assessment Language (OSCAL). OSCAL API endpoints have been added in Engine and UCP. These endpoints are enabled by default. -- Container storage interface (CSI). +- Container storage interface (CSI). Version 1.0 of the CSI specification is now supported for container orchestrators to manage storage plugins. Note: As of May 2019, none of the [available CSI drivers](https://kubernetes-csi.github.io/docs/drivers.html) are production quality and are considered pre-GA. -- Internet Small Computer System Interface (iSCSI). +- Internet Small Computer System Interface (iSCSI). Using iSCSI, a storage admin can now provision a UCP cluster with persistent storage from which UCP end users can request storage resources without needing underlying infrastructure knowledge. -- System for Cross-domain Identity Management (SCIM). +- System for Cross-domain Identity Management (SCIM). SCIM implementation allows proactive synchronization with UCP and eliminates manual intervention for changing user status and group membership. -- Support for Pod Security Policies (PSPs) within Kubernetes. +- Support for Pod Security Policies (PSPs) within Kubernetes. Pod Security Policies are enabled by default in UCP 3.2 allowing platform operators to enforce security controls on what can run on top of Kubernetes. For more information see @@ -119,13 +125,13 @@ The following features are deprecated in UCP 3.2: ``` docker node update --label-add com.docker.ucp.agent-pause=true ``` -- Windows 2016 is formally deprecated from Docker Enterprise 3.0. EOL of Windows Server 2016 support will occur in Docker +- Windows 2016 is formally deprecated from Docker Enterprise 3.0. EOL of Windows Server 2016 support will occur in Docker Enterprise 3.1. Upgrade to Windows Server 2019 for continued support on Docker Enterprise. -- Support for updating the UCP config with `docker service update ucp-manager-agent --config-add ...` -is deprecated and will be removed in a future release. To update the UCP config, use the `/api/ucp/config-toml` +- Support for updating the UCP config with `docker service update ucp-manager-agent --config-add ...` +is deprecated and will be removed in a future release. To update the UCP config, use the `/api/ucp/config-toml` endpoint described in https://docs.docker.com/ee/ucp/admin/configure/ucp-configuration-file/. -- Generating a backup from a UCP manager that has lost quorum is no longer supported. We recommend that you -regularly schedule backups on your cluster so that you have always have a recent backup. +- Generating a backup from a UCP manager that has lost quorum is no longer supported. We recommend that you +regularly schedule backups on your cluster so that you have always have a recent backup. Refer to [UCP backup information](/ee/admin/backup/back-up-ucp/) for detailed UCP back up information. If your cluster has lost quorum and you cannot recover it on your own, please contact Docker Support. @@ -217,13 +223,13 @@ In order to optimize user experience and security, support for Internet Explorer - Kubelet fails mounting local volumes in "Block" mode on SLES 12 and SLES 15 hosts The error message from the kubelet looks like this, with `mount` returning error code 32. ``` - Operation for "\"kubernetes.io/local-volume/local-pxjz5\"" failed. No retries - permitted until 2019-07-18 20:28:28.745186772 +0000 UTC m=+5936.009498175 - (durationBeforeRetry 2m2s). Error: "MountVolume.MountDevice failed for volume \"local-pxjz5\" - (UniqueName: \"kubernetes.io/local-volume/local-pxjz5\") pod + Operation for "\"kubernetes.io/local-volume/local-pxjz5\"" failed. No retries + permitted until 2019-07-18 20:28:28.745186772 +0000 UTC m=+5936.009498175 + (durationBeforeRetry 2m2s). Error: "MountVolume.MountDevice failed for volume \"local-pxjz5\" + (UniqueName: \"kubernetes.io/local-volume/local-pxjz5\") pod \"pod-subpath-test-local-preprovisionedpv-l7k9\" (UID: \"364a339d-a98d-11e9-8d2d-0242ac11000b\") - : local: failed to mount device /dev/loop0 at - /var/lib/kubelet/plugins/kubernetes.io/local-volume/mounts/local-pxjz5 (fstype: ), + : local: failed to mount device /dev/loop0 at + /var/lib/kubelet/plugins/kubernetes.io/local-volume/mounts/local-pxjz5 (fstype: ), error exit status 32" ``` Issuing "dmesg" on the system will show something like: @@ -231,7 +237,7 @@ In order to optimize user experience and security, support for Internet Explorer [366633.029514] EXT4-fs (loop3): Couldn't mount RDWR because of SUSE-unsupported optional feature METADATA_CSUM. Load module with allow_unsupported=1. ``` Rootcause: - For block volumes, if a specific filesystem is not specified, "ext4" is used as the default to format the volume. "mke2fs" is the util used for formatting and is part of the hyperkube image. The config file for mke2fs is at /etc/mke2fs.conf. The config file by default has the following line for ext4. Note that the features list includes "metadata_csum", which enables storing checksums to ensure filesystem integrity. + For block volumes, if a specific filesystem is not specified, "ext4" is used as the default to format the volume. "mke2fs" is the util used for formatting and is part of the hyperkube image. The config file for mke2fs is at /etc/mke2fs.conf. The config file by default has the following line for ext4. Note that the features list includes "metadata_csum", which enables storing checksums to ensure filesystem integrity. ``` [fs_types]... ext4 = {features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isizeinode_size = 256} @@ -243,10 +249,10 @@ In order to optimize user experience and security, support for Internet Explorer This resolution can be automated across your cluster of SLES12 and SLES15 hosts, by creating a docker swarm service as follows. Note that, for this, the hosts should be in "swarm" mode: - Create a global docker service that removes the "metadata_csum" feature from the mke2fs config file (/etc/mke2fs.conf) in ucp-kubelet container. For this, use the UCP client bundle to point to the UCP cluster and run the following swarm commands: + Create a global docker service that removes the "metadata_csum" feature from the mke2fs config file (/etc/mke2fs.conf) in ucp-kubelet container. For this, use the UCP client bundle to point to the UCP cluster and run the following swarm commands: ``` - docker service create --mode=global --restart-condition none --mount - type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock mavenugo/swarm-exec:17.03.0-ce docker + docker service create --mode=global --restart-condition none --mount + type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock mavenugo/swarm-exec:17.03.0-ce docker exec ucp-kubelet "/bin/bash" "-c" "sed -i 's/metadata_csum,//g' /etc/mke2fs.conf" ``` You can now switch nodes to be kubernetes workers. @@ -274,7 +280,7 @@ In order to optimize user experience and security, support for Internet Explorer - re-adding the above rules manually or via cron or - restarting Docker -- Running the engine with `"selinux-enabled": true` and installing UCP returns the following error: +- Running the engine with `"selinux-enabled": true` and installing UCP returns the following error: ``` time="2019-05-22T00:27:54Z" level=fatal msg="the following required ports are blocked on your host: 179, 443, 2376, 6443, 6444, 10250, 12376, 12378 - 12386. Check your firewall settings" ``` @@ -285,24 +291,25 @@ In order to optimize user experience and security, support for Internet Explorer $ sudo yum downgrade container-selinux-2.74-1.el7 ``` - Attempts to deploy local PV fail with regular UCP configuration unless PV binder SA is bound to cluster admin role. - - Workaround: Create a `ClusterRoleBinding` that binds the `persistent-volume-binder` serviceaccount + - Workaround: Create a `ClusterRoleBinding` that binds the `persistent-volume-binder` serviceaccount to a `cluster-admin` `ClusterRole`, as shown in the following example: - ``` - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRoleBinding - metadata: - labels: - subjectName: kube-system-persistent-volume-binder - name: kube-system-persistent-volume-binder:cluster-admin - roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin - subjects: - - kind: ServiceAccount - name: persistent-volume-binder - namespace: kube-system - ``` + + ``` + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + metadata: + labels: + subjectName: kube-system-persistent-volume-binder + name: kube-system-persistent-volume-binder:cluster-admin + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin + subjects: + - kind: ServiceAccount + name: persistent-volume-binder + namespace: kube-system + ``` - Using iSCSI on a SLES 12 or SLES 15 Kubernetes cluster results in failures - Using Kubernetes iSCSI on SLES 12 or SLES 15 hosts results in failures. Kubelet logs might have errors similar to the following, when there's an attempt to attach the iSCSI based persistent volume: @@ -313,20 +320,20 @@ In order to optimize user experience and security, support for Internet Explorer - Workaround: use a swarm service to deploy this change across the cluster as follows: 1. Install UCP and have nodes configured as swarm workers. 2. Perform iSCSI initiator related configuration on the nodes. - - Install packages: + - Install packages: ``` zypper -n install open-iscsi ``` - - Modprobe the relevant kernel modules + - Modprobe the relevant kernel modules ``` modprobe iscsi_tcp ``` - - Start the iscsi daemon + - Start the iscsi daemon ``` service start iscsid ``` - 3. Create a global docker service that updates the dynamic library configuration path of the ucp-kubelet with relevant host paths. For this, use the UCP client bundle to point to the UCP cluster and run the following swarm commands: + 3. Create a global docker service that updates the dynamic library configuration path of the ucp-kubelet with relevant host paths. For this, use the UCP client bundle to point to the UCP cluster and run the following swarm commands: ``` docker service create --mode=global --restart-condition none --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock mavenugo/swarm-exec:17.03.0-ce docker exec ucp-kubelet "/bin/bash" "-c" "echo /rootfs/usr/lib64 >> /etc/ld.so.conf.d/libc.conf && echo /rootfs/lib64 >> /etc/ld.so.conf.d/libc.conf && ldconfig" 4b1qxigqht0vf5y4rtplhygj8 @@ -336,8 +343,8 @@ In order to optimize user experience and security, support for Internet Explorer ugb24g32knzv: running overall progress: 0 out of 3 tasks overall progress: 0 out of 3 tasks - overall progress: 0 out of 3 tasks - overall progress: 0 out of 3 tasks + overall progress: 0 out of 3 tasks + overall progress: 0 out of 3 tasks Operation continuing in background. @@ -353,7 +360,7 @@ In order to optimize user experience and security, support for Internet Explorer ``` 4. Switch cluster to run kubernetes workloads. Your cluster is now set to run iSCSI workloads. - + ### Components | Component | Version | @@ -366,24 +373,61 @@ In order to optimize user experience and security, support for Internet Explorer # Version 3.1 -## 3.1.10 +### Kubernetes +* Kubernetes has been upgraded to version 1.14.6. +* Kubernetes DNS has been upgraded to 1.14.13 and is now deployed with more + than 1 replica by default. + +### Networking +* Calico has been upgraded to version 3.8.2. For more information see the [Calico Release + Notes](https://docs.projectcalico.org/v3.8/release-notes/). +* Interlock has been upgraded to version 2.6.1. +* The `azure-ip-count` variable is now exposed at install time, allowing a User + to customize the number of IP addresses UCP provisions for each node. + Additional information can be found + [here](/ee/ucp/admin/install/cloudproviders/install-on-azure/#adjust-the-ip-count-value) + +### Security +* Upgraded Golang to 1.12.9. +* Added CSP header to prevent cross-site scripting attacks (XSS) + +### Bootstrap +* Fixed various issues in install, uninstall, backup and restore when UCP + Telemetry data had been disabled. + + +## 3.1.10 2019-08-29 ### Kubernetes -* Kubernetes has been upgraded to version 1.11.0-docker-2 that is built on Golang 1.12.9. -* Kubernetes DNS has been upgraded to 1.14.13 and is now replicated for HA. +* Kubernetes has been upgraded to version 1.11.10-docker-1, this has been built + with Golang 1.12.9. +* Kubernetes DNS has been upgraded to 1.14.13 and is now deployed with more + than 1 replica by default. ### Networking -* Calico has been upgraded to version 3.8.2. +* Calico has been upgraded to version 3.8.2. For more information see the [Calico Release + Notes](https://docs.projectcalico.org/v3.8/release-notes/). * Interlock has been upgraded to version 2.6.1. ### Security * Upgraded Golang to 1.12.9. ### UI -* A warning message will be shown when one attempts to upgrade 3.1 to 3.2 via GUI. - -## 3.1.9 +* A warning message will be shown when one attempts to upgrade from 3.1.x to + 3.2.x via the UCP UI. This upgrade can only be performed by the CLI. + +### Components + +| Component | Version | +| --------------------- | ------- | +| UCP | 3.1.10 | +| Kubernetes | 1.11.10 | +| Calico | 3.8.2 | +| Interlock | 2.6.1 | +| Interlock NGINX proxy | 1.14.2 | + +## 3.1.9 2019-07-17 ### Bug fixes @@ -478,7 +522,7 @@ In order to optimize user experience and security, support for Internet Explorer | Calico | 3.5.3 | | Interlock (nginx) | 1.14.0 | -## 3.1.7 +## 3.1.7 (2019-05-06) ### Security @@ -824,20 +868,36 @@ The following features are deprecated in UCP 3.1. # Version 3.0 -## 3.0.14 +## 3.0.14 2019-08-29 ### Kubernetes -* Kubernetes has been upgraded to version 1.8.15-docker-7 that is built on Golang 1.12.9. +* Kubernetes has been upgraded to version 1.8.15-docker-7, this has been built + with Golang 1.12.9. * Kubernetes DNS has been upgraded to 1.14.13. ### Networking -* Calico has been upgraded to version 3.0.12. +* Calico has been upgraded to version 3.8.2. For more information see the [Calico Release + Notes](https://docs.projectcalico.org/v3.8/release-notes/). * Interlock has been upgraded to version 2.6.1. ### Security * Upgraded Golang to 1.12.9. -* + +### UI +* A warning message will be shown when one attempts to upgrade from 3.1.x to + 3.2.x via the UCP UI. This upgrade can only be performed by the CLI. + +### Components + +| Component | Version | +| --------------------- | ------- | +| UCP | 3.0.14 | +| Kubernetes | 1.8.15 | +| Calico | 3.8.2 | +| Interlock | 2.6.1 | +| Interlock NGINX proxy | 1.14.2 | + ## 3.0.13 2019-07-17 @@ -868,7 +928,7 @@ The following features are deprecated in UCP 3.1. * Removed support for Windows Server 1709 as it is now [end of life](https://docs.microsoft.com/en-us/windows-server/get-started/windows-server-release-info). - + ### Components | Component | Version | @@ -878,7 +938,7 @@ The following features are deprecated in UCP 3.1. | Calico | 3.0.8 | | Interlock (nginx) | 1.13.12 | -## 3.0.11 +## 3.0.11 2019-05-06 ### Bug fixes @@ -1352,14 +1412,14 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads. # Version 2.2 -## Version 2.2.21 +## Version 2.2.21 2019-08-29 ### Security * Upgraded Golang to 1.12.9. -## Version 2.2.20 +## Version 2.2.20 2019-07-17 ### Bug fixes @@ -1408,7 +1468,7 @@ instead of the correct image for the worker architecture. * You can't create a bridge network from the web interface. As a workaround use `/`. -## Version 2.2.18 +## Version 2.2.18 2019-05-06 ### Bug fixes From 1fb601690fd516c723570b6ac6255ded226d4035 Mon Sep 17 00:00:00 2001 From: ollypom Date: Tue, 3 Sep 2019 11:08:50 +0000 Subject: [PATCH 043/160] Removd UCP 3.1.9 Merge Conflict --- ee/ucp/release-notes.md | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index 0e345d8c3d..002e8da3cb 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -373,30 +373,6 @@ In order to optimize user experience and security, support for Internet Explorer # Version 3.1 -<<<<<<< HEAD -### Kubernetes -* Kubernetes has been upgraded to version 1.14.6. -* Kubernetes DNS has been upgraded to 1.14.13 and is now deployed with more - than 1 replica by default. - -### Networking -* Calico has been upgraded to version 3.8.2. For more information see the [Calico Release - Notes](https://docs.projectcalico.org/v3.8/release-notes/). -* Interlock has been upgraded to version 2.6.1. -* The `azure-ip-count` variable is now exposed at install time, allowing a User - to customize the number of IP addresses UCP provisions for each node. - Additional information can be found - [here](/ee/ucp/admin/install/cloudproviders/install-on-azure/#adjust-the-ip-count-value) - -### Security -* Upgraded Golang to 1.12.9. -* Added CSP header to prevent cross-site scripting attacks (XSS) - -### Bootstrap -* Fixed various issues in install, uninstall, backup and restore when UCP - Telemetry data had been disabled. - - ## 3.1.10 2019-09-03 From 49d0ea79d3d8c77c2786766a1a2d2976dbe42eca Mon Sep 17 00:00:00 2001 From: Alastair Smith Date: Tue, 3 Sep 2019 15:19:16 -0500 Subject: [PATCH 044/160] tag and push latest docs to hub on publish --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5ab1a8d441..fa9111589a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,7 +46,9 @@ pipeline { withDockerRegistry(reg) { sh """ docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} . + docker tag docs/docker.github.io:prod-${env.BUILD_NUMBER} docs/docker.github.io:latest docker push docs/docker.github.io:prod-${env.BUILD_NUMBER} + docker push docs/docker.github.io:latest . unzip -o $UCP_BUNDLE cd ucp-bundle-success_bot export DOCKER_TLS_VERIFY=1 From b75dcd63bba030368b177f2926cd7af1a690f372 Mon Sep 17 00:00:00 2001 From: Dawn W <51414965+DawnWood-Docker@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:38:45 -0700 Subject: [PATCH 045/160] Update glossary.yaml --- _data/glossary.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 1b05505b1f..2ab21dae3a 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -222,7 +222,7 @@ parent image: | image. A Dockerfile with no `FROM` directive has no parent image, and is called a **base image**. persistent storage: | - Persistent storage or volume storage provides a way for a user to add a persistent layer to the running container's file system. This persistent layer could live on the container host or an external device. The lifecycle of this persistent layer is not connected to the life cycle of the container, allowing a user to retain state. + Persistent storage or volume storage provides a way for a user to add a persistent layer to the running container's file system. This persistent layer could live on the container host or an external device. The lifecycle of this persistent layer is not connected to the lifecycle of the container, allowing a user to retain state. registry: | A Registry is a hosted service containing [repositories](#repository) of [images](#image) which responds to the Registry API. From fde9479fa1ee560e456c0991b6fa08550a1febfc Mon Sep 17 00:00:00 2001 From: Dawn W <51414965+DawnWood-Docker@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:40:34 -0700 Subject: [PATCH 046/160] Update storage-backend-migration.md --- .../configure/external-storage/storage-backend-migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md index 1aa05db279..aaf0d47d76 100644 --- a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md +++ b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md @@ -56,7 +56,7 @@ Make sure to [perform a backup](/ee/dtr/admin/disaster-recovery/create-a-backup/ * For NFS-specific changes, see [Use NFS](nfs.md). * For S3-specific changes, see [Learn how to configure DTR with Amazon S3](s3.md). -Upgrade to [DTR 2.6.4](#dtr-264-and-above) and follow [best practice for data migration](#best-practice-for-data-migration) to avoid the wiped tags issue when moving from one NFS serverto another. +Upgrade to [DTR 2.6.4](#dtr-264-and-above) and follow [best practice for data migration](#best-practice-for-data-migration) to avoid the wiped tags issue when moving from one NFS server to another. ## Where to go next From 6f769c5eeaa7c76bdc46d1725d8d327e1241cd50 Mon Sep 17 00:00:00 2001 From: Dawn W <51414965+DawnWood-Docker@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:43:46 -0700 Subject: [PATCH 047/160] Update index.md --- ee/ucp/admin/configure/external-auth/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/external-auth/index.md b/ee/ucp/admin/configure/external-auth/index.md index 1b359da723..77bc1ed5f4 100644 --- a/ee/ucp/admin/configure/external-auth/index.md +++ b/ee/ucp/admin/configure/external-auth/index.md @@ -227,7 +227,7 @@ As of UCP 3.1.5, LDAP-specific `GET` and `PUT` API endpoints have been added to - `GET /api/ucp/config/auth/ldap` - Returns information on your current system LDAP configuration. - `PUT /api/ucp/config/auth/ldap` - Lets you update your LDAP configuration. -See [UCP API Documentation](/reference/ucp/3.2/api/) for additonal information. +See [UCP API Documentation](/reference/ucp/3.2/api/) for additional information. ## Where to go next From f9f5f8dacd7b73a8bb48d434560e353c61e8cfb1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 19:14:15 +0200 Subject: [PATCH 048/160] Convert library samples to stubs Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 1 - .../library-samples.md | 0 _scripts/fetch-library-samples.sh | 16 ++++++---------- 3 files changed, 6 insertions(+), 11 deletions(-) rename _samples/boilerplate.txt => _includes/library-samples.md (100%) diff --git a/Dockerfile b/Dockerfile index f91e3545d8..c5d71100b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,7 +70,6 @@ COPY --from=docs/docker.github.io:v18.09 ${TARGET} ${TARGET} # @todo find a way to build HTML in this stage, and still have them included in the navigation tree FROM builderbase AS library-samples COPY ./_scripts/fetch-library-samples.sh ./_scripts/ -COPY ./_samples/boilerplate.txt ./_samples/ RUN bash ./_scripts/fetch-library-samples.sh # Fetch upstream resources (reference documentation) diff --git a/_samples/boilerplate.txt b/_includes/library-samples.md similarity index 100% rename from _samples/boilerplate.txt rename to _includes/library-samples.md diff --git a/_scripts/fetch-library-samples.sh b/_scripts/fetch-library-samples.sh index e8b1d2c6ec..5101df6212 100755 --- a/_scripts/fetch-library-samples.sh +++ b/_scripts/fetch-library-samples.sh @@ -4,6 +4,8 @@ svn co https://github.com/docker-library/docs/trunk ./_samples/library || (echo "Failed library download" && exit 1) # Remove symlinks to maintainer.md because they break jekyll and we don't use em find ./_samples/library -maxdepth 9 -type l -delete +# Remove the top-level README because we don't want to generate a file for that +rm ./_samples/library/README.md # Loop through the README.md files, turn them into rich index.md files FILES=$(find ./_samples/library -type f -name 'README.md') for f in ${FILES} @@ -12,7 +14,6 @@ do justcurdir="${curdir##*/}" if [ -e ${curdir}/README-short.txt ] then - # shortrm=$(<${curdir}/README-short.txt) shortrm=$(cat ${curdir}/README-short.txt) fi echo "Adding front-matter to ${f} ..." @@ -35,15 +36,10 @@ do # gitrepo=$(<${curdir}/github-repo) gitrepo=$(cat ${curdir}/github-repo) echo >> ${curdir}/front-matter.txt - echo GitHub repo: \["${gitrepo}"\]\("${gitrepo}"\)\{: target="_blank"\} >> ${curdir}/front-matter.txt - echo >> ${curdir}/front-matter.txt fi - cat ${curdir}/front-matter.txt ./_samples/boilerplate.txt > ${curdir}/header.txt - echo {% raw %} >> ${curdir}/header.txt - cat ${curdir}/header.txt ${curdir}/README.md > ${curdir}/index.md - echo {% endraw %} >> ${curdir}/index.md - rm -rf ${curdir}/front-matter.txt - rm -rf ${curdir}/header.txt + cat ${curdir}/front-matter.txt > ${curdir}/index.md + echo {% include library-samples.md %} >> ${curdir}/index.md done -rm ./_samples/library/index.md +# Remove everything except for the index.md's we generated +find ./_samples/ ! -name 'index.md' -type f -exec rm -f {} + From d460cc2351225592eb99cb65b720329ff219ba3e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 20:06:34 +0200 Subject: [PATCH 049/160] Library samples: convert to flat directory Instead of creating a sub-directory containing an image.md for each page, put all pages in a single directory. Signed-off-by: Sebastiaan van Stijn --- _scripts/fetch-library-samples.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_scripts/fetch-library-samples.sh b/_scripts/fetch-library-samples.sh index 5101df6212..0d25a880f4 100755 --- a/_scripts/fetch-library-samples.sh +++ b/_scripts/fetch-library-samples.sh @@ -37,9 +37,10 @@ do gitrepo=$(cat ${curdir}/github-repo) echo >> ${curdir}/front-matter.txt fi - cat ${curdir}/front-matter.txt > ${curdir}/index.md - echo {% include library-samples.md %} >> ${curdir}/index.md + cat ${curdir}/front-matter.txt > ${curdir}/../${justcurdir}.md + echo {% include library-samples.md %} >> ${curdir}/../${justcurdir}.md done -# Remove everything except for the index.md's we generated -find ./_samples/ ! -name 'index.md' -type f -exec rm -f {} + +# Remove all files and subdirectory, except for the Markdown files we generated +find ./_samples/library/ ! -name 'library' -type d -exec rm -rf {} + +find ./_samples/library/ ! -name '*.md' -type f -exec rm -f {} + From 5fe0fd326db706587c114f4904953fbfa22f3577 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 23:51:32 +0200 Subject: [PATCH 050/160] Exclude library samples from the sitemap Signed-off-by: Sebastiaan van Stijn --- _scripts/fetch-library-samples.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/_scripts/fetch-library-samples.sh b/_scripts/fetch-library-samples.sh index 0d25a880f4..2d3dab80f7 100755 --- a/_scripts/fetch-library-samples.sh +++ b/_scripts/fetch-library-samples.sh @@ -23,6 +23,7 @@ do echo repo: "${justcurdir}" >> ${curdir}/front-matter.txt echo layout: docs >> ${curdir}/front-matter.txt echo permalink: /samples/library/${justcurdir}/ >> ${curdir}/front-matter.txt + echo hide_from_sitemap: true >> ${curdir}/front-matter.txt echo redirect_from: >> ${curdir}/front-matter.txt echo - /samples/${justcurdir}/ >> ${curdir}/front-matter.txt echo description: \| >> ${curdir}/front-matter.txt From 9d90e6514bb799af1935dbc00bae9527b5735505 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 20:19:33 +0200 Subject: [PATCH 051/160] Dockerfile: add temporary stage to export library-samples Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index c5d71100b6..581aef5545 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,11 @@ FROM builderbase AS library-samples COPY ./_scripts/fetch-library-samples.sh ./_scripts/ RUN bash ./_scripts/fetch-library-samples.sh +# Temporary stage to export the samples using; +# DOCKER_BUILDKIT=1 docker build --target=export-samples -o type=local,dest=./_samples/library/ . +FROM scratch AS export-samples +COPY --from=library-samples /usr/src/app/md_source/_samples/library/. / + # Fetch upstream resources (reference documentation) # Only add the files that are needed to build these reference docs, so that # these docs are only rebuilt if changes were made to the configuration. From 973ab4fb1211d9528d162776ab7e15d9c42242e1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 20:23:50 +0200 Subject: [PATCH 052/160] Add exported library stubs to git Putting them in `_samples/library`, which is where Jekyll expects them to be to be in the "samples" collection. Signed-off-by: Sebastiaan van Stijn --- .gitignore | 1 - _samples/library/adminer.md | 17 +++++++++++++++++ _samples/library/adoptopenjdk.md | 17 +++++++++++++++++ _samples/library/aerospike.md | 17 +++++++++++++++++ _samples/library/alpine.md | 17 +++++++++++++++++ _samples/library/alt.md | 17 +++++++++++++++++ _samples/library/amazoncorretto.md | 17 +++++++++++++++++ _samples/library/amazonlinux.md | 17 +++++++++++++++++ _samples/library/arangodb.md | 17 +++++++++++++++++ _samples/library/backdrop.md | 17 +++++++++++++++++ _samples/library/bash.md | 17 +++++++++++++++++ _samples/library/bonita.md | 17 +++++++++++++++++ _samples/library/buildpack-deps.md | 17 +++++++++++++++++ _samples/library/busybox.md | 17 +++++++++++++++++ _samples/library/cassandra.md | 17 +++++++++++++++++ _samples/library/centos.md | 17 +++++++++++++++++ _samples/library/chronograf.md | 17 +++++++++++++++++ _samples/library/cirros.md | 17 +++++++++++++++++ _samples/library/clearlinux.md | 17 +++++++++++++++++ _samples/library/clefos.md | 17 +++++++++++++++++ _samples/library/clojure.md | 17 +++++++++++++++++ _samples/library/composer.md | 17 +++++++++++++++++ _samples/library/consul.md | 17 +++++++++++++++++ _samples/library/convertigo.md | 17 +++++++++++++++++ _samples/library/couchbase.md | 17 +++++++++++++++++ _samples/library/couchdb.md | 17 +++++++++++++++++ _samples/library/crate.md | 17 +++++++++++++++++ _samples/library/crux.md | 17 +++++++++++++++++ _samples/library/debian.md | 17 +++++++++++++++++ _samples/library/docker.md | 17 +++++++++++++++++ _samples/library/drupal.md | 17 +++++++++++++++++ _samples/library/eclipse-mosquitto.md | 17 +++++++++++++++++ _samples/library/eggdrop.md | 17 +++++++++++++++++ _samples/library/elasticsearch.md | 17 +++++++++++++++++ _samples/library/elixir.md | 17 +++++++++++++++++ _samples/library/erlang.md | 17 +++++++++++++++++ _samples/library/euleros.md | 17 +++++++++++++++++ _samples/library/express-gateway.md | 17 +++++++++++++++++ _samples/library/fedora.md | 17 +++++++++++++++++ _samples/library/flink.md | 17 +++++++++++++++++ _samples/library/fluentd.md | 17 +++++++++++++++++ _samples/library/fsharp.md | 17 +++++++++++++++++ _samples/library/gazebo.md | 17 +++++++++++++++++ _samples/library/gcc.md | 17 +++++++++++++++++ _samples/library/geonetwork.md | 17 +++++++++++++++++ _samples/library/ghost.md | 17 +++++++++++++++++ _samples/library/golang.md | 17 +++++++++++++++++ _samples/library/gradle.md | 17 +++++++++++++++++ _samples/library/groovy.md | 17 +++++++++++++++++ _samples/library/haproxy.md | 17 +++++++++++++++++ _samples/library/haskell.md | 17 +++++++++++++++++ _samples/library/haxe.md | 17 +++++++++++++++++ _samples/library/hello-world.md | 17 +++++++++++++++++ _samples/library/httpd.md | 17 +++++++++++++++++ _samples/library/hylang.md | 17 +++++++++++++++++ _samples/library/ibmjava.md | 17 +++++++++++++++++ _samples/library/influxdb.md | 17 +++++++++++++++++ _samples/library/irssi.md | 17 +++++++++++++++++ _samples/library/jetty.md | 17 +++++++++++++++++ _samples/library/jobber.md | 17 +++++++++++++++++ _samples/library/joomla.md | 17 +++++++++++++++++ _samples/library/jruby.md | 17 +++++++++++++++++ _samples/library/julia.md | 17 +++++++++++++++++ _samples/library/kaazing-gateway.md | 17 +++++++++++++++++ _samples/library/kapacitor.md | 17 +++++++++++++++++ _samples/library/kibana.md | 17 +++++++++++++++++ _samples/library/known.md | 17 +++++++++++++++++ _samples/library/kong.md | 17 +++++++++++++++++ _samples/library/lightstreamer.md | 17 +++++++++++++++++ _samples/library/logstash.md | 17 +++++++++++++++++ _samples/library/mageia.md | 17 +++++++++++++++++ _samples/library/mariadb.md | 17 +++++++++++++++++ _samples/library/matomo.md | 17 +++++++++++++++++ _samples/library/maven.md | 17 +++++++++++++++++ _samples/library/mediawiki.md | 17 +++++++++++++++++ _samples/library/memcached.md | 17 +++++++++++++++++ _samples/library/mongo-express.md | 17 +++++++++++++++++ _samples/library/mongo.md | 17 +++++++++++++++++ _samples/library/mono.md | 17 +++++++++++++++++ _samples/library/mysql.md | 17 +++++++++++++++++ _samples/library/nats-streaming.md | 17 +++++++++++++++++ _samples/library/nats.md | 17 +++++++++++++++++ _samples/library/neo4j.md | 17 +++++++++++++++++ _samples/library/neurodebian.md | 17 +++++++++++++++++ _samples/library/nextcloud.md | 17 +++++++++++++++++ _samples/library/nginx.md | 17 +++++++++++++++++ _samples/library/node.md | 17 +++++++++++++++++ _samples/library/notary.md | 17 +++++++++++++++++ _samples/library/nuxeo.md | 17 +++++++++++++++++ _samples/library/odoo.md | 17 +++++++++++++++++ _samples/library/open-liberty.md | 17 +++++++++++++++++ _samples/library/openjdk.md | 17 +++++++++++++++++ _samples/library/opensuse.md | 17 +++++++++++++++++ _samples/library/oraclelinux.md | 17 +++++++++++++++++ _samples/library/orientdb.md | 17 +++++++++++++++++ _samples/library/percona.md | 17 +++++++++++++++++ _samples/library/perl.md | 17 +++++++++++++++++ _samples/library/photon.md | 17 +++++++++++++++++ _samples/library/php-zendserver.md | 17 +++++++++++++++++ _samples/library/php.md | 17 +++++++++++++++++ _samples/library/plone.md | 17 +++++++++++++++++ _samples/library/postfixadmin.md | 17 +++++++++++++++++ _samples/library/postgres.md | 17 +++++++++++++++++ _samples/library/pypy.md | 17 +++++++++++++++++ _samples/library/python.md | 17 +++++++++++++++++ _samples/library/r-base.md | 17 +++++++++++++++++ _samples/library/rabbitmq.md | 17 +++++++++++++++++ _samples/library/rakudo-star.md | 17 +++++++++++++++++ _samples/library/rapidoid.md | 17 +++++++++++++++++ _samples/library/redis.md | 17 +++++++++++++++++ _samples/library/redmine.md | 17 +++++++++++++++++ _samples/library/registry.md | 17 +++++++++++++++++ _samples/library/rethinkdb.md | 17 +++++++++++++++++ _samples/library/rocket.chat.md | 17 +++++++++++++++++ _samples/library/ros.md | 17 +++++++++++++++++ _samples/library/ruby.md | 17 +++++++++++++++++ _samples/library/rust.md | 17 +++++++++++++++++ _samples/library/sapmachine.md | 17 +++++++++++++++++ _samples/library/scratch.md | 16 ++++++++++++++++ _samples/library/sentry.md | 17 +++++++++++++++++ _samples/library/silverpeas.md | 17 +++++++++++++++++ _samples/library/sl.md | 17 +++++++++++++++++ _samples/library/solr.md | 17 +++++++++++++++++ _samples/library/sonarqube.md | 17 +++++++++++++++++ _samples/library/sourcemage.md | 17 +++++++++++++++++ _samples/library/spiped.md | 17 +++++++++++++++++ _samples/library/storm.md | 17 +++++++++++++++++ _samples/library/swarm.md | 17 +++++++++++++++++ _samples/library/swift.md | 17 +++++++++++++++++ _samples/library/swipl.md | 17 +++++++++++++++++ _samples/library/teamspeak.md | 17 +++++++++++++++++ _samples/library/telegraf.md | 17 +++++++++++++++++ _samples/library/thrift.md | 17 +++++++++++++++++ _samples/library/tomcat.md | 17 +++++++++++++++++ _samples/library/tomee.md | 17 +++++++++++++++++ _samples/library/traefik.md | 17 +++++++++++++++++ _samples/library/ubuntu.md | 17 +++++++++++++++++ _samples/library/varnish.md | 17 +++++++++++++++++ _samples/library/vault.md | 17 +++++++++++++++++ _samples/library/websphere-liberty.md | 17 +++++++++++++++++ _samples/library/wordpress.md | 17 +++++++++++++++++ _samples/library/xwiki.md | 17 +++++++++++++++++ _samples/library/yourls.md | 17 +++++++++++++++++ _samples/library/znc.md | 17 +++++++++++++++++ _samples/library/zookeeper.md | 17 +++++++++++++++++ 145 files changed, 2447 insertions(+), 1 deletion(-) create mode 100644 _samples/library/adminer.md create mode 100644 _samples/library/adoptopenjdk.md create mode 100644 _samples/library/aerospike.md create mode 100644 _samples/library/alpine.md create mode 100644 _samples/library/alt.md create mode 100644 _samples/library/amazoncorretto.md create mode 100644 _samples/library/amazonlinux.md create mode 100644 _samples/library/arangodb.md create mode 100644 _samples/library/backdrop.md create mode 100644 _samples/library/bash.md create mode 100644 _samples/library/bonita.md create mode 100644 _samples/library/buildpack-deps.md create mode 100644 _samples/library/busybox.md create mode 100644 _samples/library/cassandra.md create mode 100644 _samples/library/centos.md create mode 100644 _samples/library/chronograf.md create mode 100644 _samples/library/cirros.md create mode 100644 _samples/library/clearlinux.md create mode 100644 _samples/library/clefos.md create mode 100644 _samples/library/clojure.md create mode 100644 _samples/library/composer.md create mode 100644 _samples/library/consul.md create mode 100644 _samples/library/convertigo.md create mode 100644 _samples/library/couchbase.md create mode 100644 _samples/library/couchdb.md create mode 100644 _samples/library/crate.md create mode 100644 _samples/library/crux.md create mode 100644 _samples/library/debian.md create mode 100644 _samples/library/docker.md create mode 100644 _samples/library/drupal.md create mode 100644 _samples/library/eclipse-mosquitto.md create mode 100644 _samples/library/eggdrop.md create mode 100644 _samples/library/elasticsearch.md create mode 100644 _samples/library/elixir.md create mode 100644 _samples/library/erlang.md create mode 100644 _samples/library/euleros.md create mode 100644 _samples/library/express-gateway.md create mode 100644 _samples/library/fedora.md create mode 100644 _samples/library/flink.md create mode 100644 _samples/library/fluentd.md create mode 100644 _samples/library/fsharp.md create mode 100644 _samples/library/gazebo.md create mode 100644 _samples/library/gcc.md create mode 100644 _samples/library/geonetwork.md create mode 100644 _samples/library/ghost.md create mode 100644 _samples/library/golang.md create mode 100644 _samples/library/gradle.md create mode 100644 _samples/library/groovy.md create mode 100644 _samples/library/haproxy.md create mode 100644 _samples/library/haskell.md create mode 100644 _samples/library/haxe.md create mode 100644 _samples/library/hello-world.md create mode 100644 _samples/library/httpd.md create mode 100644 _samples/library/hylang.md create mode 100644 _samples/library/ibmjava.md create mode 100644 _samples/library/influxdb.md create mode 100644 _samples/library/irssi.md create mode 100644 _samples/library/jetty.md create mode 100644 _samples/library/jobber.md create mode 100644 _samples/library/joomla.md create mode 100644 _samples/library/jruby.md create mode 100644 _samples/library/julia.md create mode 100644 _samples/library/kaazing-gateway.md create mode 100644 _samples/library/kapacitor.md create mode 100644 _samples/library/kibana.md create mode 100644 _samples/library/known.md create mode 100644 _samples/library/kong.md create mode 100644 _samples/library/lightstreamer.md create mode 100644 _samples/library/logstash.md create mode 100644 _samples/library/mageia.md create mode 100644 _samples/library/mariadb.md create mode 100644 _samples/library/matomo.md create mode 100644 _samples/library/maven.md create mode 100644 _samples/library/mediawiki.md create mode 100644 _samples/library/memcached.md create mode 100644 _samples/library/mongo-express.md create mode 100644 _samples/library/mongo.md create mode 100644 _samples/library/mono.md create mode 100644 _samples/library/mysql.md create mode 100644 _samples/library/nats-streaming.md create mode 100644 _samples/library/nats.md create mode 100644 _samples/library/neo4j.md create mode 100644 _samples/library/neurodebian.md create mode 100644 _samples/library/nextcloud.md create mode 100644 _samples/library/nginx.md create mode 100644 _samples/library/node.md create mode 100644 _samples/library/notary.md create mode 100644 _samples/library/nuxeo.md create mode 100644 _samples/library/odoo.md create mode 100644 _samples/library/open-liberty.md create mode 100644 _samples/library/openjdk.md create mode 100644 _samples/library/opensuse.md create mode 100644 _samples/library/oraclelinux.md create mode 100644 _samples/library/orientdb.md create mode 100644 _samples/library/percona.md create mode 100644 _samples/library/perl.md create mode 100644 _samples/library/photon.md create mode 100644 _samples/library/php-zendserver.md create mode 100644 _samples/library/php.md create mode 100644 _samples/library/plone.md create mode 100644 _samples/library/postfixadmin.md create mode 100644 _samples/library/postgres.md create mode 100644 _samples/library/pypy.md create mode 100644 _samples/library/python.md create mode 100644 _samples/library/r-base.md create mode 100644 _samples/library/rabbitmq.md create mode 100644 _samples/library/rakudo-star.md create mode 100644 _samples/library/rapidoid.md create mode 100644 _samples/library/redis.md create mode 100644 _samples/library/redmine.md create mode 100644 _samples/library/registry.md create mode 100644 _samples/library/rethinkdb.md create mode 100644 _samples/library/rocket.chat.md create mode 100644 _samples/library/ros.md create mode 100644 _samples/library/ruby.md create mode 100644 _samples/library/rust.md create mode 100644 _samples/library/sapmachine.md create mode 100644 _samples/library/scratch.md create mode 100644 _samples/library/sentry.md create mode 100644 _samples/library/silverpeas.md create mode 100644 _samples/library/sl.md create mode 100644 _samples/library/solr.md create mode 100644 _samples/library/sonarqube.md create mode 100644 _samples/library/sourcemage.md create mode 100644 _samples/library/spiped.md create mode 100644 _samples/library/storm.md create mode 100644 _samples/library/swarm.md create mode 100644 _samples/library/swift.md create mode 100644 _samples/library/swipl.md create mode 100644 _samples/library/teamspeak.md create mode 100644 _samples/library/telegraf.md create mode 100644 _samples/library/thrift.md create mode 100644 _samples/library/tomcat.md create mode 100644 _samples/library/tomee.md create mode 100644 _samples/library/traefik.md create mode 100644 _samples/library/ubuntu.md create mode 100644 _samples/library/varnish.md create mode 100644 _samples/library/vault.md create mode 100644 _samples/library/websphere-liberty.md create mode 100644 _samples/library/wordpress.md create mode 100644 _samples/library/xwiki.md create mode 100644 _samples/library/yourls.md create mode 100644 _samples/library/znc.md create mode 100644 _samples/library/zookeeper.md diff --git a/.gitignore b/.gitignore index 366c6d8a5a..010dcf6657 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ _site/** .sass-cache/** CNAME Gemfile.lock -_samples/library/** _kbase/** diff --git a/_samples/library/adminer.md b/_samples/library/adminer.md new file mode 100644 index 0000000000..455b960e85 --- /dev/null +++ b/_samples/library/adminer.md @@ -0,0 +1,17 @@ +--- +title: adminer +keywords: library, sample, adminer +repo: adminer +layout: docs +permalink: /samples/library/adminer/ +hide_from_sitemap: true +redirect_from: +- /samples/adminer/ +description: | + Database management in a single PHP file. +--- + +Database management in a single PHP file. + + +{% include library-samples.md %} diff --git a/_samples/library/adoptopenjdk.md b/_samples/library/adoptopenjdk.md new file mode 100644 index 0000000000..202df22bdd --- /dev/null +++ b/_samples/library/adoptopenjdk.md @@ -0,0 +1,17 @@ +--- +title: adoptopenjdk +keywords: library, sample, adoptopenjdk +repo: adoptopenjdk +layout: docs +permalink: /samples/library/adoptopenjdk/ +hide_from_sitemap: true +redirect_from: +- /samples/adoptopenjdk/ +description: | + Official Images for OpenJDK + HotSpot and OpenJDK + Eclipse OpenJ9 binaries built by AdoptOpenJDK. +--- + +Official Images for OpenJDK + HotSpot and OpenJDK + Eclipse OpenJ9 binaries built by AdoptOpenJDK. + + +{% include library-samples.md %} diff --git a/_samples/library/aerospike.md b/_samples/library/aerospike.md new file mode 100644 index 0000000000..ee7116d646 --- /dev/null +++ b/_samples/library/aerospike.md @@ -0,0 +1,17 @@ +--- +title: aerospike +keywords: library, sample, aerospike +repo: aerospike +layout: docs +permalink: /samples/library/aerospike/ +hide_from_sitemap: true +redirect_from: +- /samples/aerospike/ +description: | + Aerospike – the reliable, high performance, distributed database optimized for flash and RAM. +--- + +Aerospike – the reliable, high performance, distributed database optimized for flash and RAM. + + +{% include library-samples.md %} diff --git a/_samples/library/alpine.md b/_samples/library/alpine.md new file mode 100644 index 0000000000..67b74254ff --- /dev/null +++ b/_samples/library/alpine.md @@ -0,0 +1,17 @@ +--- +title: alpine +keywords: library, sample, alpine +repo: alpine +layout: docs +permalink: /samples/library/alpine/ +hide_from_sitemap: true +redirect_from: +- /samples/alpine/ +description: | + A minimal Docker image based on Alpine Linux with a complete package index and only 5 MB in size! +--- + +A minimal Docker image based on Alpine Linux with a complete package index and only 5 MB in size! + + +{% include library-samples.md %} diff --git a/_samples/library/alt.md b/_samples/library/alt.md new file mode 100644 index 0000000000..9f65a55d28 --- /dev/null +++ b/_samples/library/alt.md @@ -0,0 +1,17 @@ +--- +title: alt +keywords: library, sample, alt +repo: alt +layout: docs +permalink: /samples/library/alt/ +hide_from_sitemap: true +redirect_from: +- /samples/alt/ +description: | + The official build of ALT Linux. +--- + +The official build of ALT Linux. + + +{% include library-samples.md %} diff --git a/_samples/library/amazoncorretto.md b/_samples/library/amazoncorretto.md new file mode 100644 index 0000000000..0ab0da3f58 --- /dev/null +++ b/_samples/library/amazoncorretto.md @@ -0,0 +1,17 @@ +--- +title: amazoncorretto +keywords: library, sample, amazoncorretto +repo: amazoncorretto +layout: docs +permalink: /samples/library/amazoncorretto/ +hide_from_sitemap: true +redirect_from: +- /samples/amazoncorretto/ +description: | + Corretto is a no-cost, production-ready distribution of the Open Java Development Kit (OpenJDK). +--- + +Corretto is a no-cost, production-ready distribution of the Open Java Development Kit (OpenJDK). + + +{% include library-samples.md %} diff --git a/_samples/library/amazonlinux.md b/_samples/library/amazonlinux.md new file mode 100644 index 0000000000..6f6e183e0c --- /dev/null +++ b/_samples/library/amazonlinux.md @@ -0,0 +1,17 @@ +--- +title: amazonlinux +keywords: library, sample, amazonlinux +repo: amazonlinux +layout: docs +permalink: /samples/library/amazonlinux/ +hide_from_sitemap: true +redirect_from: +- /samples/amazonlinux/ +description: | + Amazon Linux provides a stable, secure, and high-performance execution environment for applications. +--- + +Amazon Linux provides a stable, secure, and high-performance execution environment for applications. + + +{% include library-samples.md %} diff --git a/_samples/library/arangodb.md b/_samples/library/arangodb.md new file mode 100644 index 0000000000..96fb9f035a --- /dev/null +++ b/_samples/library/arangodb.md @@ -0,0 +1,17 @@ +--- +title: arangodb +keywords: library, sample, arangodb +repo: arangodb +layout: docs +permalink: /samples/library/arangodb/ +hide_from_sitemap: true +redirect_from: +- /samples/arangodb/ +description: | + ArangoDB - a distributed database with a flexible data model for documents, graphs, and key-values. +--- + +ArangoDB - a distributed database with a flexible data model for documents, graphs, and key-values. + + +{% include library-samples.md %} diff --git a/_samples/library/backdrop.md b/_samples/library/backdrop.md new file mode 100644 index 0000000000..6b300d4d17 --- /dev/null +++ b/_samples/library/backdrop.md @@ -0,0 +1,17 @@ +--- +title: backdrop +keywords: library, sample, backdrop +repo: backdrop +layout: docs +permalink: /samples/library/backdrop/ +hide_from_sitemap: true +redirect_from: +- /samples/backdrop/ +description: | + The comprehensive CMS for small to medium sized businesses and non-profits. +--- + +The comprehensive CMS for small to medium sized businesses and non-profits. + + +{% include library-samples.md %} diff --git a/_samples/library/bash.md b/_samples/library/bash.md new file mode 100644 index 0000000000..198ba21417 --- /dev/null +++ b/_samples/library/bash.md @@ -0,0 +1,17 @@ +--- +title: bash +keywords: library, sample, bash +repo: bash +layout: docs +permalink: /samples/library/bash/ +hide_from_sitemap: true +redirect_from: +- /samples/bash/ +description: | + Bash is the GNU Project's Bourne Again SHell +--- + +Bash is the GNU Project's Bourne Again SHell + + +{% include library-samples.md %} diff --git a/_samples/library/bonita.md b/_samples/library/bonita.md new file mode 100644 index 0000000000..5b017efbb0 --- /dev/null +++ b/_samples/library/bonita.md @@ -0,0 +1,17 @@ +--- +title: bonita +keywords: library, sample, bonita +repo: bonita +layout: docs +permalink: /samples/library/bonita/ +hide_from_sitemap: true +redirect_from: +- /samples/bonita/ +description: | + Bonita is an open-source business process management and workflow suite +--- + +Bonita is an open-source business process management and workflow suite + + +{% include library-samples.md %} diff --git a/_samples/library/buildpack-deps.md b/_samples/library/buildpack-deps.md new file mode 100644 index 0000000000..b71e3c4524 --- /dev/null +++ b/_samples/library/buildpack-deps.md @@ -0,0 +1,17 @@ +--- +title: buildpack-deps +keywords: library, sample, buildpack-deps +repo: buildpack-deps +layout: docs +permalink: /samples/library/buildpack-deps/ +hide_from_sitemap: true +redirect_from: +- /samples/buildpack-deps/ +description: | + A collection of common build dependencies used for installing various modules, e.g., gems. +--- + +A collection of common build dependencies used for installing various modules, e.g., gems. + + +{% include library-samples.md %} diff --git a/_samples/library/busybox.md b/_samples/library/busybox.md new file mode 100644 index 0000000000..4e5e470986 --- /dev/null +++ b/_samples/library/busybox.md @@ -0,0 +1,17 @@ +--- +title: busybox +keywords: library, sample, busybox +repo: busybox +layout: docs +permalink: /samples/library/busybox/ +hide_from_sitemap: true +redirect_from: +- /samples/busybox/ +description: | + Busybox base image. +--- + +Busybox base image. + + +{% include library-samples.md %} diff --git a/_samples/library/cassandra.md b/_samples/library/cassandra.md new file mode 100644 index 0000000000..2c3dcdb139 --- /dev/null +++ b/_samples/library/cassandra.md @@ -0,0 +1,17 @@ +--- +title: cassandra +keywords: library, sample, cassandra +repo: cassandra +layout: docs +permalink: /samples/library/cassandra/ +hide_from_sitemap: true +redirect_from: +- /samples/cassandra/ +description: | + Apache Cassandra is an open-source distributed storage system. +--- + +Apache Cassandra is an open-source distributed storage system. + + +{% include library-samples.md %} diff --git a/_samples/library/centos.md b/_samples/library/centos.md new file mode 100644 index 0000000000..2b9da892bf --- /dev/null +++ b/_samples/library/centos.md @@ -0,0 +1,17 @@ +--- +title: centos +keywords: library, sample, centos +repo: centos +layout: docs +permalink: /samples/library/centos/ +hide_from_sitemap: true +redirect_from: +- /samples/centos/ +description: | + The official build of CentOS. +--- + +The official build of CentOS. + + +{% include library-samples.md %} diff --git a/_samples/library/chronograf.md b/_samples/library/chronograf.md new file mode 100644 index 0000000000..0da113f4e1 --- /dev/null +++ b/_samples/library/chronograf.md @@ -0,0 +1,17 @@ +--- +title: chronograf +keywords: library, sample, chronograf +repo: chronograf +layout: docs +permalink: /samples/library/chronograf/ +hide_from_sitemap: true +redirect_from: +- /samples/chronograf/ +description: | + Chronograf is a visualization tool for time series data in InfluxDB. +--- + +Chronograf is a visualization tool for time series data in InfluxDB. + + +{% include library-samples.md %} diff --git a/_samples/library/cirros.md b/_samples/library/cirros.md new file mode 100644 index 0000000000..6db78ab6aa --- /dev/null +++ b/_samples/library/cirros.md @@ -0,0 +1,17 @@ +--- +title: cirros +keywords: library, sample, cirros +repo: cirros +layout: docs +permalink: /samples/library/cirros/ +hide_from_sitemap: true +redirect_from: +- /samples/cirros/ +description: | + CirrOS is a Tiny OS that specializes in running on a cloud. +--- + +CirrOS is a Tiny OS that specializes in running on a cloud. + + +{% include library-samples.md %} diff --git a/_samples/library/clearlinux.md b/_samples/library/clearlinux.md new file mode 100644 index 0000000000..f05ba78804 --- /dev/null +++ b/_samples/library/clearlinux.md @@ -0,0 +1,17 @@ +--- +title: clearlinux +keywords: library, sample, clearlinux +repo: clearlinux +layout: docs +permalink: /samples/library/clearlinux/ +hide_from_sitemap: true +redirect_from: +- /samples/clearlinux/ +description: | + Official docker build of Clear Linux OS for Intel Architecture +--- + +Official docker build of Clear Linux OS for Intel Architecture + + +{% include library-samples.md %} diff --git a/_samples/library/clefos.md b/_samples/library/clefos.md new file mode 100644 index 0000000000..308c8e2b97 --- /dev/null +++ b/_samples/library/clefos.md @@ -0,0 +1,17 @@ +--- +title: clefos +keywords: library, sample, clefos +repo: clefos +layout: docs +permalink: /samples/library/clefos/ +hide_from_sitemap: true +redirect_from: +- /samples/clefos/ +description: | + The official build of ClefOS. +--- + +The official build of ClefOS. + + +{% include library-samples.md %} diff --git a/_samples/library/clojure.md b/_samples/library/clojure.md new file mode 100644 index 0000000000..90211880c3 --- /dev/null +++ b/_samples/library/clojure.md @@ -0,0 +1,17 @@ +--- +title: clojure +keywords: library, sample, clojure +repo: clojure +layout: docs +permalink: /samples/library/clojure/ +hide_from_sitemap: true +redirect_from: +- /samples/clojure/ +description: | + Clojure is a dialect of Lisp that runs on the JVM. +--- + +Clojure is a dialect of Lisp that runs on the JVM. + + +{% include library-samples.md %} diff --git a/_samples/library/composer.md b/_samples/library/composer.md new file mode 100644 index 0000000000..2044bf062f --- /dev/null +++ b/_samples/library/composer.md @@ -0,0 +1,17 @@ +--- +title: composer +keywords: library, sample, composer +repo: composer +layout: docs +permalink: /samples/library/composer/ +hide_from_sitemap: true +redirect_from: +- /samples/composer/ +description: | + Composer is a dependency manager written in and for PHP. +--- + +Composer is a dependency manager written in and for PHP. + + +{% include library-samples.md %} diff --git a/_samples/library/consul.md b/_samples/library/consul.md new file mode 100644 index 0000000000..e5c62fc8ca --- /dev/null +++ b/_samples/library/consul.md @@ -0,0 +1,17 @@ +--- +title: consul +keywords: library, sample, consul +repo: consul +layout: docs +permalink: /samples/library/consul/ +hide_from_sitemap: true +redirect_from: +- /samples/consul/ +description: | + Consul is a datacenter runtime that provides service discovery, configuration, and orchestration. +--- + +Consul is a datacenter runtime that provides service discovery, configuration, and orchestration. + + +{% include library-samples.md %} diff --git a/_samples/library/convertigo.md b/_samples/library/convertigo.md new file mode 100644 index 0000000000..c596267ada --- /dev/null +++ b/_samples/library/convertigo.md @@ -0,0 +1,17 @@ +--- +title: convertigo +keywords: library, sample, convertigo +repo: convertigo +layout: docs +permalink: /samples/library/convertigo/ +hide_from_sitemap: true +redirect_from: +- /samples/convertigo/ +description: | + Convertigo is an open source MBaaS/MADP platform for mobile application development and back-end. +--- + +Convertigo is an open source MBaaS/MADP platform for mobile application development and back-end. + + +{% include library-samples.md %} diff --git a/_samples/library/couchbase.md b/_samples/library/couchbase.md new file mode 100644 index 0000000000..9d11b59ca4 --- /dev/null +++ b/_samples/library/couchbase.md @@ -0,0 +1,17 @@ +--- +title: couchbase +keywords: library, sample, couchbase +repo: couchbase +layout: docs +permalink: /samples/library/couchbase/ +hide_from_sitemap: true +redirect_from: +- /samples/couchbase/ +description: | + Couchbase Server is a NoSQL document database with a distributed architecture. +--- + +Couchbase Server is a NoSQL document database with a distributed architecture. + + +{% include library-samples.md %} diff --git a/_samples/library/couchdb.md b/_samples/library/couchdb.md new file mode 100644 index 0000000000..92a5588c4e --- /dev/null +++ b/_samples/library/couchdb.md @@ -0,0 +1,17 @@ +--- +title: couchdb +keywords: library, sample, couchdb +repo: couchdb +layout: docs +permalink: /samples/library/couchdb/ +hide_from_sitemap: true +redirect_from: +- /samples/couchdb/ +description: | + CouchDB is a database that uses JSON for documents, an HTTP API, & JavaScript/declarative indexing. +--- + +CouchDB is a database that uses JSON for documents, an HTTP API, & JavaScript/declarative indexing. + + +{% include library-samples.md %} diff --git a/_samples/library/crate.md b/_samples/library/crate.md new file mode 100644 index 0000000000..5309663a00 --- /dev/null +++ b/_samples/library/crate.md @@ -0,0 +1,17 @@ +--- +title: crate +keywords: library, sample, crate +repo: crate +layout: docs +permalink: /samples/library/crate/ +hide_from_sitemap: true +redirect_from: +- /samples/crate/ +description: | + CrateDB is a distributed SQL database handles massive amounts of machine data in real-time. +--- + +CrateDB is a distributed SQL database handles massive amounts of machine data in real-time. + + +{% include library-samples.md %} diff --git a/_samples/library/crux.md b/_samples/library/crux.md new file mode 100644 index 0000000000..80ff8ec52a --- /dev/null +++ b/_samples/library/crux.md @@ -0,0 +1,17 @@ +--- +title: crux +keywords: library, sample, crux +repo: crux +layout: docs +permalink: /samples/library/crux/ +hide_from_sitemap: true +redirect_from: +- /samples/crux/ +description: | + CRUX is a lightweight Linux distribution targeted at experienced Linux users +--- + +CRUX is a lightweight Linux distribution targeted at experienced Linux users + + +{% include library-samples.md %} diff --git a/_samples/library/debian.md b/_samples/library/debian.md new file mode 100644 index 0000000000..9c6233e7bb --- /dev/null +++ b/_samples/library/debian.md @@ -0,0 +1,17 @@ +--- +title: debian +keywords: library, sample, debian +repo: debian +layout: docs +permalink: /samples/library/debian/ +hide_from_sitemap: true +redirect_from: +- /samples/debian/ +description: | + Debian is a Linux distribution that's composed entirely of free and open-source software. +--- + +Debian is a Linux distribution that's composed entirely of free and open-source software. + + +{% include library-samples.md %} diff --git a/_samples/library/docker.md b/_samples/library/docker.md new file mode 100644 index 0000000000..8cba9f19dc --- /dev/null +++ b/_samples/library/docker.md @@ -0,0 +1,17 @@ +--- +title: docker +keywords: library, sample, docker +repo: docker +layout: docs +permalink: /samples/library/docker/ +hide_from_sitemap: true +redirect_from: +- /samples/docker/ +description: | + Docker in Docker! +--- + +Docker in Docker! + + +{% include library-samples.md %} diff --git a/_samples/library/drupal.md b/_samples/library/drupal.md new file mode 100644 index 0000000000..becf5db5dc --- /dev/null +++ b/_samples/library/drupal.md @@ -0,0 +1,17 @@ +--- +title: drupal +keywords: library, sample, drupal +repo: drupal +layout: docs +permalink: /samples/library/drupal/ +hide_from_sitemap: true +redirect_from: +- /samples/drupal/ +description: | + Drupal is an open source content management platform powering millions of websites and applications. +--- + +Drupal is an open source content management platform powering millions of websites and applications. + + +{% include library-samples.md %} diff --git a/_samples/library/eclipse-mosquitto.md b/_samples/library/eclipse-mosquitto.md new file mode 100644 index 0000000000..6ce7d1caec --- /dev/null +++ b/_samples/library/eclipse-mosquitto.md @@ -0,0 +1,17 @@ +--- +title: eclipse-mosquitto +keywords: library, sample, eclipse-mosquitto +repo: eclipse-mosquitto +layout: docs +permalink: /samples/library/eclipse-mosquitto/ +hide_from_sitemap: true +redirect_from: +- /samples/eclipse-mosquitto/ +description: | + Eclipse Mosquitto is an open source message broker which implements MQTT version 5, 3.1.1 and 3.1 +--- + +Eclipse Mosquitto is an open source message broker which implements MQTT version 5, 3.1.1 and 3.1 + + +{% include library-samples.md %} diff --git a/_samples/library/eggdrop.md b/_samples/library/eggdrop.md new file mode 100644 index 0000000000..2f44f6ed71 --- /dev/null +++ b/_samples/library/eggdrop.md @@ -0,0 +1,17 @@ +--- +title: eggdrop +keywords: library, sample, eggdrop +repo: eggdrop +layout: docs +permalink: /samples/library/eggdrop/ +hide_from_sitemap: true +redirect_from: +- /samples/eggdrop/ +description: | + The official Docker image of Eggdrop- IRC's oldest actively-developed bot! +--- + +The official Docker image of Eggdrop- IRC's oldest actively-developed bot! + + +{% include library-samples.md %} diff --git a/_samples/library/elasticsearch.md b/_samples/library/elasticsearch.md new file mode 100644 index 0000000000..55e6a23c9d --- /dev/null +++ b/_samples/library/elasticsearch.md @@ -0,0 +1,17 @@ +--- +title: elasticsearch +keywords: library, sample, elasticsearch +repo: elasticsearch +layout: docs +permalink: /samples/library/elasticsearch/ +hide_from_sitemap: true +redirect_from: +- /samples/elasticsearch/ +description: | + Elasticsearch is a powerful open source search and analytics engine that makes data easy to explore. +--- + +Elasticsearch is a powerful open source search and analytics engine that makes data easy to explore. + + +{% include library-samples.md %} diff --git a/_samples/library/elixir.md b/_samples/library/elixir.md new file mode 100644 index 0000000000..98b6359f58 --- /dev/null +++ b/_samples/library/elixir.md @@ -0,0 +1,17 @@ +--- +title: elixir +keywords: library, sample, elixir +repo: elixir +layout: docs +permalink: /samples/library/elixir/ +hide_from_sitemap: true +redirect_from: +- /samples/elixir/ +description: | + Elixir is a dynamic, functional language for building scalable and maintainable applications. +--- + +Elixir is a dynamic, functional language for building scalable and maintainable applications. + + +{% include library-samples.md %} diff --git a/_samples/library/erlang.md b/_samples/library/erlang.md new file mode 100644 index 0000000000..44ae46541d --- /dev/null +++ b/_samples/library/erlang.md @@ -0,0 +1,17 @@ +--- +title: erlang +keywords: library, sample, erlang +repo: erlang +layout: docs +permalink: /samples/library/erlang/ +hide_from_sitemap: true +redirect_from: +- /samples/erlang/ +description: | + Erlang is a programming language used to build massively scalable systems with high availability. +--- + +Erlang is a programming language used to build massively scalable systems with high availability. + + +{% include library-samples.md %} diff --git a/_samples/library/euleros.md b/_samples/library/euleros.md new file mode 100644 index 0000000000..d7f559b59c --- /dev/null +++ b/_samples/library/euleros.md @@ -0,0 +1,17 @@ +--- +title: euleros +keywords: library, sample, euleros +repo: euleros +layout: docs +permalink: /samples/library/euleros/ +hide_from_sitemap: true +redirect_from: +- /samples/euleros/ +description: | + The official release of EulerOS. +--- + +The official release of EulerOS. + + +{% include library-samples.md %} diff --git a/_samples/library/express-gateway.md b/_samples/library/express-gateway.md new file mode 100644 index 0000000000..a4fabb4128 --- /dev/null +++ b/_samples/library/express-gateway.md @@ -0,0 +1,17 @@ +--- +title: express-gateway +keywords: library, sample, express-gateway +repo: express-gateway +layout: docs +permalink: /samples/library/express-gateway/ +hide_from_sitemap: true +redirect_from: +- /samples/express-gateway/ +description: | + The Official Docker Image of Express Gateway, an API Gateway for APIs and Microservices +--- + +The Official Docker Image of Express Gateway, an API Gateway for APIs and Microservices + + +{% include library-samples.md %} diff --git a/_samples/library/fedora.md b/_samples/library/fedora.md new file mode 100644 index 0000000000..e102151cb9 --- /dev/null +++ b/_samples/library/fedora.md @@ -0,0 +1,17 @@ +--- +title: fedora +keywords: library, sample, fedora +repo: fedora +layout: docs +permalink: /samples/library/fedora/ +hide_from_sitemap: true +redirect_from: +- /samples/fedora/ +description: | + Official Docker builds of Fedora +--- + +Official Docker builds of Fedora + + +{% include library-samples.md %} diff --git a/_samples/library/flink.md b/_samples/library/flink.md new file mode 100644 index 0000000000..a18920ffe5 --- /dev/null +++ b/_samples/library/flink.md @@ -0,0 +1,17 @@ +--- +title: flink +keywords: library, sample, flink +repo: flink +layout: docs +permalink: /samples/library/flink/ +hide_from_sitemap: true +redirect_from: +- /samples/flink/ +description: | + Apache Flink® is a powerful open-source distributed stream and batch processing framework. +--- + +Apache Flink® is a powerful open-source distributed stream and batch processing framework. + + +{% include library-samples.md %} diff --git a/_samples/library/fluentd.md b/_samples/library/fluentd.md new file mode 100644 index 0000000000..5bd8336b5c --- /dev/null +++ b/_samples/library/fluentd.md @@ -0,0 +1,17 @@ +--- +title: fluentd +keywords: library, sample, fluentd +repo: fluentd +layout: docs +permalink: /samples/library/fluentd/ +hide_from_sitemap: true +redirect_from: +- /samples/fluentd/ +description: | + Fluentd is an open source data collector for unified logging layer +--- + +Fluentd is an open source data collector for unified logging layer + + +{% include library-samples.md %} diff --git a/_samples/library/fsharp.md b/_samples/library/fsharp.md new file mode 100644 index 0000000000..c3cc125217 --- /dev/null +++ b/_samples/library/fsharp.md @@ -0,0 +1,17 @@ +--- +title: fsharp +keywords: library, sample, fsharp +repo: fsharp +layout: docs +permalink: /samples/library/fsharp/ +hide_from_sitemap: true +redirect_from: +- /samples/fsharp/ +description: | + F# is a multi-paradigm language encompassing functional, imperative, and object-oriented styles +--- + +F# is a multi-paradigm language encompassing functional, imperative, and object-oriented styles + + +{% include library-samples.md %} diff --git a/_samples/library/gazebo.md b/_samples/library/gazebo.md new file mode 100644 index 0000000000..c51e19f0f1 --- /dev/null +++ b/_samples/library/gazebo.md @@ -0,0 +1,17 @@ +--- +title: gazebo +keywords: library, sample, gazebo +repo: gazebo +layout: docs +permalink: /samples/library/gazebo/ +hide_from_sitemap: true +redirect_from: +- /samples/gazebo/ +description: | + Gazebo is an open source project for simulating robots, offering robust physics and rendering. +--- + +Gazebo is an open source project for simulating robots, offering robust physics and rendering. + + +{% include library-samples.md %} diff --git a/_samples/library/gcc.md b/_samples/library/gcc.md new file mode 100644 index 0000000000..8b611bae29 --- /dev/null +++ b/_samples/library/gcc.md @@ -0,0 +1,17 @@ +--- +title: gcc +keywords: library, sample, gcc +repo: gcc +layout: docs +permalink: /samples/library/gcc/ +hide_from_sitemap: true +redirect_from: +- /samples/gcc/ +description: | + The GNU Compiler Collection is a compiling system that supports several languages. +--- + +The GNU Compiler Collection is a compiling system that supports several languages. + + +{% include library-samples.md %} diff --git a/_samples/library/geonetwork.md b/_samples/library/geonetwork.md new file mode 100644 index 0000000000..c430e18348 --- /dev/null +++ b/_samples/library/geonetwork.md @@ -0,0 +1,17 @@ +--- +title: geonetwork +keywords: library, sample, geonetwork +repo: geonetwork +layout: docs +permalink: /samples/library/geonetwork/ +hide_from_sitemap: true +redirect_from: +- /samples/geonetwork/ +description: | + GeoNetwork is a FOSS catalog for spatially referenced resources. +--- + +GeoNetwork is a FOSS catalog for spatially referenced resources. + + +{% include library-samples.md %} diff --git a/_samples/library/ghost.md b/_samples/library/ghost.md new file mode 100644 index 0000000000..81f6b1f32b --- /dev/null +++ b/_samples/library/ghost.md @@ -0,0 +1,17 @@ +--- +title: ghost +keywords: library, sample, ghost +repo: ghost +layout: docs +permalink: /samples/library/ghost/ +hide_from_sitemap: true +redirect_from: +- /samples/ghost/ +description: | + Ghost is a free and open source blogging platform written in JavaScript +--- + +Ghost is a free and open source blogging platform written in JavaScript + + +{% include library-samples.md %} diff --git a/_samples/library/golang.md b/_samples/library/golang.md new file mode 100644 index 0000000000..678abd669e --- /dev/null +++ b/_samples/library/golang.md @@ -0,0 +1,17 @@ +--- +title: golang +keywords: library, sample, golang +repo: golang +layout: docs +permalink: /samples/library/golang/ +hide_from_sitemap: true +redirect_from: +- /samples/golang/ +description: | + Go (golang) is a general purpose, higher-level, imperative programming language. +--- + +Go (golang) is a general purpose, higher-level, imperative programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/gradle.md b/_samples/library/gradle.md new file mode 100644 index 0000000000..790c8948fe --- /dev/null +++ b/_samples/library/gradle.md @@ -0,0 +1,17 @@ +--- +title: gradle +keywords: library, sample, gradle +repo: gradle +layout: docs +permalink: /samples/library/gradle/ +hide_from_sitemap: true +redirect_from: +- /samples/gradle/ +description: | + Gradle is a build tool with a focus on build automation and support for multi-language development. +--- + +Gradle is a build tool with a focus on build automation and support for multi-language development. + + +{% include library-samples.md %} diff --git a/_samples/library/groovy.md b/_samples/library/groovy.md new file mode 100644 index 0000000000..4f017844a6 --- /dev/null +++ b/_samples/library/groovy.md @@ -0,0 +1,17 @@ +--- +title: groovy +keywords: library, sample, groovy +repo: groovy +layout: docs +permalink: /samples/library/groovy/ +hide_from_sitemap: true +redirect_from: +- /samples/groovy/ +description: | + Apache Groovy is a multi-faceted language for the Java platform. +--- + +Apache Groovy is a multi-faceted language for the Java platform. + + +{% include library-samples.md %} diff --git a/_samples/library/haproxy.md b/_samples/library/haproxy.md new file mode 100644 index 0000000000..ff24752d85 --- /dev/null +++ b/_samples/library/haproxy.md @@ -0,0 +1,17 @@ +--- +title: haproxy +keywords: library, sample, haproxy +repo: haproxy +layout: docs +permalink: /samples/library/haproxy/ +hide_from_sitemap: true +redirect_from: +- /samples/haproxy/ +description: | + HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer +--- + +HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer + + +{% include library-samples.md %} diff --git a/_samples/library/haskell.md b/_samples/library/haskell.md new file mode 100644 index 0000000000..b463368f4c --- /dev/null +++ b/_samples/library/haskell.md @@ -0,0 +1,17 @@ +--- +title: haskell +keywords: library, sample, haskell +repo: haskell +layout: docs +permalink: /samples/library/haskell/ +hide_from_sitemap: true +redirect_from: +- /samples/haskell/ +description: | + Haskell is an advanced purely-functional programming language. +--- + +Haskell is an advanced purely-functional programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/haxe.md b/_samples/library/haxe.md new file mode 100644 index 0000000000..fcb52ed821 --- /dev/null +++ b/_samples/library/haxe.md @@ -0,0 +1,17 @@ +--- +title: haxe +keywords: library, sample, haxe +repo: haxe +layout: docs +permalink: /samples/library/haxe/ +hide_from_sitemap: true +redirect_from: +- /samples/haxe/ +description: | + Haxe is a modern, high level, static typed programming language with multiple compilation targets. +--- + +Haxe is a modern, high level, static typed programming language with multiple compilation targets. + + +{% include library-samples.md %} diff --git a/_samples/library/hello-world.md b/_samples/library/hello-world.md new file mode 100644 index 0000000000..c67af3b609 --- /dev/null +++ b/_samples/library/hello-world.md @@ -0,0 +1,17 @@ +--- +title: hello-world +keywords: library, sample, hello-world +repo: hello-world +layout: docs +permalink: /samples/library/hello-world/ +hide_from_sitemap: true +redirect_from: +- /samples/hello-world/ +description: | + Hello World! (an example of minimal Dockerization) +--- + +Hello World! (an example of minimal Dockerization) + + +{% include library-samples.md %} diff --git a/_samples/library/httpd.md b/_samples/library/httpd.md new file mode 100644 index 0000000000..1f42647f57 --- /dev/null +++ b/_samples/library/httpd.md @@ -0,0 +1,17 @@ +--- +title: httpd +keywords: library, sample, httpd +repo: httpd +layout: docs +permalink: /samples/library/httpd/ +hide_from_sitemap: true +redirect_from: +- /samples/httpd/ +description: | + The Apache HTTP Server Project +--- + +The Apache HTTP Server Project + + +{% include library-samples.md %} diff --git a/_samples/library/hylang.md b/_samples/library/hylang.md new file mode 100644 index 0000000000..5d65275a17 --- /dev/null +++ b/_samples/library/hylang.md @@ -0,0 +1,17 @@ +--- +title: hylang +keywords: library, sample, hylang +repo: hylang +layout: docs +permalink: /samples/library/hylang/ +hide_from_sitemap: true +redirect_from: +- /samples/hylang/ +description: | + Hy is a Lisp dialect that translates expressions into Python's abstract syntax tree. +--- + +Hy is a Lisp dialect that translates expressions into Python's abstract syntax tree. + + +{% include library-samples.md %} diff --git a/_samples/library/ibmjava.md b/_samples/library/ibmjava.md new file mode 100644 index 0000000000..0a2cc12006 --- /dev/null +++ b/_samples/library/ibmjava.md @@ -0,0 +1,17 @@ +--- +title: ibmjava +keywords: library, sample, ibmjava +repo: ibmjava +layout: docs +permalink: /samples/library/ibmjava/ +hide_from_sitemap: true +redirect_from: +- /samples/ibmjava/ +description: | + Official IBM® SDK, Java™ Technology Edition Docker Image. +--- + +Official IBM® SDK, Java™ Technology Edition Docker Image. + + +{% include library-samples.md %} diff --git a/_samples/library/influxdb.md b/_samples/library/influxdb.md new file mode 100644 index 0000000000..5197507b16 --- /dev/null +++ b/_samples/library/influxdb.md @@ -0,0 +1,17 @@ +--- +title: influxdb +keywords: library, sample, influxdb +repo: influxdb +layout: docs +permalink: /samples/library/influxdb/ +hide_from_sitemap: true +redirect_from: +- /samples/influxdb/ +description: | + InfluxDB is an open source time series database for recording metrics, events, and analytics. +--- + +InfluxDB is an open source time series database for recording metrics, events, and analytics. + + +{% include library-samples.md %} diff --git a/_samples/library/irssi.md b/_samples/library/irssi.md new file mode 100644 index 0000000000..27e15a4eb3 --- /dev/null +++ b/_samples/library/irssi.md @@ -0,0 +1,17 @@ +--- +title: irssi +keywords: library, sample, irssi +repo: irssi +layout: docs +permalink: /samples/library/irssi/ +hide_from_sitemap: true +redirect_from: +- /samples/irssi/ +description: | + irssi - The IRC client of the future +--- + +irssi - The IRC client of the future + + +{% include library-samples.md %} diff --git a/_samples/library/jetty.md b/_samples/library/jetty.md new file mode 100644 index 0000000000..3eefc3ceca --- /dev/null +++ b/_samples/library/jetty.md @@ -0,0 +1,17 @@ +--- +title: jetty +keywords: library, sample, jetty +repo: jetty +layout: docs +permalink: /samples/library/jetty/ +hide_from_sitemap: true +redirect_from: +- /samples/jetty/ +description: | + Jetty provides a Web server and javax.servlet container. +--- + +Jetty provides a Web server and javax.servlet container. + + +{% include library-samples.md %} diff --git a/_samples/library/jobber.md b/_samples/library/jobber.md new file mode 100644 index 0000000000..19a51cb66f --- /dev/null +++ b/_samples/library/jobber.md @@ -0,0 +1,17 @@ +--- +title: jobber +keywords: library, sample, jobber +repo: jobber +layout: docs +permalink: /samples/library/jobber/ +hide_from_sitemap: true +redirect_from: +- /samples/jobber/ +description: | + Jobber is an alternative to cron, with sophisticated status-reporting and error-handling. +--- + +Jobber is an alternative to cron, with sophisticated status-reporting and error-handling. + + +{% include library-samples.md %} diff --git a/_samples/library/joomla.md b/_samples/library/joomla.md new file mode 100644 index 0000000000..2ef98af38f --- /dev/null +++ b/_samples/library/joomla.md @@ -0,0 +1,17 @@ +--- +title: joomla +keywords: library, sample, joomla +repo: joomla +layout: docs +permalink: /samples/library/joomla/ +hide_from_sitemap: true +redirect_from: +- /samples/joomla/ +description: | + Joomla! is an open source content management system. +--- + +Joomla! is an open source content management system. + + +{% include library-samples.md %} diff --git a/_samples/library/jruby.md b/_samples/library/jruby.md new file mode 100644 index 0000000000..43b9a3c555 --- /dev/null +++ b/_samples/library/jruby.md @@ -0,0 +1,17 @@ +--- +title: jruby +keywords: library, sample, jruby +repo: jruby +layout: docs +permalink: /samples/library/jruby/ +hide_from_sitemap: true +redirect_from: +- /samples/jruby/ +description: | + JRuby (http://www.jruby.org) is an implementation of Ruby (http://www.ruby-lang.org) on the JVM. +--- + +JRuby (http://www.jruby.org) is an implementation of Ruby (http://www.ruby-lang.org) on the JVM. + + +{% include library-samples.md %} diff --git a/_samples/library/julia.md b/_samples/library/julia.md new file mode 100644 index 0000000000..0a2c44e676 --- /dev/null +++ b/_samples/library/julia.md @@ -0,0 +1,17 @@ +--- +title: julia +keywords: library, sample, julia +repo: julia +layout: docs +permalink: /samples/library/julia/ +hide_from_sitemap: true +redirect_from: +- /samples/julia/ +description: | + Julia is a high-level, high-performance dynamic programming language for technical computing. +--- + +Julia is a high-level, high-performance dynamic programming language for technical computing. + + +{% include library-samples.md %} diff --git a/_samples/library/kaazing-gateway.md b/_samples/library/kaazing-gateway.md new file mode 100644 index 0000000000..ff7f3b3b58 --- /dev/null +++ b/_samples/library/kaazing-gateway.md @@ -0,0 +1,17 @@ +--- +title: kaazing-gateway +keywords: library, sample, kaazing-gateway +repo: kaazing-gateway +layout: docs +permalink: /samples/library/kaazing-gateway/ +hide_from_sitemap: true +redirect_from: +- /samples/kaazing-gateway/ +description: | + Official build of Kaazing Gateway. +--- + +Official build of Kaazing Gateway. + + +{% include library-samples.md %} diff --git a/_samples/library/kapacitor.md b/_samples/library/kapacitor.md new file mode 100644 index 0000000000..db27409960 --- /dev/null +++ b/_samples/library/kapacitor.md @@ -0,0 +1,17 @@ +--- +title: kapacitor +keywords: library, sample, kapacitor +repo: kapacitor +layout: docs +permalink: /samples/library/kapacitor/ +hide_from_sitemap: true +redirect_from: +- /samples/kapacitor/ +description: | + Kapacitor is an open source framework for processing, monitoring, and alerting on time series data. +--- + +Kapacitor is an open source framework for processing, monitoring, and alerting on time series data. + + +{% include library-samples.md %} diff --git a/_samples/library/kibana.md b/_samples/library/kibana.md new file mode 100644 index 0000000000..41376e33fd --- /dev/null +++ b/_samples/library/kibana.md @@ -0,0 +1,17 @@ +--- +title: kibana +keywords: library, sample, kibana +repo: kibana +layout: docs +permalink: /samples/library/kibana/ +hide_from_sitemap: true +redirect_from: +- /samples/kibana/ +description: | + Kibana gives shape to any kind of data — structured and unstructured — indexed in Elasticsearch. +--- + +Kibana gives shape to any kind of data — structured and unstructured — indexed in Elasticsearch. + + +{% include library-samples.md %} diff --git a/_samples/library/known.md b/_samples/library/known.md new file mode 100644 index 0000000000..cf4b81b110 --- /dev/null +++ b/_samples/library/known.md @@ -0,0 +1,17 @@ +--- +title: known +keywords: library, sample, known +repo: known +layout: docs +permalink: /samples/library/known/ +hide_from_sitemap: true +redirect_from: +- /samples/known/ +description: | + Blogging, meet social. Known is a social publishing platform. +--- + +Blogging, meet social. Known is a social publishing platform. + + +{% include library-samples.md %} diff --git a/_samples/library/kong.md b/_samples/library/kong.md new file mode 100644 index 0000000000..57688fc7a1 --- /dev/null +++ b/_samples/library/kong.md @@ -0,0 +1,17 @@ +--- +title: kong +keywords: library, sample, kong +repo: kong +layout: docs +permalink: /samples/library/kong/ +hide_from_sitemap: true +redirect_from: +- /samples/kong/ +description: | + The Cloud-Native API Gateway & Service Mesh for APIs and Microservices +--- + +The Cloud-Native API Gateway & Service Mesh for APIs and Microservices + + +{% include library-samples.md %} diff --git a/_samples/library/lightstreamer.md b/_samples/library/lightstreamer.md new file mode 100644 index 0000000000..b4e8394b64 --- /dev/null +++ b/_samples/library/lightstreamer.md @@ -0,0 +1,17 @@ +--- +title: lightstreamer +keywords: library, sample, lightstreamer +repo: lightstreamer +layout: docs +permalink: /samples/library/lightstreamer/ +hide_from_sitemap: true +redirect_from: +- /samples/lightstreamer/ +description: | + Lightstreamer is a real-time messaging server optimized for the Internet. +--- + +Lightstreamer is a real-time messaging server optimized for the Internet. + + +{% include library-samples.md %} diff --git a/_samples/library/logstash.md b/_samples/library/logstash.md new file mode 100644 index 0000000000..c5e80eeb2d --- /dev/null +++ b/_samples/library/logstash.md @@ -0,0 +1,17 @@ +--- +title: logstash +keywords: library, sample, logstash +repo: logstash +layout: docs +permalink: /samples/library/logstash/ +hide_from_sitemap: true +redirect_from: +- /samples/logstash/ +description: | + Logstash is a tool for managing events and logs. +--- + +Logstash is a tool for managing events and logs. + + +{% include library-samples.md %} diff --git a/_samples/library/mageia.md b/_samples/library/mageia.md new file mode 100644 index 0000000000..53b5968374 --- /dev/null +++ b/_samples/library/mageia.md @@ -0,0 +1,17 @@ +--- +title: mageia +keywords: library, sample, mageia +repo: mageia +layout: docs +permalink: /samples/library/mageia/ +hide_from_sitemap: true +redirect_from: +- /samples/mageia/ +description: | + Official Mageia base image +--- + +Official Mageia base image + + +{% include library-samples.md %} diff --git a/_samples/library/mariadb.md b/_samples/library/mariadb.md new file mode 100644 index 0000000000..21f84c874a --- /dev/null +++ b/_samples/library/mariadb.md @@ -0,0 +1,17 @@ +--- +title: mariadb +keywords: library, sample, mariadb +repo: mariadb +layout: docs +permalink: /samples/library/mariadb/ +hide_from_sitemap: true +redirect_from: +- /samples/mariadb/ +description: | + MariaDB is a community-developed fork of MySQL intended to remain free under the GNU GPL. +--- + +MariaDB is a community-developed fork of MySQL intended to remain free under the GNU GPL. + + +{% include library-samples.md %} diff --git a/_samples/library/matomo.md b/_samples/library/matomo.md new file mode 100644 index 0000000000..446269c17d --- /dev/null +++ b/_samples/library/matomo.md @@ -0,0 +1,17 @@ +--- +title: matomo +keywords: library, sample, matomo +repo: matomo +layout: docs +permalink: /samples/library/matomo/ +hide_from_sitemap: true +redirect_from: +- /samples/matomo/ +description: | + Matomo is the leading open-source analytics platform that gives you more than powerful analytics. +--- + +Matomo is the leading open-source analytics platform that gives you more than powerful analytics. + + +{% include library-samples.md %} diff --git a/_samples/library/maven.md b/_samples/library/maven.md new file mode 100644 index 0000000000..8f659735a4 --- /dev/null +++ b/_samples/library/maven.md @@ -0,0 +1,17 @@ +--- +title: maven +keywords: library, sample, maven +repo: maven +layout: docs +permalink: /samples/library/maven/ +hide_from_sitemap: true +redirect_from: +- /samples/maven/ +description: | + Apache Maven is a software project management and comprehension tool. +--- + +Apache Maven is a software project management and comprehension tool. + + +{% include library-samples.md %} diff --git a/_samples/library/mediawiki.md b/_samples/library/mediawiki.md new file mode 100644 index 0000000000..de5e7caae8 --- /dev/null +++ b/_samples/library/mediawiki.md @@ -0,0 +1,17 @@ +--- +title: mediawiki +keywords: library, sample, mediawiki +repo: mediawiki +layout: docs +permalink: /samples/library/mediawiki/ +hide_from_sitemap: true +redirect_from: +- /samples/mediawiki/ +description: | + MediaWiki is a free software open source wiki package written in PHP. +--- + +MediaWiki is a free software open source wiki package written in PHP. + + +{% include library-samples.md %} diff --git a/_samples/library/memcached.md b/_samples/library/memcached.md new file mode 100644 index 0000000000..7cec257c61 --- /dev/null +++ b/_samples/library/memcached.md @@ -0,0 +1,17 @@ +--- +title: memcached +keywords: library, sample, memcached +repo: memcached +layout: docs +permalink: /samples/library/memcached/ +hide_from_sitemap: true +redirect_from: +- /samples/memcached/ +description: | + Free & open source, high-performance, distributed memory object caching system. +--- + +Free & open source, high-performance, distributed memory object caching system. + + +{% include library-samples.md %} diff --git a/_samples/library/mongo-express.md b/_samples/library/mongo-express.md new file mode 100644 index 0000000000..09c328052e --- /dev/null +++ b/_samples/library/mongo-express.md @@ -0,0 +1,17 @@ +--- +title: mongo-express +keywords: library, sample, mongo-express +repo: mongo-express +layout: docs +permalink: /samples/library/mongo-express/ +hide_from_sitemap: true +redirect_from: +- /samples/mongo-express/ +description: | + Web-based MongoDB admin interface, written with Node.js and express +--- + +Web-based MongoDB admin interface, written with Node.js and express + + +{% include library-samples.md %} diff --git a/_samples/library/mongo.md b/_samples/library/mongo.md new file mode 100644 index 0000000000..638520e1d9 --- /dev/null +++ b/_samples/library/mongo.md @@ -0,0 +1,17 @@ +--- +title: mongo +keywords: library, sample, mongo +repo: mongo +layout: docs +permalink: /samples/library/mongo/ +hide_from_sitemap: true +redirect_from: +- /samples/mongo/ +description: | + MongoDB document databases provide high availability and easy scalability. +--- + +MongoDB document databases provide high availability and easy scalability. + + +{% include library-samples.md %} diff --git a/_samples/library/mono.md b/_samples/library/mono.md new file mode 100644 index 0000000000..b87019a454 --- /dev/null +++ b/_samples/library/mono.md @@ -0,0 +1,17 @@ +--- +title: mono +keywords: library, sample, mono +repo: mono +layout: docs +permalink: /samples/library/mono/ +hide_from_sitemap: true +redirect_from: +- /samples/mono/ +description: | + Mono is an open source implementation of Microsoft's .NET Framework +--- + +Mono is an open source implementation of Microsoft's .NET Framework + + +{% include library-samples.md %} diff --git a/_samples/library/mysql.md b/_samples/library/mysql.md new file mode 100644 index 0000000000..f2e9fef59c --- /dev/null +++ b/_samples/library/mysql.md @@ -0,0 +1,17 @@ +--- +title: mysql +keywords: library, sample, mysql +repo: mysql +layout: docs +permalink: /samples/library/mysql/ +hide_from_sitemap: true +redirect_from: +- /samples/mysql/ +description: | + MySQL is a widely used, open-source relational database management system (RDBMS). +--- + +MySQL is a widely used, open-source relational database management system (RDBMS). + + +{% include library-samples.md %} diff --git a/_samples/library/nats-streaming.md b/_samples/library/nats-streaming.md new file mode 100644 index 0000000000..a010462db6 --- /dev/null +++ b/_samples/library/nats-streaming.md @@ -0,0 +1,17 @@ +--- +title: nats-streaming +keywords: library, sample, nats-streaming +repo: nats-streaming +layout: docs +permalink: /samples/library/nats-streaming/ +hide_from_sitemap: true +redirect_from: +- /samples/nats-streaming/ +description: | + NATS Streaming is an open-source, high-performance, cloud native messaging streaming system. +--- + +NATS Streaming is an open-source, high-performance, cloud native messaging streaming system. + + +{% include library-samples.md %} diff --git a/_samples/library/nats.md b/_samples/library/nats.md new file mode 100644 index 0000000000..0d2cdc6ea8 --- /dev/null +++ b/_samples/library/nats.md @@ -0,0 +1,17 @@ +--- +title: nats +keywords: library, sample, nats +repo: nats +layout: docs +permalink: /samples/library/nats/ +hide_from_sitemap: true +redirect_from: +- /samples/nats/ +description: | + NATS is an open-source, high-performance, cloud native messaging system. +--- + +NATS is an open-source, high-performance, cloud native messaging system. + + +{% include library-samples.md %} diff --git a/_samples/library/neo4j.md b/_samples/library/neo4j.md new file mode 100644 index 0000000000..18c55d1974 --- /dev/null +++ b/_samples/library/neo4j.md @@ -0,0 +1,17 @@ +--- +title: neo4j +keywords: library, sample, neo4j +repo: neo4j +layout: docs +permalink: /samples/library/neo4j/ +hide_from_sitemap: true +redirect_from: +- /samples/neo4j/ +description: | + Neo4j is a highly scalable, robust native graph database. +--- + +Neo4j is a highly scalable, robust native graph database. + + +{% include library-samples.md %} diff --git a/_samples/library/neurodebian.md b/_samples/library/neurodebian.md new file mode 100644 index 0000000000..dc0cd43735 --- /dev/null +++ b/_samples/library/neurodebian.md @@ -0,0 +1,17 @@ +--- +title: neurodebian +keywords: library, sample, neurodebian +repo: neurodebian +layout: docs +permalink: /samples/library/neurodebian/ +hide_from_sitemap: true +redirect_from: +- /samples/neurodebian/ +description: | + NeuroDebian provides neuroscience research software for Debian, Ubuntu, and other derivatives. +--- + +NeuroDebian provides neuroscience research software for Debian, Ubuntu, and other derivatives. + + +{% include library-samples.md %} diff --git a/_samples/library/nextcloud.md b/_samples/library/nextcloud.md new file mode 100644 index 0000000000..4cfc8fad3e --- /dev/null +++ b/_samples/library/nextcloud.md @@ -0,0 +1,17 @@ +--- +title: nextcloud +keywords: library, sample, nextcloud +repo: nextcloud +layout: docs +permalink: /samples/library/nextcloud/ +hide_from_sitemap: true +redirect_from: +- /samples/nextcloud/ +description: | + A safe home for all your data +--- + +A safe home for all your data + + +{% include library-samples.md %} diff --git a/_samples/library/nginx.md b/_samples/library/nginx.md new file mode 100644 index 0000000000..327e2ee1a8 --- /dev/null +++ b/_samples/library/nginx.md @@ -0,0 +1,17 @@ +--- +title: nginx +keywords: library, sample, nginx +repo: nginx +layout: docs +permalink: /samples/library/nginx/ +hide_from_sitemap: true +redirect_from: +- /samples/nginx/ +description: | + Official build of Nginx. +--- + +Official build of Nginx. + + +{% include library-samples.md %} diff --git a/_samples/library/node.md b/_samples/library/node.md new file mode 100644 index 0000000000..7fb5ed857c --- /dev/null +++ b/_samples/library/node.md @@ -0,0 +1,17 @@ +--- +title: node +keywords: library, sample, node +repo: node +layout: docs +permalink: /samples/library/node/ +hide_from_sitemap: true +redirect_from: +- /samples/node/ +description: | + Node.js is a JavaScript-based platform for server-side and networking applications. +--- + +Node.js is a JavaScript-based platform for server-side and networking applications. + + +{% include library-samples.md %} diff --git a/_samples/library/notary.md b/_samples/library/notary.md new file mode 100644 index 0000000000..446076a586 --- /dev/null +++ b/_samples/library/notary.md @@ -0,0 +1,17 @@ +--- +title: notary +keywords: library, sample, notary +repo: notary +layout: docs +permalink: /samples/library/notary/ +hide_from_sitemap: true +redirect_from: +- /samples/notary/ +description: | + Notary server and signer cooperatively handle signing and distribution of notary repositories. +--- + +Notary server and signer cooperatively handle signing and distribution of notary repositories. + + +{% include library-samples.md %} diff --git a/_samples/library/nuxeo.md b/_samples/library/nuxeo.md new file mode 100644 index 0000000000..6b6c83f31b --- /dev/null +++ b/_samples/library/nuxeo.md @@ -0,0 +1,17 @@ +--- +title: nuxeo +keywords: library, sample, nuxeo +repo: nuxeo +layout: docs +permalink: /samples/library/nuxeo/ +hide_from_sitemap: true +redirect_from: +- /samples/nuxeo/ +description: | + Nuxeo is an open source Content Management Platform that is completely customizable. +--- + +Nuxeo is an open source Content Management Platform that is completely customizable. + + +{% include library-samples.md %} diff --git a/_samples/library/odoo.md b/_samples/library/odoo.md new file mode 100644 index 0000000000..a3278a0948 --- /dev/null +++ b/_samples/library/odoo.md @@ -0,0 +1,17 @@ +--- +title: odoo +keywords: library, sample, odoo +repo: odoo +layout: docs +permalink: /samples/library/odoo/ +hide_from_sitemap: true +redirect_from: +- /samples/odoo/ +description: | + Odoo (formerly known as OpenERP) is a suite of open-source business apps. +--- + +Odoo (formerly known as OpenERP) is a suite of open-source business apps. + + +{% include library-samples.md %} diff --git a/_samples/library/open-liberty.md b/_samples/library/open-liberty.md new file mode 100644 index 0000000000..9b4293da93 --- /dev/null +++ b/_samples/library/open-liberty.md @@ -0,0 +1,17 @@ +--- +title: open-liberty +keywords: library, sample, open-liberty +repo: open-liberty +layout: docs +permalink: /samples/library/open-liberty/ +hide_from_sitemap: true +redirect_from: +- /samples/open-liberty/ +description: | + Official Open Liberty image. +--- + +Official Open Liberty image. + + +{% include library-samples.md %} diff --git a/_samples/library/openjdk.md b/_samples/library/openjdk.md new file mode 100644 index 0000000000..ce9aff02f2 --- /dev/null +++ b/_samples/library/openjdk.md @@ -0,0 +1,17 @@ +--- +title: openjdk +keywords: library, sample, openjdk +repo: openjdk +layout: docs +permalink: /samples/library/openjdk/ +hide_from_sitemap: true +redirect_from: +- /samples/openjdk/ +description: | + OpenJDK is an open-source implementation of the Java Platform, Standard Edition +--- + +OpenJDK is an open-source implementation of the Java Platform, Standard Edition + + +{% include library-samples.md %} diff --git a/_samples/library/opensuse.md b/_samples/library/opensuse.md new file mode 100644 index 0000000000..7a24d76e12 --- /dev/null +++ b/_samples/library/opensuse.md @@ -0,0 +1,17 @@ +--- +title: opensuse +keywords: library, sample, opensuse +repo: opensuse +layout: docs +permalink: /samples/library/opensuse/ +hide_from_sitemap: true +redirect_from: +- /samples/opensuse/ +description: | + DEPRECATED - for current images by the openSUSE Project see opensuse/leap and opensuse/tumbleweed. +--- + +DEPRECATED - for current images by the openSUSE Project see opensuse/leap and opensuse/tumbleweed. + + +{% include library-samples.md %} diff --git a/_samples/library/oraclelinux.md b/_samples/library/oraclelinux.md new file mode 100644 index 0000000000..49ddcd432a --- /dev/null +++ b/_samples/library/oraclelinux.md @@ -0,0 +1,17 @@ +--- +title: oraclelinux +keywords: library, sample, oraclelinux +repo: oraclelinux +layout: docs +permalink: /samples/library/oraclelinux/ +hide_from_sitemap: true +redirect_from: +- /samples/oraclelinux/ +description: | + Official Docker builds of Oracle Linux. +--- + +Official Docker builds of Oracle Linux. + + +{% include library-samples.md %} diff --git a/_samples/library/orientdb.md b/_samples/library/orientdb.md new file mode 100644 index 0000000000..a93a63ca3a --- /dev/null +++ b/_samples/library/orientdb.md @@ -0,0 +1,17 @@ +--- +title: orientdb +keywords: library, sample, orientdb +repo: orientdb +layout: docs +permalink: /samples/library/orientdb/ +hide_from_sitemap: true +redirect_from: +- /samples/orientdb/ +description: | + OrientDB a Multi-Model Open Source NoSQL DBMS that combines graphs and documents. +--- + +OrientDB a Multi-Model Open Source NoSQL DBMS that combines graphs and documents. + + +{% include library-samples.md %} diff --git a/_samples/library/percona.md b/_samples/library/percona.md new file mode 100644 index 0000000000..9863ebe03f --- /dev/null +++ b/_samples/library/percona.md @@ -0,0 +1,17 @@ +--- +title: percona +keywords: library, sample, percona +repo: percona +layout: docs +permalink: /samples/library/percona/ +hide_from_sitemap: true +redirect_from: +- /samples/percona/ +description: | + Percona Server is a fork of the MySQL relational database management system created by Percona. +--- + +Percona Server is a fork of the MySQL relational database management system created by Percona. + + +{% include library-samples.md %} diff --git a/_samples/library/perl.md b/_samples/library/perl.md new file mode 100644 index 0000000000..5ce3c07731 --- /dev/null +++ b/_samples/library/perl.md @@ -0,0 +1,17 @@ +--- +title: perl +keywords: library, sample, perl +repo: perl +layout: docs +permalink: /samples/library/perl/ +hide_from_sitemap: true +redirect_from: +- /samples/perl/ +description: | + Perl is a high-level, general-purpose, interpreted, dynamic programming language. +--- + +Perl is a high-level, general-purpose, interpreted, dynamic programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/photon.md b/_samples/library/photon.md new file mode 100644 index 0000000000..90f3ccaec6 --- /dev/null +++ b/_samples/library/photon.md @@ -0,0 +1,17 @@ +--- +title: photon +keywords: library, sample, photon +repo: photon +layout: docs +permalink: /samples/library/photon/ +hide_from_sitemap: true +redirect_from: +- /samples/photon/ +description: | + Photon OS is an open source minimal Linux container host. +--- + +Photon OS is an open source minimal Linux container host. + + +{% include library-samples.md %} diff --git a/_samples/library/php-zendserver.md b/_samples/library/php-zendserver.md new file mode 100644 index 0000000000..acbd0b4997 --- /dev/null +++ b/_samples/library/php-zendserver.md @@ -0,0 +1,17 @@ +--- +title: php-zendserver +keywords: library, sample, php-zendserver +repo: php-zendserver +layout: docs +permalink: /samples/library/php-zendserver/ +hide_from_sitemap: true +redirect_from: +- /samples/php-zendserver/ +description: | + Zend Server - the integrated PHP application platform for mobile and web apps. +--- + +Zend Server - the integrated PHP application platform for mobile and web apps. + + +{% include library-samples.md %} diff --git a/_samples/library/php.md b/_samples/library/php.md new file mode 100644 index 0000000000..cb3a8f869e --- /dev/null +++ b/_samples/library/php.md @@ -0,0 +1,17 @@ +--- +title: php +keywords: library, sample, php +repo: php +layout: docs +permalink: /samples/library/php/ +hide_from_sitemap: true +redirect_from: +- /samples/php/ +description: | + While designed for web development, the PHP scripting language also provides general-purpose use. +--- + +While designed for web development, the PHP scripting language also provides general-purpose use. + + +{% include library-samples.md %} diff --git a/_samples/library/plone.md b/_samples/library/plone.md new file mode 100644 index 0000000000..2a5004a1ed --- /dev/null +++ b/_samples/library/plone.md @@ -0,0 +1,17 @@ +--- +title: plone +keywords: library, sample, plone +repo: plone +layout: docs +permalink: /samples/library/plone/ +hide_from_sitemap: true +redirect_from: +- /samples/plone/ +description: | + Plone is a free and open source content management system built on top of Zope. +--- + +Plone is a free and open source content management system built on top of Zope. + + +{% include library-samples.md %} diff --git a/_samples/library/postfixadmin.md b/_samples/library/postfixadmin.md new file mode 100644 index 0000000000..fc0be8d4bd --- /dev/null +++ b/_samples/library/postfixadmin.md @@ -0,0 +1,17 @@ +--- +title: postfixadmin +keywords: library, sample, postfixadmin +repo: postfixadmin +layout: docs +permalink: /samples/library/postfixadmin/ +hide_from_sitemap: true +redirect_from: +- /samples/postfixadmin/ +description: | + Postfix Admin - web based administration interface for Postfix mail servers. +--- + +Postfix Admin - web based administration interface for Postfix mail servers. + + +{% include library-samples.md %} diff --git a/_samples/library/postgres.md b/_samples/library/postgres.md new file mode 100644 index 0000000000..9370806bf9 --- /dev/null +++ b/_samples/library/postgres.md @@ -0,0 +1,17 @@ +--- +title: postgres +keywords: library, sample, postgres +repo: postgres +layout: docs +permalink: /samples/library/postgres/ +hide_from_sitemap: true +redirect_from: +- /samples/postgres/ +description: | + The PostgreSQL object-relational database system provides reliability and data integrity. +--- + +The PostgreSQL object-relational database system provides reliability and data integrity. + + +{% include library-samples.md %} diff --git a/_samples/library/pypy.md b/_samples/library/pypy.md new file mode 100644 index 0000000000..fb077e74b9 --- /dev/null +++ b/_samples/library/pypy.md @@ -0,0 +1,17 @@ +--- +title: pypy +keywords: library, sample, pypy +repo: pypy +layout: docs +permalink: /samples/library/pypy/ +hide_from_sitemap: true +redirect_from: +- /samples/pypy/ +description: | + PyPy is a fast, compliant alternative implementation of the Python language. +--- + +PyPy is a fast, compliant alternative implementation of the Python language. + + +{% include library-samples.md %} diff --git a/_samples/library/python.md b/_samples/library/python.md new file mode 100644 index 0000000000..9ce536f4bb --- /dev/null +++ b/_samples/library/python.md @@ -0,0 +1,17 @@ +--- +title: python +keywords: library, sample, python +repo: python +layout: docs +permalink: /samples/library/python/ +hide_from_sitemap: true +redirect_from: +- /samples/python/ +description: | + Python is an interpreted, interactive, object-oriented, open-source programming language. +--- + +Python is an interpreted, interactive, object-oriented, open-source programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/r-base.md b/_samples/library/r-base.md new file mode 100644 index 0000000000..f65ea26661 --- /dev/null +++ b/_samples/library/r-base.md @@ -0,0 +1,17 @@ +--- +title: r-base +keywords: library, sample, r-base +repo: r-base +layout: docs +permalink: /samples/library/r-base/ +hide_from_sitemap: true +redirect_from: +- /samples/r-base/ +description: | + R is a system for statistical computation and graphics. +--- + +R is a system for statistical computation and graphics. + + +{% include library-samples.md %} diff --git a/_samples/library/rabbitmq.md b/_samples/library/rabbitmq.md new file mode 100644 index 0000000000..844ceb8da8 --- /dev/null +++ b/_samples/library/rabbitmq.md @@ -0,0 +1,17 @@ +--- +title: rabbitmq +keywords: library, sample, rabbitmq +repo: rabbitmq +layout: docs +permalink: /samples/library/rabbitmq/ +hide_from_sitemap: true +redirect_from: +- /samples/rabbitmq/ +description: | + RabbitMQ is an open source multi-protocol messaging broker. +--- + +RabbitMQ is an open source multi-protocol messaging broker. + + +{% include library-samples.md %} diff --git a/_samples/library/rakudo-star.md b/_samples/library/rakudo-star.md new file mode 100644 index 0000000000..300550278e --- /dev/null +++ b/_samples/library/rakudo-star.md @@ -0,0 +1,17 @@ +--- +title: rakudo-star +keywords: library, sample, rakudo-star +repo: rakudo-star +layout: docs +permalink: /samples/library/rakudo-star/ +hide_from_sitemap: true +redirect_from: +- /samples/rakudo-star/ +description: | + Rakudo Perl 6, or simply Rakudo, is a compiler for the Perl 6 programming language. +--- + +Rakudo Perl 6, or simply Rakudo, is a compiler for the Perl 6 programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/rapidoid.md b/_samples/library/rapidoid.md new file mode 100644 index 0000000000..682f640a49 --- /dev/null +++ b/_samples/library/rapidoid.md @@ -0,0 +1,17 @@ +--- +title: rapidoid +keywords: library, sample, rapidoid +repo: rapidoid +layout: docs +permalink: /samples/library/rapidoid/ +hide_from_sitemap: true +redirect_from: +- /samples/rapidoid/ +description: | + Rapidoid is a high-performance HTTP server and modern Java web framework / application container. +--- + +Rapidoid is a high-performance HTTP server and modern Java web framework / application container. + + +{% include library-samples.md %} diff --git a/_samples/library/redis.md b/_samples/library/redis.md new file mode 100644 index 0000000000..ddd88c1b77 --- /dev/null +++ b/_samples/library/redis.md @@ -0,0 +1,17 @@ +--- +title: redis +keywords: library, sample, redis +repo: redis +layout: docs +permalink: /samples/library/redis/ +hide_from_sitemap: true +redirect_from: +- /samples/redis/ +description: | + Redis is an open source key-value store that functions as a data structure server. +--- + +Redis is an open source key-value store that functions as a data structure server. + + +{% include library-samples.md %} diff --git a/_samples/library/redmine.md b/_samples/library/redmine.md new file mode 100644 index 0000000000..085b6bafc6 --- /dev/null +++ b/_samples/library/redmine.md @@ -0,0 +1,17 @@ +--- +title: redmine +keywords: library, sample, redmine +repo: redmine +layout: docs +permalink: /samples/library/redmine/ +hide_from_sitemap: true +redirect_from: +- /samples/redmine/ +description: | + Redmine is a flexible project management web application written using Ruby on Rails framework +--- + +Redmine is a flexible project management web application written using Ruby on Rails framework + + +{% include library-samples.md %} diff --git a/_samples/library/registry.md b/_samples/library/registry.md new file mode 100644 index 0000000000..eac992b3d5 --- /dev/null +++ b/_samples/library/registry.md @@ -0,0 +1,17 @@ +--- +title: registry +keywords: library, sample, registry +repo: registry +layout: docs +permalink: /samples/library/registry/ +hide_from_sitemap: true +redirect_from: +- /samples/registry/ +description: | + The Docker Registry 2.0 implementation for storing and distributing Docker images +--- + +The Docker Registry 2.0 implementation for storing and distributing Docker images + + +{% include library-samples.md %} diff --git a/_samples/library/rethinkdb.md b/_samples/library/rethinkdb.md new file mode 100644 index 0000000000..2830ded51d --- /dev/null +++ b/_samples/library/rethinkdb.md @@ -0,0 +1,17 @@ +--- +title: rethinkdb +keywords: library, sample, rethinkdb +repo: rethinkdb +layout: docs +permalink: /samples/library/rethinkdb/ +hide_from_sitemap: true +redirect_from: +- /samples/rethinkdb/ +description: | + RethinkDB is an open-source, document database that makes it easy to build and scale realtime apps. +--- + +RethinkDB is an open-source, document database that makes it easy to build and scale realtime apps. + + +{% include library-samples.md %} diff --git a/_samples/library/rocket.chat.md b/_samples/library/rocket.chat.md new file mode 100644 index 0000000000..512e9688f0 --- /dev/null +++ b/_samples/library/rocket.chat.md @@ -0,0 +1,17 @@ +--- +title: rocket.chat +keywords: library, sample, rocket.chat +repo: rocket.chat +layout: docs +permalink: /samples/library/rocket.chat/ +hide_from_sitemap: true +redirect_from: +- /samples/rocket.chat/ +description: | + The Complete Open Source Chat Solution +--- + +The Complete Open Source Chat Solution + + +{% include library-samples.md %} diff --git a/_samples/library/ros.md b/_samples/library/ros.md new file mode 100644 index 0000000000..0d3fa00e6d --- /dev/null +++ b/_samples/library/ros.md @@ -0,0 +1,17 @@ +--- +title: ros +keywords: library, sample, ros +repo: ros +layout: docs +permalink: /samples/library/ros/ +hide_from_sitemap: true +redirect_from: +- /samples/ros/ +description: | + The Robot Operating System (ROS) is an open source project for building robot applications. +--- + +The Robot Operating System (ROS) is an open source project for building robot applications. + + +{% include library-samples.md %} diff --git a/_samples/library/ruby.md b/_samples/library/ruby.md new file mode 100644 index 0000000000..d6294116b5 --- /dev/null +++ b/_samples/library/ruby.md @@ -0,0 +1,17 @@ +--- +title: ruby +keywords: library, sample, ruby +repo: ruby +layout: docs +permalink: /samples/library/ruby/ +hide_from_sitemap: true +redirect_from: +- /samples/ruby/ +description: | + Ruby is a dynamic, reflective, object-oriented, general-purpose, open-source programming language. +--- + +Ruby is a dynamic, reflective, object-oriented, general-purpose, open-source programming language. + + +{% include library-samples.md %} diff --git a/_samples/library/rust.md b/_samples/library/rust.md new file mode 100644 index 0000000000..9b75b927b9 --- /dev/null +++ b/_samples/library/rust.md @@ -0,0 +1,17 @@ +--- +title: rust +keywords: library, sample, rust +repo: rust +layout: docs +permalink: /samples/library/rust/ +hide_from_sitemap: true +redirect_from: +- /samples/rust/ +description: | + Rust is a systems programming language focused on safety, speed, and concurrency. +--- + +Rust is a systems programming language focused on safety, speed, and concurrency. + + +{% include library-samples.md %} diff --git a/_samples/library/sapmachine.md b/_samples/library/sapmachine.md new file mode 100644 index 0000000000..76dbbdb3d4 --- /dev/null +++ b/_samples/library/sapmachine.md @@ -0,0 +1,17 @@ +--- +title: sapmachine +keywords: library, sample, sapmachine +repo: sapmachine +layout: docs +permalink: /samples/library/sapmachine/ +hide_from_sitemap: true +redirect_from: +- /samples/sapmachine/ +description: | + Official SapMachine Docker Image. +--- + +Official SapMachine Docker Image. + + +{% include library-samples.md %} diff --git a/_samples/library/scratch.md b/_samples/library/scratch.md new file mode 100644 index 0000000000..75c4396202 --- /dev/null +++ b/_samples/library/scratch.md @@ -0,0 +1,16 @@ +--- +title: scratch +keywords: library, sample, scratch +repo: scratch +layout: docs +permalink: /samples/library/scratch/ +hide_from_sitemap: true +redirect_from: +- /samples/scratch/ +description: | + an explicitly empty image, especially for building images "FROM scratch" +--- + +an explicitly empty image, especially for building images "FROM scratch" + +{% include library-samples.md %} diff --git a/_samples/library/sentry.md b/_samples/library/sentry.md new file mode 100644 index 0000000000..c5b911cd46 --- /dev/null +++ b/_samples/library/sentry.md @@ -0,0 +1,17 @@ +--- +title: sentry +keywords: library, sample, sentry +repo: sentry +layout: docs +permalink: /samples/library/sentry/ +hide_from_sitemap: true +redirect_from: +- /samples/sentry/ +description: | + Sentry is a realtime, platform-agnostic error logging and aggregation platform +--- + +Sentry is a realtime, platform-agnostic error logging and aggregation platform + + +{% include library-samples.md %} diff --git a/_samples/library/silverpeas.md b/_samples/library/silverpeas.md new file mode 100644 index 0000000000..24b0fe42ea --- /dev/null +++ b/_samples/library/silverpeas.md @@ -0,0 +1,17 @@ +--- +title: silverpeas +keywords: library, sample, silverpeas +repo: silverpeas +layout: docs +permalink: /samples/library/silverpeas/ +hide_from_sitemap: true +redirect_from: +- /samples/silverpeas/ +description: | + Silverpeas is a turnkey and open-source Collaborative and Social-Networking Portal. +--- + +Silverpeas is a turnkey and open-source Collaborative and Social-Networking Portal. + + +{% include library-samples.md %} diff --git a/_samples/library/sl.md b/_samples/library/sl.md new file mode 100644 index 0000000000..43f5117000 --- /dev/null +++ b/_samples/library/sl.md @@ -0,0 +1,17 @@ +--- +title: sl +keywords: library, sample, sl +repo: sl +layout: docs +permalink: /samples/library/sl/ +hide_from_sitemap: true +redirect_from: +- /samples/sl/ +description: | + Official containers for Scientific Linux(SL) +--- + +Official containers for Scientific Linux(SL) + + +{% include library-samples.md %} diff --git a/_samples/library/solr.md b/_samples/library/solr.md new file mode 100644 index 0000000000..ee0cd6ea27 --- /dev/null +++ b/_samples/library/solr.md @@ -0,0 +1,17 @@ +--- +title: solr +keywords: library, sample, solr +repo: solr +layout: docs +permalink: /samples/library/solr/ +hide_from_sitemap: true +redirect_from: +- /samples/solr/ +description: | + Solr is the popular, blazing-fast, open source enterprise search platform built on Apache Lucene™. +--- + +Solr is the popular, blazing-fast, open source enterprise search platform built on Apache Lucene™. + + +{% include library-samples.md %} diff --git a/_samples/library/sonarqube.md b/_samples/library/sonarqube.md new file mode 100644 index 0000000000..40e4b72c17 --- /dev/null +++ b/_samples/library/sonarqube.md @@ -0,0 +1,17 @@ +--- +title: sonarqube +keywords: library, sample, sonarqube +repo: sonarqube +layout: docs +permalink: /samples/library/sonarqube/ +hide_from_sitemap: true +redirect_from: +- /samples/sonarqube/ +description: | + SonarQube is an open source platform for continuous inspection of code quality. +--- + +SonarQube is an open source platform for continuous inspection of code quality. + + +{% include library-samples.md %} diff --git a/_samples/library/sourcemage.md b/_samples/library/sourcemage.md new file mode 100644 index 0000000000..9dc1e4f76c --- /dev/null +++ b/_samples/library/sourcemage.md @@ -0,0 +1,17 @@ +--- +title: sourcemage +keywords: library, sample, sourcemage +repo: sourcemage +layout: docs +permalink: /samples/library/sourcemage/ +hide_from_sitemap: true +redirect_from: +- /samples/sourcemage/ +description: | + Source Mage is a source-based GNU/Linux distribution with maximum flexibility in customization. +--- + +Source Mage is a source-based GNU/Linux distribution with maximum flexibility in customization. + + +{% include library-samples.md %} diff --git a/_samples/library/spiped.md b/_samples/library/spiped.md new file mode 100644 index 0000000000..1df26dd02a --- /dev/null +++ b/_samples/library/spiped.md @@ -0,0 +1,17 @@ +--- +title: spiped +keywords: library, sample, spiped +repo: spiped +layout: docs +permalink: /samples/library/spiped/ +hide_from_sitemap: true +redirect_from: +- /samples/spiped/ +description: | + Spiped is a utility for creating symmetrically encrypted and authenticated pipes between sockets. +--- + +Spiped is a utility for creating symmetrically encrypted and authenticated pipes between sockets. + + +{% include library-samples.md %} diff --git a/_samples/library/storm.md b/_samples/library/storm.md new file mode 100644 index 0000000000..0e1dbfe452 --- /dev/null +++ b/_samples/library/storm.md @@ -0,0 +1,17 @@ +--- +title: storm +keywords: library, sample, storm +repo: storm +layout: docs +permalink: /samples/library/storm/ +hide_from_sitemap: true +redirect_from: +- /samples/storm/ +description: | + Apache Storm is a free and open source distributed realtime computation system. +--- + +Apache Storm is a free and open source distributed realtime computation system. + + +{% include library-samples.md %} diff --git a/_samples/library/swarm.md b/_samples/library/swarm.md new file mode 100644 index 0000000000..e423d9988c --- /dev/null +++ b/_samples/library/swarm.md @@ -0,0 +1,17 @@ +--- +title: swarm +keywords: library, sample, swarm +repo: swarm +layout: docs +permalink: /samples/library/swarm/ +hide_from_sitemap: true +redirect_from: +- /samples/swarm/ +description: | + Swarm: a Docker-native clustering system. +--- + +Swarm: a Docker-native clustering system. + + +{% include library-samples.md %} diff --git a/_samples/library/swift.md b/_samples/library/swift.md new file mode 100644 index 0000000000..52210b4743 --- /dev/null +++ b/_samples/library/swift.md @@ -0,0 +1,17 @@ +--- +title: swift +keywords: library, sample, swift +repo: swift +layout: docs +permalink: /samples/library/swift/ +hide_from_sitemap: true +redirect_from: +- /samples/swift/ +description: | + Swift is a high-performance system programming language, to learn more about Swift visit swift.org. +--- + +Swift is a high-performance system programming language, to learn more about Swift visit swift.org. + + +{% include library-samples.md %} diff --git a/_samples/library/swipl.md b/_samples/library/swipl.md new file mode 100644 index 0000000000..9b6bafc558 --- /dev/null +++ b/_samples/library/swipl.md @@ -0,0 +1,17 @@ +--- +title: swipl +keywords: library, sample, swipl +repo: swipl +layout: docs +permalink: /samples/library/swipl/ +hide_from_sitemap: true +redirect_from: +- /samples/swipl/ +description: | + SWI-Prolog offers a comprehensive free Prolog environment. +--- + +SWI-Prolog offers a comprehensive free Prolog environment. + + +{% include library-samples.md %} diff --git a/_samples/library/teamspeak.md b/_samples/library/teamspeak.md new file mode 100644 index 0000000000..955685a81e --- /dev/null +++ b/_samples/library/teamspeak.md @@ -0,0 +1,17 @@ +--- +title: teamspeak +keywords: library, sample, teamspeak +repo: teamspeak +layout: docs +permalink: /samples/library/teamspeak/ +hide_from_sitemap: true +redirect_from: +- /samples/teamspeak/ +description: | + TeamSpeak is software for quality voice communication via the Internet. +--- + +TeamSpeak is software for quality voice communication via the Internet. + + +{% include library-samples.md %} diff --git a/_samples/library/telegraf.md b/_samples/library/telegraf.md new file mode 100644 index 0000000000..33f2939d23 --- /dev/null +++ b/_samples/library/telegraf.md @@ -0,0 +1,17 @@ +--- +title: telegraf +keywords: library, sample, telegraf +repo: telegraf +layout: docs +permalink: /samples/library/telegraf/ +hide_from_sitemap: true +redirect_from: +- /samples/telegraf/ +description: | + Telegraf is an agent for collecting metrics and writing them to InfluxDB or other outputs. +--- + +Telegraf is an agent for collecting metrics and writing them to InfluxDB or other outputs. + + +{% include library-samples.md %} diff --git a/_samples/library/thrift.md b/_samples/library/thrift.md new file mode 100644 index 0000000000..f1d171a00c --- /dev/null +++ b/_samples/library/thrift.md @@ -0,0 +1,17 @@ +--- +title: thrift +keywords: library, sample, thrift +repo: thrift +layout: docs +permalink: /samples/library/thrift/ +hide_from_sitemap: true +redirect_from: +- /samples/thrift/ +description: | + Thrift is a framework for generating client and services from an IDL. +--- + +Thrift is a framework for generating client and services from an IDL. + + +{% include library-samples.md %} diff --git a/_samples/library/tomcat.md b/_samples/library/tomcat.md new file mode 100644 index 0000000000..925363b16f --- /dev/null +++ b/_samples/library/tomcat.md @@ -0,0 +1,17 @@ +--- +title: tomcat +keywords: library, sample, tomcat +repo: tomcat +layout: docs +permalink: /samples/library/tomcat/ +hide_from_sitemap: true +redirect_from: +- /samples/tomcat/ +description: | + Apache Tomcat is an open source implementation of the Java Servlet and JavaServer Pages technologies +--- + +Apache Tomcat is an open source implementation of the Java Servlet and JavaServer Pages technologies + + +{% include library-samples.md %} diff --git a/_samples/library/tomee.md b/_samples/library/tomee.md new file mode 100644 index 0000000000..9be407e185 --- /dev/null +++ b/_samples/library/tomee.md @@ -0,0 +1,17 @@ +--- +title: tomee +keywords: library, sample, tomee +repo: tomee +layout: docs +permalink: /samples/library/tomee/ +hide_from_sitemap: true +redirect_from: +- /samples/tomee/ +description: | + Apache TomEE is an all-Apache Java EE certified stack where Apache Tomcat is top dog. +--- + +Apache TomEE is an all-Apache Java EE certified stack where Apache Tomcat is top dog. + + +{% include library-samples.md %} diff --git a/_samples/library/traefik.md b/_samples/library/traefik.md new file mode 100644 index 0000000000..51496a4f34 --- /dev/null +++ b/_samples/library/traefik.md @@ -0,0 +1,17 @@ +--- +title: traefik +keywords: library, sample, traefik +repo: traefik +layout: docs +permalink: /samples/library/traefik/ +hide_from_sitemap: true +redirect_from: +- /samples/traefik/ +description: | + Traefik, The Cloud Native Edge Router +--- + +Traefik, The Cloud Native Edge Router + + +{% include library-samples.md %} diff --git a/_samples/library/ubuntu.md b/_samples/library/ubuntu.md new file mode 100644 index 0000000000..7a95979ad2 --- /dev/null +++ b/_samples/library/ubuntu.md @@ -0,0 +1,17 @@ +--- +title: ubuntu +keywords: library, sample, ubuntu +repo: ubuntu +layout: docs +permalink: /samples/library/ubuntu/ +hide_from_sitemap: true +redirect_from: +- /samples/ubuntu/ +description: | + Ubuntu is a Debian-based Linux operating system based on free software. +--- + +Ubuntu is a Debian-based Linux operating system based on free software. + + +{% include library-samples.md %} diff --git a/_samples/library/varnish.md b/_samples/library/varnish.md new file mode 100644 index 0000000000..d85c1eec82 --- /dev/null +++ b/_samples/library/varnish.md @@ -0,0 +1,17 @@ +--- +title: varnish +keywords: library, sample, varnish +repo: varnish +layout: docs +permalink: /samples/library/varnish/ +hide_from_sitemap: true +redirect_from: +- /samples/varnish/ +description: | + Varnish is an HTTP accelerator designed for content-heavy dynamic web sites as well as APIs. +--- + +Varnish is an HTTP accelerator designed for content-heavy dynamic web sites as well as APIs. + + +{% include library-samples.md %} diff --git a/_samples/library/vault.md b/_samples/library/vault.md new file mode 100644 index 0000000000..9697ffe01a --- /dev/null +++ b/_samples/library/vault.md @@ -0,0 +1,17 @@ +--- +title: vault +keywords: library, sample, vault +repo: vault +layout: docs +permalink: /samples/library/vault/ +hide_from_sitemap: true +redirect_from: +- /samples/vault/ +description: | + Vault is a tool for securely accessing secrets via a unified interface and tight access control. +--- + +Vault is a tool for securely accessing secrets via a unified interface and tight access control. + + +{% include library-samples.md %} diff --git a/_samples/library/websphere-liberty.md b/_samples/library/websphere-liberty.md new file mode 100644 index 0000000000..8b27f64a57 --- /dev/null +++ b/_samples/library/websphere-liberty.md @@ -0,0 +1,17 @@ +--- +title: websphere-liberty +keywords: library, sample, websphere-liberty +repo: websphere-liberty +layout: docs +permalink: /samples/library/websphere-liberty/ +hide_from_sitemap: true +redirect_from: +- /samples/websphere-liberty/ +description: | + Official IBM WebSphere Application Server for Developers Liberty image. +--- + +Official IBM WebSphere Application Server for Developers Liberty image. + + +{% include library-samples.md %} diff --git a/_samples/library/wordpress.md b/_samples/library/wordpress.md new file mode 100644 index 0000000000..931812b15d --- /dev/null +++ b/_samples/library/wordpress.md @@ -0,0 +1,17 @@ +--- +title: wordpress +keywords: library, sample, wordpress +repo: wordpress +layout: docs +permalink: /samples/library/wordpress/ +hide_from_sitemap: true +redirect_from: +- /samples/wordpress/ +description: | + The WordPress rich content management system can utilize plugins, widgets, and themes. +--- + +The WordPress rich content management system can utilize plugins, widgets, and themes. + + +{% include library-samples.md %} diff --git a/_samples/library/xwiki.md b/_samples/library/xwiki.md new file mode 100644 index 0000000000..18ebc0499b --- /dev/null +++ b/_samples/library/xwiki.md @@ -0,0 +1,17 @@ +--- +title: xwiki +keywords: library, sample, xwiki +repo: xwiki +layout: docs +permalink: /samples/library/xwiki/ +hide_from_sitemap: true +redirect_from: +- /samples/xwiki/ +description: | + XWiki: The Advanced Open Source Enterprise Wiki. +--- + +XWiki: The Advanced Open Source Enterprise Wiki. + + +{% include library-samples.md %} diff --git a/_samples/library/yourls.md b/_samples/library/yourls.md new file mode 100644 index 0000000000..1e74fe3ff5 --- /dev/null +++ b/_samples/library/yourls.md @@ -0,0 +1,17 @@ +--- +title: yourls +keywords: library, sample, yourls +repo: yourls +layout: docs +permalink: /samples/library/yourls/ +hide_from_sitemap: true +redirect_from: +- /samples/yourls/ +description: | + YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener. +--- + +YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener. + + +{% include library-samples.md %} diff --git a/_samples/library/znc.md b/_samples/library/znc.md new file mode 100644 index 0000000000..0cf7ffd984 --- /dev/null +++ b/_samples/library/znc.md @@ -0,0 +1,17 @@ +--- +title: znc +keywords: library, sample, znc +repo: znc +layout: docs +permalink: /samples/library/znc/ +hide_from_sitemap: true +redirect_from: +- /samples/znc/ +description: | + ZNC - An advanced IRC bouncer +--- + +ZNC - An advanced IRC bouncer + + +{% include library-samples.md %} diff --git a/_samples/library/zookeeper.md b/_samples/library/zookeeper.md new file mode 100644 index 0000000000..c910b24694 --- /dev/null +++ b/_samples/library/zookeeper.md @@ -0,0 +1,17 @@ +--- +title: zookeeper +keywords: library, sample, zookeeper +repo: zookeeper +layout: docs +permalink: /samples/library/zookeeper/ +hide_from_sitemap: true +redirect_from: +- /samples/zookeeper/ +description: | + Apache ZooKeeper is an open-source server which enables highly reliable distributed coordination. +--- + +Apache ZooKeeper is an open-source server which enables highly reliable distributed coordination. + + +{% include library-samples.md %} From 9b47229953fbbc6bbf0acf47fdc0d329d73ffbb7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 20:25:18 +0200 Subject: [PATCH 053/160] Remove script and build-stage for fetching library samples Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 14 --------- _scripts/fetch-library-samples.sh | 47 ------------------------------- 2 files changed, 61 deletions(-) delete mode 100755 _scripts/fetch-library-samples.sh diff --git a/Dockerfile b/Dockerfile index 581aef5545..07e4dec0e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,19 +64,6 @@ COPY --from=docs/docker.github.io:v17.12 ${TARGET} ${TARGET} COPY --from=docs/docker.github.io:v18.03 ${TARGET} ${TARGET} COPY --from=docs/docker.github.io:v18.09 ${TARGET} ${TARGET} -# Fetch library samples (documentation from official images on Docker Hub) -# Only add the files that are needed to build these reference docs, so that -# these docs are only rebuilt if changes were made to the configuration. -# @todo find a way to build HTML in this stage, and still have them included in the navigation tree -FROM builderbase AS library-samples -COPY ./_scripts/fetch-library-samples.sh ./_scripts/ -RUN bash ./_scripts/fetch-library-samples.sh - -# Temporary stage to export the samples using; -# DOCKER_BUILDKIT=1 docker build --target=export-samples -o type=local,dest=./_samples/library/ . -FROM scratch AS export-samples -COPY --from=library-samples /usr/src/app/md_source/_samples/library/. / - # Fetch upstream resources (reference documentation) # Only add the files that are needed to build these reference docs, so that # these docs are only rebuilt if changes were made to the configuration. @@ -90,7 +77,6 @@ RUN bash ./_scripts/fetch-upstream-resources.sh . # Build the current docs from the checked out branch FROM builderbase AS current COPY . . -COPY --from=library-samples /usr/src/app/md_source/. ./ COPY --from=upstream-resources /usr/src/app/md_source/. ./ # Build the static HTML, now that everything is in place diff --git a/_scripts/fetch-library-samples.sh b/_scripts/fetch-library-samples.sh deleted file mode 100755 index 2d3dab80f7..0000000000 --- a/_scripts/fetch-library-samples.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -# Get the Library docs -svn co https://github.com/docker-library/docs/trunk ./_samples/library || (echo "Failed library download" && exit 1) -# Remove symlinks to maintainer.md because they break jekyll and we don't use em -find ./_samples/library -maxdepth 9 -type l -delete -# Remove the top-level README because we don't want to generate a file for that -rm ./_samples/library/README.md -# Loop through the README.md files, turn them into rich index.md files -FILES=$(find ./_samples/library -type f -name 'README.md') -for f in ${FILES} -do - curdir=$(dirname "${f}") - justcurdir="${curdir##*/}" - if [ -e ${curdir}/README-short.txt ] - then - shortrm=$(cat ${curdir}/README-short.txt) - fi - echo "Adding front-matter to ${f} ..." - echo --- >> ${curdir}/front-matter.txt - echo title: "${justcurdir}" >> ${curdir}/front-matter.txt - echo keywords: library, sample, ${justcurdir} >> ${curdir}/front-matter.txt - echo repo: "${justcurdir}" >> ${curdir}/front-matter.txt - echo layout: docs >> ${curdir}/front-matter.txt - echo permalink: /samples/library/${justcurdir}/ >> ${curdir}/front-matter.txt - echo hide_from_sitemap: true >> ${curdir}/front-matter.txt - echo redirect_from: >> ${curdir}/front-matter.txt - echo - /samples/${justcurdir}/ >> ${curdir}/front-matter.txt - echo description: \| >> ${curdir}/front-matter.txt - echo \ \ ${shortrm} >> ${curdir}/front-matter.txt - echo --- >> ${curdir}/front-matter.txt - echo >> ${curdir}/front-matter.txt - echo ${shortrm} >> ${curdir}/front-matter.txt - echo >> ${curdir}/front-matter.txt - if [ -e ${curdir}/github-repo ] - then - # gitrepo=$(<${curdir}/github-repo) - gitrepo=$(cat ${curdir}/github-repo) - echo >> ${curdir}/front-matter.txt - fi - cat ${curdir}/front-matter.txt > ${curdir}/../${justcurdir}.md - echo {% include library-samples.md %} >> ${curdir}/../${justcurdir}.md -done - -# Remove all files and subdirectory, except for the Markdown files we generated -find ./_samples/library/ ! -name 'library' -type d -exec rm -rf {} + -find ./_samples/library/ ! -name '*.md' -type f -exec rm -f {} + From b34cf6b8c135ae066f080f522c959c742ddce9ee Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 21:59:54 +0200 Subject: [PATCH 054/160] Use canonical URL for library images Signed-off-by: Sebastiaan van Stijn --- _includes/library-samples.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/library-samples.md b/_includes/library-samples.md index cab6bdcba4..8cab921509 100644 --- a/_includes/library-samples.md +++ b/_includes/library-samples.md @@ -3,6 +3,6 @@ > This content is imported from > [the official Docker Library docs](https://github.com/docker-library/docs/tree/master/{{ page.repo}}/), > and is provided by the original uploader. You can view the Docker Hub page for this image at -> [https://hub.docker.com/images/{{ page.repo }}](https://hub.docker.com/images/{{ page.repo }}) +> [https://hub.docker.com/_/{{ page.repo }}](https://hub.docker.com/images/{{ page.repo }}) From 5d85af7501ac59595dea214ec5c3ca945595ba42 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Sep 2019 22:05:18 +0200 Subject: [PATCH 055/160] Change library references navigation to an anchor Don't generate a TOC Signed-off-by: Sebastiaan van Stijn --- _data/toc.yaml | 5 ++--- _includes/generateTOC.html | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 _includes/generateTOC.html diff --git a/_data/toc.yaml b/_data/toc.yaml index 87abea92c3..82c74a4d4b 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1257,9 +1257,8 @@ reference: samples: - path: /samples/#tutorial-labs title: Tutorial labs -- sectiontitle: Library references - section: - - generateTOC: library +- path: /samples/#library-references + title: Library references - sectiontitle: Sample applications section: - path: /samples/ diff --git a/_includes/generateTOC.html b/_includes/generateTOC.html deleted file mode 100644 index d4db0fe9eb..0000000000 --- a/_includes/generateTOC.html +++ /dev/null @@ -1,3 +0,0 @@ -{% if include.tocToGenerate=="library"%}{% for thisPage in site.samples %} -

  • {{ thisPage.title }}
    • -{% endfor %}{% endif %} From 4309637aaae406c294bbcc87119eb7903e0ae24f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 00:26:57 +0200 Subject: [PATCH 056/160] Move library links to bottom of samples index Signed-off-by: Sebastiaan van Stijn --- _data/toc.yaml | 4 ++-- samples/index.md | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 82c74a4d4b..875aa1d1eb 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1257,8 +1257,6 @@ reference: samples: - path: /samples/#tutorial-labs title: Tutorial labs -- path: /samples/#library-references - title: Library references - sectiontitle: Sample applications section: - path: /samples/ @@ -1281,6 +1279,8 @@ samples: title: Riak - path: /engine/examples/running_ssh_service/ title: SSHd +- path: /samples/#library-references + title: Library references manuals: - sectiontitle: Docker Enterprise diff --git a/samples/index.md b/samples/index.md index 37f9044ad7..d0ed48fb42 100644 --- a/samples/index.md +++ b/samples/index.md @@ -23,15 +23,6 @@ repository]({{ labsbase }}). | [Docker Security]({{ labsbase }}/security/README.md){: target="_blank"} | How to take advantage of Docker security features. | | [Building a 12-factor application with Docker]({{ labsbase}}/12factor){: target="_blank"} | Use Docker to create an app that conforms to Heroku's "12 factors for cloud-native applications." | -## Library references - -The following table provides a list of popular official Docker images. For detailed documentation, select the specific image name. - -| Image name | Description | -| ---------- | ----------- | -{% for page in site.samples %}| [{{ page.title }}](https://hub.docker.com/_/{{ page.title }}) | {{ page.description | strip }} | -{% endfor %} - ## Sample applications Run popular software using Docker. @@ -47,3 +38,12 @@ Run popular software using Docker. | [Rails + PostgreSQL](/compose/rails/) | Run a Dockerized Rails + PostgreSQL environment. | | [Riak](/engine/examples/running_riak_service) | Run a Dockerized Riak instance. | | [SSHd](/engine/examples/running_ssh_service) | Run a Dockerized SSHd instance. | + +## Library references + +The following table provides a list of popular official Docker images. For detailed documentation, select the specific image name. + +| Image name | Description | +| ---------- | ----------- | +{% for page in site.samples %}| [{{ page.title }}](https://hub.docker.com/_/{{ page.title }}) | {{ page.description | strip }} | +{% endfor %} From 1c00eda164959d1be3ad1c94849f084fc73faac2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 00:17:39 +0200 Subject: [PATCH 057/160] Open links to library images in a new Window/tab Signed-off-by: Sebastiaan van Stijn --- samples/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/index.md b/samples/index.md index d0ed48fb42..de370ac8f4 100644 --- a/samples/index.md +++ b/samples/index.md @@ -45,5 +45,5 @@ The following table provides a list of popular official Docker images. For detai | Image name | Description | | ---------- | ----------- | -{% for page in site.samples %}| [{{ page.title }}](https://hub.docker.com/_/{{ page.title }}) | {{ page.description | strip }} | +{% for page in site.samples %}| [{{ page.title }}](https://hub.docker.com/_/{{ page.title }}){: target="_blank"} | {{ page.description | strip }} | {% endfor %} From 00411a8db2b9071df763673597e953470540398f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 00:36:39 +0200 Subject: [PATCH 058/160] Fix links to sample applications to prevent a redirect Signed-off-by: Sebastiaan van Stijn --- samples/index.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/index.md b/samples/index.md index de370ac8f4..5749c4602d 100644 --- a/samples/index.md +++ b/samples/index.md @@ -29,15 +29,15 @@ Run popular software using Docker. | Sample | Description | | ------ | ----------- | -| [apt-cacher-ng](/engine/examples/apt-cacher-ng) | Run a Dockerized apt-cacher-ng instance. | -| [.Net Core application](/engine/examples/dotnetcore) | Run a Dockerized ASP.NET Core application. | -| [ASP.NET Core + SQL Server on Linux](/compose/aspnet-mssql-compose) | Run a Dockerized ASP.NET Core + SQL Server environment. | -| [CouchDB](/engine/examples/couchdb_data_volumes) | Run a Dockerized CouchDB instance. | +| [apt-cacher-ng](/engine/examples/apt-cacher-ng/) | Run a Dockerized apt-cacher-ng instance. | +| [.Net Core application](/engine/examples/dotnetcore/) | Run a Dockerized ASP.NET Core application. | +| [ASP.NET Core + SQL Server on Linux](/compose/aspnet-mssql-compose/) | Run a Dockerized ASP.NET Core + SQL Server environment. | +| [CouchDB](/engine/examples/couchdb_data_volumes/) | Run a Dockerized CouchDB instance. | | [Django + PostgreSQL](/compose/django/) | Run a Dockerized Django + PostgreSQL environment. | -| [PostgreSQL](/engine/examples/postgresql_service) | Run a Dockerized PostgreSQL instance. | +| [PostgreSQL](/engine/examples/postgresql_service/) | Run a Dockerized PostgreSQL instance. | | [Rails + PostgreSQL](/compose/rails/) | Run a Dockerized Rails + PostgreSQL environment. | -| [Riak](/engine/examples/running_riak_service) | Run a Dockerized Riak instance. | -| [SSHd](/engine/examples/running_ssh_service) | Run a Dockerized SSHd instance. | +| [Riak](/engine/examples/running_riak_service/) | Run a Dockerized Riak instance. | +| [SSHd](/engine/examples/running_ssh_service/) | Run a Dockerized SSHd instance. | ## Library references From e02481c0591c911177adc419381385a45dc64be3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 00:01:31 +0200 Subject: [PATCH 059/160] Remove library samples from metadata.js Signed-off-by: Sebastiaan van Stijn --- js/metadata.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/js/metadata.js b/js/metadata.js index 42fd7f65a2..5f35eff460 100644 --- a/js/metadata.js +++ b/js/metadata.js @@ -10,11 +10,4 @@ var pages = [{% assign firstPage = "yes" %} "keywords":{{ page.keywords | jsonify }} } {% endif %}{% endfor %} -{% for page in site.samples %}, -{ -"url":{{ page.url | jsonify }}, -"title":{{ page.title | jsonify }}, -"description":{{ page.description | strip | jsonify }}, -"keywords":{{ page.keywords | jsonify }} -} -{% endfor %}] +] From d78dc922788831c82a4c674e5508afb7f83f0bf3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 00:12:28 +0200 Subject: [PATCH 060/160] Remove javascripts related to generating library collection navigation Signed-off-by: Sebastiaan van Stijn --- _layouts/docs.html | 1 - js/collections_tocs.js | 12 ------------ js/docs.js | 12 ------------ 3 files changed, 25 deletions(-) delete mode 100644 js/collections_tocs.js diff --git a/_layouts/docs.html b/_layouts/docs.html index 7887877453..c8c75f0d37 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -316,7 +316,6 @@ - + + ``` + +commit fea6d53f1fe1f022c608b3f3d932e88097132e18 +Merge: 6d4047c3e9 e916f7f88e +Author: John Mulhausen +Date: Mon Oct 10 16:30:48 2016 -0700 + + Merge pull request #155 from mstanleyjones/draft_to_published_false + + Change 'draft: true' to 'published: false' for Jekyll + +commit 6d4047c3e95f0e87289bc2cf5a5edecb3bdfd28d +Author: John Mulhausen +Date: Mon Oct 10 16:25:26 2016 -0700 + + Sitemap fix + +commit 4a2953dcc6531b20283c9d15fd3938a6563e3baf +Author: John Mulhausen +Date: Mon Oct 10 16:23:13 2016 -0700 + + Update _config.yml + +commit f1bdec69ecff9dc5706e3990ebb151f7c9d71246 +Author: John Mulhausen +Date: Mon Oct 10 16:22:46 2016 -0700 + + Create sitemap.xml + +commit e916f7f88ecb9d3351448b9baed4e51ecade29fd +Author: Misty Stanley-Jones +Date: Mon Oct 10 16:19:47 2016 -0700 + + Change 'draft: true' to 'published: false' for Jekyll + +commit bdaafb8daccbdbf8df85800679a3949a5d7bf80b +Author: John Mulhausen +Date: Mon Oct 10 15:55:09 2016 -0700 + + Website verification + +commit a41d952d78eb82172971d5696258cc806f5f63c5 +Merge: f0b832357f 5423de94f0 +Author: Misty Stanley-Jones +Date: Mon Oct 10 15:52:42 2016 -0700 + + Merge pull request #117 from mbentley/add-deferred-deletion + + Add deferred deletion to recommended dm options + +commit f0b832357fc55024e1d6f36c74d73e6b060e43d0 +Merge: 6760a6a88b 220bbed0e4 +Author: Misty Stanley-Jones +Date: Mon Oct 10 15:32:12 2016 -0700 + + Merge pull request #141 from mstanleyjones/choosing_port_vs_automatic + + Fix incorrect information about swarm port assignment + +commit 5423de94f0cb4c0c749aeef42044dc2de73f111d +Author: Matt Bentley +Date: Fri Oct 7 13:01:47 2016 -0400 + + Add deferred deletion to recommended dm options + + Signed-off-by: Matt Bentley + +commit 6760a6a88b616f5a569a3a01021b27c2f0e1aa2b +Author: John Mulhausen +Date: Mon Oct 10 14:55:20 2016 -0700 + + Update get-help.md + +commit c88cadcb233fdae3a9e6f81e6012a84dc5f93f2f +Author: Joao Fernandes +Date: Mon Oct 10 14:48:37 2016 -0700 + + Update docs from dtr to dockerhubenterprise + +commit a1edd7ce09dc5f9eb1d4f3f63a15e3bfec36a060 +Author: BSCheshir +Date: Tue Oct 11 01:40:51 2016 +0400 + + node1 + + little bit before + ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR + 63s86gf6a0ms34mvboniev7bs my-web.1 nginx node1 Running Running 58 seconds ago + +commit 115b30e38a905cfcf3cbdc815e52d0bbe9ec3147 +Author: Joao Fernandes +Date: Mon Oct 10 12:26:32 2016 -0700 + + Fixes install docs, removes ucp-ca + +commit 863772ceb1fded373992cb39d1a17dca8b2be883 +Merge: 4b71ffe966 9fd3cf4cad +Author: John Mulhausen +Date: Mon Oct 10 11:43:31 2016 -0700 + + Merge pull request #130 from jaredrcarlson/opensource_workflow_find-an-issue.md + + Fixed Issue #128 - Syntax Error in: opensource/workflow/find-an-issue… + +commit 4b71ffe9667ce684a3c11ee5a6163f1c8af3304e +Merge: 95d32f79b2 b5ca8860b9 +Author: John Mulhausen +Date: Mon Oct 10 11:42:32 2016 -0700 + + Merge pull request #140 from candita/patch-1 + + Update deprecated.md + +commit 95d32f79b2e86b5aad52c4ab3d243f557e27b77b +Merge: a30aa7d320 78ff6bf07e +Author: John Mulhausen +Date: Mon Oct 10 11:42:14 2016 -0700 + + Merge pull request #139 from vishesh92/patch-1 + + fix formatting in container-communication.md + +commit a30aa7d320286e639c770738ba1db6f20000add1 +Author: John Mulhausen +Date: Mon Oct 10 11:41:32 2016 -0700 + + Delete robots.txt + +commit 4fb9c084cb6243547dae3afa152c45764bb682d4 +Merge: 4a833da9f3 df99fe96f6 +Author: LRubin +Date: Mon Oct 10 11:17:19 2016 -0700 + + Merge pull request #132 from hsluoyz/master + + Fix the wrong links in opensource/code.md + +commit 220bbed0e4888c77ae343ad1f4aae12b0610cffb +Author: Misty Stanley-Jones +Date: Mon Oct 10 10:02:15 2016 -0700 + + Fix incorrect information about swarm port assignment + +commit b5ca8860b9e50712a52f9998e3e237b43ef61121 +Author: candita +Date: Mon Oct 10 11:46:51 2016 -0400 + + Update deprecated.md + + Format as one sentence rather than 2 columns. + +commit 78ff6bf07e71eac5865c4264c9946f4d74e32942 +Author: vishesh92 +Date: Mon Oct 10 17:58:48 2016 +0530 + + fix formatting in container-communication.md + + fix formatting in container-communication.md so page is rendered perfectly at https://docs.docker.com/engine/userguide/networking/default_network/container-communication/ + +commit df99fe96f6f2c100fab82a91c0d73235b9659383 +Author: Yang Luo +Date: Sun Oct 9 09:44:35 2016 -0700 + + Fix the wrong links in opensource/code.md + +commit 5b1ab4c0c6200c96839fd67832f6059fac8c3cc8 +Author: Samuel Villamonte +Date: Sat Oct 8 18:50:39 2016 -0500 + + Update install-machine.md to version 0.8.2 + + Updated to version 0.8.2 instructions + +commit 9fd3cf4cad505eb059a5a883dd3ece60ddb4ab6c +Author: Jared Carlson +Date: Sat Oct 8 16:46:50 2016 -0600 + + Fixed Issue #128 - Syntax Error in: opensource/workflow/find-an-issue.md --> I removed the extra table heading tag I found on line 113 + + Signed-off-by: Jared Carlson + +commit c98a6d8902274113ab46004cf9676f22c1055c7b +Author: BSCheshir +Date: Sat Oct 8 23:35:37 2016 +0400 + + example pls + +commit 539f8aa082dd5dc451fc88e8506e9f9d30268aa8 +Author: sicwolf +Date: Sat Oct 8 18:52:15 2016 +0800 + + Wrong destination folder in container + + /opt/webapp of web container includes app.py, if set destination folder as /opt/webapp, app.py is not visible and below error log presents, so it's better to set the destination folder as /webapp. + + docker logs -f web + python: can't open file 'app.py': [Errno 2] No such file or directory + +commit 6603c48cde7cbddd04137a5c619401eb05191c94 +Author: Renier Strydom +Date: Sat Oct 8 10:36:56 2016 +0200 + + Update step_four.md + + It is not normal to provide the file you are looking for when running `ls` + +commit 4a833da9f366a672044a0ef0da1f0e1a4d594c9f +Merge: 1bf7e04b35 68b813c68a +Author: John Mulhausen +Date: Fri Oct 7 17:02:03 2016 -0700 + + Checking in part 4 stopping place + +commit 68b813c68aeacdabdb554f826b9c0951e1643c19 +Author: John Mulhausen +Date: Fri Oct 7 14:48:48 2016 -0700 + + Update advanced_usage.md + +commit ef4448d6b48c8be26453c65ccb98c01703eaf87c +Merge: 8ea375e1d7 8bfa1bda07 +Author: John Mulhausen +Date: Fri Oct 7 13:48:28 2016 -0700 + + Merge branch 'master' of https://github.com/docker/docker.github.io + + the commit. + +commit 8ea375e1d7de17af2bc87382a45b1ebc122fe5c1 +Author: John Mulhausen +Date: Fri Oct 7 13:48:23 2016 -0700 + + Fix for list in compose-file, CSS fixes for blockquotes + +commit 8bfa1bda075462db59c335cfcf2f99a209ad0242 +Merge: dc8ac3cc4e 362e94b2bc +Author: John Mulhausen +Date: Fri Oct 7 13:30:05 2016 -0700 + + Merge pull request #114 from benizi/fix/raw-variables-targeted + + Prevent Liquid from mangling `{{` in a more targeted way + +commit dc8ac3cc4eacd08b2205ba9b2827c8b67886efd7 +Author: John Mulhausen +Date: Fri Oct 7 13:11:38 2016 -0700 + + 404 fix for Safari + +commit aab444d99bd29d14034686f80175dc05386493de +Author: John Mulhausen +Date: Fri Oct 7 12:51:16 2016 -0700 + + Update cloud-ex-machine-ocean.md + +commit b5a42327f24521e06380e24e44f3ae84358b0e40 +Merge: a912c1a1c5 3f7a061d99 +Author: John Mulhausen +Date: Fri Oct 7 12:24:14 2016 -0700 + + Merge pull request #120 from andrewsomething/issues/118 + + Fix broken images in DigitalOcean examples. Closes: #118 + +commit a912c1a1c5f34951d7e25a0a6e2b676cdc457bc2 +Merge: 5c9cbc86b4 1b8729c5be +Author: John Mulhausen +Date: Fri Oct 7 12:23:57 2016 -0700 + + Merge pull request #121 from BSCheshir/patch-1 + + remove prefix space + +commit 1b8729c5be8eafebb530887359887108331e616a +Author: BSCheshir +Date: Fri Oct 7 23:18:45 2016 +0400 + + remove prefix space + + strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/ + + but github clear it on preview .md + +commit 5c9cbc86b43781875125100dc96b4376e4777f46 +Merge: 853b659f64 8dfe096a11 +Author: John Mulhausen +Date: Fri Oct 7 12:18:00 2016 -0700 + + Merge pull request #119 from sanscontext/improve-feedback-link + + add leading url to feedback link email template + +commit 8dfe096a11148be6f13ed8f3075bc6d52e96368e +Author: LRubin +Date: Fri Oct 7 11:19:59 2016 -0700 + + add leading url to template, markdownify + + Signed-off-by: LRubin + +commit 3f7a061d9957443e00683d09030b0da6fb8550fe +Author: Andrew Starr-Bochicchio +Date: Fri Oct 7 14:55:06 2016 -0400 + + Fix broken images in DigitalOcean examples. Closes: #118 + +commit 1bf7e04b354c5c9559fbbf29356c514c07760ee5 +Author: John Mulhausen +Date: Fri Oct 7 11:48:26 2016 -0700 + + 404 fix for Safari + +commit 853b659f640a7532347aa5b92807089acfae3070 +Author: John Mulhausen +Date: Fri Oct 7 11:42:16 2016 -0700 + + Update 404.md + +commit c4972c812ee267624e6465c41676d6d60674eacc +Author: Joao Fernandes +Date: Thu Oct 6 23:38:27 2016 -0700 + + Fix install instructions + +commit 4ab65ba3a418ee9cf801dfc47d8ef3d285a5ec31 +Merge: dec694d0d3 d6794bf9fc +Author: John Mulhausen +Date: Thu Oct 6 22:26:52 2016 -0700 + + Merge pull request #92 from dragonndev/master + + Documentation Update + +commit d6794bf9fc575dea82cb261c2d8cbc410aa49e04 +Author: John Mulhausen +Date: Thu Oct 6 22:25:54 2016 -0700 + + Update trust_sandbox.md + +commit dec694d0d383a63e0708222f01924ff6912959aa +Author: John Mulhausen +Date: Thu Oct 6 21:59:42 2016 -0700 + + Update configure-dns.md + +commit 362e94b2bca42da5dc833175e13d02935c26d25b +Author: Benjamin R. Haskell +Date: Fri Oct 7 00:39:15 2016 -0400 + + Disable Liquid templating for blocks with `{{` + + Instead of disabling templating for entire files, fix instances + individually by wrapping blocks in: + + ```{% raw %} + ... content ... + {% endraw %}``` + + Signed-off-by: Benjamin R. Haskell + +commit 65ec3a37630560f27f8c168d970e9e19fcfa6720 +Author: Benjamin R. Haskell +Date: Fri Oct 7 00:45:16 2016 -0400 + + Revert pull request #48 + + Reverts commit b3a620808a44d294a8fdee4de9bf6e5a577e8d76 in order to + replace it with more-targeted blocks. + +commit 1357a4486dbe689a0e9e790041e0c7527a575ef8 +Merge: bdc4a3b934 73fac8acb7 +Author: John Mulhausen +Date: Thu Oct 6 21:55:35 2016 -0700 + + Merge pull request #113 from mbentley/fix-devicemapper-docs + + Fixed jekyll formatting for dm docs; fixed #112 + +commit 73fac8acb74b643984dc2b72dd32d7989af3fb68 +Author: Matt Bentley +Date: Thu Oct 6 22:33:41 2016 -0400 + + Fixed jekyll formatting for dm docs; fixed #112 + + Signed-off-by: Matt Bentley + +commit bdc4a3b93457cd1cd9fbf9d8b150507996f80634 +Author: John Mulhausen +Date: Thu Oct 6 17:12:47 2016 -0700 + + Fix for Embedded DNS server + +commit fc85fcc0b981ac0372650ef0cd8642a83e60e74a +Author: John Mulhausen +Date: Thu Oct 6 17:00:33 2016 -0700 + + Re-enabling redirects + +commit a2ff02a96afff5c784ae9089ab0c4c43b3bca330 +Author: John Mulhausen +Date: Thu Oct 6 17:00:03 2016 -0700 + + Fix for relative-path redirects causing infinite loops + +commit a01754c8e01b30317598794f3439cf5301be7270 +Author: John Mulhausen +Date: Thu Oct 6 15:13:12 2016 -0700 + + Fix for redirector + +commit 68192431f47ff62dcb5e1aca5ac74bc55bbbae96 +Merge: 6e51854c1b dfc5c7fe4d +Author: Joao Fernandes +Date: Thu Oct 6 15:08:14 2016 -0700 + + Merge pull request #3205 from joaofnfernandes/release-notes-2.1 + + Add release notes for 2.1 + +commit 79695f49c963e9442fa4aaf53a20edb541cc3101 +Author: John Mulhausen +Date: Thu Oct 6 14:46:42 2016 -0700 + + Fix for char offset + +commit 6559df42aafc97df399696fa0427e0b2b45c333e +Author: John Mulhausen +Date: Thu Oct 6 14:42:11 2016 -0700 + + Fix for versioned docs + +commit 1c85806569c2dd8c04aa9f67eed330d495e3cfa1 +Author: John Mulhausen +Date: Thu Oct 6 14:36:24 2016 -0700 + + Fix for archives + +commit 0688247f2e2ef0adc90747a1c9917cf837c1c6e2 +Author: James Yu +Date: Thu Oct 6 14:19:47 2016 -0700 + + Update restart.md + +commit dfc5c7fe4d2d71ccd30893eec4ceb347c9929d3d +Author: Joao Fernandes +Date: Wed Oct 5 17:39:13 2016 -0700 + + Add release notes for 2.1 + +commit 6e51854c1b2b16cedc2a605297cd024ee47c9721 +Author: Joao Fernandes +Date: Wed Oct 5 18:00:19 2016 -0700 + + Updates CLI and API docs for 2.0 + + Closes 3085 + +commit 04e0a6fe281e92a06f6b60bd5e25ec51f7bccd5c +Author: John Mulhausen +Date: Thu Oct 6 12:30:28 2016 -0700 + + Change to redirects + +commit df9aff2877dee7e433f43695e86eee01edbad0c0 +Author: John Mulhausen +Date: Thu Oct 6 12:28:33 2016 -0700 + + Redirect logic + +commit cb3f6f04a1021876505122c9edcbc432eaefa74a +Merge: 32f3885686 b3a620808a +Author: John Mulhausen +Date: Thu Oct 6 09:46:51 2016 -0700 + + Merge pull request #48 from benizi/fix/raw-variables + + Fix formatting for Markdown files containing `{{` + +commit 32f3885686858aca16ebd242aea94cbd6bb0c21d +Author: John Mulhausen +Date: Thu Oct 6 09:39:32 2016 -0700 + + Update log_tags.md + +commit 11dae327dca946f83092ea1707ae9e0e3f464e96 +Author: John Mulhausen +Date: Thu Oct 6 09:39:18 2016 -0700 + + Update docs.html + +commit cf15de2784068a1d835e5bcbf9aa4e8cbd4e2291 +Author: John Mulhausen +Date: Thu Oct 6 09:33:45 2016 -0700 + + Update docs.html + +commit 3d08488dc40dbc42151e9c0437082940d2bcd276 +Author: John Mulhausen +Date: Thu Oct 6 09:32:22 2016 -0700 + + Update log_tags.md + +commit e6c88108e16f8b6d05f970a48876e59c49cfcfd2 +Merge: 539fcb58b7 7fd3d4e956 +Author: John Mulhausen +Date: Thu Oct 6 09:26:19 2016 -0700 + + Merge pull request #106 from BSCheshir/patch-1 + + fix url + +commit 7fd3d4e956ee4d8581a573b975cffc00c1785728 +Author: BSCheshir +Date: Thu Oct 6 18:05:44 2016 +0400 + + fix url + +commit fefc40863ad8bad015bbec0471567fc454430028 +Author: Matt Bentley +Date: Thu Oct 6 08:11:17 2016 -0400 + + Add additional package for aufs support; fixes #74 + + Signed-off-by: Matt Bentley + +commit f52ee4bef9a8b2deae100a66a807695ec624a788 +Author: Matt Bentley +Date: Thu Oct 6 08:05:46 2016 -0400 + + Add step to configure devicemapper before starting daemon + + Signed-off-by: Matt Bentley + +commit 089462d7c781257fd14c59cf324f82792aacbb10 +Merge: 790dbb4cf4 539fcb58b7 +Author: John Mulhausen +Date: Wed Oct 5 22:39:00 2016 -0700 + + Merge pull request #94 from docker/master + + Rebasing vnext-compose to enable autobuild + +commit 539fcb58b72da362ae1fb910909bf38029dc446e +Author: John Mulhausen +Date: Wed Oct 5 22:35:42 2016 -0700 + + Part 4 draft, Dockerfiles for vnext compose/machine + +commit 0ac4bae36ab6e88c42392be13342dc4981bb3948 +Author: John Mulhausen +Date: Wed Oct 5 22:35:12 2016 -0700 + + Part 4 draft, Dockerfiles for vnext compose/machine + +commit fb21824a380ff26a8a647c59faf31c47fac64e36 +Author: John Mulhausen +Date: Wed Oct 5 22:17:47 2016 -0700 + + Update index.md + +commit 3d7caa4839cc2e9b993a3e2bbbd77c44ce6d6b27 +Author: John Mulhausen +Date: Wed Oct 5 22:09:48 2016 -0700 + + Update docker-compose.yml + +commit 6129e9d3f95b40c6df59ac7f53bd5516bb3c8d15 +Author: Matthew Lapworth +Date: Wed Oct 5 21:15:45 2016 -0700 + + Updated documentation on using the trust sandbox to fix an issue where the notary server tag was not found. + + Signed-off-by: Matthew Lapworth + +commit 0e9881933b5bb5ec0c2305424fc302569f631fef +Author: Sam Waggoner +Date: Wed Oct 5 18:21:19 2016 -0700 + + update attach.go filepath and code snippet + + Signed-off-by: Sam Waggoner + +commit b51bb39ee96c36569b29470f45a7293741d80902 +Merge: 903a27c7f2 9a2be62bf8 +Author: Victoria Bialas +Date: Wed Oct 5 19:09:10 2016 -0700 + + Merge pull request #69 from sixcorners/patch-1 + + Update compose-file.md + +commit 903a27c7f28da3328de5a7e33519dedb3e2606f1 +Merge: d3e70654fa 3ff38eac3c +Author: Victoria Bialas +Date: Wed Oct 5 18:46:29 2016 -0700 + + Merge pull request #90 from londoncalling/d4win-github-issues-surface + + linked info re: GitHub issues from troubleshooting + +commit 3ff38eac3c8d5374644fe25debf2dd45c311914d +Author: Victoria Bialas +Date: Wed Oct 5 18:44:49 2016 -0700 + + linked info re: GitHub issues from troubleshooting + + Signed-off-by: Victoria Bialas + +commit d3e70654fa688d03648b945d1d5ed66a8b60e2f6 +Merge: f9dc08d830 154bc45ab7 +Author: John Mulhausen +Date: Wed Oct 5 17:33:22 2016 -0700 + + Merge branch 'master' of https://github.com/docker/docker.github.io + +commit f9dc08d830114e239374c883946320aa5e00cdd3 +Author: John Mulhausen +Date: Wed Oct 5 17:33:14 2016 -0700 + + Fix for fwding + +commit e3cb7267064116579347db1864694b06cdf38e13 +Author: John Mulhausen +Date: Wed Oct 5 17:31:48 2016 -0700 + + Adding redirects.csv support + +commit 154bc45ab7d0cd6fb58cb45a4aefb18c3a6b6414 +Merge: 626d31eb07 8c6c5a0e63 +Author: John Mulhausen +Date: Wed Oct 5 17:02:40 2016 -0700 + + Merge pull request #87 from emcniece/fix-build-markdown + + Adding fix for builder reference markdown + +commit 8c6c5a0e63df2a77ecda6ff4c532d13ec4b65529 +Author: Eric McNiece +Date: Wed Oct 5 16:50:29 2016 -0700 + + Adding fix for builder reference markdown + +commit 626d31eb072b28b7e24b606884bf40cd2ea9ed7f +Merge: 77c010136b aa183f93fa +Author: John Mulhausen +Date: Wed Oct 5 16:44:32 2016 -0700 + + Merge branch 'master' of https://github.com/docker/docker.github.io + +commit 77c010136b37ba005d74f5115b1aaec7559d56b4 +Author: John Mulhausen +Date: Wed Oct 5 16:44:25 2016 -0700 + + Formatting fixes for Configure TLS page + +commit aa183f93fa8854405b3d2b40c6a67c026083b094 +Merge: e0280abc9a c5374e6135 +Author: Victoria Bialas +Date: Wed Oct 5 16:22:38 2016 -0700 + + Merge pull request #85 from londoncalling/symlinks-more-info + + expanded on symlinks explanation, cross-linked in troubleshooting + +commit e0280abc9a28899130955dd632996c280ee06b72 +Author: John Mulhausen +Date: Wed Oct 5 16:12:47 2016 -0700 + + Update plugin_api.md + +commit f6562cf92a204116db7a58085eec7ac572080127 +Author: John Mulhausen +Date: Wed Oct 5 16:10:52 2016 -0700 + + Update last_page.md + +commit 5389e6cb122077d705692dec43555bc7a74ea5e0 +Author: John Mulhausen +Date: Wed Oct 5 16:07:08 2016 -0700 + + Update https.md + +commit 16ca0a1ed6895ddc52a1d2747ccc39cfe84d0952 +Author: John Mulhausen +Date: Wed Oct 5 16:04:13 2016 -0700 + + Update search.md + +commit e41a76bf8199558cc4c4c8bf856a65c0dea8c079 +Author: John Mulhausen +Date: Wed Oct 5 16:02:13 2016 -0700 + + Fix for table in reference/run + +commit 790dbb4cf4fdea63f0c30ce95d10b5dd02a756df +Author: John Mulhausen +Date: Wed Oct 5 15:39:53 2016 -0700 + + Update builder.md + +commit 6538eba35f47ce7b1a2af2d9532e6a5c4d29442b +Author: John Mulhausen +Date: Wed Oct 5 15:39:27 2016 -0700 + + Update glossary.md + +commit f913e2c5731a5a26cdb5b5c42fd5241660368749 +Author: John Mulhausen +Date: Wed Oct 5 15:39:09 2016 -0700 + + Update index.md + +commit e8ddc58189aff5fb85b3682ab19bb119230300b8 +Author: John Mulhausen +Date: Wed Oct 5 15:38:02 2016 -0700 + + Update run.md + +commit b62fd51a2993eeed70554ea28a1780cf5480b5d1 +Author: John Mulhausen +Date: Wed Oct 5 15:31:14 2016 -0700 + + Update Dockerfile + +commit 6e599e9d050ea50b9e799607962cbd3faa5aed1f +Author: John Mulhausen +Date: Wed Oct 5 15:26:49 2016 -0700 + + Update intro.md + +commit c5374e61356ae62b706944d253c6c9e84729f3cd +Author: Victoria Bialas +Date: Wed Oct 5 15:19:53 2016 -0700 + + expanded on symlinks explanation, cross-linked in troubleshooting + + Signed-off-by: Victoria Bialas + +commit a22178d9946732fe4e37cfbdd79137589776ed3e +Merge: 9fd1c9ad27 16b570d779 +Author: John Mulhausen +Date: Wed Oct 5 14:05:45 2016 -0700 + + Merge branch 'master' of https://github.com/docker/docker.github.io + +commit 9fd1c9ad27a5735046944623216481e5564abb78 +Author: John Mulhausen +Date: Wed Oct 5 14:05:37 2016 -0700 + + Add forwarding for page aliases + +commit 16b570d77999d864c18f6888a156cc3003d279a7 +Merge: 2cd9cbdfe6 2ab7fa3aff +Author: Victoria Bialas +Date: Wed Oct 5 13:30:23 2016 -0700 + + Merge pull request #81 from londoncalling/machine-back-out-aws-changes + + Revert "Merge pull request #36 from mrburrito/aws-iam-roles" + +commit 2cd9cbdfe6fca9b249ea443944fc3172e90b8492 +Author: John Mulhausen +Date: Wed Oct 5 13:19:19 2016 -0700 + + Update docsarchive.md + +commit a3850c18d21ff07588a0cc189c7363af6e983a8a +Merge: 5fcc2f5445 7da61ffa50 +Author: John Mulhausen +Date: Wed Oct 5 12:57:36 2016 -0700 + + Merge pull request #76 from bfirsh/add-compose-file + + Add Compose file for development + +commit 2ab7fa3affee7cc207444f5e3f374ddf882a6a28 +Author: Victoria Bialas +Date: Wed Oct 5 12:52:04 2016 -0700 + + Revert "Merge pull request #36 from mrburrito/aws-iam-roles" + + This reverts commit 82d9ab91b26d9d739a7b9db4407c01b4884ac3f1, reversing + changes made to c1188953ba031dade829fa832943479fbed5d7d3. + +commit 7da61ffa50df2a22a4ee5ca5aad4d324e2b63530 +Author: Ben Firshman +Date: Tue Oct 4 19:40:27 2016 +0100 + + Add Compose file for development + + Also fix regeneration. The starefossen/github-pages image had + --force_polling set to poll the filesystem, but this didn't + seem to work. Docker for Mac/Windows supports filesystem events, + so it now uses this instead. + + Signed-off-by: Ben Firshman + +commit 5fcc2f54456950da53029bf2192afe4bea5b4626 +Merge: 40f16b311e 2d87f30b7e +Author: Victoria Bialas +Date: Wed Oct 5 11:31:02 2016 -0700 + + Merge pull request #75 from lack3r/patch-3 + + Deleted (or right here ☺) from windows guide + +commit 2d87f30b7e633a5c0a6270a4aa4a407a273c4217 +Author: Andreas Loizou (LACK3R) +Date: Wed Oct 5 21:16:49 2016 +0300 + + Deleted (or right here ☺) from windows guide + + Deleted (or right here ☺) from windows guide + +commit 40f16b311ed64694af6b63df80b120276280b30b +Merge: d785f0cf21 57542590b3 +Author: John Mulhausen +Date: Wed Oct 5 10:32:31 2016 -0700 + + Merge pull request #49 from benizi/fix/missing-code-fence + + Add missing close tag for fenced code block + +commit d785f0cf210bf3700677912a59f303689fe88e04 +Merge: 886fd7c822 210d261bb4 +Author: John Mulhausen +Date: Wed Oct 5 10:32:10 2016 -0700 + + Merge pull request #68 from rutsky/patch-1 + + don't split verbatim text over few lines + +commit 886fd7c8220379a487b388d62af4c1aebe3f55ad +Merge: 8936e1b88c 57594630b3 +Author: John Mulhausen +Date: Wed Oct 5 10:30:55 2016 -0700 + + Merge pull request #72 from lack3r/patch-1 + + Deleted an extra /tr + +commit 57594630b3f742d002ec8bf7710b9beaa59b2b53 +Author: Andreas Loizou (LACK3R) +Date: Wed Oct 5 20:18:11 2016 +0300 + + Deleted an extra /tr + + Deleted an extra /tr + +commit 9a2be62bf89fbfff41003efe297b90935ee9dc5c +Author: sixcorners +Date: Wed Oct 5 11:40:42 2016 -0500 + + Update compose-file.md + + Document that the journald logging driver allows docker-compose logs to work. + +commit 210d261bb41b3921a09d2a58904741c4f228c881 +Author: Vladimir Rutsky +Date: Wed Oct 5 20:38:15 2016 +0400 + + don't split verbatim text over few lines + + Should fix improperly formatted documentation page. + +commit 8936e1b88ccf9306eb89d2de7ce365f2a51a04f5 +Merge: a0e7eb56d0 3fe070e848 +Author: John Mulhausen +Date: Tue Oct 4 23:54:02 2016 -0700 + + Merge pull request #46 from marcaurele/fix-exoscale + + Exoscale: fix letter casing + +commit 57542590b349d4ad8f078af2dec1ab9eeff5bfb8 +Author: Benjamin R. Haskell +Date: Wed Oct 5 02:16:54 2016 -0400 + + Add missing close tag for fenced code block + +commit b3a620808a44d294a8fdee4de9bf6e5a577e8d76 +Author: Benjamin R. Haskell +Date: Wed Oct 5 01:58:24 2016 -0400 + + Fix formatting for Markdown files containing `{{` + + They're usually examples of Go-style text templates. But, Liquid templating is treating them as variable substitutions. E.g., in `engine/reference/commandline/ps.md`: + + ```bash + $ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}" + ``` + + is rendered as: + + ```bash + $ docker ps --filter volume=remote-volume --format "table \t" + ``` + + Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks. + +commit 3fe070e8488882f0f7ca8f6e158326003c8ea05c +Author: Marc-Aurèle Brothier +Date: Wed Oct 5 07:35:36 2016 +0200 + + Exoscale: fix letter casing + + Following change https://github.com/docker/docker.github.io/commit/a059edd94987b0cc45a7bea536dbb98cb2380701 + + Signed-off-by: Marc-Aurèle Brothier + +commit a0e7eb56d0ce10ca325fa7f776d2df110685f2de +Author: John Mulhausen +Date: Tue Oct 4 18:40:58 2016 -0700 + + Update docs.html + +commit dca5b4575042b505c4174af1790eb45386938324 +Merge: a059edd949 063003dadf +Author: Victoria Bialas +Date: Tue Oct 4 18:22:31 2016 -0700 + + Merge pull request #42 from londoncalling/d4mac-d4win-prs + + PRs on shared drives and CAs, HTML fixes + +commit a059edd94987b0cc45a7bea536dbb98cb2380701 +Author: John Mulhausen +Date: Tue Oct 4 18:06:30 2016 -0700 + + Matching PR #3753 @ Machine + + A PR slipped in post-migration at https://github.com/docker/machine/pull/3753/files + +commit 063003dadf2468f4ce72897a37f3037530932f85 +Author: Victoria Bialas +Date: Tue Oct 4 18:01:54 2016 -0700 + + PRs on shared drives and CAs, HTML fixes + + Signed-off-by: Victoria Bialas + +commit c4f548e8e1cec288201a29ca31ba14e9f45e5f0d +Author: John Mulhausen +Date: Tue Oct 4 17:02:58 2016 -0700 + + Update install.md + +commit c03bb7f90c68a067a435720db0174db4378cfb98 +Author: John Mulhausen +Date: Tue Oct 4 16:59:05 2016 -0700 + + Update services.md + +commit 38c8a6c7031d4e81894319f328112288022f7125 +Merge: 51f0aa2a19 9039fe6f82 +Author: LRubin +Date: Tue Oct 4 16:47:39 2016 -0700 + + Merge pull request #40 from sanscontext/api-2 + + More cloud API docs fixes + +commit 9039fe6f820dbf19b76711ef69d2b117508b0c25 +Author: LRubin +Date: Tue Oct 4 16:10:49 2016 -0700 + + remove file that was causing a path conflict + + Signed-off-by: LRubin + +commit 925e28bdc8c08d155a88a2c86bef84d8ac9ef062 +Author: LRubin +Date: Tue Oct 4 16:02:38 2016 -0700 + + and change TOC back to point to old path + + Signed-off-by: LRubin + +commit d02565028c0e1a86dd872c9cd345b4dd9af1924b +Author: LRubin +Date: Tue Oct 4 15:56:03 2016 -0700 + + checking in source to better diff + + Signed-off-by: LRubin + +commit 55be806bd7bc1541608286d9ec289eec4ee35d82 +Author: LRubin +Date: Tue Oct 4 15:53:07 2016 -0700 + + check in apidocs move + + Signed-off-by: LRubin + +commit 51f0aa2a198665dd37b2c9657bf0ebc46b7fe2ba +Merge: 82d9ab91b2 8ea8f5a20e +Author: Victoria Bialas +Date: Tue Oct 4 15:44:06 2016 -0700 + + Merge pull request #30 from holtkamp/patch-1 + + Extend applications which suffer from poor performance + +commit 82d9ab91b26d9d739a7b9db4407c01b4884ac3f1 +Merge: c1188953ba f590974263 +Author: Victoria Bialas +Date: Tue Oct 4 15:41:45 2016 -0700 + + Merge pull request #36 from mrburrito/aws-iam-roles + + Doc update to support standard AWS credential loading. + +commit c1188953ba031dade829fa832943479fbed5d7d3 +Merge: d2cc9fe885 bdbde3fb18 +Author: Victoria Bialas +Date: Tue Oct 4 15:40:53 2016 -0700 + + Merge pull request #39 from londoncalling/fix-machine-drivers-menu-position + + repositioned Drivers menu item directly under Machine topic + +commit d2cc9fe885867fc7719cc403737579ccaff1b6ac +Merge: 55e31bb0f6 7480dc4e2a +Author: John Mulhausen +Date: Tue Oct 4 15:38:45 2016 -0700 + + Merge branch 'master' of https://github.com/docker/docker.github.io + +commit 55e31bb0f64948f4764c5a0bf8d21607960e6f63 +Author: John Mulhausen +Date: Tue Oct 4 15:38:40 2016 -0700 + + Staging container fixes + +commit bdbde3fb18e4335906548881df7b995bfb2d1450 +Author: Victoria Bialas +Date: Tue Oct 4 15:32:37 2016 -0700 + + repositioned Drivers menu item directly under Machine topic + + Signed-off-by: Victoria Bialas + +commit 7480dc4e2abbaf4b776ce509b198ced114317d7b +Merge: bb83c5f605 a9b79591cf +Author: Victoria Bialas +Date: Tue Oct 4 15:24:16 2016 -0700 + + Merge pull request #37 from mrburrito/aws-userdata + + Doc change to support custom userdata option for docker-machine AWS driver + +commit bb83c5f605593911d15d69dcf0d58391a7b44d86 +Author: John Mulhausen +Date: Tue Oct 4 15:24:14 2016 -0700 + + Update rhel.md + +commit a9b79591cf782cc89d20d0add56d7de78245b5bf +Author: Gordon Shankman +Date: Tue Oct 4 17:05:20 2016 -0400 + + Migrating docs changes from machine PR https://github.com/docker/machine/pull/3779 + + Signed-off-by: Gordon Shankman + +commit f59097426352c02972f1758031b8775b199eaa51 +Author: Gordon Shankman +Date: Tue Oct 4 16:59:58 2016 -0400 + + Docs changes from machine PR https://github.com/docker/machine/pull/3799 + + Signed-off-by: Gordon Shankman + +commit f6f3fdbfb764d6a861e3b14b63549976aa22dd65 +Merge: 3d20fab706 300486bd77 +Author: Victoria Bialas +Date: Tue Oct 4 12:51:42 2016 -0700 + + Merge pull request #35 from londoncalling/rem-ubuntu-wily-werewolf-build-deb-targets + + removed ubuntu wily 15.10 references in install docs + +commit 300486bd77b3c0e88bb5da3ccf2794f0d87ce6d9 +Author: Victoria Bialas +Date: Tue Oct 4 12:37:39 2016 -0700 + + removed ubuntu wily 15.10 references in install docs + + Signed-off-by: Victoria Bialas + +commit 3d20fab70603695c30154b03ed566b4f0bcac521 +Merge: 83991d6998 dde1ef8bb5 +Author: Victoria Bialas +Date: Tue Oct 4 12:28:01 2016 -0700 + + Merge pull request #34 from londoncalling/d4mwin-symlinks-note + + added note re: symlinks + +commit 83991d6998c5d6673c71799cfa006d728e6add5e +Merge: 655034098d cf150d8a50 +Author: John Mulhausen +Date: Tue Oct 4 12:14:08 2016 -0700 + + Merge pull request #32 from sanscontext/test-api + + fixes up cloud api docs + +commit cf150d8a509eb46d7a46ee6a4dfc85345e459a51 +Author: LRubin +Date: Tue Oct 4 12:00:05 2016 -0700 + + point the TOC to the right serve dir + + Signed-off-by: LRubin + +commit dde1ef8bb5956d06fee13623c5948a9d3effbb53 +Author: Victoria Bialas +Date: Tue Oct 4 11:44:20 2016 -0700 + + added note re: symlinks + + Signed-off-by: Victoria Bialas + +commit 655034098d3454c627467967fb5c23a7fb698e77 +Merge: 32d7713d8f 432f9af1d3 +Author: Victoria Bialas +Date: Tue Oct 4 11:30:07 2016 -0700 + + Merge pull request #31 from londoncalling/fix-kitematic-html-issues + + fixing HTML on Kitematic, Mac, Windows, Toolbox docs + +commit 32d7713d8f4e4a5d8c98e547ed30fcd7f99ef167 +Merge: f759b96301 b244267e7f +Author: LRubin +Date: Tue Oct 4 11:20:28 2016 -0700 + + Merge pull request #27 from johndmulhausen/master + + Move Cloud API Docs source into repo + +commit 432f9af1d354d3679c69fe0a2fe59c87aa86ceef +Author: Victoria Bialas +Date: Mon Oct 3 16:09:10 2016 -0700 + + fixing HTML on Kitematic, Mac, Windows, Toolbox docs for github.io rendering, plus copyedits + + copyedits + + Signed-off-by: Victoria Bialas + +commit 524849097222ce0007f531725e89d7e441cad14b +Author: LRubin +Date: Tue Oct 4 11:11:14 2016 -0700 + + fixes up cloud api docs + + Signed-off-by: LRubin + +commit 605a58d27325df3080ad65d876b3235f24f7ee16 +Merge: 71b5bcd3b1 65ec94fd1a +Author: Joao Fernandes +Date: Tue Oct 4 10:46:42 2016 -0700 + + Merge pull request #3177 from joaofnfernandes/customize-certs + + Add docs on how to configure certs + +commit 71b5bcd3b13cf3b2441443bff04755fd309a632c +Merge: 07161fb640 1fdfe678e3 +Author: Joao Fernandes +Date: Tue Oct 4 10:45:27 2016 -0700 + + Merge pull request #3173 from joaofnfernandes/review-install-docs + + Updates installation docs + +commit 65ec94fd1ae2a58a32b8e40c8485a71f10e722e1 +Author: Joao Fernandes +Date: Mon Oct 3 17:07:09 2016 -0700 + + Add docs on how to configure certs + +commit 1fdfe678e35998fdd4a48ef901814d60f2311d0e +Author: Joao Fernandes +Date: Mon Oct 3 13:30:15 2016 -0700 + + Updates installation docs + +commit 8ea8f5a20eaa699cf70b9dc88f504efd54e6d5a7 +Author: Menno Holtkamp +Date: Tue Oct 4 17:03:28 2016 +0200 + + Extend applications which suffer from poor performance + +commit f759b96301b3d889a6903284a7e7fa1b07f0f19c +Author: John Mulhausen +Date: Tue Oct 4 00:55:23 2016 -0700 + + Update docker_elevator_pitch.md + +commit 8fc96d838f48523f9a53b2fe3ff84bcac7f3e439 +Author: John Mulhausen +Date: Tue Oct 4 00:44:49 2016 -0700 + + Update README.md + +commit 8f613118626bb3a4e0aa94eae1078ec391a47601 +Author: John Mulhausen +Date: Tue Oct 4 00:26:09 2016 -0700 + + Dockerfile fix for autobuild + +commit d12eeca0579852483817afaa13f8b25179e9ccb7 +Author: John Mulhausen +Date: Mon Oct 3 19:44:51 2016 -0700 + + baseurl fix + +commit e71693c5459a480490a94d1d6c457fbbea22d561 +Author: John Mulhausen +Date: Mon Oct 3 19:44:11 2016 -0700 + + baseurl fix + +commit bc04375f4e88b0cdcec431516a350513702ad7f7 +Author: John Mulhausen +Date: Mon Oct 3 17:27:35 2016 -0700 + + Create Dockerfile + +commit c1d06249df3abb3aabc29598971db5906773722b +Author: John Mulhausen +Date: Mon Oct 3 17:27:07 2016 -0700 + + Delete Dockerfile + +commit 5bfd7630340c7dfb2196cb4fce48bd72536db04d +Author: John Mulhausen +Date: Mon Oct 3 16:41:07 2016 -0700 + + Hmm, not until we figure out the corner-case + + HTTPS + Custom Subdomain + GitHub Pages seems to not work like top-level domains; working with infra for a solution. + +commit 08787918c8d426f73571f86cb6efbcdf243b96cb +Author: John Mulhausen +Date: Mon Oct 3 16:14:09 2016 -0700 + + Create CNAME + +commit 07161fb6407880b7a0ba33942256f474635452a1 +Author: Joao Fernandes +Date: Mon Oct 3 16:01:21 2016 -0700 + + Update upgrade docs + +commit 327c0c641f3d5fa8d1e7d8e646d934e912a3533f +Author: John Mulhausen +Date: Mon Oct 3 16:05:09 2016 -0700 + + Rendering fixes, part 2 + +commit 6725383ede2ed895a8d9ffdda24fc8b89eb9e85c +Merge: d3141e1381 1928e2d80f +Author: John Mulhausen +Date: Mon Oct 3 15:36:42 2016 -0700 + + Merge pull request #29 from sanscontext/cloud-fixes + + fix bugs/html in cloud docs, remove two draft store docs + +commit 1928e2d80f88c7892ef4068162705fdb515c2da7 +Author: LRubin +Date: Mon Oct 3 15:29:12 2016 -0700 + + fix bugs/html in cloud docs, remove two draft store docs + + Signed-off-by: LRubin + +commit d3141e1381b0b3652b9704c35c1a7b4900f8c01a +Author: John Mulhausen +Date: Mon Oct 3 15:17:20 2016 -0700 + + /getting-started/ is a WIP at the moment + +commit 27d8cd81933a5e01781350a3ac5a26459412fe69 +Merge: 0a846b57f4 ece826a0cd +Author: Victoria Bialas +Date: Mon Oct 3 12:39:02 2016 -0700 + + Merge pull request #28 from londoncalling/d4mac-fixhtmltables + + fixes to HTML tables, links, and markdown for proper rendering on git… + +commit ece826a0cd4f2a36ae2664ed147f07f766a14903 +Author: Victoria Bialas +Date: Mon Oct 3 12:30:16 2016 -0700 + + fixes to HTML tables, links, and markdown for proper rendering on github.io + + Signed-off-by: Victoria Bialas + +commit 0a846b57f447a18ddf23bb83e21884ea6c6f5a13 +Author: John Mulhausen +Date: Mon Oct 3 11:08:52 2016 -0700 + + Delete Gemfile + +commit 72e7523256e3849ff66924fad1a128b12855b964 +Author: John Mulhausen +Date: Sun Oct 2 13:56:28 2016 -0700 + + Update README.md + +commit 798359abf853c628c0825993a448f3f873531254 +Author: John Mulhausen +Date: Sun Oct 2 13:54:35 2016 -0700 + + Update README.md + +commit a0ee6c600473c9cd2036480535595f08845981ca +Author: John Mulhausen +Date: Fri Sep 30 19:38:30 2016 -0700 + + Rendering fixes, part 1 (up through cs-engine) + +commit 39055aeab4096facd4f5b213dfb8f931fbccc079 +Author: John Mulhausen +Date: Fri Sep 30 19:00:09 2016 -0700 + + Fix for out-of-sync TOC + +commit 69ddac1efc18c7f9aee3832bcf0679ac503a9b2c +Author: John Mulhausen +Date: Fri Sep 30 18:59:14 2016 -0700 + + Fix for broken link and too-close Feedback box + +commit b244267e7f5841f9857506d7e5bdf883cced1663 +Author: John Mulhausen +Date: Fri Sep 30 18:47:12 2016 -0700 + + Create Gemfile.lock + +commit f4fd11984210104881d2437ef8a2e46d33cbe559 +Author: John Mulhausen +Date: Fri Sep 30 18:44:57 2016 -0700 + + Move of cloud-api-docs + +commit 9c299f523870d66585d0158ff5b2425f58633125 +Author: John Mulhausen +Date: Fri Sep 30 18:13:45 2016 -0700 + + Pic fix + +commit c35362633c39b571930f4809b8e11749a82f710b +Author: John Mulhausen +Date: Fri Sep 30 16:41:43 2016 -0700 + + Fixes for snippets in lists + +commit 79fb2534f2fabc93661b61129bf150ef53ae3839 +Author: John Mulhausen +Date: Fri Sep 30 16:22:45 2016 -0700 + + Fix for snippet-within-list + +commit 37c8021e4261bd87aa69b973959d96706add955f +Author: John Mulhausen +Date: Fri Sep 30 14:30:40 2016 -0700 + + Fix for nested Docker Engine TOC + +commit 7c615e83a30aa21c93713c3c6147e053249a2328 +Author: John Mulhausen +Date: Fri Sep 30 14:13:15 2016 -0700 + + All page links + +commit 0133cb646d7674b83335fed483b0588581de9c9c +Merge: 7e8b6603d6 6cd3fe8bd2 +Author: John Mulhausen +Date: Fri Sep 30 11:51:42 2016 -0700 + + Merge pull request #21 from pborreli/typos + + Fixed typos + +commit 7e8b6603d62179dfa4d12096357fdb8696597670 +Merge: 066b78bf86 6c71c030ab +Author: John Mulhausen +Date: Fri Sep 30 11:30:35 2016 -0700 + + Merge pull request #20 from mstanleyjones/add_migration_readme + + Add migration details + +commit 6c71c030abd6a918dab0e5342072ed3b3b7e05d0 +Author: Misty Stanley-Jones +Date: Fri Sep 30 10:20:01 2016 -0700 + + Add migration details + +commit 066b78bf86032c065b367028f674d1398e15967c +Author: John Mulhausen +Date: Fri Sep 30 01:51:56 2016 -0700 + + Content rendering fixes + +commit 82d33c504a5ebb434373c6f816abb1429b2840d3 +Author: John Mulhausen +Date: Fri Sep 30 00:33:31 2016 -0700 + + Delete LICENSE + +commit 0ad083ff1fb1b71ba062040415112d85c486ff7f +Author: John Mulhausen +Date: Thu Sep 29 23:40:58 2016 -0700 + + Delete Makefile + +commit d8b77174676f9b97b016329a617c6016805bd6af +Author: John Mulhausen +Date: Thu Sep 29 23:40:48 2016 -0700 + + Delete Dockerfile + +commit 99bab305bd37b9aa778d5a1738a117287f2c667c +Author: John Mulhausen +Date: Thu Sep 29 23:38:12 2016 -0700 + + Removing merge detritus + +commit 843b052401ed5d4a9f182e92583edbb2866bf37a +Author: John Mulhausen +Date: Thu Sep 29 22:56:42 2016 -0700 + + Fix for in-page anchor links + +commit 42964d8b7d1bd3731b1169b7a1a16adcc76c6fe6 +Author: John Mulhausen +Date: Thu Sep 29 22:39:30 2016 -0700 + + Removing empty front-matter + +commit 69b61e1fb96576f93ae346e2fbe646e85d3e7dbe +Author: John Mulhausen +Date: Thu Sep 29 19:43:26 2016 -0700 + + http only for AWS + +commit b58c93bb4072b09b499d0a795ff374fdf7b5fd66 +Author: John Mulhausen +Date: Thu Sep 29 19:39:14 2016 -0700 + + Fixes for forwarding, custom 404 + +commit 1465790db08f31df5cba6783cc33ef35d5a8575b +Author: John Mulhausen +Date: Thu Sep 29 18:55:02 2016 -0700 + + Custom 404, Docs Archive, Archive Forwarding + +commit 6cd3fe8bd2799e3eadc67bae401b9c95d82055c4 +Author: Pascal Borreli +Date: Fri Sep 23 23:38:17 2016 +0100 + + Fixed typos + +commit d53c6798c9f6b7046ae04277eb4d25ccffc1f0af +Author: Misty Stanley-Jones +Date: Thu Sep 29 12:21:06 2016 -0700 + + Convert TOML to YAML, tweaks to work with Jekyll + +commit 9f31bb790d154147d1e7cb48c7774c3f08f5682a +Author: Misty Stanley-Jones +Date: Thu Sep 29 12:13:47 2016 -0700 + + Put back inadvertently deleted compose directory + +commit 5f5eb93dfa31dd7ee3b8d96f36634f2f64d42ef3 +Author: Misty Stanley-Jones +Date: Thu Sep 29 12:11:53 2016 -0700 + + Moved pinata imported docs to top level subdirectory + +commit 3165f14c78bf2c5101194ec82c0ec80f962436ab +Author: Misty Stanley-Jones +Date: Thu Sep 29 12:11:03 2016 -0700 + + Initial import of https://github.com/docker/pinata + +commit 978130dcf460eea2a9a35b8775c6f3091da98eb9 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:35:02 2016 -0700 + + Moved docs to docker-cloud + +commit 15efc2d85179b45dd39fdd3afaf1c7c59ece2f07 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:31:42 2016 -0700 + + Initial import of https://github.com/docker/cloud-docs + +commit 9d5e59d503fdfe8bd2c9fe0f9e965df318a01267 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:19:31 2016 -0700 + + Moved engine imported docs to the engine subdirectory + +commit 6a54b082a82a5bf9a0270f430259f9352b967ef9 +Merge: 701f170a21 3134c23b55 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:17:56 2016 -0700 + + Initial import of https://github.com/docker/docker + +commit 3134c23b55eb10031e9dc4c9562e95ea03409d2f +Merge: 88ce3d60b9 a114655b56 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:12:42 2016 -0700 + + Merge pull request #27040 from mstanleyjones/fix_labels_nav_pick + + Merge pull request #27036 from mstanleyjones/fix_labels_nav + +commit a114655b5631a01ba8227214ff88494041e14771 +Author: Misty Stanley-Jones +Date: Thu Sep 29 11:04:46 2016 -0700 + + Merge pull request #27036 from mstanleyjones/fix_labels_nav + + Fix menu position of the labels-custom-metadata.md topic + (cherry picked from commit a3286783bcfbfd6e58d16e1b189138580b08facc) + + Signed-off-by: Misty Stanley-Jones + +commit 701f170a2197f98c386b17a311701f494473f2f6 +Author: Misty Stanley-Jones +Date: Thu Sep 29 10:38:46 2016 -0700 + + Move docker-hub docs to docker-hub subdirectory + +commit 4d1a62276e2520f7a1568ea27022738e24ebd66c +Author: Misty Stanley-Jones +Date: Thu Sep 29 10:35:53 2016 -0700 + + Imitial import of https://github.com/docker/hub2-demo + +commit 88ce3d60b932ffc782a3d4f76d5641c97c9d0b66 +Merge: cd15b2b300 ed69445474 +Author: Sebastiaan van Stijn +Date: Thu Sep 29 19:27:49 2016 +0200 + + Merge pull request #27032 from mstanleyjones/fix_image_link_pick + + Merge pull request #27031 from mstanleyjones/fix_broken_image_link + +commit ed6944547491c32cbf42686e9076c92a1e9c111c +Author: Sebastiaan van Stijn +Date: Thu Sep 29 19:21:30 2016 +0200 + + Merge pull request #27031 from mstanleyjones/fix_broken_image_link + + Revert "Add direct link to event chart image" + (cherry picked from commit 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23) + + Signed-off-by: Misty Stanley-Jones + +commit cd15b2b300c179ec7245e8cfb48bf4374cd55093 +Merge: 45bed2cc80 68aca71637 +Author: Sebastiaan van Stijn +Date: Thu Sep 29 17:58:12 2016 +0200 + + Merge pull request #27022 from thaJeztah/docs-cherry-picks-1.12.2 + + Docs cherry picks 1.12.2 + +commit 68aca716376e0b500356723e328aedff088c78a3 +Author: Misty Stanley-Jones +Date: Wed Sep 28 20:19:00 2016 -0700 + + Fix link to non-existent file + + Signed-off-by: Misty Stanley-Jones + (cherry picked from commit ca04f02d7655e7306c7c0cde6fa1895a14f0a673) + Signed-off-by: Sebastiaan van Stijn + +commit 735622fdf4e9ecdd52d672618a8acf151041fed3 +Author: Victoria Bialas +Date: Tue Sep 27 14:21:17 2016 -0700 + + added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits + + Signed-off-by: Victoria Bialas + (cherry picked from commit 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc) + Signed-off-by: Sebastiaan van Stijn + +commit ca474f7808bbf3c75f32a0f2c05ece68cc55c7c4 +Author: Sebastiaan van Stijn +Date: Tue Sep 27 01:02:57 2016 +0200 + + Fix incorrect aux-address examples and test + + The (host)name for aux-addresses should + be unique, otherwise later values overwrite + earlier values. + + Before this change, the example command + would send this API request; + + { + "Attachable": false, + "CheckDuplicate": true, + "Driver": "overlay", + "EnableIPv6": false, + "IPAM": { + "Config": [ + { + "Gateway": "192.168.0.100", + "IPRange": "192.168.1.0/24", + "Subnet": "192.168.0.0/16" + }, + { + "AuxiliaryAddresses": { + "a": "192.170.1.5", + "b": "192.170.1.6" + }, + "Gateway": "192.170.0.100", + "Subnet": "192.170.0.0/16" + } + ], + "Driver": "default", + "Options": { + } + }, + "Internal": false, + "Labels": { + }, + "Name": "my-multihost-network", + "Options": { + } + } + + After this change, the request looks + like this (all aux-addresses preserved); + + { + "Attachable": false, + "CheckDuplicate": true, + "Driver": "overlay", + "EnableIPv6": false, + "IPAM": { + "Config": [ + { + "AuxiliaryAddresses": { + "my-router": "192.168.1.5", + "my-switch": "192.168.1.6" + }, + "Gateway": "192.168.0.100", + "IPRange": "192.168.1.0/24", + "Subnet": "192.168.0.0/16" + }, + { + "AuxiliaryAddresses": { + "my-printer": "192.170.1.5", + "my-nas": "192.170.1.6" + }, + "Gateway": "192.170.0.100", + "Subnet": "192.170.0.0/16" + } + ], + "Driver": "default", + "Options": { + } + }, + "Internal": false, + "Labels": { + }, + "Name": "my-multihost-network", + "Options": { + } + } + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit fd7161bb3061e2e2f56faed1a4ba1f7a887627bf) + Signed-off-by: Sebastiaan van Stijn + +commit c93303b8d7eecc3f9250665869fa1ea1f159f656 +Author: allencloud +Date: Fri Aug 26 00:34:32 2016 +0800 + + move mcvlan out of experimental docs + + Signed-off-by: allencloud + (cherry picked from commit 6e4ec046f4a267083b1bd07028d1b68eb248a950) + Signed-off-by: Sebastiaan van Stijn + +commit 96b5ec8f50491759eb84d122fb690dae2c9a393d +Author: yuexiao-wang +Date: Mon Sep 26 15:03:56 2016 +0800 + + Fix the broken link + + Signed-off-by: yuexiao-wang + (cherry picked from commit cfb07e642d23622412c5455ca70c42140268f9fe) + Signed-off-by: Sebastiaan van Stijn + +commit 394ce0c9c1e085f19fbae045835813d56f58ec2f +Author: yuexiao-wang +Date: Mon Sep 26 14:28:31 2016 +0800 + + Fix typo for how pki works + + Signed-off-by: yuexiao-wang + (cherry picked from commit bf9c6d3115dd388cf379ec1a80d29104521a7b42) + Signed-off-by: Sebastiaan van Stijn + +commit 729717568b1c0e1a02e286ed1aa6d317c4370597 +Author: lixiaobing10051267 +Date: Fri Sep 23 17:37:45 2016 +0800 + + the network id is not consistant with the real id created + + Signed-off-by: lixiaobing10051267 + (cherry picked from commit 392aae44fd8ea5755305104e1c2a1c85f39d4a07) + Signed-off-by: Sebastiaan van Stijn + +commit fc884da8174e111d22fc4cfe172235b39ff2ebb2 +Author: Sebastiaan van Stijn +Date: Thu Sep 22 23:26:49 2016 +0200 + + Add missing API docs for "privileged" and "user" exec + + The "user" feature was added in docker 1.7.0, and + "privileged" feature was added in docker 1.9.0 + only contained CLI docs. + + This adds the missing API docs. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8) + Signed-off-by: Sebastiaan van Stijn + +commit 9363b42e59c6491ae54c2455e7240b2598918f9b +Author: Hans Kristian Flaatten +Date: Thu Sep 22 14:19:14 2016 +0200 + + docs: add missing 'on' in Oracle installation guide + + Signed-off-by: Hans Kristian Flaatten + (cherry picked from commit 838fe65e5332dd79f5cf8551d70906d9801f79fb) + Signed-off-by: Sebastiaan van Stijn + +commit 2659333a27832bad4ea7c7bc8fd4816ee52e27a2 +Author: Jeff Silberman +Date: Tue Sep 20 20:49:30 2016 -0700 + + Add Portworx Volume Plugin Description + + Signed-off-by: Jeff Silberman + (cherry picked from commit da2159ea1c366ac64b0f498a8aca0ee595dae558) + Signed-off-by: Sebastiaan van Stijn + +commit 67610e9dea836475522c2cdb92d15ebd31220cb3 +Author: Misty Stanley-Jones +Date: Thu Sep 15 17:26:12 2016 -0700 + + Restructure content about Docker object labels + + A few points of work: + + - Took the topic out of the left-hand nav and made it + reachable from the User guide intro + + - Condensed the topic's contents, presenting only conceptual + info and pointing instead to the command-line references + for each type of object + + - Added brief information about the `LABELS` keyword to the + Dockerfile reference + + A big part of the point is to establish a pattern of + thinking and use around how Docker uses labels and what they + mean in different contexts. + + Signed-off-by: Misty Stanley-Jones + (cherry picked from commit 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd) + Signed-off-by: Sebastiaan van Stijn + +commit 121cd6f9e6529b53b7674548b77881cc6976286b +Author: Sebastiaan van Stijn +Date: Tue Sep 20 13:51:55 2016 +0200 + + Fix incorrectly named API options + + This renames `MaximumIOps` to `IOMaximumBandwidth`, + and `MaximumIOBps` to `IOMaximumIOps` to match + the actual code. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 36a25bdbe4d973aef308fa11b450264dae1bc0b4) + Signed-off-by: Sebastiaan van Stijn + +commit d4288a32128711f81fbe904215d51ef5ad783348 +Author: yuexiao-wang +Date: Tue Sep 20 11:14:58 2016 +0800 + + Update on index refernce documentation + + Signed-off-by: yuexiao-wang + (cherry picked from commit 0483d776130aa6b7add845bdab3d1d8ee67f7480) + Signed-off-by: Sebastiaan van Stijn + +commit cdda81146b0661301dc0feedde9509a80212e009 +Author: Sebastiaan van Stijn +Date: Thu Sep 15 15:43:26 2016 +0200 + + Update API docs for "HostConfig.Binds" + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 708892c4037e9eef6f6c25b5a3551f7779fb8868) + Signed-off-by: Sebastiaan van Stijn + +commit ddc58225f3f842b2b8f1557447c3ede5b71475f1 +Author: Steven Erenst +Date: Mon Sep 19 09:40:42 2016 -0700 + + Fix regex for the json-file logger opts in overview.md + + The regex used to describe the max-file and max-size logging options for + the json-file logger were incorrect. The regexes would only match a + single character (a digit or a literal +). Instead the regexes should + match 1 or more digits. + + The character class for the units of the max-size also included a pipe + which meant that the regex would match 1| instead of only matching 1m, + 1k, and 1g. + + Signed-off-by: Steven Erenst + (cherry picked from commit e9a9015e38fc0996a3dae61393885414b092103f) + Signed-off-by: Sebastiaan van Stijn + +commit 22a3332325ebe3900a8ad350a4378f4ddd23cee3 +Author: Sebastiaan van Stijn +Date: Mon Sep 19 16:12:16 2016 +0200 + + Cleanup / sync RHEL, CentOS, Fedora installation docs + + These installation procedures are very similar, so + synchronized these docs and removed some differences. + + Also; + + - updated markdown, added language-hints where possible + - replaced "service docker start" with "systemctl start" + - replaced "chkconfig docker on" with "systemctl enable" + - added "systemctl enable" to the list of steps for + installation, because most people want to have docker + started automatically (and overlooked this step). + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd) + Signed-off-by: Sebastiaan van Stijn + +commit 7df1b6a96222b4c68f7cc7440aebc3c7e58fb8cd +Author: Alex Olshansky +Date: Mon Sep 19 15:53:25 2016 +0200 + + Fix typos in installation doc for Mac + + Signed-off-by: Alex Olshansky + (cherry picked from commit f7af5cc780cb49b6115c726687dec5ef361ca5fb) + Signed-off-by: Sebastiaan van Stijn + +commit 7da3e5d0b212fd082592597268df992759703cdb +Author: Sebastiaan van Stijn +Date: Mon Sep 19 13:57:39 2016 +0200 + + Fix Markdown formatting and missing prompt in service create + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 533b00da8bed8336debf99a03f2fd2a0692fac6e) + Signed-off-by: Sebastiaan van Stijn + +commit 03a4e9a3979672c932f9337043ea3e3d59b63390 +Author: Sebastiaan van Stijn +Date: Mon Sep 19 12:52:13 2016 +0200 + + Update sshd example to use ubuntu 16.04 + + Although the example is just for illustrational + purposes, many users are now switching to + Ubuntu 16.04 as the "default" version for Ubuntu, + so updating the example for those that use + this example as a starting point. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit b81d12e7a10abfb55f164105365ff175a95ae9e9) + Signed-off-by: Sebastiaan van Stijn + +commit 5508a82cacba4f370ac9b1d7aaae7dae630d1097 +Author: yuexiao-wang +Date: Sun Sep 18 11:00:19 2016 +0800 + + fix typo for docs reference + + Signed-off-by: yuexiao-wang + (cherry picked from commit 0f0b0db842e53c81191385395d6d040574eeb0d9) + Signed-off-by: Sebastiaan van Stijn + +commit 0e29518469b3658d920086ab98159d00745598a5 +Author: Misty Stanley-Jones +Date: Fri Sep 9 17:29:32 2016 -0700 + + Misty's edits and additions + + Signed-off-by: Misty Stanley-Jones + (cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e) + (cherry picked from commit 5880d629533d9b8ad9889500fe841cb2e31a71c8) + Signed-off-by: Sebastiaan van Stijn + +commit 3bd4612aaf043e4673855ce99dbbe706ecfbb9d6 +Author: Sebastiaan van Stijn +Date: Mon Aug 15 23:51:15 2016 +0200 + + Add --mount syntax documentation to CLI reference + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit eb3a01eb432473beae968a0c9f3817af8b7a7d53) + Signed-off-by: Sebastiaan van Stijn + +commit f81e4e8d577dbeacb597bcbbe76908904e4e91ed +Author: YuPengZTE +Date: Sun Sep 18 09:21:03 2016 +0800 + + The hit is missed + + Signed-off-by: YuPengZTE + (cherry picked from commit ced272984157e277523a942505435aa392913ac4) + Signed-off-by: Sebastiaan van Stijn + +commit 1edf705917d394242d34f9a8b0103135dce5389f +Author: pestophagous +Date: Sat Sep 17 15:37:03 2016 -0700 + + Fix typo in docs. s/methodoligies/methodologies/ + + Signed-off-by: K Heller + (cherry picked from commit 191adcfb637ea1b52d2da9a75e4e1e4938d9550c) + Signed-off-by: Sebastiaan van Stijn + +commit 9a207a7eb7df26053c9490c205f3bf0cc5cd576f +Author: Sebastiaan van Stijn +Date: Sat Sep 17 03:02:12 2016 +0200 + + Synchronize API docs + + This synchronizes changes between API versions, and: + + - applies e0a552504e64192946c86d3bdd517ae7b3af348f to + older versions of the documentation + - applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to + API version 1.25 + - syncs some minor differences + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5) + Signed-off-by: Sebastiaan van Stijn + +commit ac1eb9edd018b86e40fd5ef70b8874339fb57873 +Author: Sebastiaan van Stijn +Date: Fri Sep 16 16:39:57 2016 +0200 + + Fix service and tasks API documentation + + The documentation contained some outdated information + on these endpoints. + + This change fixes those parts of the documentation + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit d69409fd43e73829209315de79abf79000c4c720) + Signed-off-by: Sebastiaan van Stijn + +commit f9f6145003ec0124b036150adbe7b1ccfd7e7093 +Author: lixiaobing10051267 +Date: Wed Sep 14 17:36:48 2016 +0800 + + add bash symbol for docker network inspect + + Signed-off-by: lixiaobing10051267 + (cherry picked from commit 7c3a26db166bf4d618ae414470f6bed7160f1371) + Signed-off-by: Sebastiaan van Stijn + +commit e289fc155a0057e1d6b5b5f0d08fe337d7f9b4ea +Author: Alessandro Boch +Date: Fri Sep 2 15:39:22 2016 -0700 + + Fix mtu option in documentation + + Signed-off-by: Alessandro Boch + (cherry picked from commit e74a937b00af567b655c93224cc6a514f54e2b38) + Signed-off-by: Sebastiaan van Stijn + +commit 8ae21d6d4de4b07625909073444d7a026c2ec535 +Author: YuPengZTE +Date: Fri Sep 2 16:11:07 2016 +0800 + + The etc and dot is seprated + + Signed-off-by: YuPengZTE + (cherry picked from commit bd914ff5a31b1b39bdd9c0fbacf76c65c2b1e842) + Signed-off-by: Sebastiaan van Stijn + +commit bcc70e52eb7c2d61abd795813b2685142f65d4a7 +Author: Josh Bodah +Date: Fri Sep 16 15:32:12 2016 -0400 + + Remove extra paren in `run --link` docs + + Signed-off-by: Josh Bodah + (cherry picked from commit 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9) + Signed-off-by: Sebastiaan van Stijn + +commit c84d8b836010626ab8001fcc04b50cd1c8dee897 +Author: Sebastiaan van Stijn +Date: Fri Sep 16 17:22:58 2016 +0200 + + Use "sudo" for dockerd examples + + Because we standardize on using a non-privileged + prompt (`$`) instead of `#`, replacing the + examples to use `sudo` instead to indicate + this has to be run as root. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4) + Signed-off-by: Sebastiaan van Stijn + +commit ae9b46dbd0f7ec64c596758931ddef3f0fc82371 +Author: Sebastiaan van Stijn +Date: Fri Sep 16 15:29:28 2016 +0200 + + Add link to logging drivers reference + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 7ca02f86de2ceef980cad98faefc15cbc628c91a) + Signed-off-by: Sebastiaan van Stijn + +commit 7fad9da9f23fee14900528de6fc41f840788bd0d +Author: Antonio Murdaca +Date: Fri Sep 16 11:02:08 2016 +0200 + + docs: reference: api: clarify pull all tags + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 03a8b6798d030a952e85f15208aeea1215e3f801) + Signed-off-by: Sebastiaan van Stijn + +commit a8aaf5bfadbd98d507e358606dc928d2f7dfffcb +Author: Sebastiaan van Stijn +Date: Thu Sep 15 18:53:46 2016 +0200 + + Synchronize push reference with man page + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit dddea689ab45ce146e6ac3a1199235e1f36ffe29) + Signed-off-by: Sebastiaan van Stijn + +commit c6ba6498b35023a8261b0f88589e4ee205699b31 +Author: Sebastiaan van Stijn +Date: Thu Sep 15 16:06:29 2016 +0200 + + Restore missing "format" example + + The "format" example got lost during the + rewrite of the documentation for Cobra. This + restores the missing example. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit edbb8fb86d7d0b715adc15415f0cb187433092a5) + Signed-off-by: Sebastiaan van Stijn + +commit af46f0242ecf805490dc6ab1666d1978915dfb0c +Author: Yong Tang +Date: Wed Sep 14 13:28:19 2016 -0700 + + Fix a couple of issues in Get Started docs + + This fix fixes a couple of issues in Get Started docs' Step Four: + 1. `Sending build context to Docker daemon 158.8 MB` should be + `Sending build context to Docker daemon 2.048 kB` as there is only + one Dockerfile for context. + + 2. There are only 3 steps altogether in stead of 4 steps as + `RUN apt-get -y update && apt-get install -y fortunes` is one step. + So `Step 3 : RUN apt-get install -y fortunes` should be removed and + `Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to + `Step 3 : CMD /usr/games/fortune -a | cowsay` + + Signed-off-by: Yong Tang + (cherry picked from commit 1cd06fdd1ac5ce1f91291330d9f89679468ce393) + Signed-off-by: Sebastiaan van Stijn + +commit c9ce561ac0fc2c29fb4f46ab6afe10dd5da2a091 +Author: Sebastiaan van Stijn +Date: Wed Sep 14 23:16:32 2016 +0200 + + Add direct link to event chart image + + This adds a direct link to the event chart image + so that the full-resolution image can be "zoomed" + in to. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 86de72fef244b3fe209e5793deb40fb26f5b318e) + Signed-off-by: Sebastiaan van Stijn + +commit 792c545f52af870c5d3b2d63c2e8f8b6bfa0166b +Author: Sebastiaan van Stijn +Date: Wed Sep 14 18:08:08 2016 +0200 + + Remove Frugalware installation docs + + These docs were outdated, and not actively + maintained. Also, there are no official packages + available for this distribution, so better to + remove it from the documentation. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12) + Signed-off-by: Sebastiaan van Stijn + +commit cd589e16c89ed392885bdfe37012fb823b1aa328 +Author: Victor Vieux +Date: Wed Sep 7 02:34:57 2016 -0700 + + add some plugin manifest reference doc + + Signed-off-by: Victor Vieux + (cherry picked from commit 44a16acff15b5da3103fd002ad5064cb7b375106) + Signed-off-by: Sebastiaan van Stijn + +commit bc97dc1e506d3e8b4e649285108c91ef904d848e +Author: lixiaobing10051267 +Date: Wed Sep 7 11:40:50 2016 +0800 + + remove some incorrect bash symbols + + Signed-off-by: lixiaobing10051267 + (cherry picked from commit 2d1d4684f0fc752aae7e41af03a0f1589f11ee00) + Signed-off-by: Sebastiaan van Stijn + +commit 17f54b847553cdcdbe8763b5b7b100e4f7e176c9 +Author: Misty Stanley-Jones +Date: Wed Sep 28 20:45:49 2016 -0700 + + Move machine docs to machine subdirectory + +commit 29f7d3396b90bc02b1350a4dde7dd4397688b11f +Merge: 52a1ad7609 95041b4cfe +Author: Misty Stanley-Jones +Date: Wed Sep 28 20:44:12 2016 -0700 + + Initial import of https://github.com/docker/machine + +commit 52a1ad7609d11aaf4de56ab564470cd442ef3509 +Author: Misty Stanley-Jones +Date: Wed Sep 28 20:40:01 2016 -0700 + + Initial import of https://github.com/docker/pinata + +commit 5425536e14c44149ba7d2c3220029c579e0c6c3d +Author: Misty Stanley-Jones +Date: Wed Sep 28 20:36:30 2016 -0700 + + Initial import of https://github.com/docker/pinata + +commit 0b95b8601113f9b4343ffe660287eb3cdbc8eb28 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:46:17 2016 -0700 + + Move kitematic docs to kitematic subdirectory + +commit eaf7fc72446582e675324e9f0623ed2aea9fe176 +Merge: 4dd28a91ef 02c9f96071 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:43:46 2016 -0700 + + Initial import of https://github.com/docker/kitematic + +commit 4dd28a91ef461c99b45c25d9a3739711c1e5ab47 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:42:34 2016 -0700 + + Move opensource docs to opensource subdirectory + +commit a772b5304a3b76abcbcf69e18f87c6129293134b +Merge: b01677e524 b9b87bed67 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:41:17 2016 -0700 + + Initial import of https://github.com/docker/opensource + +commit b01677e5240c68d9fce145b06133f24f5be0e0cb +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:39:30 2016 -0700 + + Move toolbox docs to toolbox subdirectory + +commit 723b8e81fcafd3ddb9338bad212deecf78560d27 +Merge: 9c69f388c5 c645734149 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:36:10 2016 -0700 + + Initial import of https://github.com/docker/toolbox + +commit 9c69f388c52e40b47d29ff70acdd4ca796fd069e +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:35:14 2016 -0700 + + Move notary docs to notary subdirectory + +commit d522d7c6b3e3682d0f9dc8c1472c1fba4b064080 +Merge: ad063c8987 a6fda67663 +Author: Misty Stanley-Jones +Date: Wed Sep 28 16:29:48 2016 -0700 + + Initial import of https://github.com/docker/notary + +commit ad063c8987bcfb12087f48401bd485e244164c4d +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:54:30 2016 -0700 + + Move swarm docs to swarm subdirectory + +commit a78f6e80accc89692b8ca53417d7d616f6c8a433 +Merge: 7629f462d5 27968edd8a +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:53:14 2016 -0700 + + Initial import of https://github.com/docker/swarm + +commit 7629f462d560b4bfd7e7abbeb02b7effc798bca8 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:52:24 2016 -0700 + + Moved compose docs to compose subdirectory + +commit 89f6699de8fe9c03391aba76e100d3e547991040 +Merge: df52708a85 429320a4f8 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:48:48 2016 -0700 + + Initial import of https://github.com/docker/compose + +commit df52708a850bbf477a40b5b50a80894837b4ace7 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:46:28 2016 -0700 + + Moved registry docs to registry subdirectory + +commit 95951fc984270d3917caab7c1cb9117ea616fa1a +Merge: c493719f19 a9b1322edf +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:45:00 2016 -0700 + + Initial import of https://github.com/docker/distribution + +commit c493719f199b2f7f2195499b1a5833f99d20461a +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:40:26 2016 -0700 + + Move docker-store docs to docker-store subdirectory + +commit 9b50ee394325178c58fb53c946b7d77cd793f44e +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:39:20 2016 -0700 + + Initial commit -f https://github.com/docker/mercury-ui + +commit af078a5cb64adffd980063f7ff011eed8d71d78d +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:37:27 2016 -0700 + + Move docker-hub docs to docker-hub subdirectory + +commit cdc8eba140a21db8499b409706c012ad31a0bf47 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:36:23 2016 -0700 + + Imitial import of https://github.com/docker/hub2-demo + +commit 9224c67d2ec5101ebecc9e64451774822b196186 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:35:02 2016 -0700 + + Moved imported orca docs into ucp directory + +commit 060a96b814413a040913efc87c7b29b782492fbb +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:33:25 2016 -0700 + + Initial commit -f https://github.com/docker/orca + +commit e6b2531858ae7715e04be8e45acc9e94bdbbcd0a +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:29:59 2016 -0700 + + Moved docker-trusted-registry imported docs to apidocs and docker-trusted-registry subdirectories + +commit 8c1f94a90329bee701471e76a65e15b030c0d26f +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:25:04 2016 -0700 + + Initial import of https://github.com/docker/dhe-engine + +commit a4ae8a109cceeb6e2055586495b5d2506c522818 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:19:05 2016 -0700 + + Moved cs-engine docs to the cs-engine subdirectory + +commit 307ab54a22c191d93a7cb490532002edc7a79226 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:17:14 2016 -0700 + + Initial import of https://github.com/docker/cs-docker + +commit f0a62ccf9b365a29dec583be7856fb5e877ec3d9 +Author: Misty Stanley-Jones +Date: Wed Sep 28 14:14:26 2016 -0700 + + Initial repo commit + +commit 95041b4cfe2e8b260106c57907a6122da5ed7ae6 +Author: Victoria Bialas +Date: Fri Sep 23 13:37:50 2016 -0700 + + WIP: docs update for d4mac, d4win, Hyper-V driver and other virtualization factors, swarm mode + + more updates to Machine docs for creating local VMsM + + added details and example on using hyper-v driver, formatted headings for other driver docs + + copyedits + + incorporated Nathan's copyedits + + Signed-off-by: Victoria Bialas + +commit 45bed2cc80c242936d94817644783c997ee4c033 +Author: Victor Vieux +Date: Tue Sep 27 20:37:47 2016 +0000 + + Bump VERSION to v1.12.2-rc1 + + Signed-off-by: Victor Vieux + +commit 1ec9ca1ca6801113254b7c24a612ebb36c165735 +Merge: 707163c38c b6943c50f1 +Author: Victor Vieux +Date: Tue Sep 27 13:33:29 2016 -0700 + + Merge pull request #26866 from docker/cherry-picks-1.12.2 + + Cherry picks 1.12.2 + +commit 707163c38c668b58cd9fa5bc81fb0b4f0bfd2ae1 +Merge: 8f598d9027 e9c655442a +Author: Brian Goff +Date: Tue Sep 27 16:20:32 2016 -0400 + + Merge pull request #26949 from thaJeztah/revert-docker-create-rm + + 1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-doc… + +commit 8f598d90276c1cb37a58b7f28ebc2fa380f8e74d +Merge: 3d8e9bfcda f25dffe56a +Author: Sebastiaan van Stijn +Date: Tue Sep 27 21:00:48 2016 +0200 + + Merge pull request #26956 from vieux/changelog-1.12.2 + + Update CHANGELOG for 1.12.2 + +commit 3d8e9bfcdaacd77ddc5bdb156969983b7abcac0d +Merge: 667c02ce8c 2d183336ec +Author: Victor Vieux +Date: Tue Sep 27 11:37:29 2016 -0700 + + Merge pull request #26953 from mavenugo/gossip_retry + + Vendor libnetwork#1473 + +commit 2d183336ecdd0bd664891b9325dcbbb0f0a52c80 +Author: Madhu Venugopal +Date: Tue Sep 27 09:23:59 2016 -0700 + + Vendor libnetwork#1473 + + Signed-off-by: Madhu Venugopal + +commit e9c655442a1147c7310b45b24d1509c4798f019d +Author: Sebastiaan van Stijn +Date: Tue Sep 27 16:33:53 2016 +0200 + + 1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm" + + This reverts commit 44180a48e9cdef0ced94ef1aceac3fbcfc6c830a, + as `docker create --rm` is part of docker 1.13, so should + not be in the 1.12 branch + + Signed-off-by: Sebastiaan van Stijn + +commit f25dffe56aac598b6fd6957643a2055342c2487a +Author: Victor Vieux +Date: Mon Sep 26 22:10:34 2016 -0700 + + Update CHANGELOG for 1.12.2 + + Signed-off-by: Victor Vieux + +commit b6943c50f14324579916f47bb3c7820371faa4c1 +Author: Aaron Lehmann +Date: Wed Aug 31 11:44:32 2016 -0700 + + cluster: Do not autodetect advertise address on join + + On join, remote addresses are supposed to be detected by the manager + that receives the join request. However, the daemon is interfering with + this by automatically detecting an advertise address and specifying that + to the remote manager. Fix this so that an advertise address is only + specified while joining a cluster if one was given by the user. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit b1d2b088533187954d3b98ed5951ec2dbbb422e9) + Signed-off-by: Victor Vieux + +commit d5aaaa7ea3ba0601d30be418e9aae681569f260e +Author: Ji.Zhilong +Date: Fri Jul 15 22:47:31 2016 +0800 + + devmapper: prevent libdevmapper from deleting device symlinks in RemoveDeviceDeferred + + if there is no cookie set in dm task, or flag DM_UDEV_DISABLE_LIBRARY_FALLBACK + is cleared for a DM_DEV_REMOVE task, libdevmapper will fallback to clean up the + symlink under /dev/mapper by itself, no matter the device removal is executed + immediately or deferred by the kernel.In some cases, the removal is deferred by the + kernel, while the symlink is deleted directly by libdevmapper, when docker tries to + activate the device again, the deferred removal will be canceld, but the symlink will + not show up again, so docker's attempt to mount the device by the symlink will fail, + and it will eventually leads to a `docker start/diff` error. + + Fixes #24671 + + Signed-off-by: Ji.Zhilong + (cherry picked from commit 5e505d101f0201a4d045510d0a9b0c66697dedfe) + Signed-off-by: Victor Vieux + +commit f2a48d2ff3b6efab4148389d291072250c2628b8 +Author: Yong Tang +Date: Tue Aug 23 21:08:23 2016 -0700 + + Fix AuthZ plugins headers change issue + + This fix tries to address the issue raised in 25927 where + the HTTP headers have been chaged when AUthZ plugin is in + place. + + This issue is that in `FlushAll` (`pkg/authorization/response.go`), + the headers have been written (with `WriteHeader`) before all the + headers have bee copied. + + This fix fixes the issue by placing `WriteHeader` after. + + A test has been added to cover the changes.` + + This fix fixes 25927 + + Signed-off-by: Yong Tang + (cherry picked from commit 9cb8fb6ea03fcd78010ce7dd33585d96cd73e38c) + Signed-off-by: Victor Vieux + +commit 32b0633f65fae131a1ed05e69878bbfb94d320cc +Author: Satoshi Tagomori +Date: Tue Sep 20 20:31:22 2016 +0900 + + Update fluent-logger-golang to v1.2.0. + + Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference". + This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes. + + Signed-off-by: Satoshi Tagomori + (cherry picked from commit 87124b9d62bc71f7632126cf7f8d5eb805c4a7f1) + Signed-off-by: Victor Vieux + +commit 5592ee4d0748a99fd877c065ad72bb7ffc3f59b6 +Author: Thomas Leonard +Date: Wed Aug 31 17:36:10 2016 +0100 + + Fix exec form of HEALTHCHECK CMD + + We attached the JSON flag to the wrong AST node, causing Docker to treat + the exec form ["binary", "arg"] as if the shell form "binary arg" had + been used. This failed if "ls" was not present. + + Added a test to detect this. + + Fixes #26174 + + Signed-off-by: Thomas Leonard + (cherry picked from commit e95b6b51daed868094c7b66113381d5088e831b4) + Signed-off-by: Victor Vieux + +commit f4650e2eb8fe3c1c43cb702002a92237809104a1 +Author: Ron Williams +Date: Mon Aug 8 20:59:52 2016 -0700 + + Force input stream ANSI emulation for ConEmu. + + Signed-off-by: Ron Williams + (cherry picked from commit 0fd4bbda2dfb9a1bfc6781f2a3dacedc62c7c11b) + Signed-off-by: Victor Vieux + +commit 5619e72a346b9ae274241bd2c0f512194052398e +Author: Anusha Ragunathan +Date: Tue Sep 13 09:25:36 2016 -0700 + + Add retry logic during aufs unmount. + + Treat EBUSY as a transient error and retry. Also stop ignoring unmount errors. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 0e539fec331cb9dbc4ef784b55516570b11affe2) + Signed-off-by: Victor Vieux + +commit a1d191d91ee60f69f5cce4b3bb0acff0d80a404b +Author: Brian Goff +Date: Sat Sep 17 10:25:05 2016 -0400 + + re-vendor syslog package + + Fixes #26394 + + Signed-off-by: Brian Goff + (cherry picked from commit f528690674712b680caf2712092c7e2f8f236491) + Signed-off-by: Victor Vieux + +commit 708a93a8008d35ba659f42e67c476fb85fbffe48 +Author: Misty Stanley-Jones +Date: Fri Sep 2 10:21:55 2016 -0700 + + 'docker node inspect --pretty' needs an extra newline at the end + + Signed-off-by: Misty Stanley-Jones + (cherry picked from commit 341489f1500873a6aa51998f49c1da7f7fd8eb5a) + Signed-off-by: Victor Vieux + +commit 2be91b121baba427fc6e45b9361c853ab6dae4f8 +Author: Alessandro Boch +Date: Thu Sep 15 10:53:48 2016 -0700 + + Vendoring boltdb @fff57c100 + + Signed-off-by: Alessandro Boch + (cherry picked from commit 5cfbdceafe87df8bab85c0561a1483d3191eb775) + Signed-off-by: Victor Vieux + +commit 0dcd2e1a5d0258a4d83b5001c860614c26a1519d +Author: Yanqiang Miao +Date: Tue Sep 20 18:38:56 2016 +0800 + + Remove the support of setting host configuration options when the container starts + + Signed-off-by: Yanqiang Miao + + update + + Signed-off-by: Yanqiang Miao + + update + + Signed-off-by: Yanqiang Miao + + update + + Signed-off-by: Yanqiang Miao + (cherry picked from commit 26b6b47420be3e0d932a5e128ac2304b9e93efc2) + Signed-off-by: Victor Vieux + +commit e892a54fa13f8c634fe80e5b32ae783a5da03123 +Author: Yong Tang +Date: Mon Sep 5 03:11:14 2016 -0700 + + Fix incorrect help output in `docker network ls` + + As is raised in 26312, in `docker network ls`, the help output was + mistaken to `volume names`: + ``` + -q, --quiet Only display volume names + ``` + + This fix changes the help output to: + ``` + -q, --quiet Only display network IDs + ``` + + This fix also updates the documentation in: + `docs/reference/commandline/network_ls.md` + + This fix fixes 26312. + + Signed-off-by: Yong Tang + (cherry picked from commit b9e46235fadc6b390e2c04c44b6a865e4ea97cb8) + Signed-off-by: Victor Vieux + +commit 24df98212863a8a59de6e5d4e7759a75f706c3da +Author: Misty Stanley-Jones +Date: Thu Sep 1 15:38:25 2016 -0700 + + Clarify usage of --force when used on a swarm manager + + Fixes #26125 + + Signed-off-by: Misty Stanley-Jones + (cherry picked from commit 7b5c3d935a7a99b282f0f859101c887894a0b00e) + Signed-off-by: Victor Vieux + +commit fd7e763e7cc7c08133bbdd3af0fc864ea65e3804 +Author: Liam Macgillavry +Date: Fri Aug 19 10:43:15 2016 +0200 + + missed DOCKER->DOCKERD change in 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 for 'status' + + Signed-off-by: Liam Macgillavry + (cherry picked from commit 11eda60848e476c3a1d84a035642edba74e94c8a) + Signed-off-by: Victor Vieux + +commit 132a8e79634f7eee0db2ee19b0be9cf496f45076 +Author: Christopher Jones +Date: Tue Jul 5 11:54:19 2016 -0400 + + ppc64le: remove go SHA check + + Makes it consistent with other Dockerfiles. + + Signed-off-by: Christopher Jones + (cherry picked from commit d9e12cba5a9a2291f56eb3921b06ac1b5f85dfc7) + Signed-off-by: Victor Vieux + +commit aaaeb84ac62db4b82721129c393f8ad9ffa67128 +Author: Michael Crosby +Date: Fri Aug 26 10:02:10 2016 -0700 + + Check for non-nil container after match + + There can be a race between getting the container ids for matches and + getting the actual container. This makes sure that we check that the + container returned by `Get` is non-nil before adding it to the list of + matches. + + Fixes #25991 + + Signed-off-by: Michael Crosby + (cherry picked from commit a020ec4c8b476a814eb137e216fe9d723524fc3b) + Signed-off-by: Victor Vieux + +commit e18a9193d49de4a45ba4b1b6379cad7775481cd2 +Author: Nathan LeClaire +Date: Mon Sep 26 14:41:17 2016 -0700 + + Bump version to 0.8.2 + + Signed-off-by: Nathan LeClaire + +commit 667c02ce8ca12aa273f9d036d0b6488f64109508 +Merge: 38aa258343 33e855f8ae +Author: Victor Vieux +Date: Mon Sep 26 13:05:52 2016 -0700 + + Merge pull request #26765 from aaronlehmann/swarmkit-1.12.2 + + Vendor SwarmKit for 1.12.2 + +commit 38aa258343f35c75be0917f60c7d848edcd77506 +Merge: 03da508273 727402135d +Author: Victor Vieux +Date: Mon Sep 26 12:55:57 2016 -0700 + + Merge pull request #26874 from mlaventure/1.12.2-vendor-containerd + + Vendor in containerd + +commit 727402135d2e8653124e88e4fd79062ac76b906f +Author: Kenfe-Mickael Laventure +Date: Fri Sep 23 14:17:44 2016 -0700 + + Vendor in containerd + + This brings in the exec's children handling fixes + + Signed-off-by: Kenfe-Mickael Laventure + +commit 03da5082731c3617f0bbc399e2a7a718d1a3c976 +Merge: e4040acb01 ef634b95f4 +Author: Victor Vieux +Date: Sun Sep 25 00:17:00 2016 -0700 + + Merge pull request #26875 from justincormack/1.12.x-sierra-go + + Patch Go with fix for OSX Sierra + +commit e4040acb01a52550ceadbc4ba39f5a17add6a0e8 +Merge: 07fcfd0c28 df3209b4d6 +Author: Victor Vieux +Date: Sun Sep 25 00:10:50 2016 -0700 + + Merge pull request #26879 from mavenugo/ln_1.12.2 + + Vendoring libnetwork e282a91b294ab413a172b3c4e37d15fa92d79ef5 + +commit df3209b4d60650b1c7ab56949460ab606479be18 +Author: Jana Radhakrishnan +Date: Thu Sep 22 18:43:54 2016 -0700 + + Add GetListenAddress in ClusterProvider + + Signed-off-by: Jana Radhakrishnan + +commit 0ce34bdb127e3e7000968b5a594a102b5f74e797 +Author: Madhu Venugopal +Date: Fri Sep 23 17:26:40 2016 -0700 + + Vendoring libnetwork e282a91b294ab413a172b3c4e37d15fa92d79ef5 + + Carries a bunch of patches to resolve routing-mesh and swarm-mode + networking issues. + + Signed-off-by: Madhu Venugopal + +commit ef634b95f4b034fac073c347e791a0974bf76f2a +Author: Justin Cormack +Date: Fri Sep 23 23:24:20 2016 +0100 + + Patch Go with fix for OSX Sierra + + Backport this patch to the Go 1.6.3 runtime needed for OSX Sierra. + + Signed-off-by: Justin Cormack + +commit fed2495d7b1c5f0558697d019a62bb42b15758b9 +Author: Justin Cormack +Date: Thu Sep 8 12:40:39 2016 +0100 + + Update to Go 1.7.1 + + Signed-off-by: Justin Cormack + +commit 33e855f8ae04d53b62a21a34bdbd75646490efb4 +Author: Aaron Lehmann +Date: Tue Sep 20 18:24:48 2016 -0700 + + Vendor swarmkit for 1.12.2 + + Signed-off-by: Aaron Lehmann + +commit 07fcfd0c281cf7f06ff9d6fb3d181f2b6595008f +Merge: e646e927ee 1bcc2d9ab7 +Author: Sebastiaan van Stijn +Date: Fri Sep 23 17:26:55 2016 +0200 + + Merge pull request #26777 from vdemeester/1.12.x + + Fixing Regression in exit codes in 1.12 + +commit 1bcc2d9ab743e591f0894cc2314806148f464477 +Author: Vincent Demeester +Date: Wed Sep 21 16:43:13 2016 +0200 + + Fixing Regression in exit codes in 1.12 + + Signed-off-by: Vincent Demeester + +commit e646e927ee7283031336496773f485265f770703 +Merge: bb45417c91 f885d8ed5c +Author: Sebastiaan van Stijn +Date: Mon Sep 19 17:16:17 2016 +0200 + + Merge pull request #26707 from thaJeztah/revert-26320 + + [1.12.x] Revert "Merge pull request #26320 from yongtang/09052016-man-docker-c… + +commit f885d8ed5cd74d16c2cb398d3ae43e92d0a5b911 +Author: Sebastiaan van Stijn +Date: Mon Sep 19 16:54:37 2016 +0200 + + Revert "Merge pull request #26320 from yongtang/09052016-man-docker-create" + + This reverts commit f1d590c45b09f2b863f4be9ed7a5c657fb269064, which does + not apply to 1.12. + + Signed-off-by: Sebastiaan van Stijn + +commit c6457341499a196b09b0b9d6010bcce7d06b4e2c +Merge: 0c412148c3 4fdbad009c +Author: Nathan LeClaire +Date: Fri Sep 16 14:26:07 2016 -0700 + + Merge pull request #565 from londoncalling/docs-toolbox-uninstall-clarify + + clarified some details about Toolbox uninstall and Docker Machine + +commit 4fdbad009c07389ed3a0aab2edac9d15d66b86d6 +Author: Victoria Bialas +Date: Fri Sep 16 14:13:00 2016 -0700 + + clarified some details about Toolbox uninstall and Docker Machine + + Signed-off-by: Victoria Bialas + +commit bb45417c917c5f7a70c61aed10eb2f6555895d55 +Merge: 73f256760c 4da24ca1e3 +Author: Sebastiaan van Stijn +Date: Fri Sep 16 23:08:02 2016 +0200 + + Merge pull request #26603 from mstanleyjones/2016.09.13_cherry_picks + + 2016.09.13 cherry picks + +commit 4da24ca1e3f5af8c149c10dbffdcb6858460f70a +Author: Misty Stanley-Jones +Date: Thu Sep 15 08:44:06 2016 -0700 + + Set docker_remote_api_v1.25.md to draft in 1.12.x branch + + It does not apply to 1.12.x but we are leaving the file in place + to make future cherry-picks easier. + + Signed-off-by: Misty Stanley-Jones + +commit 99ed95cb57d311084d2019ab4c372c2418fc7b51 +Author: Sebastiaan van Stijn +Date: Wed Sep 14 17:48:43 2016 +0200 + + Merge pull request #26526 from lixiaobing10051267/masterSymble + + fix some incorrect symbols before executing command + (cherry picked from commit 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e) + + Signed-off-by: Misty Stanley-Jones + +commit 787ed27c32543c3ffadabe3bc9f34811d889e9b0 +Author: Justin Cormack +Date: Mon Sep 12 23:56:41 2016 +0100 + + Merge pull request #26496 from riyazdf/trust-sandbox-fix + + Use latest version of notary server in trust sandbox docs + (cherry picked from commit 6fafd07282f950799613c2ffc8eac6ff86d48206) + + Signed-off-by: Misty Stanley-Jones + +commit 9ec857ad5a5fc0ee390aa85449e889d68f00eca0 +Author: Brian Goff +Date: Mon Sep 12 09:08:35 2016 -0400 + + Merge pull request #26472 from yongtang/09112016-docker-build-step-0 + + Fix documentation for `Step 0` to `Step 1` in `docker build` + (cherry picked from commit e41839e8a154f1336b3a995dba3f5912dde7e0fe) + + Signed-off-by: Misty Stanley-Jones + +commit f784166e8a17140454acde049a52b0b17a394bf8 +Author: Sven Dowideit +Date: Mon Sep 12 10:11:08 2016 +1000 + + Merge pull request #26458 from sfsmithcha/fix_vip_diagram + + updates swarm overlay network diagram + (cherry picked from commit ae4582dc28ba33f80f17e2cf47e62e464aac7ec5) + + Signed-off-by: Misty Stanley-Jones + +commit 0183b3bf8c8c54aa88d92d4de771494388ee267a +Author: Vincent Demeester +Date: Sat Sep 10 11:50:29 2016 +0200 + + Merge pull request #26426 from sfsmithcha/carry_pry_25414 + + Carry pr 25414 + (cherry picked from commit e6f76800f5880652382a6f9180bfdefe6aaad577) + + Signed-off-by: Misty Stanley-Jones + +commit 8f264db3f12168f99d4152a76171df7dfa770d5b +Author: Sven Dowideit +Date: Mon Sep 12 10:52:30 2016 +1000 + + Merge pull request #26306 from deployable/patch-1 + + Remote API documentation consistancy + (cherry picked from commit 2cce7bf33a1af566670ec0fb2deeff8056b2798d) + + Signed-off-by: Misty Stanley-Jones + +commit b23bff1d9f73de7cad5e8dfb400a90e0cf4aae75 +Author: Michael Crosby +Date: Thu Sep 8 11:22:21 2016 -0700 + + Merge pull request #26224 from q384566678/test-zhou + + Modify rename function use tips + (cherry picked from commit 061cc417591217c4bcf735267c2de18f2a8189c0) + + Signed-off-by: Misty Stanley-Jones + +commit 0c412148c3f253adb36c627944088d8517392496 +Merge: d252e6ac51 d2936c9bcd +Author: Nathan LeClaire +Date: Thu Sep 15 17:26:50 2016 -0700 + + Merge pull request #564 from londoncalling/docs-add-uninstall + + added uninstall instructions to Toolbox docs + +commit d2936c9bcd8bffd4ef6189e3c079febe4d70f393 +Author: Victoria Bialas +Date: Thu Sep 15 17:20:34 2016 -0700 + + added uninstall instructions to Toolbox docs + + Signed-off-by: Victoria Bialas + +commit 7c8dc9e6d5a6ccedf257c85573c80b7eaaa8b650 +Author: Sebastiaan van Stijn +Date: Tue Sep 13 12:08:32 2016 +0200 + + Merge pull request #25817 from sfsmithcha/update_glossary + + add swarm mode terms to the glossary + (cherry picked from commit 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7) + + Signed-off-by: Misty Stanley-Jones + +commit c6e7fececbaf5faf29907d4f703dcbe9996888a7 +Author: Vincent Demeester +Date: Mon Aug 22 09:15:37 2016 +0200 + + Merge pull request #25719 from eskaaren/master + + You can force leave swarm + (cherry picked from commit daf454d8cd6146ef2cb644614301806ef59c58cc) + + Signed-off-by: Misty Stanley-Jones + +commit 73f256760cbbe1851dede767f4427c92a4b4c94f +Merge: 9366ba2434 01855d37be +Author: Charles Smith +Date: Tue Sep 13 16:47:12 2016 -0700 + + Merge pull request #26549 from mstanleyjones/2016.09.13_cherry_picks + + Merge pull request #26547 from londoncalling/fix-links-in-overview + +commit 01855d37bea71ded7b20c85176bf4c17a7bf757f +Author: Misty Stanley-Jones +Date: Tue Sep 13 16:30:17 2016 -0700 + + Merge pull request #26547 from londoncalling/fix-links-in-overview + + fixed on-page links + (cherry picked from commit e08b2f7a082de21f62816ccbb42dedad36d47adb) + + Signed-off-by: Misty Stanley-Jones + +commit 9366ba243448fc4f6b7fb04f593541e94eaabba3 +Merge: 7e9c951813 49dc97dbc2 +Author: Brian Goff +Date: Mon Sep 12 18:57:55 2016 -0400 + + Merge pull request #26507 from drakenator/26384-healthcheck-race + + Prevent stdout / stderr race condition in limitedBuffer + +commit 49dc97dbc26289e3b031887ab553c3833545f768 +Author: Stephen Drake +Date: Mon Sep 12 19:24:07 2016 +0200 + + Prevent stdout / stderr race condition in limitedBuffer. + + Signed-off-by: Stephen Drake + +commit 7e9c951813c7914d869e088b40b77095f9eb4137 +Merge: 2a1197037c bf637439e7 +Author: Misty Stanley-Jones +Date: Mon Sep 12 11:16:34 2016 -0700 + + Merge pull request #26501 from mstanleyjones/revert_26455 + + Revert commit of #26236 to 1.12.x branch + +commit bf637439e7e7d5ffac9e59fb1d15552fbba798a2 +Author: Misty Stanley-Jones +Date: Mon Sep 12 11:02:03 2016 -0700 + + Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option" + + This reverts commit eea99cd001173a68ea595e2f473b23a9b344282a. + + Signed-off-by: Misty Stanley-Jones + +commit 2a1197037c05ccf74bd4661d511d93a8a8fa03cf +Merge: be71b62acf 61c0a019fc +Author: Sven Dowideit +Date: Mon Sep 12 09:45:49 2016 +1000 + + Merge pull request #26455 from mstanleyjones/2016.09.09-docs-cherry-picks + + 2016.09.09 docs cherry picks + +commit 61c0a019fc198af0c929df1522cee57fcd0eeaf1 +Author: Antonio Murdaca +Date: Fri Sep 2 15:53:19 2016 +0200 + + Merge pull request #26264 from q384566678/test-two + + Modify docker-restart.1.md + (cherry picked from commit b98e918248f4d4880b707e24bf2f72878ffbb8d6) + + Signed-off-by: Misty Stanley-Jones + +commit 2eb9e805472d0b432c0814cc9062eef96a3c108d +Author: Vincent Demeester +Date: Thu Sep 8 17:15:13 2016 +0200 + + Merge pull request #26252 from leslau/master + + Fixed custom daemon options on systemd docs still using -H fd:// + (cherry picked from commit 7baa09faa02ad93dcb0e103abde3c45862fc903c) + + Signed-off-by: Misty Stanley-Jones + +commit 4cf193bac57f120672e95c903a2da6e6a31e6185 +Author: Vincent Demeester +Date: Thu Sep 1 20:46:46 2016 +0200 + + Merge pull request #26242 from YuPengZTE/devEG + + "eg." should be "e.g." + (cherry picked from commit baf2108baf8f4ff504847224cfb00794dfea5c20) + + Signed-off-by: Misty Stanley-Jones + +commit eea99cd001173a68ea595e2f473b23a9b344282a +Author: Vincent Demeester +Date: Mon Sep 5 09:52:18 2016 +0200 + + Merge pull request #26236 from yuexiao-wang/remove-h-option + + Remove -h option for docker cli + (cherry picked from commit 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b) + + Signed-off-by: Misty Stanley-Jones + +commit d95bffff5faa18acbdf7b6f3ddfad20f42c40e41 +Author: Vincent Demeester +Date: Mon Sep 5 13:39:19 2016 +0200 + + Merge pull request #26233 from yuexiao-wang/fix-readme + + Fix readme doc for dockerd + (cherry picked from commit 1145c9b0d59dd1210e71799a68addee23884861b) + + Signed-off-by: Misty Stanley-Jones + +commit 8a565615280cb8911e6bfe359ace42c96a2cf57f +Author: Brian Goff +Date: Thu Sep 8 11:09:18 2016 -0400 + + Merge pull request #26228 from lixiaobing10051267/masterPluginRm + + check inconsistant command in docs/reference/commandline + (cherry picked from commit e96c0fafa0465e7d1a3a12fda820c16d0449f814) + + Signed-off-by: Misty Stanley-Jones + +commit dc98c767727b9bb5750961107539e08f267b8718 +Author: Charles Smith +Date: Wed Sep 7 10:38:59 2016 -0700 + + Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage + + Sanitize uses of Swarm as a proper and improper noun (Fixes #24905) + (cherry picked from commit 6f0502b89b29a7d23b02363d02104ec531a36e4a) + + Signed-off-by: Misty Stanley-Jones + +commit 9710d3d9e92de5eb45c25e47837b96f0d1708453 +Author: Vincent Demeester +Date: Thu Aug 25 21:06:20 2016 +0200 + + Merge pull request #25896 from raksonibs/fix/docs_step_6 + + Email deprecation for step 6 of tutorial + (cherry picked from commit 4e4ebbe34040f557775b59d111a8127f1f7df9a2) + + Signed-off-by: Misty Stanley-Jones + +commit 0d800e9a37e400e30e83f0b0ff08c94047e21cf5 +Author: yuexiao-wang +Date: Thu Aug 18 10:21:41 2016 +0800 + + clean up the run.md in reference + + Signed-off-by: yuexiao-wang + (cherry picked from commit dd02815a2673794cd94f3225c5517d9f30d09d56) + Signed-off-by: Misty Stanley-Jones + +commit be71b62acf536d929a78917b65296ef7c7328d5c +Merge: 359f8fe426 c63cdcd948 +Author: Sven Dowideit +Date: Fri Sep 9 21:43:38 2016 +1000 + + Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates + + 2016.09.08 engine docs updates + +commit f206a3b9d0c045edeb8a23dc03062213c93fa5a8 +Merge: b7d026735f 0cb33580b2 +Author: Joao Fernandes +Date: Thu Sep 8 15:28:10 2016 -0700 + + Merge pull request #2716 from cyli/notary-doc-update + + Update the architecture docs to reflect the notary containers and volumes. + +commit c63cdcd948cf2fed1fbbe7ace53e2ee9ecfa36b6 +Author: Vincent Demeester +Date: Wed Sep 7 11:25:25 2016 +0200 + + Merge pull request #26362 from lixiaobing10051267/masterIfconfig + + rectify some response information while execute ifconfig in container + (cherry picked from commit 0ebb18102f376ee42ecc97d159842737ff73568d) + + Signed-off-by: Misty Stanley-Jones + +commit f1d590c45b09f2b863f4be9ed7a5c657fb269064 +Author: Vincent Demeester +Date: Mon Sep 5 18:40:07 2016 +0200 + + Merge pull request #26320 from yongtang/09052016-man-docker-create + + Update man page for `docker create` to add `--rm` flag + (cherry picked from commit d7594d23c81ad3de47bba933bb8f9041435a6226) + + Signed-off-by: Misty Stanley-Jones + +commit a8c297c2549aa2601ea1937253a8bcae39e8a573 +Author: Charles Smith +Date: Wed Sep 7 11:36:58 2016 -0700 + + Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker + + Rewrites to Understanding Docker topic for clarity + (cherry picked from commit 426a0af0759798d8e3332b38236ee40df6d14798) + + Signed-off-by: Misty Stanley-Jones + +commit bf7d3355139b68b0ff88b624ddfea6b1e3d51b6e +Author: Sven Dowideit +Date: Wed Sep 7 22:18:26 2016 +1000 + + Merge pull request #26218 from frosforever/fix_run_reference_typo + + Correct typo in run reference docs that use the create command + (cherry picked from commit e73e37f11206a346d2a552c5d133112cd103d562) + + Signed-off-by: Misty Stanley-Jones + +commit b7d026735fa14a0e9bb96a0812edb56147cbc258 +Author: Tammy Fox +Date: Thu Sep 8 16:20:19 2016 -0400 + + Fix typo + +commit 359f8fe42663b07cc40f89d5abfe29361678458a +Merge: e98eafcc3c 11330bf048 +Author: Sven Dowideit +Date: Wed Sep 7 22:15:21 2016 +1000 + + Merge pull request #26343 from sfsmithcha/2016-09-06-1.12.1-engine-docs-updates + + 2016 09 06 1.12.1 engine docs updates + +commit 11330bf048dc7a2f518d9bf5adaba682cf6d0ee4 +Author: Vincent Demeester +Date: Tue Sep 6 17:47:46 2016 +0200 + + Merge pull request #26307 from AkihiroSuda/fix-doc-26291 + + fix docs about `sudo docker login` + (cherry picked from commit da763602afbb25ea4428e1d608af5ee017a0b94e) + + Signed-off-by: Charles Smith + +commit bbf49348e2c088d1f57a43144efe96405aea5c5f +Author: Vincent Demeester +Date: Tue Sep 6 15:44:44 2016 +0200 + + Merge pull request #26293 from lixiaobing10051267/masterDockerAttach + + fix the wrong option info while specifying the command with the "--help" + (cherry picked from commit d8e151535017b4bb4ee5aa8281f1b9bb7bffa397) + + Signed-off-by: Charles Smith + +commit 55f95dd7e8604b826292b3538f3c379f20cd8e6b +Author: Vincent Demeester +Date: Mon Sep 5 15:44:01 2016 +0200 + + Merge pull request #26292 from lixiaobing10051267/masterDockerPull + + modify output info for docker pull centos + (cherry picked from commit 175188d8b0eb976cceb6c46de439186eec98e40e) + + Signed-off-by: Charles Smith + +commit 95bc4519d2a7f56072459cf4cf58e6efe7f3325a +Author: Vincent Demeester +Date: Thu Sep 1 20:53:07 2016 +0200 + + Merge pull request #26241 from YuPengZTE/devNote + + The first letter of “docker“ is small + (cherry picked from commit b14f29dfbd527fd2dbd05e024f760939aba6642c) + + Signed-off-by: Charles Smith + +commit a42e2a0e42cc88a5724d2f37fe7a650425165bcb +Author: Vincent Demeester +Date: Wed Aug 31 14:42:03 2016 +0200 + + Merge pull request #26192 from lixiaobing10051267/masterPluginInspect + + make command "docker plugin inspect" complete + (cherry picked from commit cf699ad427084076c7ca1ea5fbab78cd77597f2a) + + Signed-off-by: Charles Smith + +commit 1e9fb2f18e0d73f33f3e0b92decbeb4f9d356b4a +Author: Vincent Demeester +Date: Wed Aug 31 14:41:49 2016 +0200 + + Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate + + provide actual command format for docker network create + (cherry picked from commit 37fd1416daac0b3963dc812a820b844e9e854e59) + + Signed-off-by: Charles Smith + +commit 5e4e13e31c71f27e62825b55beedc096c27e3554 +Author: Vincent Demeester +Date: Wed Aug 31 14:41:22 2016 +0200 + + Merge pull request #26187 from albers/docs-volume-create-fix + + Fix argument order for docker create in tutorial + (cherry picked from commit 670eaa71a0629323327cb5604c44abf14890d4b4) + + Signed-off-by: Charles Smith + +commit 748f3ef8e375c2934df7b70f4d75296e9fe141d8 +Author: Vincent Demeester +Date: Wed Aug 31 14:41:03 2016 +0200 + + Merge pull request #26185 from yuexiao-wang/update-docs + + Update description for docker plugin inspect + (cherry picked from commit 0414a2c1a960832cc6d3df8641f23952c3700084) + + Signed-off-by: Charles Smith + +commit e3197e1dfab20346822f0ffe403ea2c6dc500427 +Author: Doug Davis +Date: Tue Aug 30 18:52:13 2016 -0400 + + Merge pull request #26171 from CrimsonGlory/patch-2 + + typo + (cherry picked from commit 6705d68c8995137f94e2f0958c72e1502e682c88) + + Signed-off-by: Charles Smith + +commit 01de2e76b45e227f61adba40cf27f0463743f9ad +Author: Michael Crosby +Date: Tue Sep 6 09:05:50 2016 -0700 + + Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example + + Updated Windows mounting example + (cherry picked from commit 368a27a8d80337918d465c8c98100a4e22d9ef1a) + + Signed-off-by: Charles Smith + +commit 1a57e1b1f5f67a538026bb703761f57fd9eb5af7 +Author: Sven Dowideit +Date: Mon Sep 5 21:51:42 2016 +1000 + + Merge pull request #26314 from unclejack/docs_contiv_nfs + + docs: mention NFS support for Contiv volume plugin + (cherry picked from commit 8f424f777438169edda354ab82fca9f81c7aab4a) + Signed-off-by: Charles Smith + +commit 5c34d579dc89421340bfebe8536944155d5b3570 +Author: Sven Dowideit +Date: Mon Sep 5 10:03:14 2016 +1000 + + Merge pull request #26302 from vdemeester/health_status-in-event-docs + + Add health status as action on events documentations + (cherry picked from commit b468df9eac16d73c9b8e4853411df1fafea37d1f) + + Signed-off-by: Charles Smith + +commit 931418603e66953a1802cf39ded20eed26a88027 +Author: Charles Smith +Date: Tue Sep 6 10:41:46 2016 -0700 + + Merge pull request #26288 from sfsmithcha/add_tls + + author merge: addressed @diogomonica ' remark: add how pki works topic + (cherry picked from commit 75c36bcc64a5597919a16a7d43463f7e7c5e1499) + + Signed-off-by: Charles Smith + +commit 7e2259bb63e2f3bc02493863416e54b4ab2c7215 +Author: Vincent Demeester +Date: Fri Sep 2 12:39:31 2016 +0200 + + Merge pull request #26271 from AkihiroSuda/fix-service-create-doc + + update docs/reference/commandline/service_create.md + (cherry picked from commit 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55) + + Signed-off-by: Charles Smith + +commit b7e9344365488e5d3248ba1c24a4fdea3c1abbd3 +Author: Vincent Demeester +Date: Tue Sep 6 17:43:19 2016 +0200 + + Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value + + Add response to swarm/init example (fixes #25625 + (cherry picked from commit d4e173fc347911999458eb82fe4c0fd1b3818218) + + Signed-off-by: Charles Smith + +commit dc0d2166d52da4c0530376b67bfe7f9d859397ed +Author: Sven Dowideit +Date: Mon Sep 5 10:02:35 2016 +1000 + + Merge pull request #26245 from dbdd4us/master + + add volumes, networks, nodes and services into label doc + (cherry picked from commit 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f) + + Signed-off-by: Charles Smith + +commit e773b059d1fd2b4060540b165c76552806083215 +Author: Justin Cormack +Date: Wed Aug 31 16:37:50 2016 +0100 + + Merge pull request #26139 from yuexiao-wang/fix-link + + Modify link for hub and registry + (cherry picked from commit ad6f5a49d5f24f8b64def11176b6c8df162d839f) + + Signed-off-by: Charles Smith + +commit 934d7b83ef78e272ff142e01e418a1621f8ac898 +Author: Vincent Demeester +Date: Tue Aug 30 10:53:50 2016 +0200 + + Merge pull request #26135 from kmkr/master + + Fix typo in builder.md + (cherry picked from commit 20869b5650bd059cd67969f9774fb4eb78b6dbfd) + + Signed-off-by: Charles Smith + +commit 755addd56f920a8c24780cf880c00ac9ce004aed +Author: Brian Goff +Date: Tue Aug 30 10:18:19 2016 -0400 + + Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy + + usage description of docker deploy in md not consistant with go file + (cherry picked from commit afd54a1a8645bde7d5d87efc5567ee0d3c788e78) + + Signed-off-by: Charles Smith + +commit 9c2b789cafc725e96607073e5552526bed7e7e77 +Author: Vincent Demeester +Date: Wed Aug 31 10:43:02 2016 +0200 + + Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs + + some fixes to clean up new plugin system docs + (cherry picked from commit c1b82df74042a0290b995283c504b60ac6b4bc95) + + Signed-off-by: Charles Smith + +commit abe05f4a29491034071f1625475ad6b141392644 +Author: Charles Smith +Date: Mon Aug 29 12:09:15 2016 -0700 + + Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut + + fixed line spacing in Swarm tutorial bullets + (cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409) + + Signed-off-by: Charles Smith + +commit 9bef12dcfd4c1d83692713eea53f55a257c07f24 +Author: Justin Cormack +Date: Tue Aug 30 13:36:50 2016 +0100 + + Merge pull request #26096 from ohmystack/fix/docs-dockerd + + Add docs for "--containerd" in dockerd + (cherry picked from commit 644cb53b41b49fd750fe9c86e922125ef8156259) + + Signed-off-by: Charles Smith + +commit aaa7a58c6380495ce3b0944b4419df05c3ab202e +Author: Vincent Demeester +Date: Mon Aug 29 14:36:49 2016 +0200 + + Merge pull request #26080 from sw-double/patch-1 + + [docs] Fix volume binding in fluentd container example + (cherry picked from commit ad73e8f169ee39ed830bfa385583bddd5741012d) + + Signed-off-by: Charles Smith + +commit 49e863f6d0d9818b989a037f3fb14432f0892bc6 +Author: Vincent Demeester +Date: Sat Aug 27 14:51:16 2016 +0200 + + Merge pull request #26036 from yuexiao-wang/add-gcplog + + Add the content for Google Cloud Loging driver in index + (cherry picked from commit 48659599cbb4c896e9597e50ae16c087d9dd5ac9) + + Signed-off-by: Charles Smith + +commit 44180a48e9cdef0ced94ef1aceac3fbcfc6c830a +Author: Doug Davis +Date: Fri Aug 26 09:06:30 2016 -0400 + + Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm + + Update docs for `docker create` to include `--rm` flag + (cherry picked from commit 91ec7fa811c7476b7c20e3b95a92ea9062d498fa) + + Signed-off-by: Charles Smith + +commit 8f0254da4124c44e510e8a4c354c1e5c84ee2d05 +Author: Antonio Murdaca +Date: Fri Aug 26 12:06:58 2016 +0200 + + Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged + + Fixes #25918 - Changed --permissive to --privileged. + (cherry picked from commit 91fdafb79f1532de33e2e258446d6eab80fd0d53) + + Signed-off-by: Charles Smith + +commit 2aa780abe4813225787ece380ad4d6bbbdf0768a +Author: Charles Smith +Date: Fri Aug 26 15:55:26 2016 -0700 + + Merge pull request #26028 from londoncalling/docs-pinata-for-swarm + + Clarify how to use d4mac, d4win with swarm mode + (cherry picked from commit 6072e6bfd20598f4e9cb28d32c09bfddec6df76c) + + Signed-off-by: Charles Smith + +commit af9378f713c6c3885b09c4d64933dfb7c1ec94d6 +Author: Vincent Demeester +Date: Thu Aug 25 17:58:00 2016 +0200 + + Merge pull request #25996 from yuexiao-wang/fix-docker-daemon + + Replace docker command from 'docker daemon' to 'dockerd' + (cherry picked from commit aff33055ac138e09ef693c8d07ea005cde55e025) + + Signed-off-by: Charles Smith + +commit a3098657c3e065616d5a90592f5021db79b62903 +Author: Justin Cormack +Date: Wed Aug 24 10:57:10 2016 +0100 + + Merge pull request #25963 from yuexiao-wang/fix-repo + + Modify incorrect repository URL + (cherry picked from commit a110512e38a14e938096fe18b345e8f920605b9f) + + Signed-off-by: Charles Smith + +commit 6e9dd212b9e8281cc0864e5c5f0cc26945f74c09 +Author: Vincent Demeester +Date: Tue Aug 23 21:44:26 2016 +0200 + + Merge pull request #25948 from lixiaobing10051267/masterImages + + get a redis-cli image while using docker pull + (cherry picked from commit 602b2381360cf59fffe46b64bb4bdfa180639c44) + + Signed-off-by: Charles Smith + +commit 9234cc38e237c08502774b324ef5525fab3401e7 +Author: Tõnis Tiigi +Date: Tue Aug 23 11:19:52 2016 -0700 + + Merge pull request #25946 from lixiaobing10051267/masterDockerImages + + Incorrect response field name for command "docker images" + (cherry picked from commit 0b2ff0ccdef3327e52699941b2ab888f7fbecb1e) + + Signed-off-by: Charles Smith + +commit d649ae03703948447b8f65bcff820905c5759ea6 +Author: Doug Davis +Date: Mon Aug 22 21:53:47 2016 -0500 + + Merge pull request #25931 from fj/patch-1 + + Fix minor typo in "Getting Started" documentation + (cherry picked from commit a949a79a5899df2b57c0ff3e6a3e9aa432db248c) + + Signed-off-by: Charles Smith + +commit af2a9ba322476c9b13ed8b9d93d5734e7e093fff +Author: Vincent Demeester +Date: Fri Aug 26 07:57:07 2016 +0200 + + Merge pull request #25919 from yuexiao-wang/fix-refer + + Remove the redundant words in reference for swarm + (cherry picked from commit 72e7cd75c1f7a636b48774c3ba189cc8fd510138) + + Signed-off-by: Charles Smith + +commit 72f1556f622e58ff1659769879dc02650edfc1bf +Author: Aaron Lehmann +Date: Mon Aug 22 13:13:21 2016 -0700 + + Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager + + Remove option "--manager" description for swarm_join.md + (cherry picked from commit 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259) + + Signed-off-by: Charles Smith + +commit 909f9f5ea808f2f1c36d4d5bb3712301b3e9afab +Author: Sebastiaan van Stijn +Date: Thu Aug 18 17:20:09 2016 +0200 + + Merge pull request #25726 from vieux/new_plugin_system_doc + + adding some documentation about the new plugin system + (cherry picked from commit 88a6a7763b789a35fff9df4e52e48ca99afd3c08) + + Signed-off-by: Charles Smith + +commit e98eafcc3c9359b56bf4d7b6b964cef534af45e5 +Merge: 1f563dd224 69d3aaa2e2 +Author: Sven Dowideit +Date: Wed Aug 31 12:23:09 2016 +1000 + + Merge pull request #26168 from sfsmithcha/fix_swarm_tutorial_note + + Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut + +commit 69d3aaa2e2cb5676fea5244512f3241c12fd7800 +Author: Charles Smith +Date: Mon Aug 29 12:09:15 2016 -0700 + + Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut + + fixed line spacing in Swarm tutorial bullets + (cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409) + + Signed-off-by: Charles Smith + +commit 1f563dd2245c44983e9b69b94f8e7508fd03df44 +Merge: f1bcb5f10e 5d2e3ad0c9 +Author: Charles Smith +Date: Tue Aug 30 11:02:05 2016 -0700 + + Merge pull request #26117 from sfsmithcha/2016_08_29_engine_docs_updates + + author merge: Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut + +commit 5d2e3ad0c9ae04587a3a39e5ee18d6af12241b99 +Author: Charles Smith +Date: Mon Aug 29 12:09:15 2016 -0700 + + Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut + + fixed line spacing in Swarm tutorial bullets + (cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409) + + Signed-off-by: Charles Smith + +commit f1bcb5f10e527b1837c5fed0adab11056538d173 +Merge: 23cf638307 080891bb11 +Author: Charles Smith +Date: Mon Aug 29 10:02:01 2016 -0700 + + Merge pull request #26064 from sfsmithcha/updates_to_v1.12.1_docs + + author merge: Updates to v1.12.1 docs + +commit 080891bb116318284d786de91434abcf417048c9 +Author: Sebastiaan van Stijn +Date: Sun Aug 21 02:12:02 2016 +0200 + + Merge pull request #25902 from MihaiB/docs-link-fragment + + docs: fix typo in url fragment + (cherry picked from commit ab533a98dceecec707414006544411cfd18b2d30) + Signed-off-by: Charles Smith + +commit be94e07b6d53384357c69064f02b5d07b78c936b +Author: Sven Dowideit +Date: Mon Aug 22 11:58:30 2016 +1000 + + Merge pull request #25901 from yuexiao-wang/add-content + + Add the content for how services work + (cherry picked from commit abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5) + + Signed-off-by: Charles Smith + +commit ca9bb6e4455201d56868ae769100c8ad086e81f5 +Author: Vincent Demeester +Date: Mon Aug 22 09:17:32 2016 +0200 + + Merge pull request #25899 from yuexiao-wang/fix-overview + + Optimize description for Feature highlights + (cherry picked from commit d2fa978d4d66622a197eb98f9a77fa217e25f449) + + Signed-off-by: Charles Smith + +commit 7e956837f2f0dfb8e415e38af26a64c272162095 +Author: Sven Dowideit +Date: Mon Aug 22 15:47:23 2016 +1000 + + Merge pull request #25835 from decoursin/patch-1 + + Update apparmor error message + (cherry picked from commit e168f0b4ad4dfc11a4423a6785d80153f0969808) + + Signed-off-by: Charles Smith + +commit 069aa4e11a3e02fc135edea1300798dfb77d56ed +Author: Vincent Demeester +Date: Thu Aug 18 15:26:59 2016 +0200 + + Merge pull request #25815 from justincormack/capdoc + + Split list of capabilities into those added by default and those not + (cherry picked from commit d854c4fcc6255330693eee67b655606e92b11544) + + Signed-off-by: Charles Smith + +commit e097320c926407adba93d0267a7ffe0de6e192db +Author: Sebastiaan van Stijn +Date: Thu Aug 18 17:08:41 2016 +0200 + + Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave + + Specify woker node for docker swarm leave command + (cherry picked from commit 90308fd78315412c30da90217ee14515de4fbf8a) + + Signed-off-by: Charles Smith + +commit fdb514089347567d80a669e60c66a02a995338b8 +Author: Charles Smith +Date: Thu Aug 25 10:06:11 2016 -0700 + + Merge pull request #25781 from sfsmithcha/add_ingress_guide + + author merge: add ingress / publish port guide + (cherry picked from commit dee30443368b9ed8046733242410b8c32550ce0d) + + Signed-off-by: Charles Smith + +commit 63fb3077cc3ae8cb48ec3fcb47f4c9e890fb0f3c +Author: Vincent Demeester +Date: Mon Aug 22 09:13:54 2016 +0200 + + Merge pull request #25775 from ddgenome/entrypoint-env + + Remove erroneous ENTRYPOINT note + (cherry picked from commit c1bdda0be8616f987245cb61a4aedc09c8b5c806) + + Signed-off-by: Charles Smith + +commit 3d4813ffd222f20625c1f22db5b4102b12657b62 +Author: Vincent Demeester +Date: Wed Aug 17 09:59:36 2016 +0200 + + Merge pull request #25751 from yuexiao-wang/clean-docs + + Remove mess words in installation doc + (cherry picked from commit bbd5396955a8c36b9f208d64fe580b769c1686f5) + + Signed-off-by: Charles Smith + +commit 330486c45f12431995751536e32ad0807a164ec0 +Author: Arnaud Porterie +Date: Thu Aug 25 17:23:51 2016 +0000 + + Merge pull request #25750 from talex5/spec + + Document Healthcheck in image spec + (cherry picked from commit 46cb1f2601afc2eb99cc31ced362d874c8c3c192) + + Signed-off-by: Charles Smith + +commit dc49ed96cb42ed12fb8417b09555b04946b6c48a +Author: Sebastiaan van Stijn +Date: Thu Aug 18 19:25:08 2016 +0200 + + Merge pull request #25743 from lixiaobing10051267/masterInspect + + Check the return message of docker service inspect + (cherry picked from commit 6fa69d2d0610320cce61517eca6e4471f5381561) + + Signed-off-by: Charles Smith + +commit 21e168053feba7c8b88aaee8bdc7df5c2748a8cf +Author: Sebastiaan van Stijn +Date: Wed Aug 17 16:43:35 2016 +0200 + + Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context + + Add missing docs about binary remote contexts + (cherry picked from commit b4abe38d43f1158b3c085ef006e88740296a3020) + + Signed-off-by: Charles Smith + +commit 88bd4cb0ea26da05bc9507d785b08b4e3162980c +Author: Sebastiaan van Stijn +Date: Wed Aug 17 10:39:45 2016 +0200 + + Merge pull request #25704 from thaJeztah/cleanup-api-markdown + + Cleanup API docs Markdown formatting and wording + (cherry picked from commit 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51) + + Signed-off-by: Charles Smith + +commit d252e6ac5165f9372aa70d22af015cd3558581b9 +Merge: db24b21660 677967c4f1 +Author: Sven Dowideit +Date: Wed Aug 24 14:57:40 2016 +1000 + + Merge pull request #557 from SvenDowideit/add-jenkinsfile + + Add docs checking Jenkinsfile + +commit 677967c4f178676b163c20308de5635955101598 +Author: Sven Dowideit +Date: Mon Aug 22 12:25:51 2016 +1000 + + Add docs checking Jenkinsfile + + Signed-off-by: Sven Dowideit + +commit 0cb33580b2724162b8b4f33c7f71697473506c52 +Author: cyli +Date: Fri Aug 19 13:35:28 2016 -0700 + + Update the architecture docs to reflect the notary and jobrunner containers and volumes. + Also update the general configuration to indicate that DTR comes with Notary now. + + Signed-off-by: cyli + +commit db24b2166089b2bf67841b995015e626bb7a409f +Merge: c1cd1162f9 768f358596 +Author: Nathan LeClaire +Date: Thu Aug 18 16:57:03 2016 -0700 + + Merge pull request #555 from docker/1.12.1 + + Bump to 1.12.1 + +commit 768f3585965eaa34589e8d0fa88a8534da11081f +Author: Nathan LeClaire +Date: Thu Aug 18 16:58:13 2016 -0700 + + Bump to 1.12.1 + + Signed-off-by: Nathan LeClaire + +commit 41b3b253352b8b355d668f5e12b5f329f88c3482 +Author: Nathan LeClaire +Date: Thu Aug 18 16:29:40 2016 -0700 + + Bump version to 0.8.1 + + Signed-off-by: Nathan LeClaire + +commit 81424e7b52f7b68327e33bf1db966dbb0d2a1ff0 +Author: Nathan LeClaire +Date: Fri Jul 29 14:49:54 2016 -0700 + + Move generated systemd unit file closer to upstream + + Signed-off-by: Nathan LeClaire + +commit f212b53d43303cfa1cfa96f62d0e35fadefe81ef +Author: Ahmet Alp Balkan +Date: Thu Aug 18 11:54:30 2016 -0700 + + azure: update docs with updated default param + + Update `--azure-image` param documented that changed in + + Signed-off-by: Ahmet Alp Balkan + +commit 3fe6f7f33cd14db67ae15efba8229d63d8250a51 +Author: Ahmet Alp Balkan +Date: Thu Aug 18 11:48:55 2016 -0700 + + azure: increase log level for info statement + + This should have been info in the first place. + + Signed-off-by: Ahmet Alp Balkan + +commit f63aaa20dd330dc362dd71f44358d396687adca0 +Author: Ahmet Alp Balkan +Date: Thu Aug 18 11:43:05 2016 -0700 + + azure: bump default image to Ubuntu 16.04.0-LTS + + Ubuntu 15.10 image is EOL'd and removed from azure. + Closes #3676. + + Signed-off-by: Ahmet Alp Balkan + +commit 27968edd8a160f66c96c8545ad35e3a3eeb8766a +Merge: dcaaa5570a 04114bb5b5 +Author: Dongluo Chen +Date: Thu Aug 18 16:05:59 2016 -0700 + + Merge pull request #2454 from dongluochen/bump-v1.2.5 + + Bump version to 1.2.5 + +commit 04114bb5b537b517848a3edd04c2661a18b1d6d3 +Author: Dong Chen +Date: Thu Aug 18 15:39:35 2016 -0700 + + Bump version to 1.2.5 + + Signed-off-by: Dong Chen + +commit dcaaa5570aaaef6a49ce5bfd60144882ad0046cd +Merge: 25919db69e c3b9a533bc +Author: Dongluo Chen +Date: Thu Aug 18 14:41:03 2016 -0700 + + Merge pull request #2436 from dongluochen/rescheduleWithOverlay + + Reschedule containers with global network + +commit 25919db69eb1b621c398fcac168faf03c0a6f0b7 +Merge: 93fec7608c c5d5e7341b +Author: Charles Smith +Date: Thu Aug 18 14:09:32 2016 -0700 + + Merge pull request #2453 from RangerMauve/patch-3 + + Fix name of private key in configure-tls guide + +commit c1cd1162f95d1d7e0fbdb155e9f60e912beddb71 +Merge: 6c900e6d66 58b7007970 +Author: Nathan LeClaire +Date: Thu Aug 18 11:25:29 2016 -0700 + + Merge pull request #552 from bbodenmiller/patch-2 + + set no proxy flag - exclude machine from proxy + +commit c5d5e7341b8fbd3e1d1457d38c5f47b6b075822d +Author: RangerMauve +Date: Thu Aug 18 09:54:56 2016 -0400 + + Fix name of private key in configure-tls guide + + Fixes https://github.com/docker/docker/issues/25823 + + Signed-off-by: Georgiy Shibaev + +commit 58b7007970b922f9891019e6d4aebdb66bc905aa +Author: Ben Bodenmiller +Date: Thu Aug 18 00:09:22 2016 -0700 + + set no proxy flag - exclude machine from proxy + + Signed-off-by: Ben Bodenmiller + +commit 23cf638307f030cd8d48c9efc21feec18a6f88f8 +Author: Tibor Vass +Date: Wed Aug 17 21:40:58 2016 -0700 + + Bump VERSION to v1.12.1 + + Signed-off-by: Tibor Vass + +commit 3e4c33365f24719a7b4cfec5297c5d490825ce70 +Merge: 5d29b79241 e8ed523480 +Author: Tibor Vass +Date: Wed Aug 17 21:05:32 2016 -0700 + + Merge pull request #25830 from tiborvass/cherry-pick-25825 + + [1.12] Fix volume not working after daemon restart + +commit 93fec7608c16ac50a5c4798e0fde7b95a39a607b +Merge: 5e2ae22513 5243531291 +Author: Dongluo Chen +Date: Wed Aug 17 20:37:13 2016 -0700 + + Merge pull request #2442 from dongluochen/install-w-machine + + Revert install-w-machine.md to 833471b74cf39c826f349c0355dfca0d244f92c0. + +commit e8ed523480a82688264f6148278d1834d624f0a4 +Author: Brian Goff +Date: Wed Aug 17 20:36:17 2016 -0400 + + Fix volume not working after daemon restart + + When the daemon is started, it looks at all the volumes and checks to + see if any of them have mount options persisted to disk, and loads them + from disk if it does. + + In some cases a volume will be created with an empty map causing the + options file to be persisted and volume options set to a non-nil value + on daemon restart... this causes problems later when the driver checks + for a non-nil value to determine if it should try and mount with the + persisted volume options. + + Ensures 2 things: + + 1. Instead of only checking nilness for the opts map, use `len` to make + sure it is not an empty map, which we don't really need to persit. + + 2. An empty (or nulled) opts.json will not inadvertnatly set volume + options on daemon restart. + + Signed-off-by: Brian Goff + (cherry picked from commit 246d1eb58e807f2cf2d2b387e267dcfa228f96a8) + Signed-off-by: Tibor Vass + +commit 5d29b79241b7343d5dd6bf6dc9eff438c5e4a8fc +Merge: 6e7b8f41ca c745f4db98 +Author: Tibor Vass +Date: Wed Aug 17 20:01:46 2016 -0700 + + Merge pull request #25780 from thaJeztah/1.12.1-docs-cherry-picks + + 1.12.1 docs cherry picks + +commit 6e7b8f41cae68b3be2daa0c8a66f182f71009fb0 +Merge: bd8d47e028 13e82f23c8 +Author: Tibor Vass +Date: Wed Aug 17 20:00:56 2016 -0700 + + Merge pull request #25787 from tiborvass/cherry-pick-23790 + + [1.12] Skip always pulling images on integration tests + +commit bd8d47e0284546058f661ae9a8b52ae4d1f301e4 +Merge: 236317fa56 74cdda0333 +Author: Tibor Vass +Date: Wed Aug 17 17:14:55 2016 -0700 + + Merge pull request #25811 from aaronlehmann/swarm-changelog + + Add swarm section to 1.12.1 changelog + +commit 6c900e6d664332d5ffdd595ebd021a9f4c9b8674 +Merge: da301e5b7e 895536880f +Author: Nathan LeClaire +Date: Wed Aug 17 17:00:20 2016 -0700 + + Merge pull request #553 from bbodenmiller/patch-3 + + clear all_proxy if not socks address + +commit 5e2ae22513044ddbd510f4820c6f768de906519c +Merge: 26811e6a09 0a0ebb16fe +Author: Nishant Totla +Date: Wed Aug 17 16:20:43 2016 -0700 + + Merge pull request #2444 from dongluochen/containerRefresh + + Listen to health_status events + +commit c745f4db98796296f446486fec2827bf851ee05d +Author: Eivin Giske Skaaren +Date: Tue Aug 16 13:58:50 2016 +0200 + + "Annotations" not a parameter + + Signed-off-by: Eivin Giske Skaaren + (cherry picked from commit 69e481af4e1fec65629c6ea4eb74fc58f5abc932) + Signed-off-by: Sebastiaan van Stijn + +commit b313230fa89c46d9e535bb794e28551a7398037a +Author: Eivin Giske Skaaren +Date: Tue Aug 16 13:43:17 2016 +0200 + + Capital D in "ID" returned when creating service + + Signed-off-by: Eivin Giske Skaaren + (cherry picked from commit 9eb2ec799eb37210dee5183ace375e480bbfd8aa) + Signed-off-by: Sebastiaan van Stijn + +commit a193f2995e42784dd8a729d279b6098e32a484d6 +Author: Eivin Giske Skaaren +Date: Tue Aug 16 11:28:13 2016 +0200 + + Add doc for inspect swarm + + Signed-off-by: Eivin Giske Skaaren + (cherry picked from commit c59bc537274aa7f4dc9702ea08c349c71a024b39) + Signed-off-by: Sebastiaan van Stijn + +commit 0f63ddb03d2fa6544be071322a117b7011ee405e +Author: Sebastiaan van Stijn +Date: Mon Aug 15 14:14:41 2016 +0200 + + Fix capitalization + + Signed-off-by: YuPengZTE + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 75e60fbe09f6065ed095671f98713d862c466858) + Signed-off-by: Sebastiaan van Stijn + +commit 2875711fe732531e8a2408b40468ed75760e4022 +Author: Sebastiaan van Stijn +Date: Mon Aug 15 13:41:18 2016 +0200 + + Restore missing ps example for killed containers + + This example was added in b0b2f979c7c43e2975d5e39340c168da2da42d1d, + but got lost during splitting up the cli.md docs into separate files; + 561bfb268de3c674b04d48895b7e46ae890ef795 + + This restores the missing example. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 8d5818a6931db9d0acd4a6663815cd317da1bb6b) + Signed-off-by: Sebastiaan van Stijn + +commit e24421a6ef056c78dc3805d64dbe91f9ea5d45fa +Author: Sebastiaan van Stijn +Date: Mon Aug 15 12:02:54 2016 +0200 + + Move sysctls to correct API version + + Commit 067b510dfc5b90a1d7712c89e857b6dafb184f24 move the + sysctls feature to the right API version, but + missed this one. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 7cdd693d5d2094f73383145eb74d81c6b9bb9b24) + Signed-off-by: Sebastiaan van Stijn + +commit e2c8597c8f0d146e2a9d61c0cd0b3e9dfeed43d4 +Author: Sebastiaan van Stijn +Date: Mon Aug 15 11:53:12 2016 +0200 + + Add X-Registry-Auth header to service API docs + + The service create/update endpoints support + passing registry-authentication information, + but this was not documented. + + This adds the missing information about passing + a X-Registry-Auth header. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit bde35ef18a408a297b960c439dc029cfb5e15464) + Signed-off-by: Sebastiaan van Stijn + +commit f436a41d0ce9e37d833ea9908aef0fd89e017024 +Author: Akihiro Suda +Date: Mon Aug 15 09:43:24 2016 +0000 + + Add a note about the open(2) and rename(2) on AUFS and OverlayFS + + Close #25409 + Update #10180 + + Signed-off-by: Akihiro Suda + (cherry picked from commit aab101a770a88cdbde5012dc7eb5b4439cf57192) + Signed-off-by: Sebastiaan van Stijn + +commit fc8a0f4786765a45b6200bef72cf9ccec979ace3 +Author: lixiaobing10051267 +Date: Mon Aug 15 15:11:37 2016 +0800 + + command "docker service remove" not insistant + + Signed-off-by: lixiaobing10051267 + (cherry picked from commit 078e2aa1571ad402f0a9599e6fac2286a3d35f54) + Signed-off-by: Sebastiaan van Stijn + +commit 9bc8e7858c17037d6b8547833fd1a0d7d9eea88b +Author: Sven Dowideit +Date: Fri Aug 12 21:13:20 2016 +0000 + + James' site has been dead for a while - removing links + + Signed-off-by: Sven Dowideit + (cherry picked from commit a9b08f3102e946df44337deb65c99b41570754d1) + Signed-off-by: Sebastiaan van Stijn + +commit a30a0b07a4522fa6733c4caf148ab32add57d087 +Author: David Lechner +Date: Fri Aug 12 12:15:32 2016 -0500 + + Move export from image commands to container commands + + The export command operates on containers, not images, so it should be listed under the container commands, not the image commands. + + Signed-off-by: David Lechner + (cherry picked from commit 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd) + + Signed-off-by: Sebastiaan van Stijn + +commit 05e1e65ca70d5679dc1d2c50607eb4f002222aa7 +Author: Matt Bentley +Date: Thu Aug 11 07:54:20 2016 -0400 + + Add install of virtual kernel extras for AUFS + + Signed-off-by: Matt Bentley + (cherry picked from commit e715ca506f41b22cde21187328fcb416cec5e6a2) + Signed-off-by: Sebastiaan van Stijn + +commit 4534b9e6c38be8a8bd3cf77675a4880916021880 +Author: Charles Smith +Date: Mon Aug 1 14:17:21 2016 -0700 + + add overlay networking guide + + Signed-off-by: Charles Smith + (cherry picked from commit e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b) + Signed-off-by: Sebastiaan van Stijn + +commit 3da4ac64af16f967adfc7d6767488b048884448d +Author: Charles Smith +Date: Tue Jul 26 20:40:17 2016 -0700 + + add overlay networking security model node + + Signed-off-by: Charles Smith + (cherry picked from commit cc5debcb2e8621358721eb860c07f33f8b83d684) + Signed-off-by: Sebastiaan van Stijn + +commit 13e82f23c8b2bbbbf483ccaf5035bff96979086c +Author: Tonis Tiigi +Date: Mon Jun 20 17:44:45 2016 -0700 + + Skip always pulling images on integration tests + + Signed-off-by: Tonis Tiigi + (cherry picked from commit e2226223e614716749cdb7701a130c7449f5f854) + Signed-off-by: Tibor Vass + +commit 74cdda0333c10d13876b9c0eb58d1605d774a876 +Author: Aaron Lehmann +Date: Wed Aug 17 11:21:59 2016 -0700 + + Add swarm section to 1.12.1 changelog + + Signed-off-by: Aaron Lehmann + +commit c3b9a533bc675b6155a077d1cd8ccc245942c5db +Author: Dong Chen +Date: Thu Jul 28 16:28:01 2016 -0700 + + Reschedule with overlay network + + Signed-off-by: Dong Chen + +commit da301e5b7efbdb6de6e811440ab7031358966a40 +Merge: 7e9c0d922d 5712450bd0 +Author: Nathan LeClaire +Date: Wed Aug 17 11:25:59 2016 -0700 + + Merge pull request #551 from bbodenmiller/patch-1 + + improve proxy variables check + +commit 5243531291a0aba816fce35ac109d116f5dce1f8 +Author: Dong Chen +Date: Wed Aug 17 10:02:49 2016 -0700 + + Fix link to discovery.md. + + Signed-off-by: Dong Chen + +commit 895536880f7532b89751803ae2881111fe41085d +Author: Ben Bodenmiller +Date: Wed Aug 17 00:14:44 2016 -0700 + + clear all_proxy if not socks address + + Signed-off-by: Ben Bodenmiller + +commit 5712450bd083c94384bb5281244e896139945a17 +Author: Ben Bodenmiller +Date: Wed Aug 17 00:04:54 2016 -0700 + + improve proxy variables check + + Signed-off-by: Ben Bodenmiller + +commit 236317fa56ab2cbe022cea88c6bda1a7a566998c +Author: Tibor Vass +Date: Tue Aug 16 21:30:11 2016 -0700 + + Bump VERSION to v1.12.1-rc2 + + Signed-off-by: Tibor Vass + +commit f806ae48383f5f1eac14a3e1c9607138096ab933 +Merge: 0c369b1a5c a544fe4b38 +Author: Tibor Vass +Date: Tue Aug 16 21:26:03 2016 -0700 + + Merge pull request #25767 from tiborvass/1.12.1-rc2-cherrypicks + + 1.12.1 rc2 cherrypicks + +commit a544fe4b38dc3edff78a24be6c3e0d72d017b885 +Author: Tibor Vass +Date: Tue Aug 16 15:44:54 2016 -0700 + + Vendor swarmkit to change root key to P-256 + + Signed-off-by: Tibor Vass + +commit 09dc9a2a9e544543504c9966aa958ffe4f20a817 +Author: Anusha Ragunathan +Date: Thu Aug 11 15:27:06 2016 -0700 + + Debugging issue #25511 + + Volumes and other content created under a bind mount should be + recursively propagated using rshared, not shared. This could be + the reason for EBUSY during removal. Override options with rbind, + rshared and see if CI errors are fixed. + + May fix #25511 + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit e58028d078077dc566639ff52ece09ad6c481e44) + Signed-off-by: Tibor Vass + +commit f21cdf48f98b164c2a0ea52c7404e4227eebd1e0 +Author: Tonis Tiigi +Date: Tue Aug 16 10:39:05 2016 -0700 + + Add retry checks to TestSwarmPublishAdd + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 7bd1c1195998c10c732ccfa67c568e634d58166e) + Signed-off-by: Tibor Vass + +commit 651c53f020607c284549310c03a5d99c2b74e9cb +Author: Jana Radhakrishnan +Date: Mon Aug 15 17:53:35 2016 -0700 + + Vendoring libnetwork @82fb373e3eaa4e + + - Fixes a SNAT issue in loadbalancer when multiple networks are involved + - Fixes an issue with SRV query forwarding in DNS + - Fixes a map race + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 56c98226955d98a2ba6a99bffd3a9a80d691e4a7) + Signed-off-by: Tibor Vass + +commit 64f62a6703832467fb8ef11c7497b757e124c6f6 +Author: Dieter Reuter +Date: Sat Aug 13 16:29:06 2016 +0200 + + Improve systemd config for Raspbian + + Signed-off-by: Dieter Reuter + (cherry picked from commit 3c7ae431e08af7a53ebfe4fbb2eaf279fb3993b6) + Signed-off-by: Tibor Vass + +commit 460d8d80ca73b3142af03fbc4a67bf630101d204 +Author: Tibor Vass +Date: Fri Aug 12 16:50:10 2016 -0700 + + release-rpm: fix bad destination paths for rpms + + Signed-off-by: Tibor Vass + (cherry picked from commit e1c7ad871f6fd41a7682cf7effb02838ab679ae3) + Signed-off-by: Tibor Vass + +commit dd083421039304d2722c692bfcc2d9f2ab354903 +Author: Sebastiaan van Stijn +Date: Mon Aug 15 15:23:14 2016 +0200 + + Add note about new binaries to changelog + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 32b8a6e735ef674e1ea2415915e41531bcd4a9c8) + Signed-off-by: Tibor Vass + +commit 07e038037922726be8edbfedc793432cadfc0ab0 +Author: Dieter Reuter +Date: Sat Aug 13 00:40:29 2016 +0200 + + Fix build deb for ARMv6 + + Signed-off-by: Dieter Reuter + (cherry picked from commit 5907e4a872c7d586ab594972fa24bf4fa4e83207) + Signed-off-by: Tibor Vass + +commit 0c369b1a5c14e4a1b55a129090cb02756b3d1575 +Merge: 8dae3ecff0 6927a7b263 +Author: Sebastiaan van Stijn +Date: Tue Aug 16 21:51:27 2016 +0200 + + Merge pull request #25761 from thaJeztah/update-changelog + + Update 1.12.1 changelog for networking fixes + +commit 6927a7b26375cd274e8911700d25edb3d1f78a5b +Author: Sebastiaan van Stijn +Date: Tue Aug 16 15:59:33 2016 +0200 + + Update networking section in changelog + + - Add 25550 to 1.12.1 changelog + - Add 25739 to 1.12.1 changelog + + Signed-off-by: Sebastiaan van Stijn + +commit 8dae3ecff023f2e297c89f960a5e408975a490b3 +Merge: 7889dc71a2 12ab1ca5eb +Author: Tibor Vass +Date: Mon Aug 15 10:34:16 2016 -0700 + + Merge pull request #25713 from thaJeztah/update-changelog + + [1.12.1] Add removal of "--network-add" / "--network-rm" to changelog + +commit 12ab1ca5eb416d8a20e64bb90b67c589f92ec55b +Author: Sebastiaan van Stijn +Date: Mon Aug 15 14:31:39 2016 +0200 + + Add removal of "--network-add" / "--network-rm" to changelog + + Signed-off-by: Sebastiaan van Stijn + +commit 0a0ebb16fecef2a77e22769b09f8d8dea508d479 +Author: Dong Chen +Date: Mon Aug 15 00:47:42 2016 -0700 + + Add test output to debug failure. + + Signed-off-by: Dong Chen + +commit 6323fc172cc07dcc6cc4f2150aeae26232f90a04 +Merge: ee595f517b 2ca2b82f35 +Author: Joao Fernandes +Date: Fri Aug 12 11:49:14 2016 -0700 + + Merge pull request #2635 from sarahlynnpark/auth-docs + + Remove all links / mentions of LDAP auth config from DTR docs + +commit 7889dc71a2e860590d3e3c4051d6008bc94f8b47 +Author: Tibor Vass +Date: Fri Aug 12 00:17:01 2016 -0700 + + Bump VERSION to v1.12.1-rc1 + + Signed-off-by: Tibor Vass + +commit 705ebd6fac73b3edd9d7980684ba96cef85d2fc0 +Merge: e005053797 eae4ba51e5 +Author: Tibor Vass +Date: Fri Aug 12 10:58:41 2016 -0700 + + Merge pull request #25659 from thaJeztah/update-1.12.1-changelog + + rewording and changes in 1.12.1 changelog for 1.12.1-GA + +commit 2ca2b82f356d46a0905c0065290b0c699b0dbcf2 +Author: sarahlynnpark +Date: Sun Aug 7 14:51:59 2016 -0700 + + Remove all links / mentions of LDAP config + +commit eae4ba51e5f7af1a4d059f0828b84cdc5ac0dae4 +Author: Sebastiaan van Stijn +Date: Fri Aug 12 11:29:57 2016 +0200 + + Minor rewording and changes in 1.12.1 changelog + + Signed-off-by: Sebastiaan van Stijn + +commit e00505379769d67220e4d28e0d25ffaa84720e8e +Merge: c4428f84d0 7646aba651 +Author: Tibor Vass +Date: Fri Aug 12 01:36:22 2016 -0700 + + Merge pull request #25653 from tiborvass/i-hate-rpm + + Changelog: Add placeholder date for 1.12.1 + +commit 7646aba651026a7ff0fc81e040e30f092e75efdb +Author: Tibor Vass +Date: Fri Aug 12 01:29:09 2016 -0700 + + Changelog: Add placeholder date for 1.12.1 + + Signed-off-by: Tibor Vass + +commit c4428f84d093a6d60844f9dbc93dcb9a130a7283 +Merge: 5680192346 a019407d3e +Author: Tibor Vass +Date: Fri Aug 12 00:14:37 2016 -0700 + + Merge pull request #25651 from tiborvass/changelog-1.12.1 + + Update CHANGELOG for 1.12.1 + +commit 5680192346d3415d00a33beed2c54d5438c03a5e +Merge: 5dc0715cd2 151b799147 +Author: Tibor Vass +Date: Fri Aug 12 00:14:30 2016 -0700 + + Merge pull request #25632 from SvenDowideit/more-docs-1.12.1-cherry-picks + + More docs 1.12.1 cherry picks + +commit a019407d3e83e7cc72013d49b91c4bb24a2948ab +Author: Tibor Vass +Date: Thu Aug 11 22:45:16 2016 -0700 + + Update CHANGELOG for 1.12.1 + + Signed-off-by: Tibor Vass + +commit 5dc0715cd2695a97def9a4679924944341f15bcc +Merge: 235d897aaf 42fed93a89 +Author: Tibor Vass +Date: Thu Aug 11 22:27:32 2016 -0700 + + Merge pull request #25637 from tiborvass/cherry-picks-1.12.1 + + Cherry picks 1.12.1 + +commit 235d897aafe2426acb98e8d0483fe2bd4d88d785 +Merge: 6811254691 9623f45fce +Author: Tibor Vass +Date: Thu Aug 11 21:08:40 2016 -0700 + + Merge pull request #25647 from tiborvass/fix-network-flag-on-service-update-1.12.1 + + [1.12.1] Remove --network-add and --network-rm flags from service update + +commit 42fed93a8930df1ba773fb43f81b70187661ceaa +Author: Santhosh Manohar +Date: Thu Aug 11 18:44:32 2016 -0700 + + Vendoring libnetwork for 1.12.1-rc1 + + Signed-off-by: Santhosh Manohar + (cherry picked from commit b9c9fa2855cd5c7391cd026ef13a7d9d061214ee) + Signed-off-by: Tibor Vass + +commit a3f2c03ef00ae6245d8be58666fdfe125fd3d44f +Author: Anusha Ragunathan +Date: Thu Aug 11 15:59:35 2016 -0700 + + Fix deadlock on plugin shutdown. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 4d009084de8cad94a180130eb57efa2a98df6d98) + Signed-off-by: Tibor Vass + +commit af0f7ad7922a6ac8a3369d3e80212072fffd2d86 +Author: Yong Tang +Date: Tue Jul 26 11:40:15 2016 -0700 + + Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed + + This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029. + + Basically this fix adds a check to wait until 3 containers has already up, + before processing `node tasks ...`. + + This might fix 25029. + + Signed-off-by: Yong Tang + (cherry picked from commit 63c0366bc9a7f326ad61cdfa69fa860cf844a2c7) + Signed-off-by: Tibor Vass + +commit 16a0c1c3741ac89fc2186ed782ec127bce0a831a +Author: John Howard +Date: Fri Jun 17 15:46:45 2016 -0700 + + Windows: Fix RO test cases + + Signed-off-by: John Howard + (cherry picked from commit 03816ad5b5a060449243d0e30fa396c2255ddacb) + Signed-off-by: Tibor Vass + +commit 9623f45fce46c297f4953b8045c75128e0dbecd4 +Author: Tibor Vass +Date: Thu Aug 11 18:30:04 2016 -0700 + + Remove --network-add and --network-rm flags from service update + + These flags were not supported (daemon returns an error), and it was an + oversight. They were not present in completion scripts. + + Signed-off-by: Tibor Vass + (cherry picked from commit 3a7e90c743f6fdccb8aecb9d6d9afd42232fa736) + Signed-off-by: Tibor Vass + +commit 3048098843eb266d37b1d131b48cd20c02cfe341 +Author: Davanum Srinivas +Date: Thu Aug 11 15:12:35 2016 -0400 + + Adding /proc/timer_list to the masked paths list + + /proc/timer_list seems to leak information about the host. Here is + an example from a busybox container running on docker+kubernetes. + + # cat /proc/timer_list | grep -i -e kube + , hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2497 + , hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3478 + , hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3470 + , hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2499 + + Signed-Off-By: Davanum Srinivas + Signed-off-by: Davanum Srinivas + (cherry picked from commit 03bd00b68f28062ef6b09a43a4c381af63b91673) + Signed-off-by: Tibor Vass + +commit 7b9515447405ef22cdfbb02ebb9c07531934efa7 +Author: Thomas Tanaka +Date: Wed Aug 10 13:13:27 2016 -0700 + + Add Oracle Linux distro specific selinux policy + + With the latest OL7.2, selinux policy that is shipped + might not be the latest for it to work or build with + selinux policy for docker-1.12. + + To be able to achieve that here is what is done: + 1. Added systemd_machined policy which is part of systemd. + 2. Temporarily comment out unconfined_typebounds because the + current OL7's selinux doesn't have unconfineduser selinux policy, + to include this will be too much. Will revisit this once we have + updated the selinux policy. + + Fixes: #24612 + + Signed-off-by: Thomas Tanaka + (cherry picked from commit d6cae872c704c6cf36ee7d5c9b472e33280af202) + Signed-off-by: Tibor Vass + +commit dab3fc3955342d2e423486c7458688d6c2181e57 +Author: Tibor Vass +Date: Wed Aug 10 14:05:04 2016 -0700 + + Make release scripts architecture-agnostic and add ARM support + + This patch allows to only release the packages that were built and are + present under the bundles/ directory instead of assuming packages exist + for all distros enumerated in the contrib/builder/ directory. + + It also now adds support for armhf architecture for apt repositories. + + Signed-off-by: Tibor Vass + (cherry picked from commit 2ff2e9a73076b737948c68c26f26b7bda5ac7db8) + Signed-off-by: Tibor Vass + +commit f99fd5a3f90c91e62dc50e9908affe55ef1ba459 +Author: Yong Tang +Date: Thu Aug 4 20:51:28 2016 -0700 + + Idempotent service update --publish-add + + This fix tries to address the issue raised in 25375 where + `service update --publish-add` returns an error if the exact + same value is repeated (idempotent). + + This fix use a map to filter out repeated port configs so + that `--publish-add` does not error out. + + An integration test has been added. + + This fix fixes 25375. + + Signed-off-by: Yong Tang + (cherry picked from commit b487497cd2d7586fd7e10affdcc514ca6b7884f6) + Signed-off-by: Tibor Vass + +commit bdf7a55cfedbaa6994b050f8f420d90234e642c2 +Author: Sebastiaan van Stijn +Date: Thu Aug 11 00:47:04 2016 +0200 + + Add warning about systemd socket activation to changelog + + Docker 1.12 ships with an updated unit file on RPM + based distros. Users that have local modifications + to the unit file, or have a drop-in file installed + may not automatically get the updated unit file, + or get an error when starting docker. + + This adds a warning to the changelog, and instructions + on how to resolve the issue. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 66b656684e32884b46c9abb08c874b202f6c77e8) + Signed-off-by: Tibor Vass + +commit 46afae53723b241b08c35bcda07a48e8dd9769f6 +Author: Madhu Venugopal +Date: Wed Aug 10 23:31:01 2016 -0700 + + Vendoring libnetwork for 1.12.1-rc1 + + * Fixes https://github.com/docker/docker/issues/25236 + * Fixes https://github.com/docker/docker/issues/24789 + * Fixes https://github.com/docker/docker/issues/25340 + * Fixes https://github.com/docker/docker/issues/25130 + * Fixes https://github.com/docker/libnetwork/issues/1387 + * Fix external DNS responses > 512 bytes getting dropped + * Fix crash when remote plugin returns empty address string + * Make service LB work from self + * Fixed a few race-conditions + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924) + Signed-off-by: Tibor Vass + +commit 265f7a37bdfa674c1f3e9a7a7c923c5fc54803df +Author: Justin Cormack +Date: Wed Aug 10 12:22:36 2016 +0100 + + Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH + + Only open_by_handle_at requires CAP_DAC_READ_SEARCH. + + This allows systemd to run with only `--cap-add SYS_ADMIN` + rather than having to also add `--cap-add DAC_READ_SEARCH` + as well which it does not really need. + + Signed-off-by: Justin Cormack + (cherry picked from commit c1ca124682a90f3306b34ad104ba80e413f7bf88) + Signed-off-by: Tibor Vass + +commit 769c25c416ac8d22fe2d17c15f7d693074fb64cd +Author: Jana Radhakrishnan +Date: Tue Aug 9 13:37:11 2016 -0700 + + Retry creating dynamic networks if not found + + In cases there are failures in task start, swarmkit might be trying to + restart the task again in the same node which might keep failing. This + creates a race where when a failed task is getting removed it might + remove the associated network while another task for the same service + or a different service but connected to the same network is proceeding + with starting the container knowing that the network is still + present. Fix this by reacting to `ErrNoSuchNetwork` error during + container start by trying to recreate the managed networks. If they + have been removed it will be recreated. If they are already present + nothing bad will happen. + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 117cef5e9766d6ba228770c225e816c6afd16ff8) + Signed-off-by: Tibor Vass + +commit 2f6ca79080de0829ffcfb577de48f71db07cd7e4 +Author: Michael Crosby +Date: Mon Aug 1 16:02:01 2016 -0700 + + Add selinux policy per distro + + This adds the ability to have different profiles for individual distros + and versions of the distro because they all ship with and depend on + different versions of policy packages. + + The `selinux` dir contains the unmodified policy that is being used + today. The `selinux-fedora` dir contains the new policy for fedora 24 + with the changes for it to compile and work on the system. + + The fedora policy is from commit + https://github.com/projectatomic/docker-selinux/commit/4a6ce94da5e34868642ebcc7a67da937d4c73283 + + Signed-off-by: Michael Crosby + (cherry picked from commit 32b1f26c5111b22fe4277879c4f5e4687a6a72fc) + Signed-off-by: Tibor Vass + +commit 147f1ad34884dce004f841c30ddab639706033eb +Author: Dieter Reuter +Date: Wed Jul 20 02:05:54 2016 +0200 + + Fix typo in comment + + Signed-off-by: Dieter Reuter + (cherry picked from commit 430bf992d933a1a41d7e61e23ca8fa051e98659e) + Signed-off-by: Tibor Vass + +commit dff3faf04e50e1967d9cc7fdf643e3244264466d +Author: Dieter Reuter +Date: Wed Jul 20 01:08:19 2016 +0200 + + Add a Raspbian specific systemd unit file, use overlay by default + + Signed-off-by: Dieter Reuter + (cherry picked from commit 84ff895a06c3e1de84a522db89207688c8a62899) + Signed-off-by: Tibor Vass + +commit 25a629574cd9fb81875a3ae7de8435ed5d24f93f +Author: Dieter Reuter +Date: Tue Jul 19 21:52:34 2016 +0200 + + Add support to install Docker on raspbian/jessie + + Signed-off-by: Dieter Reuter + (cherry picked from commit 6e76b7a7e5c7810526b1596637fd3b34f53b4dc2) + Signed-off-by: Tibor Vass + +commit 5cc103e9e91d1025d88a86e3678167f6a4d6b632 +Author: Victor Vieux +Date: Tue Aug 9 11:49:28 2016 -0700 + + fix plugin restart on docker restart + + Signed-off-by: Victor Vieux + (cherry picked from commit ab12ed4a5642edb4d96b54b6152f12260093f3ea) + Signed-off-by: Tibor Vass + +commit fdf513e99d2d17ac4d0b5680ff646c82d4032ddb +Author: Yong Tang +Date: Thu Aug 4 20:08:22 2016 -0700 + + Fix `service update --env-add` issue + + This fix tries to address the issue in 25404 where updating environmental + variable in `service update --env-add` will not work. + + The issue is because `--env-add` will only append the env, not update if + the same env already exist. + + This fix tracks the env variable with a map and update if the variable + is the same. + + An integration test has been added. + + This fix fixes 25404. + + Signed-off-by: Yong Tang + (cherry picked from commit c6de8add5fd5443aa820adbcd3c9a438df78823f) + Signed-off-by: Tibor Vass + +commit e5a4047a627ff5642a34e2861516a1e54208f526 +Author: Diogo Monica +Date: Mon Aug 8 16:23:10 2016 -0700 + + Adding Joined at to node inspect + + Signed-off-by: Diogo Monica + (cherry picked from commit d1244abc5ce6382b0ebe034bc604ad0c16d2b628) + Signed-off-by: Tibor Vass + +commit a345cc11c9501b3ac09f99bb6c7973b407a011c7 +Author: Sebastiaan van Stijn +Date: Mon Aug 8 17:24:00 2016 +0200 + + fix validation of non-existing bind-mount source + + Unlike `docker run -v..`, `docker service create --mount` + does not allow bind-mounting non-existing host paths. + + This adds validation for the specified `source`, and + produces an error if the path is not found on the + host. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 84d5ab96ef33355e65f5c31210eb1777db372c52) + Signed-off-by: Tibor Vass + +commit 98bbe7254949db76c40916cd34d1398969152998 +Author: Harald Albers +Date: Fri Aug 5 17:41:40 2016 +0200 + + Fix bash completion for `docker service {create,update} {-e,--env}` + + Signed-off-by: Harald Albers + (cherry picked from commit 197f23da497d3d82f30beb6d920211f6d2055fa3) + Signed-off-by: Tibor Vass + +commit aaadc511d86a0eb8b9441d5fd82fc503ff1d7304 +Author: Dave Tucker +Date: Fri Aug 5 22:22:05 2016 +0100 + + cli: service inspect - Null check for UpdateConfig + + Fixes #25453 + + Signed-off-by: Dave Tucker + (cherry picked from commit 0e1fe4516fc7af03259753f6d264e91d11fe4d1a) + Signed-off-by: Tibor Vass + +commit 8ef01f724b4fe7243bd5e103fab934e22b8dbe9c +Author: Kenfe-Mickael Laventure +Date: Mon Jul 25 19:32:51 2016 -0700 + + Handle out-of-sync libcontainerd client on restore + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 51f21a1674c60108f97878815046c69f769cee48) + Signed-off-by: Tibor Vass + +commit af77d47c1f8321c151b4606e6150d919571525a5 +Author: Harald Albers +Date: Fri Aug 5 19:14:13 2016 +0200 + + Fix bash completion for `docker swarm join --advertise-addr` + + Signed-off-by: Harald Albers + (cherry picked from commit fa1b82e5ebc0e7dafe500e891c8b8c5fe5d4e1aa) + Signed-off-by: Tibor Vass + +commit c473d14d45b99b60a428b20b97cb0368b876d8ad +Author: Tonis Tiigi +Date: Wed Aug 3 15:28:52 2016 -0700 + + libcontainerd: mark container exited after failed restart + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 9be0fb45c25e4d8d3cf0aa444da5ae41dd18f435) + Signed-off-by: Tibor Vass + +commit f6d388f5b1f456e5151d9d8f6f97b89d84881ef3 +Author: Tonis Tiigi +Date: Wed Aug 3 13:45:46 2016 -0700 + + libcontainerd: wait for restart after state change + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 495448b2903c1a765cc17dff05afebe16a466917) + Signed-off-by: Tibor Vass + +commit 8b9d96d208e85ec7f0a664ac3d518c6208a6ae13 +Author: Yong Tang +Date: Wed Aug 3 19:02:39 2016 -0700 + + Sort output of `docker ps --filter` with order by creation time + + This fix tries to address the issue raised in 25374 where the + output of `docker ps --filter` is in random order and + not deterministic. + + This fix sorts the list of containers by creation time so that the + output is deterministic. + + An integration test has been added. + + This fix fixes 25374. + + Signed-off-by: Yong Tang + (cherry picked from commit 3f971335463b99a7caedcf597ffc544845b37a21) + Signed-off-by: Tibor Vass + +commit c573ad30b9420253f22eb81dd9d05cdaeef768f0 +Author: Steve Durrheimer +Date: Thu Aug 4 08:01:04 2016 +0200 + + Add zsh completion for 'docker node rm --force' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit b58ef479a6be7ddff79a354ee912f9dd73a9f41b) + Signed-off-by: Tibor Vass + +commit 23b79424c05415979d220416a988f7c25bb27243 +Author: Victor Vieux +Date: Wed Aug 3 16:22:12 2016 -0700 + + fix deadlock when more than 1 plugin is installed + + Signed-off-by: Victor Vieux + (cherry picked from commit 42360d164b9f25fb4b150ef066fcf57fa39559a7) + Signed-off-by: Tibor Vass + +commit 2422b48ffb92fb7160d58deaab821a710c7f6a20 +Author: Brian Goff +Date: Mon Aug 1 17:00:13 2016 -0400 + + Validate mount paths on task create + + This is intended as a minor fix for 1.12.1 so that task creation doesn't + do unexpected things when the user supplies erroneous paths. + + In particular, because we're currently using hostConfig.Binds to setup + mounts, if a user uses an absolute path for a volume mount source, or a + non-absolute path for a bind mount source, the engine will do the + opposite of what the user requested since all absolute paths are + treated as binds and all non-absolute paths are treated as named + volumes. + + Fixes #25253 + + Signed-off-by: Brian Goff + (cherry picked from commit 38f8b0eb10725c40fb3c7e0719accd240cd39e22) + Signed-off-by: Tibor Vass + +commit 2ac7a9ca9ec23144c13e3231bb3cf28c04fb0673 +Author: Daniel Nephin +Date: Thu Jul 28 14:53:08 2016 -0400 + + Fix the man/Dockerfile for arm + + Signed-off-by: Daniel Nephin + (cherry picked from commit fcde27e6db9ccdb952a1259788404fc500995f98) + Signed-off-by: Tibor Vass + +commit 4dc1afc9614aff3db976e29778b60180bce9d52f +Author: Harald Albers +Date: Wed Aug 3 11:07:24 2016 +0200 + + Add bash completion for `docker node rm --force` + + Signed-off-by: Harald Albers + (cherry picked from commit 46d3464362f18a1eb6d37fc51b120d0f0614653a) + Signed-off-by: Tibor Vass + +commit 9b759e18b174724bf6dbea22eec88fac53d94016 +Author: Tonis Tiigi +Date: Tue Aug 2 15:15:23 2016 -0700 + + Mask join tokens in daemon logs + + Signed-off-by: Tonis Tiigi + (cherry picked from commit e3917c76ce6f75e6c12cd2099d403fdaba8ab218) + Signed-off-by: Tibor Vass + +commit b0bff4d8d2c57e0afe6933c0370524c52b1eece3 +Author: Drew Erny +Date: Tue Aug 2 13:27:35 2016 -0700 + + Fix missing newline in service inspect --pretty + + Printing off networks as part of --pretty was missing a newline, causing + the next thing printed to be concatenated onto the end of the line. + Added an empty println after all networks are printed. + + Signed-off-by: Drew Erny + (cherry picked from commit 02ebaf364ff0463c65d63fd1c3c11840a578fc45) + Signed-off-by: Tibor Vass + +commit caaf53ad3e42aadcbddee5eec543438dcbf80f86 +Author: Diogo Monica +Date: Wed Jul 27 21:17:00 2016 -0700 + + Add --force to node removal + + Signed-off-by: Diogo Monica + (cherry picked from commit a327c231b5c68c13b7dcde2fdc83b8e4cec59c43) + Signed-off-by: Tibor Vass + +commit b32462e2a49c139d1b0ccd8ad961de26077a91be +Author: Brian Goff +Date: Tue Aug 2 11:24:24 2016 -0400 + + Fix missing mount ID on volume unmount + + Fixes #25331 + + Signed-off-by: Brian Goff + (cherry picked from commit 63983f3ffe7895fce3a75115a5bcfe8258e5654c) + Signed-off-by: Tibor Vass + +commit 40baa97ab10a8e372c460a95dc93e38db957f3a6 +Author: Sebastiaan van Stijn +Date: Wed Jul 27 16:14:29 2016 +0200 + + Improve swarm join-token instructions + + this change improves the instructions for + swarm join-token and swarm init; + + - only print the join-token command for workers + instead of for both managers and workers, to + prevent users from copying the wrong command. + An extra line is added to explain how to obtain + the manager token. + - print a message that a token was rotated + sucesfully if '--rotate' is used. + - add some extra white-space before / after + the join commands, to make copy/pasting + easier. + + this change also does some refactoring of join-token; + + - move flagname-constants together with other constants + - use variables for selected role ("worker" / "manager") + to prevent checking for them multiple times, and to + keep the "worker" / "manager" sting centralized + - add an extra blank line after "join-token" instructions + this makes it easier to copy, and cleans up the + code a tiny bit + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit ebebd4176940bc907ba4e8f5fbe62f6a050f8ed4) + Signed-off-by: Tibor Vass + +commit 70f0f7a20e9362c9a74752a497acd921cd591a42 +Author: Brian Goff +Date: Mon Aug 1 23:02:51 2016 -0400 + + Fix issue reloading mount options on restart + + On daemon restart the local volume driver will read options that it + persisted to disk, however it was reading an incorrect path, causing + volume options to be silently ignored after a daemon restart. + + Signed-off-by: Brian Goff + (cherry picked from commit c560dd968600ebc9c1ff78f256ee93a6ded9a728) + Signed-off-by: Tibor Vass + +commit aaf3a81086146f1b67baed8ccf67f88ef0d3f457 +Author: Yong Tang +Date: Thu Jul 28 20:29:58 2016 -0700 + + Output external CAs in swarm mode with `docker info` + + This fix tries to address the issue raised in 25195 where external + CA configurations are not present in `docker info`. + + This fix adds the output of external CAs in `docker info` in swarm + mode. + + The test is done manually with: + ``` + docker run -p 8888:8888 -e CXFSSL_ADDRESS=0.0.0.0 -d fabric8/cfssl + docker swarm init --external-ca protocol=cfssl,url=http://172.17.0.2:8888 + ``` + + The `docker info` output: + ``` + Managers: 1 + Nodes: 1 + Orchestration: + Task History Retention Limit: 5 + Raft: + Snapshot interval: 10000 + Heartbeat tick: 1 + Election tick: 3 + Dispatcher: + Heartbeat period: 5 seconds + CA configuration: + Expiry duration: 3 months + External CAs: + cfssl: https://172.17.0.2:8888 + ``` + + This fix fixes 25195. + + Signed-off-by: Yong Tang + (cherry picked from commit 995128e9ebfc1a84bbfe8765d3642f132a4f630d) + Signed-off-by: Tibor Vass + +commit 828a2473c2e4bb8b60fbb22d788bc6a2e8baea6e +Author: Anusha Ragunathan +Date: Wed Jul 27 13:38:13 2016 -0700 + + Remove plugin root from filesystem. + + `docker plugin remove` didnt actually remove plugin from disk. Fix that. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 5690730a7471726bbaf813e634a7117a562dfb8c) + Signed-off-by: Tibor Vass + +commit 9ba749a49774c79ef1b3ce25589b65a79ad3aac2 +Author: Yong Tang +Date: Sun Jul 31 16:24:17 2016 -0700 + + Better error messages when IP address autodetection fails + + This fix tries to improve error messages when IP address + autodetection fails, as is specified in 25141. + + Previously, error messages only indicate that multiple IPs + exist when autodetection fails. In this fix, if one + interface consists of multiple addresses or multiple + interfaces consist of addresses, the error messages output + the address names and interface names so that end user could + take notice. + + This fix is verified manually. + When multiple addresses exist on multiple interfaces: + ``` + $ sudo docker swarm init + Error response from daemon: could not choose an IP address + to advertise since this system has multiple addresses on different + interfaces (192.168.186.128 on ens33 and 192.168.100.199 on eth10) + - specify one with --advertise-addr + ``` + When multiple addresses exist on single interface: + ``` + $ sudo docker swarm init + Error response from daemon: could not choose an IP address + to advertise since this system has multiple addresses + on interface ens33 (192.168.186.128 and 192.168.55.199) + - specify one with --advertise-addr + ``` + + This fix fixes 25141. + + Signed-off-by: Yong Tang + (cherry picked from commit 59db01049ac6a8e54490565dc44661f780c13734) + Signed-off-by: Tibor Vass + +commit e25a1ca19ce58238e277abe6828ebeb98304b934 +Author: allencloud +Date: Sat Jul 30 01:41:52 2016 +0800 + + update command description in CLI + + Signed-off-by: allencloud + (cherry picked from commit 6c5988ed8c654527ee8dbae26d5618297f038cef) + Signed-off-by: Tibor Vass + +commit cd0a4389e2e436ec37170f59bc01760c8a64b596 +Author: allencloud +Date: Sat Jul 30 10:14:44 2016 +0800 + + uppercase output in docker info related to swarm mode + + Signed-off-by: allencloud + (cherry picked from commit ac13162464f4f80a274d075dca41c2da4d3d73be) + Signed-off-by: Tibor Vass + +commit d00d9dbbfb4b7a4843550530f58e09fdd59686fa +Author: Steve Durrheimer +Date: Fri Jul 29 07:54:10 2016 +0200 + + Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit ab95ec3dd927d5c0c303410519f07631c8c99a4e) + Signed-off-by: Tibor Vass + +commit 282dda382b8c0e2161e073dea3e62e436d3af9cb +Author: Steve Durrheimer +Date: Fri Jul 29 07:41:27 2016 +0200 + + Remove zsh completion for 'docker swarm inspect' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit f146f6127ce5c7a5f579b78f00bd06f68198ce0f) + Signed-off-by: Tibor Vass + +commit 798e0b07cbc6661f4f79bdf4c17efb4c66210b43 +Author: Sebastiaan van Stijn +Date: Tue Jul 26 01:24:32 2016 +0200 + + Update usage of "Swarm" for consistency + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit f0230049f0afd318217c60ebe486aab3b54538fd) + Signed-off-by: Tibor Vass + +commit 4d529895f043329800eb4da445257138da671e6b +Author: Anusha Ragunathan +Date: Mon Jul 18 08:02:12 2016 -0700 + + Make daemon events listen for plugin lifecycle events. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 42abccb841b5bc0d420044e69165852b0054c38f) + Signed-off-by: Tibor Vass + +commit 49d9a425d5a7635d36b7ffccdf1a89ceefbf31b3 +Author: Akihiro Suda +Date: Tue Jul 26 08:37:30 2016 +0000 + + Fix pkg/plugins TLSConfig panic + + Fix #25046 + + Signed-off-by: Akihiro Suda + (cherry picked from commit b1e71bdd1d624e297509a62b072082524dc841fc) + Signed-off-by: Tibor Vass + +commit a577a064039871d07ecf022c21a3196b66223a22 +Author: Anusha Ragunathan +Date: Mon Jul 25 14:06:27 2016 -0700 + + Check for plugin state before enable and disable. + + This prevents unnecessary API call to containerd. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit b867f6c6e18f9d999ddec911a241941428777569) + Signed-off-by: Tibor Vass + +commit bdc0a24156884e200d59ce41926173884422aded +Author: Tibor Vass +Date: Thu Aug 11 12:45:17 2016 -0700 + + Vendor engine-api and swarmkit for 1.12.1 + + Signed-off-by: Tibor Vass + +commit af4ff2541a2a9869a86e6f2a3204866291cb4de1 +Author: Alexander Morozov +Date: Fri Jul 29 09:57:28 2016 -0700 + + integration: drain node before stop in TestApiSwarmForceNewCluster + + It's too long to wait for reschedule. + + Signed-off-by: Alexander Morozov + (cherry picked from commit 307b7b0d151e949024e7ab7ad276b174802a75f2) + Signed-off-by: Tibor Vass + +commit 151b799147596c500ba505da07ed32cd587d5750 +Author: Vincent Demeester +Date: Thu Aug 11 14:03:25 2016 +0200 + + Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api + + add fields in volume api for 1.24, 1.25 + (cherry picked from commit a3432c2fdbc2bdab15e49599815f42660904fdd9) + + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit 61fe5dabe3d6c44160d4dc480873b0374bc7d21b +Author: Sebastiaan van Stijn +Date: Thu Aug 11 13:30:07 2016 +0200 + + Merge pull request #25611 from lixiaobing10051267/masterJoin + + docker swarm join command has no flag '--swarm-token' + (cherry picked from commit f1101ebf3e8fed953528c30bb7d329857fb58805) + + Signed-off-by: Sven Dowideit + +commit 6e122d9bd58a10d10a05189248ce0e4338615a53 +Author: Sebastiaan van Stijn +Date: Thu Aug 11 13:29:47 2016 +0200 + + Merge pull request #25610 from lixiaobing10051267/masterSwarm + + optimize some descriptions for swarm nodes.md + (cherry picked from commit 81fca603a4c828a7bca882cd504cc32b0a7b0d1d) + + Signed-off-by: Sven Dowideit + +commit 6a7d5dcf08fefbf254430abfd5bd609cd2a7a1a9 +Author: Vincent Demeester +Date: Thu Aug 11 09:55:25 2016 +0200 + + Merge pull request #25585 from yongtang/22311-log-opts-map + + Update docs so that log-opts takes map (`{}`) instead of `[]` + (cherry picked from commit e42cc1f6c53a139e08c28dee607105eecafc029e) + + Signed-off-by: Sven Dowideit + +commit ec26e561b0fdc4c5700be1b151e5df5cd92aa065 +Author: Sebastiaan van Stijn +Date: Thu Aug 11 21:52:04 2016 +0200 + + Merge pull request #25548 from thaJeztah/plugin-api-docs + + Add API documentation for experimental plugin features + (cherry picked from commit 5b68177a6e3865a3880d8b3a4e5b932d3ccae1dc) + + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit 83e47c15ee167840752063462ae80efe650863d5 +Author: Sebastiaan van Stijn +Date: Thu Aug 11 10:43:15 2016 +0200 + + Merge pull request #25573 from thaJeztah/improve-runmetrics-layout + + docs: improve layout for runmetrics + (cherry picked from commit a19029a719f209f1bf2e760f11225027787550e2) + Signed-off-by: Sven Dowideit + +commit 6811254691819c86d516a44248c8e55262edb774 +Author: Sebastiaan van Stijn +Date: Wed Aug 10 23:32:26 2016 +0200 + + Merge pull request #25588 from thaJeztah/fix-events-since-description + + Fix events "since" query parameter description + (cherry picked from commit 960b7de456883864479428cdabb5189a348eb700) + + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + + (cherry picked from commit 006f50ae275775dd7125d5c54784fa782f87f37d) + Signed-off-by: Tibor Vass + +commit 8cc5797894c7045ff388c74c5b5f55644ea8c788 +Author: Sven Dowideit +Date: Wed Aug 10 10:34:43 2016 -0700 + + Merge pull request #25569 from friism/fix-typo-in-security-doc + + update intro to say there are four things to consider + (cherry picked from commit ce2ca236db87f8f580cb29be27b4f0b5341af0ca) + + Signed-off-by: Sven Dowideit + (cherry picked from commit 7cee444f8b90d435cc3358e2f510d0614e4e02fd) + Signed-off-by: Tibor Vass + +commit 7bd1512ad6e5eb40a21ec4fa1096a3f15616c55c +Author: Sebastiaan van Stijn +Date: Wed Aug 10 08:01:13 2016 +0200 + + Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs + + Add delete and update API documentation + (cherry picked from commit 2f167a760904f5cf4f6250a55aa8f735fba74594) + + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + + (cherry picked from commit ee59531352e3d98d4cc167733e0ffb99528dbd22) + Signed-off-by: Tibor Vass + +commit 4e6e046035538c61e8d4cf721249d4fb14b7482a +Author: Sebastiaan van Stijn +Date: Tue Aug 9 15:24:43 2016 +0200 + + Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output + + Update example output for node inspect + (cherry picked from commit 80c49d1e5206eabf314069c262f7f643adf021e1) + + Signed-off-by: Sven Dowideit + (cherry picked from commit adf552821a35361b5c975189d6fd5c26f700e86a) + Signed-off-by: Tibor Vass + +commit 1ad0903ea30425747d6f79fe9a9af51887c22fc8 +Author: Vincent Demeester +Date: Sat Aug 6 09:16:23 2016 +0200 + + Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide + + add force remove to admin guide, clean up usage of Raft, cluster -> s… + (cherry picked from commit 59b03240b17d5c1fdd18e629e614dc5cffc6c536) + + Signed-off-by: Sven Dowideit + + Conflicts: + docs/swarm/admin_guide.md + + (cherry picked from commit 0f65b6b1377335cd343d248e3dc47d1ea75eb166) + Signed-off-by: Tibor Vass + +commit 74e965afd804e0ead5f202d1572c966578b47194 +Author: Vincent Demeester +Date: Sat Aug 6 09:10:12 2016 +0200 + + Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo + + fix typo, change sample cert expiry value + (cherry picked from commit e62b9450136595ac73b4fd0de766d072c1a6954a) + + Signed-off-by: Sven Dowideit + (cherry picked from commit f72a1eb6bed1684bb3f282227ae761c6e0532714) + Signed-off-by: Tibor Vass + +commit 39d7e266de0179826d8cee5e4c05cef9fc394bd4 +Author: Sebastiaan van Stijn +Date: Tue Aug 9 15:26:16 2016 +0200 + + Merge pull request #25530 from thaJeztah/docs-update-image-load-response + + docs: add missing "quiet" parameter for image/load and update response + (cherry picked from commit 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4) + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit f558e71cd2d33ef52ba9743f6a81972852f6b31c +Author: Sebastiaan van Stijn +Date: Tue Aug 9 11:31:55 2016 +0200 + + Merge pull request #25527 from thaJeztah/fix-image-load-api-docs + + docs: add missing content-type header for image load + (cherry picked from commit 5fd483695f8d5ffa297f40730f21031f629333e7) + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit 037ad1b1745e12ea5593c14be295bcd9cca8387f +Author: Sebastiaan van Stijn +Date: Tue Aug 9 00:24:08 2016 +0200 + + Merge pull request #25506 from sfsmithcha/fix_network_name + + fix overlay network example + (cherry picked from commit c51f639531459e57f681f97c7358c04a96785db0) + + Signed-off-by: Tibor Vass + +commit 33cabf265814e70cbb40de2545c3ff7d83c60a2e +Author: Sebastiaan van Stijn +Date: Fri Aug 5 18:37:35 2016 +0200 + + Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory + + update D4M D4W advisory in swarm tutorial + (cherry picked from commit e4bca493568c2b67bb45fc488cf7c8a81d55e3d3) + + Signed-off-by: Tibor Vass + +commit c01379f52fe6ebeabcad78bff18e5497dff70043 +Author: Sebastiaan van Stijn +Date: Fri Aug 5 18:05:38 2016 +0200 + + Merge pull request #25441 from thaJeztah/sync-api-docs + + Sync API docs to older API versions + (cherry picked from commit f4575970a7a9c052b2a45c1a9b66ba2333a4d824) + + Signed-off-by: Tibor Vass + +commit d32508f2a1dc41497b697764987e9fc42681f845 +Author: Sebastiaan van Stijn +Date: Fri Aug 5 14:19:22 2016 +0200 + + Merge pull request #25435 from kfr2/fix-run-docs-typo + + Fix typo in run command documentation + (cherry picked from commit 0af3ca6933cccae7fc12cd76dd2ec858bd469eb8) + + Signed-off-by: Tibor Vass + +commit cfd105cd5bb5250cf3bab9d90c4644ce8a1bfab7 +Author: Sebastiaan van Stijn +Date: Fri Aug 5 10:48:19 2016 +0200 + + Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker + + Remove git conflict markers in docs/reference/commandline/swarm_join.md + (cherry picked from commit 49819165460f12606cb96fc0e579cb4019e407da) + + Signed-off-by: Tibor Vass + +commit 4b9b07f281e57193b2b14d408fe01012d0f064d1 +Author: Sebastiaan van Stijn +Date: Fri Aug 5 02:15:24 2016 +0200 + + Merge pull request #25425 from thaJeztah/remove-rc-suffix + + Remove "-rc" from documentation + (cherry picked from commit 9513aa3a48b6d4d7d612ddbdc097495bf48d9572) + + Signed-off-by: Tibor Vass + +commit fff3dce95fdda648b59f4d5c23a3715a66e29a54 +Author: Sebastiaan van Stijn +Date: Fri Aug 5 00:33:37 2016 +0200 + + Merge pull request #25421 from avaid96/patch-1 + + minor nit typo in opensl(openssl) genrsa -out delegation.key 2048 + (cherry picked from commit 4191b786c5a1741038561f79f7fb2790bcbd2b5a) + + Signed-off-by: Tibor Vass + +commit bc967c6ea94acb051e2e2db85bd39b26f7ce199d +Author: Sebastiaan van Stijn +Date: Fri Aug 5 17:44:15 2016 +0200 + + Merge pull request #25405 from thaJeztah/fix-api-markdown + + Fix Markdown formatting in API docs + (cherry picked from commit 66671d4ec29d7ccbd991399b8b98705e57b6a3eb) + + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit 0faacf1180b11ef8844a6ecebfdee19de9d84d77 +Author: Brian Goff +Date: Thu Aug 4 11:03:33 2016 -0400 + + Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output + + Update `service ps` output format in swarm tutorial to match 1.12.0 + (cherry picked from commit e1b77bd69a0789652252b5a1b338839541250dc1) + + Signed-off-by: Tibor Vass + +commit 8e04d5a68c9ec0cb95e2ae2e3500be7fb06a1ea8 +Author: Brian Goff +Date: Wed Aug 3 13:31:36 2016 -0400 + + Merge pull request #25376 from sfsmithcha/fix_typo + + add missing period + (cherry picked from commit f7d48d74a3dd44171d5e9dbcf33ba6de40baa08a) + + Signed-off-by: Tibor Vass + +commit 222e44179c84519d9857eda6c156baa453e837f1 +Author: Sebastiaan van Stijn +Date: Wed Aug 3 15:44:18 2016 +0200 + + Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes + + Update `/node/*` api reference documentation + (cherry picked from commit 0ab06816ea5887098039ba4ddecc964654335594) + + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.24.md + docs/reference/api/docker_remote_api_v1.25.md + +commit 85b9530e26f20716848f09018ef16452c0a4f8cc +Author: Sebastiaan van Stijn +Date: Wed Aug 3 10:21:39 2016 +0200 + + Merge pull request #25358 from lixiaobing10051267/masterBe + + Remove reduntant word in device-mapper-driver.md + (cherry picked from commit 5c9bcaa9421699eb39df59cf12f9404bd4ebec82) + + Signed-off-by: Tibor Vass + +commit 9aabd9c3f4e95843458cd73b0b2305e19f3267a0 +Author: Sebastiaan van Stijn +Date: Wed Aug 3 19:36:19 2016 +0200 + + Merge pull request #24736 from johnharris85/fix-sinatra-tutorial + + Fix broken gem instructions. + (cherry picked from commit 29648795cd3709063c0f4309148708bbb5a3e7bc) + + Signed-off-by: Tibor Vass + +commit 60db5f060e8642202880a180e2ae1bf6cc271aa0 +Author: Sebastiaan van Stijn +Date: Wed Aug 3 01:27:26 2016 +0200 + + Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update + + [Carry 24314] Make MongoDB sample Dockerfile working again + (cherry picked from commit 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad) + + Signed-off-by: Tibor Vass + +commit 514c1da2bf9e740321c3f5ba2661c463da7c056c +Author: Sebastiaan van Stijn +Date: Wed Aug 3 01:04:36 2016 +0200 + + Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update + + [carry 25174] 409 status code result to create service + (cherry picked from commit 2cb1281a4abe20f84cafa9d46f5660355e59ce44) + + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.24.md + docs/reference/api/docker_remote_api_v1.25.md + +commit 5cad6c1df8197f8b1aaf5c07596a7590517949af +Author: Sebastiaan van Stijn +Date: Tue Aug 2 12:27:19 2016 +0200 + + Merge pull request #25318 from lixiaobing10051267/masterParentheses + + A parenthesis omitted in Seccomp.md + (cherry picked from commit d7c9c85e3093cef9e014be12951d226ab45bbba6) + + Signed-off-by: Tibor Vass + +commit d7a01cc60eba2480caa6a33e27f1f22803f0165d +Author: Sven Dowideit +Date: Tue Aug 2 13:06:24 2016 -0700 + + Merge pull request #25282 from clhlc/clhlc-patch-1 + + Update swarm-mode.md + (cherry picked from commit 181f5ac6276fd47a81ea0931c4fd170ceb3508ed) + + Signed-off-by: Tibor Vass + +commit 7ab84e8daff48db2f2eb98443c2f2347e0a50db3 +Author: Sven Dowideit +Date: Tue Aug 2 13:05:47 2016 -0700 + + Merge pull request #25241 from jhorwit2/jah/ps-doc-fix + + Added shutdown to desired-state docs for filter node/service ps + (cherry picked from commit 1d8617a42b9e85f3098174234401d02595f84a79) + + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit 5f38d112fc3bba2f68e0f953911078615266e34b +Author: Vincent Demeester +Date: Mon Aug 1 09:30:07 2016 +0200 + + Merge pull request #25269 from allencloud/update-remote-api-docs-about-409 + + add status code 409 in attach in docs + (cherry picked from commit 56cbfc587f3e30d7587a4a4969d5497aa07edc06) + + Signed-off-by: Tibor Vass + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit a4c8fe1cd4850c2b4583c086dbc7c1c327622896 +Author: Tõnis Tiigi +Date: Mon Aug 1 18:31:46 2016 -0700 + + Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance + + Fix swarm manager node fault tolerance table + (cherry picked from commit ceb4126aa0cfcaf7842d22351876dc35dff915b3) + + Signed-off-by: Tibor Vass + +commit cdfde82612c01f8f7eeaa7405b5ee5aedcca6453 +Author: Charles Smith +Date: Mon Aug 1 11:34:54 2016 -0700 + + Merge pull request #25205 from lixiaobing10051267/masterPath + + Give the correct link of docker swarm init + (cherry picked from commit 93fea86d1da9088899481519412070e2207cfd40) + + Signed-off-by: Tibor Vass + +commit e118034053b2fc621c153593cf1680099ef65c34 +Author: Vincent Demeester +Date: Sun Jul 31 08:54:53 2016 +0200 + + Merge pull request #25239 from dlech/patch-1 + + Make it clear which parmeter is the user + (cherry picked from commit c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192) + + Signed-off-by: Tibor Vass + +commit 9c2ba289dd1d9fbeece5e8c63728cd390a71b4ad +Author: Sebastiaan van Stijn +Date: Thu Jul 28 09:29:51 2016 +0200 + + Merge pull request #25020 from jfrazelle/update-non-events + + update security non-events + (cherry picked from commit 14664beda923dc9249cbd4ac4f024319668e57c0) + + Signed-off-by: Tibor Vass + +commit 5f3b3d651c9a7a568704f6014da6acb65fe35bdf +Author: Charles Smith +Date: Fri Jul 29 16:10:20 2016 -0700 + + Merge pull request #25182 from sfsmithcha/clarify_join_token + + Author Merge add advertise address, clarify join token + + CI errors expected. + (cherry picked from commit ee355e017d210bef02771a8de4733f820ae6b717) + + Signed-off-by: Tibor Vass + +commit 1a5acb35e75745632ff5275ee1104ca7cb0f44a7 +Author: Charles Smith +Date: Fri Jul 29 15:33:34 2016 -0700 + + Merge pull request #25197 from sfsmithcha/add_services_guide + + author merge: add services guide to manage a swarm + (cherry picked from commit 8b69d50c79f75f670fdc87e3e19c651551726605) + + Signed-off-by: Tibor Vass + +commit ddbc9c7d888e0d60c19c5fa63944e7feeba89110 +Author: Sven Dowideit +Date: Thu Jul 28 17:08:54 2016 +1000 + + Merge pull request #25156 from londoncalling/docs-v112-getstarted-a + + modifed d4mac and d4win download links to stable for v1.12 + (cherry picked from commit 352c720d69f6c37c9b1e15332f46ea2dc4335cb9) + + Signed-off-by: Tibor Vass + +commit ee595f517be2ea17773ec75c6a4c3a0b32e2da85 +Author: Joao Fernandes +Date: Thu Aug 11 15:10:17 2016 -0700 + + Fix typo in docs + +commit db523273c58aede54fbee2b6fcc952e487dda582 +Author: Joao Fernandes +Date: Thu Aug 11 14:22:17 2016 -0700 + + Update offline install docs + +commit 72f799363de2711345d2974f1fdc2f2aed985387 +Author: Joao Fernandes +Date: Wed Aug 10 14:19:55 2016 -0700 + + Add release notes for 2.0.3 + +commit a396b5cbd0ce66eaff32004ec2c04a02bd479e13 +Author: Matt Bentley +Date: Wed Aug 10 14:18:34 2016 -0400 + + Added ports for HA documentation + + Signed-off-by: Matt Bentley + +commit f78b30d9294c91c8a83b8816e0ca09c5e377ca45 +Merge: d49c2ca9b5 98e45b7ce8 +Author: Joao Fernandes +Date: Mon Aug 8 16:43:07 2016 -0700 + + Merge pull request #2633 from vsaraswat/patch-1 + + Make DTR install on UCP node requirement clearer + +commit d49c2ca9b5dbca54cb47ec3ea87fde76cbce8270 +Merge: 67c7b2205d 822dd43a54 +Author: Edgar Lee +Date: Mon Aug 8 15:19:02 2016 -0700 + + Merge pull request #2606 from hinshun/improve-reconfigure-desc + + Update reconfigure command description that only flags specified are … + +commit 67c7b2205d792bbe5057ca0e6471f1e40cc372e7 +Author: Matt Bentley +Date: Sat Aug 6 11:32:09 2016 -0400 + + Fixed migrate command; added storage migration + + Signed-off-by: Matt Bentley + +commit 26811e6a09dcc55209c77eb0706f83eaf5ce6207 +Merge: 9eae185fdd 2164f0283d +Author: Allen Sun +Date: Sat Aug 6 11:05:21 2016 +0800 + + Merge pull request #2407 from xianlubird/bug/schedule-log + + Fix scheduler detail log improper effect when container name is empty + +commit 98e45b7ce88e483e7a27642051ca554b06c72aed +Author: Vivek Saraswat +Date: Fri Aug 5 16:58:41 2016 -0700 + + Make DTR install on UCP node requirement clearer + + During DockerCon workshops and other customer sessions several people have noted that it is not clear that DTR must be installed on a node already joined to the UCP cluster (they asked if it automatically joined the UCP cluster or not). Adding two lines (one in install and one in replica joins) that hopefully makes this clearer. + +commit c9d614ffe11388a87efc00df7e01d1c8a312d7d2 +Author: Dong Chen +Date: Fri Aug 5 11:45:04 2016 -0700 + + Listen to health_status events. + + Signed-off-by: Dong Chen + +commit 822dd43a54123da4d4c2622f5c64888fe711f662 +Author: Edgar Lee +Date: Wed Aug 3 18:13:56 2016 -0700 + + Update reconfigure command description that only flags specified are changed and rest left intact + +commit 1c0b72c4db13358b4bf4803722c46a30103c297c +Author: Dong Chen +Date: Wed Aug 3 17:40:32 2016 -0700 + + Revert install-w-machine.md to 833471b74cf39c826f349c0355dfca0d244f92c0. + + Signed-off-by: Dong Chen + +commit b9b87bed67f42891d3ee73993f85a9dcd1e5028d +Author: Sven Dowideit +Date: Thu Jul 28 16:39:04 2016 +1000 + + Merge pull request #83 from SvenDowideit/start-migrating-to-jenkinsfile + + Initial Jenkinsfile + (cherry picked from commit 9736bd57db38561847648a612867d0f0f9978836) + +commit a6fda67663e158d0f0c1384599a2084724249577 +Author: Riyaz Faizullabhoy +Date: Tue Aug 2 10:27:30 2016 -0700 + + Merge pull request #893 from docker/docs-typo + + fix access typos, close 833 + (cherry picked from commit 41c5dd3248dfeee0213b104b0cfc95b473164ec1) + +commit 429320a4f8f4040b273fd4d1be9f1d0b1283dc23 +Author: Victoria +Date: Mon Aug 1 12:25:38 2016 -0700 + + Merge pull request #3797 from aanand/note-about-experimental-build + + Add note to bundle docs about requiring an experimental Engine build + (cherry picked from commit 589fb4925e7620cf2631b491acc5e2df4f96b69c) + +commit 9eae185fdd1fd81aad8dda9820e28561cffb8b18 +Merge: a5a7ed4526 535ea05d3d +Author: Sven Dowideit +Date: Wed Aug 3 11:38:04 2016 -0700 + + Merge pull request #2337 from dangoncalves/issue-2336 + + Make install manual less confusing + +commit 535ea05d3d81ef59eef3cd37edb47e8a88802625 +Author: Daniel Gonçalves +Date: Tue Jun 7 14:46:23 2016 +0200 + + Make install manual less confusing + + Signed-off-by: Daniel Gonçalves + +commit 2164f0283d9f5b6bc0fe8f2fc7f14f5b2b43ec97 +Author: xianlubird +Date: Mon Jul 11 19:14:49 2016 +0800 + + Fix scheduler detail log improper effect when container name is empty + + Signed-off-by: Xianlu + +commit a5a7ed45263d088964b45c0227a0b499ed054145 +Merge: 5d5f7f04c8 265c55023c +Author: Allen Sun +Date: Tue Aug 2 10:17:12 2016 +0800 + + Merge pull request #2244 from ezrasilvera/mesosCheckNameFix + + Check unique container name on create and rename for Mesos cluster + +commit 3350253c192033a32ca188f35862c6b656b635fd +Author: Joao Fernandes +Date: Mon Aug 1 16:21:44 2016 -0700 + + Revamp docs for permission management + +commit 7e9c0d922ddb3c95c60547b91e85fd9d53568a1e +Merge: 8adfe0ee4e 97117f7144 +Author: Nathan LeClaire +Date: Thu Jul 28 17:43:46 2016 -0700 + + Merge pull request #543 from docker/test2get + + Change test.docker.com to get.docker.com for final release + +commit 97117f714404a03232bd165803ed04d3fdab0445 +Author: Nathan LeClaire +Date: Thu Jul 28 17:43:26 2016 -0700 + + Change test.docker.com to get.docker.com for final release + + Signed-off-by: Nathan LeClaire + +commit 8adfe0ee4e8371e1da9d646402fb064dfec018af +Merge: ad9eac89e9 4359eee68a +Author: Nathan LeClaire +Date: Thu Jul 28 17:40:40 2016 -0700 + + Merge pull request #542 from docker/bump_1.12.0 + + Bump versions for 1.12.0 + +commit 4359eee68af9e7eccf35d54c773caa6c3a289551 +Author: Nathan LeClaire +Date: Thu Jul 28 17:16:38 2016 -0700 + + Bump versions for 1.12.0 + + Signed-off-by: Nathan LeClaire + +commit 8eab29edd820017901796eb60d4bea28d760f16f +Author: Tibor Vass +Date: Wed Jul 27 16:35:10 2016 -0700 + + Bump VERSION to v1.12.0 + + Signed-off-by: Tibor Vass + +commit 3c292b6d92dab10b538bf66afe365fb9036a9b4c +Merge: cd22bb863c 4f369a74fa +Author: Tibor Vass +Date: Thu Jul 28 13:59:20 2016 -0700 + + Merge pull request #25191 from mavenugo/1.12.dl + + Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock + +commit 5d5f7f04c861d9da49005c8570598b021c7bd73a +Merge: 0d05ee2354 3d4d8be89b +Author: Alexandre Beslic +Date: Thu Jul 28 12:47:36 2016 -0700 + + Merge pull request #2435 from nishanttotla/bump-1.2.4 + + Bump version to 1.2.4 + +commit 3d4d8be89b46eb86c3a8faca35a82f7ac5970146 +Author: Nishant Totla +Date: Thu Jul 28 12:20:46 2016 -0700 + + Bump version to 1.2.4 + + Signed-off-by: Nishant Totla + +commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81 +Author: Madhu Venugopal +Date: Thu Jul 28 11:56:12 2016 -0700 + + Vendoring libnetwork to avoid a deadlock + + Signed-off-by: Madhu Venugopal + +commit cd22bb863ce783232a54136a683d9e8a20694df8 +Merge: 664fcd9f28 eddee8e932 +Author: Tibor Vass +Date: Thu Jul 28 11:13:37 2016 -0700 + + Merge pull request #25178 from crosbymichael/bump-restore + + Check if the container is running if no event + +commit a9b1322edf48b1fb9aee4e5ded7a4f4ac37c6830 +Author: Aaron Lehmann +Date: Tue Jul 12 12:18:54 2016 -0600 + + Document TOOMANYREQUESTS error code + + Add entries with this error code in registry/api/v2/descriptors.go. + + Signed-off-by: Aaron Lehmann + +commit eddee8e9328dd8decff4f492045798a7d0867fde +Author: Michael Crosby +Date: Wed Jul 27 09:21:13 2016 -0700 + + Check if the container is running if no event + + When there is no event for the container it can happen because of a + crash and the container state on the persistent disk will have a + mismatch between what was in `/run` ( machine crash ). + + This situation will create an unkillable container in docker because + containerd does not see it and it is not running but docker thinks it is + and you cannot tell it anything different. + + This fixes the issue by checking if containerd has the container running + if we do not have an event instead of just returning. + + Signed-off-by: Michael Crosby + +commit 0d05ee2354a358389629436369bb25162d5ef989 +Merge: 8d2748ff6b 0f188a3787 +Author: Nishant Totla +Date: Thu Jul 28 01:14:19 2016 -0700 + + Merge pull request #2206 from nishanttotla/http-client-create + + Creating http client in swarm + +commit ad9eac89e92e1e684955a7806e198cb68b935aef +Merge: fa56475fb2 27bffccbb2 +Author: Sven Dowideit +Date: Thu Jul 28 13:33:13 2016 +1000 + + Merge pull request #541 from londoncalling/docs-v112a + + added info about d4mac and d4win for v1.12 publish set + +commit 27bffccbb22afa4a15c7aaf1d6d98ed06048c392 +Author: Victoria Bialas +Date: Wed Jul 27 19:04:06 2016 -0700 + + added info about d4mac and d4win for v1.12 publish set + + Signed-off-by: Victoria Bialas + +commit 3672996bac620e3d854f45162b45f1632ed5e0a6 +Author: Aanand Prasad +Date: Tue Jul 5 16:08:08 2016 -0700 + + Merge pull request #3669 from chrisclark/master + + Docs: Typo leading to possible extreme agony + (cherry picked from commit edd3637b9b0e80d2ed1d3dc5f1f74f351f9116cc) + Signed-off-by: Sven Dowideit + +commit ae97955f99ec920cc3f7dc68fc0af75794906fd3 +Author: Sven Dowideit +Date: Mon Jun 27 11:50:15 2016 +1000 + + Merge pull request #3631 from jamesottaway/patch-1 + + Document `tmpfs` being v2 only + (cherry picked from commit 5c1abe2e293ffdfaee3f2a07499ef765adfbd10e) + + Signed-off-by: Sven Dowideit + +commit aa044719c0022e81b30c3ecc8eea33ea888ede69 +Author: Ben Firshman +Date: Wed Jun 29 15:20:16 2016 +0100 + + Merge pull request #3570 from davidjb/patch-1 + + Fix minor YAML typo + (cherry picked from commit da2aae2a298d035ebfd81e89a02fe51d0ef4839f) + + Signed-off-by: Sven Dowideit + +commit 664fcd9f287c295a603cc7f230b9b4843e65eab6 +Merge: f399272f7b 29f6886e48 +Author: Justin Cormack +Date: Thu Jul 28 00:21:36 2016 +0100 + + Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picks + + 1.12.0 final cherry picks + +commit f399272f7b159a3e6e992d73237ea791ce09665f +Merge: 1f33c33fbe 05073a911d +Author: Tibor Vass +Date: Wed Jul 27 15:28:46 2016 -0700 + + Merge pull request #25149 from tiborvass/1.12-changelog-fix + + Add some ommissions to CHANGELOG and update some swarm commands + +commit 29f6886e4836eb7f29e14c585eb2f9e4ec548bd0 +Author: Madhu Venugopal +Date: Wed Jul 27 08:41:46 2016 -0700 + + Vendoring libnetwork to fix #25109 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit b1ae883d3f8c35f9142966af7bf5278e7a10b268) + Signed-off-by: Tibor Vass + +commit 7f6a1d9fb78ca8c2fc312c1f24178acee57b1812 +Author: Charles Smith +Date: Mon Jul 25 09:04:15 2016 -0700 + + update rolling update tutorial to reflect default parallelism and update on failure + + Signed-off-by: Charles Smith + (cherry picked from commit 6440cacd49226e97b2dcb64eb31cb32b87b1ff18) + Signed-off-by: Tibor Vass + +commit c46db363d67c86e8887eec5be521134ae4e31f4c +Author: Lei Jitang +Date: Tue Jul 26 22:51:03 2016 -0400 + + Fix daemon panic on restoring containers + + Signed-off-by: Lei Jitang + (cherry picked from commit c75de8e33cc0db5236eef6146f2de06533b46aa8) + Signed-off-by: Tibor Vass + +commit cda10d4d7fec9c5cd4322b80dfe5196ef1f698c8 +Author: John Howard +Date: Mon Jun 27 13:20:47 2016 -0700 + + Move directive out of globals + + Signed-off-by: John Howard + Signed-off-by: Michael Crosby + (cherry picked from commit 755be795b4e48b3eadcdf1427bf9731b0e97bed1) + Signed-off-by: Tibor Vass + +commit 3fba11f7c64060d71319b2b4591d6691a6aae24f +Author: Derek McGowan +Date: Tue Jul 26 11:57:09 2016 -0700 + + Fix files in subdirectories creating bad whiteout + + Closes #23863 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 1c0f6653ba82c933885719478e90c13f8d7e32b7) + Signed-off-by: Tibor Vass + +commit b49dd20939d04a86bf5da698c2e0f9e0fc8d6330 +Author: Derek McGowan +Date: Tue Jul 26 11:56:38 2016 -0700 + + Update diff apply test to check sub directories + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 5c05b8447d06793530e3d860b99a6e878685275a) + Signed-off-by: Tibor Vass + +commit 0a4abdb0ac3fd3e284bd69082e37505c5bcc18af +Author: Michael Crosby +Date: Tue Jul 26 14:56:27 2016 -0700 + + Remove the Require on the socket for the rpm + + Signed-off-by: Michael Crosby + (cherry picked from commit 3cddda3bbb0cbc6f600b228b61e1110e0cf34c65) + Signed-off-by: Tibor Vass + +commit d79bd3010a2534134ad46fa5f489814f724daad1 +Author: Brian Goff +Date: Tue Jul 26 10:03:47 2016 -0400 + + Fix issue with test ordering for TestParseWords + + `TestParseWords` needs to use the `tokenEscape` for one of the test + cases, but `tokenEscape` was not being set unless tests ran in a + specific order. + This sets a default value for `tokenEscape`... `\`... so that tests that + rely on this global are not affected by test ordering. + + This is the simplest fix for these cases. Ideally the token should not + be set as a global but rather passed down, which is a much larger + change. + + Signed-off-by: Brian Goff + (cherry picked from commit df167d3ff04cdc90012c8ca39647662ad69e6715) + Signed-off-by: Tibor Vass + +commit 486d5aa47f14389b4740ffc95a26a9e181509f05 +Author: Harald Albers +Date: Tue Jul 26 04:51:27 2016 -0700 + + Remove bash completion for `docker swarm inspect` + + Signed-off-by: Harald Albers + (cherry picked from commit 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b) + Signed-off-by: Tibor Vass + +commit 55b920c98886772703fd53cbf8409e3d9b8a49df +Author: Harald Albers +Date: Tue Jul 26 04:45:57 2016 -0700 + + bash completion for container labels to `service {create,update}` + + Signed-off-by: Harald Albers + (cherry picked from commit 13c138ec2a896a87da8fa81693975e7ffbec85fd) + Signed-off-by: Tibor Vass + +commit 05073a911d90fb7fc11e9190d1e6d260e252bb51 +Author: Tibor Vass +Date: Wed Jul 27 14:36:23 2016 -0700 + + Add some ommissions to CHANGELOG and update some swarm commands + + Signed-off-by: Tibor Vass + +commit 1f33c33fbe9a6a95fd73359175e8f8d70cd36fd9 +Merge: 7b7b9078cf d8f3b3f006 +Author: Tibor Vass +Date: Wed Jul 27 14:39:38 2016 -0700 + + Merge pull request #25145 from aaronlehmann/remove-join-tokens-from-info + + Carry #25134: Remove join-tokens from the /info API + +commit 7b7b9078cf491001a9f8aa3d94dd726126e7a5ca +Merge: c9b38547d5 2f736927a0 +Author: Tibor Vass +Date: Wed Jul 27 14:38:08 2016 -0700 + + Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0 + + [bump-1.12.0] cli: `docker service|node|stack ps` instead of tasks + +commit c9b38547d5f82041fa90a0b8a875bef74988681f +Merge: 340ff060a8 398bde913f +Author: Tibor Vass +Date: Wed Jul 27 14:13:49 2016 -0700 + + Merge pull request #25144 from dnephin/remove-extraneous-aliases.bump + + [bump_v1.12.0] Remove extraneous mount aliases + +commit 02c9f9607128802c904a454d6cc900b3e9ec4555 +Author: French Ben +Date: Wed Jul 27 13:51:41 2016 -0700 + + Kitematic version to match engine + + Signed-off-by: French Ben + +commit b85aac15463faf0e69f41d757291db9ab4c056f3 +Author: Nathan LeClaire +Date: Wed Jul 27 13:49:03 2016 -0700 + + Bump version to 0.8.0 + + Signed-off-by: Nathan LeClaire + +commit c6167911081db8b2f237182bf4e4505a7c0d5c7c +Merge: 9a2e327224 fd85914f80 +Author: Nathan LeClaire +Date: Wed Jul 27 13:41:31 2016 -0700 + + Merge pull request #3616 from nathanleclaire/revert_version_bump + + Revert "Bump version for 0.8.0" + +commit fd85914f80cee6307bde17c1d00862c21fc4d563 +Author: Nathan LeClaire +Date: Wed Jul 27 13:38:07 2016 -0700 + + Revert "Bump version for 0.8.0" + + This reverts commit 324f31ea4b9486a97ad928f81b6527e2fa239842. + + Signed-off-by: Nathan LeClaire + +commit 9a2e327224348fff460bb754a11c45b368fcc6c8 +Merge: fcad7821d7 324f31ea4b +Author: Nathan LeClaire +Date: Wed Jul 27 13:31:45 2016 -0700 + + Merge pull request #3614 from nathanleclaire/v0.8.0_bump + + Bump version for 0.8.0 + +commit 324f31ea4b9486a97ad928f81b6527e2fa239842 +Author: Nathan LeClaire +Date: Wed Jul 27 13:21:30 2016 -0700 + + Bump version for 0.8.0 + + Signed-off-by: Nathan LeClaire + +commit fcad7821d707f1629859cae0d2f274d547691948 +Merge: ff1f645174 6c39ec9e3f +Author: Nathan LeClaire +Date: Wed Jul 27 13:16:28 2016 -0700 + + Merge pull request #3612 from GenPage/patch-1 + + Update digitalocean driver image defaults + +commit 340ff060a8e077b483fa6908c1c9bffacaa526b5 +Merge: 69080f423d e97e51d79c +Author: Tibor Vass +Date: Wed Jul 27 12:45:31 2016 -0700 + + Merge pull request #25103 from tiborvass/fix-bad-cherry-pick-info + + Fix bad cherrypick from a91bc28e6225fb0d943451b8bdafca8b6bbb047d + +commit 94f7016fb73a7174c5249c0ca2abfab44663ce7a +Merge: 1bf0cd07de f3628c7a5e +Author: Joffrey F +Date: Wed Jul 27 12:40:07 2016 -0700 + + Merge pull request #3777 from docker/bump-1.8.0 + + Bump 1.8.0 + +commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7 +Author: Aaron Lehmann +Date: Wed Jul 27 12:06:00 2016 -0700 + + Remove join-tokens from the /info API + + join-tokens are not needed for this endpoint, and should not be as part + of /info + + Signed-off-by: Aaron Lehmann + +commit 398bde913f62793c51de6aab5a71ac1eed99c557 +Author: Daniel Nephin +Date: Mon Jul 25 12:28:05 2016 -0400 + + Remove extraneous mount aliases. + + Signed-off-by: Daniel Nephin + +commit f3628c7a5e14b545a8f3d93f5f03681d2e5de4ef +Author: Joffrey F +Date: Wed Jul 27 11:55:49 2016 -0700 + + Bump 1.8.0 + + Signed-off-by: Joffrey F + +commit e115eaf6fc3682a0bae0b5148f0793346950e9da +Author: Aanand Prasad +Date: Wed Jul 27 18:26:40 2016 +0100 + + Fix error message for unrecognised TLS version + + Signed-off-by: Aanand Prasad + +commit 1bf0cd07dea62208de481f5317c76e7c9cee4735 +Merge: 7f54850b4a cefa239c2e +Author: Joffrey F +Date: Wed Jul 27 11:50:24 2016 -0700 + + Merge pull request #3772 from docker/bump-1.8.0-rc3 + + Bump 1.8.0-rc3 + +commit 2f736927a0faae8405c96fcc2b6d6f60e2464e94 +Author: Stephen J Day +Date: Tue Jul 19 14:01:31 2016 -0700 + + cli: `docker service|node|stack ps` instead of tasks + + Rather than conflict with the unexposed task model, change the names of + the object-oriented task display to `docker ps`. The command + works identically to `docker service tasks`. This change is superficial. + + This provides a more sensical docker experience while not trampling on + the task model that may be introduced as a top-level command at a later + date. + + The following is an example of the display using `docker service ps` + with a service named `condescending_cori`: + + ``` + $ docker service ps condescending_cori + ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE + e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 13 minutes ago Running 6c6d232a5d0e + ``` + + The following shows the output for the node on which the command is + running: + + ```console + $ docker node ps self + ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE + b1tpbi43k1ibevg2e94bmqo0s mad_kalam.1 mad_kalam apline Accepted 2 seconds ago Accepted 6c6d232a5d0e + e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 12 minutes ago Running 6c6d232a5d0e + 4x609m5o0qyn0kgpzvf0ad8x5 furious_davinci.1 furious_davinci redis Running 32 minutes ago Running 6c6d232a5d0e + ``` + + Signed-off-by: Stephen J Day + (cherry picked from commit 0aa4e1e68973ede0c73f8a4356e2a17fc903f549) + +commit 69080f423da8a31f73943c1f403915f4a06a318a +Merge: c62b19f1e3 441b660dd1 +Author: Tibor Vass +Date: Wed Jul 27 11:14:01 2016 -0700 + + Merge pull request #25114 from SvenDowideit/bump_v1.12.0-docs + + Bump v1.12.0 docs + +commit 6c39ec9e3fabf93e82162f2d9574478dadda2768 +Author: Dylan Page +Date: Wed Jul 27 09:08:14 2016 -0400 + + Update digitalocean driver image defaults + + - Changed default image from 15.10 to 16.04.1 + - Use slug instead of ID to prevent breakage with ubuntu point releases + + Signed-off-by: Dylan Page + +commit c62b19f1e345e53435c2d94ff71f939a8e54ce2f +Merge: a3f206372f d6b53d91d7 +Author: Sebastiaan van Stijn +Date: Wed Jul 27 18:53:07 2016 +0200 + + Merge pull request #25126 from mlaventure/fix-weird-rpc-lock + + Attach stdin after attach stdout/err to avoid an rpc lock + +commit cefa239c2e86ca0cbc356e4b69f809743c15c75e +Author: Aanand Prasad +Date: Wed Jul 27 15:55:47 2016 +0100 + + Bump 1.8.0-rc3 + + Signed-off-by: Aanand Prasad + +commit 6f3e4bbc6c6bc81c5d4d12331c7540e7dac60b20 +Author: Aanand Prasad +Date: Tue Jul 26 11:59:04 2016 +0100 + + Remove note about .dsb + + Signed-off-by: Aanand Prasad + +commit 87b6b3c1390da4f508a6e9285a9122800581f669 +Author: Aanand Prasad +Date: Tue Jul 26 11:51:30 2016 +0100 + + Add note about missing volume mount support + + Signed-off-by: Aanand Prasad + +commit 1fb5c4b15a6643f2b6a80858633343ba2f0d61c9 +Author: Aanand Prasad +Date: Tue Jul 26 11:51:16 2016 +0100 + + Fix example image hash + + Signed-off-by: Aanand Prasad + +commit 35ed1899819fb7f7a8acfd316aa0b76307671fed +Author: Aanand Prasad +Date: Mon Jul 25 13:46:50 2016 +0100 + + Copy experimental bundle docs into Compose docs so URL is stable + + Signed-off-by: Aanand Prasad + +commit c392acc56b1e9aee7810df6bf2671c1c040ba05e +Author: Aanand Prasad +Date: Fri Jul 1 13:54:27 2016 -0700 + + Show a warning when engine is in swarm mode + + Signed-off-by: Aanand Prasad + +commit cd267d5121d747b282792202bac703e2b958fe97 +Author: Ben Firshman +Date: Sun Jul 24 18:57:36 2016 +0100 + + Add user agent to API calls + + Signed-off-by: Ben Firshman + +commit cb076a57b9261907e61716ab073565b20cc95d0a +Author: Ben Firshman +Date: Tue Jul 5 17:29:28 2016 +0100 + + Suggest to run Docker for Mac if it isn't running + + Instead of suggesting docker-machine. + + Signed-off-by: Ben Firshman + +commit 6246a2592ee95a12450c9d6487ed7fe0c877a9ea +Author: Daniel Nephin +Date: Fri Jun 24 11:10:18 2016 -0400 + + Add reference docs for push and bundle. + + Signed-off-by: Daniel Nephin + +commit 606358cfb7979cd9275ea78e50e7ca22b0a7f429 +Author: Joffrey F +Date: Tue Jul 26 13:07:38 2016 -0700 + + Update docker-py requirement to the latest release + + Signed-off-by: Joffrey F + +commit 0488dd3709f3005ce975c3c6bbc1f0688db0cf0e +Author: Aanand Prasad +Date: Mon Jul 25 16:48:28 2016 +0100 + + Rename --fetch-digests to --push-images and remove auto-pull + + Signed-off-by: Aanand Prasad + +commit b72f911ccf10bb20b9c681c2f0b02b873a29fef4 +Author: Aanand Prasad +Date: Thu Jul 7 12:08:47 2016 -0700 + + Fix timeout value in error message + + Signed-off-by: Aanand Prasad + +commit f9c5816ab8dc7de4a11457966b98d5f658889c3e +Author: Aanand Prasad +Date: Thu Jul 7 11:58:10 2016 -0700 + + Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable + + Signed-off-by: Aanand Prasad + +commit 2ecbf25445856fcf1b06a2ff56f04e4ad628042a +Author: Aanand Prasad +Date: Mon Jul 11 16:13:16 2016 -0400 + + Fix bugs with entrypoint/command in docker-compose run + + - When no command is passed but `--entrypoint` is, set Cmd to `[]` + - When command is a single empty string, set Cmd to `[""]` + + Signed-off-by: Aanand Prasad + +commit 8f842d55d70574ea29f635e7ab7dbaa1e64649f6 +Author: Aanand Prasad +Date: Wed Jul 20 12:47:47 2016 +0100 + + Reorder/clarify args docs + + Signed-off-by: Aanand Prasad + +commit ad19ff6c67554168966ffaaeaa0f2c82231ca35d +Author: Jarrod Pooler +Date: Fri Jul 8 15:56:15 2016 -0400 + + Updating arg docs in the proper place + + Signed-off-by: Jarrod Pooler + +commit 4fb7033d9cf6905a6f54d804b4ca6c48827f6fea +Author: Aanand Prasad +Date: Wed Jul 20 12:23:51 2016 +0100 + + Clarify environment and env_file docs + + Add note to say that environment variables will not be automatically + made available at build time, and point to the `args` documentation. + + Signed-off-by: Aanand Prasad + +commit e1b7510e4a8588df320f87ec4e24623a8e9493c4 +Author: Tomas Tomecek +Date: Thu Apr 21 14:03:02 2016 +0200 + + service: detailed error messages for create and start + + Fixes: #3355 + + Signed-off-by: Tomas Tomecek + +commit f7853a30bdb7177808a6f7366395d7bcbdcdff52 +Author: Harald Albers +Date: Wed Jun 29 08:45:36 2016 -0700 + + bash completion for `docker-compose bundle --fetch-digests` + + Signed-off-by: Harald Albers + +commit 3b4a53c959c97b1043ab1d2f69e71cdae8e7cc63 +Merge: c72c966abc 7f54850b4a +Author: Aanand Prasad +Date: Wed Jul 27 15:53:08 2016 +0100 + + Merge remote-tracking branch 'release/release' into bump-1.8.0-rc3 + +commit 441b660dd17a209b9bdcaf24518d5ad35965f0d3 +Author: Sebastiaan van Stijn +Date: Wed Jul 27 11:30:42 2016 +0200 + + Add back links to 1.12 release in deprecated.md + + These links were temporarily changed, because the + docs were published before the 1.12.0 tag was + available. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca) + Signed-off-by: Sven Dowideit + +commit 2e8165d503e11cf4cb0a95321901ab31c01ee5eb +Author: Sebastiaan van Stijn +Date: Wed Jul 27 11:24:16 2016 +0200 + + Remove release-candidate advisories + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 053ac127ab0f784bebeda38f29f2d7615d2ffcb8) + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + docs/reference/commandline/service_create.md + +commit 1717c76ff2a3a27f50c2b199e5ae0c0c16f6316f +Author: Sebastiaan van Stijn +Date: Wed Jul 27 11:09:57 2016 +0200 + + fix minor docs issues + + this brings back the trailing whitespace in "runmetrics", + that were there intentially to force a line-break + + also removes a duplicate redirect, that was present + on two pages + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit d8434eba462752327d4c7769d3ce2c85013c211e) + Signed-off-by: Sven Dowideit + +commit b7e1ea51a082c51f892d50a3ea3821351f075158 +Author: mapk0y +Date: Wed Jul 27 03:17:32 2016 +0900 + + fix the ipaddress of an explanation. + + Signed-off-by: mapk0y + (cherry picked from commit a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25) + Signed-off-by: Sven Dowideit + +commit b8333bfd5e11f32d81a3e9a07106701f1abf303b +Author: Charles Smith +Date: Fri Jul 22 16:40:15 2016 -0700 + + add how services work to how swarm mode works guide + + Signed-off-by: Charles Smith + (cherry picked from commit bef36fba4022e1c37f1f21e9e265e7f98e2f7f65) + Signed-off-by: Sven Dowideit + +commit ef19b22b856a77ce6c55101216b3b7e1b3ea7886 +Author: Charles Smith +Date: Tue Jul 26 08:15:37 2016 -0700 + + add swarm manage nodes guide + + Signed-off-by: Charles Smith + (cherry picked from commit 704facbbab0af520e0429eb75a6f875b6015a77c) + Signed-off-by: Sven Dowideit + +commit 0bd41118518b9febe13e7b9e37c9cae822894986 +Author: Charles Smith +Date: Mon Jul 18 21:40:07 2016 -0700 + + add doc for live-restore setting and daemonless containers, fix admin guide menu + + Signed-off-by: Charles Smith + (cherry picked from commit cbd07495a3c5b49a47ea288a9e6ee9b24800cace) + Signed-off-by: Sven Dowideit + +commit 81d31af68c8c1b6289b5bcaaff27a51fccef57a8 +Author: Sebastiaan van Stijn +Date: Fri Jul 8 12:06:36 2016 -0700 + + Make archive links absolute + + The archive is only available on docs.docker.com, and not + when doing a "make docs", so relative links will not resolve. + + Making these links absolute, so that they always + point to the live "docs.docker.com" domain. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 4b090ae5f259dcedb946463a8512b2416a971fcb) + Signed-off-by: Sven Dowideit + +commit 9fa212ba5981f1ccb69354b2693b106767acf640 +Author: Mickaël FORTUNATO +Date: Mon Jun 27 09:10:50 2016 +0200 + + Update docker_remote_api_v1.22.md + Update docker_remote_api_v1.23.md + Update docker_remote_api_v1.24.md + Update docker_remote_api_v1.25.md + + look like ExecDriver is not return anymore + + Signed-off-by: Mickaël Fortunato + (cherry picked from commit 166928a24bf5f3b23103b8ad09f134e277c00d6a) + Signed-off-by: Sven Dowideit + + Conflicts: + docs/reference/api/docker_remote_api_v1.25.md + +commit d6b53d91d7d5e95239dda9a33fd6146cf57fa3f2 +Author: Kenfe-Mickael Laventure +Date: Tue Jul 26 19:17:22 2016 -0700 + + Attach stdin after attach stdout/err to avoid an rpc lock + + Reason of the lock is currently unknown + + Signed-off-by: Kenfe-Mickael Laventure + +commit e97e51d79cecf36a1ba5292fe76ed41a9161ed90 +Author: Tibor Vass +Date: Tue Jul 26 18:14:34 2016 -0700 + + Fix bad cherrypick from a91bc28e6225fb0d943451b8bdafca8b6bbb047d + + Signed-off-by: Tibor Vass + +commit ff1f6451743973c065d74d7f6b43ec36f7d99e7b +Merge: 783b3a8341 9ab845ce01 +Author: Nathan LeClaire +Date: Tue Jul 26 17:39:40 2016 -0700 + + Merge pull request #3611 from nathanleclaire/fix_do_slug + + Fix missing slug issue + +commit 9ab845ce01efd7b2cf899a03e28ea45570c20734 +Author: Nathan LeClaire +Date: Tue Jul 26 17:32:17 2016 -0700 + + Fix missing slug issue + + Signed-off-by: Nathan LeClaire + +commit 2d67804aa9c138414120a667e7f9fdd95ad1a1ac +Author: French Ben +Date: Tue Jul 26 12:06:12 2016 -0700 + + Updated description and bump'd version + + Signed-off-by: French Ben + +commit 0b335d348feb37c11ab08d9d5d94e5fa75cb2c54 +Merge: ba7fb1fc84 5a18d0e1c3 +Author: French Ben +Date: Tue Jul 26 12:04:36 2016 -0700 + + Merge pull request #1847 from sbacic/electron-debian-fix + + Electron debian fix + +commit ba7fb1fc8446f08686b35a5cd9d558beea717f14 +Merge: 21f605a4ee c05d16f050 +Author: French Ben +Date: Tue Jul 26 11:46:20 2016 -0700 + + Merge pull request #1844 from thomasdarimont/issue/honor-machine-storage-path-for-vboxlogs + + Honor MACHINE_STORAGE_PATH environment for virtualBoxLogs + +commit a3f206372f58f45fb5f738d3a1bf1b8e78ee9cbf +Author: Tibor Vass +Date: Tue Jul 26 05:07:16 2016 -0700 + + Bump VERSION to v1.12.0-rc5 + + Signed-off-by: Tibor Vass + +commit 626b1529445c40566d829586d65af1a6c75ff047 +Merge: 4ed7f63f0d 5b667c7c55 +Author: Tibor Vass +Date: Tue Jul 26 05:58:54 2016 -0700 + + Merge pull request #25063 from thaJeztah/man-page-cherry + + cherry-pick manpages fix + +commit 5b667c7c55194364495b1ac23ca425da8db6a76f +Author: Daniel Nephin +Date: Fri Jul 22 16:34:46 2016 -0400 + + Require manpages for packages. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 1ea9c19ffe53811931ecd3102703c3eacb22d14c) + Signed-off-by: Sebastiaan van Stijn + +commit c5531b033a6a7c95d224fe0ba3c0e3e80f9da601 +Author: Daniel Nephin +Date: Fri Jul 22 16:32:51 2016 -0400 + + Make manpages in a conatiner. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 7004f219f5d0fe99de0dadf319381d224866eb7c) + Signed-off-by: Sebastiaan van Stijn + +commit 4ed7f63f0daf1567c6bd5b404f0a3ca7341b2743 +Merge: 05444a56af e16a20d11a +Author: Tibor Vass +Date: Tue Jul 26 05:01:51 2016 -0700 + + Merge pull request #25058 from tiborvass/additional-cherrypicks-for-1.12.0-rc5 + + [bump_v1.12.0] Additional cherrypicks for 1.12.0 rc5 + +commit e16a20d11ae57fa23765ea03ed88cfb2afe56c4e +Author: Aaron Lehmann +Date: Mon Jul 25 23:53:20 2016 -0700 + + service update: Don't assume existing pointers in spec are valid + + When updating values in the spec according to CLI flags, don't write + into the existing pointers. They may be nil. Instead, update them to + point to the new value we're writing. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit f9c920a1266197c2b6f0378b58f22246037fda7a) + Signed-off-by: Tibor Vass + +commit 0e2d7c996c081986950618ab0fdc05a0a971c9ba +Author: Tibor Vass +Date: Mon Jul 25 23:07:39 2016 -0700 + + Address some displaying issues in docker info + + Signed-off-by: Tibor Vass + (cherry picked from commit 8ad9438edeab44c8f424113bc96fa12d76e4fdc6) + Signed-off-by: Tibor Vass + +commit a91bc28e6225fb0d943451b8bdafca8b6bbb047d +Author: Vincent Demeester +Date: Sun Jul 24 10:53:52 2016 +0200 + + Remove swarm inspect and use info instead + + Remove the swarm inspect command and use docker info instead to display + swarm information if the current node is a manager. + + Signed-off-by: Vincent Demeester + (cherry picked from commit e6923f6d75c2bd1b22cc1229214ffceca3251cc6) + Signed-off-by: Tibor Vass + +commit 0ffa19daa874d129a7e834f29c3f7ea1f2bdccfb +Author: Tibor Vass +Date: Mon Jul 25 20:31:02 2016 -0700 + + vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89 + + Signed-off-by: Tibor Vass + (cherry picked from commit e3c150bd470162d7a1a168f125a5e9a3b32b6a00) + Signed-off-by: Tibor Vass + +commit c3574dd1ec3eb05fa11af047ae34dd5bd5aa247f +Author: Stephen J Day +Date: Mon Jul 25 20:59:02 2016 -0700 + + container/controller: avoid cancellation with forked pull context + + Context cancellations were previously causing `Prepare` to fail + completely on re-entrant calls. To prevent this, we filtered out cancels + and deadline errors. While this allowed the service to proceed without + errors, it had the possibility of interrupting long pulls, causing the + pull to happen twice. + + This PR forks the context of the pull to match the lifetime of + `Controller`, ensuring that for each task, the pull is only performed + once. It also ensures that multiple calls to `Prepare` are re-entrant, + ensuring that the pull resumes from its original position. + + Signed-off-by: Stephen J Day + (cherry picked from commit d8d71ad5b94d44a2778f2d8989424259cac94e9b) + Signed-off-by: Tibor Vass + +commit fe1d39cc9664fc623ea493429abaf3cd5afec95c +Author: Madhu Venugopal +Date: Mon Jul 25 19:44:07 2016 -0700 + + Vendoring libnetwork to remove stale xfrm states + + When using encrypted vxlan network, some of the xfrm states are left + stale. This fix also filters out self advertise-addr rules. + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42) + Signed-off-by: Tibor Vass + +commit 45c8a3ddd57b8097c46fedaa5dd1cd80f4eee1da +Author: Tibor Vass +Date: Mon Jul 25 19:17:06 2016 -0700 + + Prevent panic on update --container-label-add + + Signed-off-by: Tibor Vass + (cherry picked from commit e462b4507a7020ae96ec4f4806877bff3a0cae99) + Signed-off-by: Tibor Vass + +commit 8fe03baa410b897818cc5b998b8f117fe7f3218b +Author: Vincent Demeester +Date: Mon Jul 25 11:38:01 2016 +0200 + + Add container labels to service create/update + + Swarm mode makes it possible through the API to set labels to containers + but not through command line. This tries to fix it. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 4031d70d1be2f02e1c9d6f7738f2a816be7eeef2) + Signed-off-by: Tibor Vass + +commit 05444a56af9109140618e506077eda3126c2edfe +Merge: e4a0dbc472 86670cced9 +Author: Tibor Vass +Date: Tue Jul 26 03:29:52 2016 -0700 + + Merge pull request #25045 from tiborvass/cherry-picks-1.12.0-rc5 + + Cherry picks for 1.12.0 rc5 + +commit 86670cced9bd1f689410b5f35d9abe9c16e79f54 +Author: Derek McGowan +Date: Tue Jul 26 00:45:39 2016 -0700 + + Fix untag without force while container running + + With digests being added by default, all images have multiple references. + The check for whether force is required to remove the reference should use the new check for single reference which accounts for digest references. + This change restores pre-1.12 behavior and ensures images are not accidentally left dangling while a container is running. + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 1f7a9b1ab3d261de5be7d490e7e4f978f317242f) + Signed-off-by: Tibor Vass + +commit 4b986851f7a2cd2ea0bbb24c0f911766fc3f5904 +Author: Aaron Lehmann +Date: Tue Jul 26 00:15:08 2016 -0700 + + Vendor swarmkit for 1.12.0-rc5 + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 60496af7118d91b04c4fd5a7e50150a76ad9abaf) + Signed-off-by: Tibor Vass + +commit e111f0c7b28719d81750cdf8322aea0186609ce5 +Author: Derek McGowan +Date: Mon Jul 25 13:28:10 2016 -0700 + + Fix calculation of relative path for symlink on docker save + + Relative paths are now calculated from a base path rather than from the file path, which gets treated like a directory. + Symlinks will now properly point to the file as "..//layer.tar" rather the incorrect "../..//layer.tar". + + Fixes #24951 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 5487881e120e927d7210adf0cb09181092c3ab35) + Signed-off-by: Tibor Vass + +commit 25cf7999fa4d97b95c4bb6fe3b806f63889068e8 +Author: Nishant Totla +Date: Mon Jul 25 17:16:31 2016 -0700 + + Using map to list plugins in node description + + Signed-off-by: Nishant Totla + (cherry picked from commit feedb7ab5a139ba492a9b896e8efdc0b9ddc43b2) + Signed-off-by: Tibor Vass + +commit 678a19ef6b8bd99deb91c1915523dab89e3e342f +Author: Madhu Venugopal +Date: Sat Jul 23 08:11:10 2016 -0700 + + improve error message when using ineligible network with service create + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 40c88b8c54fe4595f8bda5417ced3729eea5b16e) + Signed-off-by: Tibor Vass + +commit 027de801a88ff08af9b8581907cc85e97edae5cc +Author: Stephen J Day +Date: Mon Jul 25 14:52:27 2016 -0700 + + swarm/controller: allow cancellation to propagate + + Ensure that cancellation of a pull propagates rather than continuing to + container creation. This ensures that the `Prepare` method is properly + re-entrant. + + Signed-off-by: Stephen J Day + (cherry picked from commit d99c6b837ffd18ffe5bce801feb4936bf0edd2aa) + Signed-off-by: Tibor Vass + +commit 07735b4f0c33ba718ceb0163d5c2c4a0a9629413 +Author: Brian Goff +Date: Mon Jul 25 15:54:38 2016 -0400 + + fix panic on --label-add + + Signed-off-by: Brian Goff + (cherry picked from commit 85bc3194aa12c19a5bd755666d1e9617dc1bb322) + Signed-off-by: Tibor Vass + +commit 84eae5d69fd13e0ccd03925fc886f2d6ce7eda26 +Author: runshenzhu +Date: Tue Jul 12 10:56:01 2016 -0700 + + extend health check to start service + + Signed-off-by: runshenzhu + Signed-off-by: Runshen Zhu + (cherry picked from commit a99db84b4a966f0f09e81c446e857323a2a3302c) + Signed-off-by: Tibor Vass + +commit 0df31ff19377dd3f3a1d4929b9ca6d0bddb1de3e +Author: Tibor Vass +Date: Wed Jul 20 10:50:04 2016 -0700 + + healthcheck: do not interpret exit code 2 as "starting" + + Instead reserve exit code 2 to be future proof, document that it should + not be used. Implementation-wise, it is considered as unhealthy, but + users should not rely on this as it may change in the future. + + Signed-off-by: Tibor Vass + (cherry picked from commit 91e9f3831330c63f8351b9fc3f7c31b3229505be) + Signed-off-by: Tibor Vass + +commit bf024205b7467e7f5860057829a50e0da7889d70 +Author: Nishant Totla +Date: Mon Jul 25 10:38:24 2016 -0700 + + Sort plugin names in node description + + Signed-off-by: Nishant Totla + (cherry picked from commit 227c7e4e8d8ce9ecb74ff1b38fe07cd6c37aee9f) + Signed-off-by: Tibor Vass + +commit 365d16ed6d30361e50176f521ef09e0640dc70d9 +Author: Alexandre Beslic +Date: Wed Jul 20 13:08:46 2016 -0700 + + swarm docs: add administration guide for Managers and Raft + + This adds a guide with recommendations on how to setup + Managers and keep the Swarm cluster healthy. + + Signed-off-by: Alexandre Beslic + (cherry picked from commit 24f87f26e73a49383e0606813a86ed96da7f5a18) + Signed-off-by: Tibor Vass + +commit bd31863ba792cad3c3a8556781b4092ccc016e90 +Author: Charles Smith +Date: Thu Jun 30 11:38:23 2016 -0700 + + add run swarm mode guide + + Signed-off-by: Charles Smith + (cherry picked from commit c406711cc0c5c47f2a36a54becae49c24e0c31c9) + Signed-off-by: Tibor Vass + +commit a3639e6ac6336492d0c3c843891f291639806a11 +Author: Aaron Lehmann +Date: Fri Jul 22 11:35:51 2016 -0700 + + Add failure action for rolling updates + + This changes the default behavior so that rolling updates will not + proceed once an updated task fails to start, or stops running during the + update. Users can use docker service inspect --pretty servicename to see + the update status, and if it pauses due to a failure, it will explain + that the update is paused, and show the task ID that caused it to pause. + It also shows the time since the update started. + + A new --update-on-failure=(pause|continue) flag selects the + behavior. Pause means the update stops once a task fails, continue means + the old behavior of continuing the update anyway. + + In the future this will be extended with additional behaviors like + automatic rollback, and flags controlling parameters like how many tasks + need to fail for the update to stop proceeding. This is a minimal + solution for 1.12. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 57ae29aa74e77ade3c91b1c77ba766512dae9ab4) + Signed-off-by: Tibor Vass + +commit 92cbdfece9977c1897143c92de0cd7f512053709 +Author: Aaron Lehmann +Date: Fri Jul 22 11:12:27 2016 -0700 + + Revendor engine-api + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 3585026c3a01928a0e5a22e893af5f52c75e1a85) + Signed-off-by: Tibor Vass + +commit c166b2c9da72a64a23c9f32acc84778b486716c8 +Author: Josh Horwitz +Date: Thu Jul 21 16:02:12 2016 -0400 + + Treat HEALTHCHECK NONE the same as not setting a healthcheck + + Signed-off-by: Josh Horwitz + (cherry picked from commit 4016038bd323a4ef4ee8d0af8da5dafd88ab1721) + Signed-off-by: Tibor Vass + +commit a688a0ae9d002926a73643116af24ba82bffd6d7 +Author: Aanand Prasad +Date: Mon Jul 25 17:21:23 2016 +0100 + + Add note about --entrypoint overriding default command + + Signed-off-by: Aanand Prasad + (cherry picked from commit 2b7548f97298565bd57a9c26e4eba3aa6e23f8a5) + Signed-off-by: Tibor Vass + +commit 52b078fb3710a073108df825bd17a819941dc14f +Author: Anusha Ragunathan +Date: Fri Jul 22 08:53:26 2016 -0700 + + Handle plugin shutdown when liveRestore is set. + + When daemon has liveRestore set, daemon shutdown should not shutdown + plugins. Fixes #24759 + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 4a44cf1d4c8e540b67aaa3834291a964c6ab7524) + Signed-off-by: Tibor Vass + +commit 47b7cf5ceb849a239a22e2d3f7a4a6c1ed89b151 +Author: Kenfe-Mickael Laventure +Date: Fri Jul 22 15:21:10 2016 -0700 + + Fix missing unlock in libcontainerd.Restore() + + This was preventing the "exit" event to be correctly processed during + the restore process without live-restore enabled. + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit ac068a1f9de2b20b145b5682cd514c1f6b1fac17) + Signed-off-by: Tibor Vass + +commit 6142557cba9b8b3b0a311af278dde6353fdd7b63 +Author: Kenfe-Mickael Laventure +Date: Fri Jul 22 15:20:14 2016 -0700 + + Prepend libcontainerd log message with "libcontainerd:" + + This will make it easier to pinpoint error messages in the daemon + logs. + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 5231c5534679206e20672ca16bbee5c10d699319) + Signed-off-by: Tibor Vass + +commit 42e97d23e261a39582040cf7d1953f36b178f862 +Author: Andrea Luzzardi +Date: Thu Jul 21 19:19:11 2016 -0700 + + service tasks: Improve error reporting + + - Tasks will display all tasks (`-a` is the default and was removed) + - Nest tasks to help display history + - Display task errors inline + + Signed-off-by: Andrea Luzzardi + (cherry picked from commit edd67fd4ad961f0782f1f94e6a26c95810dd037e) + Signed-off-by: Tibor Vass + +commit ec241bfeaf96ec2b999b79a588bf6c85b744fd10 +Author: Sebastiaan van Stijn +Date: Mon Jul 25 12:15:54 2016 +0200 + + make network errors less DRY + + There's existing code to generate these + kind of errors, so make the errors added + in commit cc493a52a46271df82dbebea26038502b85788b9 + less DRY. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 3fa9d77bf312652ae04e902a2b6e73a0b91ec007) + Signed-off-by: Tibor Vass + +commit 861fa0913193a96bc4292a1d647b2af03a29a515 +Author: Zhang Wei +Date: Tue Jul 26 07:10:28 2016 +0800 + + small nit: fix unmeaningful log + + Truncated dir name can't give any useful information, print whole dir + name will. + + Bad debug log is like this: + + ``` + DEBU[2449] aufs error unmounting /var/lib/doc: no such file or directory + ``` + + Signed-off-by: Zhang Wei + (cherry picked from commit af8359562c9561afad0a05e66386588d17788804) + Signed-off-by: Tibor Vass + +commit e9190e0764ed94c7fb78f2cfdd563bf8fce78d51 +Author: Sebastiaan van Stijn +Date: Mon Jul 25 12:04:55 2016 +0200 + + Add new error to API docs + + Commit cc493a52a46271df82dbebea26038502b85788b9 added + a constraint to network connect/disconnect operations + on "Swarm scoped" networks. + + This adds those errors to the API documentation. Also + changes the error to lowercase for consistency. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit b0089e48272f18d856ba147b393371c18d5683fb) + Signed-off-by: Tibor Vass + +commit 14038215d309258b88ee878f5e477377c729f317 +Author: Tianyi Wang +Date: Fri Jun 24 01:49:45 2016 +0900 + + Fix high cpu usage caused by docker stats. + + Signed-off-by: Tianyi Wang + (cherry picked from commit 54e8beec9b33fcca4263516b6f03ef96c29132a3) + Signed-off-by: Tibor Vass + +commit 82219c7727065206c6be1b797d77be8b10236a65 +Author: Tadej Janež +Date: Wed Jun 22 10:00:56 2016 +0200 + + Expand instructions on using systemd to manage containers + + Signed-off-by: Tadej Janež + (cherry picked from commit c8a99a5054b2f890d56eda15adf478d4e70612b1) + Signed-off-by: Tibor Vass + +commit c6ff464d43034c0ab10cb2b18bf2631b2f886140 +Author: Madhu Venugopal +Date: Sun Jul 24 20:08:00 2016 -0700 + + Vendoring libnetwork for rc5 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 56b78ab2f2871707ebdf33802a3029417b43036e) + Signed-off-by: Tibor Vass + +commit 71d54a4bd318010db071f5774e886fce4c54475a +Author: Madhu Venugopal +Date: Sun Jul 24 15:34:45 2016 -0700 + + Prevent network connect/disconnect on swarm scoped networks + + Swarm handles service updates quite differently and also it doesnt + support worker driver network operations. Hence prevent containers from + connecting to swarm scoped networks + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 8f9066c468d7312af722c7cf9fc27b7c8ab79fc3) + Signed-off-by: Tibor Vass + +commit beffc3e8c043b0452f62c7ec13164457bfd2f40a +Author: Everett Toews +Date: Sun Jul 24 22:57:48 2016 -0500 + + Fix AuthzPlugin URL fragment in docs + + These docs have AuthzPlugin with a lower case 'z'. What the plugin + api is actually looking for is AuthZPlugin with an upper case 'Z'. + + See https://github.com/docker/docker/blob/46e3a249a1971f8697ca338c9b02e27d36ddab12/pkg/authorization/api.go#L5-L8 + + Signed-off-by: Everett Toews + (cherry picked from commit c42fbc6b0906c7ccafe5a35d9c2288f83361849d) + Signed-off-by: Tibor Vass + +commit 43193233f878bd955e5f527bde3a30bb15c18d5f +Author: John Starks +Date: Fri Jul 22 18:34:14 2016 -0700 + + Windows: Restore console mode on set mode failure + + SetConsoleMode() on input handles appears to remember invalid bits that + were set, causing problems for other programs (such as xcopy.exe) trying + to set the console mode after docker.exe has exited. Always restore + the input console mode on set failure. + + Signed-off-by: John Starks + (cherry picked from commit 83c186fdd4332b8a08db715e8cb5dd1e80a56567) + Signed-off-by: Tibor Vass + +commit 4cd455a8d911ad2eb891385f7d0b5027b94d18c0 +Author: allencloud +Date: Thu Jul 21 18:03:37 2016 +0800 + + fix typos + + Signed-off-by: allencloud + (cherry picked from commit 4e959ef2f7f063803d04e06166f459257eb94b5c) + Signed-off-by: Tibor Vass + +commit 5aef7cc12d1dfa048e2ffd8556c362930bc554d5 +Author: Steve Durrheimer +Date: Mon Jul 25 08:39:33 2016 +0200 + + Add zsh completion for 'docker swarm join-token' command + + Signed-off-by: Steve Durrheimer + (cherry picked from commit a04bba8b89f12480c4eaf0dda8f47442f99864ca) + Signed-off-by: Tibor Vass + +commit 1cc85c1726a6e1052f1089c9eac8b97ad64f1c05 +Author: Madhu Venugopal +Date: Thu Jul 21 16:13:10 2016 -0700 + + Daemon changes to pass exec-root to libnetwork + + This is required to make the libnetwork's namespace mgmt + directory configurable + + Signed-off-by: Madhu Venugopal + (cherry picked from commit d3af5e3d4bc0aadf25d571835893a9d5bead56b3) + Signed-off-by: Tibor Vass + +commit a0d1201e02841570ed03e6cea1f9a362b5ae4725 +Author: Aaron Lehmann +Date: Thu Jul 21 10:40:19 2016 -0700 + + Require listen address and advertise address to be an IP address or an interface name + + Hostnames are not supported for now because libnetwork can't use them + for overlay networking yet. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit fca0b18dcba99a7fbb8b430a55dc7bf60d5c1356) + Signed-off-by: Tibor Vass + +commit 762a73bf7ff725b2bd786018be9c76bed480bf59 +Author: Aaron Lehmann +Date: Thu Jun 30 18:07:35 2016 -0700 + + Split advertised address from listen address + + There are currently problems with "swarm init" and "swarm join" when an + explicit --listen-addr flag is not provided. swarmkit defaults to + finding the IP address associated with the default route, and in cloud + setups this is often the wrong choice. + + Introduce a notion of "advertised address", with the client flag + --advertise-addr, and the daemon flag --swarm-default-advertise-addr to + provide a default. The default listening address is now 0.0.0.0, but a + valid advertised address must be detected or specified. + + If no explicit advertised address is specified, error out if there is + more than one usable candidate IP address on the system. This requires a + user to explicitly choose instead of letting swarmkit make the wrong + choice. For the purposes of this autodetection, we ignore certain + interfaces that are unlikely to be relevant (currently docker*). + + The user is also required to choose a listen address on swarm init if + they specify an explicit advertise address that is a hostname or an IP + address that's not local to the system. This is a requirement for + overlay networking. + + Also support specifying interface names to --listen-addr, + --advertise-addr, and the daemon flag --swarm-default-advertise-addr. + This will fail if the interface has multiple IP addresses (unless it has + a single IPv4 address and a single IPv6 address - then we resolve the + tie in favor of IPv4). + + This change also exposes the node's externally-reachable address in + docker info, as requested by #24017. + + Make corresponding API and CLI docs changes. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit a0ccd0d42fdb0dd2005f67604cb81a5a6b26787e) + Signed-off-by: Tibor Vass + +commit 38beb3d9ab64934db9b6d87e190394aff5b7a93f +Author: Aaron Lehmann +Date: Thu Jul 21 14:27:47 2016 -0700 + + Vendor libnetwork and github.com/vishvananda/netlink + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 24d2d53f5d3c3da8480f419618c1ae0b054f4cdc) + Signed-off-by: Tibor Vass + +commit ea9d74b7555618d0aa3a06dbb973b3b7e2eba16b +Author: Aaron Lehmann +Date: Fri Jul 22 10:26:45 2016 -0700 + + Revendor swarmkit + + Signed-off-by: Aaron Lehmann + (cherry picked from commit d626875a94d9066617887bcee5046c5f0bdcadab) + Signed-off-by: Tibor Vass + +commit 6db1c73da75e3929c7828c2e6235fc7c3ebbd4dd +Author: Vincent Demeester +Date: Sun Jul 24 11:13:06 2016 +0200 + + Update swarm init task-history-limit docs + + Signed-off-by: Vincent Demeester + (cherry picked from commit 180f8c61bb1d3f05c21e697147b2f75a44bda485) + Signed-off-by: Tibor Vass + +commit e6464aa5ab2c87b05b0d83bc72ddd57bcda30cb9 +Author: Andrea Luzzardi +Date: Fri Jul 22 18:09:54 2016 -0700 + + CLI: Change default Swarm task history retention limit. + + Signed-off-by: Andrea Luzzardi + (cherry picked from commit d97c0a1f253fe61957047ea4b21d9e764dc7d783) + Signed-off-by: Tibor Vass + +commit 723073bccb8974fd27297d0adaf9372d1482d713 +Author: Sebastiaan van Stijn +Date: Sat Jul 23 01:05:45 2016 +0200 + + bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20 + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 9a3e47511ab9faac599b8f085a1b755ec941e49c) + Signed-off-by: Tibor Vass + +commit b7a38b19b3e3dd69a70647e7d27e10ec86652754 +Author: Sebastiaan van Stijn +Date: Fri Jul 22 14:06:03 2016 +0200 + + Change "rotate_worker_token" to "rotateWorkerToken" + + This renames the `rotate_xxx` flags to camelBack, for + consistency with other API query-params, such as + `detachKeys`, `noOverwriteDirNonDir`, and `fromImage`. + + Also makes this flag accept a wider range of boolean + values ("0", "1", "true", "false"), and throw an error + if an invalid value is passed. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit bd81df12780b0765e55582574eaa2a125adf65fa) + Signed-off-by: Tibor Vass + +commit 986a968044441ba749725f29260c3a48243fe9ca +Author: Stephen J Day +Date: Wed Jul 20 16:34:45 2016 -0700 + + api/client/service: mount option defaults and aliases + + Simplifies the mount option usage by providing common aliases for + `source` and `target`. The default mount type is now volume. + + Signed-off-by: Stephen J Day + (cherry picked from commit 634f54a047bfcd2ac95bdcdfe04da7eabe02cbec) + Signed-off-by: Tibor Vass + +commit 9e006577f4180fa79ddca8629057139765f8e51c +Author: Alessandro Boch +Date: Fri Jul 22 15:42:26 2016 -0700 + + Fix regression on --link on bridge network + + Signed-off-by: Alessandro Boch + (cherry picked from commit 3a3f800ff48ddfa729f1db7898bf689d25a6d4cf) + Signed-off-by: Tibor Vass + +commit 1bb38f1a2ba772cea25ba97070c4dee461068c9f +Author: Aaron Lehmann +Date: Fri Jul 22 19:07:10 2016 -0700 + + Update --update-parallelism docs + + Update documentation to account for the changes in #24952. + + docs/swarm/swarm-tutorial/rolling-update.md doesn't need any changes, + but the CLI reference pages should show the current help text. + drain-node.md no longer needs to specify --update-parallelism 1 in its + example. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 933ba8d7f7f95ad0bac97c39ffb3cdf1a5634cc6) + Signed-off-by: Tibor Vass + +commit 16744cb970ffd3f9b7c3890014a7feaddcd18a05 +Author: Stephen J Day +Date: Fri Jul 22 15:06:52 2016 -0700 + + api/client/service: default update parallelism to 1 + + When updates happen, the current behavior is to kill all running + instances and dispatch new tasks. Common use cases for container updates + involve small numbers of containers, meaning the app will go down on + most updates. Setting parallelism to 1 ensures that at most one task + will go down during the update. Services with higher replica counts can + increase this number accordingly to meet their needs. + + Signed-off-by: Stephen J Day + (cherry picked from commit 67246afd3dbcb53fea470bd3e45578370207139d) + Signed-off-by: Tibor Vass + +commit 98f1c30e8c5cca86ef5f5661b87f6888b562f1d5 +Author: Sebastiaan van Stijn +Date: Fri Jul 22 13:13:30 2016 +0200 + + Remove "secrets" leftovers from docs + + f5e1f6f6880391a5a3399023cf93a3c48502e57d replaced "secrets" + with "join tokens", which also removed the "auto-accept" + policy. + + This removes some remaining references to those features. + + Note that there are other references, but those + are already addressed in another pull request. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 987511712f0cee391c8296b7f789c71e91561773) + Signed-off-by: Tibor Vass + +commit ac6d5a01c1b9fbe79c20422a5d7ed15eec84ac52 +Author: Harald Albers +Date: Fri Jul 22 17:39:55 2016 +0200 + + bash completion for `docker swarm join-token` + + Signed-off-by: Harald Albers + (cherry picked from commit 42b4d6ebe44029155d98d623c9d51f0cda89e194) + Signed-off-by: Tibor Vass + +commit fa89f32b133c6c2d91ab6a0facc2e665a9f8c827 +Author: Charles Smith +Date: Thu Jul 21 13:12:23 2016 -0700 + + updates get started with swarm to use join-token + + Signed-off-by: Charles Smith + (cherry picked from commit 9ac145d73621b6393be763686b06b9cf5fb22ce2) + Signed-off-by: Tibor Vass + +commit 9ec67fd8d144a9a769159f7d496962d278d2712b +Author: Vincent Demeester +Date: Fri Jul 22 10:38:56 2016 +0200 + + Append --registry-auth with with + + `--with-registry-auth` is more explicit. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 8426f72107f351b769babadeabbf13f205126514) + Signed-off-by: Tibor Vass + +commit 7836221015fcbbe6274b06e07bb3457052ba562b +Author: Aaron Lehmann +Date: Thu Jul 21 18:08:41 2016 -0700 + + Reorder swarm commands + + This way "join-token" appears next to "join" in the help output. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 58ba4c313b1f19dfb1d50cb32238045d7b3db91d) + Signed-off-by: Tibor Vass + +commit 83e40c50256896878f69014a33388b029a15d384 +Author: Sebastiaan van Stijn +Date: Fri Jul 22 13:09:09 2016 +0200 + + remove "secrets" from completion scripts + + Swarm join has been changed in f5e1f6f6880391a5a3399023cf93a3c48502e57d, + removing various options and the "node accept" command. + + This removes the removed options from the completion + scripts. + + NOTE: a new command ("docker swarm join-token") was + also added, but is not part of this commit. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit c4ab20c5f8c13d9d91dbd29fd41fc0d78f93ab0d) + Signed-off-by: Tibor Vass + +commit c6cd4b37c7ff3ab39dba289f5c8cd4c61d45a81b +Author: Yong Tang +Date: Fri Jul 22 00:20:52 2016 -0700 + + Update the errNoManager() to conform to `swarm join-token` + + In 24823, `swarm join` has been updated to take a `--token` + flag and flag `--manager` has been removed. Though in errNoManager() + the error message still use the old description. + + This fix update the error message in errNoManager() and conforms + to the current available flags. + + This fix is related to 24823. + + Signed-off-by: Yong Tang + (cherry picked from commit 3d30155735d572376500729496de657459493213) + Signed-off-by: Tibor Vass + +commit adeba99c7f3ea2371e949e9c23ed2edbe5318b71 +Author: Justin Cormack +Date: Fri Jul 22 09:43:08 2016 +0100 + + Make README less scabious + + Signed-off-by: Justin Cormack + (cherry picked from commit b2ad59e7bd78271223d0912b1717e63b269346d3) + Signed-off-by: Tibor Vass + +commit b738f3f3e52a2a674ecb62b5380da6f5241860ce +Author: Aaron Lehmann +Date: Wed Jul 20 17:34:33 2016 -0700 + + Revendor swarmkit + + Signed-off-by: Aaron Lehmann + (cherry picked from commit aaa0f0b246c52ef3f5ae46b413f445028b7f88fe) + Signed-off-by: Tibor Vass + +commit 05b1803b130bc7c477b681f0d7c7f6cfa02760b5 +Author: Aaron Lehmann +Date: Wed Jul 20 17:32:24 2016 -0700 + + Revendor engine-api + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 852091ad41127ba318ce1d382214ad2f6cab67de) + Signed-off-by: Tibor Vass + +commit 5d7a3f7b5f869c4ad3d2dd3ceb2a5623e2101e48 +Author: Aaron Lehmann +Date: Wed Jul 20 11:15:08 2016 -0700 + + Replace secrets with join tokens + + Implement the proposal from + https://github.com/docker/docker/issues/24430#issuecomment-233100121 + + Removes acceptance policy and secret in favor of an automatically + generated join token that combines the secret, CA hash, and + manager/worker role into a single opaque string. + + Adds a docker swarm join-token subcommand to inspect and rotate the + tokens. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 2cc5bd33eef038bf5721582e2410ba459bb656e9) + Signed-off-by: Tibor Vass + +commit 4d7d354cffa90195d04b77e2a0b3ebcc03ce9e9c +Author: Sebastiaan van Stijn +Date: Thu Jul 21 01:04:51 2016 +0200 + + Change mount-types to lowercase + + these values were changed to lowercase in + https://github.com/docker/engine-api/commit/690cb2d08cfcca31cd02e68b23915b75386beecd, + but not changed accordingly in docker/docker. + + this changes the mounttypes to lowercase + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 8f93128cd619e1d11be1bc0ae21f1362b1e3f9ad) + Signed-off-by: Tibor Vass + +commit 33a8310bc8f027bf62aba4b07fc5b625fa3f93d9 +Author: Kenfe-Mickael Laventure +Date: Thu Jul 21 10:21:52 2016 -0700 + + Harmonize containerd commit used by all Dockerfile + + When #24648 was merged, only the main Dockerfile was updated with the + new containerd commit, this commit brings the other Dockerfile up to + speed. + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit d5cbc57eff0df651bfbfb455608da45747651d0c) + Signed-off-by: Tibor Vass + +commit acfbf729060da5794eb8a75ee5766ce930457178 +Author: Yong Tang +Date: Tue Jul 12 20:14:11 2016 -0700 + + Extend deprecation cycle to 3 releases by default + + At the moment docker's deprecation policy is 2 release cycles by + default, which is around 5 months. This may not be enough for + production environment and there is a need to extend the + deprecation cycle to 3 releases (see #24494). + + This fix updates the docs/deprecated.md and extend the deprecation + cycle to 3 releases. + + This fix is related to #24494 and #24534. + + This fix fixes #24534. + + Signed-off-by: Yong Tang + (cherry picked from commit 9414955c608834c20e3764e753854e667f2e0cbe) + Signed-off-by: Tibor Vass + +commit 51b749e65943b0d6bca9b279e823dbad249725be +Author: Alexandre Beslic +Date: Wed Jul 20 17:25:39 2016 -0700 + + update libkv, fix wrong error check on zookeeper list + + Signed-off-by: Alexandre Beslic + (cherry picked from commit 5189e3d50d66c654132a64777e437dad55176ed5) + Signed-off-by: Tibor Vass + +commit f001601c09fb457dfffbf4b550d18e0cee390813 +Author: Sebastiaan van Stijn +Date: Thu Jul 21 12:27:39 2016 +0200 + + docs: improve formatting and highlighting of docker ps reference + + this improves the formatting, and code-highlighting + of the `docker ps` reference page, and wraps sentences + to 80 chars + + also adds single quotes around the formatting + example for labels. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 07ef0a37f85fbb3ba0be4a09bb301108bf461d96) + Signed-off-by: Tibor Vass + +commit 5d5680053790b3b3e59b1f18922049239e6104f8 +Author: Nishant Totla +Date: Fri Jul 15 13:17:03 2016 -0700 + + Send registry auth token for service deploy + + Signed-off-by: Nishant Totla + (cherry picked from commit a26bdd8607c62e6e736d06e9ec8f0908c4808d74) + Signed-off-by: Tibor Vass + +commit 9f5465d4e62aa754e91b2c05694718aa9251993b +Author: fonglh +Date: Thu Jul 21 16:16:46 2016 +0800 + + Clarify API behavior when older versions are called. + + Signed-off-by: fonglh + (cherry picked from commit f62e24f697dd5c69e58f3b5d732fd5a962a0c8e6) + Signed-off-by: Tibor Vass + +commit 6a06d8d94c59cbdb071d2903d89889095802ea87 +Author: Stephen J Day +Date: Wed Jul 20 16:05:33 2016 -0700 + + api/client/service: shorten to volume-opt + + `volume-driver-opt` was too verbose for its own existence and the sanity + of those in the vicinity. The much better, sleeker `volume-opt` replaces + it. 7 bytes and a case of carpal tunnel syndrome are saved! + + Signed-off-by: Stephen J Day + (cherry picked from commit a40b5820c91640183b40e0668f6802415e6adc14) + Signed-off-by: Tibor Vass + +commit 8e0e7644d896c16d4d6b1ce687e6d6455ab65f55 +Author: Harald Albers +Date: Wed Jul 20 13:13:14 2016 -0700 + + Add manual support for macvlan networks to bash completion + + Signed-off-by: Harald Albers + (cherry picked from commit 6c98d5bfaccda4b211e537f5072767160a20d497) + Signed-off-by: Tibor Vass + +commit 7876fa1c2d2253f183732e1ee39be9cd318ae1e5 +Author: Sebastiaan van Stijn +Date: Wed Jul 20 23:59:38 2016 +0200 + + docs: fix copy/pasta error + + Looks like I copied from the line below, not + from the output :) + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 83b12c0c1144dc3778177fab8dc5052108388f1e) + Signed-off-by: Tibor Vass + +commit fd231567dc3bb8e4dd4388c6b1d038116fdff96a +Author: Drew Erny +Date: Mon Jul 18 16:31:43 2016 -0700 + + Added leader election test + + Signed-off-by: Drew Erny + (cherry picked from commit 3489e76513b76e6429075dbbcb6acb3341e42293) + Signed-off-by: Tibor Vass + +commit 178b6874a14dffac2cc0570e34cb8e07957d22ec +Author: Sebastiaan van Stijn +Date: Wed Jul 20 16:18:44 2016 +0200 + + docs: add code-hints to builder page + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit b5503ef0a511f5be11d9dcfa1359976f159d8a67) + Signed-off-by: Tibor Vass + +commit 84e78fe955997d592f4aa808f8ccdc9379c06968 +Author: Sebastiaan van Stijn +Date: Wed Jul 20 14:55:26 2016 +0200 + + Add missing --log-driver and --log-opt docs + + Adds documentation for "--log-driver" and "--log-opt" + for services. + + Also updated the API docs to include the new + options, and generated a more complete JSON + example. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 5ece2a6e0d748fe3960a7459b745ceb4302e9202) + Signed-off-by: Tibor Vass + +commit 8f0ec20157ec7a6e7d2fc66b594cc941aaa4f6e5 +Author: Sebastiaan van Stijn +Date: Wed Jul 20 23:37:55 2016 +0200 + + docs: update reference docs for plugins + + the output/response slightly changed in + 340964db1c8f161a2ad156023eb47dcc93bf804b, + and `:latest` is no longer required for + various actions. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 9d532b5e2d4e68888e38ad2793d9075815e230f7) + Signed-off-by: Tibor Vass + +commit 6dfb916abf99ec022d2f1108890819e33de20c84 +Author: Charles Smith +Date: Tue Jul 12 11:14:12 2016 -0700 + + add how nodes work to how swarm works guide + + Signed-off-by: Charles Smith + (cherry picked from commit 137261f97ce3f27a8c28a50e286429ead4a6fc18) + Signed-off-by: Tibor Vass + +commit 2d5716544d371c1252084f5a0c71cb5ea4c06682 +Author: Harald Albers +Date: Wed Jul 20 12:27:06 2016 -0700 + + Update completions for syslog log driver options + + Signed-off-by: Harald Albers + (cherry picked from commit 492fdf1f57bff10bed5d44bf63f344c1d7961eb2) + Signed-off-by: Tibor Vass + +commit 9ce976f4f62ed51633f5076dedd02b0d8614eb10 +Author: Yong Tang +Date: Wed Jul 20 08:16:54 2016 -0700 + + Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1 + + This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1. + + This is part of step to fix #24270. + + Signed-off-by: Yong Tang + (cherry picked from commit 467107cd401ce9d3678e4f7ec1abfb65a0e46018) + Signed-off-by: Tibor Vass + +commit 06f8cd5f312dbadaa9296d2470fccb7b2ba4359a +Author: Yong Tang +Date: Sun Jul 17 13:21:29 2016 -0700 + + Allow partial name match for `node ls`, and `node tasks` + + This fix is an extension to last commit to expand the partial + filter to node and task searches. + + Additional integration tests have been added to cover the changes. + + This fix fixes 24270. + This fix fixes 24112. + + Note: A separate pull request will be opened on swarmkit. + + Signed-off-by: Yong Tang + (cherry picked from commit e734fa58eadb4dfaa33b4be275d6f8f29d899e78) + Signed-off-by: Tibor Vass + +commit 7ebba69c43ccf0121df203dc4ccaab12cf127bee +Author: Yong Tang +Date: Wed Jul 13 19:09:07 2016 -0700 + + Allow partial name match for `service ls --filter` + + This fix tries to address the issue raised in 24270 where it was + not possible to have a partial name match when list services + with name filter. + + This fix updates swarmkit and allows prefix search when name is + provided as the filter for listing services. + + An additional integration test is added to cover the changes. + + This fix fixes 24270. + + Note: A separate pull request will be opened on swarmkit. + + Signed-off-by: Yong Tang + (cherry picked from commit 1d600ebcb5750c4c93356fae08e562d836ecee45) + Signed-off-by: Tibor Vass + +commit 14835b683453c27c3c324e8cc4cfb702cd968aba +Author: Charles Smith +Date: Mon Jul 11 20:06:56 2016 -0700 + + clarify update-delay and rolling update behavior + + Signed-off-by: Charles Smith + (cherry picked from commit 68a9224bd42437e63972dc9c3374c065872363b3) + Signed-off-by: Tibor Vass + +commit ece06aee0669733dc1ac4a207ebf45a367b3cacc +Author: Sebastiaan van Stijn +Date: Wed Jul 20 18:54:48 2016 +0200 + + docs: add initial reference for "stack services" + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit f49dc528ed29e6285c24ef356652cc8bc637c8c7) + Signed-off-by: Tibor Vass + +commit 33ff331ad7fa097fb82a3cd558a7a98b14d83f0f +Author: Sebastiaan van Stijn +Date: Wed Jul 20 15:52:43 2016 +0200 + + Rename --bundle to --file + + This renames the '--bundle' flag for docker (stack) deploy + to be consistent with 'docker build'. + + Note that there's no shorthand '-f' added for now, + because this may be confusing on 'docker stack config', + which also takes a file, and for which we may want to + have a '--format' flag in future. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 06f35262c47629fef78e36daaa2742c2c0d7c3a9) + Signed-off-by: Tibor Vass + +commit fd7cabed367b704c0f791c8b1455062e720388e5 +Author: Harry Zhang +Date: Tue Jul 19 22:42:23 2016 +0800 + + Fix nits in deprecated + + Signed-off-by: Harry Zhang + (cherry picked from commit 78a5480dfd8dc1b304e38bc9c18854c4ef86de33) + Signed-off-by: Tibor Vass + +commit c3a114d4d4231865409368621edbf3fa3f402f58 +Author: Sebastiaan van Stijn +Date: Wed Jul 20 15:36:02 2016 +0200 + + fix duplicated usage in docs + + this removes a copy/pasta whoopsie on my side, + introduced in de64324109d2694b1525e62b5c0072267282a36c + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit effbd2b76decd00444d963e10eabe2766bb8c89c) + Signed-off-by: Tibor Vass + +commit a3d9a99c0e92797b30909fe2bb4d8922bba65abe +Author: Yi EungJun +Date: Wed Jul 20 18:23:56 2016 +0900 + + Fix the usage for `service rm` command + + Signed-off-by: Yi EungJun + (cherry picked from commit cf61cd3a920809f6a0be44a584f365544acaf1a9) + Signed-off-by: Tibor Vass + +commit 80463d80008ac99dc07fe8466cfe35a773294d2e +Author: Steve Durrheimer +Date: Wed Jul 20 09:11:16 2016 +0200 + + Add zsh completion for 'docker node update --label-{add,rm}' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit cdb8383d7f4045a5cde0fe636f8fadb6560ba6cd) + Signed-off-by: Tibor Vass + +commit b29a9fdc4bc98eb0b2ec89b5531328cf4d64bae0 +Author: Steve Durrheimer +Date: Wed Jul 20 09:18:59 2016 +0200 + + Add zsh completion for 'docker service {create,update} --log-{driver,opt}' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 45484f5458e3b4cf7996d4cb8481ed7e38982200) + Signed-off-by: Tibor Vass + +commit 05e6d5f5db456094bff369205c3cd1732a71a27b +Author: Charles Smith +Date: Mon Jul 11 09:11:18 2016 -0700 + + add ref docs for node label + + Signed-off-by: Charles Smith + (cherry picked from commit 9594ac97ce0c6e0777716be2a35b47208d440e8e) + Signed-off-by: Tibor Vass + +commit 61936227d04a3b03b5dbeb199e4dbe367bc32b48 +Author: Dong Chen +Date: Mon Jul 11 17:15:30 2016 -0700 + + Test rolling update. + + Signed-off-by: Dong Chen + (cherry picked from commit d327765a62a99dc63e9a8c16ac291861cee066f3) + Signed-off-by: Tibor Vass + +commit 05b7fe417073ef1d0b8542916d73f41e8ecfe730 +Author: Anusha Ragunathan +Date: Tue Jul 19 08:35:36 2016 -0700 + + Remove extra map lookup for volume drivers. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 5d4627331ee0c685116b083e9f25f2644f0d1bd0) + Signed-off-by: Tibor Vass + +commit 1b131678dac18edc83ebcf352fe44b5ee11474e1 +Author: Vincent Demeester +Date: Tue Jul 19 18:32:44 2016 +0200 + + Add documentation for stack commands + + Also removes the `-f` flags of bundle to follow the single-letter flags + evaluation. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 10919e890942cbdaa65f180dbcd475d21b9c6713) + Signed-off-by: Tibor Vass + +commit afc64c2d71315d9629b1ad4659d5e5824a37f227 +Author: Kenfe-Mickael Laventure +Date: Fri Jul 15 14:12:07 2016 -0700 + + Update libcontainerd.AddProcess to accept a context + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit c02f82756e914081543bf05cb1815a48c02b1ebd) + Signed-off-by: Tibor Vass + +commit b7687cc6737cc11759b5f61df401e6c65ae260de +Author: Kenfe-Mickael Laventure +Date: Mon Jul 11 08:55:39 2016 -0700 + + Do not rely on "live" event anymore + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 64483c3bdaa1887b8b932e0564362fbbff025dc0) + Signed-off-by: Tibor Vass + +commit 6c717a5744b44744052341508a8021caaff72691 +Author: Kenfe-Mickael Laventure +Date: Sun Jul 10 11:11:27 2016 -0700 + + Vendor in new containerd + + This version introduces the following: + - uses nanosecond timestamps for event + - ensure events are sent once their effect is "live" + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 29b2714580d085533c29807fa337c2b7a302abb6) + Signed-off-by: Tibor Vass + +commit 06492999086798042135dc87b37d5eb6e682716a +Author: Daniel Nephin +Date: Wed Jun 22 10:12:18 2016 -0400 + + Dont run man generation as part of test-unit. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb) + Signed-off-by: Tibor Vass + +commit 3430f2e7562b34018b8abddfb55dc27fd6b5c651 +Author: Daniel Nephin +Date: Mon Jun 20 16:33:53 2016 -0400 + + Set Long text for volume commands so they can be used to generate man pages. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 25e9b06ac0750396f35d3f52f71c44b1072f0972) + Signed-off-by: Tibor Vass + +commit ea0d7e52715b687a3cc70b21287d5447ce90f0d6 +Author: Daniel Nephin +Date: Thu Jun 9 11:33:28 2016 -0400 + + Add a script to generate man pages from cobra commands. + + Use the generate.sh script instead of md2man directly. + Update Dockerfile for generating man pages. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 00a8a40398263429f99b1a5f0be59048e1c6f38d) + Signed-off-by: Tibor Vass + +commit 14aee340f88b2aa736eb51b60f281d9a50f15647 +Author: Michael Crosby +Date: Mon Jul 18 16:37:29 2016 -0700 + + Remove docker.socket from rpm based systems + + Fixes #23981 + + The selinux issue we are seeing in the report is related to the socket + file for docker and nothing else. By removing the socket docker starts + up correctly. + + However, there is another motivation for removing socket activation from + docker's systemd files and that is because when you have daemons running + with --restart always whenever you have a host reboot those daemons + will not be started again because the docker daemon is not started by + systemd until a request comes into the docker API. + + Leave it for deb based systems because everything is working correctly + for both socket activation and starting normally at boot. + + Signed-off-by: Michael Crosby + (cherry picked from commit 04104c3a1e6cad30cb41b762e8832215466c0e95) + Signed-off-by: Tibor Vass + +commit fee68def8f743ea33d949b234678029d4dac63f7 +Author: Anusha Ragunathan +Date: Mon Jul 18 15:39:27 2016 -0700 + + Add only legacy plugins to the legacy lookup map. + + Legacy plugin model maintained a map of plugins. This is + not used by the new model. Using this map in the new model + causes incorrect lookup of plugins. This change uses adds + a plugin to the map only if its legacy. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 8fd779dc28a11d8727d76e9553379b0c854f7c4c) + Signed-off-by: Tibor Vass + +commit 45920009cc302cfa144c322c015f16fd1859a4de +Author: Sebastiaan van Stijn +Date: Sat Jul 16 16:44:10 2016 +0200 + + Don't automagically add "[OPTIONS]" to usage + + This removes the logic to automatically + add [OPTIONS] to the usage output. + + The current logic was broken if a command + only has deprecated or hidden flags, and + in many cases put the [OPTIONS] in the + wrong location. + + Requiring the usage string to be set + manually gives more predictable results, + and shouldn't require much to maintain. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 4f0b5105524649169d765bb94c2806209ab21904) + Signed-off-by: Tibor Vass + +commit 6c3019702eb741f38389a75ef7176184c4efbe43 +Author: Harald Albers +Date: Tue Jul 19 13:09:28 2016 +0200 + + bash completion for `docker node update --label-{add,rm}` + + Signed-off-by: Harald Albers + (cherry picked from commit bc6e3c0b5e415f09957955782b4d51e94a5ff2b9) + Signed-off-by: Tibor Vass + +commit 4845b686b2727e958532cfde1e26f565ecda0d95 +Author: Harald Albers +Date: Tue Jul 19 13:20:40 2016 +0200 + + bash completion for `docker service {create,update} --log-{driver,opt}` + + Signed-off-by: Harald Albers + (cherry picked from commit 823e161de73e2df04cd3905b72b7916c49091af4) + Signed-off-by: Tibor Vass + +commit f370132a42cdd2f4920c38e9135fb906ee49b8ce +Author: Damian Smyth +Date: Mon Jul 18 14:11:00 2016 +1000 + + Create zfs directory if it doesn't exist at startup. + + Signed-off-by: Damian Smyth + (cherry picked from commit 205bc6fc99872ba852fa7a158c106514d5b64179) + Signed-off-by: Tibor Vass + +commit 47a16dbe3104c1f7a22436110d1359a81998d1cf +Author: Sebastiaan van Stijn +Date: Mon Jul 18 11:52:27 2016 +0200 + + bump Go to 1.6.3 + + following the announcement; + https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0 + + > [security] Go 1.6.3 and Go 1.7rc2 pre-announcement + > + > Hello gophers, + > We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC. + > These are minor release to fix a security issue. + > + > Following our policy at https://golang.org/security, this is the pre-announcement of those releases. + > + > Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5. + > Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip. + > + > Cheers, + > Chris on behalf of the Go team + + **Note:** + the man/Dockerfile is not yet updated, because + the official image for Go 1.6.2 has not yet + been updated. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 589bafddf391cbf6aff8b22044266dc819cdcaeb) + Signed-off-by: Tibor Vass + +commit 2456150a5266fea71b050487a953c39358ddd585 +Author: Tonis Tiigi +Date: Mon Jul 18 19:12:54 2016 -0700 + + Update docker load security docs + + Signed-off-by: Tonis Tiigi + (cherry picked from commit f17469e890c1fd2ea9d63e7bfe1025df9754c97b) + Signed-off-by: Tibor Vass + +commit f3fea0ea88d7ab966028a5cfa23385cc47ebaa59 +Author: Dong Chen +Date: Thu Jun 30 17:33:43 2016 -0700 + + Support node label update. + + Signed-off-by: Dong Chen + (cherry picked from commit e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1) + Signed-off-by: Tibor Vass + +commit 71a8ee2f499ba02e531d0eb1bbca8401f29061a2 +Author: Stephen J Day +Date: Fri Jul 8 18:44:18 2016 -0700 + + swarm: add log driver support for services + + Adds log driver support for service creation and update. Add flags + `--log-driver` and `--log-opt` to match `docker run`. Log drivers are + configured per service. + + Signed-off-by: Stephen J Day + (cherry picked from commit e778ba2d5b1e5074fe413dffaa365f3d37b175c7) + Signed-off-by: Tibor Vass + +commit 4d0f6041ade389668ad96e2f21ee312ee4fc7775 +Author: John Starks +Date: Wed Jun 22 16:34:01 2016 -0700 + + Windows: Always enable VT emulation + + Always enable VT output emulation when starting the process so that + non-attaching commands can still output VT codes. + + Also remove the version block for using the native console and just rely + on supported flags being present. + + Signed-off-by: John Starks + (cherry picked from commit 4acc2c7499425b9c2521977019d9fe4da73e6af8) + Signed-off-by: Tibor Vass + +commit da773af88573904a0b82a84f675f0be21fa68390 +Author: Anusha Ragunathan +Date: Fri Jul 15 10:37:17 2016 -0700 + + Print plugin name on successful install, enable and disable. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 6dca1e6d3f875de7a6652390f65fdb8ec2623e3b) + Signed-off-by: Tibor Vass + +commit 3b20018dd01f781e84e51f1f29564e4404f64ee4 +Author: Aaron Lehmann +Date: Mon Jul 18 10:36:07 2016 -0700 + + Update vendored go-events + + This is needed to suppress a log message about a harmless condition + which was previously logged at the WARNING log level with potentially + high frequency (https://github.com/docker/go-events/pull/11). + + Signed-off-by: Aaron Lehmann + (cherry picked from commit db9bc51cbeb40204ff15ea1a40db8d3736ad3845) + Signed-off-by: Tibor Vass + +commit fc22510aef88c32b03fd9a87f54746dcd3e8ccea +Author: Justyn Temme +Date: Thu Jul 14 21:48:38 2016 -0500 + + suggested improvements for Debian install doc issue #23884 + + Signed-off-by: Justyn Temme + (cherry picked from commit b74b46b26a8a8fcacc1fdea080c0bebe70194e9f) + Signed-off-by: Tibor Vass + +commit c04c127ce35afb19486d999927ac84da1b9ff671 +Author: Anusha Ragunathan +Date: Fri Jul 8 10:37:52 2016 -0700 + + Remove use of exec-root in plugins due to socket pathname limits. + + Unix sockets are limited to 108 bytes. As a result, we need to be + careful in not using exec-root as the parent directory for pluginID + (which is already 64 bytes), since it can result in socket path names + longer than 108 bytes. Use /tmp instead. Before this change, setting: + - dockerd --exec-root=/go/src/github.com/do passes + - dockerd --exec-root=/go/src/github.com/doc fails + After this change, there's no failure. + + Also, write a volume plugins test to verify that the plugins socket + responds. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 21ecd5a93db34288c0c579d5738030716d7bef2d) + Signed-off-by: Tibor Vass + +commit abf9cfe22fccc07d46e5f7ec24b1825c10d73326 +Author: Tonis Tiigi +Date: Fri Jul 15 10:58:21 2016 -0700 + + Increase timeout for swarm requests + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 85b1fdf15ce2ad1b373748554d3aa218e2eb5a5f) + Signed-off-by: Tibor Vass + +commit 4118e0c9eebda2412a09ae66e90c34b85fae3275 +Author: Sebastiaan van Stijn +Date: Sat Jul 16 01:52:59 2016 +0200 + + Improve flag help consistency, and update docs + + This adds the `--live-restore` option to the documentation. + + Also synched usage description in the documentation + with the actual description, and re-phrased some + flag descriptions to be a bit more consistent. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01) + Signed-off-by: Tibor Vass + +commit 5fcac2cdfd9879e9ee4d7ccba8434e8b0cab2de3 +Author: allencloud +Date: Sat Jul 16 15:32:17 2016 +0800 + + better command `docker network create -h` output + + Signed-off-by: allencloud + (cherry picked from commit d0081a0f476f91b0dc6b28c480e7c95c06b05ebb) + Signed-off-by: Tibor Vass + +commit de2498db0b38cb98fd90ba371990409da5dae7c4 +Author: Yanqiang Miao +Date: Sun Jul 17 11:47:57 2016 +0800 + + Fix link errors in 'docs/reference/api/docker_remote_api_v***.md' + + Signed-off-by: Yanqiang Miao + + update fix-link-err-in-docs + + Signed-off-by: Yanqiang Miao + + update fix-link-err-in-docs + + Signed-off-by: Yanqiang Miao + + update fix-link-err-in-docs + + Signed-off-by: Yanqiang Miao + (cherry picked from commit f9ef10f853576d67d73b785deb53ecec84c31e63) + Signed-off-by: Tibor Vass + +commit ebb3cca216975f612183f82148a0e01e63b0116d +Author: Yong Tang +Date: Sat Jul 16 23:16:57 2016 -0700 + + Fix inconsistent fields for resource settings on service for API docs + + In API docs, `CPU` and `Memory` were used for resource settings on + services. The actual settings should be `NanoCPUs` and `MemoryBytes`. + + This fix address the inconsistent fields between API docs and actual + settings. + + This fix fixes #24058. + + Signed-off-by: Yong Tang + (cherry picked from commit 0159ee1f5dcd28dad1f621d17b9321f35f171b29) + Signed-off-by: Tibor Vass + +commit da699d32072890ee8c2824c9600046313eaf15e3 +Author: Sebastiaan van Stijn +Date: Sat Jul 16 14:34:07 2016 +0200 + + docs: update Oracle support link + + The none-https url results in a redirect + to https://support.oracle.com/epmos/faces/MosIndex.jspx?...... + which our link-checker didn't like. + + The https link looks to be a direct link, + and not resulting in a redirect, so updating the URL. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit c15144c4ec25df4234129fbe88b89cd4f709f784) + Signed-off-by: Tibor Vass + +commit 91432080bf45817f68c6c9520d9dcccfc45eea55 +Author: Justin Cormack +Date: Fri Jul 15 14:11:54 2016 +0100 + + Document --oom-score-adj flag in docker run + + This was only mentioned in docker create documentation. + + Signed-off-by: Justin Cormack + (cherry picked from commit 6ba6265d1ad86680ad7f7750ae1f9abb72f1e728) + Signed-off-by: Tibor Vass + +commit 285bfa04ac66aa2ffeaa1b6b942f486b94b27a54 +Author: Vincent Demeester +Date: Wed Jul 13 22:03:11 2016 +0200 + + Small zsh completion fix on --pretty & --no-resolve + + Signed-off-by: Vincent Demeester + (cherry picked from commit 698bd5ab65ddc3db9679aa27b79c89ba1ca1fe23) + Signed-off-by: Tibor Vass + +commit cf2b19a72e9d3a860f7d20a0e091ef725c9f025d +Author: Daniel Nephin +Date: Fri Jul 15 16:02:04 2016 -0400 + + Only show port name if set. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 909c596fa5956ed02b4708a437a828a2829c9bd5) + Signed-off-by: Tibor Vass + +commit 2b7c285ddcc334bb76e40212a17891b555d157fd +Author: Victoria Bialas +Date: Fri Jul 15 13:54:34 2016 -0700 + + fixed cut-and-paste error on description of Docker Toolbox + + Signed-off-by: Victoria Bialas + (cherry picked from commit 6f9e310831326b8031a3526282ffd82cee94294f) + Signed-off-by: Tibor Vass + +commit f0c76fb8d56c8c14322d0debdcacd204ca55f4a3 +Author: Charles Smith +Date: Wed Jul 13 16:52:59 2016 -0700 + + update create swarm and add nodes to use the auto-generated join command + + Signed-off-by: Charles Smith + (cherry picked from commit fec803f7793ce347fe276ea93c13fb9022677135) + Signed-off-by: Tibor Vass + +commit 3d0cd8442ee33a6da8c179d88551e0be887a2d5a +Author: Lei Jitang +Date: Fri Jul 15 04:59:52 2016 -0400 + + Fix daemon panic use wrong graphdriver with --live-restore flag + + Signed-off-by: Lei Jitang + (cherry picked from commit d9e8cea1b666cc22d6747482ad16600cb9dc6fa1) + Signed-off-by: Tibor Vass + +commit 09b01499b72a8ef532eabfebb8b7a5529ce6dd7c +Author: Tonis Tiigi +Date: Thu Jul 14 10:13:54 2016 -0700 + + Wait for the reader fifo opening to block + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 0b2023130e285a0207be9fda4b22e1419997c552) + Signed-off-by: Tibor Vass + +commit 63084741f07f5e3ee3f8e0a22f62dee4e9e0bea0 +Author: Yanqiang Miao +Date: Thu Jul 14 22:49:56 2016 +0800 + + Delete redundant content of 'docs/extend/plugins.md' + + Signed-off-by: Yanqiang Miao + + Update plugins.md + + Update plugins.md + + (cherry picked from commit cfe9d2ff1eded7e9bb9b798e780a251c6fc26ef9) + Signed-off-by: Tibor Vass + +commit e4d263c99b08eb21ac7ff16de8ddc03c56e0599f +Author: Steve Durrheimer +Date: Fri Jul 15 08:29:10 2016 +0200 + + Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 2e6922a6d3295857ae73fe7df7aa452d220f869d) + Signed-off-by: Tibor Vass + +commit f6dfc0394fb27f3b2b3b1d077f509c1295b209b3 +Author: Steve Durrheimer +Date: Fri Jul 15 08:16:15 2016 +0200 + + Add zsh completion for 'dockerd --oom-score-adjust' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 5d29732bdf8f6b3a52a8272c4549982a95727ef8) + Signed-off-by: Tibor Vass + +commit cf83ab8e6d2baa0c350e7f5272770a6092a26d25 +Author: Qiang Huang +Date: Fri Jul 15 13:57:38 2016 +0800 + + Fix aufs docs + + Signed-off-by: Qiang Huang + (cherry picked from commit 92dfbc1e2d48164e1100718be42115c26d40dc6e) + Signed-off-by: Tibor Vass + +commit 211f8710926a7143cb1ae840bc32cbc29df51d1a +Author: Tonis Tiigi +Date: Thu Jul 14 16:59:44 2016 -0700 + + Fix panic in stats test + + Signed-off-by: Tonis Tiigi + (cherry picked from commit f5fb3c69fdd339c4ec1778a00d4cfc1aa887e310) + Signed-off-by: Tibor Vass + +commit 5f8d7aa0f4c96218382734a32049d6a976883cff +Author: Steve Durrheimer +Date: Fri Jul 15 08:23:57 2016 +0200 + + Add zsh completion for 'docker service {create,update} --registry-auth' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 64f08906a2429ac0b2192e263ca86574f7f0dded) + Signed-off-by: Tibor Vass + +commit e204600ee15c6e9d613861da7f3c7ccf7d446204 +Author: Steve Durrheimer +Date: Fri Jul 15 08:09:20 2016 +0200 + + Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit ba5d9f63a3b5c39fdbb89778782367a55ce74809) + Signed-off-by: Tibor Vass + +commit 25caee39a7a38254676d18d9fafcc0e77a3ad94a +Author: Paul Furtado +Date: Thu Jul 14 16:18:42 2016 -0400 + + Change $prog back to docker in sysvinit-redhat + + (and set $exec to dockerd instead) + + This ensures end users do not need to make any configuration changes + due to the rename from docker to dockerd in version 1.12. + + Signed-off-by: Paul Furtado + (cherry picked from commit acb41ddc9df80894d2ff84c34a98cc904b9241fa) + Signed-off-by: Tibor Vass + +commit 4516769d50df5a510b767ac33155e479e68f8ed9 +Author: Michael Crosby +Date: Thu Jul 14 16:24:21 2016 -0700 + + State that docker supports fedora 24 + + Signed-off-by: Michael Crosby + (cherry picked from commit 6780bdcbad3ab3b3de1568e51db676bb0f059cd8) + Signed-off-by: Tibor Vass + +commit c8dec6c2ddabd9bc2f62b7a79ed31c06f7d81509 +Author: Michael Crosby +Date: Thu Jul 14 16:23:05 2016 -0700 + + Enable docker socket and service on fedora + + Make sure that the users enable both the socket and service for docker + as part of the default install instructions. If both are not enabled + docker will not start at boot and restart containers. + + Signed-off-by: Michael Crosby + (cherry picked from commit 7a93a87c1a254abbf8e68093d4be241097694bb1) + Signed-off-by: Tibor Vass + +commit 12e32363e982bbe71302a03b880b20df0460a006 +Author: Anil Madhavapeddy +Date: Thu Jul 14 17:38:37 2016 +0100 + + docs: correct the placement constraints `docker service` example + + - the constraint expression needs to be quoted + - add an actual redis container to run so the command line works + + Signed-off-by: Anil Madhavapeddy + (cherry picked from commit c37da1792d232b5a8545227d5819bb245df16023) + Signed-off-by: Tibor Vass + +commit e678d9fb7ce9874674d19f11feb692ef09029ee7 +Author: Derek McGowan +Date: Wed Jul 13 13:30:24 2016 -0700 + + Allow v1 search to use v2 auth with identity token + + Updates the v1 search endpoint to also support v2 auth when an identity token is given. + Only search v1 endpoint is supported since there is not v2 search currently defined to replace it. + + Signed-off-by: Derek McGowan + (cherry picked from commit 19d48f0b8ba59eea9f2cac4ad1c7977712a6b7ac) + Signed-off-by: Tibor Vass + +commit 9deaa5cc1dc837b5be0410b801fd37e8d5653401 +Author: Derek McGowan +Date: Mon Jul 11 17:20:17 2016 -0700 + + Vendor distribution changes + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 1e0b7538fa2aba4aa252e423362171f1bbfa166c) + Signed-off-by: Tibor Vass + +commit ec03307eb28d45f44d70f9190e362b1ef02362b9 +Author: Kenfe-Mickael Laventure +Date: Wed Jul 13 10:04:42 2016 -0700 + + Fix data race in libcontainerd + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 8e9fbc8f5fc5759eb7f26ec998f227994ff6c642) + Signed-off-by: Tibor Vass + +commit 5bb9640ab8247d612ef9213984b0061e28e37547 +Author: Eivin Giske Skaaren +Date: Thu Jul 14 11:21:05 2016 +0200 + + Status code 409 received when conflicting name when creating container + + Signed-off-by: Eivin Giske Skaaren + (cherry picked from commit 5bf46cc43624f230fae80430dd9d1d5f494c0c95) + Signed-off-by: Tibor Vass + +commit 07bc1eecab8186640225f156fa465a4b5ef81025 +Author: Vincent Demeester +Date: Thu Jul 14 11:23:03 2016 +0200 + + Update service inspect --pretty reference docs + + Update the output and fix wrong usage in a tutorial page. + + Signed-off-by: Vincent Demeester + (cherry picked from commit cc651bc642e3478062416b50171dbf5595daf4e4) + Signed-off-by: Tibor Vass + +commit e04733a67e925ad9965d44ac7190617f12c0abc4 +Author: Vincent Demeester +Date: Thu Jul 14 11:22:18 2016 +0200 + + Update service update commandline reference docs + + Update with the new remove flags + + Signed-off-by: Vincent Demeester + (cherry picked from commit dbe310eff05cf5b67eab99d3cfff66c2680d01ac) + Signed-off-by: Tibor Vass + +commit a5584f5f415ceeb0543181bc79c3bfc30e8f77c9 +Author: Justin Cormack +Date: Wed Jul 13 14:41:58 2016 +0100 + + Expand the documentation of "no-new-privileges" + + The change to runc in https://github.com/opencontainers/runc/pull/789 + was not documented previously. Also say what this affects and clean + up layout of initial table as there was some miscolouration of the + continuation lines. + + Signed-off-by: Justin Cormack + (cherry picked from commit 3050d9af9b2384baed599be9d7142b4775f89e10) + Signed-off-by: Tibor Vass + +commit fc3d339109294e44e532404179678e9a60dd1ea1 +Author: Daniel Nephin +Date: Wed Jul 13 15:59:23 2016 -0400 + + Fix multi-remove during service update. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 3249c1d0e79f57642b96f6692ffa44f46f15b602) + Signed-off-by: Tibor Vass + +commit fad55b0ea1e530b681ecb869ab023c0480277306 +Author: Daniel Nephin +Date: Wed Jun 29 12:28:33 2016 -0400 + + Change the add/update flags to include 'add' + + Signed-off-by: Daniel Nephin + (cherry picked from commit 4c6faa434071b87a55256e86020cb78495e9951d) + Signed-off-by: Tibor Vass + +commit 1cf4bd4df7b3a11ae13b2f455c40caa4a0f548a8 +Author: Daniel Nephin +Date: Fri Jun 24 11:53:49 2016 -0400 + + PR feedback + + improve help text for service update remove flags + implement proper merge update of placement flag + more code re-use in update functions using a toRemove set. + + Signed-off-by: Daniel Nephin + (cherry picked from commit ead1f62abae5e5ad188536a01fb88d55339e3f63) + Signed-off-by: Tibor Vass + +commit b5f1b77a23dd9b0e20ccd6d48d5c721cbd62602f +Author: Daniel Nephin +Date: Mon Jun 20 12:57:57 2016 -0400 + + Add remove flags for service update + + with unit tests + + Signed-off-by: Daniel Nephin + (cherry picked from commit dc33fc1ff433fcc70efc22f5cea9b87c6ec64a3b) + Signed-off-by: Tibor Vass + +commit 32b12ed57a85d63a45e3b912cb9b0ca6e3199457 +Author: Aaron Lehmann +Date: Wed Jul 13 19:26:54 2016 -0600 + + Use spaces, not tabs, to format sample "swarm join" command + + Using tabs here seems to cause copy/paste problems in some terminals. + Using spaces is safer. + + Fixes #24609 + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 6de8fcb2f2baf335fc24e10909078199af528e8d) + Signed-off-by: Tibor Vass + +commit a769e22b7016d3de993b1521f7e0183fc0071c25 +Author: Dong Chen +Date: Wed Jul 13 16:19:31 2016 -0700 + + Fix service inspect --pretty. + + Signed-off-by: Dong Chen + (cherry picked from commit 08ae4e544d5744e975da0f89c4f04baa2b8474f2) + Signed-off-by: Tibor Vass + +commit a89bd71433802f1c0a1b9296a4f522429e2bd7df +Author: Sebastiaan van Stijn +Date: Wed Jul 13 18:56:02 2016 +0200 + + Remove dead code for "inspect --pretty" + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 4d87f9083bfb3147566997b3f48c4805229f7c94) + Signed-off-by: Tibor Vass + +commit 3bd6c0b8dd408275ee5c57d876f49ca129158222 +Author: Harald Albers +Date: Wed Jul 13 12:31:55 2016 -0700 + + bash completion for `docker daemon --oom-score-adjust` + + Signed-off-by: Harald Albers + (cherry picked from commit e1e310ea1fc47488a7404e3fa52fa606fe270ed0) + Signed-off-by: Tibor Vass + +commit 9f86a9712d5dcaefb9acf33f829d0aa8f1295f54 +Author: Daniel Nephin +Date: Fri Jun 24 15:03:26 2016 -0400 + + Merge service command and args as a string. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 674d227445887ea2f9a0fde6ebb7838bcce58578) + Signed-off-by: Tibor Vass + +commit d8e9dbf6288ddae667e7257d31e5a20963cd11ce +Author: Daniel Nephin +Date: Fri Jun 24 15:56:15 2016 -0400 + + Vendor go-shlex. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 3464589c2aceb60972cdee14f57e0f41bcc8e327) + Signed-off-by: Tibor Vass + +commit 7491ebe00accdd7e31a082a835124de97f4b112f +Author: Sebastiaan van Stijn +Date: Wed Jul 13 18:46:17 2016 +0200 + + Remove shorthand flags for "mount", "pretty", and "no-resolve" + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 7bf0faf42377a91a8535b443201d9ad62326889b) + Signed-off-by: Tibor Vass + +commit 89986cbff438342a5770e4b198bdbd41e37c3e47 +Author: Michael Crosby +Date: Mon Jul 11 15:26:23 2016 -0700 + + Add --oom-score-adjust to daemon + + This adds an `--oom-score-adjust` flag to the daemon so that the value + provided can be set for the docker daemon's process. The default value + for the flag is -500. This will allow the docker daemon to have a + less chance of being killed before containers do. The default value for + processes is 0 with a min/max of -1000/1000. + + -500 is a good middle ground because it is less than the default for + most processes and still not -1000 which basically means never kill this + process in an OOM condition on the host machine. The only processes on + my machine that have a score less than -500 are dbus at -900 and sshd + and xfce( my window manager ) at -1000. I don't think docker should be + set lower, by default, than dbus or sshd so that is why I chose -500. + + Signed-off-by: Michael Crosby + (cherry picked from commit a894aec8d81de5484152a76d76b80809df9edd71) + Signed-off-by: Tibor Vass + +commit 0ce4630533bbc63d0806d868f57f42eff398f70c +Author: Sebastiaan van Stijn +Date: Wed Jul 13 01:53:51 2016 +0200 + + docs: fix output of node inspect + + The output uses tabs, but those don't + translate well to the rendered output in + the docs, so replacing the tabs with spaces. + + Also updates the output, because REPLICATED, + and SPREAD are no longer all-caps in the + actual output. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 477a5f8fb0be1244858614cdda2d2528208fc88a) + Signed-off-by: Tibor Vass + +commit cda05164ba11f7969a36d8c43499bab809551c5d +Author: Vincent Demeester +Date: Wed Jul 13 16:19:21 2016 +0200 + + Remove --command flag for service update + + Signed-off-by: Vincent Demeester + (cherry picked from commit e4a024d5902df1d3db8b9fff8865304afa2305e6) + Signed-off-by: Tibor Vass + +commit dc5f28f4b587cd4f597ab5df1100026384be6219 +Author: Alessandro Boch +Date: Tue Jul 12 21:51:44 2016 -0700 + + Handle ingress sbox creation gracefully + + Signed-off-by: Alessandro Boch + (cherry picked from commit ed6641ad61d6d4f6475062ab2a2669a379caf574) + Signed-off-by: Tibor Vass + +commit 8d7223d99164975499268f68eae2c86171c938c2 +Author: Alessandro Boch +Date: Tue Jul 12 21:51:11 2016 -0700 + + Vendoring libnetwork 905d374 + + Signed-off-by: Alessandro Boch + (cherry picked from commit cabc5b27c0d93a7665a24d205572a9462bb85da6) + Signed-off-by: Tibor Vass + +commit ca9805f78d0604f70eff1e4b9cc0dd00cc3efbc8 +Author: Sebastiaan van Stijn +Date: Wed Jul 13 00:57:15 2016 +0200 + + Make labels human readable + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit ea365e4cb37d037046364773d01a744b1258ce4e) + Signed-off-by: Tibor Vass + +commit eb8bbea3d1a7059886694ab2014c43aed54d661b +Author: Akihiro Suda +Date: Mon Jul 11 06:53:23 2016 +0000 + + Remove "Yes"/"No" and use "true"/"false" consistently in `docker info` + + Signed-off-by: Akihiro Suda + (cherry picked from commit c6b7bd1aa6b94ab242d6310419f1c3a7964ffa02) + Signed-off-by: Tibor Vass + +commit 8a810acb1eb9c4ef6f8d75d8a08ed292ddd63636 +Author: Harald Albers +Date: Wed Jul 13 12:42:27 2016 +0200 + + Change bash completion for `docker run --net*` to `--network*` + + Ref: https://github.com/docker/docker/pull/23324 + + Signed-off-by: Harald Albers + (cherry picked from commit c4846f697271d2990cca8481338f4827b2558112) + Signed-off-by: Tibor Vass + +commit 96247f4277d16ed1eee705ad07f024106e655097 +Author: Lei Jitang +Date: Thu Jul 7 21:21:57 2016 -0400 + + Add IPVLAN and DUMMY to check-config.sh + + This commit add DUMMY and IPVLAN to check-config.sh + because they are need for ipvlan and macvlan network + driver. + + Signed-off-by: Lei Jitang + (cherry picked from commit f5940ef7255a0a387baa6e20e09f86473ddf6d08) + Signed-off-by: Tibor Vass + +commit 9b0ebd26e869c1d368a542ac35bff55532ec9880 +Author: Harald Albers +Date: Wed Jul 13 11:37:31 2016 +0200 + + Update bash completion for `docker service {create,update} {--mode,--endpoint-mode}` + + Signed-off-by: Harald Albers + (cherry picked from commit a394490d3895fe0122b44a3f89acc04946b83bda) + Signed-off-by: Tibor Vass + +commit fc4c8d927ac07c39a449fd30cdac6b95bd1f7671 +Author: Harald Albers +Date: Wed Jul 13 11:20:02 2016 +0200 + + bash completion for `docker service {create,update} --registry-auth` + + Signed-off-by: Harald Albers + (cherry picked from commit a44e71c4274cd311e99722277cb674b2bc84d86e) + Signed-off-by: Tibor Vass + +commit ccffaddb5510ad19d57ad39d6b26b8a047941267 +Author: Sebastiaan van Stijn +Date: Wed Jul 13 00:45:23 2016 +0200 + + docs: remove executiondriver from API 1.24 docs + + the executiondriver property was removed in + 880484992c360881dc57a3317b84d75300c358af, but docs + were only updated for the 1.25 API, not for 1.24 + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 3c6ef4c29d28e92ea29816d6117412162d829c60) + Signed-off-by: Tibor Vass + +commit b2334cc79d9fc442f8368a8e6c83ed2d8b2c95f8 +Author: Mei ChunTao +Date: Wed Jul 13 08:21:26 2016 +0800 + + fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here' + + Signed-off-by: Mei ChunTao + (cherry picked from commit acbe38a3ccb85be012d88f3109b688f8b815daaf) + Signed-off-by: Tibor Vass + +commit 926d66b50fa628e37ba500c623ec359f4f5d3ce8 +Author: Alexander Morozov +Date: Wed Jun 22 10:40:32 2016 -0700 + + all: fix usage of some variables + + Signed-off-by: Alexander Morozov + (cherry picked from commit 57e14714ee85e67f59d8c22aed23dc875cf2e58c) + Signed-off-by: Tibor Vass + +commit de6b73a1a8860eb435c68c2ec9c98d6d7050a080 +Author: Neil Peterson +Date: Thu Jun 16 21:41:58 2016 -0700 + + Added daemon.json Windows example + + Signed-off-by: Neil Peterson + (cherry picked from commit 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc) + Signed-off-by: Tibor Vass + +commit 8d2748ff6b2eb1be29640667668e3751353ef412 +Merge: 2fdb517952 b88763773b +Author: Dongluo Chen +Date: Sat Jul 23 15:53:26 2016 -0700 + + Merge pull request #2429 from nishanttotla/add-case-docker-112 + + Adding case for updating client version, for Docker 1.12 + +commit 5a18d0e1c3df9e27033479572103e985b24bfb77 +Author: Slaven Bacic +Date: Sat Jul 23 07:50:55 2016 +0200 + + Removed comments and collapsed overrides. + + Signed-off-by: Slaven Bacic + +commit 2870ce8b1595a24b84282cd646a9156c4b4ec09b +Author: Slaven Bacic +Date: Sat Jul 23 07:49:29 2016 +0200 + + Add fixes and lintian overrides to electron-installer-debian, with comments. + + Signed-off-by: Slaven Bacic + +commit b88763773b683ba492e100c88f225f01e8e3c17f +Author: Nishant Totla +Date: Fri Jul 22 16:34:20 2016 -0700 + + Adding case for updating client version, for Docker 1.12 + + Signed-off-by: Nishant Totla + +commit 0f188a3787246d1c64c175d1357c474cfec5e9f2 +Author: Nishant Totla +Date: Mon May 2 18:45:30 2016 -0700 + + Creating http client in swarm + + Signed-off-by: Nishant Totla + +commit c05d16f050e1608b8f729928beba7588d56b2949 +Author: Thomas Darimont +Date: Fri Jul 22 23:35:06 2016 +0200 + + Honor MACHINE_STORAGE_PATH environment for virtualBoxLogs + + Previously vbox log files were only stored beneath the .docker folder + relative to the user's home-directory which potentially resulted in + filenotfound errors. + + We now store the vbox log files relative to the MACHINE_STORAGE_PATH + for docker machines, e.g. on windows + with `MACHINE_STORAGE_PATH` set to `C:\dev\docker\machine` + the logs for the `default` vm would be written to + `C:\dev\docker\machine\machines\default\default\Logs\VBox.log` + + Signed-off-by: Thomas Darimont + +commit 2fdb51795226afc51097f6891f899ce835dc74c1 +Merge: 9d8b938222 bd74d1dc46 +Author: Dongluo Chen +Date: Thu Jul 21 21:01:46 2016 -0700 + + Merge pull request #2251 from doronp/Fix-#2247 + + Ignoring gone Engine removing the network from the rest + +commit 21f605a4eed3dc294e5f00524799d24c40fee58c +Merge: 98fef969e5 3c8e9c8b9e +Author: French Ben +Date: Thu Jul 21 14:13:50 2016 -0700 + + Merge pull request #1839 from docker/fix-windows + + Fix windows connection setup and port publish + +commit 98fef969e5cba12f0569f04c613a1d98f72b0f62 +Merge: 38470dd381 dc6aded2b0 +Author: French Ben +Date: Thu Jul 21 14:13:35 2016 -0700 + + Merge pull request #1831 from thomasdarimont/feature/honor-docker-cert-path-env-variable + + Honor DOCKER_CERT_PATH environment in nonNativeSetup + +commit bd74d1dc463b31545350911adeaa20a32b5159fe +Author: Doron Podoleanu +Date: Thu May 19 12:11:20 2016 +0300 + + Ignoring gone Engine removing the network from the rest + + Signed-off-by: Doron Podoleanu + + Use exported var + + Signed-off-by: Doron Podoleanu + + Verify global scope before iteration on all engines + + Signed-off-by: Doron Podoleanu + +commit dc6aded2b05e362b46eac38254d691576c8890fa +Author: Thomas Darimont +Date: Sun Jul 17 01:09:08 2016 +0200 + + Honor DOCKER_CERT_PATH environment in nonNativeSetup + + Previously only certificates relative to the home folder + were honored, which made using custom storage locations + via MACHINE_STORAGE_PATH for docker machines quite + cumbersome to use. + + This helps with the issue #1640. + + Signed-off-by: Thomas Darimont + +commit 3c8e9c8b9e13cabff108c8e28837c0c1e9c2afa9 +Author: French Ben +Date: Wed Jul 20 20:43:47 2016 -0700 + + Moved all to named pipe + + Signed-off-by: French Ben + +commit 806eb3b00c76404b587af3e974dfdf971df7ba70 +Author: French Ben +Date: Wed Jul 20 20:21:58 2016 -0700 + + Fixed port publishing + + Signed-off-by: French Ben + +commit 9d8b938222be8c0b485da751bad8fff214333c64 +Merge: 76b6754cc6 318666579a +Author: Nishant Totla +Date: Wed Jul 20 19:00:39 2016 -0700 + + Merge pull request #2427 from abronan/update_libkv + + libkv: update godeps, fix wrong error check on zookeeper List + +commit d762c50cbe505a637e4b6b2dc388a60a6c6eaf2a +Author: Joao Fernandes +Date: Wed Jul 20 17:43:01 2016 -0700 + + Removes quickstart docs, some cleanups + + Nukes the quickstart docs, since they were difficult to follow, and + didn't add any value. + Also cleans up the docs, so that we stop having index.md pages that can be + accessed by users, but don't have content. + +commit 6e4aa098fbdfb0912c50af4d289125a38c1c7a54 +Author: French Ben +Date: Wed Jul 20 16:49:04 2016 -0700 + + Updated kitematic endpoint + + Signed-off-by: French Ben + +commit 318666579a81b9243a24ad0c3a4a2e0d5dd773f9 +Author: Alexandre Beslic +Date: Wed Jul 20 16:40:29 2016 -0700 + + libkv: fix wrong error check on zookeeper List + + Signed-off-by: Alexandre Beslic + +commit 16c219213d8637f9ffcd5b8649b825140e1c0a1a +Merge: edf6c3ba6a ca03459fb4 +Author: Joao Fernandes +Date: Wed Jul 20 14:49:57 2016 -0700 + + Merge pull request #2502 from joaofnfernandes/push-pull-images + + Revamps docs for pushing and pulling images + +commit 76b6754cc66dde2647ac1c15bba433a5d1dfbae1 +Merge: b71933665c 5356356ae4 +Author: Nishant Totla +Date: Wed Jul 20 13:09:26 2016 -0700 + + Merge pull request #2426 from nishanttotla/bump-v1.2.4-rc2 + + Bump version to v1.2.4-rc2 + +commit 5356356ae4e8db1909e5f86427ad15516e6773cc +Author: Nishant Totla +Date: Wed Jul 20 12:02:04 2016 -0700 + + Bump version to v1.2.4-rc2 + + Signed-off-by: Nishant Totla + +commit b71933665c581ebd01cdd71f11aa38678233da00 +Merge: 562da10f2d 3982f039a2 +Author: Alexandre Beslic +Date: Tue Jul 19 23:07:23 2016 -0700 + + Merge pull request #2418 from dongluochen/cli_healthcheck + + Add healthcheck info to CLI + +commit 562da10f2d01cc77de02c713e230fee5c4fe30e3 +Merge: ef0aa2aeb2 d283e00512 +Author: Dongluo Chen +Date: Tue Jul 19 21:25:54 2016 -0700 + + Merge pull request #2424 from dongluochen/reschedulingtest + + Fix rescheduling test + +commit d283e00512418ec940e2491f83b4cc8dd3daa140 +Author: Dong Chen +Date: Tue Jul 19 18:59:08 2016 -0700 + + Fix rescheduling test. + + Signed-off-by: Dong Chen + +commit 3982f039a2a67159be894443455204a381b82137 +Author: Dong Chen +Date: Fri Jul 15 11:05:42 2016 -0700 + + Add healthcheck info to CLI. + + Signed-off-by: Dong Chen + +commit ef0aa2aeb292483904e276873f9584ce730ca629 +Merge: 584c6bee65 62b0b29aa6 +Author: Dongluo Chen +Date: Tue Jul 19 18:31:07 2016 -0700 + + Merge pull request #2423 from nishanttotla/engine-api-update-interface + + Updating engine-api to latest, with a new client interface + +commit 62b0b29aa6dd0e4ae3875ebe6a2500fbab4ddb02 +Author: Nishant Totla +Date: Tue Jul 19 10:14:55 2016 -0700 + + Adding new client interface in Swarm + + Signed-off-by: Nishant Totla + +commit edf6c3ba6a78e9f0c92fcda4bf26406c0518f9be +Author: Joao Fernandes +Date: Tue Jul 19 16:06:16 2016 -0700 + + Fixes instructions to install offline docs + +commit 8281bfa5f16824ce9c599d52dbecf6f1ba21dfa9 +Author: Joao Fernandes +Date: Tue Jul 19 13:49:11 2016 -0700 + + Updates docs for offline install + +commit ca03459fb4dfa5d5e8c9a922fbaddff0d784ff47 +Author: Joao Fernandes +Date: Mon Jul 18 10:13:33 2016 -0700 + + Revamps docs for pushing and pulling images + +commit 584c6bee6515ad0b9611a9960c8c9a94515a6a28 +Merge: 384d95a1d0 e361f64180 +Author: Alexandre Beslic +Date: Tue Jul 19 13:24:18 2016 -0700 + + Merge pull request #2400 from xianlubird/bug/refresh-network + + Remove refresh network when creating container + +commit 936f2f79149aa3d4fdecf678707671c2dfe51c4a +Author: Nishant Totla +Date: Mon Jul 18 11:59:49 2016 -0700 + + Updating engine-api to latest + + Signed-off-by: Nishant Totla + +commit 384d95a1d025793ee87d63ef13c6a7b3b5efda25 +Merge: 6aa4e3cdc5 9b80918528 +Author: Sebastiaan van Stijn +Date: Thu Jul 14 16:03:56 2016 +0200 + + Merge pull request #2413 from avsm/typo-in-label-docs + + docs: fix extra newline in swarm label addition + +commit 9b809185280f62cb051031bd20c5320ff24abf5a +Author: Anil Madhavapeddy +Date: Thu Jul 14 14:36:32 2016 +0100 + + docs: fix extra newline in swarm label addition + + Signed-off-by: Anil Madhavapeddy + +commit 6aa4e3cdc547ad6a1e52bf928f9be28dd192e25e +Merge: 165868e33a c8e39ae954 +Author: Dongluo Chen +Date: Wed Jul 13 17:57:47 2016 -0700 + + Merge pull request #2254 from allencloud/get-volume-labels-when-refreshVolumes + + Refresh single volume when volume event emitted + +commit fa56475fb204c14d3673d14365c62aba5a838207 +Author: Nathan LeClaire +Date: Wed Jul 13 10:30:47 2016 -0700 + + Bump versions for 1.12.0-rc4 + + Signed-off-by: Nathan LeClaire + +commit c8e39ae95459bcd3b1fc27a4ce86ed3edc8e182f +Author: allencloud +Date: Fri May 20 02:48:19 2016 +0800 + + refresh single volume when event emitted + + Signed-off-by: allencloud + +commit e4a0dbc47232e3a9da4cfe6ce44f250e6e85ed43 +Author: Tibor Vass +Date: Tue Jul 12 20:27:22 2016 -0700 + + Bump VERSION to v1.12.0-rc4 + + Signed-off-by: Tibor Vass + +commit 8ab73b58e771d1746883965bd3696808cfeb6deb +Merge: e4c35bd74c 3cad13f679 +Author: Tibor Vass +Date: Tue Jul 12 20:23:40 2016 -0700 + + Merge pull request #24571 from tiborvass/buildid-docker-proxy-cherrypick + + [bump_v1.12.0] docker-proxy: Force external linking to add BuildID information to pl… + +commit 3cad13f679d24bc3ba24f1bda4bd6b957e4a2d71 +Author: Tibor Vass +Date: Tue Jul 12 19:59:48 2016 -0700 + + docker-proxy: Force external linking to add BuildID information to please rpm + + Signed-off-by: Tibor Vass + (cherry picked from commit 9a690d3544563bf3b88708dabd5bc853e0e749d2) + Signed-off-by: Tibor Vass + +commit e4c35bd74c3cb25d266c402af34502c62d01151c +Merge: ff7c84b867 f00c098bf7 +Author: Tibor Vass +Date: Tue Jul 12 17:47:32 2016 -0700 + + Merge pull request #24467 from tiborvass/cherry-picks-1.12.0-rc4 + + [WIP] Cherry picks 1.12.0 rc4 + +commit ff7c84b8678605a74f1732667ae014f63ba74d47 +Merge: 84aa074d18 91e29e815d +Author: Tibor Vass +Date: Tue Jul 12 17:46:52 2016 -0700 + + Merge pull request #24567 from tiborvass/bump_v1.12.0 + + Bump VERSION to v1.12.0-rc3 + +commit 165868e33ab34c8da1b68aeadf927441beaf3f0e +Merge: 444e25d50e 0b544c93f7 +Author: Dongluo Chen +Date: Tue Jul 12 17:37:51 2016 -0700 + + Merge pull request #2331 from allencloud/update-min-engine-version-swarm-supports + + update min docker engine's version swarm supports + +commit f00c098bf74bf05a76d6ad8ae8a407860fc02285 +Author: Christy Perez +Date: Thu Jun 30 15:33:21 2016 -0500 + + Uncomment the TasksMax val later in the deb build + + The original sed placement was creating packages with an + "unsupported" tag in the package name. + + Fixes #24197 + + Signed-off-by: Christy Perez + (cherry picked from commit dab287819a21ef8755d2f1b578ebeea33eb4e784) + Signed-off-by: Tibor Vass + +commit c61fa33c23330b134e4107b138d3141424c8dc22 +Author: Arnaud Porterie (icecrime) +Date: Mon Jun 6 16:33:00 2016 -0700 + + Rename `--net` to `--network` + + Add a `--network` flag which replaces `--net` without deprecating it + yet. The `--net` flag remains hidden and supported. + + Add a `--network-alias` flag which replaces `--net-alias` without deprecating + it yet. The `--net-alias` flag remains hidden and supported. + + Signed-off-by: Arnaud Porterie (icecrime) + (cherry picked from commit c0c7d5e71586ec8e4d54aef9e061f061e9223cc4) + Signed-off-by: Tibor Vass + +commit e3ed7f8c7b162defe2efd6fc728048a39c889a11 +Author: Arnaud Porterie (icecrime) +Date: Mon Jun 6 15:25:04 2016 -0700 + + Organize run flags into categories + + Flatten the list of `docker run` flags and group them loosely by + category (general purpose, security, networking, ...). + + Signed-off-by: Arnaud Porterie (icecrime) + (cherry picked from commit 5b21c8a40823edf82b3b3f22c559c524a49d25a9) + Signed-off-by: Tibor Vass + +commit 31d24fa6a935a92dbcca97f01321965bca67bb6f +Author: Brian Goff +Date: Tue Jul 12 15:05:44 2016 -0400 + + Fix panic while merging log configs to nil map + + Signed-off-by: Brian Goff + (cherry picked from commit 7dff31064824ed1f9b046fe5c29bd707e663ee0b) + Signed-off-by: Tibor Vass + +commit 98b155379bdca9a9c0e590945fb2500bb2c823a8 +Author: Brian Goff +Date: Tue Jul 12 15:30:21 2016 -0400 + + Fix panic when meminfo couldn't be read + + Signed-off-by: Brian Goff + (cherry picked from commit 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6) + Signed-off-by: Tibor Vass + +commit 9a0e0cccfe3b06dacf2b3dbbb0db2030c3c7cc21 +Author: Madhu Venugopal +Date: Tue Jul 12 11:27:58 2016 -0700 + + Fixing a stale endpoint issue that blocks ingress network cleanup + + fixes #24400 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit a4926a4d92eb7940d079de01d7fafe43060fcd56) + Signed-off-by: Tibor Vass + +commit 6ce4e9b50ceef9223d62aa3d4a7f43d38e819749 +Author: Madhu Venugopal +Date: Tue Jul 12 11:27:32 2016 -0700 + + Vendoring libnetwork + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 92c40f9bc0cd08dd8f8aaee6dd889b955a00dc60) + Signed-off-by: Tibor Vass + +commit bc5eb28299ec1635541689e7dd13ba2fc4601dc7 +Author: Sebastiaan van Stijn +Date: Tue Jul 12 21:51:14 2016 +0200 + + Fix some broken sourceforge.net links + + Looks like there's issues with sourceforge project + pages. Given that sourceforge isn't really what + it used to be, trying to find alternative URLs + where possible. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 0e7a1079be5e87aae2abcda7c27a2b0e67270a50) + Signed-off-by: Tibor Vass + +commit 156495f3a65159b377faad1515365d57038553de +Author: Sebastiaan van Stijn +Date: Tue Jul 12 22:06:01 2016 +0200 + + Add "auto-accept=none" to documentation + + The "none" option was not added to the documentation. + This adds an example, and adds additional information + on manually accepting or rejecting a node. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 06517753c19262129202b224a35965a2686e49e9) + Signed-off-by: Tibor Vass + +commit eaa8821a2396cbaf9b7981234422f49c4954b2fc +Author: Alexander Morozov +Date: Fri Jul 8 14:54:18 2016 -0700 + + integration-cli: add test for restarting entire swarm cluster + + Signed-off-by: Alexander Morozov + (cherry picked from commit ae4137ae3cc6ee479f5e7f86f9859b485473285a) + Signed-off-by: Tibor Vass + +commit 85bb54b988aaa3d050c2c4eb374b4dd5c4fc170b +Author: Charles Smith +Date: Tue Jul 12 10:29:50 2016 -0700 + + add caveat for network plugins in swarm mode + + Signed-off-by: Charles Smith + (cherry picked from commit 9ae64de6143451b0c3a3b2fe368b1c365b10e1a4) + Signed-off-by: Tibor Vass + +commit 909e7a2ca53a8055976336b43a01d4975d4a81a2 +Author: Ralf Sippl +Date: Tue Jul 12 17:31:44 2016 +0200 + + Add API test for empty services list + + Signed-off-by: Ralf Sippl + (cherry picked from commit 65e72133a11ea3e6873f62039956bbd70548a5a7) + Signed-off-by: Tibor Vass + +commit 18f1fc8349194ea0f86e742e32192d08752750b9 +Author: Ralf Sippl +Date: Tue Jul 12 11:41:04 2016 +0200 + + Return an empty services list if no services are running + + Signed-off-by: Ralf Sippl + (cherry picked from commit c8e4e95db9b0d3115435b8f0e94c78a2e0cb92d0) + Signed-off-by: Tibor Vass + +commit adfeccf06fcec3d351586269aeddcf8e2e63e551 +Author: Derek McGowan +Date: Mon Jul 11 16:48:08 2016 -0700 + + Allow option to override kernel check in overlay2 + + Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs. + + Fixes #24023 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit ff98da0607c4d6a94a2356d9ccaa64cc9d7f6a78) + Signed-off-by: Tibor Vass + +commit 72274de26e5a6ec1a9708df6a2d63b5276d2a566 +Author: Aaron Lehmann +Date: Mon Jul 11 18:06:23 2016 -0600 + + Don't retry push on an unknown repository + + If the remote registry responds with a NAME_UNKNOWN error, treat this as + a fatal error and don't retry the push. + + Tested against an ECR registry. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit a12ab28e0afb8dd0a05187989dd95c9b9ca3fd68) + Signed-off-by: Tibor Vass + +commit c0a787db2ba844b0dd8e6c4c1f7759ef90b38c17 +Author: johnharris85 +Date: Wed Jun 29 14:01:25 2016 -0700 + + Add support for comma-separated --auto-accept syntax. + Signed-off-by: John Harris + + (cherry picked from commit 8e148827734a94165156adfd0f6d202d28dff142) + Signed-off-by: Tibor Vass + +commit 209f6e27e0bd328610cad656b70c84703987ccf7 +Author: Yong Tang +Date: Tue Jul 12 04:59:08 2016 -0700 + + Fix a minor typo in swarm tutorial docs + + This fix fixes a minor typo in swarm tutorial's delete service docs. + + Signed-off-by: Yong Tang + (cherry picked from commit 93fa7e75553c3332314b3b988f7082cfde857475) + Signed-off-by: Tibor Vass + +commit d16f04942fb88a69fbb5db689ca75619b9be8bef +Author: Sebastiaan van Stijn +Date: Tue Jul 12 01:52:42 2016 +0200 + + Add missing API docs for HostConfig.PidMode + + The `--pid` flag was added in Docker 1.5.0, but the + API changes were not documented. In Docker 1.12.0, + `--pid=container:` was added as an additional + option, but also undocumented. + + This adds the missing API documentation for this + option. + + Also see commits + 47e3da848ffbe88d0188ae6cfc09d6e1668bc293 (for 1.5.0), and + ebeb5a0422be47e703353e327606a380eb9962ab (for 1.12.0). + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 2c9b5addc5022dba33d5d0443b49b2e4c0041ef3) + Signed-off-by: Tibor Vass + +commit 5dafcf2170f268cc7983696a0918194b152bb769 +Author: Dave Henderson +Date: Mon Jul 11 21:18:03 2016 -0400 + + Clarify warning against using build-time variables for secrets + + Signed-off-by: Dave Henderson + (cherry picked from commit 9af24ba3ac9c2efbb8ec7edef4668650a3c31834) + Signed-off-by: Tibor Vass + +commit 56ab840f377c9c970a1f9a3ab273faff6662f6fa +Author: Tonis Tiigi +Date: Fri Jul 8 14:17:32 2016 -0700 + + Use waitAndAssert to test node state changes + + Signed-off-by: Tonis Tiigi + (cherry picked from commit f02ec39e99bfd36f34a965f78d853e19234e513b) + Signed-off-by: Tibor Vass + +commit db94be5084f09f0b763d4cfff1ec762e61eb266b +Author: Anusha Ragunathan +Date: Fri Jul 1 11:36:11 2016 -0700 + + Shutdown plugins during daemon shutdown. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 863ab9ab134d0baef3c7e5d745eded891e87e734) + Signed-off-by: Tibor Vass + +commit 88d82eee4b68bbc67b4b51b604d09e1face296a5 +Author: Qiang Huang +Date: Mon Jul 11 14:52:27 2016 +0800 + + Remove execution driver + + We use containerd and there is no execution driver anymore. + + Addresses: https://github.com/docker/docker/issues/24461 + + Signed-off-by: Qiang Huang + (cherry picked from commit 1fb1136fecfd761300a38f64ac9178979cc0b270) + Signed-off-by: Tibor Vass + +commit c164011a4e08372d58a97ca82619499a04258421 +Author: Mansi Nahar +Date: Mon Jun 13 12:22:36 2016 -0400 + + Change content-trust doc to not point to images that don't exist #22730 + + Signed-off-by: Mansi Nahar + (cherry picked from commit 82d70f440952951f2ce8aee34f3f750f540aed38) + Signed-off-by: Tibor Vass + +commit e7dd82fab0874da3c525d42e671fea2851be90fd +Author: Madhu Venugopal +Date: Fri Jul 8 18:00:41 2016 -0700 + + swarmkit expects network-id for as target + + For any operation that involves netwoks (other than network create), + swarmkit expects the target as network-id. Service upate was using + network-name as the target and that caused the issue. + + Signed-off-by: Madhu Venugopal + (cherry picked from commit b32cfb32a3f654f27bc9d4356b36c6a7e5e53b21) + Signed-off-by: Tibor Vass + +commit 25b235a1b137d781b7c2319290998f1e323db944 +Author: allencloud +Date: Wed Jun 29 01:39:49 2016 +0800 + + return err when stack name does not exist + + Signed-off-by: allencloud + (cherry picked from commit 416613f2e54581c62d3efa1c4f0288b6e7d58365) + Signed-off-by: Tibor Vass + +commit e07a1af84b79228dcbd6291303d480a7580576a2 +Author: Joao Fernandes +Date: Fri Jul 8 16:04:03 2016 -0700 + + Fixes broken link in docs. + + Fixes #24428 + + Signed-off-by: Joao Fernandes + (cherry picked from commit 6c9b5da5a17adccc06cbee31d1e674f89644030b) + Signed-off-by: Tibor Vass + +commit e0960bd8e7424fc653ba009a55b30d8f7e631e39 +Author: Kara Alexandra +Date: Thu Jun 30 16:46:57 2016 -0700 + + Add blanks lines in docs for clarity + + Signed-off-by: Kara Alexandra + (cherry picked from commit d0737e9ac0bfcbac0e212d157ab305e561eea3ee) + Signed-off-by: Tibor Vass + +commit f17d02c9925d67a67d0845390f53d94becbcdf1f +Author: Lucas Chi +Date: Sun Jul 10 00:26:58 2016 -0400 + + Fix grammar in docker volumes tutorial + + Signed-off-by: Lucas Chi + (cherry picked from commit 7b3ac47fa4c2dd6850959c3c230289eefbc4dbe3) + Signed-off-by: Tibor Vass + +commit 2e3706127832883d534fe16920603993be97e12c +Author: runshenzhu +Date: Mon Jun 27 18:08:56 2016 -0700 + + add health check in docker cluster + + Signed-off-by: runshenzhu + (cherry picked from commit 1ded1f26e154e283ab26f347971d4d4a51edc94f) + Signed-off-by: Tibor Vass + +commit e76138c35fe1bbfcd5579a76c5fde4a3d49962c1 +Author: Antonio Murdaca +Date: Sun Jul 10 15:54:52 2016 +0200 + + integration-cli: fix --net=none tests + + Example: + + 21:28:01 [d68573521] waiting for daemon to start + 21:28:01 [d68573521] daemon started + 21:28:01 docker_api_swarm_test.go:163: + 21:28:01 c.Assert(d1.Init(map[string]bool{"worker": true}, ""), + checker.IsNil) + 21:28:01 ... value *errors.errorString = + &errors.errorString{s:"initializing swarm: invalid statuscode 500, + \"{\\\"message\\\":\\\"could not determine local IP address: dial udp + 8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing + swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not + determine local IP address: dial udp 8.8.8.8:53: connect: network is + unreachable\\\"}\\n\"") + 21:28:01 + 21:28:01 [d68573521] exiting daemon"} + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394) + Signed-off-by: Tibor Vass + +commit adbb169463b3016d017853bd2294d55c4e105345 +Author: Yong Tang +Date: Fri Jul 8 15:54:48 2016 -0700 + + Fix seccomp output in `docker info` + + This fix tries to address the issue raised in #24374 where + `docker info` outputs seccomp support in Ubuntu 14.04 but + the seccomp wass not actually supported. + + The issue is that in the current docker implementation, seccomp + support is only checked against the kernel by inspect CONFIG_SECCOMP + and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled + when building docker (through golang build flag). + + This fix adds a supportSeccomp boolean variable. The supportSeccomp + is only set to true when seccomp is enabled when building docker. + + This fix fixes #24374. + + Signed-off-by: Yong Tang + (cherry picked from commit a3b9dd89a1b19e7f84617b91f3756ae816c11035) + Signed-off-by: Tibor Vass + +commit b008283a7f8831cbf3684521edbd32ec74350eb3 +Author: Tonis Tiigi +Date: Fri Jul 8 12:01:58 2016 -0700 + + Add more complicated demotion testcases + + Signed-off-by: Tonis Tiigi + (cherry picked from commit a3f1577365f7b2ed99d1801c909bfaa69c048c92) + Signed-off-by: Tibor Vass + +commit 82603c3abe1bb38e02e5088db8225cc399ba7111 +Author: Tonis Tiigi +Date: Fri Jul 8 11:43:42 2016 -0700 + + Add logdrivers to executor from swarmkit + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 8a50315f3ce89b24e3556dba288b2ce7b4daf026) + Signed-off-by: Tibor Vass + +commit df6581ababcf66ae92972c20aee857cf819437b5 +Author: Tonis Tiigi +Date: Fri Jul 8 11:42:07 2016 -0700 + + Update executor volumes from swarmkit + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 6586f4f0719ae59c4a2b74acd91a1a888a0018b5) + Signed-off-by: Tibor Vass + +commit 045006917901f54b2e2dc795639d832b998395d2 +Author: Tonis Tiigi +Date: Fri Jul 8 11:41:07 2016 -0700 + + vendor: update swarmkit to 6478bc19 + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 4d12e64cd4893cbd9f7a6078851f4e3c9c6fd3a5) + Signed-off-by: Tibor Vass + +commit 9b5d50780461cbd2f60a0babdf0cc403cbc480fd +Author: Yong Tang +Date: Sun Jun 19 06:13:57 2016 -0700 + + Add release tag reference links in deprecated.md + + This fix adds a couple of missed release tag reference links in deprecated.md + + Signed-off-by: Yong Tang + (cherry picked from commit bc20354b095906eedd346fb45bbbf9ad5e82145d) + Signed-off-by: Tibor Vass + +commit 421bb30808b0dfbafffc12e781346110d5975886 +Merge: d6f4f9841c 23942a60cc +Author: Nathan LeClaire +Date: Tue Jul 12 14:30:06 2016 -0700 + + Merge pull request #534 from docker/toolbox_bin_path + + Force Toolbox bin path to start of PATH + +commit 444e25d50eb449cca83605beaf94cd2debd4d9e4 +Merge: 5a6da69f6c 3baf3e68e9 +Author: Victor Vieux +Date: Tue Jul 12 14:14:08 2016 -0700 + + Merge pull request #2412 from ezrasilvera/FixMesosRlock + + Fix double RLock in Mesos cluster (apply PR #2210 to Mesos cluster) + +commit 3baf3e68e999568207b2e026d8e8304cb3c42e37 +Author: Ezra Silvera +Date: Tue Jul 12 10:33:49 2016 -0400 + + Fix double RLock in Mesos cluster + + Signed-off-by: Ezra Silvera + + format + + Signed-off-by: Ezra Silvera + +commit 265c55023c31aed4922bbda7c0e60b388d543c06 +Author: Ezra Silvera +Date: Wed May 11 13:55:54 2016 +0300 + + Check in pending tasks as well + + Signed-off-by: Ezra Silvera + +commit eac4981da8f082ec44fed581e98a74f6c74b73f5 +Author: Ezra Silvera +Date: Wed May 11 12:15:04 2016 +0300 + + check unique container name + + Signed-off-by: Ezra Silvera + +commit 0b544c93f7a8359043dc9c2b9ff1b265a9cfc62e +Author: allencloud +Date: Sun Jun 5 19:57:34 2016 +0800 + + update min docker engine's version swarm supports + + Signed-off-by: allencloud + +commit 5a6da69f6c4562c6c62a0bb31f80417fc3646344 +Merge: ec5e048908 d1694cbab0 +Author: Dongluo Chen +Date: Mon Jul 11 16:58:30 2016 -0700 + + Merge pull request #2163 from xianlubird/feature/rescheduler + + fix issue #2162 add removeDuplicateContainers behaviour for every node when it's added. + +commit 23942a60cc2cc5e26db660a03ed28192a10b92ca +Author: Nathan LeClaire +Date: Mon Jul 11 14:44:13 2016 -0700 + + Force Toolbox bin path to start of PATH + + Signed-off-by: Nathan LeClaire + +commit ec5e048908388439eedefbf9b4737ce6e6d65cbc +Merge: 9e94f55df1 6c408c3caf +Author: Allen Sun +Date: Mon Jul 11 23:18:19 2016 +0800 + + Merge pull request #2410 from rmoriz/issue-2409 + + fix off-by-one error in server count + +commit 6c408c3cafdcddfe9211de0c6f26479905c2044f +Author: Roland Moriz +Date: Mon Jul 11 14:33:02 2016 +0200 + + fix off-by-one error in server count + + Signed-off-by: Roland Moriz + +commit 783b3a83419a8b32ec80804324233fab27b567e8 +Merge: 770d198619 ec7018348d +Author: Nathan LeClaire +Date: Fri Jul 8 17:24:11 2016 -0700 + + Merge pull request #3552 from juanjose49/Update-Windows-VirtualBox-Driver + + Change VirtualBox on Windows base paths to use long path prefix + +commit 92b44225728020ee8039ac5a369aacc88e1a217b +Author: Justin Cormack +Date: Thu Jul 7 13:02:19 2016 +0100 + + Add ltdl dependencies for aarch64 + + Fixes `make test` and fix #24380 on aarch64 + + Signed-off-by: Justin Cormack + (cherry picked from commit d37a7394acd7842f588ef423fb076b05fccd1da2) + Signed-off-by: Tibor Vass + +commit d8d1573b0d8c3607e91df5b03dbd0855126d7ec4 +Author: Harald Albers +Date: Wed Jun 29 05:26:55 2016 -0700 + + bash completion for default port on `docker swarm {init,join}` + + Signed-off-by: Harald Albers + (cherry picked from commit 009d50e2d8c4f74f38ebefe89b8dd44b69b46660) + Signed-off-by: Tibor Vass + +commit 00a988c2ad2eaa1615966ee79951c9088654122c +Author: Harald Albers +Date: Wed Jun 29 05:17:26 2016 -0700 + + bash completion can be configured to show node and service IDs + + Signed-off-by: Harald Albers + (cherry picked from commit 715754ee61a83a710f5c0c3974cfed6b453d5595) + Signed-off-by: Tibor Vass + +commit 89bb424ce290e8c6accbc8974e961db282b21695 +Author: Harald Albers +Date: Wed Jun 29 04:05:29 2016 -0700 + + bash completion for `docker {service,node}` filters + + Signed-off-by: Harald Albers + (cherry picked from commit 2b34fa0511a5193b1cb07493555872cfd6b70442) + Signed-off-by: Tibor Vass + +commit 1a45978a2db17a63ff88052c842866261b6c135b +Author: Akihiro Suda +Date: Wed Jul 6 02:40:48 2016 +0000 + + Validate arguments for `ps` in `docker top` + + Fix #24357 + + Signed-off-by: Akihiro Suda + (cherry picked from commit 253933220965574422aa6679255359d8bd15d435) + Signed-off-by: Tibor Vass + +commit 2bb603aafd1850b50d1ba96b57d635a5117f4c77 +Author: Brian Goff +Date: Thu Jul 7 22:19:48 2016 -0400 + + Fix daemon not cleaned up w/ live restore enabled + + This patch makes sure daemon resources are cleaned up on shutdown if + there are no running containers. + + Signed-off-by: Brian Goff + (cherry picked from commit 2d5dc94b9b547a9ba73f7b613e358b03fdfb2b84) + Signed-off-by: Tibor Vass + +commit b74b71ecb31ebb4147f52e04faebfd01895fe451 +Author: Madhu Venugopal +Date: Thu Jul 7 16:10:43 2016 -0700 + + fixes #23983 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 6a4b21bd863f955d05e5df1e54be4dfcf6889870) + Signed-off-by: Tibor Vass + +commit 65a256f7a87f5c6dd7eb495d91b6028c7c1cb662 +Author: Madhu Venugopal +Date: Thu Jul 7 16:08:40 2016 -0700 + + Revert "Fixed a few network UI issues in swarm-mode" + + This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5. + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 4623276886033aedb4932c3996c7f61e7fc35861) + Signed-off-by: Tibor Vass + +commit b1819cb61b6ce706497bb536a808e82eadceaf68 +Author: Justin Cormack +Date: Fri Jul 8 14:15:57 2016 +0100 + + Add missing docker-proxy into managed files in rpm spec + + This was missed in #23312 even though the other parts of + this were fixed. + + Signed-off-by: Justin Cormack + (cherry picked from commit 47ace5cd989103f7d646282fce66434b5a3c13f6) + Signed-off-by: Tibor Vass + +commit 52ca6cb63a5b2f780cd8b7096e20ec8133f6e16d +Author: Antonio Murdaca +Date: Fri Jul 8 15:58:06 2016 +0200 + + daemon: ensure we set default options to stock runtime + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 59162641cc20640afb785540b5f47178835de656) + Signed-off-by: Tibor Vass + +commit 234861710f22b0d0969072f259da640c17fc1ba2 +Author: Justin Cormack +Date: Fri Jul 8 13:33:41 2016 +0100 + + Update binary install docs with new contents of tgz + + This is now up to date with contents of 1.12 tgz + + Also change usage to `dockerd` not `docker daemon` + + Signed-off-by: Justin Cormack + (cherry picked from commit 7102e09f29822e4bb0e375738c5194ded8b716ca) + Signed-off-by: Tibor Vass + +commit e90025aa76748729f95fbd99c781f9d3582987a1 +Author: Charles Smith +Date: Thu Jul 7 16:57:46 2016 -0700 + + add constraint to service create ref + + Signed-off-by: Charles Smith + (cherry picked from commit 093817031acd2b8dc17cba5c3c994b2d6d19dc0e) + Signed-off-by: Tibor Vass + +commit 7a09cd277271b2b8f2c062200c4a2dc80ceb28e3 +Author: Sebastiaan van Stijn +Date: Thu Jul 7 14:22:12 2016 -0700 + + add iptables=false to docs for multiple daemons + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 1255e53e2890149df3c919af7aac88237069e1bb) + Signed-off-by: Tibor Vass + +commit a654ab1e8915743ce38e53b20dd1ba55b05e318e +Author: Justin Cormack +Date: Thu Jul 7 20:17:39 2016 +0100 + + Fix test case for docker_api_swarm_test.go + + Signed-off-by: Justin Cormack + (cherry picked from commit 6dfba780cc490ef7579e95169b5c71617f8e5a47) + Signed-off-by: Tibor Vass + +commit 3c338c7d8aa3680f912c96df231eaf2aefca04e4 +Author: Justin Cormack +Date: Thu Jul 7 12:58:43 2016 +0100 + + Update swarmkit vendoring + + Needed for libnetwork vendoring + + Update Secret API name change correspondingly + + Signed-off-by: Justin Cormack + (cherry picked from commit d428a7a425f071ee9e5707c7319d3197540adc19) + Signed-off-by: Tibor Vass + +commit bf2efa3332d5ce34174d5a900553d00ad4451cc9 +Author: Justin Cormack +Date: Thu Jul 7 12:23:10 2016 +0100 + + Update libnetwork vendoring + + Update now that the changes in https://github.com/docker/libnetwork/pull/1230 + have been merged + + Signed-off-by: Justin Cormack + (cherry picked from commit 3ae0c664507e0d8da5e3151f28b8d00316569e47) + Signed-off-by: Tibor Vass + +commit d28a8673b5d1c04fa6eced46b6cf2b159902e1ee +Author: Justin Cormack +Date: Fri Jun 3 17:28:14 2016 +0100 + + Make the docker proxy a standalone binary not a re-exec + + This reduces memory usage with a lot of docker proxy processes. + On Docker for Mac we are currently carrying a patch to replace + the binary as we modify it to forward ports to the Mac rather + than the Linux VM, this allows us to simply replace this binary + in our packaging with one that has a compatible interface. This + patch does not provide an easy way to substitute a binary as + the interface is complex and there are few use cases, but where + needed this can be done. + + Signed-off-by: Justin Cormack + (cherry picked from commit 0682468431867e3382a759402eb92df5877e310b) + Signed-off-by: Tibor Vass + +commit 0a861141fac6e6fce7700848ea3914c9c451fffb +Author: John Howard +Date: Wed Jun 29 16:10:57 2016 -0700 + + Windows: Ensure VolumePath is not set for Hyper-V containers + + Signed-off-by: John Howard + (cherry picked from commit fd4f5c23650799a7e76e193614bf82454b375fe3) + Signed-off-by: Tibor Vass + +commit f831be849b446df11229d26eb500194445c28cf4 +Author: Vincent Demeester +Date: Thu Jul 7 20:43:18 2016 +0200 + + Updates on cli reference documentation + + - Update ps with `--last` flag + - Update commands with current output + - Make sure hugo does not detect the wrong language + - Update usage for `tag` command to be more coherent with the other ones + + Signed-off-by: Vincent Demeester + (cherry picked from commit f4cfc6b9830ed236eb588d6a4dddca7455145e70) + Signed-off-by: Tibor Vass + +commit a00d12a8dd8c2e0b1d44b766db14436a5f37aa6d +Author: Aaron Lehmann +Date: Tue Jul 5 15:39:26 2016 -0700 + + Generate a swarm joining secret if none is specified + + The current behavior of `docker swarm init` is to set up a swarm that + has no secret for joining, and does not require manual acceptance for + workers. Since workers may sometimes receive sensitive data such as pull + credentials, it makes sense to harden the defaults. + + This change makes `docker swarm init` generate a random secret if none + is provided, and print it to the terminal. This secret will be needed to + join workers or managers to the swarm. In addition to improving access + control to the cluster, this setup removes an avenue for + denial-of-service attacks, since the secret is necessary to even create + an entry in the node list. + + `docker swarm init --secret ""` will set up a swarm without a secret, + matching the old behavior. `docker swarm update --secret ""` removes the + automatically generated secret after `docker swarm init`. + + Closes #23785 + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 7342e42fcecbc243bcb8723b8422879662452017) + Signed-off-by: Tibor Vass + +commit 23be23841470826c56428dd2a0b365fd52e448a9 +Author: Vincent Demeester +Date: Thu Jul 7 11:32:19 2016 +0200 + + Use "on-failure" for both containers and services + + Signed-off-by: Vincent Demeester + (cherry picked from commit a859a336475f39c7b7d7739c58a1dae40df86a86) + Signed-off-by: Tibor Vass + +commit 3b8f724a96a87b59416f236c41afb22804f80ffe +Author: Vincent Demeester +Date: Thu Jul 7 11:32:09 2016 +0200 + + Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904 + + Signed-off-by: Vincent Demeester + (cherry picked from commit 6ec4a640de492e2f3c7b8268b5258d76b38b094b) + Signed-off-by: Tibor Vass + +commit 61dc82f4234aaa8ec7092041215772fdfb82b59b +Author: Anusha Ragunathan +Date: Wed Jul 6 12:16:14 2016 -0700 + + Detect non-plugin content during install and error out. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit d32df6d934875052232bbbc49fa473bd283af6e4) + Signed-off-by: Tibor Vass + +commit 843b4a93fe13589bbff4c8b99c4d7cbc688ae7b5 +Author: Brian Goff +Date: Tue Jul 5 14:43:28 2016 -0400 + + Use newer default values for mounts CLI + + In the API: + `Writable` changed to `ReadOnly` + `Populate` changed to `NoCopy` + + Corresponding CLI options updated to: + `volume-writable` changed to `volume-readonly` + `volume-populate` changed to `volume-nocopy` + + Signed-off-by: Brian Goff + (cherry picked from commit 56f3422468a0b43da7bae7a01762ce4f0a92d9ff) + Signed-off-by: Tibor Vass + +commit 272e75f9a0edf46eb06bc16810ea03b14da7845b +Author: Brian Goff +Date: Tue Jul 5 11:37:26 2016 -0400 + + re-vendor swarmkit + + Signed-off-by: Brian Goff + (cherry picked from commit db271b8833fc0b55998afababdaad60a67e3a982) + Signed-off-by: Tibor Vass + +commit f331f05f9a19af67095b82a674d312f0da8d3be8 +Author: Brian Goff +Date: Tue Jul 5 11:20:49 2016 -0400 + + re-vendor engine-api + + Signed-off-by: Brian Goff + (cherry picked from commit 140ec59db6e413de5025fb8686b97bf80b66c519) + Signed-off-by: Tibor Vass + +commit 0a21d2b8d005b36aab520e5ed5ec7e23985a1707 +Author: Anil Madhavapeddy +Date: Tue Jul 5 13:18:49 2016 +0100 + + make `docker service --help` text for `--endpoint-mode` more consistent + + Previously: + + ``` + --constraint value Placement constraints (default []) + --endpoint-mode string Endpoint mode(Valid values: vip, dnsrr) + + --restart-condition string Restart when condition is met (none, on_failure, or any) + ``` + + Now: + + ``` + --constraint value Placement constraints (default []) + --endpoint-mode string Endpoint mode (vip or dnsrr) + + --restart-condition string Restart when condition is met (none, on_failure, or any) + ``` + + Signed-off-by: Anil Madhavapeddy + (cherry picked from commit 2de9585f5ea798cbff23045d9d19ba239d5e5431) + Signed-off-by: Tibor Vass + +commit ee1fa5b4645c5d811628183c04edee6d1d4f444d +Author: Yong Tang +Date: Wed Jul 6 20:23:53 2016 -0700 + + Change NAME to HOSTNAME in docs for `docker node ls` + + In #24159, the title field of `docker node ls` has been + changed from NAME to HOSTNAME. However, in the docs the + NAMEs are still used for the output of `docker node ls`. + + This fix updates docs so that NAME field is changed to + HOSTNAME for all `docker node ls`. + + This fix is related to #24159 and #24090. + + Signed-off-by: Yong Tang + (cherry picked from commit 668b8a998f5ebbe66c7376c432a5fd87208add73) + Signed-off-by: Tibor Vass + +commit 6b30370210224b0f8654011c03ebdfbbf9ccaeb1 +Author: Jonathan Lomas +Date: Wed Jul 6 08:47:24 2016 -0700 + + Remove unmatched bracket from _docker for zsh + + Signed-off-by: Jonathan Lomas + (cherry picked from commit 7631dc80a6b1549b857192f44322fcee5e754254) + Signed-off-by: Tibor Vass + +commit 85aefec45a6074f6db84ca2a94923d879309cf98 +Author: Brian Goff +Date: Wed Jun 29 14:00:11 2016 -0400 + + Implement service integration tests + + This is done in a hacky way as currently there is no better way. + Uses known implementation details about how tasks are scheduled to be + able to operate on the underlying container. + + Signed-off-by: Brian Goff + (cherry picked from commit e5ec575b32d6979914dce576f1b8bb71f3057cea) + Signed-off-by: Tibor Vass + +commit 3bf23479cfef4af7af4588b7a8bba94422e47940 +Author: Antonio Murdaca +Date: Wed Jul 6 12:17:19 2016 +0200 + + integration-cli: ensure digest is the same after cross-repo push + + Signed-off-by: Antonio Murdaca + (cherry picked from commit a0c8970df1f013a51684f82dd86815dcf773a250) + Signed-off-by: Tibor Vass + +commit f7a8a315e7b16bff9b5ce14064a7449026fdee79 +Author: Antonio Murdaca +Date: Wed Jul 6 12:03:04 2016 +0200 + + vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 8aa37bdbb76a781d73c24800c2bc5373d2289c28) + Signed-off-by: Tibor Vass + +commit b18cea6d0f767551b3255514851e2c57ded6686e +Author: Anil Madhavapeddy +Date: Tue Jul 5 09:12:12 2016 +0100 + + Improve the warning messages when leaving a Swarm cluster + + Signed-off-by: Anil Madhavapeddy + (cherry picked from commit 22a3d1fa209282e938ca16f31cce0dab4f35bf72) + Signed-off-by: Tibor Vass + +commit 6966df5de7493f4cf3043b029fe9b802e0bf4119 +Author: Vincent Demeester +Date: Wed Jul 6 09:13:59 2016 +0200 + + Validate hostname starting from 1.24 API. + + In order to keep a little bit of "sanity" on the API side, validate + hostname only starting from v1.24 API version. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 6daf3d2a783fd042e870c8af8bbd19fc28989505) + Signed-off-by: Tibor Vass + +commit e8c136169d9c411753fe372fbf17644644c25c71 +Author: allencloud +Date: Wed Jul 6 07:00:39 2016 +0800 + + fix severe fd leak in stack + + Signed-off-by: allencloud + (cherry picked from commit 0af04b613220060ef1fc21ca2f1d551f8f868af8) + Signed-off-by: Tibor Vass + +commit da2ad48b92d3f7a832a2c5e7b1f437206493a924 +Author: Aaron Lehmann +Date: Tue Jul 5 09:59:45 2016 -0700 + + image spec: Correct set of acceptable characters in tags + + The image spec did not match the regexp that validates tags. It + neglected to mention that period and dash characters are allowed in + tags, as long as they are not the first character. It also did not + mention the length limit for tags. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 2f19e910bdeee94a2962ce8457325e92aa21ce0e) + Signed-off-by: Tibor Vass + +commit b6349ac163f6cc739e77644e8e85db08bc78ac7d +Author: Madhu Venugopal +Date: Wed Jun 29 18:08:55 2016 -0700 + + Fixed a few network UI issues in swarm-mode + + * Detect name conflicts on network creation + * Detect and prevent network connect/disconnect for managed containers + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5) + Signed-off-by: Tibor Vass + +commit 65c03f10138109b1192467ff1def2941caf1cd9e +Author: Aleksa Sarai +Date: Mon Jul 4 23:00:28 2016 +1000 + + contrib: systemd: set Limit* to infinity + + There is a not-insignificant performance overhead for all containers (if + containerd is a child of Docker, which is the current setup) if systemd + sets rlimits on the main Docker daemon process (because the limits + propogate to all children). + + Signed-off-by: Aleksa Sarai + (cherry picked from commit 8db61095a3d0bcb0733580734ba5d54bc27a614d) + Signed-off-by: Tibor Vass + +commit fcdaa2d6b320542325962f949f4149fc9a58eeba +Author: Derek McGowan +Date: Mon Jun 27 15:54:39 2016 -0700 + + Atomically save libtrust key file + + The libtrust keyfile which is used to set the "ID" property of a daemon must be generated or loaded on every startup. + If the process crashes during startup this could cause the file to be incomplete causing future startup errors. + Ensure that the file is written atomically to ensure the file is never in an incomplete state. + + Fixes #23985 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 9836162446bd0deadecbf0eed38ef3c134754f16) + Signed-off-by: Tibor Vass + +commit bbc85af0bda906fb2bf179ab5ed5673144452eed +Author: Vincent Demeester +Date: Thu Jun 30 15:09:03 2016 +0200 + + Allow service and node filter to be name… + + … on `docker node tasks` and `docker service tasks` commands. + This changes is mainly server-side (between engine api and + swarmkit). There is just a check in `api/client/service/tasks.go` to + handle the special *self* meaning. + + Signed-off-by: Vincent Demeester + (cherry picked from commit b0fc5a21f1138f48e0431a550c936e8908d72840) + Signed-off-by: Tibor Vass + +commit 58eb74778b168b1ab331713778bf73ab30864b40 +Author: allencloud +Date: Mon Jul 4 12:02:56 2016 +0800 + + fix stdout and stderr in api client + Signed-off-by: allencloud + + (cherry picked from commit 533bd82e41fee352962cb5ae0a49b9edbdebc25e) + Signed-off-by: Tibor Vass + +commit dd7fe47136f8e768babf8adaeca20f98c6ff1b67 +Author: Derek McGowan +Date: Thu Jun 30 09:24:46 2016 -0700 + + Treat digest only images as dangling + + Add test for dangling digest images + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 8906f8307c86ce59f51d2f1b750f5e698f3cf8a5) + Signed-off-by: Tibor Vass + +commit d81ed3eb4c6c4e23956ac075a2df714b2249b50e +Author: Derek McGowan +Date: Mon Jun 27 10:09:57 2016 -0700 + + Always store the image digest when pulling and pushing an image. + + Always attempt to add digest even when tag already exists. + Ensure digest does not currently exist. + When image id is mismatched, output an error log. + + Signed-off-by: Daniel Nephin + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 33984f256b1a281b1130ac7e8edb7bc311750ccf) + Signed-off-by: Tibor Vass + +commit ef6236034219600c949f67ec2758814d8b01b8e3 +Author: Tonis Tiigi +Date: Thu Jun 30 13:15:43 2016 -0700 + + Mask swarm secrets from daemon logs + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 8b8f86aec95ec73881c2dfb6e990784014d61e6e) + Signed-off-by: Tibor Vass + +commit 3eb83b5b2deb1911c671087853c6738df30fb531 +Author: allencloud +Date: Sun Jul 3 20:47:39 2016 +0800 + + fix typos + + Signed-off-by: allencloud + (cherry picked from commit edc307cb9213d11d9c5911b08ebd921a097939c0) + Signed-off-by: Tibor Vass + +commit e54d291989adf8758d116aef73bbb56a4118ce50 +Author: Francis Chuang +Date: Tue Jul 5 16:18:06 2016 +1000 + + Fix a grammatical error in errClusterNetworkOnRun()'s error message. + + Signed-off-by: Francis Chuang + (cherry picked from commit 1205a5584650388f36cda922556a31cbce827915) + Signed-off-by: Tibor Vass + +commit 9d4117ae181b21ecc8173805cb47bfa871ff28e1 +Author: Lei Jitang +Date: Mon Jul 4 10:09:46 2016 +0000 + + Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64 + + schema1 manifests is not working on ARM64, we should skip integration-cli + tests for schema1 manifests on ARM64. + + Signed-off-by: Lei Jitang + (cherry picked from commit 9c1566a1dfa3eccd12e09a3e2cbda60503600d44) + Signed-off-by: Tibor Vass + +commit aa89297297908a665babfe12540b4e965556de61 +Author: skaasten +Date: Mon Jul 4 11:13:57 2016 -0400 + + Fix typo - stacks being managed, not tasks? + (cherry picked from commit 88da491cd9e2c2ea15df15654ac4d98f425d54ed) + + Signed-off-by: Tibor Vass + +commit 4cedd8fc238c6117fa0b5b055e72aa1b2a401c72 +Author: Steve Durrheimer +Date: Sun Jul 3 00:09:34 2016 +0200 + + Add zsh completion for 'docker service' commands + + Signed-off-by: Steve Durrheimer + (cherry picked from commit f5d768e2c53f777e1add70f0e367e58db561842e) + Signed-off-by: Tibor Vass + +commit 65e339bed19020fbbf41b25cbc4ea95936cfd932 +Author: Steve Durrheimer +Date: Tue Jun 21 08:53:10 2016 +0200 + + Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit a5c7eb607e5cbd46b72e21d2af084e83573688f5) + Signed-off-by: Tibor Vass + +commit a8bd5c65cc080038efd1e62b17edef94c05a8923 +Author: Lei Jitang +Date: Mon Jul 4 11:00:35 2016 +0000 + + Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod + + Signed-off-by: Lei Jitang + (cherry picked from commit 8c179348c31392559d95481b47625769a7620a21) + Signed-off-by: Tibor Vass + +commit 8b72a21977351c3cfca70c4b27dcf252c2cc21d3 +Author: allencloud +Date: Mon Jul 4 09:38:06 2016 +0800 + + add a whitespace in plugin's logging + + Signed-off-by: allencloud + (cherry picked from commit 97c77b7e0dd2eef23beca1180be93733a3a95e82) + Signed-off-by: Tibor Vass + +commit dbdd38e421ba9c285349a49f0ab4977adcc221f6 +Author: Steve Durrheimer +Date: Sun Jul 3 01:09:16 2016 +0200 + + Add zsh completion for 'docker swarm' commands + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 2086663abdcfe793aeef3e64655df833c144d024) + Signed-off-by: Tibor Vass + +commit 46a866ece9441dfabf887faf03a694fb2bc521bc +Author: Steve Durrheimer +Date: Sat Jul 2 21:17:01 2016 +0200 + + Add zsh completion for 'docker node' commands + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 024698718f3004d654e46fc2a7732ab35ab3ca5f) + Signed-off-by: Tibor Vass + +commit 664c75ebbab861fa5d1468cf3d73d5528b147f95 +Author: Otto Kekäläinen +Date: Sun Jul 3 20:58:11 2016 +0300 + + Fix spelling in comments, strings and documentation + + Signed-off-by: Otto Kekäläinen + (cherry picked from commit 644a7426cc31c338fedb6574d2b88d1cc2f43a08) + Signed-off-by: Tibor Vass + +commit be2bec4ead4cb998d8248cf99102a5125067fe69 +Author: Sebastiaan van Stijn +Date: Fri Jul 1 18:13:29 2016 -0700 + + remove incorrect L3 recommendation + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit a26852223ecc9bed25ad7e0c6e2a8c0601db8b1e) + Signed-off-by: Tibor Vass + +commit 0e1d691b7f8d66a5489f60c3a9b53cb5e25fc3d5 +Author: Shoubhik Bose +Date: Wed Jun 22 19:14:16 2016 +0000 + + 23837 Added long flag to docker ps for checking latest n containers. Updated to "--last" + + Signed-off-by: Shoubhik Bose + (cherry picked from commit 256edc24fc8f32a93a0572e5d05f3ca1389238da) + Signed-off-by: Tibor Vass + +commit 18d85f7db167d15fd27aafb9a8ffee795c958861 +Author: Antonio Murdaca +Date: Sat Jul 2 16:22:23 2016 +0200 + + man: add missing --add-runtime + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 585332dfe0b4b38f428deb680086b6d69275100d) + Signed-off-by: Tibor Vass + +commit 98e4b0035a675f532b0d735f539dba86e51db682 +Author: Adolfo Ochagavía +Date: Sun Jul 3 14:59:52 2016 +0200 + + Fix typo + + Signed-off-by: Adolfo Ochagavía + (cherry picked from commit 76b09be69683d19c8a9c8cb6c8b693941f62b2ec) + Signed-off-by: Tibor Vass + +commit 7dc8b036e165ef26d958dc9977b7a99bd65beb3e +Author: Bilal Amarni +Date: Sun Jul 3 10:07:07 2016 +0200 + + [doc] add missing whitespace + + Signed-off-by: Bilal Amarni + (cherry picked from commit 0244174296204ca862023dec69778ac54cfd0f9d) + Signed-off-by: Tibor Vass + +commit a4bc0cfecb7de66d0691390000ea9802cb906cc5 +Author: Sebastiaan van Stijn +Date: Fri Jul 1 17:08:59 2016 -0700 + + fix typo in "readonly" flag in documentation + + the flag is named '--read-only', not '--readonly' + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit ac12696ff48aeb115e3d9ce3b13cfa54342b5aee) + Signed-off-by: Tibor Vass + +commit 5c9db19be01c98ca503cc1a970b645a466ae00c1 +Author: Alan Thompson +Date: Fri Jul 1 16:11:01 2016 -0700 + + Update network_create.md + + minor typos and punctuation. + + Signed-off-by: Alan Thompson + (cherry picked from commit 68b8cc9735e9f966dd0e7b3b2d56835310100c2a) + Signed-off-by: Tibor Vass + +commit 15dee375d261c63e5af5de792f7b8ab3cb307a37 +Author: Sebastiaan van Stijn +Date: Fri Jul 1 17:55:52 2016 -0700 + + Improve timestamp formatting + + lowercase the output, to prevent "About" halfway, + and add "ago" to the output, as timestamps are always + in the past. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 04c94a013ccba1690933156830efdc314de67ef8) + Signed-off-by: Tibor Vass + +commit 7e086db901cd6dcfcceaeb3cbf4af24fa27153f4 +Author: Aaron Lehmann +Date: Fri Jul 1 16:52:33 2016 -0700 + + Fix --auto-accept documentation + + The --auto-accept documentation currently says that both worker and + manager nodes are automatically accepted by default. Correct it. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 9aed7d1a3dd7677cbba6b92952a9d28801cf1ceb) + Signed-off-by: Tibor Vass + +commit 855dc5ba79f75fc0f13e8a26b670de99fc101ab5 +Author: Brian Goff +Date: Fri Jun 24 16:17:37 2016 -0400 + + Volume mounts need to use "Binds" API field + + Swarm was putting volume type mounts into the container config's + "Volumes" field, but really these need to go into "Binds". + "Volumes" is only for normal "-v /foo" volumes, not named volumes or + anything else. + + Signed-off-by: Brian Goff + (cherry picked from commit 2bc2165cbf3e949921d1659f09841b5f008f590d) + Signed-off-by: Tibor Vass + +commit bb41792de2f050d811223b92909c3a54c721bb77 +Author: Charles Smith +Date: Tue Jun 28 11:53:39 2016 -0700 + + add menu.md, make index.md command line reference, update typos/minor errors in cli docs + + Signed-off-by: Charles Smith + (cherry picked from commit f98f596c19cb589569ec89bd12d562d8ddd03843) + Signed-off-by: Tibor Vass + +commit 67f4f5d2c492a9ae13c59fa2f9e9f6fb1910ba52 +Author: Sebastiaan van Stijn +Date: Wed Jun 29 09:20:32 2016 -0700 + + rename desired_state filter to desired-state + + For consistency with other filters (such as + "is-official"), this renames the desired_state + filter to "desired-state". + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit d761719eb4e45fbd6f092f6d0b4eb42206e298f6) + Signed-off-by: Tibor Vass + +commit 76aed241923bfcf5b287bd1371c12d896157d146 +Author: Vincent Demeester +Date: Fri Jul 1 15:19:28 2016 +0200 + + Improve systemd service unit in *Automatically start containers* + + Signed-off-by: Vincent Demeester + (cherry picked from commit 48744e03e951c7ab4be180fbf6c1f56108512efa) + Signed-off-by: Tibor Vass + +commit 6387822594b3eef73595510111c92bb66de63e48 +Author: Nicola Kabar +Date: Wed Jun 29 18:11:41 2016 -0700 + + [Docs] clarified local volume driver docs + + Signed-off-by: Nico + (cherry picked from commit 841f9859944250585b2adf2c9bf2ad5332ccc0bd) + Signed-off-by: Tibor Vass + +commit f1d6c3a0f91c49ad59294550e3219de4307be732 +Author: Joao Fernandes +Date: Fri Jul 8 13:33:18 2016 -0700 + + Improves docs for backup and restore procedure + + * Fixes #2418 + * Fixes #1894 + +commit 9e94f55df1bee8a338dc70924f19ac57f1bb6b2e +Merge: 762a4d5e5a a17cbc2304 +Author: Alexandre Beslic +Date: Fri Jul 8 14:15:56 2016 -0700 + + Merge pull request #2403 from dongluochen/readme_update + + Clarify Docker Swarm and Swarmkit projects + +commit a17cbc2304811bef724f0bb247eb7a783687e6df +Author: Dong Chen +Date: Fri Jul 8 11:48:35 2016 -0700 + + Clarify Docker Swarm and Swarmkit projects. + + Signed-off-by: Dong Chen + +commit 38470dd381420b351420981da2ae9b31b0b43dcd +Merge: ece9cfa6c2 917fbdf9b7 +Author: French Ben +Date: Fri Jul 8 15:48:43 2016 -0400 + + Merge pull request #1813 from docker/bump-modem + + Updated dockerode to the latest + +commit 762a4d5e5ae8ac5ca2c7c99374d004bc10803765 +Merge: 6302424ff6 7b7937cef1 +Author: Alexandre Beslic +Date: Fri Jul 8 10:29:50 2016 -0700 + + Merge pull request #2317 from allencloud/consider-different-systime + + consider systime's difference between swarm and engine + +commit 770d1986199997d49a1aba1ad480b8157b7b92fd +Merge: eeb35dd5e4 af44041f28 +Author: Nathan LeClaire +Date: Fri Jul 8 10:11:22 2016 -0700 + + Merge pull request #3575 from ahmetalpbalkan/azure-atomic-write + + azure: another cross-fs tempfile moving fix + +commit af44041f28a8fa066b3d9d5b8f1fc69d0cfa5722 +Author: Ahmet Alp Balkan +Date: Fri Jul 8 10:02:46 2016 -0700 + + azure: another cross-fs tempfile moving fix + + Actually fixes #3313. + + Signed-off-by: Ahmet Alp Balkan + +commit 917fbdf9b72f0efb328cd6b322e1e3e5d536c1b3 +Author: French Ben +Date: Thu Jul 7 19:38:34 2016 -0400 + + Updated dockerode to the latest + + Signed-off-by: French Ben + +commit 5b3fd263ecaeb0ceb68fe6ba29f82e56a0ea39ed +Merge: 27f4e5d9f6 af024509dc +Author: Joao Fernandes +Date: Thu Jul 7 16:32:53 2016 -0700 + + Merge pull request #2475 from joaofnfernandes/cse-docs + + Removes CS engine docs + +commit af024509dc02a79e71bc7468fe8e50c17af6cab0 +Author: Joao Fernandes +Date: Thu Jul 7 16:25:30 2016 -0700 + + Removes CS engine docs + + CS engine docs were migrated to the `cs-docker` repo on + docker/cs-docker#28 + +commit 27f4e5d9f68d110e5114ade94be0adb8e20ba884 +Author: Joao Fernandes +Date: Thu Jul 7 16:19:07 2016 -0700 + + Updates url for offline install docs + +commit e1e10e0ea635dcc3b5e60dddea0ebe70f9af5201 +Merge: 07178773d0 0eadddf6e9 +Author: Sebastiaan van Stijn +Date: Thu Jul 7 13:57:48 2016 -0700 + + Merge pull request #81 from sfsmithcha/redirect_contributing_to_oss + + add alias. redirect /contributing/contributing to opensource/code + +commit f54cec76b450c5ce46e83d03631c74278318cfb7 +Author: Joao Fernandes +Date: Wed Jul 6 17:25:05 2016 -0700 + + Adds release notes for 2.0.2 + +commit 0eadddf6e991efb3db5267bde52c36a3eaf67ac5 +Author: Charles Smith +Date: Thu Jul 7 11:41:55 2016 -0700 + + add alias. redirect /contributing/contributing to opensource/code + + Signed-off-by: Charles Smith + +commit eeb35dd5e4c0cfec6a1f6e1c83be2a85c585f10e +Merge: 34ea48e7dc f171370343 +Author: Nathan LeClaire +Date: Thu Jul 7 09:49:32 2016 -0700 + + Merge pull request #3573 from aculich/patch-1 + + remove LTS from Ubuntu 15.10 in aws driver docs + +commit 07178773d0166943061fa40d1a0bad722fad4eac +Merge: 8fec3cf532 f7ce690c72 +Author: Sebastiaan van Stijn +Date: Thu Jul 7 01:08:59 2016 -0700 + + Merge pull request #79 from levlaz/fix_typo + + Fix Typo + +commit f7ce690c725f56a468f9ccb6d6ac3d38b2fd5836 +Author: Lev Lazinskiy +Date: Thu Jul 7 07:56:41 2016 +0000 + + Fix Typo + + Signed-off-by: Lev Lazinskiy + +commit d1694cbab00eafb38c62e94b16028647f2b42e7a +Author: xianlubird +Date: Mon Apr 25 20:53:13 2016 +0800 + + fix issue #2162 add removeDuplicateContainers behaviour for every node when it's added. + + Signed-off-by: Xianlu + +commit 7b7937cef16ee41a5c8b357a3791af37eff5aabb +Author: allencloud +Date: Wed Jun 1 19:36:03 2016 +0800 + + consider system's difference between swarm and engine + + Signed-off-by: allencloud + +commit 6302424ff6969119225f88e82d638beb784c4e9b +Merge: b9de046b4f c1100ab3a2 +Author: Dongluo Chen +Date: Wed Jul 6 21:41:05 2016 -0700 + + Merge pull request #2202 from allencloud/change-the-way-of-producing-engine-label + + change the way of producing engine label + +commit e361f64180f42fcc480abbf1987e4d707620b7f6 +Author: xianlubird +Date: Wed Jul 6 16:33:23 2016 +0800 + + Remove refresh network when creating container + + Signed-off-by: Xianlu + +commit c1100ab3a2b37702554b6cce3447590ff6464e2f +Author: Sun Hongliang +Date: Tue May 3 18:38:28 2016 +0800 + + change the way of producing engine label + + Signed-off-by: allencloud + +commit 7f54850b4a9a70e489e57e949cb78ce9d574cb95 +Merge: 0de9a1b388 c72c966abc +Author: Aanand Prasad +Date: Wed Jul 6 19:11:03 2016 -0700 + + Merge pull request #3698 from docker/bump-1.8.0-rc2 + + Bump 1.8.0 rc2 + +commit b9de046b4f5a54a8c2a4868bfd786f93dbf558ac +Merge: e7b8b4c6eb baa3ca60d8 +Author: Dongluo Chen +Date: Wed Jul 6 18:36:49 2016 -0700 + + Merge pull request #2300 from allencloud/remove-unnecessary-err-check + + remove unnecessary err check and make check better + +commit c72c966abcebf15496af8ef29c8143967089aee3 +Author: Aanand Prasad +Date: Wed Jul 6 16:08:07 2016 -0700 + + Bump 1.8.0-rc2 + + Signed-off-by: Aanand Prasad + +commit 801167d2710f35b73985e1ebbbab9b47c681c9b6 +Author: Aanand Prasad +Date: Wed Jul 6 18:01:27 2016 -0700 + + Pin base image to alpine:3.4 in Dockerfile.run + + Signed-off-by: Aanand Prasad + +commit 408e4719e1c26258165f2e9f69552a017eef8131 +Author: Daniel Nephin +Date: Wed Jun 29 10:25:47 2016 -0400 + + Update requirements.txt + + Signed-off-by: Daniel Nephin + +commit dbf40d82442892feb0e94ce54fd94e513d2a57dd +Author: Jonathan Giannuzzi +Date: Mon Jun 20 14:48:45 2016 +0200 + + Fix assertion that was always true + + Signed-off-by: Jonathan Giannuzzi + +commit 6021237a698934b5807dd6554f002bd46364daab +Author: Victoria Bialas +Date: Tue Jun 14 12:24:30 2016 -0700 + + fixes broken links in 3 Compose docs files due to topic re-org in PR#23492 + + Signed-off-by: Victoria Bialas + +commit e4159cfd42727d77f7ca2c90cb4ea494b233e980 +Author: Aanand Prasad +Date: Wed Jul 6 09:56:25 2016 -0700 + + Fix alias tests on 1.11 + + The fix in 8e0458205241f654bb1d75de9babd9880afa7206 caused a regression + when testing against 1.11. + + Signed-off-by: Aanand Prasad + +commit d8ec9c1572115f95ee5d3446c0c605b27c95790f +Author: Daniel Nephin +Date: Thu Jun 30 18:40:39 2016 -0400 + + Upgrade pip on osx + + Signed-off-by: Daniel Nephin + +commit 244b3036252e1b25cb37386532c1c75130cc0ed9 +Author: Aanand Prasad +Date: Thu Jun 30 16:26:12 2016 -0700 + + Fix test: check container's Env array instead of the output of 'env' + + Signed-off-by: Aanand Prasad + +commit 217f762a60b0e43b831f23c80d57379456814ed0 +Author: Aanand Prasad +Date: Thu Jun 30 15:18:05 2016 -0700 + + Post-merge fix - restore Environment import in main.py + + Signed-off-by: Aanand Prasad + +commit 70da16103aaf4753494cc380f4e5d73910772ddb +Author: Joffrey F +Date: Fri Apr 22 14:45:51 2016 -0700 + + Unset env vars behavior in 'run' mirroring engine + + Unset env vars passed to `run` via command line options take the + value of the system's var with the same name. + + Signed-off-by: Joffrey F + +commit 6b71645ed7ab4159ccfbb4d64f18de88a50b9db0 +Author: Aanand Prasad +Date: Mon Jun 27 16:21:19 2016 -0700 + + Fix tests to accommodate short-id container alias + + Signed-off-by: Aanand Prasad + +commit 05bf9a054ad629b5afe6b215c00c0151b3f2259b +Author: Ke Xu +Date: Mon Jun 27 18:00:52 2016 +0900 + + add zsh completion for push + + Signed-off-by: Ke Xu + +commit 6e3d82eea6cfae1d48d196c7f8360485e3a0c76f +Author: Ke Xu +Date: Wed Jun 29 11:01:50 2016 +0900 + + change dsb to dab + + Signed-off-by: Ke Xu + +commit 21d114b879314a29d199536dca2e4ac52587c045 +Author: Ke Xu +Date: Mon Jun 27 17:48:14 2016 +0900 + + add zsh completion support for bundle + + Signed-off-by: Ke Xu + +commit 72849d99c0015c9c5f70e11e568df70a21211d7c +Author: Aanand Prasad +Date: Wed Jun 22 14:53:45 2016 -0700 + + Update bundle extension + + It's now .dab, for Distributed Application Bundle + + Signed-off-by: Aanand Prasad + +commit 85e3ad2655c6ba4cd8ab0a5d7276a5a6beac3201 +Author: Harald Albers +Date: Wed Jun 22 17:19:20 2016 +0200 + + bash completion for `docker-compose push` + + Signed-off-by: Harald Albers + +commit a3e30c3eedf93978781d8c560e0d6ed534fd904d +Author: Harald Albers +Date: Wed Jun 22 17:04:22 2016 +0200 + + bash completion for `docker-compose bundle` + + Signed-off-by: Harald Albers + +commit 6fd77fa698c97f17b6eb14677207fdeee011dc5e +Author: Joffrey F +Date: Thu Jun 16 15:10:56 2016 -0700 + + Update docker-py version in requirements + + Signed-off-by: Joffrey F + +commit a7fc3e222012a926b0f7bb94fc96d1109266fe6d +Author: Daniel Nephin +Date: Thu Jun 16 15:15:17 2016 -0400 + + Add an acceptance test for bundle. + + Signed-off-by: Daniel Nephin + +commit db02c9f5372855a406227ccbc396237724a753bd +Author: Daniel Nephin +Date: Tue Jun 14 16:55:48 2016 -0400 + + Add some unit tests for new bundle and push commands. + + Signed-off-by: Daniel Nephin + +commit 33cc601176addaedf44d8f3bafd576f38bd6312e +Author: Aanand Prasad +Date: Tue Jun 14 16:03:56 2016 -0700 + + Warn on missing digests, don't push/pull by default + + Add a --fetch-digests flag to automatically push/pull + + Signed-off-by: Aanand Prasad + +commit 44e82edc5f11d02c9207b184d2748b5b4734c06f +Author: Aanand Prasad +Date: Wed Jun 29 11:08:08 2016 -0700 + + Merge pull request #3221 from aeriksson/fix-zsh-autocomplete + + Fix zsh autocomplete + (cherry picked from commit c0237a487b31e1d3e4b67fb180bd7db219e5d858) + + Signed-off-by: Aanand Prasad + +commit 53341b82f9619de39e1640930911679c48023e94 +Merge: 9bf6bc6dbd 0de9a1b388 +Author: Aanand Prasad +Date: Wed Jul 6 16:05:34 2016 -0700 + + Merge remote-tracking branch 'release/release' into bump-1.8.0-rc2 + +commit d6f4f9841ccdd31a61b7f9e01e44a3701857215b +Author: Nathan LeClaire +Date: Wed Jul 6 14:29:29 2016 -0700 + + Bump to Toolbox 1.12.0-rc3 + + Signed-off-by: Nathan LeClaire + +commit f17137034355d6d8862ef7aeba6de8daa3a30175 +Author: Aaron Culich +Date: Tue Jul 5 22:37:15 2016 -0700 + + remove LTS from Ubuntu 15.10 in aws driver docs + + The 14.04.x and 16.04 [release](https://wiki.ubuntu.com/Releases) are LTS., but Ubuntu 15.10 is not an LTS release, so I'd suggest removing that designation from the docs. + + Signed-off-by: Aaron Culich + +commit 34ea48e7dc62587ca1c1d24e86b7ae69358a2e5c +Merge: 7712452207 e29c77bff3 +Author: Nathan LeClaire +Date: Tue Jul 5 16:39:16 2016 -0700 + + Merge pull request #3564 from cdrage/add-variantid-to-osrelease + + Add VARIANT and VARIANT_ID to os-release + +commit 7712452207c6e85ff619ab2f6f1b84fbcd525ebb +Merge: 338744a639 0ca33d886c +Author: Nathan LeClaire +Date: Tue Jul 5 16:35:08 2016 -0700 + + Merge pull request #3546 from leonhartX/master + + add swarm-join-opt support + +commit 338744a639955e8e65e36e4e0dd4100b64b896a9 +Merge: 42a08deba5 c0b721b5f9 +Author: Nathan LeClaire +Date: Tue Jul 5 16:23:35 2016 -0700 + + Merge pull request #3571 from nathanleclaire/disable_nonswarm_ext_attribute_client_for_server_cert + + Disable extended key usage as a client for non-Swarm-master server certs + +commit c0b721b5f9d8ffcbcc1df15e20ba1fdb756c58f7 +Author: Nathan LeClaire +Date: Fri Jun 24 10:52:24 2016 -0700 + + Disable extended key usage as a client for non-Swarm-master server certs + + Signed-off-by: Nathan LeClaire + +commit e7b8b4c6eb6ae0accd7b1a10bc0e204c419bf360 +Merge: 2700d0b75c c5e1bca7dc +Author: Nishant Totla +Date: Tue Jul 5 10:17:21 2016 -0700 + + Merge pull request #2375 from NanXiao/error-handle-in-postContainersCreate + + Check r.ParseForm() error in postContainersCreate(). + +commit 2700d0b75c78972f35ae2c9ded9f185913998b64 +Merge: eb391fbff2 9b156d1230 +Author: Alexandre Beslic +Date: Tue Jul 5 10:15:17 2016 -0700 + + Merge pull request #2385 from clhlc/master + + fix Switch the primary docs + +commit 84aa074d18d2f75f54564f21c2b5c0d1bcddd23f +Merge: da6da096b8 777c387f1e +Author: Vincent Demeester +Date: Tue Jul 5 11:27:42 2016 +0200 + + Merge pull request #24325 from Anvil/plugins_volume.md-unqiue + + Fixed typo: s/unqiue/unique/g + +commit 777c387f1e1072ad37737493a0e4663326fdd1fd +Author: Damien Nadé +Date: Tue Jul 5 11:16:24 2016 +0200 + + Fixed typo: s/unqiue/unique/g + + Signed-off-by: Damien Nadé + +commit baa3ca60d8b72ec7ab8e5a01d9b5679af78106c8 +Author: allencloud +Date: Sun May 29 13:39:46 2016 +0800 + + remove unnecessary err check and make some check better + + Signed-off-by: allencloud + +commit e29c77bff38de15f00d5c7d1ad5a3fc30f9840db +Author: Charlie Drage +Date: Mon Jul 4 17:24:32 2016 -0400 + + Add VARIANT and VARIANT_ID to os-release + + In order to provision different variant types such as embedded and + server releases, it's required to grep the VARIANT and VARIANT_ID + variables of os-release. + + Specifically from this commit: + https://pagure.io/fork/sgallagh/fedora-release/c/56267336c738f80e3e7a344c740b5d02730c76c6 + + Which adds the VARIANT_ID="atomic.host" in order to differentiate + between Fedora Server and container-centric Atomic Host releases. + + This commit adds the accessability of VARIANT and VARIANT_ID in order + for Docker Machine to successfully provision different variants of Fedora + releases. + + Signed-off-by: Charlie Drage + +commit 8fec3cf53210992f2cd851aac00a5fc134743ee1 +Merge: e793ae929b 1632f44ae8 +Author: Sebastiaan van Stijn +Date: Sat Jul 2 00:25:55 2016 -0700 + + Merge pull request #78 from ShevYan/change-binary-path + + change the binary path in guide + +commit e793ae929bd7987201fa8c2d72121905a8dfa735 +Merge: d11bfda738 9e64de086b +Author: Sebastiaan van Stijn +Date: Sat Jul 2 00:24:13 2016 -0700 + + Merge pull request #77 from ah3rz/patch-1 + + fix typo 'software' + +commit 91e29e815d18420e4251a8d6b70e5e9c1a5bd3c2 +Author: Tibor Vass +Date: Fri Jul 1 16:56:08 2016 -0700 + + Bump VERSION to v1.12.0-rc3 + + Signed-off-by: Tibor Vass + +commit da6da096b84ee6d2806a2516c5b700a9e5dd1008 +Merge: ac499dc4bb 0500446b36 +Author: Tibor Vass +Date: Fri Jul 1 16:52:57 2016 -0700 + + Merge pull request #24247 from tiborvass/fix-rpm-for-fedora24 + + fix F24 rpm build + +commit 0500446b3663d67ddca1de8c92c543f90c647cfb +Author: Antonio Murdaca +Date: Fri Jul 1 23:28:19 2016 +0200 + + fix F24 rpm build + + error: line 89: Invalid version (epoch must be unsigned integer): + %{epoch}:1.12.0-0.3.rc3.fc24: Requires(pre): docker-engine-selinux >= + %%{epoch}:1.12.0-0.3.rc3.fc24 + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 0c07e55e4c867ee034c72c7ff8a9b8d63a8ec17d) + +commit eb391fbff274d5c9fed80315061fb1519e9b732c +Merge: 519eabaca1 666792ebf7 +Author: Alexandre Beslic +Date: Fri Jul 1 15:55:37 2016 -0700 + + Merge pull request #2387 from sfsmithcha/update_readme_disambiguate_swarm + + include descriptions/links for various swarm projects + +commit 519eabaca1e3c955ba0cca3bcfa83125b7c53e9f +Merge: da0cb171cb 3f2946107d +Author: Alexandre Beslic +Date: Fri Jul 1 15:08:32 2016 -0700 + + Merge pull request #2255 from allencloud/refresh_single_network_when_event_emitted + + Refresh single network when network event emitted + +commit ac499dc4bb94681382a106b887923806d83cd6fa +Merge: 39bc769113 5199e3960e +Author: Tibor Vass +Date: Fri Jul 1 13:30:13 2016 -0700 + + Merge pull request #24231 from tiborvass/cherry-pick-containerd-race-fix + + Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee + +commit 5199e3960ece00a13f888ceefb794aa59f2d15bc +Author: Kenfe-Mickael Laventure +Date: Fri Jul 1 11:45:19 2016 -0700 + + Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d) + +commit 666792ebf7e950888ad6637294d601740667de35 +Author: Charles Smith +Date: Wed Jun 29 15:53:58 2016 -0700 + + include descriptions/links for various swarm projects + + Signed-off-by: Charles Smith + +commit 4e17ab5d319ac5b70b2769442947567a83386fbc +Merge: b49f8ed894 e015cbadd6 +Author: Derek McGowan +Date: Fri Jul 1 10:59:50 2016 -0700 + + Merge pull request #1817 from cezarsa/master + + Avoid formatting errors with %#v + +commit e015cbadd6b93e12b58f84b6f1c3640995bce034 +Author: Cezar Sa Espinola +Date: Fri Jul 1 10:59:32 2016 -0300 + + registry: avoid formatting errors with %#v + + Signed-off-by: Cezar Sa Espinola + +commit 39bc769113d3b7c0ed768f00b765d1ebbfe18316 +Merge: 906eacd586 8a18eac752 +Author: Tibor Vass +Date: Fri Jul 1 03:59:35 2016 -0700 + + Merge pull request #23724 from tiborvass/cherry-picks-for-1.12.0-rc3 + + [WIP] Cherry picks for 1.12.0 rc3 + +commit 8a18eac752927c96f449d9226672e1db608f51bc +Author: Aaron Lehmann +Date: Thu Jun 30 16:07:25 2016 -0700 + + Add documentation for external CA features in API/CLI + + Signed-off-by: Aaron Lehmann + (cherry picked from commit fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4) + +commit f9f7abfffe3931a3be20587cf1d45cf57177a8d3 +Author: Tonis Tiigi +Date: Thu Jun 30 14:39:39 2016 -0700 + + Add support for external CAs + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 11085b2260a78b3248f3e98e0a1e3203431fae22) + +commit 4905c858db6812a9480e7d8545ae3635b3e44124 +Author: Tonis Tiigi +Date: Thu Jun 30 14:04:02 2016 -0700 + + Update to new swarmkit/engine-api + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 9b652738363d92fbe6e43b3981cdcc94bdb72c76) + +commit 7d835ed934e573a5104adfc08588c6580499cb2a +Author: Tonis Tiigi +Date: Thu Jun 30 13:34:48 2016 -0700 + + Vendor updated swarmkit, libnetwork, engine-api + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 54255f53d8575d50aec4d58869240e01c41dad1b) + +commit ae47b00c6cb4eb9ab92c922c0e8b2cd7f2775a2c +Author: Nishant Totla +Date: Wed Jun 29 17:08:00 2016 -0700 + + Adding a flag to specify sending of registry auth + + Signed-off-by: Nishant Totla + (cherry picked from commit 538bac39d7fe93562922b89e9a294096be48fb59) + +commit d199f78d180b55febede2357b06b66580e3360c6 +Author: Nishant Totla +Date: Thu Jun 16 19:09:44 2016 -0700 + + Updating header name and executor + + Signed-off-by: Nishant Totla + (cherry picked from commit af5df117a805c8df661c7efa58c57680019b5752) + +commit 25c6d432acdd46276c318ea54bdef4fbd36a1341 +Author: Nishant Totla +Date: Thu Jun 16 15:57:08 2016 -0700 + + Update engine-api vendored version + + Signed-off-by: Nishant Totla + (cherry picked from commit e13a14340dde563fa799fb95090940c74636e398) + +commit c5ddd5bb7fe1a615e1ec7b22529657572c6f211a +Author: Nishant Totla +Date: Wed Jun 15 11:50:49 2016 -0700 + + Passing registry auth token for service create and update + + Signed-off-by: Nishant Totla + (cherry picked from commit 93ec5cda55e78dbb683b59bde244a7984b323574) + +commit 88cb79d40010d95cdbd69bb069b4726611831b27 +Author: Tonis Tiigi +Date: Mon Jun 27 12:46:15 2016 -0700 + + Fix duplicate layers in exported tar + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 41bf7de73be5d35f40aca9eb68064aa3e8bb9a54) + +commit 72a4697cdac6cca4ee5243567f2d5583eb424662 +Author: Wen Cheng Ma +Date: Thu Jun 30 17:22:42 2016 +0800 + + Fix docker stack link + + Signed-off-by: Wen Cheng Ma + (cherry picked from commit 93ed4b35fa6b35a24a79e3e4f9cfaea29982e7a4) + +commit 17939a3159db43717135510dec74dfa98bf90314 +Author: Keith Hudgins +Date: Thu Jun 30 14:07:03 2016 -0400 + + Added HPE volume plugin listing + + Signed-off-by: Keith Hudgins + (cherry picked from commit 87ef5b425472c442c9b79e018ee05b0724fdca8f) + +commit ddae91f21a5bc51c7f21af26cc0d06e7fb88b16a +Author: John Howard +Date: Tue Jun 28 13:04:42 2016 -0700 + + Windows: Skip RunCidFileCleanupIfEmpty on RS1 + + Signed-off-by: John Howard + (cherry picked from commit 20424fccdd1ba874277eca7d9644b1ef98ac4b2e) + +commit 9185a0a681a73072a3ef440eb779e140402c2d20 +Author: John Howard +Date: Tue Jun 28 12:22:16 2016 -0700 + + Windows: Skip TestBuildEmptyCmd on RS1 + + Signed-off-by: John Howard + (cherry picked from commit 45da1274421ba7484dcf2bf1a398f9e3683600d1) + +commit 6234af6680c4a54acd27bc510d0d3bfd32e1c0e1 +Author: Derek McGowan +Date: Wed Jun 29 13:09:13 2016 -0700 + + Set permission on atomic file write + + Perform chmod before rename with the atomic file writer. + Ensure writeErr is set on short write and file is removed on write error. + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 1cd74902810b0eefddd173239cd95b506b34e678) + +commit 1632f44ae8567e3536fda6e0caa2b1da7ef9d094 +Author: Shev Yan +Date: Fri Jul 1 12:41:09 2016 +0800 + + The binaries are no longer in bundles/1.12.0-dev/binary, instead, they are in bundles/1.12.0-dev/binary-client and bundles/1.12.0-dev/binary-daemon. + + Signed-off-by: Shev Yan + +commit 3f2946107d697feeddb55b40951cf2f8c1e36c55 +Author: allencloud +Date: Fri May 20 17:46:12 2016 +0800 + + in network event, just refresh the single network to improve performance + + Signed-off-by: allencloud + +commit 42a08deba5849e51158f48313666428a658553e4 +Merge: 5f6bc6fa72 cd95232ac7 +Author: Nathan LeClaire +Date: Thu Jun 30 17:48:40 2016 -0700 + + Merge pull request #3560 from s-koba/3559-fix-crash_report + + Remove "open : no such file or directory" message during crash report + +commit 1e30b67b4db801518089cd505f45d336e0b5ccb3 +Author: Vincent Demeester +Date: Wed Jun 29 17:40:34 2016 +0200 + + Fix --filter=desired_state behaviour + + Just like `docker service tasks`, we should add `desired_state` filters + only in case there is no provided filters. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 3c194bd2a4fb4693deba366b3400c2efeeb90369) + +commit 06cbb86a2945cdca6e8314eba212f8c6a2e322ad +Author: Stefan Scherer +Date: Wed Jun 29 08:10:10 2016 +0200 + + Revert tasksmax workaround to avoid unsupported bins + + Signed-off-by: Stefan Scherer + (cherry picked from commit 6509cc4e63f50661f6563f45153b23599cc6665c) + +commit 4d4848ab68ce2389c82e73e480bc3e31f6bc3bf1 +Author: Akihiro Suda +Date: Wed Jun 29 01:55:45 2016 +0000 + + zfs: call mount.MakePrivate + + Fix #24008 + + Signed-off-by: Akihiro Suda + (cherry picked from commit 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7) + +commit acc31b4448a6aa439ec36062a560670e6ebc3df3 +Author: allencloud +Date: Wed Jun 29 17:26:42 2016 +0800 + + fix comments and handle err + + Signed-off-by: allencloud + (cherry picked from commit cc054f3195308da471c252d755dacfe446cb1066) + +commit b34706b152c02355cc80aa3b0871ed4a4f6036bc +Author: Yong Tang +Date: Wed Jun 29 19:48:53 2016 -0700 + + Use HOSTNAME in the output of `docker node ls` + + This fix tries to address an issue raised in #24090 where + the title field of `docker node ls` use NAME instead of + HOSTNAME. Yet the content of this field is actually + hostname. + + The fix makes needed changes for the output of + `docker node ls`. + + An additional test has been added to cover the change in + this fix. + + This fix fixes #24090. + + Signed-off-by: Yong Tang + (cherry picked from commit 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc) + +commit b375ccfee7d5365dfc1fb3ea3bee700695062058 +Author: Antonio Murdaca +Date: Thu Jun 30 15:17:37 2016 +0200 + + fix warn message typos + + Signed-off-by: Antonio Murdaca + (cherry picked from commit a4143e6756d697323d560396dff6b90168a1e56c) + +commit 49981f83279678e3ccc4534af1e71ba985c3f51d +Author: allencloud +Date: Thu Jun 30 20:13:28 2016 +0800 + + make cmd short short consistency and change docs + + Signed-off-by: allencloud + (cherry picked from commit 184afb92bf0bda1f47b5e1812ee1134328e272e2) + +commit 90c272a4f20d60e795c0dfb950692093daebc97e +Author: Alexander Morozov +Date: Mon Jun 27 14:14:17 2016 -0700 + + daemon/logger: fix races in channel close + + it's actually not okay to do such trick from multiple goroutines + + Signed-off-by: Alexander Morozov + (cherry picked from commit 378f0657f963fa6c854643571e4fe83628466c01) + +commit bb09b3e5f15add342e3695a8cc94ef36ac82142b +Author: Lei Jitang +Date: Thu Jun 30 14:57:46 2016 +0800 + + Remove dm.no_warn_on_loop_devices in info warning + + I think we doesn't provide dm.no_warn_on_loop_devices option + at all. I didn't found any code to handle this option. + + Signed-off-by: Lei Jitang + (cherry picked from commit 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7) + +commit 3657275ca0d9f138bd4e23af5d1e5215775e20c1 +Author: Madhu Venugopal +Date: Wed Jun 29 14:59:22 2016 -0700 + + Added missing flags for swarm-mode networks + + Signed-off-by: Madhu Venugopal + (cherry picked from commit cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc) + +commit 99cfbbc2872ab66a522a9ef86254bfef90ce7603 +Author: Sebastiaan van Stijn +Date: Wed Jun 29 13:30:09 2016 -0700 + + docs: add note that we no longer send container-id for exec + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f) + +commit 0d061f680a33640305f9281433075d9cbe0a99ca +Author: Daniel Nephin +Date: Wed Jun 29 15:14:55 2016 -0400 + + Fix mount opts error message. + + Signed-off-by: Daniel Nephin + (cherry picked from commit c8659d3cc501449a69a7e0b79994b42799750f29) + +commit f4929786387f795f31488f41f0038a1524947770 +Author: Tonis Tiigi +Date: Mon Jun 20 16:36:13 2016 -0700 + + Add test for force-new-cluster + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 1acb8ef82572c52994b1ff00fe5c86aac53be4b8) + +commit 1f4e2f33ef49da45575c8d4d0a1ee0aeb0571d41 +Author: Tonis Tiigi +Date: Mon Jun 20 16:35:33 2016 -0700 + + Fix race on clearing swarm nodes on stop + + On stop there were multiple places that marked + `cluster.node` nil. Now stop waits for the node to + set itself nil. + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 1a8a473017299c5e999d55d14634874826062fce) + +commit 7b70250d07e069986b4a429e081d830f5a4274cb +Author: Tonis Tiigi +Date: Sun Jun 19 19:00:45 2016 -0700 + + Switch node management tests to api types + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 22b34d64496c9b6ebae5e2b4a98ecd9a172cc557) + +commit cd0ffa9359439db53036baffce0ae38543c9ad32 +Author: Daniel Nephin +Date: Wed Jun 29 12:38:23 2016 -0400 + + Fix service update of Args + + add a unit test + + Signed-off-by: Daniel Nephin + (cherry picked from commit 07b59ef210490df19f65da950d7d41176d104a31) + +commit ea03b75b205ace16d5141aa61987fda00806e7de +Author: Vincent Demeester +Date: Wed Jun 29 00:06:44 2016 +0200 + + Return an empty network list if nothing matches filter + + Initializing the network list struct in order to return an empty list + instead of a nil object. + + Signed-off-by: Vincent Demeester + (cherry picked from commit a7043ac5c423cf68d4f92024e694887099640d91) + +commit d83a27471b2ae136b1b74e680f1660baa34eb286 +Author: Adam Kunk +Date: Tue Jun 28 15:33:26 2016 -0400 + + updates to fix install script for RHEL + + fixing install script for rhel7 + + fixing install script for rhel7 + + Signed-off-by: Adam Kunk + + updates to fix install script for RHEL + + fixing install script for rhel7 + + fixing install script for rhel7 + + Signed-off-by: Adam Kunk + (cherry picked from commit 485c27e18680f5eaeefe5de7f7916ba23f66c8f0) + +commit 5c04eab617aa7c9c48e97ece45333c6cdf27d3cc +Author: Vincent Demeester +Date: Wed Jun 29 11:27:22 2016 +0200 + + Fixes /swarm/join endpoint documentation + + The JSON payload given in the API documentation is wrong, fixing it. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 97c9491b0d395dc923e8b4e335839662c17aff46) + +commit 9ce196dc3c47e7363541d61959279c425c26e3ce +Author: Wonjun Kim +Date: Wed Jun 29 06:20:52 2016 +0900 + + Add integration tests for swarm incompatible + + Signed-off-by: Wonjun Kim + (cherry picked from commit d71789828f5c8d2e0f5757f1c003325c4b8a871d) + +commit bd572fcd8fbfc03bca1e0f7c980a9c2f19c8fe13 +Author: Wonjun Kim +Date: Wed Jun 29 02:23:35 2016 +0900 + + Fix check code for --cluster-store and --cluster-advertise in config_unix.go + + Signed-off-by: Wonjun Kim + (cherry picked from commit 4f671ae85e62d0b413f913b1289100ae7cc45972) + +commit 712cbdbe1f3b3ac733ecf0e27e51f340d0264c1f +Author: Anton Tiurin +Date: Wed Jun 29 19:03:49 2016 +0300 + + Remove extra comma in Image Pull API examples + + Signed-off-by: Anton Tiurin + (cherry picked from commit 307c39c187f8785d8edae4bfd460e2dd0432626a) + +commit 44766978671aec3ecd62765d2c508e33a6e1dc30 +Author: Harald Albers +Date: Wed Jun 29 07:16:31 2016 -0700 + + add documentation for desired_state filter + + Signed-off-by: Harald Albers + (cherry picked from commit 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234) + +commit 43186c4304c8f35d3d3f0b579bdd9bd8df987374 +Author: Anusha Ragunathan +Date: Mon Jun 27 20:32:03 2016 -0700 + + Fix daemon tests. + + Fix two test issues: + - pidof is not available in PATH on some Jenkins systems (rhel, centos) + Use kill -0 instead. + - Cleanup after plugin test. This is a stop gap fix. The right way to + fix this, is to shutdown the plugin on daemon shutdown path (except + for the live-restore case). This will be done in a follow up PR. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 6d36431e2395867d7bb101dbfd4340e132fd5438) + +commit 79b488d5c4bb5d1c76de213e8f65bc1b3559825d +Author: Charles Smith +Date: Tue Jun 28 19:46:39 2016 -0700 + + remove margin from bottom of swarm mode docs + + Signed-off-by: Charles Smith + (cherry picked from commit 0d6f59e85a2728008aad154d366cc8c92888e871) + +commit 07bd7b0128b33003cbdf6ea49ed540f5224464b7 +Author: Derek McGowan +Date: Tue Jun 28 13:23:00 2016 -0700 + + overlay2: close read end of pipe on mount exec + + Use StdinPipe to ensure pipe is properly closed after startup + + Fixes #23686 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit ad4b3e11fe41080d66ac1780b455246ae18bdc35) + +commit 0f1439a065e9d5a91f7078d0fb78aa4c42bd1579 +Author: Brian Goff +Date: Tue Jun 28 13:42:38 2016 -0400 + + Add ip_vs to check-config script + + Signed-off-by: Brian Goff + (cherry picked from commit 9e14002cedd21d6eedd86ea2a536f1137f88921d) + +commit cab4e108c84f30f5e6284f42f71ebc8666da6354 +Author: Akihiro Suda +Date: Tue Jun 28 06:10:54 2016 +0000 + + update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS + + Signed-off-by: Akihiro Suda + (cherry picked from commit ddf9b6f6666d501bc408bdf8cdc4feb10db287ed) + +commit a55b4462d48727d889937cd2b99d4e9a50cc40bd +Author: danf +Date: Tue Jun 28 11:09:39 2016 +0300 + + Fix Malformed history layer - missing Sprintf in append of shell in Builder run config + + Signed-off-by: Dan Feldman + (cherry picked from commit 29b6a696604d5bc80d1722e3ba123558bce7c7c9) + +commit 246d503dea4a4149899978d5f4d1037f05af9f50 +Author: Victoria Bialas +Date: Mon Jun 27 18:58:16 2016 -0700 + + added another alias for getting started stuff + + Signed-off-by: Victoria Bialas + (cherry picked from commit 4060eb02ef84a0faef4407bf9796db1a2afc42f5) + +commit 795390b033b9770db162e3c5453ece76d6c74de6 +Author: Michael Crosby +Date: Wed Jun 1 17:29:06 2016 -0700 + + Change root_maxkeys + + Most modern distros have the limit for the maximum root keys at 1000000 + but some do not. Because we are creating a new key for each container + we need to bump this up as the older distros are having this limit at + 200. + + Using 1000000 as the limit because that is that most distros are setting + this to now. If someone has this value configured over that we do not + change it. + + Signed-off-by: Michael Crosby + (cherry picked from commit ca3e4545aa7d0da3a36fef41d85d02e9f2c4d15d) + +commit 4dc392b2131e66c7019b505ac76e094364411d2f +Author: Michael Crosby +Date: Mon Jun 27 11:45:05 2016 -0700 + + Update containerd to b93a33be39bc4ef0fb00bfcb79147 + + This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 + fixing the start sync issues. + + Signed-off-by: Michael Crosby + (cherry picked from commit 7db7e046315eed5ccfb3a913b965be4b1a595601) + +commit 8ac21ed2d48cd27cfa009222db511c7955c6c7a0 +Author: Anusha Ragunathan +Date: Fri Jun 17 08:21:03 2016 -0700 + + Add plugin restore tests. + + Also live restore is stable now. So move experimental tests out to stable. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 006d58d7e6756848058bd69a12c698c44e64efd1) + +commit 6ed3aaf3b6530c26aa48ee621443f4991fa01cdb +Author: Sebastiaan van Stijn +Date: Wed May 25 16:44:58 2016 +0200 + + deprecate '-h' shorthand and remove '-help' + + This deprecates the shorthand '-h', because we don't mention it as an option, + and it conflicts with the 'docker create -h/--hostname' option, so cannot be + used for all commands consistently. + + This also removes the (single-dash) '-help' option. The single-dash variant was + marked "deprecated" in version 1.5.0 (basically, since it was added in + a2b529ead21e6ab9eafcb1b1d2437c725c43a06a), but still kept around to + prevent '-help' being treated as '-h -e -l -p', causing confusing + warnings. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 6add695084151a54a503c6e2597e05c17aa3d37f) + +commit db9b930abcedbb9ca24f7ecd16b5f1474e220490 +Author: allencloud +Date: Mon Jun 27 23:41:53 2016 +0800 + + add err handling, close fd + + Signed-off-by: allencloud + (cherry picked from commit 2281ce7e98ec983514450c33c0ef1d90262c3b4f) + +commit 63ce6b60d58e397b1d12f3bbb8b7a3d17c761878 +Author: Sebastiaan van Stijn +Date: Wed Jun 22 11:21:19 2016 -0700 + + Fix installation script for RHEL + + the previous fix changed the lsb_dist variable + too early. We only normalize to "centos" + for the repository-location, so changing + it just before that. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 73d5f0648e430a74cd05ff9fd335611ddc6dd2a1) + +commit 7a5e247d010cd290e5b2bfab58ed9b0f5e6afaa7 +Author: Kenfe-Mickael Laventure +Date: Mon Jun 20 12:14:27 2016 -0700 + + Use "docker-runc" as alias for the default runtime + + This also moves the variable holding the default runtime name from the + engine-api repository into docker repository + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 69af7d0d13670b8e2a03a38b4d9a849fc109b338) + +commit 795560dba223bcdb64a80a898e5e3fedbd7ce13e +Author: Harald Albers +Date: Wed Jun 22 19:37:05 2016 +0200 + + bash completion enhancements for `docker {swarm,node,service}` + + Signed-off-by: Harald Albers + (cherry picked from commit e3339a75d3d9e79ed5b8d372237ce5d2802910ba) + +commit 6661a205640639d822f6feb56a847e5bce1caadc +Author: Dong Chen +Date: Fri Jun 17 11:14:36 2016 -0700 + + Block service mode change. + + Signed-off-by: Dong Chen + (cherry picked from commit 72f7cebfb036f0fc74b9fa6fcc0c154f83f1605f) + +commit a3b8c1a80ee4316ab43013216dc057b423333d29 +Author: allencloud +Date: Mon Jun 27 18:26:58 2016 +0800 + + uppercase output in node inspect to keep consistency + + Signed-off-by: allencloud + (cherry picked from commit 89582e1a34a570c27232cd394d38f7fddf7e6520) + +commit 460418f035e9e80a6805b49ff9355b33c412ef52 +Author: Alex Coventry +Date: Sun Jun 19 15:28:08 2016 -0400 + + Clarify role of `dockerhost` variable + + Signed-off-by: Alex Coventry + (cherry picked from commit 8aba9fd3ec776fa419ea504982e9bc12b6427f22) + +commit ea4d01f22fe5b878659b3b3b7bfdf329095f2a6a +Author: Tadej Janež +Date: Tue Jun 21 16:45:29 2016 +0200 + + Use 'default.target' in systemd unit file example + + Previously, 'local.target' was used which is not going to work + out-of-the-box for lots of users. + The 'default.target' is the default unit systemd starts at bootup and + hence what most users would be expected to use. + + Signed-off-by: Tadej Janež + (cherry picked from commit 0a8c46d5e5f9a8c66e6ab6ac5ce7f50143b9a8df) + +commit e5fb8b1fb60eafebdd7e7eaae21e8404a258fe06 +Author: Tonis Tiigi +Date: Fri Jun 24 12:09:53 2016 -0700 + + Disable iptables in swarm test daemons + + Signed-off-by: Tonis Tiigi + (cherry picked from commit caaf92f7b4b947c5d226fb66a355b60fac683979) + +commit 0762cce09a06144ac9080f062e587ae13c6213d4 +Author: Vincent Demeester +Date: Sat Jun 25 19:08:03 2016 +0200 + + Update experimental docs dsb -> dab + + Fixing bundle extension in experimental documentation. + + Signed-off-by: Vincent Demeester + (cherry picked from commit 8af760c9100d87ad89972c05312471b00f7f5691) + +commit b84206157a7427cbf55b9954448c2b530df87435 +Author: Aanand Prasad +Date: Wed Jun 22 14:59:10 2016 -0700 + + Update bundle extension + + It's now .dab, for Distributed Application Bundle + + Signed-off-by: Aanand Prasad + (cherry picked from commit 61e2d4240ba266518d0a9a862a88201e54502a88) + +commit 8084f80259c1def169df952a7776dca6cf0fed2a +Author: Vincent Demeester +Date: Fri Jun 24 19:55:48 2016 +0200 + + No need for container.Lock if rename same name + + During the renaming of a container, no need to call `container.Lock()` + if `oldName == newName`. + + This is a follow-up from #23360 (commit 88d1ee6c112d980a63c625389524047fea32e6d9) + + Signed-off-by: Vincent Demeester + (cherry picked from commit 7e1ec8d2bd6d1aa77f824a1a4d717a7aa4cc3459) + +commit 77e3708bf7b9a5f77f8796829d6d05836646fd4f +Author: Aaron Lehmann +Date: Fri Jun 24 12:04:26 2016 -0700 + + Fix "sanbox" typos + + Correcting "sanbox" to "sandbox". + + Signed-off-by: Aaron Lehmann + (cherry picked from commit fa04558ac10d70bcdd501f01a5090607db32cc3a) + +commit 5ff054ef51573c207b9013a72aa80a5d5cfe2401 +Author: Brian Goff +Date: Fri Jun 24 11:57:17 2016 -0400 + + Fix panic due to nil bind options + + Signed-off-by: Brian Goff + (cherry picked from commit 4c2e1a9cb04614d360e91a81959cb196380283b1) + +commit f463560ead8c60b0ca332a92dcff06c71c2cfe40 +Author: allencloud +Date: Sat Jun 25 02:52:28 2016 +0800 + + fix error message and typos in swarm cluster + Signed-off-by: allencloud + + (cherry picked from commit 39bc10c36d40677c11a800b4346c5cddec2b997d) + +commit d985acae68aca04be5ac2bae4e40a0593524906e +Author: Alexander Morozov +Date: Fri Jun 24 09:32:39 2016 -0700 + + cli: fix network create usage + + Signed-off-by: Alexander Morozov + (cherry picked from commit 159e7341ad80d6926fd9c09585afcc2abda25415) + +commit 72bb109a682eeb8ce577827de2b4faf89c77b838 +Author: Aaron Lehmann +Date: Fri Jun 24 12:07:47 2016 -0700 + + Remove log warning on task update + + This warning appears in the course of normal use of swarm mode. Since + it's meant more as an internal TODO than something which should be + exposed to a user, remove the log message. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 39c93cfb47783f2531ba44f062fd9a8b351d2224) + +commit 1fdce396225561532071a281a55944da6f6c9e7e +Author: Tonis Tiigi +Date: Thu Jun 23 13:52:41 2016 -0700 + + Add better error messages for unavailable swarm commands + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 803733120a1f9f080c6403f2a3717987393f1f0d) + +commit 5c1a76f8dae167d8ec04fa626c85b931e2e0c803 +Author: Adam Avilla +Date: Thu Jun 23 14:54:40 2016 -0700 + + Fixing typo on service log output. + + Signed-off-by: Adam Avilla + (cherry picked from commit 7cc6fe575895dca6c50c4eadb0fd4c4986d05048) + +commit b6b262d8bb1dcb63c1cca7cc3ebed9e630e489f9 +Author: Charles Smith +Date: Wed Jun 22 12:41:22 2016 -0700 + + correct output description - only one task is running on manager + + Signed-off-by: Charles Smith + (cherry picked from commit 5f219806fce6c70bfea1a610476e7e3e6e78371d) + +commit eebd6ac4df521e7bf6a5af30eb3cc69a748abd1e +Author: Sainath Grandhi +Date: Tue Jun 7 18:40:44 2016 -0700 + + docker rename fix to address the issue of renaming with the same name issue #23319 + + Signed-off-by: Sainath Grandhi + (cherry picked from commit 3e8c16ef6d5e6b451996722d99f5d646ed8a0e56) + +commit 0ec119e727e5d927dea32fef382a996e509d9e26 +Author: Alexander Morozov +Date: Thu Jun 23 16:09:13 2016 -0700 + + pkg/pools: avoid copy of sync.Pool + + Signed-off-by: Alexander Morozov + (cherry picked from commit ba3af336eb0bd5bd6082b41bb4ce0ea542c3f008) + +commit de5fd9d641af71f992dc5bcf117b7204e10d5b7f +Author: Tonis Tiigi +Date: Thu Jun 23 17:30:15 2016 -0700 + + Increase test timeouts for node state changes + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 2e5da4434126309f2395cc3d5b2013674155ae5c) + +commit e546ffb37ad205cb66e243d0acf00a23685e3cef +Author: Tonis Tiigi +Date: Wed Jun 22 17:49:46 2016 -0700 + + Fix error reporting on executor wait + + Signed-off-by: Tonis Tiigi + (cherry picked from commit c895a76f1076c782011e9decf58ab6548cf0fb35) + +commit c2b195d3c22e0e70f629cb258172f785acf63041 +Author: Alvaro Saurin +Date: Tue Jun 21 10:38:45 2016 +0200 + + Make sure we are trying to unmount a mounted /etc/resolv.conf + + Signed-off-by: Alvaro Saurin + (cherry picked from commit 41cc7c4d9ddb6d6b9e024f30806adc82f1bb1d4a) + +commit 3e6c39e2ee764cdbced7d929dac7f6e1d482f3bd +Author: Alvaro Saurin +Date: Tue Jun 21 10:35:50 2016 +0200 + + Make sure we compare strings with the same capitalization + + Signed-off-by: Alvaro Saurin + (cherry picked from commit ded347e744e74b99c023b30b53fcabe2c3bde24c) + +commit 71dbab2235102ac51bd4ae7e8af6103f72cd4eea +Author: Akihiro Suda +Date: Thu Jun 23 01:57:00 2016 +0000 + + update go-md2man to v1.0.5 + + Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly. + https://github.com/cpuguy83/go-md2man/commit/a8f937e11314ca0b085aa7a7a5526695e3ca5b49 + + Signed-off-by: Akihiro Suda + (cherry picked from commit cfe16e0d5b4bb7d1d194553f2a82cc1879d60e6b) + +commit 80405bef73407c33c428c3cc2bc2ca8c4906dccb +Author: Tonis Tiigi +Date: Wed Jun 22 14:48:57 2016 -0700 + + Do not show tasks from down nodes as active in ls + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 5d4401d6d72c647fa61501c40949b2d67c3f958b) + +commit f3da720d8bc32b48a0fbec3f29a68c96b8eadd96 +Author: John Howard +Date: Thu Jun 23 16:37:53 2016 -0700 + + Windows: Ensure frozen cope with prefix + + Signed-off-by: John Howard + (cherry picked from commit b820ead42674eca25c9718fb4de924405ec0c555) + +commit 1641f5e3080289b823fc6b968f710416cad7ab99 +Author: Kenfe-Mickael Laventure +Date: Tue Jun 21 11:57:33 2016 -0700 + + Fix the value of the Components value in apt {In,}Release files + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 63b07130140242dffef01ce22d8c85cd7d93ab1a) + +commit d99f4cc83d2b9657104a9037c4dc021e739c5b44 +Author: Derek McGowan +Date: Thu Jun 23 13:34:38 2016 -0700 + + Fix overlay2 ignoring whiteout files + + Currently when overlay creates a whiteout file then the overlay2 layer is archived, + the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure. + When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored. + By skipping the copy of empty files, no open attempt will be made on whiteout files. + + Fixes #23863 + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit bd13c53f8dc1504c9e681dfabef2afc1685ccec7) + +commit f4de46d2ac9936dbd0206bfa777df6f2e0ec32b6 +Author: Serhat Gülçiçek +Date: Mon Jun 20 12:35:26 2016 +0200 + + Fix error for env variables example in docker reference - 2 + The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute. + Everything after isn't executed as one might expect. + + When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2, except only for one occurrence. + + Signed-off-by: Serhat Gülçiçek + (cherry picked from commit 7a30fa7af6f0bb3850ce6167850642420b4c0633) + +commit eaf5b17592478945f854c722d1ed6ef568ff668f +Author: Sven Dowideit +Date: Wed Jun 22 12:50:51 2016 +0000 + + Removing some url links that can be resolved using src markdown links + + Signed-off-by: Sven Dowideit + (cherry picked from commit 01f9cbc3663cf134ca427e4f8b98bba637f6655e) + +commit 6de8049ab59216cb2caef63363ee00c656db8c1c +Author: David M. Karr (fullname at gmail.com) +Date: Wed Jun 22 09:36:30 2016 -0700 + + Update work-with-networks.md + + The value of the Subnet and Gateway properties didn't match the command-line argument. + + Signed-off-by: David M. Karr + (cherry picked from commit a54c3fbb8aa024c477864a0614506da3ea185839) + +commit f312883f39086777195246e714284deca302eb74 +Author: Alessandro Boch +Date: Wed Jun 22 09:44:56 2016 -0700 + + Add modules for secure overlay network to check-config.sh + + Signed-off-by: Alessandro Boch + (cherry picked from commit c355e059cc1a4f66338a039240195c66dc928e73) + +commit ada93c7182eb93595b01e57a3b4e858059f2e82c +Author: Alessandro Boch +Date: Wed Jun 22 09:40:20 2016 -0700 + + Vendoring libnetwork ed311d0 + + Signed-off-by: Alessandro Boch + (cherry picked from commit e26c513fa818a57b4ea572121e153cf6f056e1ee) + +commit e928358dfbd599efa127ad2abb52fdee22dd6e7e +Author: Alessandro Boch +Date: Wed Jun 22 09:31:55 2016 -0700 + + Vendoring vishvananda/netlink 734d02c + + Signed-off-by: Alessandro Boch + (cherry picked from commit 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0) + +commit ae0648fca8599b54e429ef84f33a13e687473712 +Author: Antonio Murdaca +Date: Thu Jun 23 12:31:11 2016 +0200 + + contrib: builder: rpm: add Fedora 24 + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 0b83f27328eab843d79c94dd603f52e8fb9c013b) + +commit d4cdc5172cce18fe0215829be1736c667f294c97 +Author: orkaa +Date: Thu Jun 23 16:26:43 2016 +0200 + + For the lulz! (evalulate -> evaluate) + + Signed-off-by: orkaa + (cherry picked from commit 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0) + +commit 790501e51f6db52995f28dccaa6c9c4cb3565607 +Author: Steve Durrheimer +Date: Thu Jun 23 08:29:24 2016 +0200 + + Add zsh completion for 'load' and 'save' image events + + Signed-off-by: Steve Durrheimer + (cherry picked from commit e2f1f699b39d30d71a9afc9af7027088970aa4fd) + +commit 7b643a09d598cd5b946b83440ba6cbeed3825146 +Author: Steve Durrheimer +Date: Thu Jun 23 08:44:08 2016 +0200 + + Add zsh completion for 'docker {create,run,network connect} --link-local-ip' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 704d9b6864cc81a1564f482a2dfbaa32b9c5e905) + +commit c6721ada675b6224ac511c2a75a909126a544a33 +Author: Steve Durrheimer +Date: Thu Jun 23 08:52:42 2016 +0200 + + Add zsh completion for 'docker run --storage-opt size=' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 857e7d6ae4f78184c70b2047ed45b24a6732537d) + +commit 3714e9b3934aa3946e2275912aaf43f8480eef6a +Author: Steve Durrheimer +Date: Thu Jun 23 08:57:39 2016 +0200 + + Re-Add zsh completion for '-c' alias to '--cpu-shares' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 4c23ac0ae5103a1238c25cd1216507e9d6eec779) + +commit 27d64ec8ad584813bbb84f1b775073d55a5b2d62 +Author: Steve Durrheimer +Date: Thu Jun 23 08:35:36 2016 +0200 + + Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 8e582a257326496cc27d30751b759a37f993d116) + +commit 43014ea54b7a45a8173b93b08e8607f815de6486 +Author: Tonis Tiigi +Date: Tue Jun 21 17:14:55 2016 -0700 + + Fix opts tests after default port fix + + The code for default port was already there but + it didn’t work because split function errored out + before. This should be the desired behavior that + matches daemon listen address with swarm listen + address. + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 0a4a0d9800aa62daf2b980b82c1840cd6f7d0e34) + +commit 3d06cd4910347a07ba95e57a782cc22baebd294e +Author: Tonis Tiigi +Date: Tue Jun 21 14:27:04 2016 -0700 + + Unify swarm init and update options + + Add api side validation and defaults for init and + join requests. + + Signed-off-by: Tonis Tiigi + (cherry picked from commit fb3eb1c27ef5520571c599ead8a72b343748db39) + +commit 8691607ade23f9d2d282e0edc0d88d481451b5fb +Author: Stefan J. Wernli +Date: Tue Jun 21 18:36:19 2016 -0700 + + Fixing file handle leak for "docker logs" + + If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container. Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close. This change addresses both cases. + + Signed-off-by: Stefan J. Wernli + (cherry picked from commit 54f11b84d218c1a7ff4ab4e2148819265da213bc) + +commit db4153cc9093c7edd961648a92f4e8a42c833716 +Author: Kai Qiang Wu(Kennan) +Date: Wed Jun 22 08:40:31 2016 +0000 + + Fix the missing 'ls' + + Signed-off-by: Kai Qiang Wu(Kennan) + (cherry picked from commit cbd240581f274c3599efb1c43b01cb61607c79d0) + +commit c984a6cdc828d34d7093dfae5aa9fffdbb49f396 +Author: Shishir Mahajan +Date: Tue Jun 21 10:49:28 2016 -0400 + + Man page fix: Mention supported drivers for --storage-opt size option in docker create/run + + Signed-off-by: Shishir Mahajan + (cherry picked from commit dc3fdfbe5bb5aff4ebd8f7025ace4bd6009d3db4) + +commit 060b6c4363f8670ca0138cc05f40fa6c1099f2ba +Author: Eric Barch +Date: Tue Jun 21 08:28:59 2016 -0700 + + Add missing words in the swarm docs + + Signed-off-by: Eric Barch + (cherry picked from commit db158e9182f86adc721d6c401782983bfe51fd49) + +commit 6a5a15072231d3fb43971e3b87fd9d769a6565c2 +Author: bin liu +Date: Tue Jun 21 15:28:30 2016 +0800 + + fix some typos + + Signed-off-by: bin liu + (cherry picked from commit 950073aabb305db6156709ea8509b1f72ff06f3b) + +commit 62d50a3f136973ba6d67e6f935975537b166898a +Author: nick +Date: Sun Jun 19 09:53:31 2016 -0700 + + Fix misspell typos + + Signed-off-by: nick + (cherry picked from commit 7135afa79b4d99ba2a214fcc1c2decf95f850c2f) + +commit 56d53adab1056308b1cd4706fa2778120d3cee39 +Author: Aaron Lehmann +Date: Fri Jun 17 22:27:03 2016 -0700 + + Fix parallel push of the same image to different registries + + Layer uploads are deduplicated by a "key" made up of the layer DiffID + and the repository name. The repository name being used to form this key + was a remote version of the name that didn't include the name of the + registry. Consequently, pushes of the same layer in a repository with + the same remote name to different registries would wrongly be + deduplicated. + + Correct the key by using the full name of the repository, which includes + the registry hostname as well as the image's name. + + Signed-off-by: Aaron Lehmann + (cherry picked from commit 1333ef3ca381976438d4ae10f6b0e9be21e1a9ba) + +commit 8f677417d129330dc1f11c360f03d57056b2e36d +Author: Ken Cochrane +Date: Tue Jun 21 09:40:00 2016 -0400 + + Fixed issue #23787 install script not working for RHEL7 host + + Signed-off-by: Ken Cochrane + (cherry picked from commit 0e84474672fb30449028b4f7a678d5ab6a81f102) + +commit 3d5903a45f5726251002b230f1c5943d268daf0f +Author: Sven Dowideit +Date: Tue Jun 21 12:55:41 2016 +0000 + + Now that the Docker4 links are online, we can use them + + Signed-off-by: Sven Dowideit + (cherry picked from commit 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9) + +commit ba77356d98af123ed7041270ca6ebcb61755f665 +Author: Akihiro Suda +Date: Mon Jun 20 17:29:21 2016 +0900 + + Add overlay2 description to overlayfs-driver.md + + Signed-off-by: Akihiro Suda + (cherry picked from commit 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b) + +commit 5604fb2362cbd834b1daeb1d92ffdea59ae13b33 +Author: Harald Albers +Date: Tue Jun 21 11:30:26 2016 +0200 + + bash completion for `-c` alias to `--cpu-shares` + + Signed-off-by: Harald Albers + (cherry picked from commit 79296b2770b6d629a2e6ab02f888294a99f62153) + +commit b23562ea20a3e631bc57c12e4223cf695904682a +Author: Harald Albers +Date: Tue Jun 21 11:06:08 2016 +0200 + + bash completion for `docker daemon --storage-opt btrfs.min_space` + + Signed-off-by: Harald Albers + (cherry picked from commit f693b99870031a6f5311defa9aba13b690323594) + +commit 0afeae16dec9a87a6425a4a20c368ab0e08aec85 +Author: Harald Albers +Date: Tue Jun 21 11:04:09 2016 +0200 + + bash completion for `docker {run,create} --storage-opt` + + Signed-off-by: Harald Albers + (cherry picked from commit 7d2ffa00c08e2f316285fe2f9adf81255f5ae688) + +commit 749f94e885152546c16dda9485815051e83898b5 +Author: Harald Albers +Date: Tue Jun 21 10:24:14 2016 +0200 + + bash completion for `load` and `save` image events + + Signed-off-by: Harald Albers + (cherry picked from commit 5334520bf04598121b026c0b5018714fd4120d44) + +commit 5188629256670d43a363373380b226448cbc0741 +Author: Harald Albers +Date: Tue Jun 21 10:19:07 2016 +0200 + + bash completion for `docker daemon --storage-driver olverlay2` + + Signed-off-by: Harald Albers + (cherry picked from commit d96eeff19416be61e7e021c9dfaed8728a177d02) + +commit 9117c0dd4106e36115c2b4d88eaf24032ae61b22 +Author: Harald Albers +Date: Tue Jun 21 09:43:34 2016 +0200 + + bash completion for `docker {run,create,network connect} --link-local-ip` + + Signed-off-by: Harald Albers + (cherry picked from commit 98483f57ed984acd0d1c1f0de85c2b82c0308896) + +commit 7d72ca329cdd2e8733a7e1d9c3025c0acabe13f0 +Author: Steve Durrheimer +Date: Tue Jun 21 08:31:28 2016 +0200 + + Add zsh completion for 'docker daemon --live-restore' + + Signed-off-by: Steve Durrheimer + (cherry picked from commit 8036fc794a54323d28e2179267fd7201eca5b76a) + +commit df987c84de144506e92740077423a40049aff0c1 +Author: Kenfe-Mickael Laventure +Date: Mon Jun 20 11:21:01 2016 -0700 + + Fix missing container runtime on upgrade + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit d7ceda4e375250e6868854cca96c49a369503745) + +commit 16274ba9407f82b7e11cc8f0fdf60d4576cb9b58 +Author: Shishir Mahajan +Date: Mon Jun 20 17:52:34 2016 -0400 + + PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run. + + Signed-off-by: Shishir Mahajan + (cherry picked from commit fe6416d04fb3ccd83fe4fb3a73f0364b88da730a) + +commit c7d35daad89b3c0e034eef733d5d75cb98f68021 +Author: Kevin Jing Qiu +Date: Mon Jun 20 23:54:36 2016 -0700 + + Fix some doc typos and spacings + + Signed-off-by: Kevin Jing Qiu + (cherry picked from commit 3b2ee9a704f1e3974dbb9ce857886d5e377580ab) + +commit 1b053efb5a84272d4a2b1c4d02937961168df69a +Author: Sebastiaan van Stijn +Date: Mon Jun 20 14:07:11 2016 -0700 + + Sync API changes from 1.25 -> 1.24 + + commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96 + updated the v1.25 API with changes in SwarmKit, + but these changes should apply to v1.24. + + This updates the 1.24 API with the same changes. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 93095b1699eb11e1bd256dcf8f42f34f50ec2c78) + +commit 803b4d30a67fe946103bd9a31bfbfc9fab73b077 +Author: Charles Smith +Date: Mon Jun 20 11:02:56 2016 -0700 + + clarify swarm concept + + Signed-off-by: Charles Smith + (cherry picked from commit e0296317131782008dcb94c72d591244663d61b1) + +commit c51fced060e25493fd696e6e21ebc01ea2b4d79c +Author: Lei Jitang +Date: Thu May 26 03:20:53 2016 -0400 + + Fix link doesn't work sometimes when container start with multiple networks + + If there is multiple networks to connect to on container starting, + the order of these networks is random because we "range a map". But + the defautl network "bridge" should be connected first since only + "bridge" support link and we should have do some settings on sandbox + creation, and only the first connect will setting the sandbox. + + Signed-off-by: Lei Jitang + (cherry picked from commit 57c0a653e3d0055e63db399019b3b16d4ac97004) + +commit aa123b73d14936eef2d52abef95b9120c070375e +Author: Derek McGowan +Date: Fri Jun 17 09:18:27 2016 -0700 + + Add tests for rmi + + Add integration test for removing by image id with tag and digest reference to the same repository. + Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference. + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 5cff374b140b4a836b7082d009bcfe9a6e96f1af) + +commit 611bbed2df3885e3283c9c22f4a4d6fe9edc91c8 +Author: Derek McGowan +Date: Thu Jun 16 16:06:47 2016 -0700 + + Update rmi logic for canonical references + + Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion. + Canonical references with a different repository name will be treated as separate references. + Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining. + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit a281be1c11d61deed7cb2853125e6d489f16aa2e) + +commit 8a93ff1ffb64292dc5fc4dd0e3f6fe105a9a73d8 +Author: Daniel Nephin +Date: Fri Jun 17 11:26:53 2016 -0400 + + Remove dead code from node update. + + Also share mode code between update commands + and use flag constants + + Signed-off-by: Daniel Nephin + (cherry picked from commit cacaeab9db51f42c33872c6cce1adc3e55f1c9c5) + +commit 0641b8ba9c45999c0c2b36adb877dbf66293fda9 +Author: Daniel Nephin +Date: Fri Jun 17 11:19:51 2016 -0400 + + Use flag constants for swarm flag. + + Signed-off-by: Daniel Nephin + (cherry picked from commit c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e) + +commit 7b0bb3f92cb7d65e0b3671b8ace3f190a43559f4 +Author: Daniel Nephin +Date: Fri Jun 17 11:01:46 2016 -0400 + + add more flag constants to service update. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 9d1f3373b3678033c1be197fafc55010cc8531dd) + +commit 3f276b58a55adadd4b80dbcb3bd6042fb608c247 +Author: Charles Smith +Date: Fri Jun 17 13:30:17 2016 -0700 + + update docker swarm cli + + Signed-off-by: Charles Smith + (cherry picked from commit 78ebfaff1a426425573c440c24eb0f36ffed4d8c) + +commit 75193e58ce849125a8957c6a103ac4cbbcc8039f +Author: Harald Albers +Date: Sat Jun 18 10:11:46 2016 -0700 + + fix bash completion for `docker {swarm,node}` subcommands + + Signed-off-by: Harald Albers + (cherry picked from commit e65f036e134c428b1303b00a8f08b0eea79f0701) + +commit a4e34152355e599775e32bd6c4663b8a5eebafbe +Author: Harald Albers +Date: Sat Jun 18 09:52:02 2016 -0700 + + correct sort order in new bash completions + + The completion for the new `docker service`, `docker swarm` and + `docker node` command families were partly added in non-alphabetical + order. + + Signed-off-by: Harald Albers + (cherry picked from commit 19753ec84dcd2961adf64c4c66b09a2f4ca3220a) + +commit b8b938c61c45a8fe95bd66fe5b96f6ecce030c10 +Author: Mike Goelzer +Date: Wed Jun 15 12:28:33 2016 -0700 + + Add bash completion for `docker service scale` + + Signed-off-by: Mike Goelzer + + Conflicts: + contrib/completion/bash/docker + + (cherry picked from commit 5cf73a47f5327c38b27400012333a9e569f1a584) + +commit 2899866c63cc7a3ee51067c66dad37961e15e6cf +Author: Sebastiaan van Stijn +Date: Mon Jun 20 00:12:48 2016 -0700 + + Fix markdown formatting for experimental + + - don't indent code-blocks that use fences + - fixed some formatting + - wrapped long lines to 80-chars + - removed stray empty lines + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit a92f6551c92aae23ec88880b406c8854dcfa9b4a) + +commit 9157831d16cc91875e55307e902cba7a1e98c86f +Author: Michael Friis +Date: Sun Jun 19 21:27:55 2016 -0700 + + bring dab into title and intro + + Signed-off-by: Michael Friis + (cherry picked from commit 6defef56194e7fe74f6f1bbc0ccb0565bc51ffd1) + +commit cabc0df64d26c258ba79087f32dba512f859a97f +Author: Michael Friis +Date: Sun Jun 19 16:14:34 2016 -0700 + + expand stack doc + + Signed-off-by: Michael Friis + (cherry picked from commit cd2237c2bc6bce738a42a7eaf0ba82d57857fe2f) + +commit c40debc362d7b237bb418f34c20a419688ecd286 +Author: Zhang Wei +Date: Sun Jun 19 16:26:23 2016 +0800 + + Make --help information consistent + + Other docker command always print "[OPTIONS]" right after `docker + COMMAND`, but `build` and `push` has inconsistent help message. + + This commit will fix help information format. + + Signed-off-by: Zhang Wei + (cherry picked from commit 0e5397633628ab154fae33152de7dc1fd4e122db) + +commit 178436669412428622f0af6b755623226a761879 +Author: Charles Smith +Date: Sun Jun 19 11:43:49 2016 -0700 + + add links to swarm and service commands to swarm mode overview + + Signed-off-by: Charles Smith + (cherry picked from commit c13c5601961bb5ea30e21c9c8c469dd55a2f17d0) + +commit 8a994d4724311b3c37e703651ad0ff934c261cd9 +Author: Tonis Tiigi +Date: Sat Jun 18 19:43:47 2016 -0700 + + Don’t try to restore swarm from incomplete state + + Signed-off-by: Tonis Tiigi + (cherry picked from commit ded1d9af38cb467dadab0521936174eef0d4bc9e) + +commit abb6e382080c5cc7f569b2f8e184d73ce3383f99 +Author: Yong Tang +Date: Sun Jun 19 07:10:58 2016 -0700 + + Fix reference link error in Jenkins docs failure + + This fix fixes one of the Jenkins docs failure: + https://jenkins.dockerproject.org/job/docs-docker-pr/9754/ + + There are 7 errors. This fix addresses one: + `* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options` + + Signed-off-by: Yong Tang + (cherry picked from commit 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa) + +commit 92ffbd2b5222cfec3d3d25667f21aa420df3c0b4 +Author: Yong Tang +Date: Sat Jun 18 16:43:30 2016 -0700 + + Fix `docker start` error with renamed container + + This fix tries to fix the issue raised in #23716 where `docker start` + causes an error of `No such container:` if the container has been + renamed before `docker start` returns. + + The issue is that `docker start` use container name passed at the + beginning to check for exit code at the end of the `docker start`. + + This fix addresses the issue by always use container's `ID` to get + the information during `docker start`. + + Additional integration tests have been added to cover this fix. + + This fix fixes #23716. + + Signed-off-by: Yong Tang + (cherry picked from commit 6e86733b47faf0d7629751987346022544b65cb7) + +commit 2b45db42b24b1212ecbcc3a8a530a8ad2ee1c9da +Author: Jana Radhakrishnan +Date: Sat Jun 18 19:16:51 2016 -0700 + + Vendoring @ab62dd6bf06bf0 + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 663159e9acb93ea571e8aec0a687fcc16fd96dff) + +commit da0cb171cbec131db0e489a54283b0b3f44771b7 +Merge: 28de7cfb3d 728dde46ef +Author: Nishant Totla +Date: Thu Jun 30 10:48:47 2016 -0700 + + Merge pull request #2275 from allencloud/remove-engine-details-in-volume-network-API + + remove engine details in volume and network api + +commit 728dde46ef8ecc5650f2e2950906a46745f95225 +Author: allencloud +Date: Wed May 25 10:21:50 2016 +0800 + + remove engine details in volume and network api + + Signed-off-by: allencloud + +commit cd95232ac74e187b6cc9afeb3b46a8414474378b +Author: KOBAYASHI Shinji +Date: Thu Jun 30 06:46:14 2016 +0000 + + Remove "open : no such file or directory" message during crash report + + Add an empty string check to the path argument of addFile(). Send() + method of BugsnagCrashReporter calls addFile() passing err.LogFilePath + as the path argument, which is an empty string if the driver is not + virtualbox. + + Fixes #3559 + + Signed-off-by: KOBAYASHI Shinji + +commit 7f4770de009a71b8e1eb7a3554042faca2b3328d +Merge: e24e33ea2f 3a2c828ab4 +Author: Arnaud Porterie +Date: Wed Jun 29 23:10:09 2016 +0000 + + Merge pull request #527 from londoncalling/fix-links + + fixed link + +commit b49f8ed894f134a00b2db9bbf3f98c41617daed4 +Merge: c24b072e7d beb5d00474 +Author: Derek McGowan +Date: Wed Jun 29 15:28:34 2016 -0700 + + Merge pull request #1812 from RichardScothern/media-type + + Override media type returned from Stat for existing manifests. + +commit beb5d0047439779e56eb991fd9655c8ac3659b43 +Author: Richard Scothern +Date: Wed Jun 29 14:52:50 2016 -0700 + + Override media type returned from Stat for existing manifests. + + Signed-off-by: Richard Scothern + +commit ead4c8651587c721d48e78777579f92499e09c31 +Author: Joao Fernandes +Date: Wed Jun 29 14:00:26 2016 -0700 + + Updates docs for licensing DTR + +commit 28de7cfb3dc5c61cfb61a8b865a009ac437e3aa3 +Merge: b29baba3bb d382fbd883 +Author: Dongluo Chen +Date: Wed Jun 29 13:41:31 2016 -0700 + + Merge pull request #2329 from allencloud/support-daemon-events-in-swarm + + support daemon events for swarm + +commit c24b072e7d3b3b81b03d46ed84443b5181beeb9c +Merge: 1f1d042f55 a1f9f71e67 +Author: Derek McGowan +Date: Wed Jun 29 12:02:48 2016 -0700 + + Merge pull request #1808 from BrianBland/clientAllTagsFollowsLinks + + Changes the client Tags All() method to follow links + +commit c5e1bca7dca78d6ba13afc68cb99fe7ea48f7b1e +Author: NanXiao +Date: Thu Jun 23 17:14:11 2016 +0800 + + Check r.ParseForm() error in postContainersCreate(). + + Signed-off-by: NanXiao + +commit d382fbd883f0a1253b2acaba7ded76ad293a46c7 +Author: allencloud +Date: Sun Jun 5 17:52:06 2016 +0800 + + support daemon events for swarm + + Signed-off-by: allencloud + +commit ece9cfa6c2afa04b3eb6fb534d9ad89d27864252 +Merge: fc0c70da0d b7b6115bc3 +Author: French Ben +Date: Tue Jun 28 16:37:30 2016 -0700 + + Merge pull request #1698 from sibprogrammer/checkbox-labels + + Better way to control checkboxes using labels. + +commit a1f9f71e67751bb007e24ad002b263791fa86915 +Author: Brian Bland +Date: Tue Jun 28 14:44:51 2016 -0700 + + Changes the client Tags All() method to follow links + + This returns all tags even when the registry forces pagination. + + Signed-off-by: Brian Bland + +commit 3a2c828ab408f7ea8939c74b58e55465cc937554 +Author: Victoria Bialas +Date: Tue Jun 28 15:26:15 2016 -0700 + + fixed link + + revised link fix to remove index.md, which doesn't work in these files + + Signed-off-by: Victoria Bialas + +commit 1f1d042f551b86111713112c44989f4b2c07626c +Merge: 5f7f871d8f 2d0a5ecc0e +Author: Richard Scothern +Date: Tue Jun 28 15:09:35 2016 -0700 + + Merge pull request #1807 from docker/jchorl-master + + fixed s3 Delete bug due to read-after-delete inconsistency + +commit 2d0a5ecc0e060d39f36d0cc325b866d8b46a7c0e +Author: Josh Chorlton +Date: Mon Jun 27 17:39:25 2016 -0700 + + fixed s3 Delete bug due to read-after-delete inconsistency + + Signed-off-by: Josh Chorlton + +commit ec7018348d4c816805350bc52dec6bde66ee2550 +Author: Juan San Emeterio +Date: Tue Jun 28 12:49:49 2016 -0400 + + Accounted for the escaped backslashes + + Signed-off-by: Juan San Emeterio + +commit 70c7de3ddc7337f7f677c860827507704279b1e1 +Author: Juan San Emeterio +Date: Tue Jun 28 12:24:14 2016 -0400 + + Modified the Windows VirtualBox Driver + + *The current implementation for the Windows VirtualBox driver maps + directly to the 'c:\\Users' directory. This regularly causes exceptions + when a file is written to a volume on a Windows machine where there is a + limitation on the number of characters allowed in a file path. + *By instead using the proposed mapping of '\\?\c:\\Users' the Windows + API will allow the file path to exceed the character limit and should + resolve issues and cryptic errors for many users that are using Docker + Machine to build artifacts with lengthy file paths. + + Signed-off-by: Juan San Emeterio + +commit 9b156d12305efb6e13a84dc4bc841d5533c9047f +Author: lichao +Date: Tue Jun 28 10:38:36 2016 +0800 + + fix Switch the primary docs + + Signed-off-by: lichao + +commit fc0c70da0d801aaa976cabb68af65ae851885e7a +Merge: a6bb087ce2 01836fb950 +Author: French Ben +Date: Mon Jun 27 16:01:51 2016 -0700 + + Merge pull request #1783 from ClemMakesApps/fix-http-settings-url + + Remove redundant http:// formatting + +commit b29baba3bb8be2415c57e0a8ac06ba591d37573c +Merge: a4f335fd40 a3952ff74d +Author: Nishant Totla +Date: Mon Jun 27 13:45:48 2016 -0700 + + Merge pull request #2383 from dperny/add-issue-template + + Added issue template to direct users to right repo + +commit f510f9b6c80cf8894ee8e6d4e8fa691d93ec725f +Author: Joao Fernandes +Date: Mon Jun 27 13:06:12 2016 -0700 + + Fixes broken link in docs + +commit 01836fb95048619c561580c99ec2b93e0f5d994a +Author: Clement Ho +Date: Mon Jun 27 13:45:36 2016 -0500 + + Remove redundant http:// formatting + + Signed-off-by: Clement Ho + +commit a3952ff74da3b2c36871567e8f5e78a3f06208fe +Author: Drew Erny +Date: Mon Jun 27 11:43:48 2016 -0700 + + Added issue template to direct users to right repo + + Signed-off-by: Drew Erny + +commit 5f7f871d8fb8af84fab624953a587c2b4140e920 +Merge: ffbe9b7c63 a1c1349eac +Author: Richard Scothern +Date: Mon Jun 27 10:41:36 2016 -0700 + + Merge pull request #1805 from SvenDowideit/difuse-non-link + + Stop hugo from making the example URL into a link + +commit 0ca33d886ca0b3ed14947c9ccb8317b857dc158c +Author: Ke Xu +Date: Mon Jun 27 18:17:44 2016 +0900 + + add swarm-join-opt support + + Signed-off-by: Ke Xu + +commit e24e33ea2f3f2c655fc4d07a671bd5f31ddfd95f +Merge: 63844502e7 7a442c945d +Author: Sven Dowideit +Date: Mon Jun 27 12:01:25 2016 +1000 + + Merge pull request #488 from kevinBlum/master + + Added documentation pertaining to VT-X virtualization being enabled when installing Toolbox + +commit a1c1349eac91bde3b4bb7aeacfc0736b8f29cbb5 +Author: Sven Dowideit +Date: Mon Jun 27 10:15:26 2016 +1000 + + Stop hugo from making the example URL into a link + + Signed-off-by: Sven Dowideit + +commit a4f335fd40892d40f217f8afdc3f974d012528b3 +Merge: 959d50a647 04b8fa8f1d +Author: Xian Chaobo +Date: Sun Jun 26 13:20:22 2016 +0800 + + Merge pull request #2342 from NanXiao/issue-9999 + + Edit docs/discovery.md + +commit 9e64de086b03aa3e14c6386ccd7eba524435b780 +Author: Adam Herzog +Date: Thu Jun 23 18:06:57 2016 -0700 + + fix typo 'software' + +commit 5f6bc6fa7276674e64e03b5f48da61c7876eebdb +Merge: cdd8c86e41 ec4697ea33 +Author: Nathan LeClaire +Date: Thu Jun 23 17:29:26 2016 -0700 + + Merge pull request #3508 from s-koba/3507-fix-redhat-ssh-logs + + Add SSH logs when provisioning with RedHat derivatives + +commit cdd8c86e41d0615b26cfb982eb0c9d4d5b673bff +Merge: 9c4a8a93a1 5c888874e0 +Author: Nathan LeClaire +Date: Thu Jun 23 17:28:54 2016 -0700 + + Merge pull request #3535 from tronicum/fedora-version + + bumped version up to fedora 23 (should'nt it use a matching versi… + +commit 9c4a8a93a153206d05e2a1e1010248ae3d678e17 +Merge: 97c3f27434 7830ca897f +Author: Nathan LeClaire +Date: Thu Jun 23 17:22:55 2016 -0700 + + Merge pull request #3524 from dantjones/master + + Add Skytap Docker Machine Driver Plugin + +commit 97c3f274342d8f518e4f8a4fe8120293c884f0d5 +Merge: bca4af7130 2692ac9005 +Author: Nathan LeClaire +Date: Thu Jun 23 17:22:39 2016 -0700 + + Merge pull request #3521 from katzj/gce-instances-monitoring-scope + + Add the monitoring scope to the default scopes for GCE instances created by docker-machine + +commit 959d50a647c577d246bd64c6a49428590a8f422e +Merge: 8fa12527c2 68ed7f7933 +Author: Charles Smith +Date: Thu Jun 23 10:37:53 2016 -0700 + + Merge pull request #2376 from sfsmithcha/remove_note_overview + + remove manual note in favor of swarm-wide advisory + +commit 68ed7f79336758eebc4fd8f5b61d1ec80cfb73bc +Author: Charles Smith +Date: Thu Jun 23 09:44:34 2016 -0700 + + remove manual note in favor of swarm-wide advisory + + Signed-off-by: Charles Smith + +commit 5c888874e07e8562fb947be7f2931742fde2b977 +Author: tronicum +Date: Thu Jun 23 16:01:38 2016 +0200 + + updated test + + Signed-off-by: tronicum + +commit 071ce5e6679531c5e0ac06620faf0946958e2c99 +Author: tronicum +Date: Thu Jun 23 15:39:01 2016 +0200 + + bumped version up to fedora 23 (should'nt it use a matching version and only default to something else otherwise?) + + Signed-off-by: tronicum + +commit 8fa12527c272f7cc0b36f590702e2917fafbee60 +Merge: 9857318613 17923e3264 +Author: Sven Dowideit +Date: Thu Jun 23 15:04:31 2016 +1000 + + Merge pull request #2374 from sfsmithcha/move_swarm_menu + + move Docker Swarm menu under Component Projects + +commit 17923e32641d03c3d83abf6355075681fa896c7c +Author: Charles Smith +Date: Wed Jun 22 21:23:49 2016 -0700 + + move Docker Swarm menu under Component Projects + + Signed-off-by: Charles Smith + +commit 0517d5728ed46bd2c5ce3447bdfdb55a53c80a9b +Merge: d1e910ba5d 0d69ee3f8d +Author: Riyaz Faizullabhoy +Date: Wed Jun 22 15:34:41 2016 -0700 + + Merge pull request #793 from gtank/memstore-lock-copy + + remove literal copy of sync.Mutex from memory store + +commit 7830ca897f2e68b402eaf6e40de1bab25f67fcb7 +Author: Dan Jones +Date: Wed Jun 22 13:33:53 2016 -0700 + + Add Skytap Docker Machine Driver Plugin + + Signed-off-by: Dan Jones + +commit ffbe9b7c635082432c4adb0395b7426ed5081cff +Merge: e3b4445b83 82bdab7d48 +Author: Stephen Day +Date: Wed Jun 22 13:25:24 2016 -0700 + + Merge pull request #1798 from SvenDowideit/replace-google-docs-png-with-local-image + + Replace google docs image link with one in this repo + +commit 9857318613423ab21bed68e1091422d34d8eb401 +Merge: dd9d9af57d 2e26be8e75 +Author: Charles Smith +Date: Wed Jun 22 08:55:22 2016 -0700 + + Merge pull request #2373 from SvenDowideit/ucp-product-url-redirects + + The UCP wwwurl redirects to DDC page, and UCP isn't in beta anymore + +commit 2692ac900562b5c478b35e77cad9d0fdf0e93492 +Author: Jeremy Katz +Date: Wed Jun 22 10:07:12 2016 -0400 + + Add the monitoring scope to the default scopes for GCE instances created by docker-machine + + Signed-off-by: Jeremy Katz + +commit e3b4445b8359e2685002fec71e2f28fd4f7ad15f +Merge: edd7cb5249 913e12c8ff +Author: Derek McGowan +Date: Wed Jun 22 07:06:04 2016 -0700 + + Merge pull request #1799 from liubin/fix-typos + + fix typos + +commit 82bdab7d48e56f2a27084cc4a99fc6a69779fd3b +Author: Sven Dowideit +Date: Wed Jun 22 01:52:30 2016 +0000 + + Replace google docs image link with one in this repo + + Signed-off-by: Sven Dowideit + +commit 2e26be8e7558b53bec1f8bd2290ab70dc00081bb +Author: Sven Dowideit +Date: Wed Jun 22 11:36:46 2016 +0000 + + The UCP wwwurl redirects to DDC page, and UCP isn't in beta anymore + + Signed-off-by: Sven Dowideit + +commit dd9d9af57d52233fec13d794d7d2461ff2a33a87 +Merge: 14cb2e0805 06fc7e2ae7 +Author: Xian Chaobo +Date: Wed Jun 22 15:46:27 2016 +0800 + + Merge pull request #2372 from liubin/fix-typos + + fix typos + +commit 06fc7e2ae7c1f37ce7da6bed550b32a1769b8b04 +Author: bin liu +Date: Wed Jun 22 14:29:37 2016 +0800 + + fix typos + + Signed-off-by: bin liu + +commit 913e12c8ff1ce0f8a8540dbde3aa8c4c6d8f0bb7 +Author: bin liu +Date: Wed Jun 22 12:40:21 2016 +0800 + + fix typos + + Signed-off-by: bin liu + +commit 14cb2e08058f397dcf3ce6eeaef79047b339a83b +Merge: cb7a723884 1ba800ddbf +Author: Allen Sun +Date: Wed Jun 22 07:06:24 2016 +0800 + + Merge pull request #2369 from LukasBacigal/master + + [DOC] Typo in scheduler/filter.md #2 + +commit 1ba800ddbf02a2ff21a9358a89fc8425263abc90 +Author: Lukáš Bacigál +Date: Tue Jun 21 23:59:26 2016 +0200 + + Typo in scheduler/filter.md + + Correcting link to header. + + Signed-off-by: Lukáš Bacigál + +commit 63844502e76ccc0289a72b0fbaa51a6bce3547d0 +Merge: 896c7a8871 040cb37371 +Author: Sven Dowideit +Date: Tue Jun 21 23:04:36 2016 +1000 + + Merge pull request #521 from SvenDowideit/update-docker4-links + + Now that the Docker4 links are online, we can use them + +commit 040cb373713f18008c957c6ae0954d20f1e7ec50 +Author: Sven Dowideit +Date: Tue Jun 21 13:01:38 2016 +0000 + + Now that the Docker4 links are online, we can use them + + Signed-off-by: Sven Dowideit + +commit cb7a723884c678189be89447aae6d3e276b56849 +Merge: a34785e489 af7d223f68 +Author: Charles Smith +Date: Mon Jun 20 16:33:52 2016 -0700 + + Merge pull request #2361 from sfsmithcha/engine_112_overview + + author merge: add note to Swarm docs to refer to swarm mode in Engine + +commit a34785e48971b4aae3fc56c95781149165a3f0c5 +Merge: 4180caed47 c4886bd006 +Author: Xian Chaobo +Date: Mon Jun 20 19:03:58 2016 +0800 + + Merge pull request #2303 from xianlubird/bug/concurrent_network + + Fix network Uniq method concurrent map writes problem + +commit 896c7a88719168c50e4a57ce22f863e4a24c2c86 +Merge: b20f933334 b8af8eb553 +Author: Sebastiaan van Stijn +Date: Sun Jun 19 20:25:53 2016 -0700 + + Merge pull request #518 from SvenDowideit/fix-terminal-link + + Fix mac terminal image link + +commit b8af8eb5532c8e848a69a7a30d10ec0a5aab2dbe +Author: Sven Dowideit +Date: Mon Jun 20 03:08:06 2016 +0000 + + Fix mac terminal image link + + Signed-off-by: Sven Dowideit + +commit b20f933334805d07ef72ba2a4270676b7d1a76ff +Merge: 4d70fea4c8 22f06e2c3e +Author: Arnaud Porterie +Date: Mon Jun 20 00:11:43 2016 +0000 + + Merge pull request #516 from londoncalling/fix-broken-links-docs-base + + fix broken links per issue #30 on docs-base-1.12-integration + +commit fe2a9bea380dac41867caadfac1a7ea5c18f8038 +Author: Charles Chan +Date: Sun Jun 12 21:30:14 2016 -0700 + + Update help output to match Docker 1.11. + + * Also touch up headings. + + Signed-off-by: Charles Chan + (cherry picked from commit 17ae6539f6bfc20792d0a25b3f98adfce96e7337) + +commit dd39dbe79c71dc0c45030f0da3204a5dba8ea435 +Author: Charles Smith +Date: Wed Jun 15 13:26:13 2016 -0700 + + update cli commands output for rc1, revise key concepts + + Signed-off-by: Charles Smith + (cherry picked from commit 9499d5fd522e2fa31e5d0458c4eb9b420f164096) + +commit e8e1fbb72f0be212491bfbfa05638a2322c47d60 +Author: Sven Dowideit +Date: Sat Jun 18 13:00:38 2016 +0000 + + bad url + + Signed-off-by: Sven Dowideit + (cherry picked from commit c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45) + +commit d546db33ffba42e5dae55201c2fdbc46d245558b +Author: Sven Dowideit +Date: Sat Jun 18 12:44:38 2016 +0000 + + href links are not converted from file.md by hugo + + Signed-off-by: Sven Dowideit + (cherry picked from commit ad1819ca1d56a0e2caae2f0f28d14a456686e00b) + +commit 3c35da6029197fe3b8981546d36d23cf25af61d9 +Author: Daniel Nephin +Date: Fri Jun 17 16:02:04 2016 -0400 + + Add tests for AutoAcceptOption + + Signed-off-by: Daniel Nephin + (cherry picked from commit c544649874bfecf2e6b8a00a0b25db309d81cf94) + +commit e090e2dbd4afab5f63889b75cfb97cb05f62a959 +Author: Daniel Nephin +Date: Fri Jun 17 15:42:16 2016 -0400 + + Support a listen addr without a port, and add tests. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 595e79b805fd6e96d2e6c8876f7c9734164f5db7) + +commit 6b2cd6e843298fe24d9c753e3a8a7fec05adcce8 +Author: Victor Vieux +Date: Fri Jun 17 19:06:12 2016 -0700 + + accept uppercase endpoint mode + + Signed-off-by: Victor Vieux + (cherry picked from commit 8a0c5f157892efdfd5119410adedf0f04c9c16cf) + +commit 0728f28cbea6022477db6f4c25efa854d6ea1701 +Author: Jana Radhakrishnan +Date: Fri Jun 17 19:01:18 2016 -0700 + + Vendoring swarmkit @3f135f206179e + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 64a567d24c147379dc79b54cf2140c4e7905c022) + +commit 9e1d592de338c8fc42e2ae902bf6ccdc46ba39c8 +Author: tomwbarlow@gmail.com +Date: Fri Jun 17 15:03:11 2016 +0100 + + Change log.printf service creation msg to debug + + Signed-off-by: tomwbarlow@gmail.com + (cherry picked from commit eed8d14ed16846f926e2d139e8232fbc2d4641e4) + +commit f1f2461e09f46d254161ff8e7f16a272ac74f25b +Author: Arnaud Porterie (icecrime) +Date: Fri Jun 17 16:24:07 2016 -0700 + + Change `docker service update` semantics + + Change `docker service update` to replace attributes of the target + service rather than augment them. One particular occurrence where the + previous behavior proved problematic is when trying to update a port + mapping: the merge semantics provided no way of removing published + ports, but strictly of adding more. + + The utility merge* functions where renamed accordingly to update*. + + Signed-off-by: Arnaud Porterie (icecrime) + (cherry picked from commit 1f8ab93b4422a88ef3053105c17acf1933576fbe) + +commit ffb4daf0fb00bd6a0580fad4573d2a305bdc644e +Author: Harald Albers +Date: Fri Jun 17 09:49:46 2016 +0200 + + fix bash completion for `docker service` subcommands + + Signed-off-by: Harald Albers + (cherry picked from commit 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145) + +commit d5c89ec65e6052249fbd978c1164b95915cb79b2 +Author: Sebastiaan van Stijn +Date: Fri Jun 17 16:51:17 2016 -0700 + + Add initial "service" docs + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf) + +commit d1c91b41e14adf8b95c87dc73b30d35a015382ab +Author: Victoria Bialas +Date: Thu Jun 16 22:29:56 2016 -0700 + + install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's + + fixing links to d4mac and d4win + + updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc. + + updates per Sven's comments in the PR + + removed duplicate line in tutorials menu.md + + Signed-off-by: Victoria Bialas + (cherry picked from commit 5bc730eda76351ab669a60a5fc95fd273e399d88) + +commit 4180caed474829c7ddaa4fd2c18ebc0504e84a30 +Merge: 79f086dbff 7df94645f0 +Author: Allen Sun +Date: Sun Jun 19 07:08:22 2016 +0800 + + Merge pull request #2357 from axhm3a/master + + fixed backticks typo in configure-tls.md + +commit 22f06e2c3ef0920e31a8f0fbe1b378f314409223 +Author: Victoria Bialas +Date: Fri Jun 17 17:35:14 2016 -0700 + + fix broken links per issue #30 on docs-base-1.12-integration + + Signed-off-by: Victoria Bialas + +commit 4d70fea4c8b20eb6c15c0afee13ae0316f5f2472 +Author: Nathan LeClaire +Date: Fri Jun 17 16:43:17 2016 -0700 + + Bump Docker version for 1.12.0-rc2 + + Signed-off-by: Nathan LeClaire + +commit af7d223f6875ab561e6060b0e18afb2fd5b88ec8 +Author: Charles Smith +Date: Fri Jun 17 16:37:16 2016 -0700 + + add note to Swarm docs to refer to swarm mode in Engine + + Signed-off-by: Charles Smith + +commit 79f086dbff4049e004efadf729fb4f7440266b11 +Merge: 6d5638b95b a897e53dcc +Author: Allen Sun +Date: Sat Jun 18 04:54:58 2016 +0800 + + Merge pull request #2358 from NanXiao/issue-9998 + + Fix typo in cluster/swarm/cluster.go + +commit 906eacd586853e9e79ea2bd5df7e13ba8a28cd60 +Author: Tibor Vass +Date: Fri Jun 17 16:28:45 2016 -0400 + + Bump VERSION to v1.12.0-rc2 + + Signed-off-by: Tibor Vass + +commit 02772750e1e245678cdbdb784999c63cf4351ca2 +Merge: 2ba4108c95 11daa3e417 +Author: Tibor Vass +Date: Fri Jun 17 13:25:47 2016 -0700 + + Merge pull request #23594 from tiborvass/changelog-fix + + v1.12.0: some fixes to CHANGELOG + +commit 2ba4108c95ff2ae7047efdfa3a7940064f80a3d1 +Merge: be67aae778 944a8f16c7 +Author: Tibor Vass +Date: Fri Jun 17 13:20:10 2016 -0700 + + Merge pull request #23661 from tiborvass/cherry-picks-for-1.12.0-rc2 + + Cherry picks for 1.12.0 rc2 + +commit 11daa3e417feeb804a17c9696333181d37e22777 +Author: Tibor Vass +Date: Wed Jun 15 13:36:44 2016 -0700 + + v1.12.0: some fixes to CHANGELOG + + Signed-off-by: Tibor Vass + +commit 944a8f16c7fa25af655ddcafad2be4b9bfc836b2 +Author: Arnaud Porterie (icecrime) +Date: Fri Jun 17 11:38:19 2016 -0700 + + Improve `docker service inspect --pretty` + + Remove capitalization in placement, and remove spurious `\t`. + + Signed-off-by: Arnaud Porterie (icecrime) + (cherry picked from commit 3c60b7b9843276082c0ba4b868f354b9b44e9627) + +commit 70bd46293abcd79c6c6a51199974509d5c69a166 +Author: Tibor Vass +Date: Fri Jun 17 12:02:05 2016 -0700 + + plugins: fix name handling for legacy plugins + + Signed-off-by: Tibor Vass + (cherry picked from commit 8ba17b4823f9a1a40a405905613667d97bb24546) + +commit 6eaac7be89a161eaf9e7ee03005954a7bf0925d4 +Author: Vincent Demeester +Date: Fri Jun 17 18:13:24 2016 +0200 + + Update plugin command with defaulttag + + This way, you don't have to specify the ":latest" tag for some command + and not for others + + Signed-off-by: Vincent Demeester + (cherry picked from commit cb321e82db662f5190a6d83a90677a9dd9fdcd31) + +commit 2ae733014091b11802f3a738e4d3c7f3d21c4af3 +Author: Tibor Vass +Date: Fri Jun 17 09:14:23 2016 -0700 + + plugins: fix usage for plugin commands + + Signed-off-by: Tibor Vass + (cherry picked from commit 65ed9daf70ccf0027f4eac8049667130deb249ed) + +commit 1cfd620124821e35767d2894024f87bba58c413a +Author: Tibor Vass +Date: Fri Jun 17 09:13:35 2016 -0700 + + plugins: remove automatic mounting of a state dir + + Signed-off-by: Tibor Vass + (cherry picked from commit 15ff9de65801178a522c445ff9fb8964e21d12a0) + +commit f24e5d79bc986e111f13568dc8860a44b1eb4cf3 +Author: Tibor Vass +Date: Fri Jun 17 09:12:37 2016 -0700 + + plugins: install should not automatically accept all permissions + + Signed-off-by: Tibor Vass + (cherry picked from commit 4b70d4561e4a9b57d80b70cfebc50831e230735a) + +commit a7c925cba4dd867b8c43aa8238ac90b6dd1d4cf7 +Author: Jana Radhakrishnan +Date: Fri Jun 17 10:27:34 2016 -0700 + + Vendoring libnetwork @13be89d1cf79 + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 70e2585d545e18757222b8ccfb21514fde7c42f4) + +commit bbc214fa9bedbde32c38f9703cbca5e01dd18ce4 +Author: Tonis Tiigi +Date: Fri Jun 17 10:58:11 2016 -0700 + + Add newline to promote/demote message + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 3386e3570a1251bbea5302d8b8e639aaf68436c3) + +commit 8fdc925338961bcf4681656d4d25a5280c9544fb +Author: Jana Radhakrishnan +Date: Fri Jun 17 09:17:03 2016 -0700 + + Check if DriverState is valid before using in convert + + Signed-off-by: Jana Radhakrishnan + (cherry picked from commit 4fea81154b817b09e553308a1595bfd97a8c0582) + +commit 4b2883fac67d87700261699caf8db98a6119d0ab +Author: Anil Madhavapeddy +Date: Fri Jun 17 16:26:47 2016 +0100 + + `docker swarm`: more consistent CLI help + + This changes `docker swarm help` to be consistent with capitals + and removes full stops. + + Before: + + ``` + Commands: + init Initialize a Swarm. + join Join a Swarm as a node and/or manager. + update update the Swarm. + leave Leave a Swarm. + inspect Inspect the Swarm + ``` + + After: + + ``` + Commands: + init Initialize a Swarm + join Join a Swarm as a node and/or manager + update Update the Swarm + leave Leave a Swarm + inspect Inspect the Swarm + ``` + + Signed-off-by: Anil Madhavapeddy + (cherry picked from commit 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8) + +commit 05c32e7f08b7537a460abddd24e0f8eb3934f5f4 +Author: Ke Xu +Date: Fri Jun 17 16:16:13 2016 +0900 + + fix #23017, add zsh completion for dockerd + + Signed-off-by: Ke Xu + (cherry picked from commit bd1fc1e5c26b954fb35f7adda46d764d80a1a570) + +commit 82608cd4ce7e287385dba49fc74dff2db28d31a6 +Author: Anusha Ragunathan +Date: Fri Jun 17 07:44:57 2016 -0700 + + Add disable flag for plugin Install. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4) + +commit fcdd4d4a520955da5ddc71f084ce7996c861deb7 +Author: Harald Albers +Date: Fri Jun 17 08:49:06 2016 +0200 + + bash completion for `docker swarm update --cert-expiry` + + Signed-off-by: Harald Albers + (cherry picked from commit dc2fc75d4260767937d98ea81c51fdea148162b2) + +commit 445f4f2f3e1942eb24e6ba954e6ac83c0a6ed00d +Author: Justin Cormack +Date: Fri Jun 17 15:49:35 2016 +0100 + + Missing line feed after accepting node + + Avoids + ``` + root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80 + Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~# + ``` + + Signed-off-by: Justin Cormack + (cherry picked from commit c34d752419f0e9c17aa759df1a8314974b0d17ed) + +commit b7a1f1a2d15f389fad6352e66c6a82e4025996ab +Author: Justin Cormack +Date: Fri Jun 17 15:27:54 2016 +0100 + + fix invalid typo in error message + + Signed-off-by: Justin Cormack + (cherry picked from commit 2322ccb8fff46a4d3a84f3ef214cb473816374af) + +commit 0d69ee3f8d547c5fd1b88aaa0c25cb3bc5408d02 +Author: George Tankersley +Date: Fri Jun 17 14:09:29 2016 -0400 + + remove literal copy of sync.Mutex from memory store + + Signed-off-by: George Tankersley + +commit a897e53dcc3bf8de4ff3f303346289f3a686ef4f +Author: NanXiao +Date: Fri Jun 17 18:43:21 2016 +0800 + + Fix typo in cluster/swarm/cluster.go + + Signed-off-by: NanXiao + +commit aa1f2418940f666f910c65422134f43b324268a1 +Author: Charles Smith +Date: Thu Jun 16 21:28:07 2016 -0700 + + update output for node commands, minor edits + + Signed-off-by: Charles Smith + (cherry picked from commit 3b2132c2c7f277750edfd9fc76d73dbb9142fde2) + +commit fb364d86fa16f8edf428f86e00c334f3b6d9ea11 +Author: Daniel Nephin +Date: Thu Jun 16 17:55:50 2016 -0400 + + Add some tests for bundlefile and improve the error messages for LoadFile + + Signed-off-by: Daniel Nephin + (cherry picked from commit c0ea589c1b27f8b68e84cfe6692a7639da52ce6d) + +commit d747fbc95c1a7fae0ec3f42d1811a37e4c66ea7a +Author: Victor Vieux +Date: Thu Jun 16 16:39:27 2016 -0700 + + improve some messages in the node subcmds + + Signed-off-by: Victor Vieux + (cherry picked from commit eb962235fbf1579cf36bb0582347e8639ec47205) + +commit 0efe76c62b3d1fbd412331cf8e4474e0625dbf12 +Author: Tonis Tiigi +Date: Thu Jun 16 17:04:56 2016 -0700 + + Add integration test for parsing swarm update options + + Signed-off-by: Tonis Tiigi + (cherry picked from commit a933ac3c27ac88cf69a2bc2bc16ce076486c0206) + +commit ab6abb799b3c7747d7dca2fb52544a4ec30ec0a7 +Author: Tonis Tiigi +Date: Thu Jun 16 17:04:33 2016 -0700 + + Add cert-expiry to swarm update + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56) + +commit 9647e4d6cc5150ea0fa16e56e46eecc9626e49a7 +Author: Brian Goff +Date: Wed Jun 15 13:39:33 2016 -0400 + + Implement plugin restore after daemon restart + + This ensures that: + + - The in-memory plugin store is populated with all the plugins + - Plugins which were active before daemon restart are active after. + This utilizes the liverestore feature when available, otherwise it + manually starts the plugin. + + Signed-off-by: Brian Goff + (cherry picked from commit dfd91873056c172ffc061d882da0cd18204b521a) + +commit be82ff5c7f9ac30d260c460e6f69353e59350ead +Author: Brian Goff +Date: Wed Jun 15 11:21:31 2016 -0400 + + Fix removing plugins + + Signed-off-by: Brian Goff + (cherry picked from commit 5e156fd3d4b21267caca093dd0df7ed6bce85535) + +commit efc10a92efece3fa0720a45b5741f32502663f2f +Author: Tonis Tiigi +Date: Thu Jun 16 16:08:15 2016 -0700 + + Fix removing containers on leaving from pending state + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 826f6f07031abc4dea6f71ed69d33a4e0789ee11) + +commit 3635938b00176a3056f09c32b53bdc66bc55ef3c +Author: Victor Vieux +Date: Thu Jun 16 14:34:28 2016 -0700 + + add some more fields in docker service inspect -p + + Signed-off-by: Victor Vieux + (cherry picked from commit 4c9e21b674046e8a3819cfbbb96f471bd280fba5) + +commit 0cac3c4c23c71e7829af8ca15e6ebbeaf6956e51 +Author: Tonis Tiigi +Date: Thu Jun 16 09:42:22 2016 -0700 + + Return membership status on join without timeout + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 1973cee0cd86da3c7b7002a3fed7af2557df538c) + +commit 01c5b208e8c5f003fea3ca28cc38913b370f74fc +Author: Tonis Tiigi +Date: Wed Jun 15 22:41:43 2016 -0700 + + Update daemon to new swarmkit + + Signed-off-by: Tonis Tiigi + (cherry picked from commit a83bba467a8bd24924b1a0cf55b954ac49937b5b) + +commit 528f3ab668428f84be9ec27512d4d60c45bd1566 +Author: Tonis Tiigi +Date: Wed Jun 15 22:41:30 2016 -0700 + + Update swarmkit to 310f1119 + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 2783568284a0c84bbb53df3c40295d27a151889e) + +commit 56b253fb3cc8bcdf99ff09e96de60b91e1a794d4 +Author: Derek McGowan +Date: Tue Jun 14 22:44:49 2016 -0700 + + Do not show empty tags for digest references in output + + When a repository has a tag and digests, show tag for each digest value. + Do not duplicate rows for the same image name with both tag and digest. + + Signed-off-by: Derek McGowan (github: dmcgowan) + (cherry picked from commit 79eada38141dca71f5195df59882f1cb46657640) + +commit b3387e96ed307cb8967c7ee165574dc342ff0ec3 +Author: Sebastiaan van Stijn +Date: Thu Jun 16 16:42:40 2016 -0700 + + fix "overlay" -> "overlay2" in error message + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 2d4b285a75621604f31058a43cb5ef1d4618533e) + +commit 42f445565daaa086e1031d7cf765ff56fbe26824 +Author: Vincent Demeester +Date: Fri Jun 17 00:47:22 2016 +0200 + + Update ServiceInspectWithRaw + + Signed-off-by: Vincent Demeester + (cherry picked from commit 4a70cb55710a76ee7dfa059c440c34fd6cb84f16) + +commit d9d24b6605218b34b0e3c4051625e1e1e0cda472 +Author: Vincent Demeester +Date: Fri Jun 17 00:33:21 2016 +0200 + + Update docker plugin install code… + + … for more consistency (api side). + + Signed-off-by: Vincent Demeester + (cherry picked from commit 2c82337b0490dc0a5b8329d1f23c6bad00d8551b) + +commit 7444bb2c250d067b0b3a3a764454f024bef42164 +Author: Vincent Demeester +Date: Fri Jun 17 00:32:58 2016 +0200 + + Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c + + Signed-off-by: Vincent Demeester + (cherry picked from commit 58529a15535ee2accafdde740214c0d5b595d6e1) + +commit fdb5324595bfcbd9046a9bdeb5ef23ae8781f451 +Author: Sebastiaan van Stijn +Date: Thu Jun 16 16:29:23 2016 -0700 + + Update docker info output example + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42) + +commit ed01cfc6db892a899b7f79888fb55400c159215f +Author: Madhu Venugopal +Date: Thu Jun 16 14:32:12 2016 -0700 + + Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed + + * fixes https://github.com/docker/docker/issues/23622 + * fixes a memory leak issue with bulk sync + * fixes external DNS resolution issue after live restore + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54) + +commit 213adac2ea5d0b92e7a1e095a9fb9137491c65da +Author: Justin Cormack +Date: Thu Jun 16 23:21:08 2016 +0100 + + Add the seccomp build tag for s390x now runc updated + + This was waiting for runc bump see https://github.com/docker/docker/issues/23171 + runc was bumped in https://github.com/docker/docker/pull/23603 + + Fixes #23171 + + Signed-off-by: Justin Cormack + (cherry picked from commit f8d970169a7ae6dcf46beb69c0367d35d019294e) + +commit 83fbaa3cb4042728082de130a7c6659224b327b2 +Author: Lei Jitang +Date: Thu Jun 16 07:54:36 2016 -0400 + + Fix restore active sandbox + + we store the active sandbox after daemon.containerd.Restore, but there + is a chance the `Restore` will set the container to exit see + (https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469). + so we should check if the container is really running before add it to + activesandbox. + + Signed-off-by: Lei Jitang + (cherry picked from commit 78f3094518b1f3f498bd2629667877f9a87d452f) + +commit 1ad7b517fa4623a07998a932bcf80e0424e61e7c +Author: Yong Tang +Date: Tue Jun 14 07:43:25 2016 -0700 + + Add security info to `docker info` + + The security infomation has already been added to `GET /info` in #21172. + However, it is not part of the output of `docker info` yet. + + This fix adds the security information to `docker info`. + + Additional tests has been added to cover changes. + + This fix fixes #23500. This fix is related to #20909, #21172. + + Signed-off-by: Yong Tang + (cherry picked from commit eee20b564ffae0b8c8043115c959f0f9d1869fed) + +commit 6c3d080e83cd8d1fe2c4e6699c9eccaa56149817 +Author: Stephen J Day +Date: Thu Jun 16 14:54:41 2016 -0700 + + api/client/service: fix minor spelling error in service inspect + + Signed-off-by: Stephen J Day + (cherry picked from commit 920e65ccbca0423c43579c9ce3b9331efe14c97b) + +commit 82453c84baa44212d5b54d79931fc45c5f89dbc5 +Author: Kai Qiang Wu(Kennan) +Date: Tue Jun 14 14:01:41 2016 +0000 + + Add ecryptfs check for overlay2 + + We added docs about ecryptfs check but not in code side. + Also refactor code to make it clean. + + Signed-off-by: Kai Qiang Wu(Kennan) + (cherry picked from commit 136323b04315eceffbed61d680878ed23cecc015) + +commit c73e56fd7ffdfc0b1404ac66039124b7644d7a66 +Author: Sebastiaan van Stijn +Date: Thu Jun 16 11:52:34 2016 -0700 + + docs: move "advisory" to general metadata + + the advisory option should not be + below "menu" + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit aadd88c306d43b401a18a29efafa714f64f87894) + +commit 1e5ee1dd375b3c1d292cd73feb7a98e9e50ce713 +Author: Sainath Grandhi +Date: Thu Jun 16 12:31:23 2016 -0700 + + Fixes #23596-returns empty string for NetworkID in response to /containers/json + + Signed-off-by: Sainath Grandhi + (cherry picked from commit ad85d299066e87cd40afc43ffee8cb73dcc79eb4) + +commit c3015a22cb532a15178a6f08d87930b65a7cc11e +Author: Stephen J Day +Date: Wed Jun 15 20:58:36 2016 -0700 + + api/client/service: list running services over replicas + + To provide users a view of service status, list the number of running + task over the requested number of replicas. + + Signed-off-by: Stephen J Day + (cherry picked from commit b86cb293ecc67e76ec90ec60766f52dad6903eac) + +commit 01d26abd5c08f570654fee1e043e28f1b2dc568f +Author: Tonis Tiigi +Date: Thu Jun 16 12:12:38 2016 -0700 + + Add api tests for secret update + + Signed-off-by: Tonis Tiigi + (cherry picked from commit aed7667bee243b0e0d1aa480e3bb52bae894cfe5) + +commit 7f4bca0f90b3affa7f4992a2d3a44a44c142f41b +Author: Victor Vieux +Date: Wed Jun 15 17:20:18 2016 -0700 + + use same hash for same secret + + Signed-off-by: Victor Vieux + (cherry picked from commit a579ce8ed307024ededd527819bfdbf38e970fbf) + +commit 7cc76facbabadfc73f789d4c693f441210851f0a +Author: Victor Vieux +Date: Wed Jun 15 14:30:54 2016 -0700 + + fix docker swarm init/update --secret + + Signed-off-by: Victor Vieux + (cherry picked from commit 085895342c7f797f0eef7ec956438e33489f211f) + +commit e491dbb38a27dde1484e5a2266f1be86c1f61ad4 +Author: Michael Crosby +Date: Thu Jun 16 11:46:04 2016 -0700 + + Set systemd KillMode + + Change the kill mode to process so that systemd does not kill container + processes when the daemon is shutdown but only the docker daemon + + Signed-off-by: Michael Crosby + (cherry picked from commit db435f526ac5703276ad1add28188c0c8c6e4c2a) + +commit dd5573bc60ba5714cb0519a2878a26f8e942c12b +Author: Sebastiaan van Stijn +Date: Mon Jun 13 17:55:06 2016 +0200 + + Update release script installation instructions + + Instructions for installing the static binaries + has changed, so updated the instructions. + + The comment on top already requires the steps + to be executed as root, so removing the 'sudo' + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit e233c8dd7208b358b950731a6ba93cf9dcb80eb5) + +commit bb8996d62b1e60f1d7a1e3a079815b35d03c7986 +Author: Daniel Nephin +Date: Wed Jun 15 13:11:23 2016 -0400 + + Fix String() for some option types + + and add unit tests for them. + + Signed-off-by: Daniel Nephin + (cherry picked from commit c26e7d8c9105e16048268a01dd1e556af43902cd) + +commit 2401c0223df828226df013902d1ef7b33f90002a +Author: Adrian Moisey +Date: Wed Jun 15 12:38:02 2016 +0200 + + Fix URL to issue + + Signed-off-by: Adrian Moisey + (cherry picked from commit 88d4da7f422a4ac341efa85541271b1c0e9bcfa3) + +commit af3b1c7370a8bae2d1ee1162b2feb5482270521e +Author: Sven Dowideit +Date: Thu Jun 16 11:33:12 2016 +0000 + + advisory can't be in the [menu] section + + Signed-off-by: Sven Dowideit + (cherry picked from commit bc033cb706fd22e3934968b0dfdf93da962e36a8) + +commit 979ad079254df3cdb2264f5374b79c7f20b27785 +Author: Thomas Leonard +Date: Thu Jun 16 13:07:06 2016 +0100 + + Remove out-of-date health test + + The test was waiting for the container to exit after failing its + healthcheck. However, we no longer automatically terminate containers, + so this waited instead for the container to time-out by itself. + + Signed-off-by: Thomas Leonard + (cherry picked from commit 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8) + +commit 3e44703caea49159a58ff3f9d5e2f5b4a40d7317 +Author: Anusha Ragunathan +Date: Wed Jun 15 10:18:55 2016 -0700 + + Add basic integration tests for plugins. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit a2d48c9e4e2abadcba582de47891837b0a80b24c) + +commit c82f23095a02ea05d778843b865477f90df02244 +Author: Anusha Ragunathan +Date: Wed Jun 15 10:29:01 2016 -0700 + + Add accept-permissions flag for install. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit ec4857da485768db8dadda3511122d136d896dde) + +commit 187b6607a4c6de1416afc052c32bb0a14ccb97a9 +Author: Arnaud Porterie (icecrime) +Date: Wed Jun 15 21:13:04 2016 -0700 + + Service `--update-parallelism` defauls to 0 + + The `--update-parallelism` flaag should default to 0, which is + interpreted by the backend as unlimited. In other words, by default all + services should update simultaneously. + + Signed-off-by: Arnaud Porterie (icecrime) + (cherry picked from commit f22d0174f33e084445c5845c95aca346e187fb02) + +commit 5e41ec703d9e335269a9c1f7c8053b09d8d487ec +Author: Tom Barlow +Date: Wed Jun 15 15:41:57 2016 +0100 + + Change 'invald' to 'invalid' in volume opts errors + + Signed-off-by: Tom Barlow + (cherry picked from commit bf988fc6ff90e1477d3fdab79cc7239511f32aba) + +commit ad2821698757d702389f9c0841130336cc5648e5 +Author: Justin Cormack +Date: Wed Jun 15 16:25:27 2016 -0400 + + Move mlock back into the default ungated seccomp profile + + Do not gate with CAP_IPC_LOCK as unprivileged use is now + allowed in Linux. This returns it to how it was in 1.11. + + Fixes #23587 + + Signed-off-by: Justin Cormack + (cherry picked from commit bdf01cf5deee11deb426eb33e1c8433c410084b6) + +commit d2a9560e71d443b6cb75f27d158a2f215e5bbca0 +Author: Anusha Ragunathan +Date: Wed Jun 15 09:17:05 2016 -0700 + + Avoid back and forth conversion between strings and bytes. + + Signed-off-by: Anusha Ragunathan + (cherry picked from commit d6d448aab8e303a351b763f6a77b909fadb7344b) + +commit 41d72e28c3444b97278df0b011adf7bb6764cf24 +Author: Daniel Nephin +Date: Wed Jun 15 17:57:59 2016 -0400 + + Change SCALE to REPLICAS. + + Signed-off-by: Daniel Nephin + (cherry picked from commit 4df03499486a7f62f94bd1fb8e2625b0ef932fe5) + +commit e324ec639bb582c2b0275d15ab9aadcd80417026 +Author: Kenfe-Mickael Laventure +Date: Tue Jun 14 18:59:22 2016 -0700 + + Fix TestRunWithRuntime* on arm + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit bd6317031bb8f7e1a82cbfd254fe60e0de703524) + +commit cdb04519e238d658825f6db8437b389d7dfd88f2 +Author: Michael Crosby +Date: Wed Jun 15 15:07:04 2016 -0700 + + Update libnetwork to 96d45528599c32354230480a1ebc0 + + This fixes an issue with hanging tests due to store. + + Fixes #23560 + + Signed-off-by: Michael Crosby + (cherry picked from commit e927df7b4b58099113b5086371b1d80ff517f564) + +commit 38305cb67608ee0b909c8639f41ef8dab8bd3255 +Author: Victoria Bialas +Date: Wed Jun 15 18:22:24 2016 -0700 + + fixing links and merge conflicts + + updated link to faqs/troubleshoot to point to new location /toolbox + + fixed docker-for-mac link error + + Signed-off-by: Victoria Bialas + (cherry picked from commit 1d80f8ca193139755de935fa6567a32734038cac) + +commit 2b36087597b67b23c8309fe9330a60f17952496b +Author: Shoubhik Bose +Date: Tue Jun 14 09:44:09 2016 +0000 + + Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7 + + Signed-off-by: Shoubhik Bose + (cherry picked from commit d3fad80cc7823eddb823dd53424a28ee81043f18) + +commit 7af9b80f23ba76f749d771c9e0a922862c6eb25f +Author: Sven Dowideit +Date: Wed Jun 15 04:46:40 2016 +0000 + + fix links for #23505 + + Signed-off-by: Sven Dowideit + (cherry picked from commit fa94eb46041ad309468dbbd29faba2053f402096) + +commit 60a86590aa610b55d94422aabba70e883af5c392 +Author: Madhu Venugopal +Date: Tue Jun 14 14:55:05 2016 -0700 + + Use service alias and configure container's --net-alias + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f) + +commit 588b76c2a17630762f42c3d5f9dc256b40818fec +Author: Madhu Venugopal +Date: Tue Jun 14 19:47:35 2016 -0700 + + Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit 5af8e2a9c08439049da9a9abc24145c3d1f2e9de) + +commit f1d5c3374c98a93e6202a0181f5cde02332b34eb +Author: Madhu Venugopal +Date: Tue Jun 14 19:40:25 2016 -0700 + + Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 + + Signed-off-by: Madhu Venugopal + (cherry picked from commit f2f97f768e51f817336cd56456158bc32ab3b977) + +commit ca16a4c81d1160368307d883beb4e7bb6c67dace +Author: Tonis Tiigi +Date: Wed Jun 15 10:18:18 2016 -0700 + + Fix hanging integration tests + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 22f827ababc1910bc48762d7980913497dbc915d) + +commit 034d555d300ef5c8b0fd4f03baeb553da38397a2 +Author: Antonio Murdaca +Date: Mon Jun 6 11:57:11 2016 +0200 + + daemon: allow tmpfs to trump over VOLUME(s) + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 756f6cef4a1379e59d6511ee000e435d23659153) + +commit ce6211d2528082d58aab4fa7c90bcf75457948fe +Author: Akihiro Suda +Date: Wed Jun 15 11:19:03 2016 +0900 + + Update experimental/README.md + + Signed-off-by: Akihiro Suda + (cherry picked from commit fec98ecca1d82ec1f2e0bd4d5e2c180ef834dc52) + +commit 92ff142da2f17f792f2ec7f4047b21339d8f8f76 +Author: Victoria Bialas +Date: Mon Jun 13 11:08:11 2016 -0700 + + surfacing Learn by example topics to top level of Docker Engine docs + fixing links after moving surfacing tutorials + + fixing more links for the newly located tutorials + + WIP: merging 3 getting started tutorials into one to cover all platforms, added new files + + fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win + + Signed-off-by: Victoria Bialas + (cherry picked from commit 0254c12e1e0be7a93e3b28e61586ac66168a9b7c) + +commit c816f2c905b5918f298c08b62b8b8c3143562672 +Author: Drew Erny +Date: Tue Jun 14 17:50:02 2016 -0700 + + Remove the node leader column, show leader as status. + + Removes the leader column from node ls and shows whether a node is the + leader in the manager status column instead. + + Signed-off-by: Drew Erny + (cherry picked from commit 4104c1dc131b62c033c702719909815fba679774) + +commit 7df94645f0ca3cb7e949d0f52227b10e057ac566 +Author: Daniel Basten +Date: Fri Jun 17 08:08:33 2016 +0200 + + fixed backticks typo in configure-tls.md + + Signed-off-by: Daniel Basten + +commit e0f604dbfa3922cd731bb1912d2147a3e9a26625 +Author: Joao Fernandes +Date: Thu Jun 16 17:10:52 2016 -0700 + + Updates docs with links to KB + +commit be67aae778a3fbbbca24064629e8b46721e4ccd1 +Merge: 1f136c1f85 301f3d776f +Author: Michael Crosby +Date: Thu Jun 16 14:30:54 2016 -0700 + + Merge pull request #23627 from mlaventure/update-runc-on-1.12 + + Update runc on 1.12 + +commit d1e910ba5ddd793b5ac18784571f0e9ee38d5c5a +Merge: 2e1e07e3da 0119f5b5c8 +Author: Riyaz Faizullabhoy +Date: Thu Jun 16 10:32:36 2016 -0700 + + Merge pull request #748 from HuKeping/feature-hot-reload + + Feature: increase/decrease logging level without restarting + +commit 301f3d776f8b272b9cc977b1ca91704d60eeb027 +Author: Kenfe-Mickael Laventure +Date: Thu Jun 16 09:06:53 2016 -0700 + + Revert build-{deb,rpm} to cloning from opencontainers repository + + Signed-off-by: Kenfe-Mickael Laventure + +commit 9eb6e049bd1569dba9eed15bbf444074a374a9d2 +Author: Kenfe-Mickael Laventure +Date: Wed Jun 15 14:57:34 2016 -0700 + + Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit b675124cf5fc96a6c329b5580ef60304089270c6) + +commit 6d5638b95b379df3ade31d6cb982dd8ea7acb340 +Author: Doron Podoleanu +Date: Thu Jun 16 02:56:03 2016 +0300 + + Create in engine.go renamed to CreateContainer (#2283) + + * Create in engine.go renamed to CreateContainer + + Signed-off-by: Doron Podoleanu + +commit 9a3996f7c3dea2d5934a387d4e8b99c144af8246 +Merge: 68aa0856fd bbe879b266 +Author: David Gageot +Date: Thu Jun 16 01:07:22 2016 +0200 + + Merge pull request #513 from londoncalling/add-d4mac-win-links + + added Mac, Win install steps to Toolbox, and links btwn 3-in-1 getsta… + +commit 68aa0856fdb34216979eccd195edb3991d57e398 +Author: Nathan LeClaire +Date: Wed Jun 15 12:58:41 2016 -0700 + + Use test.docker.com for RCs + + Signed-off-by: Nathan LeClaire + +commit edd7cb5249d0a45262b20bb58b838ecf4fb368bd +Merge: e472758825 afb262bd5f +Author: Richard Scothern +Date: Wed Jun 15 10:33:48 2016 -0700 + + Merge pull request #1739 from cezarsa/master + + [Swift] Expose EndpointType parameter in driver + +commit b47a5644e7239e8041a1337bc2ba2444554904e5 +Author: Nathan LeClaire +Date: Wed Jun 15 09:39:25 2016 -0700 + + Bump changes for 1.12.0-rc1 + + Signed-off-by: Nathan LeClaire + +commit bca4af7130b6d018a632b65bdae73b31205ef94f +Merge: 91ec013436 9e0aec6b8c +Author: Nathan LeClaire +Date: Wed Jun 15 09:33:52 2016 -0700 + + Merge pull request #3510 from nathanleclaire/0.8.0-script + + 0.8.0 release tasks + +commit 0119f5b5c8a108f1061d0edc3cbd6aa58202f003 +Author: HuKeping +Date: Wed Jun 15 05:00:30 2016 +0800 + + Add some user guide for notary-server + + About how to increase/decrease logging level via system signal. + + Signed-off-by: Hu Keping + +commit 783a7e2286abb94b1fe661c88ede458b10d533ac +Author: HuKeping +Date: Tue Jun 14 16:51:42 2016 +0800 + + Add newline to flush the stdout + + Otherwise it will not print anything until the flag for flush + is coming. + + Signed-off-by: Hu Keping + +commit 4d1a985cae70ff3224856b4219adca8800bb6f01 +Author: HuKeping +Date: Tue Jun 14 16:06:08 2016 +0800 + + Clean up + + Fix typo , update docs and remove some unused code. + + From riyazdf's comment. + + Signed-off-by: Hu Keping + +commit 0845fed7e73414f3ede7126642951514ba4a6fcb +Author: HuKeping +Date: Sat Jun 11 08:02:21 2016 +0800 + + Revert the code about hot reloading the whole config file + + After disscussing with the team, we all agreed that it might not + make sense to completely reload the whole config file yet at present. + + Instead, a graceful shutdown would be a better choice. + + Signed-off-by: Hu Keping + +commit 784eb3737a23a72e23a134edca648d1332f9c658 +Author: HuKeping +Date: Thu Jun 9 14:44:47 2016 +0800 + + Fix error message when failed to reload logging level + + From riyazdf's comments. + + Signed-off-by: Hu Keping + +commit eb8b53bacbae57ae9bf915a180a4fb2716c56641 +Author: HuKeping +Date: Tue May 31 03:21:59 2016 +0800 + + [PATCH 8/8] Add docs for the hot configuration reload + + Signed-off-by: Hu Keping + +commit 68cb2f3f822e82a27f8e0219f04c7c100ecf498f +Author: HuKeping +Date: Fri May 27 22:12:40 2016 +0800 + + [PATCH 7/8] Add test for reloadConfig + + From NathanMcCauley's review + + Signed-off-by: Hu Keping + +commit 229cf08cc94a1fb026a3382b2046bf1bbf2ee520 +Author: HuKeping +Date: Fri May 20 04:52:12 2016 +0800 + + [PATCH 6/8] Feature: hot configuration reload for notary server + + This patch will allow people to use SIGHUP to tell notary server to + reload the configuration file. + + For now it only supports to reload the logging level. + + Signed-off-by: Hu Keping + +commit d2149d804b8842af2e49a8dc2c1eac1fc7dd9974 +Author: HuKeping +Date: Fri May 20 04:38:12 2016 +0800 + + [PATCH 5/8] Introduce a signal constant to reload the configuration. + + Signed-off-by: Hu Keping + +commit 651ed6ea86ac228183ee826f6afc540883accfdc +Author: HuKeping +Date: Sat May 14 17:43:15 2016 +0800 + + [PATCH 4/8] Feature: hot increment/decrement logging level for notary server + + This patch will allow people to: + - use SIGUSR1 to increment the logging level + - use SIGUSR2 to decrement the logging level + + And it will allow the logging level to be turned up or down as much as + desired by sending the appropriate signal multiple times. + + Signed-off-by: Hu Keping + +commit 1110a5eae87198f40549ebfb04b5ca9e9395cc32 +Author: HuKeping +Date: Sat May 14 21:16:03 2016 +0800 + + [PATCH 3/8] Add two constants to describe the signals we would like to handle + + Signed-off-by: Hu Keping + +commit 9b096b7c94a9ffbcca94a155a5972657e79e996f +Author: HuKeping +Date: Sat May 14 20:36:47 2016 +0800 + + [PATCH 2/8] Add test for the helper function + + Signed-off-by: Hu Keping + +commit 9337c344edada11d5e52c5dc68158bd3b113bbd2 +Author: HuKeping +Date: Sat May 14 20:21:06 2016 +0800 + + [PATCH 1/8] Add a helper function to increase/decrease log level + + Signed-off-by: Hu Keping + +commit bbe879b266b5955979e0ea59e05b5f93f3517403 +Author: Victoria Bialas +Date: Tue Jun 14 20:58:37 2016 -0700 + + added Mac, Win install steps to Toolbox, and links btwn 3-in-1 getstarted tutorial + + fixed one local broken link + + fixed two linkes to reference full path including index.md + + Signed-off-by: Victoria Bialas + +commit 1f136c1f8589dc5f7b9ea102df9a30e2443beb1d +Author: Tibor Vass +Date: Tue Jun 14 23:32:01 2016 -0400 + + bump VERSION to v1.12.0-rc1 + + Signed-off-by: Tibor Vass + +commit c293f64dc0afae8212463e3f4ab65961bbf07f23 +Merge: aab402731f adbf43fe10 +Author: Michael Crosby +Date: Tue Jun 14 21:35:39 2016 -0700 + + Merge pull request #23564 from tiborvass/fix-changelog + + v1.12.0: fixed date in CHANGELOG to be in YYYY-MM-DD form + +commit adbf43fe10a3ec492aac19b704c3e506602f00cd +Author: Tibor Vass +Date: Tue Jun 14 21:33:17 2016 -0700 + + v1.12.0: fixed date in CHANGELOG to be in YYYY-MM-DD form + + Signed-off-by: Tibor Vass + +commit aab402731f3d711fe82e8d35f4b12ee70a9e7ef6 +Merge: 427738d81f e2b7f648f4 +Author: Arnaud Porterie +Date: Wed Jun 15 04:14:13 2016 +0000 + + Merge pull request #23563 from icecrime/i_trust_crosbymichael + + Use runc from crosbymichael's fork + +commit e2b7f648f454e4a903edb4decacf0da7420cb23d +Author: Arnaud Porterie (icecrime) +Date: Tue Jun 14 21:10:38 2016 -0700 + + Use runc from crosbymichael's fork + + Signed-off-by: Arnaud Porterie (icecrime) + +commit 19d3eb2a766b20ddeb05bfe25fe28668ab3d1480 +Author: Sven Dowideit +Date: Wed Jun 15 03:52:46 2016 +0000 + + Fix moved tutorial link + + Signed-off-by: Sven Dowideit + +commit 427738d81f39306a6a76b956fe8b32061e61c546 +Author: Tibor Vass +Date: Tue Jun 14 20:12:57 2016 -0700 + + v1.12.0: first draft of CHANGELOG additions + + Signed-off-by: Tibor Vass + +commit 9ba0504923879f65d880e3c928c3964d8cbefc6c +Merge: 2e9aac59e2 78a48af37b +Author: Arnaud Porterie +Date: Wed Jun 15 02:36:42 2016 +0000 + + Merge pull request #23554 from vieux/node_update_name + + fix docker node update via name + +commit 2e9aac59e20ee376da32c5c85e1b392fc555f9c9 +Merge: bd92dd29b9 e6e1fd5d06 +Author: Arnaud Porterie +Date: Wed Jun 15 02:36:17 2016 +0000 + + Merge pull request #23553 from icecrime/heartbeat_as_duration + + Make `--dispatcher-heartbeat-period` a duration + +commit bd92dd29b9436f4e6a16904e92ce2d965e994d2c +Merge: 91197953d0 dcfe99278d +Author: Arnaud Porterie +Date: Wed Jun 15 02:33:56 2016 +0000 + + Merge pull request #23531 from tonistiigi/rm-race + + Fix race on force deleting container created by task + +commit 91197953d07843e34f02d6d2dc435cc4c43dfec1 +Merge: 574f7d2149 7d0689a8d3 +Author: Arnaud Porterie +Date: Wed Jun 15 02:33:16 2016 +0000 + + Merge pull request #23524 from aboch/restore + + Daemon to support network restore + +commit 574f7d2149930749256d075e2f60614ea97c85ae +Merge: c0677565dc b38408fd02 +Author: Arnaud Porterie +Date: Wed Jun 15 02:25:31 2016 +0000 + + Merge pull request #23551 from tonistiigi/update-swarmkit + + Update swarmkit to 25572005f + +commit c0677565dc99c67edea0e109e86a7a3dbaca28ac +Merge: aa1b507af6 ae816baa3c +Author: Arnaud Porterie +Date: Wed Jun 15 02:22:01 2016 +0000 + + Merge pull request #23522 from docker/swarm-stack + + Add experimental Docker Stack CLI commands + +commit 2e1e07e3dae5bea41219d1108c1c009071954283 +Merge: acc4e1b1fa 2bee3f72f2 +Author: Riyaz Faizullabhoy +Date: Tue Jun 14 19:19:31 2016 -0700 + + Merge pull request #786 from avaid96/nearexpirywarnings + + Nearexpirywarnings for re-signing roles on read or write + +commit aa1b507af6a0c17ea35301d911109db1bb88dd7d +Merge: e087ba4633 1d380243fc +Author: Tõnis Tiigi +Date: Tue Jun 14 19:08:46 2016 -0700 + + Merge pull request #23552 from vieux/prevent_panics + + prevent some panics in 'service update' + +commit e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb +Author: Arnaud Porterie (icecrime) +Date: Tue Jun 14 17:36:37 2016 -0700 + + Make `--dispatcher-heartbeat-period` a duration + + Make `--dispatcher-heartbeat-period` a duration in `docker swarm + update`, allowing to express the value as "5s", "1h", etc. + + Signed-off-by: Arnaud Porterie (icecrime) + +commit 2bee3f72f2355ded65e5afe1a949e86f6b2a7d15 +Author: avaid96 +Date: Tue Jun 14 11:35:12 2016 -0700 + + added nearexpiry functionality and removed an unused testutil function + + Signed-off-by: avaid96 + +commit e4727588258350009f330f8599ec6358c7f84498 +Merge: 879dc2fa38 51be30beb1 +Author: Sven Dowideit +Date: Wed Jun 15 10:57:13 2016 +1000 + + Merge pull request #1788 from SvenDowideit/move-build-doc + + Move the building.md doc to the top of the git repo + +commit 51be30beb11fe3c0b03ae24d999d6ba7fff159e0 +Author: Sven Dowideit +Date: Tue Jun 14 04:22:17 2016 +0000 + + Move the building.md doc to the top of the git repo + + Closes #1776 + + Signed-off-by: Sven Dowideit + +commit e087ba4633c948f00ca3d92c9906fc4cc5db06db +Merge: cd03a68d31 c21f861327 +Author: Arnaud Porterie +Date: Wed Jun 15 00:43:58 2016 +0000 + + Merge pull request #23548 from vieux/no_more_reject + + no more 'docker node reject' in docs + +commit cd03a68d31b33f0020a838bda25c0135f11479e3 +Merge: 6ed921dc38 e07d78d247 +Author: Michael Crosby +Date: Tue Jun 14 17:43:52 2016 -0700 + + Merge pull request #23530 from crosbymichael/exp-tests + + Kill containers after restart tests + +commit 6ed921dc38be582939966f71a01ec10f03ed531f +Merge: 93daa10e3e e79873c27c +Author: Brian Goff +Date: Tue Jun 14 20:32:14 2016 -0400 + + Merge pull request #23446 from tiborvass/plugins-experimental + + Plugins: experimental support for new plugin management + +commit b38408fd0287a5d6eda4f8083b83806faf5d5cbd +Author: Tonis Tiigi +Date: Tue Jun 14 17:03:46 2016 -0700 + + Update drain test + + With the rolling update there can be a possibility + that the container count matches the update has + completely finished yet. + + The actual bug for the flakiness was fixed with the + swarmkit update. + + Signed-off-by: Tonis Tiigi + +commit 25a89d73e57e46dd23caebcb6446c7edd6e07f56 +Author: Tonis Tiigi +Date: Tue Jun 14 17:23:01 2016 -0700 + + Update daemon to new swarmkit + + Signed-off-by: Tonis Tiigi + +commit cdf279d74df05b2ce2a051fc5b53533ac5249f16 +Author: Tonis Tiigi +Date: Tue Jun 14 17:07:14 2016 -0700 + + Update swarmkit to 25572005f + + Signed-off-by: Tonis Tiigi + +commit 93daa10e3ed326ce01cd18904824b0406fe86eb1 +Merge: 381a152793 7b0c3066e3 +Author: Tibor Vass +Date: Tue Jun 14 17:04:59 2016 -0700 + + Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions + + update formatting for variables, clarify text in certain topics + +commit 381a15279374b482a8257ee277488ae562cf61a1 +Merge: 8a6cb9c19f 98880d8b39 +Author: Tibor Vass +Date: Tue Jun 14 17:04:34 2016 -0700 + + Merge pull request #23547 from icecrime/update_api_reference + + Update API reference + +commit d8e7932be4961fdaa96fbe9d21d0aad96a845287 +Merge: a84967a1a8 fa4325ad6f +Author: Nishant Totla +Date: Tue Jun 14 16:55:42 2016 -0700 + + Merge pull request #2350 from nishanttotla/bump-v1.2.4-rc1 + + Bump version to 1.2.4-rc1 + +commit fa4325ad6fc408d2f03d25ff174b9cc67b3164d2 +Author: Nishant Totla +Date: Tue Jun 14 16:49:45 2016 -0700 + + Bump version to 1.2.4-rc1 + + Signed-off-by: Nishant Totla + +commit dcfe99278db113e79dc037a6f854f4cea9eebe22 +Author: Tonis Tiigi +Date: Tue Jun 14 11:11:43 2016 -0700 + + Fix race on force deleting container created by task + + Signed-off-by: Tonis Tiigi + +commit 7d0689a8d35e4dd7d569e552957a20ba287c95e6 +Author: Lei Jitang +Date: Tue Jun 14 11:14:33 2016 -0700 + + Add test case for network restore + + Signed-off-by: Lei Jitang + +commit ecffb6d58cf89371e3f4a20f55c2e614dbdfe880 +Author: Lei Jitang +Date: Tue Jun 14 09:13:53 2016 -0700 + + Daemon to support network restore + + Signed-off-by: Lei Jitang + +commit 98880d8b3938a5cb1b5d7970cbb8efb849a9f97d +Author: Arnaud Porterie (icecrime) +Date: Tue Jun 14 16:41:10 2016 -0700 + + Update API reference + + Signed-off-by: Arnaud Porterie (icecrime) + +commit 7b0c3066e30d721fb9efbac74e9675e1baeb019a +Author: Charles Smith +Date: Tue Jun 14 16:29:10 2016 -0700 + + update formatting for variables, clarify text in certain topics + + Signed-off-by: Charles Smith + +commit 9e0aec6b8c08844176a192102ba1620d1cb5d26b +Author: Nathan LeClaire +Date: Tue Jun 14 16:18:03 2016 -0700 + + Update changelog for release 0.8.0 + + Signed-off-by: Nathan LeClaire + +commit 4357f4ca3b29c738a43dadc716dde645ac236e01 +Author: Nathan LeClaire +Date: Tue Jun 14 16:17:47 2016 -0700 + + Update release script to work with any version pattern + + Signed-off-by: Nathan LeClaire + +commit e07d78d247c796236e92faed6cfbe05177691d95 +Author: Michael Crosby +Date: Tue Jun 14 11:06:11 2016 -0700 + + Kill containers after restart tests + + Signed-off-by: Michael Crosby + +commit 8a6cb9c19f5080cbaccdfc1af72ca29b1a715ae5 +Merge: 93ef595eb5 e6f2e7646c +Author: Michael Crosby +Date: Tue Jun 14 16:08:34 2016 -0700 + + Merge pull request #23535 from dmcgowan/cleanup-symlinks-overlay2 + + Remove symlinks on layer removal for overlay2 + +commit 93ef595eb5d1bf0a0abf062ad921ac318d20d720 +Merge: c97fdbe3c5 35e2970b98 +Author: Sebastiaan van Stijn +Date: Wed Jun 15 00:55:40 2016 +0200 + + Merge pull request #23476 from mgoelzer/docker112_bash_completions + + Bash tab completions for subcommands swarm, service and node + +commit 78a48af37bec95f010d3355e1434793ff266d12e +Author: Victor Vieux +Date: Tue Jun 14 15:55:34 2016 -0700 + + fix docker node update via name + + Signed-off-by: Victor Vieux + +commit e79873c27c2b3f404db02682bb4f11b5a046602e +Author: Sebastiaan van Stijn +Date: Thu Jun 9 23:57:15 2016 +0200 + + docker plugin commandline reference + + Signed-off-by: Sebastiaan van Stijn + +commit c97fdbe3c5954b2685a8b140f595f06b09191956 +Merge: a0e992eff7 1c4efb6aa0 +Author: Michael Crosby +Date: Tue Jun 14 15:47:54 2016 -0700 + + Merge pull request #23415 from aboch/ll + + Allow user to specify container's link-local addresses + +commit a0e992eff7055e1300fdcdf955c109a9904b0e1d +Merge: 3f0dbc89b8 1b2c59bf86 +Author: Arnaud Porterie +Date: Tue Jun 14 22:41:08 2016 +0000 + + Merge pull request #23525 from dnephin/fix_service_update_repliacs + + Fix service update replicas + +commit 1d380243fcfaab2f4f82fa594e25aae3626ec03d +Author: Victor Vieux +Date: Tue Jun 14 15:37:27 2016 -0700 + + prevent some panics in 'service update' + + Signed-off-by: Victor Vieux + +commit 3f0dbc89b8d27238544c9a0ea9aaafd7a2731206 +Merge: 067b510dfc 9c52b11e2a +Author: Michael Crosby +Date: Tue Jun 14 15:34:21 2016 -0700 + + Merge pull request #23540 from cpuguy83/fix_test_cleanup_mounts + + TestCleanupMountsAfterGracefulShutdown wait for daemon exit + +commit ae816baa3c36aaec5e3b7c31425b620b4709ab50 +Author: Arnaud Porterie (icecrime) +Date: Tue Jun 14 15:31:45 2016 -0700 + + Add experimental documentation for stacks + + Signed-off-by: Arnaud Porterie (icecrime) + +commit 067b510dfc5b90a1d7712c89e857b6dafb184f24 +Merge: 1704914d7c de22669377 +Author: Sebastiaan van Stijn +Date: Wed Jun 15 00:28:09 2016 +0200 + + Merge pull request #23543 from LK4D4/move_sysctls_docs + + docs: move sysctls docs to current API version + +commit de22669377d074a2594de33be01ae4d9723283a8 +Author: Alexander Morozov +Date: Tue Jun 14 15:14:16 2016 -0700 + + docs: move sysctls docs to current API version + + Signed-off-by: Alexander Morozov + +commit c21f8613275ca546b1310999d8714ff2609f33e3 +Author: Victor Vieux +Date: Tue Jun 14 14:55:25 2016 -0700 + + no more 'docker node reject' in docs + + Signed-off-by: Victor Vieux + +commit a84967a1a82c1cd164b8a2ba0a9ffbcfa29d9bb2 +Merge: b3205ca161 63997947bc +Author: Alexandre Beslic +Date: Tue Jun 14 14:44:10 2016 -0700 + + Merge pull request #2314 from thaJeztah/update-docs-maintainers + + Update docs maintainers + +commit b3205ca161b9d40a27969527b814a87f63c7c7d5 +Merge: 1675c4ca85 e782541d99 +Author: Dongluo Chen +Date: Tue Jun 14 14:34:20 2016 -0700 + + Merge pull request #2288 from nishanttotla/refactoring-img-handling + + Refactoring code around image ref generation + +commit 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002 +Author: Alessandro Boch +Date: Thu Jun 9 15:10:59 2016 -0700 + + Allow user to specify container's link-local addresses + + Signed-off-by: Alessandro Boch + +commit 879dc2fa389942b9d26b8d353531a80cb395884a +Merge: f4296d55fc c0987a9e1b +Author: Charles Smith +Date: Tue Jun 14 14:20:35 2016 -0700 + + Merge pull request #1791 from londoncalling/fix-broken-links-PR-23492 + + fixed broken link due to topic re-org in PR#23492 + +commit f37117045c5398fd3dca8016ea8ca0cb47e7312b +Author: Tibor Vass +Date: Mon May 16 11:50:55 2016 -0400 + + plugins: experimental support for new plugin management + + This patch introduces a new experimental engine-level plugin management + with a new API and command line. Plugins can be distributed via a Docker + registry, and their lifecycle is managed by the engine. + This makes plugins a first-class construct. + + For more background, have a look at issue #20363. + + Documentation is in a separate commit. If you want to understand how the + new plugin system works, you can start by reading the documentation. + + Note: backwards compatibility with existing plugins is maintained, + albeit they won't benefit from the advantages of the new system. + + Signed-off-by: Tibor Vass + Signed-off-by: Anusha Ragunathan + +commit e5b7d36e9954ffd8c199c0fcfaa0b9f4bfdeb196 +Author: Tibor Vass +Date: Mon Jun 13 22:01:08 2016 -0700 + + plugins: vendor engine-api to import new plugin types + + Signed-off-by: Tibor Vass + +commit 1675c4ca85807580d1396fb86e6337a51db89f0a +Merge: 0121b63c22 a3f9817fb6 +Author: Nishant Totla +Date: Tue Jun 14 14:17:30 2016 -0700 + + Merge pull request #2271 from abronan/fix_leader_election_test + + integration: increase retry for leader election store failure test + +commit 9c52b11e2a92a2c5f78d18ae95ba8d79b149d9e2 +Author: Brian Goff +Date: Tue Jun 14 16:41:29 2016 -0400 + + TestCleanupMountsAfterGracefulShutdown wait for daemon exit + + Signed-off-by: Brian Goff + +commit c0987a9e1b7384905e07e584c779ff753d831b4c +Author: Victoria Bialas +Date: Tue Jun 14 13:56:17 2016 -0700 + + fixed broken link due to topic re-org in PR#23492 + + Signed-off-by: Victoria Bialas + +commit 5b79122146008e21a01419953bab2d905c94568d +Author: Alessandro Boch +Date: Tue Jun 14 13:45:24 2016 -0700 + + Vendoring libnetwork 452dff1 + + Signed-off-by: Alessandro Boch + +commit 1b2c59bf86a67f7238df07b860234b02478f7371 +Author: Daniel Nephin +Date: Tue Jun 14 12:33:50 2016 -0400 + + Use constants for flag names. + + Signed-off-by: Daniel Nephin + +commit 1704914d7cf8318a69ba9712f664cd031b6e61f6 +Merge: 6381ed14d1 19d6960b5b +Author: Arnaud Porterie +Date: Tue Jun 14 20:42:05 2016 +0000 + + Merge pull request #23533 from dnephin/remove_old_cmd_tag + + Remove CmdTag + +commit 0de9a1b3884468d57279c4cb337ac3f0ad05e216 +Merge: 6c29830127 9bf6bc6dbd +Author: Joffrey F +Date: Tue Jun 14 13:06:29 2016 -0700 + + Merge pull request #3598 from docker/bump-1.8.0-rc1 + + Bump 1.8.0 rc1 + +commit 35e2970b984971465b107aec1e6f2e9c274183f4 +Author: Mike Goelzer +Date: Sun Jun 12 10:05:22 2016 -0700 + + Update bash completion for Docker 1.12 CLI commands + + Signed-off-by: Mike Goelzer + +commit e6f2e7646c813e8225b0bc16d3a0c13c76a9cd97 +Author: Derek McGowan +Date: Tue Jun 14 12:40:35 2016 -0700 + + Remove symlinks on layer removal for overlay2 + + Symlinks are currently not getting cleaned up when removing layers since only the root directory is removed. + On remove, read the link file and remove the associated link from the link directory. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 9bf6bc6dbdb42c61defe97b98ec83f5f6ba63b98 +Author: Joffrey F +Date: Tue Jun 14 11:33:45 2016 -0700 + + Bump 1.8.0-rc1 + + Signed-off-by: Joffrey F + +commit 80afbd3961800532d184a5b04b57a2f411bdb8c3 +Author: Joffrey F +Date: Tue Jun 14 12:23:04 2016 -0700 + + Skip TLS version test if TLSv1_2 is not available on platform + + Signed-off-by: Joffrey F + +commit 19d6960b5bab7598b15091e5d9e9ee3b24537511 +Author: Daniel Nephin +Date: Tue Jun 14 15:09:38 2016 -0400 + + Remove CmdTag. + + This file was accidentally re-added as part of a rebase. + + Signed-off-by: Daniel Nephin + +commit 6381ed14d13b57873eb985380e52c9ff4fd94b98 +Merge: 87f31e379d 77efe6dffc +Author: Michael Crosby +Date: Tue Jun 14 11:59:34 2016 -0700 + + Merge pull request #22983 from mlaventure/multiple-runtimes + + Add support for multiple runtimes + +commit 71104bb592dc98467d3828394eabcbe50ca22ae4 +Author: Daniel Nephin +Date: Wed Jun 8 13:47:46 2016 -0400 + + Add experimental docker stack commands + + Signed-off-by: Daniel Nephin + +commit 87f31e379d7440bc3d0896a7b964e4ed59b6249a +Merge: f0e8952669 ffeb9fcb2a +Author: Brian Goff +Date: Tue Jun 14 14:44:19 2016 -0400 + + Merge pull request #23523 from vieux/fix_mounts_swarm + + fix 2 potential panics with mounts in swarm + +commit de374d845e899450db9122de29a8a822b2a6df5c +Merge: 0fe82614a6 6c29830127 +Author: Joffrey F +Date: Tue Jun 14 11:03:45 2016 -0700 + + Merge remote-tracking branch 'source/release' into bump-1.8.0-rc1 + +commit 0fe82614a60da699808b4dc46e3f913e9207d19f +Merge: 8f8c17bf66 9b7bd69cfc +Author: Joffrey F +Date: Tue Jun 14 10:57:32 2016 -0700 + + Merge pull request #3595 from dnephin/add-push-and-bundle + + Add docker-compose push and docker-compose bundle + +commit 8f8c17bf66365445c2b3092e463291f0922fcf3f +Merge: 21f20cbc9b e7a8b2fed5 +Author: Aanand Prasad +Date: Tue Jun 14 10:57:12 2016 -0700 + + Merge pull request #3549 from shin-/KalleDK-master + + Add support for COMPOSE_TLS_VERSION config option + +commit f0e89526698de9bc7b081a91c0cfb8390326a0cb +Merge: 81a85cf448 499e3a45b1 +Author: Tibor Vass +Date: Tue Jun 14 10:56:03 2016 -0700 + + Merge pull request #23526 from tonistiigi/skip-drain-test + + Temporarily skip flaky part of the drain test + +commit 81a85cf4481d804df59ba7aa7ecb0df5f7f9e008 +Merge: c913dd5f57 2e6db51de7 +Author: Alexander Morozov +Date: Tue Jun 14 10:49:22 2016 -0700 + + Merge pull request #23348 from vdemeester/migrate-cp-to-cobra + + Migrate cp command to cobra + +commit acc4e1b1fadc471afe3d74956252126653448eab +Merge: ec834ba4e6 19c00b0b95 +Author: Ying Li +Date: Tue Jun 14 10:40:55 2016 -0700 + + Merge pull request #785 from cyli/bump-alpine-version + + Bump the golang-alpine image version due to CVEs + +commit f4296d55fcefdf842a4a2fce41cbf2aef3e03403 +Merge: 1fc752c718 ccfa25cf00 +Author: Richard Scothern +Date: Tue Jun 14 10:37:47 2016 -0700 + + Merge pull request #1787 from RichardScothern/nr + + Re-add support for non-resumable digests + +commit 499e3a45b17eff6d52abe6ba9063fe365415cf08 +Author: Tonis Tiigi +Date: Tue Jun 14 10:14:13 2016 -0700 + + Increase the join connect timeout + + Signed-off-by: Tonis Tiigi + +commit 32f18616c70c52298ea7e07529acba852aa87c86 +Author: Tonis Tiigi +Date: Tue Jun 14 10:13:52 2016 -0700 + + Temporarily skip flaky part of the drain test + + Signed-off-by: Tonis Tiigi + +commit 19c00b0b95e91852479c88ea99c1ea069111a0f1 +Author: Ying Li +Date: Tue Jun 14 10:14:50 2016 -0700 + + Bump the golang-alpine image version due to CVEs + + Signed-off-by: Ying Li + +commit 9b7bd69cfca3f957f11a8f309ca816f13b52c436 +Author: Daniel Nephin +Date: Tue Jun 14 12:55:29 2016 -0400 + + Support entrypoint, labels, and user in the bundle. + + Signed-off-by: Daniel Nephin + +commit ffeb9fcb2a155f3495be333f9c6df41ea14c809b +Author: Victor Vieux +Date: Tue Jun 14 09:25:39 2016 -0700 + + fix 2 potential panics with mounts in swarm + + Signed-off-by: Victor Vieux + +commit 1ea9dda1d3b1db1d2bcb248b4e4eb57a26a06fd4 +Author: Aanand Prasad +Date: Tue May 10 16:14:54 2016 +0100 + + Implement 'docker-compose push' and 'docker-compose bundle' + + Signed-off-by: Aanand Prasad + +commit 2e6db51de7dc293785520df81c6bb54aa96c84ca +Author: Vincent Demeester +Date: Tue Jun 14 17:16:59 2016 +0200 + + Migrate cp command to cobra + + Signed-off-by: Vincent Demeester + +commit 21f20cbc9b6735c97d33c49a5243d7c6281b2e52 +Merge: 2123906586 a67ba5536d +Author: Aanand Prasad +Date: Tue Jun 14 08:05:07 2016 -0700 + + Merge pull request #3449 from Andrey9kin/ready/3281 + + Fix #3281: Unexpected result when using build args with default values + +commit 77efe6dffcd337a45831c5294fc402627251e915 +Author: Kenfe-Mickael Laventure +Date: Mon Jun 13 21:27:26 2016 -0700 + + Skip TestRunResolvconfUpdate as it is unstable + + Signed-off-by: Kenfe-Mickael Laventure + +commit 1aec3bacfd754e1ed72ec5a59dfd20d653f794a3 +Author: Kenfe-Mickael Laventure +Date: Mon Jun 13 19:33:00 2016 -0700 + + Vendor in new runc binary with userns fix + + Signed-off-by: Kenfe-Mickael Laventure + +commit 1f266d40f3844d1e398186cb98b4deb2272ebd6c +Author: Kenfe-Mickael Laventure +Date: Mon Jun 13 17:18:31 2016 -0700 + + Fix race in DockerExternalGraphdriverSuite.TestExternalGraphDriver + + Signed-off-by: Kenfe-Mickael Laventure + +commit 6e9bf4d3167c19bed0b8136d38bc1fe9146a45e5 +Author: Kenfe-Mickael Laventure +Date: Fri Jun 3 09:12:20 2016 -0700 + + Add bash completion support for --runtime and --add-runtime + + Signed-off-by: Kenfe-Mickael Laventure + +commit 1a6ed50e1f295714f6e514ec2c6127717b281216 +Author: Kenfe-Mickael Laventure +Date: Tue May 24 17:07:23 2016 -0700 + + Add missing completion for --config-file + + Signed-off-by: Kenfe-Mickael Laventure + +commit 7b2e5216b89b4c454d67473f1fa06c52a4624680 +Author: Kenfe-Mickael Laventure +Date: Mon May 23 14:49:50 2016 -0700 + + Add support for multiples runtimes + + Signed-off-by: Kenfe-Mickael Laventure + +commit 2e9ea5c194e5fbb83f59e30f8bda5467086598fe +Author: Kenfe-Mickael Laventure +Date: Thu Jun 9 14:56:14 2016 -0700 + + Update containerd and runc vendoring + + containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2 + runc: 85873d917e86676e44ccb80719fcb47a794676a1 + runtime-specs: v1.0.0-rc1 + + Signed-off-by: Kenfe-Mickael Laventure + +commit c913dd5f575c877b93a812c8f57dcc212d566b87 +Merge: 2a96ac66ea a4438ca606 +Author: Sven Dowideit +Date: Tue Jun 14 21:49:48 2016 +1000 + + Merge pull request #23489 from thaJeztah/fix-indentation + + API docs cleanup + +commit ec4697ea3379b79cef47f50cac44efee283b5ace +Author: KOBAYASHI Shinji +Date: Tue Jun 14 11:13:32 2016 +0000 + + Add SSH logs when provisioning with RedHat derivatives + + Fixes #3507 + + Signed-off-by: KOBAYASHI Shinji + +commit 2a96ac66ea41d206161a6ef022e10d53f99e86ec +Merge: 74873f192a 8eca8089fa +Author: Sven Dowideit +Date: Tue Jun 14 21:10:17 2016 +1000 + + Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12 + + surfacing Learn by example topics to top level of Docker Engine docs + +commit 74873f192ad0b0cdced4a3fcc2170e5d69aabbb5 +Merge: 31e48e85ef 73882e8f83 +Author: Lei Jitang +Date: Tue Jun 14 17:24:00 2016 +0800 + + Merge pull request #23506 from albers/completion-daemon---live-restore + + bash completion for `docker daemon --live-restore` + +commit 31e48e85ef929f2b2b232f4c971f7c7966002539 +Merge: 1cb16a1b41 0e74aabbb9 +Author: Sebastiaan van Stijn +Date: Tue Jun 14 10:49:42 2016 +0200 + + Merge pull request #23501 from dmcgowan/fix-overlay-diff-test + + Remove failing overlay test + +commit 1cb16a1b4130e7e83cbe033bff1daea861696915 +Merge: a1e319e847 546594eaaa +Author: Sebastiaan van Stijn +Date: Tue Jun 14 10:13:29 2016 +0200 + + Merge pull request #23484 from onlyjob/bash-completion + + Fix syntax errors in bash-completion (Closes: #23483) + +commit a1e319e847f41e648ebede7f9d79999d75bd14c8 +Merge: c69614deae ea4fef2d87 +Author: Tibor Vass +Date: Tue Jun 14 00:55:55 2016 -0700 + + Merge pull request #23361 from docker/swarm + + Add dependency to docker/swarmkit + +commit 73882e8f833f3b141c309d543cfe9e84efc00e62 +Author: Harald Albers +Date: Tue Jun 14 09:14:25 2016 +0200 + + bash completion for `docker daemon --live-restore` + + Signed-off-by: Harald Albers + +commit c69614deae7f20e0dbff8399ce3a8d11014b0f43 +Merge: 7d988a7aa6 cac6658da0 +Author: Vincent Demeester +Date: Tue Jun 14 08:47:43 2016 +0200 + + Merge pull request #23490 from shishir-a412ed/dm_options_modularized + + Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic. + +commit 7d988a7aa6ae20020f0f96c6e2a47377e3567a3d +Merge: 4940985340 fb175bb367 +Author: Vincent Demeester +Date: Tue Jun 14 08:44:24 2016 +0200 + + Merge pull request #23093 from tkopczynski/20784-builder-dockerfile-outside-context + + Builder integration tests for Dockerfile outside context as a unit test + +commit 0e74aabbb9aa5cea0b6bf7342f9e325f989468fa +Author: Derek McGowan +Date: Mon Jun 13 22:34:57 2016 -0700 + + Remove failing overlay test + + Diff apply is sometimes producing a different change list causing the tests to fail. + Overlay has a known issue calculating diffs of files which occur within the same second they were created. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit ea4fef2d875de39044ca7570c35365b75086e8a5 +Author: Charles Smith +Date: Tue Jun 7 17:08:36 2016 -0700 + + add tutorial + + Signed-off-by: Charles Smith + +commit 9acf97b72a4d5ff7b1bcad36fb19b53775f01596 +Author: Amit Shukla +Date: Mon Jun 13 19:57:19 2016 -0700 + + CLI docs + + Signed-off-by: Amit Shukla + Signed-off-by: Tonis Tiigi + +commit 12a00e60177ca42bfb1dd9ebd5dce1c7039da6dd +Author: Daniel Nephin +Date: Mon Jun 13 19:56:23 2016 -0700 + + Add Swarm management CLI commands + + As described in our ROADMAP.md, introduce new Swarm management commands + to call to the corresponding API endpoints. + + This PR is fully backward compatible (joining a Swarm is an optional + feature of the Engine, and existing commands are not impacted). + + Signed-off-by: Daniel Nephin + Signed-off-by: Victor Vieux + Signed-off-by: Tonis Tiigi + +commit 494098534023096f016fa7f184b379929a3f8096 +Merge: c81c131a40 acd67e25a9 +Author: Tibor Vass +Date: Mon Jun 13 22:16:53 2016 -0700 + + Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb + + Do not overwrite already published deb files when releasing + +commit d4abe1d84a58461fea54d2046c24ae5d869fa41e +Author: Arnaud Porterie (icecrime) +Date: Mon Jun 13 19:55:02 2016 -0700 + + Add swarm api reference docs + + Signed-off-by: Arnaud Porterie (icecrime) + +commit 0d88d5b64b69a451d374e322b2abe64140a6cd1c +Author: Tonis Tiigi +Date: Mon Jun 13 19:54:20 2016 -0700 + + Swarm integration tests + + Signed-off-by: Tonis Tiigi + Signed-off-by: Victor Vieux + +commit 534a90a99367af6f6bba1ddcc7eb07506e41f774 +Author: Tonis Tiigi +Date: Mon Jun 13 19:52:49 2016 -0700 + + Add Swarm management backend + + As described in our ROADMAP.md, introduce new Swarm management API + endpoints relying on swarmkit to deploy services. It currently vendors + docker/engine-api changes. + + This PR is fully backward compatible (joining a Swarm is an optional + feature of the Engine, and existing commands are not impacted). + + Signed-off-by: Tonis Tiigi + Signed-off-by: Victor Vieux + Signed-off-by: Daniel Nephin + Signed-off-by: Jana Radhakrishnan + Signed-off-by: Madhu Venugopal + +commit 44793049ce1ad364720b4be915a92291d1f808c2 +Author: Tonis Tiigi +Date: Tue Jun 7 14:28:28 2016 -0700 + + Add dependency to docker/swarmkit + + Add a dependency to `docker/swarmkit` in preparation for adding + first-class Swarm-wide service management inside the Docker Engine as + described in our ROADMAP.md. + + Signed-off-by: Tonis Tiigi + Signed-off-by: Jana Radhakrishnan + Signed-off-by: Victor Vieux + Signed-off-by: Madhu Venugopal + +commit 0121b63c2209332cef502b094749def3296912a1 +Merge: 79ee15fbb2 5f0e652d29 +Author: Allen Sun +Date: Tue Jun 14 13:13:16 2016 +0800 + + Merge pull request #2347 from NanXiao/issue-9998 + + Edited cluster/cluster.go + +commit c81c131a409a04ca11686c71798acf9df8ddfdbc +Merge: 3020081e94 5a0b53b5a3 +Author: Alexander Morozov +Date: Mon Jun 13 22:12:20 2016 -0700 + + Merge pull request #23373 from capkurmagati/23211-spf13-cobra-ps + + Migrate ps command to cobra + +commit a6bb087ce29f75db2d75416beb98a742e73c28ef +Author: French Ben +Date: Mon Jun 13 21:34:36 2016 -0700 + + Modified circleCI push + + Signed-off-by: French Ben + +commit 3020081e94277410984c62d12f88de3d4f258681 +Merge: bfed05be0b d705dab1b1 +Author: Michael Crosby +Date: Mon Jun 13 20:57:19 2016 -0700 + + Merge pull request #23213 from crosbymichael/restore-option + + Add --live-restore flag + +commit 5a0b53b5a3d779e26a51230dfbdbf53bdd6b18d4 +Author: Tianyi Wang +Date: Wed Jun 8 21:56:44 2016 +0900 + + Migrate ps command to cobra + + Signed-off-by: Tianyi Wang + +commit d705dab1b1bd0a946d647374325d61fac57736db +Author: Michael Crosby +Date: Thu Jun 2 11:10:55 2016 -0700 + + Add --live-restore flag + + This flags enables full support of daemonless containers in docker. It + ensures that docker does not stop containers on shutdown or restore and + properly reconnects to the container when restarted. + + This is not the default because of backwards compat but should be the + desired outcome for people running containers in prod. + + Signed-off-by: Michael Crosby + +commit 21239065865b566ba12a86a421f7aaf88cdc82af +Merge: 59e96fea4f 61324ef308 +Author: Aanand Prasad +Date: Tue Jun 14 01:58:27 2016 +0100 + + Merge pull request #3577 from sanmai-NL/3576-byte_str_fix + + Fix byte/str typing error + +commit 91ec013436974d3a3d0f5d9bda56d9ffe4cb68ef +Merge: 7986255782 d2fe2c281a +Author: Nathan LeClaire +Date: Mon Jun 13 17:52:14 2016 -0700 + + Merge pull request #3502 from nathanleclaire/plugin_exit + + Add code to exit when heartbeat call fails + +commit 79862557829622c434b539f1397850594ee38922 +Merge: 3dd8466ca8 c9e8a87a3b +Author: Nathan LeClaire +Date: Mon Jun 13 17:51:47 2016 -0700 + + Merge pull request #3503 from nathanleclaire/vmwarefusion_fix_cpus + + Fix driver CPU inconsistency + +commit 59e96fea4f6c33dc8d49ef970bb2463f0288efda +Merge: e502417df2 60f7e021ad +Author: Aanand Prasad +Date: Tue Jun 14 01:45:20 2016 +0100 + + Merge pull request #3588 from shin-/3285-root-mount + + Fix split_path_mapping behavior when mounting "/" + +commit 5a9bce1da4c7716829403a4a98505ec370dd4b7c +Merge: fe536059f1 073a83b34e +Author: French Ben +Date: Mon Jun 13 17:38:03 2016 -0700 + + Merge pull request #1757 from docker/1.12-rc + + 1.12 rc + +commit ccfa25cf000f460199484bda4b3c89d52a388c6b +Author: Richard Scothern +Date: Mon Jun 13 17:35:06 2016 -0700 + + If resumable digest support is disabled, detct this when closing the blobwriter + and allow the close to continue. Also update the name of the function. + + Signed-off-by: Richard Scothern + +commit 1fc752c7184a2bdcbeb26ad90eba80f9fd9c76bf +Merge: 337ceb2b40 eca581cf36 +Author: Richard Scothern +Date: Mon Jun 13 16:29:35 2016 -0700 + + Merge pull request #1706 from aibaars/registry-size-close + + Blobwriter: call BlobWriter.Size after BlobWriter.Close + +commit 337ceb2b4006a7be09b1c41af81570fe68901270 +Merge: 6445220d0d 6e2dd4fa68 +Author: Richard Scothern +Date: Mon Jun 13 16:09:09 2016 -0700 + + Merge pull request #1786 from RichardScothern/admin + + Prepare for the release. + +commit c9e8a87a3bf076ba0318b39942f4d01c010e5658 +Author: Nathan LeClaire +Date: Mon Jun 13 16:06:08 2016 -0700 + + Fix driver CPU inconsistency + + Signed-off-by: Nathan LeClaire + +commit 6e2dd4fa6825391b54adf1e8a604bfaf5234d42d +Author: Richard Scothern +Date: Mon Jun 13 16:03:16 2016 -0700 + + Prepare for the release. + + Update .mailmap, AUTHORS and MAINTAINERS files. + + Signed-off-by: Richard Scothern + +commit d2fe2c281a59549f4358a51771771303698f60e3 +Author: Nathan LeClaire +Date: Mon Jun 13 16:03:10 2016 -0700 + + Add code to exit when heartbeat call fails + + Signed-off-by: Nathan LeClaire + +commit 073a83b34e8a0fb2badef52b369a5eb40702562f +Author: French Ben +Date: Mon Jun 13 16:00:07 2016 -0700 + + Modified version to match engine + + Signed-off-by: French Ben + +commit 3dd8466ca80c18526563b50428cc019da14ff040 +Merge: ba9219eb03 4739fbda5b +Author: Nathan LeClaire +Date: Mon Jun 13 16:00:05 2016 -0700 + + Merge pull request #3489 from legal90/fix-doc-parallels + + docs: Fix the name of "Parallels Desktop for Mac" + +commit ba9219eb038a7cdf984912d6a81a1b774c1b8a18 +Merge: e3594a517f 6a2221fd97 +Author: Nathan LeClaire +Date: Mon Jun 13 15:53:02 2016 -0700 + + Merge pull request #3463 from malex984/add-virtualbox-ui-type + + Adding an optional VM's UI type for the virtualbox driver + +commit 6445220d0de14da3c1ffec6b9f05752365709da0 +Merge: fb106e167a c2af377920 +Author: Richard Scothern +Date: Mon Jun 13 15:52:33 2016 -0700 + + Merge pull request #1785 from RichardScothern/changelog + + Changelog for 2.5 + +commit c2af377920b22cc2a9b3d41242eab914a698c09d +Author: Richard Scothern +Date: Mon Jun 13 14:18:19 2016 -0700 + + Changelog for 2.5 + + Signed-off-by: Richard Scothern + +commit 60f7e021ada69b4bdfce397eb2153c6c35eb2428 +Author: Joffrey F +Date: Mon Jun 13 15:32:10 2016 -0700 + + Fix split_path_mapping behavior when mounting "/" + + Signed-off-by: Joffrey F + +commit afb262bd5f7d975338169230ed02c825bccab3c7 +Author: Cezar Sa Espinola +Date: Mon Mar 7 18:52:53 2016 -0300 + + Update swift driver docs removing dup table and adding endpointtype + + Signed-off-by: Cezar Sa Espinola + +commit 7f72092940c3559eb662ef1e3c369c3795e7b254 +Author: Cezar Sa Espinola +Date: Mon Mar 7 18:41:20 2016 -0300 + + Expose EndpointType parameter in swift storage driver + + Signed-off-by: Cezar Sa Espinola + +commit 5ad9d19ff603945b239cc466869630cc06ce46d5 +Author: Cezar Sa Espinola +Date: Mon May 23 16:31:57 2016 -0300 + + Update vendored version of ncw/swift library + + Signed-off-by: Cezar Sa Espinola + +commit fb106e167a680086edb8c64534c2ec95654b83d7 +Merge: 4e08e7d1d6 1126e32234 +Author: Richard Scothern +Date: Mon Jun 13 15:01:06 2016 -0700 + + Merge pull request #1465 from dmcgowan/token-server-oauth + + Integration token server supporting oauth + +commit 4e08e7d1d6fb7a52c90c9b1e6f5ece4ec8466b3e +Merge: 805b94eb2b 125f4ff7d7 +Author: Richard Scothern +Date: Mon Jun 13 14:59:05 2016 -0700 + + Merge pull request #1775 from dmcgowan/get-content-digest + + Add option to get content digest from manifest get + +commit bfed05be0b9bfc04bf922d79dd8dc420e1e579e2 +Merge: 5338ae7133 ea3a7899f5 +Author: John Howard +Date: Mon Jun 13 14:47:06 2016 -0700 + + Merge pull request #23447 from Microsoft/RemoveQosValidation + + Removed QoS validation on Windows + +commit 805b94eb2b7e4a4e011f755fe004cb48b529113e +Merge: 1bf52359f1 a3965b93bc +Author: Richard Scothern +Date: Mon Jun 13 14:34:42 2016 -0700 + + Merge pull request #1770 from Windfarer/fix-link-patch + + Fixing link patch + +commit 1bf52359f1f7db3f27c9b24c43b17186daf50552 +Merge: 9198d642ba 8907f7d189 +Author: Richard Scothern +Date: Mon Jun 13 14:33:46 2016 -0700 + + Merge pull request #1782 from tianon/accept-lists + + Update "Accept" header parsing for list values + +commit 5338ae713347aa8c1139cbcfd8e07746eff52a51 +Merge: f0193e278c d1b7e8373b +Author: Vincent Demeester +Date: Mon Jun 13 23:20:37 2016 +0200 + + Merge pull request #23425 from runcom/authz-race + + pkg: authorization: lock when lazy loading + +commit 852bcfcbfbb1cd204e4033bb79ab04e4b74dad7b +Author: French Ben +Date: Mon Jun 13 14:19:25 2016 -0700 + + made all self this + + Signed-off-by: French Ben + +commit 90147cccc3cc600a578462a3981420111ca9f7c7 +Author: French Ben +Date: Mon Jun 13 12:02:52 2016 -0700 + + Bump version to 0.11 + + Signed-off-by: French Ben + +commit f0193e278c31fb568c4cbbdc046e84a0d1a3390b +Merge: a502158d8a ad4e20cd92 +Author: Alexander Morozov +Date: Mon Jun 13 14:16:42 2016 -0700 + + Merge pull request #23256 from vdemeester/migrate-pull-push-to-cobra + + Use spf13/cobra for docker push and docker pull + +commit a502158d8a9b3a3949eb0bc0b087138ef65efabb +Merge: e6c49bf71b baf467722b +Author: Alexander Morozov +Date: Mon Jun 13 14:15:46 2016 -0700 + + Merge pull request #23265 from vdemeester/migrate-login-logout-to-cobra + + Use spf13/cobra for docker login and docker logout + +commit e6c49bf71b44a2513c37c08f488bf05089ac1f76 +Merge: 8a2f9a249c 939a142c8d +Author: Alexander Morozov +Date: Mon Jun 13 14:13:37 2016 -0700 + + Merge pull request #23309 from yongtang/23211-spf13-cobra-commit + + Use spf13/cobra for docker commit + +commit 9198d642ba1d6106623372c6fcd3fac025703a18 +Merge: 75882f079c 015df6cdea +Author: Aaron Lehmann +Date: Mon Jun 13 10:48:55 2016 -1000 + + Merge pull request #1779 from dmcgowan/letsencrypt-support + + Let's Encrypt support + +commit 8eca8089fa35f652060e86906166dabc42e556f8 +Author: Victoria Bialas +Date: Mon Jun 13 11:08:11 2016 -0700 + + surfacing Learn by example topics to top level of Docker Engine docs + fixing links after moving surfacing tutorials + + fixing more links for the newly located tutorials + + Signed-off-by: Victoria Bialas + +commit 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d +Merge: 1842077541 a546042b91 +Author: Michael Crosby +Date: Mon Jun 13 13:15:39 2016 -0700 + + Merge pull request #22126 from dmcgowan/overlay-native-diff + + Overlay multiple lower directory support + +commit 1842077541d1679c20932ed66c07081759c36c7f +Merge: f7600fc641 ba115b0a91 +Author: Sebastiaan van Stijn +Date: Mon Jun 13 22:11:32 2016 +0200 + + Merge pull request #23195 from cyli/update-content-trust-docs + + Update content trust docs to reflect latest notary compose file changes + +commit ba115b0a91970f434e41e9f72caccc01493a9729 +Author: cyli +Date: Wed Jun 1 22:56:35 2016 -0700 + + Update content trust docs to reflect latest notary compose file changes, and to simplify + the instructions by providing a single compose file that runs the notary server, registry, + and a docker-in-docker trust sandbox. + + Signed-off-by: cyli + +commit 015df6cdea10d9ce4b893bcd98887980e7061fb7 +Author: Richard Scothern +Date: Mon Jun 13 11:42:13 2016 -0700 + + Add documentation for let's encrypt + + Signed-off-by: Richard Scothern + +commit ec834ba4e669fd641a92ead4969098e54d163c84 +Merge: 5c9cf48557 bfbce57560 +Author: Riyaz Faizullabhoy +Date: Mon Jun 13 11:44:05 2016 -0700 + + Merge pull request #780 from docker/change-to-map + + Change target info API from list to map return + +commit 5c9cf485573ab9dbc54abf4c58ddd3911d578fe4 +Merge: 5a645089b3 d5369d7e40 +Author: Ying Li +Date: Mon Jun 13 11:41:46 2016 -0700 + + Merge pull request #783 from jzwlqx/patch-1 + + seems a duplicate 'use' + +commit be2ed961aa9049667ddba1baee0b743ce97810f2 +Author: Derek McGowan +Date: Mon Jun 13 11:30:42 2016 -0700 + + Add support for Let's Encrypt + + Add configuration and certificate manager to use letsencrypt + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit f7600fc6413cc7dcc5a243c174ecb086870fb16f +Merge: d169f057d9 c088321ea8 +Author: Sebastiaan van Stijn +Date: Mon Jun 13 20:19:26 2016 +0200 + + Merge pull request #23261 from dimrozakis/23260 + + Escape brackets in hack/install.sh + +commit d169f057d9007580aa7ddb3ca7fca8de1e481081 +Merge: 3bb42723ac 3c25656efa +Author: Vincent Demeester +Date: Mon Jun 13 20:08:12 2016 +0200 + + Merge pull request #23473 from coolljt0725/fix_stop_crash + + Fix shutdown daemon during daemon staring casue crash + +commit 3bb42723acf4a6ade3f9f1a1819ca6ef530c2032 +Merge: 50c7bcac1e e6e8c4d700 +Author: Sebastiaan van Stijn +Date: Mon Jun 13 20:07:17 2016 +0200 + + Merge pull request #23485 from sbose78/22514-run-image-using-digest + + Fixes #22514 - Added example for using image digest in the docker run command + +commit a546042b91f655c7cf53484cdb0c5c8b3cf12d33 +Author: Derek McGowan +Date: Mon Jun 13 11:06:47 2016 -0700 + + Add documentation for using overlay2 + + Add mention in dockerd command line and storage driver selection documentation. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit e6e8c4d700c4510e463eb16fedba51b6e8a3ccd6 +Author: Shoubhik Bose +Date: Mon Jun 13 09:36:44 2016 +0000 + + Added example for using image digest in the docker run command + + Signed-off-by: Shoubhik Bose + + Added explanation for the example with image's digest ( as per @thaJeztah 's comment + + Signed-off-by: Shoubhik Bose + + Wrapped to ~80 chars + + Signed-off-by: Shoubhik Bose + +commit 50c7bcac1e22a6a3dd39bec4136aa96136f56eb2 +Merge: 8eb1d89c17 f2ad7be2c4 +Author: Sebastiaan van Stijn +Date: Mon Jun 13 19:49:23 2016 +0200 + + Merge pull request #23443 from swernli/servicing-async + + Updating call sequence for servicing Windows containers + +commit 8eb1d89c1755150fef42799f284866ebe604b7dc +Merge: 0b879b993d 7d22887b2c +Author: Alexander Morozov +Date: Mon Jun 13 09:29:46 2016 -0700 + + Merge pull request #22631 from runcom/fix-leak-mount + + pkg: chrootarchive: chroot_linux: fix mount leak + +commit cac6658da061f01b4abd5b4bd1a7aeb234e8401d +Author: Shishir Mahajan +Date: Mon Jun 13 12:05:46 2016 -0400 + + Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic. + + Signed-off-by: Shishir Mahajan + +commit a4438ca606223f7c8ae5edb4101ff5eaae39fb05 +Author: Sebastiaan van Stijn +Date: Mon Jun 13 16:37:24 2016 +0200 + + API docs cleanup + + fix some formatting issues and consistency; + + - Change capitalization (Query Parameters -> Query parameters, Json -> JSON) + - Make Query/JSON parameters and Status codes headings bold + - Fix indentation of some code blocks + - Fix headings (H2 -> H1), although all headings should be shifted the other way + round ;-) + + Signed-off-by: Sebastiaan van Stijn + +commit 0b879b993df3332814da3c2ae3ba470df84226d2 +Merge: 6ba3d63a8c 2777f884f6 +Author: Vincent Demeester +Date: Mon Jun 13 15:46:12 2016 +0200 + + Merge pull request #23416 from dnephin/fix-daemon-help + + Support running 'docker help daemon' with split binaries + +commit 6ba3d63a8ccd58423495c52b003cd01c7b0c7e10 +Merge: 9a8affb0ff 391441c28b +Author: Sebastiaan van Stijn +Date: Mon Jun 13 15:11:01 2016 +0200 + + Merge pull request #22575 from mountkin/fix-22536 + + fix LogConfig for containers created before docker 1.12 on daemon start + +commit 5f0e652d29e672e504f2c9c2231e01ba786cc0b8 +Author: NanXiao +Date: Mon Jun 13 17:47:09 2016 +0800 + + Edited cluster/cluster.go + + Signed-off-by: NanXiao + +commit 546594eaaa47e367cef17a3acae2854fba125efe +Author: Dmitry Smirnov +Date: Mon Jun 13 19:12:31 2016 +1000 + + Fix syntax errors in bash-completion (Closes: #23483) + + Signed-off-by: Dmitry Smirnov + +commit 3c25656efa812a4c969c833623f3b96f86116e77 +Author: Lei Jitang +Date: Mon Jun 13 02:10:37 2016 -0400 + + Fix shutdown daemon during starting causes daemon crash + + Signed-off-by: Lei Jitang + +commit 9a8affb0ffdf6010fca6a1c8fb00c9e0a38845d6 +Merge: 0d744de9ab edd80498d5 +Author: Sven Dowideit +Date: Mon Jun 13 14:22:48 2016 +1000 + + Merge pull request #23478 from cpuguy83/22833_optional_mountpoint_docs + + Clarify volume plugin `Mountpoint` is optional + +commit 0d744de9abc868ae79d813a93ed571670dd97bd6 +Merge: bf0e2cb1b6 4ace1811b4 +Author: Vincent Demeester +Date: Mon Jun 13 00:49:44 2016 +0200 + + Merge pull request #23479 from thaJeztah/fix-typo + + Fix typo in error message + +commit bf0e2cb1b632b46a070fd6141d8abf5de5f69231 +Merge: aaef5297bf d4d8cc9c0a +Author: Sebastiaan van Stijn +Date: Mon Jun 13 00:41:09 2016 +0200 + + Merge pull request #23444 from Microsoft/RevendorHcsshim + + Update vendored hcsshim to v0.3.4 + +commit 4ace1811b4a0c0a48f1aeeba996b8096a3a4bb2d +Author: Sebastiaan van Stijn +Date: Sun Jun 12 00:05:03 2016 +0200 + + Fix typo in error message + + Signed-off-by: Sebastiaan van Stijn + +commit edd80498d5b1b7686f2179dc5c6602093295a21e +Author: Brian Goff +Date: Sun Jun 12 16:33:03 2016 -0400 + + Note about mountpoint being optional + + Signed-off-by: Brian Goff + +commit aaef5297bfb2a410bdaea2bf6a4fa17951796daf +Merge: 0f7c5f92c5 a229e1f4b7 +Author: Brian Goff +Date: Sun Jun 12 16:27:54 2016 -0400 + + Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb + + build armhf deb for ubuntu-trusty + +commit d1b7e8373bde77819a25fce94bdfa9725608215e +Author: Antonio Murdaca +Date: Sun Jun 12 17:23:19 2016 +0200 + + authz: cleanups + + Signed-off-by: Antonio Murdaca + +commit ceb9c5a88b5fa7d0b6c0901fa6b44ec89e81c2dc +Author: Antonio Murdaca +Date: Sun Jun 12 17:19:43 2016 +0200 + + pkg: authorization: lock when lazy loading + + Signed-off-by: Antonio Murdaca + +commit 0f7c5f92c5c64f1844f402da507d061e2189f036 +Merge: 4dafd107ad 734260886c +Author: Sebastiaan van Stijn +Date: Sun Jun 12 16:21:41 2016 +0200 + + Merge pull request #23472 from sdurrheimer/zsh-completion-run-healthcheck + + Add zsh completion for 'docker run' healthcheck options + +commit d5369d7e40df72f4bd074787eb659e1e3a3b8aa6 +Author: 姜太公 +Date: Sun Jun 12 19:10:39 2016 +0800 + + seems a duplicate 'use' + + Signed-off-by: 姜继忠 + +commit 4dafd107ad0cb89e1a7f9e3bcc66fb6a5a5c99c5 +Merge: 434a46e652 c498d4700d +Author: Vincent Demeester +Date: Sun Jun 12 13:01:20 2016 +0200 + + Merge pull request #22777 from WeiZhang555/wait-restarting + + Bug fix: `docker run -i --restart always` hangs + +commit 734260886c9281f98c109e78b8f28a7d4d8fec78 +Author: Steve Durrheimer +Date: Sun Jun 12 13:00:05 2016 +0200 + + Add zsh completion for 'docker run' healthcheck options + + Signed-off-by: Steve Durrheimer + +commit 434a46e6522b6fd143eb6842f57d126f772ff045 +Merge: 576c9fa200 d917723331 +Author: Vincent Demeester +Date: Sun Jun 12 10:21:04 2016 +0200 + + Merge pull request #23466 from yongtang/23459-logrus-formatting-2 + + Fix incorrect usage of logrus when formatting string is present + +commit 576c9fa2007cfb5f379f67b11cd852800f9175c6 +Merge: 96110f3cd2 1dd28788f1 +Author: Alexander Morozov +Date: Sat Jun 11 16:37:39 2016 -0700 + + Merge pull request #23442 from thaJeztah/remove-defaultExitOnUnhealthy + + remove unused defaultExitOnUnhealthy constant + +commit d917723331c090d5003b70decda7f80bf123f966 +Author: Yong Tang +Date: Sat Jun 11 15:37:36 2016 -0700 + + Fix incorrect usage of logrus when formatting string is present + + This fix tries to fix logrus formatting by adding `f` to the end of + `logrus.[Error|Warn|Debug|Fatal|Panic|Info](` when formatting string + is present but the function `logrus.[Error|Warn|Debug|Fatal|Panic|Info](` + is used (incorrectly). + + This fix is related to #23459, and is a follow up of #23461. + + Signed-off-by: Yong Tang + +commit 96110f3cd2229eb0f1e45c924da69badaeca4afb +Merge: c9b1ec5424 a72b45dbec +Author: Vincent Demeester +Date: Sun Jun 12 00:19:05 2016 +0200 + + Merge pull request #23461 from yongtang/23459-logrus-formatting + + Fix logrus formatting + +commit c9b1ec542448ea5dea741d9830cc3309c623d80d +Merge: ec1790d7f1 0c3a4a1fcd +Author: Vincent Demeester +Date: Sun Jun 12 00:18:44 2016 +0200 + + Merge pull request #23464 from charleswhchan/update-pull-commandline-doc + + Add link to Docker Hub. + +commit 0c3a4a1fcdbb4b7e14292a871dec4bf6828ae57c +Author: Charles Chan +Date: Sat Jun 11 14:31:53 2016 -0700 + + Add link to Docker Hub. + + * To make it consistent with similar references in other parts of document. + + Signed-off-by: Charles Chan + +commit a72b45dbec3caeb3237d1af5aedd04adeb083571 +Author: Yong Tang +Date: Sat Jun 11 13:16:55 2016 -0700 + + Fix logrus formatting + + This fix tries to fix logrus formatting by removing `f` from + `logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string + is not present. + + This fix fixes #23459. + + Signed-off-by: Yong Tang + +commit ec1790d7f110366a438202c61985d377c4e2b43a +Merge: dcc65376ba 44ccbb317c +Author: Vincent Demeester +Date: Sat Jun 11 21:42:12 2016 +0200 + + Merge pull request #23458 from runcom/warnf + + *: fix logrus.Warn[f] + +commit dcc65376bac8e73bb5930fce4cddc2350bb7baa2 +Merge: a29376dfd0 c9a68ffb2a +Author: Vincent Demeester +Date: Sat Jun 11 21:41:33 2016 +0200 + + Merge pull request #23460 from kevinburke/fix-typo + + typo in builder.md: its => it's + +commit c9a68ffb2ae7b2ac13a2febab82b3d7a824eb97f +Author: Kevin Burke +Date: Sat Jun 11 12:33:09 2016 -0700 + + typo in builder.md: its => it's + + Signed-off-by: Kevin Burke + +commit 44ccbb317c2ca67fd8a88147b1ff80ce83d453cc +Author: Antonio Murdaca +Date: Sat Jun 11 19:42:38 2016 +0200 + + *: fix logrus.Warn[f] + + Signed-off-by: Antonio Murdaca + +commit a29376dfd0be8157c2251ee2317648a29a5057b9 +Merge: befada2ca7 60c435e7d0 +Author: Vincent Demeester +Date: Sat Jun 11 18:52:48 2016 +0200 + + Merge pull request #23456 from sdurrheimer/zsh-completion-ps-filter-network + + Add zsh completion for 'docker ps --filter=network' + +commit befada2ca7064997c3b1f3d65999ffa323dcba73 +Merge: b133737cb7 809207fc74 +Author: Sebastiaan van Stijn +Date: Sat Jun 11 18:32:22 2016 +0200 + + Merge pull request #23453 from runcom/fix-typo-pkg-proxy + + pkg: proxy: fix TCPEchoServer.Close() in unit test + +commit b133737cb765d7b70874d9b4d6d6d0ab0328ea26 +Merge: b3ce532762 b5498a8b0b +Author: Sebastiaan van Stijn +Date: Sat Jun 11 18:29:17 2016 +0200 + + Merge pull request #23455 from sdurrheimer/zsh-completion-events-filter-values + + Add zsh completion for 'docker events --filter' values + +commit b3ce5327622f07b675f5ec7d69cd58f5f1d7656f +Merge: 2a6abf1011 654aaa055e +Author: Sebastiaan van Stijn +Date: Sat Jun 11 18:28:01 2016 +0200 + + Merge pull request #23454 from sdurrheimer/zsh-completion-create-run-pid-values + + Add zsh completion for 'docker {create,run} --pid' values + +commit b5498a8b0b6d836b42381bbdd272670ad3219bd2 +Author: Steve Durrheimer +Date: Sat Jun 11 15:22:41 2016 +0200 + + Add zsh completion for 'docker events --filter' values + + Signed-off-by: Steve Durrheimer + +commit 60c435e7d0f79f530606dd49440fbdef6d83edd2 +Author: Steve Durrheimer +Date: Sat Jun 11 16:53:26 2016 +0200 + + Add zsh completion for 'docker ps --filter=network' + + Signed-off-by: Steve Durrheimer + +commit 654aaa055e3bc56048996f46e4e4b6d0afe42dac +Author: Steve Durrheimer +Date: Sat Jun 11 14:14:02 2016 +0200 + + Add zsh completion for 'docker {create,run} --pid' values + + Signed-off-by: Steve Durrheimer + +commit 809207fc7432b59257d4026b98467ba7414014be +Author: Antonio Murdaca +Date: Sat Jun 11 15:27:56 2016 +0200 + + pkg: proxy: fix TCPEchoServer.Close() in unit test + + Signed-off-by: Antonio Murdaca + +commit 2a6abf101173ca5212f56c647c2f5d51bf24ff7b +Merge: ee8c512dc3 edadc2f4d7 +Author: Sebastiaan van Stijn +Date: Sat Jun 11 15:26:45 2016 +0200 + + Merge pull request #23441 from thaJeztah/update-packagers + + Update Golang requirements in PACKAGERS.md + +commit 4856ba5ec5b8a39593c93ee637f5a320c497f4be +Author: Joao Fernandes +Date: Fri Jun 10 17:44:27 2016 -0700 + + Adds link in installation docs + +commit 8907f7d1899a578e3e5d10ec34ec49f1841fb154 +Author: Tianon Gravi +Date: Fri Jun 10 16:34:08 2016 -0700 + + Update "Accept" header parsing for list values + + In Go's header parsing, the same header multiple times results in multiple entries in the `r.Header[...]` slice, but Go does no further parsing beyond that (and in https://golang.org/cl/4528086 it was determined that until/unless the stdlib itself needs it, Go will not do so). + + The consequence here for parsing of `Accept:` headers is that we support the way Go outputs headers, but not all language HTTP libraries have a facility to output multiple headers instead of a single list header. + + This change ensures that the following (valid) header blocks all parse to the same result for the purposes of what is being tested here: + + ``` + Accept: a/b + Accept: b/c + Accept: d/e + ``` + + ``` + Accept: a/b; q=0.5, b/c + Accept: d/e + ``` + + ``` + Accept: a/b; q=0.1, b/c; q=0.2, d/e; q=0.8 + ``` + + Signed-off-by: Andrew "Tianon" Page + +commit edadc2f4d737bf4f7aa3c477f2021aae2e551cc2 +Author: Sebastiaan van Stijn +Date: Fri Jun 10 23:15:47 2016 +0200 + + Update Golang requirements in PACKAGERS.md + + Docker 1.12 now requires Go 1.6, so update + the packagers.md accordingly + + Signed-off-by: Sebastiaan van Stijn + +commit ea3a7899f50f623df58d0ef7e0c5318bddaf1877 +Author: Darren Stahl +Date: Fri Jun 10 16:24:23 2016 -0700 + + Removed QoS validation on Windows + + Signed-off-by: Darren Stahl + +commit ee8c512dc32117fbd327b4a19da0ffefe47abfcd +Merge: 3d0595f1d5 c111b7eb3d +Author: Alexander Morozov +Date: Fri Jun 10 15:38:06 2016 -0700 + + Merge pull request #23403 from WeiZhang555/split-utils + + Move GetExitCode to package container and unexport it + +commit d4d8cc9c0a94840a2d45b549925301daa3bfcad3 +Author: Darren Stahl +Date: Fri Jun 10 15:27:05 2016 -0700 + + Update vendored hcsshim to v0.3.4 + + Signed-off-by: Darren Stahl + +commit f2ad7be2c4aa13413d539887e8c13fb47bea7254 +Author: Stefan J. Wernli +Date: Wed Jun 8 18:57:25 2016 -0700 + + Updating call sequence for servicing Windows containers + + This change adjusts the calling pattern for servcing containers to use waiting on the process instead of expecting start to block. This is safer, as it avoids timeouts in the start code path for the potentially expensive update operation. + + Signed-off-by: Stefan J. Wernli + +commit 7d22887b2c8f4de99c3da7c3a0394ca53fb1c4eb +Author: Antonio Murdaca +Date: Tue May 10 16:18:16 2016 +0200 + + pkg: chrootarchive: chroot_linux: fix mount leak + + When pivot_root fails we need to unmount the bind mounted path we + previously mounted in preparation for pivot_root. + + Signed-off-by: Antonio Murdaca + +commit 1dd28788f14d19ac5d9a1248769c689d9398236d +Author: Sebastiaan van Stijn +Date: Sat Jun 11 00:04:05 2016 +0200 + + remove unused defaultExitOnUnhealthy constant + + the '--exit-on-unhealty' option was removed, + but we forgot to remove this constant. + + Signed-off-by: Sebastiaan van Stijn + +commit 3d0595f1d5aaa52b82a9bdfe7104735c09667860 +Merge: 29283143be e6e51d37f7 +Author: Michael Crosby +Date: Fri Jun 10 14:45:44 2016 -0700 + + Merge pull request #23439 from michael-holzheu/PR-s390x-seccomp-remove-again + + Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS + +commit 29283143be0c2d31775dd540433d5a09fc3d1ffc +Merge: a1f60b9db3 cd7ca2a1c7 +Author: Sebastiaan van Stijn +Date: Fri Jun 10 23:23:16 2016 +0200 + + Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen + + [carry 23352] update peaceful zen + +commit a1f60b9db3edc06f66d8977ebcf66f8ae606baec +Merge: 12970bef34 64a91ee74e +Author: Sebastiaan van Stijn +Date: Fri Jun 10 23:21:52 2016 +0200 + + Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout + + (cherry-pick) Increase containerd start-timeout to 2 minutes on master + +commit e6e51d37f7b6509f6422ad97533e9bb581042461 +Author: Michael Holzheu +Date: Fri Jun 10 15:16:11 2016 -0400 + + Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS + + We have to wait until runc version (RUNC_COMMIT) is bumped. + Otherwise we get the following error: + + oci runtime error: string SCMP_ARCH_S390 is not a valid + arch for seccomp + + Fixes: bf2a577c131d899 ("Enable seccomp for s390x") + Signed-off-by: Michael Holzheu + +commit bfbce575603f99f708cb2f5507a06c4520b0cb8a +Author: Riyaz Faizullabhoy +Date: Fri Jun 10 09:50:03 2016 -0700 + + Change target info API from list to map return + + Signed-off-by: Riyaz Faizullabhoy + +commit 5a645089b3ee321ffe7d94c38fe51881959cc365 +Merge: c48b4faf29 0f94804ede +Author: Ying Li +Date: Fri Jun 10 09:41:43 2016 -0700 + + Merge pull request #775 from avaid96/tufREADME + + Edited tuf/README + +commit 12970bef34dbad39beb87a87d553020750347ec4 +Merge: 73169da9db 6b46a56865 +Author: Alexander Morozov +Date: Fri Jun 10 09:16:46 2016 -0700 + + Merge pull request #23351 from thaJeztah/remove-go-1.4-fix + + remove fallback for Go 1.4 + +commit cd7ca2a1c761886ba937efef2ea5fbd90d371c1b +Author: fortinux +Date: Tue Jun 7 17:51:34 2016 -0300 + + update peaceful zen + + Signed-off-by: fortinux + Signed-off-by: Sebastiaan van Stijn + +commit 61324ef30839bdcf99e20e0de2a4bb029e189166 +Author: Sander Maijers +Date: Fri Jun 10 16:30:46 2016 +0200 + + Fix byte/str typing error + + Signed-off-by: Sander Maijers + +commit 73169da9db9ee12b421060eae14377cb6ca372d7 +Merge: 4a3b9a606b 302a1e6101 +Author: Vincent Demeester +Date: Fri Jun 10 16:28:19 2016 +0200 + + Merge pull request #23433 from thaJeztah/changelog-cherry-pick + + Cherry-pick 1.11.2 CHANGELOG into master + +commit 64a91ee74e73c956e92801447ae73ba82d168ed5 +Author: Kenfe-Mickael Laventure +Date: Wed Jun 1 13:00:25 2016 -0700 + + Increase containerd start-timeout to 2 minutes + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 4251e1e99e16ff7ff5557ee16e5bef26a14cd127) + Signed-off-by: Sebastiaan van Stijn + +commit 302a1e61013a2c90ae94a4e7d3e49b9c8ed9d768 +Author: Kenfe-Mickael Laventure +Date: Fri May 27 09:12:33 2016 -0700 + + Update CHANGELOG for 1.11.2 + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit c9dd46ca5c4d559e079962fe583755828f4b1a03) + Signed-off-by: Sebastiaan van Stijn + +commit 4a3b9a606b0a33de8148a1fd438bd2166fa77945 +Merge: a05536ff42 e6d856df43 +Author: Sebastiaan van Stijn +Date: Fri Jun 10 15:58:25 2016 +0200 + + Merge pull request #23410 from cyphar/fix-xattr-ignore + + pkg: archive: only ignore ENOTSUP when xattr fails + +commit ad4e20cd92079ec59b175b8a687ddadfa00037eb +Author: Vincent Demeester +Date: Fri Jun 10 12:07:32 2016 +0200 + + Moving Image{Push,Pull}Privileged to trust.go + + Signed-off-by: Vincent Demeester + +commit 9640e3a4514f96a890310757a09fd77a3c70e931 +Author: Vincent Demeester +Date: Fri Jun 10 12:07:28 2016 +0200 + + Migrate push command to cobra + + Signed-off-by: Vincent Demeester + +commit fa67b984f8ec1aa7b8292777210f4643d4bc1bf0 +Author: Vincent Demeester +Date: Fri Jun 10 12:07:23 2016 +0200 + + Migrate pull command to cobra + + Signed-off-by: Vincent Demeester + +commit baf467722b3ca9c3beea5d49e26e7982230e7567 +Author: Vincent Demeester +Date: Fri Jun 10 12:04:29 2016 +0200 + + Migrate login & logout command to cobra + + Also moves some common stuff around : + - `api/client/registry.go` for registry related + method (`ElectAuthServer`, …) + - `api/client/credentials.go` to interact with credentials + + Migrate logout command to cobra + + Signed-off-by: Vincent Demeester + +commit a05536ff42d8a59d72cd95dfc38dc848e736420c +Merge: 51f0def774 6632fd2788 +Author: Antonio Murdaca +Date: Fri Jun 10 12:02:18 2016 +0200 + + Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra + + Use spf13/cobra for docker load and save + +commit 51f0def774fc8e526adce73bb4465577ebebfe27 +Merge: 04f5ce5152 0bc88d5b0a +Author: Vincent Demeester +Date: Fri Jun 10 11:56:14 2016 +0200 + + Merge pull request #23400 from runcom/fix-digest-test + + integration-cli: use distribution/reference.DigestRegexp + +commit 04f5ce5152dbbe303e95216fb5a2a420656c3297 +Merge: 949f8d0d11 a07c57f656 +Author: Sebastiaan van Stijn +Date: Fri Jun 10 08:31:19 2016 +0200 + + Merge pull request #23421 from tiffanyfj/typos + + Fixed spelling error in builder/dockerfile/parser/parser.go + +commit 0f94804edeb227b109b6e9d544cb980627c7c1e9 +Author: avaid96 +Date: Thu Jun 9 11:00:03 2016 -0700 + + Edited tuf/README + + Signed-off-by: avaid96 + +commit 1c999392214614d7f97b2cc450d26ea3b3342970 +Author: Derek McGowan +Date: Thu Jun 9 17:35:14 2016 -0700 + + Vendor letsencrypt packages + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 949f8d0d11eb7dbc2fbdf91210c5564da19de8e7 +Merge: a4ff707e99 b91269c5ed +Author: Sebastiaan van Stijn +Date: Fri Jun 10 00:36:13 2016 +0200 + + Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin + + docs: Add Azure File Storage Volume Driver plugin + +commit b91269c5edf0b62bcc91d18b23b58e66f7a4f52b +Author: Ahmet Alp Balkan +Date: Thu Jun 9 13:47:15 2016 -0700 + + docs: Add Azure File Storage Volume Driver plugin + + Signed-off-by: Ahmet Alp Balkan + +commit c48b4faf29e75b40215b8d3ef4d3a8c7530c116a +Merge: ca58a2d38f e286b4d355 +Author: Riyaz Faizullabhoy +Date: Thu Jun 9 15:26:54 2016 -0700 + + Merge pull request #777 from cyli/bump-rethink-version + + Bump rethink version due to vulnerabilites in 2.3.0 image + +commit a4ff707e993ac01c05eee5dd9e7eb7d374d129cf +Merge: 1164f917fa 94ac03cdf5 +Author: Sebastiaan van Stijn +Date: Fri Jun 10 00:05:43 2016 +0200 + + Merge pull request #23406 from thaJeztah/update-deb-script + + release-deb: create "dists" directory if missing + +commit 1164f917faa46e0178dd5050a524a635ea849386 +Merge: 30bbf184e9 8bd33b430b +Author: Sebastiaan van Stijn +Date: Fri Jun 10 00:02:56 2016 +0200 + + Merge pull request #23359 from londoncalling/docker-engine-overview + + re-doing Docker Engine overview topics for v.1.12 + +commit a07c57f656846ee0de67ac4f575fe5b76d482efb +Author: Tiffany Jernigan +Date: Thu Jun 9 14:47:05 2016 -0700 + + Fixed spelling error in builder/dockerfile/parser/parser.go + + Signed-off-by: Tiffany Jernigan + +commit e286b4d355dd9007a2373455af3c73930128be78 +Author: Ying Li +Date: Thu Jun 9 14:04:02 2016 -0700 + + Bump rethink version due to vulnerabilites (see docker hub vulnerability scan of 2.3.0 at https://hub.docker.com/r/jlhawn/rethinkdb/tags/2.3.0/) + + Signed-off-by: Ying Li + +commit ca58a2d38f588a91de09a12c8e6e601193134791 +Merge: ec0625cca8 2c028a3bdc +Author: Riyaz Faizullabhoy +Date: Thu Jun 9 14:02:53 2016 -0700 + + Merge pull request #776 from avaid96/master + + changed Tuf to TUF in code + +commit 2c028a3bdc9ecbc1f690fb0a295761972b705088 +Author: avaid96 +Date: Thu Jun 9 12:22:05 2016 -0700 + + change Tuf to TUF in code + + Signed-off-by: avaid96 + +commit 30bbf184e937ee2aab075a4a6890d9f9f0b74cde +Merge: 5bdc833e44 bb1c54bc1f +Author: John Howard +Date: Thu Jun 9 11:39:39 2016 -0700 + + Merge pull request #23392 from Microsoft/RevendorHcsshim + + Revendor hcsshim to v0.3.2 + +commit ec0625cca8f9f2d1c34115bd23e65cc32a47f58f +Merge: e919b3d81e 1016b68103 +Author: Ying Li +Date: Thu Jun 9 11:31:18 2016 -0700 + + Merge pull request #763 from docker/logrus-error + + Error logging for POSTs to notary server + +commit e919b3d81e0ab727b99d5fca95eaa1fbfad40e6a +Merge: 0826dbe201 b2a01324b0 +Author: Ying Li +Date: Thu Jun 9 11:25:31 2016 -0700 + + Merge pull request #772 from cyli/json-unmarshal-rethink-objs + + Add JSON marshalling and unmarshalling specific model types to rethink Table object + +commit b2a01324b0812a03f185ad1f63d93d1df4394398 +Author: Ying Li +Date: Wed Jun 8 17:08:35 2016 -0700 + + Include JSON unmarshalling failure test cases + + Signed-off-by: Ying Li + +commit 2f62e8d260edebd08ac63f7e2bb50fcbe8f328b7 +Author: Ying Li +Date: Wed Jun 8 16:20:45 2016 -0700 + + Add JSON marshalling and unmarshalling specify model types as a field on a Table object + + Signed-off-by: Ying Li + +commit 0826dbe201080d416cecc934214fa86d9d9dfd5f +Merge: 4ad17f6f2a bfab7201b3 +Author: Riyaz Faizullabhoy +Date: Thu Jun 9 10:40:42 2016 -0700 + + Merge pull request #773 from avaid96/TUF/tuf + + TUF changed to Tuf + +commit 2777f884f6c1cea1efa6ec2e7b6270194e425c4c +Author: Daniel Nephin +Date: Thu Jun 9 13:20:55 2016 -0400 + + Support running 'docker help daemon' + + Signed-off-by: Daniel Nephin + +commit 5bdc833e44b8ab64b039849f736f8f8077c17ce4 +Merge: 63a7a59c92 075b75fa14 +Author: Alexander Morozov +Date: Thu Jun 9 10:15:10 2016 -0700 + + Merge pull request #23413 from vdemeester/client-fix-context-sharing + + Fix some api/client context sharing/plumbing + +commit 075b75fa14e878afa87ad4fd989f03a8541b13eb +Author: Vincent Demeester +Date: Thu Jun 9 17:58:10 2016 +0200 + + Fix some context sharing/plumbing + + With cobra switch (and maybe before), some context weren't *plumbed* the + right way, fixing that. + + Signed-off-by: Vincent Demeester + +commit 6632fd27881faf899bbc33a8219a84ff18443270 +Author: Vincent Demeester +Date: Thu Jun 9 17:38:20 2016 +0200 + + Migrate save command to cobra + + Signed-off-by: Vincent Demeester + +commit 8b1d40271fd2abcd6b703a2d9e6036bceb01c050 +Author: Vincent Demeester +Date: Thu Jun 9 17:28:33 2016 +0200 + + Migrate load command to cobra + + Signed-off-by: Vincent Demeester + +commit e6d856df43ac2877ebbcff26e9f3ee755f52bce9 +Author: Aleksa Sarai +Date: Fri Jun 10 00:24:04 2016 +1000 + + pkg: archive: only ignore ENOTSUP when xattr fails + + There might be other (valid) reasons for setxattr(2) to fail, so only + ignore it when it's a not supported error (ENOTSUP). Otherwise, bail. + + Signed-off-by: Aleksa Sarai + +commit 4739fbda5b5e21051eb6d0a96af067415a7c92cc +Author: Mikhail Zholobov +Date: Thu Jun 9 17:47:38 2016 +0300 + + docs: Fix the name of "Parallels Desktop for Mac" + + Signed-off-by: Mikhail Zholobov + +commit 63a7a59c928ae80cfafa30d2bb569ea8218597e4 +Merge: b8f3cdfaec 55e9976316 +Author: Vincent Demeester +Date: Thu Jun 9 15:59:48 2016 +0200 + + Merge pull request #23408 from absourdnoise/fix-docs-readme-link + + Fixing man page link in docs/README.md + +commit 55e99763160018c610718890468c0f7ef300b1d9 +Author: Andrew Po +Date: Thu Jun 9 16:39:50 2016 +0300 + + Fixing man page link + + Signed-off-by: Andrew Po + +commit 94ac03cdf549567c01f191a066d8435731f41e06 +Author: Sebastiaan van Stijn +Date: Thu Jun 9 15:22:49 2016 +0200 + + release-deb: create "dists" directory if missing + + The script failed if an empty volume is used + to generate the repo. This adds the directory + if missing. + + Signed-off-by: Sebastiaan van Stijn + +commit b8f3cdfaec28ed4113b30923452a9842312ba70f +Merge: 266c40087c 758f9a8ceb +Author: Sebastiaan van Stijn +Date: Thu Jun 9 14:15:03 2016 +0200 + + Merge pull request #23402 from michael-holzheu/PR-bump-libseccomp-golang + + Bump seccomp version to enable ppc/s390x seccomp support + +commit 266c40087cbdd80b93e435284264db5f881a03e1 +Merge: 456551a672 982c5f199f +Author: Sebastiaan van Stijn +Date: Thu Jun 9 14:08:58 2016 +0200 + + Merge pull request #23398 from jfrazelle/23394-butts + + fix default tmpfs size to prevent breakage + +commit a229e1f4b74a038b604c4d60772db74d4dae3130 +Author: Felix Ruess +Date: Tue Apr 19 15:13:17 2016 +0200 + + build armhf deb for ubuntu-trusty + + Signed-off-by: Felix Ruess + +commit c111b7eb3d25b5f7a07a6037fcca33282de91ef3 +Author: Zhang Wei +Date: Thu Jun 9 18:04:53 2016 +0800 + + Move GetExitCode to package container and unexport it + + GetExitCode is used only by container package, so move it to package + container and unexport it + + Signed-off-by: Zhang Wei + +commit 758f9a8cebbc3f6a0f07cd66146c726452b4207d +Author: Michael Holzheu +Date: Thu Jun 9 05:41:18 2016 -0400 + + Bump seccomp version to enable ppc/s390x seccomp support + + Signed-off-by: Michael Holzheu + +commit 0bc88d5b0a14e6c7291bb5fbf99283a05511d07c +Author: Antonio Murdaca +Date: Thu Jun 9 11:00:41 2016 +0200 + + integration-cli: use distribution/reference.DigestRegexp + + from a docker push output digest.DigestRegexp.FindString(output) does + not retrive the sha256: prefixed digest but just a string - in many + cases it's the registry host. The checks in the code are completely + wrong then. Fix this by using the DigestRegexp from the + distribution/reference package which correctly retrieves the digest + from the output. + + Signed-off-by: Antonio Murdaca + +commit 982c5f199fe548ecafd53ab72e7984a6ce07ba8f +Author: Jess Frazelle +Date: Thu Jun 9 00:12:34 2016 -0700 + + fix default tmpfs size to prevent breakage + + Signed-off-by: Jess Frazelle + +commit 456551a672db7285dfdba9927c1acb8d2ab07a6b +Merge: 6717b35503 9ea3f2aca2 +Author: Vincent Demeester +Date: Thu Jun 9 08:14:14 2016 +0200 + + Merge pull request #23380 from Microsoft/jjh/refreshwin2lin + + Update win2lin scripts to match production + +commit 04b8fa8f1d7ccd82fa28cd3dfabd1c8c3a39c8fc +Author: NanXiao +Date: Thu Jun 9 13:11:32 2016 +0800 + + Edit docs/discovery.md + + Since only one "" is invisible in Markdown file, use " + node IP address" instead. + + Signed-off-by: NanXiao + +commit bfab7201b36a9c26d788da92f0233959c176fbc5 +Author: avaid96 +Date: Wed Jun 8 19:01:26 2016 -0700 + + Changed the comment inconsistency that caused last circleci build to fail + + Signed-off-by: avaid96 + +commit 939a142c8db7054600cf911a8a19071f794da5f0 +Author: Yong Tang +Date: Mon Jun 6 07:57:44 2016 -0700 + + Use spf13/cobra for docker commit + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker commit` to use spf13/cobra + + NOTE: `RequiresMinMaxArgs()` has been renamed to `RequiresRangeArgs()`. + + Signed-off-by: Yong Tang + +commit 8bd33b430b950ca5355f950d4b79a04ba0363c3c +Author: Victoria Bialas +Date: Tue Jun 7 17:42:00 2016 -0700 + + re-doing Docker Engine overview topics for v.1.12 + + fixed broken links created from Engine Overview update by adding missing topic to daemon reference page and updating the hrefs in the api pages + + Signed-off-by: Victoria Bialas + +commit bb1c54bc1f0379b03eac50949c4b1fba0f91dd57 +Author: Darren Stahl +Date: Wed Jun 8 17:32:22 2016 -0700 + + Revendor hcsshim to v0.3.2 + + Signed-off-by: Darren Stahl + +commit 07265a36352de0381a55ec6ebd5b92cf4fc6a802 +Author: avaid96 +Date: Wed Jun 8 17:10:34 2016 -0700 + + TUF changed to Tuf in all comments and rethink models as per open issue 313 + + Signed-off-by: avaid96 + +commit 125f4ff7d7fbb5298e4ddf18db177d6583571cfa +Author: Derek McGowan +Date: Wed Jun 8 17:02:29 2016 -0700 + + Add option to get content digest from manifest get + + The client may need the content digest to delete a manifest using the digest used by the registry. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 6717b355034e81659cd8144590eaa7ac8c573fba +Merge: b47bf3dc69 70a03951a0 +Author: Sebastiaan van Stijn +Date: Thu Jun 9 01:04:02 2016 +0200 + + Merge pull request #23385 from thaJeztah/fix-rpm-manpages + + fix RPM spec for man8 + +commit b47bf3dc696615308d021b6ef417a9147d7b065c +Merge: 5b1060c775 7d22eb072c +Author: Sebastiaan van Stijn +Date: Thu Jun 9 01:03:17 2016 +0200 + + Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork + + fix TestEventsContainerWithMultiNetwork + +commit 5b1060c7758aa6bfd2210515a3e24fb287322ed9 +Merge: e884a515e9 8d72ff3f5e +Author: Sebastiaan van Stijn +Date: Thu Jun 9 00:09:28 2016 +0200 + + Merge pull request #23354 from riyazdf/notary-delegation-env + + Add link to notary environment vars from docker trust automation section + +commit e884a515e96201d4027a6c9c1b4fa884fc2d21a3 +Merge: 8a22c4166b 04cdb8e602 +Author: Vincent Demeester +Date: Wed Jun 8 23:50:46 2016 +0200 + + Merge pull request #23334 from WeiZhang555/cobra-stats + + Migrate stats and events command to cobra + +commit 8a22c4166b3f82f4ae447a89541e8b691a3bddda +Merge: 6fd8c96f61 e3490cdcc0 +Author: Vincent Demeester +Date: Wed Jun 8 23:46:47 2016 +0200 + + Merge pull request #23384 from jannickfahlbusch/fix-typos + + Fix some typos + +commit 7d22eb072cd277048e678d6244e5fb395b34f1ff +Author: Sebastiaan van Stijn +Date: Wed Jun 8 23:09:20 2016 +0200 + + fix TestEventsContainerWithMultiNetwork + + the order in which disconnect takes place is undetermined, + so don't check for the full name + + this test was passing due to a previous bug, that + always returned the same network-name. + + this bug was recently fixed in 148bcda3292563df8e433a3d7987810cd5702dec + (pull request 23375), exposing this test to be + flaky. + + Signed-off-by: Sebastiaan van Stijn + +commit 6fd8c96f6164fa70170a2400f8fa092de9507cf9 +Merge: 3b08711bb7 b29e8ea412 +Author: Brian Goff +Date: Wed Jun 8 16:37:08 2016 -0400 + + Merge pull request #23344 from pdalpra/timeout-as-time.Duration + + Timeout as time.duration + +commit 70a03951a037c2c415d84fc65eff989151c1dfc4 +Author: Sebastiaan van Stijn +Date: Wed Jun 8 22:21:21 2016 +0200 + + fix RPM spec for man8 + + installation for man-8 was added in 1514b499f04e317d6bc81bb2d46a6623db422763 + (pull-request 23236), but had a typo in a path, + causing generation of the RPM's to fail. + + This fixes the path + + Signed-off-by: Sebastiaan van Stijn + +commit e3490cdcc0e2b1e4c4da125626430016a3048128 +Author: Jannick Fahlbusch +Date: Wed Jun 8 21:58:45 2016 +0200 + + Fix some typos + + Signed-off-by: Jannick Fahlbusch + +commit 75882f079c9a2160af5df26c7b3a429f912b0b1d +Merge: 2cbf54df6c 352924cd85 +Author: Richard Scothern +Date: Wed Jun 8 12:59:09 2016 -0700 + + Merge pull request #1774 from RichardScothern/catalog-clarifcation + + Clarify API documentation around catalog fetch behavior + +commit 4ad17f6f2a4c91159bba6f98ff2d0439b2220fb5 +Merge: a1f1fb449e 53d91279c6 +Author: Ying Li +Date: Wed Jun 8 12:40:43 2016 -0700 + + Merge pull request #769 from gtank/go-devel + + allow devel builds of go to pass make version check + +commit 3b08711bb75e30d850665312413a60f51114202f +Merge: f8a8222126 60f447b655 +Author: Alexander Morozov +Date: Wed Jun 8 11:59:48 2016 -0700 + + Merge pull request #23343 from vdemeester/migrate-build-to-cobra + + Use spf13/cobra for docker build + +commit 53d91279c686a6f09e62d8f9ae53e7207eaf66f2 +Author: George Tankersley +Date: Tue Jun 7 14:43:53 2016 -0700 + + allow devel builds of go to pass make version check + + Signed-off-by: George Tankersley + +commit f8a8222126806391f78a87cf327dd69353488c3c +Merge: 393e97e435 e3d31d794b +Author: Sebastiaan van Stijn +Date: Wed Jun 8 20:39:37 2016 +0200 + + Merge pull request #23381 from kolyshkin/docs-add-ploop-plugin + + docs/extend/plugins.md: add docker-volume-ploop + +commit d11bfda738ba2c44b2e5541b473c25aff6b7b042 +Merge: 5193fed183 bf91ddcb58 +Author: Sebastiaan van Stijn +Date: Wed Jun 8 20:25:45 2016 +0200 + + Merge pull request #74 from thaJeztah/add-swarmkit + + Add SwarmKit + +commit e3d31d794b64d93174e17dd98249033e623adbe6 +Author: Kirill Kolyshkin +Date: Wed Jun 8 11:24:56 2016 -0700 + + docs/extend/plugins.md: add docker-volume-ploop + + Added docker-volume-ploop driver to the list of available volume plugins. + + Signed-off-by: Kir Kolyshkin + +commit bf91ddcb58f3e66d6e1572fdbae4a63bf96a704d +Author: Sebastiaan van Stijn +Date: Wed Jun 8 19:26:58 2016 +0200 + + Add SwarmKit + + Signed-off-by: Sebastiaan van Stijn + +commit 393e97e435e7c1629934d8042d1fb8e5bb7d61f9 +Merge: 9db33b7646 8d174a43ba +Author: Michael Crosby +Date: Wed Jun 8 11:18:48 2016 -0700 + + Merge pull request #23002 from Microsoft/jjh/readonly + + Windows: Support RO volumes 14350+ + +commit 9ea3f2aca2ce3b12d42e72290e404592209ee652 +Author: John Howard +Date: Wed Jun 8 11:08:23 2016 -0700 + + Update win2lin scripts to match production + + Signed-off-by: John Howard + +commit a1f1fb449e34751949efd85b02f4c54f0bccf5bf +Merge: 71a40efa20 4a1c4c9c85 +Author: Riyaz Faizullabhoy +Date: Wed Jun 8 10:43:53 2016 -0700 + + Merge pull request #767 from docker/rethinkdb-export-schema + + Export rethinkdb table definitions + +commit 9db33b7646854ed994b74d0e71bced087e617291 +Merge: 148bcda329 9b5e0ea7de +Author: Brian Goff +Date: Wed Jun 8 13:42:22 2016 -0400 + + Merge pull request #23377 from vdemeester/carry-pr-23007 + + Carry #23007 : Say something useful during docker load + +commit 352924cd854d83024a71d42c7893bc873a156485 +Author: Richard Scothern +Date: Wed Jun 8 10:39:17 2016 -0700 + + Clarify API documentation around catalog fetch behavior + + Signed-off-by: Richard Scothern + +commit 2cbf54df6cc5f66f4ed9b5e5564ca356fc790f93 +Merge: 79102ecf85 fc9aa2f351 +Author: Richard Scothern +Date: Wed Jun 8 10:31:49 2016 -0700 + + Merge pull request #1773 from zhouhaibing089/comment-fix + + Fix incorrect comment about auth type + +commit 79102ecf850b5bc27bc34326ed122b03dcee6948 +Merge: feddf6cd4e 4901f1b278 +Author: Richard Scothern +Date: Wed Jun 8 10:22:57 2016 -0700 + + Merge pull request #1772 from runcom/go1.6const + + registry: use const for status code 429 + +commit 148bcda3292563df8e433a3d7987810cd5702dec +Merge: 430950e2d1 1cac7e6cbd +Author: Vincent Demeester +Date: Wed Jun 8 18:19:08 2016 +0200 + + Merge pull request #23375 from HackToday/fixnetworkmap + + Fix wrong map usage + +commit 9b5e0ea7dedac3c1cbbaf6770aa6834c8e7b7774 +Author: Vincent Demeester +Date: Wed Jun 8 17:40:37 2016 +0200 + + Update docker-load documentation + + Signed-off-by: Vincent Demeester + +commit 430950e2d17c25b5df65d61a53f50528510509ac +Merge: a63e95423a feabf71dc1 +Author: Vincent Demeester +Date: Wed Jun 8 17:32:00 2016 +0200 + + Merge pull request #23305 from thaJeztah/fix-network-examples + + network docs cleanup + +commit 6986a3220fe59146eeddeaa865561472abc7baeb +Author: Doug Davis +Date: Wed May 25 18:25:12 2016 -0700 + + Say something useful during docker load + + During a `docker load` there are times when nothing is printed + to the screen, leaving the user with no idea whether something happened. + When something *is* printed, often its just something like: + ``` + 1834950e52ce: Loading layer 1.311 MB/1.311 MB + 5f70bf18a086: Loading layer 1.024 kB/1.024 kB + ``` + which isn't necessarily the same as the image IDs. + + This PR will either show: + - all of the tags for the image, or + - all of the image IDs if there are no tags + + Sample output: + ``` + $ docker load -i busybox.tar + Loaded image: busybox:latest + + $ docker load -i a.tar + Loaded image ID: sha256:47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb + ``` + + IOW, show the human-friendly stuff first and then only if there are no tags + default back to the image IDs, so they have something to work with. + + For me this this is needed because I have lots of images and after a + recent `docker load` I had no idea what image I just imported and had a + hard time figuring it out. This should fix that by telling the user + which images they just imported. + + I'll add tests once there's agreement that we want this change. + + Signed-off-by: Doug Davis + +commit a63e95423a7e33c87b4ad0c10e4f158d4777c469 +Merge: a4422e6ebc 6284f04a6b +Author: Vincent Demeester +Date: Wed Jun 8 17:05:02 2016 +0200 + + Merge pull request #23372 from GaretJax/23369-unicode-parse-words + + Support unicode characters in parseWords + +commit fc9aa2f351c9f780b77ebada9d87f098d1ebd3ba +Author: zhouhaibing089 +Date: Wed Jun 8 22:43:28 2016 +0800 + + incorrect comment about auth type + + Signed-off-by: haibzhou + +commit 1cac7e6cbd3d1501d0fc29fc55b7ada981974998 +Author: Kai Qiang Wu(Kennan) +Date: Wed Jun 8 14:36:42 2016 +0000 + + Fix wrong map usage + + As map reference, if all networks use same, it could cause strange + results. + Closes: #23304 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 6284f04a6b3a9b8127dc166ff84b102c8ad411ce +Author: Jonathan Stoppani +Date: Wed Jun 8 13:55:26 2016 +0200 + + Support unicode characters in parseWords + + Signed-off-by: Jonathan Stoppani + +commit a4422e6ebc57c2c1082bc23a9906e948acbb0da7 +Merge: d85491ff4b 322e2a7d05 +Author: Vincent Demeester +Date: Wed Jun 8 11:16:00 2016 +0200 + + Merge pull request #22880 from bfirsh/remote-api-json-errors + + Return remote API errors as JSON + +commit 8ca6f99d5efd3f20b4b88ed488f933d9bd4a00a8 +Author: cyli +Date: Wed Jun 8 01:00:41 2016 -0700 + + Update the API docs about repo namespace to include the word 'owner' + + Signed-off-by: cyli + +commit 4901f1b2781c5de0d06a18a3990bf091bcd4f081 +Author: Antonio Murdaca +Date: Wed Jun 8 10:19:15 2016 +0200 + + registry: use const for status code 429 + + Signed-off-by: Antonio Murdaca + +commit 23e5c94cfb26eb72c097892712d3dbaa93ee9bc0 +Author: Derek McGowan +Date: Mon May 16 17:02:51 2016 -0700 + + Add separate overlay2 driver + + Adds a new overlay driver which uses multiple lower directories to create the union fs. + Additionally it uses symlinks and relative mount paths to allow a depth of 128 and stay within the mount page size limit. + Diffs and done directly over a single directory allowing diffs to be done efficiently and without the need fo the naive diff driver. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 246e99303195b6ce4c357ceb5925990aa1890288 +Author: Derek McGowan +Date: Fri Apr 15 15:53:37 2016 -0700 + + Add more overlay tests and benchmarks + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 8b0441d42cca4f89cf871c1b64172cc06f9c98e6 +Author: Derek McGowan +Date: Thu Apr 14 18:14:42 2016 -0700 + + Expand graphtest package + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 79ee15fbb2527f5bee21b6e64cc34983a80821f4 +Merge: 453d71753e a1c58f5149 +Author: Allen Sun +Date: Wed Jun 8 15:11:56 2016 +0800 + + Merge pull request #2338 from NanXiao/issue-9999 + + Edited docs/discovery.md + +commit a1c58f514962a33204383fcb24c0be189be7fd26 +Author: NanXiao +Date: Wed Jun 8 15:35:40 2016 +0800 + + Fix typos in docs/reference/manage.md and docs/reference/join.md + + Signed-off-by: NanXiao + +commit 8222c86360b3f63174e1dbd9b35e27a3d01298bc +Author: Derek McGowan +Date: Wed Apr 6 15:07:29 2016 -0700 + + Update archive package to support overlay whiteouts + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit b03d3232d19db476077b845cbfc796f4ae3ec7b6 +Author: Viktor Stanchev +Date: Sun Dec 13 21:42:52 2015 -0800 + + aufs compatibility + + Signed-off-by: Viktor Stanchev + +commit b29e8ea412534a857d76bc716b79c7483e347f3a +Author: Pierre Dal-Pra +Date: Wed Jun 8 08:05:18 2016 +0200 + + Use time.Duration for container restart/stop timeouts + + Signed-off-by: Pierre Dal-Pra + +commit 04cdb8e6025d9c0eac0462f3ad3f1ab33204e615 +Author: Zhang Wei +Date: Tue Jun 7 00:47:18 2016 +0800 + + Migrate stats and events command to cobra. + + Signed-off-by: Zhang Wei + +commit d85491ff4bd300b159425dcad41764f454f43ceb +Merge: 88e9fcf65a 04b4e3e6d8 +Author: Brian Goff +Date: Tue Jun 7 22:18:25 2016 -0400 + + Merge pull request #21946 from chosenken/add_disk_quota_to_zfs + + Add support for setting storage size on ZFS containers + +commit 88e9fcf65a6868e8761206f2313b2c701b6094fe +Merge: f6ff9acc63 d17b9f3da0 +Author: Arnaud Porterie +Date: Wed Jun 8 02:14:05 2016 +0000 + + Merge pull request #23355 from crosbymichael/bump-containerd-jun7 + + Update containerd to cf554d59dd96e459544748290eb91 + +commit 322e2a7d059a81617b593cf6ece2cfd9f6d4ea03 +Author: Ben Firshman +Date: Sat May 21 12:56:04 2016 +0100 + + Return remote API errors as JSON + + Signed-off-by: Ben Firshman + +commit d17b9f3da064f4c7e70867be5e64d06b127df301 +Author: Michael Crosby +Date: Tue Jun 7 14:30:43 2016 -0700 + + Update containerd to cf554d59dd96e459544748290eb91 + + This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and + includes various fixes and updates the grpc package and types generated + for use. + + Signed-off-by: Michael Crosby + +commit f6ff9acc63a0e8203a36e2e357059089923c2a49 +Merge: 13d101d53c 2c60430a3d +Author: Antonio Murdaca +Date: Wed Jun 8 00:02:23 2016 +0200 + + Merge pull request #23327 from dmcgowan/refactor-foreign-layer + + Refactor foreign sources to describable interfaces + +commit 8d174a43babd19e8c1166338b5aa5f1128914a96 +Author: John Howard +Date: Wed May 25 13:56:36 2016 -0700 + + Windows: Support RO volumes 14350+ + + Signed-off-by: John Howard + +commit 13d101d53ce820d920accd429528374b41bfab4e +Merge: ce96ce9e05 bc82e51d77 +Author: Vincent Demeester +Date: Tue Jun 7 23:46:01 2016 +0200 + + Merge pull request #23333 from yongtang/23211-spf13-cobra-version + + Use spf13/cobra for docker version + +commit 0f5f18a2134946edaa3dffa2bbbc05dabde5c197 +Merge: cdc8651ac3 f737af4a55 +Author: Joao Fernandes +Date: Tue Jun 7 14:07:48 2016 -0700 + + Merge pull request #2309 from joaofnfernandes/upgrade + + Updates docs for upgrading with latest image + +commit cdc8651ac37cda24437767590237cade36e3803d +Merge: c478a2739b 92a2532834 +Author: Joao Fernandes +Date: Tue Jun 7 14:07:16 2016 -0700 + + Merge pull request #2311 from joaofnfernandes/fix-typo + + Fix docs typo. Replaces UCP with DTR + +commit ce96ce9e05d9b312b5454237680abadc7aa51092 +Merge: 08419313ec 7702f39fe8 +Author: Brian Goff +Date: Tue Jun 7 17:05:21 2016 -0400 + + Merge pull request #23311 from WeiZhang555/cobra-rm + + Migrate rm command to cobra + +commit 8d72ff3f5e5d3a3a0fb3645ef41ad72713c8298b +Author: Riyaz Faizullabhoy +Date: Tue Jun 7 14:02:39 2016 -0700 + + Add link to notary environment vars from docker trust automation section + + Signed-off-by: Riyaz Faizullabhoy + +commit c478a2739bd29449a6dbc00c811712de0f5a1b66 +Author: Brian Goff +Date: Tue Jun 7 13:58:38 2016 -0400 + + Update cs-engine release notes for 1.11.2-cs3 + + Signed-off-by: Brian Goff + +commit 6b46a568656ac400830e170c4b1ad79455d63111 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 22:38:02 2016 +0200 + + remove fallback for Go 1.4 + + Windows is now built using Go 1.6, so we no longer + need to have a fallback for Go 1.4. + + This removes the fallback that was introduced in + 6df3fc51759a6219e965a30c413cb43ddbc897c9 / + https://github.com/docker/docker/pull/18553 + + Signed-off-by: Sebastiaan van Stijn + +commit 08419313ec51b4e9c7db9e12c01cc6eea6cb8f16 +Merge: 55a8bfa0e8 65a0034c67 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 21:56:42 2016 +0200 + + Merge pull request #23292 from yongtang/23211-spf13-cobra-images + + Use spf13/cobra for docker images + +commit 55a8bfa0e863c6399021ac4bf0bb7ca130debe16 +Merge: 9d139e50bc ba7324ffcb +Author: Sebastiaan van Stijn +Date: Tue Jun 7 21:55:29 2016 +0200 + + Merge pull request #23278 from yongtang/23211-spf13-cobra-tag + + Use spf13/cobra for docker tag + +commit 9d139e50bc967aa4573608c5f38189bf3933043f +Merge: 8cd6977f98 337eaab5d1 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 21:54:58 2016 +0200 + + Merge pull request #23349 from albers/completion-ps-filter-network + + bash completion for `docker ps --filter network` + +commit 337eaab5d1bf024dc3299e6b70a575623886e063 +Author: Harald Albers +Date: Tue Jun 7 12:44:17 2016 -0700 + + bash completion for `docker ps --filter network` + + Signed-off-by: Harald Albers + +commit 1016b68103ee81afe5497555c755bc9b93aa2c10 +Author: Riyaz Faizullabhoy +Date: Thu Jun 2 15:47:35 2016 -0700 + + Error logging for 500 POSTs to notary server + + Signed-off-by: Riyaz Faizullabhoy + +commit 4a1c4c9c856a09d90e059988c4b94172681c5d41 +Author: Riyaz Faizullabhoy +Date: Mon Jun 6 12:53:34 2016 -0700 + + Export rethinkdb table definitions + + Signed-off-by: Riyaz Faizullabhoy + +commit 71a40efa20763048575a194c52a77b694d6877db +Merge: 205666e4ff e93a2ea662 +Author: Ying Li +Date: Tue Jun 7 12:00:22 2016 -0700 + + Merge pull request #768 from docker/fix-lint + + fix lint and circle, edit codecov + +commit 8cd6977f98f4f51ee110a9795d1d93b9ec4b166c +Merge: 06a204c314 aa00520fc8 +Author: Alexander Morozov +Date: Tue Jun 7 10:46:45 2016 -0700 + + Merge pull request #23338 from vdemeester/23253-fix-create-run + + Fix create command flags + +commit 06a204c314814c8d022a03ed187a11d8b26062c6 +Merge: cc03a422aa 7c46ba02e6 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 19:18:51 2016 +0200 + + Merge pull request #23300 from thaJeztah/carry-22894-ps_filter_network + + [carry 22894] Adding network filter to docker ps command + +commit cc03a422aaa976568dcb423ebb518b0c40e9e66a +Merge: a01ae049f9 2266e7f234 +Author: Alexander Morozov +Date: Tue Jun 7 09:49:28 2016 -0700 + + Merge pull request #23328 from swernli/servicingFix + + Fix postRunProcessing behavior during docker build + +commit 66234eaf9bd78ccad44db4a199fa865334e7b418 +Author: Pierre Dal-Pra +Date: Tue Jun 7 17:48:07 2016 +0200 + + Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814 + + Signed-off-by: Pierre Dal-Pra + +commit 60f447b655c960a48fa23e9eb86cc3bce4aeec37 +Author: Vincent Demeester +Date: Tue Jun 7 18:15:44 2016 +0200 + + Migrate docker build to cobra + + Signed-off-by: Vincent Demeester + +commit e502417df28e689d07006eb6e7a7e29729ddda82 +Merge: 6e2d1eb80e ea640f3821 +Author: Aanand Prasad +Date: Tue Jun 7 18:01:39 2016 +0200 + + Merge pull request #3475 from shin-/3429-networks-config-serialize + + Output valid config in config command + +commit ba7324ffcb23ba314fbab335a816004c4af7f3f3 +Author: Yong Tang +Date: Sun Jun 5 11:05:35 2016 -0700 + + Use spf13/cobra for docker tag + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker tag` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit bc82e51d7755e54dc6d0dcb93e6250bbff0bbd59 +Author: Yong Tang +Date: Mon Jun 6 19:15:37 2016 -0700 + + Use spf13/cobra for docker version + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker version` to use spf13/cobra + + NOTE: Most of the commands like `run`, `images` etc. goes to packages of + `container`, `image`, `network`, etc. Didn't find a good place for + `docker version` so just use the package `client` for now. + + Signed-off-by: Yong Tang + +commit 65a0034c67dbcc9e7a2baf285fca7d2435b689a3 +Author: Yong Tang +Date: Sun Jun 5 20:55:47 2016 -0700 + + Use spf13/cobra for docker images + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker images` to use spf13/cobra + + NOTE: As part of this fix, a new function `RequiresMaxArgs()` + has been defined in `cli/required.go`. This func returns an + error if there is not at most max args + + Signed-off-by: Yong Tang + +commit 7c46ba02e694ae540866b29ebf0dab76e556cc13 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 02:04:33 2016 +0200 + + add support for filtering by network ID + + This adds support for filtering by network ID, to be + consistent with other filter options. + + Note that only *full* matches are returned; this is + consistent with other filters (e.g. volume), that + also return full matches only. + + Signed-off-by: Sebastiaan van Stijn + +commit 912af1ae8f22c4d9d7e478d0985a40b41ded2027 +Author: Sainath Grandhi +Date: Fri May 27 12:20:31 2016 -0700 + + Adding network filter to docker ps command + + Signed-off-by: Sainath Grandhi + +commit a01ae049f982811c2e6d9a25a6c595bcd2fb7d32 +Merge: 88323c861a 085f41b6a5 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 16:40:14 2016 +0200 + + Merge pull request #23340 from thaJeztah/fix-TestRenameInvalidName + + Fix TestRenameInvalidName + +commit 7702f39fe8e642dbaede34af09472f5aea66a795 +Author: Zhang Wei +Date: Mon Jun 6 23:32:38 2016 +0800 + + Migrate rm command to cobra + + Signed-off-by: Zhang Wei + +commit 085f41b6a5764cba33fb5bda387f8ebe165d5828 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 15:42:48 2016 +0200 + + Fix TestRenameInvalidName + + Change the test back to what it was before + e83dad090a1e890ac870808d776fa584276bf7ab + + And added an extra test-case to check the + output if an incorrect number of arguments + is passed. + + Signed-off-by: Sebastiaan van Stijn + +commit 88323c861a70f94b88870b7614bc91d2fdfd98e0 +Merge: 4f9e2f9fb4 264462d601 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 15:28:35 2016 +0200 + + Merge pull request #23307 from WeiZhang555/cobra-restart + + Migrate restart command to cobra + +commit aa00520fc8bb4e04c37c2eb41f3bc3558deab533 +Author: Vincent Demeester +Date: Tue Jun 7 14:11:11 2016 +0200 + + Fix create command flags + + Any command that expects extra flags after positional args needs to set flags.SetInterspersed(false). + + Signed-off-by: Vincent Demeester + +commit 4f9e2f9fb4a3b6594a8ae094eeb3494d6b6ef2f9 +Merge: f061f556f2 732f08a822 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 13:44:22 2016 +0200 + + Merge pull request #23297 from WeiZhang555/cobra-kill + + Migrate kill command to cobra + +commit f061f556f2d3819f293e76a434c8212d613eca6b +Merge: 8e63de1f63 7878705dcc +Author: Sebastiaan van Stijn +Date: Tue Jun 7 13:07:30 2016 +0200 + + Merge pull request #23269 from vdemeester/migrate-import-to-cobra + + Use spf13/cobra for docker import + +commit 8e63de1f63ac6bb8b0eefad4836599255d1eaea6 +Merge: 148d2b8e4a a596d3d1cf +Author: Vincent Demeester +Date: Tue Jun 7 12:54:42 2016 +0200 + + Merge pull request #23236 from runcom/fix-spec + + Fix spec and man + +commit 148d2b8e4a7e4f669ba9e8db2adc2413fde27a07 +Merge: eb6b5a6448 428328908d +Author: Vincent Demeester +Date: Tue Jun 7 12:50:04 2016 +0200 + + Merge pull request #22149 from vdemeester/deprecated-copy-endpoint + + Deprecate /containers/(id or name)/copy endpoint + +commit eb6b5a6448efe7a9450abb98f9a0ea1c4cf51913 +Merge: f9021838b6 bf2a577c13 +Author: Sebastiaan van Stijn +Date: Tue Jun 7 12:04:13 2016 +0200 + + Merge pull request #23172 from michael-holzheu/PR-s390x-seccomp + + Enable seccomp for s390x and ppc: s390x part + +commit 732f08a822567aedeb9c9b27a84d8028c9ebb365 +Author: Zhang Wei +Date: Mon Jun 6 15:38:20 2016 +0800 + + Migrate kill command to cobra + + Signed-off-by: Zhang Wei + +commit 264462d601ecd5d5e0d9e063e3d380a1e47d470a +Author: Zhang Wei +Date: Mon Jun 6 22:15:46 2016 +0800 + + Migrate restart command to cobra + + Signed-off-by: Zhang Wei + +commit f9021838b61f17b2de6c42e459a732652ee2d207 +Merge: 6d4a7213e6 864e362aa0 +Author: Vincent Demeester +Date: Tue Jun 7 10:02:17 2016 +0200 + + Merge pull request #23226 from HackToday/fixnetinspectId + + Fix the network inspect id + +commit 6d4a7213e66145552af31fa0c88aebdd70eb5700 +Merge: 804536df25 91731706c2 +Author: Vincent Demeester +Date: Tue Jun 7 10:01:42 2016 +0200 + + Merge pull request #23285 from yongtang/23211-spf13-cobra-pause + + Use spf13/cobra for docker pause + +commit 804536df25fb8b3819a42e88da4fc94b3e449000 +Merge: e83dad090a a76d387cda +Author: Vincent Demeester +Date: Tue Jun 7 10:00:39 2016 +0200 + + Merge pull request #23291 from yongtang/23211-spf13-cobra-history + + Use spf13/cobra for docker history + +commit fe536059f19277da2253fd927ffbc55908e15690 +Author: French Ben +Date: Mon Jun 6 23:50:35 2016 -0700 + + Added tracking for native setup + + Signed-off-by: French Ben + +commit e83dad090a1e890ac870808d776fa584276bf7ab +Merge: 3d8fdbb626 70f7ccb304 +Author: Vincent Demeester +Date: Tue Jun 7 08:28:27 2016 +0200 + + Merge pull request #23290 from yongtang/23211-spf13-cobra-rename + + Use spf13/cobra for docker rename + +commit a3965b93bcaf6e6a0e7c4246250d429a04408cd7 +Author: Eric Yang +Date: Tue Jun 7 11:00:37 2016 +0800 + + Fixing link in readme + + Fixing link in readme + + Signed-off-by: Qizhao Yang + +commit a31474626b734af9cb9380a2db163023870e752d +Merge: 62d46ef07d feddf6cd4e +Author: Eric Yang +Date: Tue Jun 7 10:58:38 2016 +0800 + + Merge pull request #1 from docker/master + + update + +commit 3d8fdbb6264c83975bfd36b68e3b67d12a3006c1 +Merge: c077d4cc1e 2e506039ff +Author: Brian Goff +Date: Mon Jun 6 22:39:33 2016 -0400 + + Merge pull request #23331 from yongtang/06062016-docs-typo + + Fix a couple of typos in the docs of `docker attach` + +commit 2e506039ff9f6502670d42570f835c0d51fcda20 +Author: Yong Tang +Date: Mon Jun 6 19:06:50 2016 -0700 + + Fix a couple of typos in the docs of `docker attach` + + This fix fixed a couple of typos in the docs of `docker attach`: + docs/reference/commandline/attach.md + man/docker-attach.1.md + + Signed-off-by: Yong Tang + +commit e93a2ea6623a8457053b825346eb64f73475b88d +Author: Riyaz Faizullabhoy +Date: Mon Jun 6 14:02:39 2016 -0700 + + fix lint and circle, less aggressive codecov threshold + + Signed-off-by: Riyaz Faizullabhoy + +commit c077d4cc1e2f888d645520d1f7f68619b2f85ecc +Merge: ab821f9f9b 90244abc5b +Author: Brian Goff +Date: Mon Jun 6 21:17:47 2016 -0400 + + Merge pull request #23316 from dnephin/error_on_invalid_docker_host + + Fix a panic when the DOCKER_HOST was invalid using cobra commands + +commit ab821f9f9bf15cb7d356c6e48729f706807488db +Merge: afc3cb03f4 eceb8625a9 +Author: Brian Goff +Date: Mon Jun 6 21:16:45 2016 -0400 + + Merge pull request #23274 from WeiZhang555/cobra-attach + + Move attach command to cobra + +commit 2266e7f2345c88a8e195fd959550d0d657bec843 +Author: Stefan J. Wernli +Date: Mon Jun 6 18:07:01 2016 -0700 + + Fix postRunProcessing behavior during docker build + + If Windows updates are being applied via a RUN command in a docker build, the build will not stop if there was a failure in postRunProcessing. To enable this behavior, we explicitly set the exit code of the container to a failure if postRunProcessing fails during servicing container step. For completeness, also avoid running servicing operation if the original exit code of the container is non-zero so that original failure exit code does not get overwritten. + + Signed-off-by: Stefan J. Wernli + +commit afc3cb03f4fc88f2826960a6ba3341a2b1ddeaef +Merge: 7d08f3a5ad ccaea227e0 +Author: Brian Goff +Date: Mon Jun 6 21:03:30 2016 -0400 + + Merge pull request #23323 from tiborvass/debug-ci + + Cleanup + +commit 2c60430a3d1431e0879aa1c66ca23143de987b35 +Author: Derek McGowan +Date: Mon Jun 6 17:49:34 2016 -0700 + + Use describable interfaces + + Replace use of foreign sources with descriptors and describable + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 7d08f3a5ad16446952b9b461feb0895a5c73ea58 +Merge: 3d80884f3d 05bd04350b +Author: Arnaud Porterie +Date: Tue Jun 7 00:27:40 2016 +0000 + + Merge pull request #22866 from jstarks/foreign_layers + + Support layers from external URLs + +commit ccaea227e0e9356ab293610784b635c643e9a15e +Author: Tibor Vass +Date: Mon Jun 6 15:57:51 2016 -0700 + + Cleanup + + Signed-off-by: Tibor Vass + +commit 92a2532834d61e6286674f23273e1ba6385a06e9 +Author: Joao Fernandes +Date: Mon Jun 6 14:45:09 2016 -0700 + + Fix docs typo. Replaces UCP with DTR + +commit 6e2d1eb80eec6036097f66d81cf8359e28e96636 +Merge: 427ec899df c46737ed02 +Author: Ben Firshman +Date: Mon Jun 6 22:23:56 2016 +0100 + + Merge pull request #3516 from albers/completion-rm--all + + remove command completion for `docker-compose rm --a` + +commit 48c3bea7b50a1c3d8474de7d256b5abe7004cf40 +Merge: 055f864f79 d6daabb233 +Author: French Ben +Date: Mon Jun 6 14:05:51 2016 -0700 + + Merge pull request #1717 from sibprogrammer/iterm-issue + + Fix incorrect syntax that prevents to open the stable version of iTerm. + +commit 055f864f7942a053fa67f11a842626e84000d757 +Merge: 586e3626a2 1613f172e5 +Author: French Ben +Date: Mon Jun 6 13:43:22 2016 -0700 + + Merge pull request #1739 from ruurd/master + + Only animate the running and restarting icon five times. Continuously… + +commit 586e3626a26ea77b4d952034ccf4cefe8c2e3112 +Merge: c0aadc9fef d03375f750 +Author: French Ben +Date: Mon Jun 6 13:28:31 2016 -0700 + + Merge pull request #1735 from ClemMakesApps/use-eslint + + Change npm script for lint to eslint + +commit 70f7ccb304f9246bc9c2bfe0e30d3a2bd8fd42f8 +Author: Yong Tang +Date: Sun Jun 5 19:16:26 2016 -0700 + + Use spf13/cobra for docker rename + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker rename` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit 91731706c2c7d7efba78045ff8080f2b38d07c4f +Author: Yong Tang +Date: Sun Jun 5 16:12:59 2016 -0700 + + Use spf13/cobra for docker pause + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker pause` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit f737af4a557a1bbf9c924bd57b4e6d1c1001399a +Author: Joao Fernandes +Date: Mon Jun 6 12:14:27 2016 -0700 + + Updates docs for upgrading with latest image + +commit 3d80884f3d7d60c51c0ccd6b487ebbeb98d2f7e8 +Merge: 5ce2f14f9b b32478488c +Author: Antonio Murdaca +Date: Mon Jun 6 20:46:01 2016 +0200 + + Merge pull request #23317 from LK4D4/fix_bytepipe_race + + ioutils: fix race in access closeErr in bytespipe + +commit b32478488ce6d373e44bb8a6c9cb986c773ad48e +Author: Alexander Morozov +Date: Mon Jun 6 11:29:47 2016 -0700 + + ioutils: fix race in access closeErr in bytespipe + + Signed-off-by: Alexander Morozov + +commit 90244abc5bfc3be3f97bef16f15079c4fb96c1ff +Author: Daniel Nephin +Date: Mon Jun 6 14:17:04 2016 -0400 + + Fix a panic when the DOCKER_HOST was invalid using cobra commands. + + Signed-off-by: Daniel Nephin + +commit 5ce2f14f9bd12f1a66ad8f6f75d82d8fa8adc5e0 +Merge: 4f1c5772a8 0f38669267 +Author: Alexander Morozov +Date: Mon Jun 6 10:14:10 2016 -0700 + + Merge pull request #23306 from yongtang/23211-spf13-cobra-top + + Use spf13/cobra for docker top + +commit 4f1c5772a8da16ac66fbf838b782af76fa4185a6 +Merge: 52da20b839 431e7b6573 +Author: Alexander Morozov +Date: Mon Jun 6 10:12:42 2016 -0700 + + Merge pull request #23217 from clnperez/speedup-pushfail-tests + + test trusted push: use a nonexistant hostname + +commit 52da20b839f0de34c107ca80f3be1df89dcd698c +Merge: 7a0628e01d d5971c230d +Author: Vincent Demeester +Date: Mon Jun 6 18:55:37 2016 +0200 + + Merge pull request #23286 from yongtang/23211-spf13-cobra-port + + Use spf13/cobra for docker port + +commit 205666e4ffd6d034f3838e79c8ec1690bdb50863 +Merge: 1a700552b2 f1b6097ec0 +Author: Ying Li +Date: Mon Jun 6 09:47:08 2016 -0700 + + Merge pull request #765 from endophage/passphrase_import + + moving the passphrase.Retriever definition so fewer things have a cha… + +commit 453d71753e7a7c7ef2d334e0977f1d7f17ba69b6 +Merge: f7c2deda47 8a5531777b +Author: Xian Chaobo +Date: Mon Jun 6 10:32:27 2016 -0500 + + Merge pull request #2144 from allencloud/show-container-status-of-node-in-docker-info + + show container status of each node in docker info + +commit 864e362aa05ed2207d71471780068e951fe9d02e +Author: Kai Qiang Wu(Kennan) +Date: Mon Jun 6 15:19:09 2016 +0000 + + Fix the network inspect id + + This fixes #22231 + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit a76d387cdaa0b44d7d2b7550c2eb4c0fc53e7a47 +Author: Yong Tang +Date: Sun Jun 5 19:54:33 2016 -0700 + + Use spf13/cobra for docker history + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker history` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit eceb8625a94e3504fca7b27d8156bcf11a93bf4f +Author: Zhang Wei +Date: Mon Jun 6 00:17:39 2016 +0800 + + Move attach command to cobra. + + Signed-off-by: Zhang Wei + +commit 7a0628e01d72c9caa28e4daaab3d259944e1dfb3 +Merge: 07a7c0632f 82f84a67d6 +Author: Vincent Demeester +Date: Mon Jun 6 16:08:40 2016 +0200 + + Merge pull request #23287 from yongtang/23211-spf13-cobra-wait + + Use spf13/cobra for docker wait + +commit 0f3866926763447c247bb24268923b5e50c006e1 +Author: Yong Tang +Date: Mon Jun 6 06:38:43 2016 -0700 + + Use spf13/cobra for docker top + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker top` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit d5971c230dc91fa8764dd5e9bc4124346ad06e02 +Author: Yong Tang +Date: Sun Jun 5 16:48:26 2016 -0700 + + Use spf13/cobra for docker port + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker port` to use spf13/cobra + + Note: As part of this fix, a new function `RequiresMinMaxArgs(min int, max int)` + has been added in cli/required.go. This function restrict the args + to be at least min and at most max. + + Signed-off-by: Yong Tang + +commit feabf71dc1cd5757093c5887b463a6cbcdd83cc2 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 14:20:41 2016 +0200 + + network docs cleanup + + This fixes some Markup and formatting + issues in the network documentation; + + - wrap text to 80 chars + - add missing language hints for code examples + - add missing line continuations (\) + - update USAGE output for Cobra + + Signed-off-by: Sebastiaan van Stijn + +commit bf2a577c131d8998eb6ecac986d80e1289e6c801 +Author: Michael Holzheu +Date: Tue May 31 09:27:28 2016 -0400 + + Enable seccomp for s390x + + To implement seccomp for s390x the following changes are required: + + 1) seccomp_default: Add s390 compat mode + + On s390x (64 bit) we can run s390 (32 bit) programs in 32 bit + compat mode. Therefore add this information to arches(). + + 2) seccomp_default: Use correct flags parameter for sys_clone on s390x + + On s390x the second parameter for the clone system call is the flags + parameter. On all other architectures it is the first one. + + See kernel code kernel/fork.c: + + #elif defined(CONFIG_CLONE_BACKWARDS2) + SYSCALL_DEFINE5(clone, unsigned long, newsp, unsigned long, clone_flags, + int __user *, parent_tidptr, + + So fix the docker default seccomp rule and check for the second + parameter on s390/s390x. + + 3) seccomp_default: Add s390 specific syscalls + + For s390 we currently have three additional system calls that should + be added to the seccomp whitelist: + + - Other architectures can read/write unprivileged from/to PCI MMIO memory. + On s390 the instructions are privileged and therefore we need system + calls for that purpose: + + * s390_pci_mmio_write() + * s390_pci_mmio_read() + + - Runtime instrumentation: + + * s390_runtime_instr() + + 4) test_integration: Do not run seccomp default profile test on s390x + + The generated profile that we check in is for amd64 and i386 + architectures and does not work correctly on s390x. + + See also: 75385dc216e ("Do not run the seccomp tests that use + default.json on non x86 architectures") + + 5) Dockerfile.s390x: Add "seccomp" to DOCKER_BUILDTAGS + + Signed-off-by: Michael Holzheu + +commit 82f84a67d6d40d4a076927c618db475191f97da0 +Author: Yong Tang +Date: Sun Jun 5 17:25:22 2016 -0700 + + Use spf13/cobra for docker wait + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker wait` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit 7878705dcc26804b5f6a562410aecdb8f3485b91 +Author: Vincent Demeester +Date: Mon Jun 6 13:58:29 2016 +0200 + + Fix TestDiffEmptyArgClientError O:) + + Signed-off-by: Vincent Demeester + +commit 9d2e8abd302ae72e4dd5bddf325eb921a9e73a1b +Author: Vincent Demeester +Date: Mon Jun 6 13:58:23 2016 +0200 + + Migrate import command to cobra + + Signed-off-by: Vincent Demeester + +commit ca01e57d55699ab9e30f120a1de9d00a477547ad +Author: Vincent Demeester +Date: Mon Jun 6 13:58:18 2016 +0200 + + Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9 + + Signed-off-by: Vincent Demeester + +commit 07a7c0632f7b1ae70b5261565742756b76df7402 +Merge: 9d449d89f7 4bd202b00f +Author: Sebastiaan van Stijn +Date: Mon Jun 6 13:51:57 2016 +0200 + + Merge pull request #23210 from vdemeester/migrate-network-command-to-cobra + + Use spf13/cobra for docker network and subcommands + +commit 9d449d89f7949aea708125badfbaebc65440b98d +Merge: 4b2b5214a4 b4740e3021 +Author: Vincent Demeester +Date: Mon Jun 6 13:43:52 2016 +0200 + + Merge pull request #23129 from WeiZhang555/print-detailed-error + + Print original error for `start` + +commit 4b2b5214a46563caedab0c30314fe2c0e8849516 +Merge: ac14aa11b6 e8c67e8d8d +Author: Vincent Demeester +Date: Mon Jun 6 13:40:15 2016 +0200 + + Merge pull request #23299 from albers/completion-dockerd-path + + fix bash completion for dockerd invoked with path + +commit ac14aa11b6f9172c744affa9823d05fde721c5e0 +Merge: ab0c683f5d 041aad6d72 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 12:07:23 2016 +0200 + + Merge pull request #23293 from mountkin/network-docs + + docs: correct network create command + +commit ab0c683f5db26a16c91687ac8798129ca0840b30 +Merge: 28dde09cdf 41f2183f8a +Author: Sebastiaan van Stijn +Date: Mon Jun 6 11:46:57 2016 +0200 + + Merge pull request #23295 from sdurrheimer/zsh-completion-search-limit + + Add zsh completion for 'docker search --limit' + +commit 5193fed183e8b0294ab77c81a88e641097029095 +Merge: bea4a97dc4 929f4738c1 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 10:39:22 2016 +0200 + + Merge pull request #73 from thaJeztah/add-swarm-frontends + + add swarm-frontends project + +commit 929f4738c1dc4f0e0c9e50ac1575583f7bf2c0f1 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 10:37:04 2016 +0200 + + add swarm-frontends project + + Signed-off-by: Sebastiaan van Stijn + +commit 4bd202b00f7859ebeb4ba87511a0618ad08d0605 +Author: Vincent Demeester +Date: Mon Jun 6 10:28:52 2016 +0200 + + Migrate network command to cobra + + - Migrates network command and subcommands (connect, create, disconnect, + inspect, list and remove) to spf13/cobra + - Create a RequiredExactArgs helper function for command that require an + exact number of arguments. + + Signed-off-by: Vincent Demeester + +commit bea4a97dc4515e3c92ae59f845405b28df224e9c +Merge: ecca1becef 6d50ecf6f9 +Author: Sebastiaan van Stijn +Date: Mon Jun 6 10:27:26 2016 +0200 + + Merge pull request #72 from thaJeztah/add-go-events + + add go-events project to maintainers + +commit 28dde09cdf2a48dcdb6ce665cd2b912175dfb871 +Merge: 3ac1787b7e 2f40b1b281 +Author: Vincent Demeester +Date: Mon Jun 6 10:15:43 2016 +0200 + + Merge pull request #22077 from cpuguy83/remote_volplugin_caps + + Add support for volume scopes + +commit e8c67e8d8d8d4570d78e21eae02451f27a372f83 +Author: Harald Albers +Date: Mon Jun 6 10:01:15 2016 +0200 + + fix bash completion for dockerd with path + + Signed-off-by: Harald Albers + +commit 3ac1787b7e60f0ee3d09f4fd1cd95b416dfe4ac0 +Merge: 731bae6749 2d4bced30c +Author: Vincent Demeester +Date: Mon Jun 6 09:20:16 2016 +0200 + + Merge pull request #23098 from capkurmagati/23097-fix-zsh-completion-docker-rm-f + + fixes #23097 zsh completion on `docker rm -f` + +commit 731bae674965a3ae8a300d8e285927f993727bab +Merge: 2becfab55f 4f4b59cc43 +Author: Vincent Demeester +Date: Mon Jun 6 09:06:51 2016 +0200 + + Merge pull request #23284 from yongtang/23211-spf13-cobra-logs + + Use spf13/cobra for docker logs + +commit 41f2183f8afe6c1ee8cf650a33bfb8ac0fb5f255 +Author: Steve Durrheimer +Date: Mon Jun 6 09:03:31 2016 +0200 + + Add zsh completion for 'docker search --limit' + + Signed-off-by: Steve Durrheimer + +commit 2becfab55fd8ad6ec1d02aea3cd6498a2f91ef68 +Merge: c35d9f2611 5899afae52 +Author: Vincent Demeester +Date: Mon Jun 6 09:05:18 2016 +0200 + + Merge pull request #23283 from yongtang/23211-spf13-cobra-diff + + Use spf13/cobra for docker diff + +commit c35d9f2611c4b1e43403010210708d9c50b838db +Merge: b70dd0e04c 4f3625a288 +Author: Vincent Demeester +Date: Mon Jun 6 08:59:42 2016 +0200 + + Merge pull request #23268 from WeiZhang555/cobra-start + + Migrate start command to cobra + +commit 041aad6d7200a5b53204d95e9cc5505bf4d201cf +Author: Shijiang Wei +Date: Mon Jun 6 13:50:29 2016 +0800 + + docs: correct network create command + + Signed-off-by: Shijiang Wei + +commit b70dd0e04c621dc524397b0ef4583667b92df42c +Merge: e94be2f639 8ea7733a63 +Author: Vincent Demeester +Date: Mon Jun 6 05:17:59 2016 +0200 + + Merge pull request #23279 from yongtang/23211-spf13-cobra-unpause + + Use spf13/cobra for docker unpause + +commit c498d4700df8216ccefd6d2f03b5ebe6d6e9fd47 +Author: Zhang Wei +Date: Tue May 17 10:30:06 2016 +0800 + + Bug fix: `docker run -i --restart always` hangs. + + e.g. + ``` + $ docker run -i --restart always busybox sh + pwd + / + exit 11 + + <...hang...> + ``` + + This is because Attach(daemon side) and Run(client side) both hangs on + WaitStop, if container is restarted too quickly, wait won't have chance + to get exit signal. + + Signed-off-by: Zhang Wei + +commit b4740e3021a39a502ffc82f0f70e9b7ed2f0875f +Author: Zhang Wei +Date: Tue May 31 23:18:17 2016 +0800 + + Log and print original error for `start` + + Currently `start` will hide some errors and throw a consolidated error, + which will make it hard to debug because developer can't find the + original error. + + This commit allow daemon to log original errors first. + + Signed-off-by: Zhang Wei + +commit 4f3625a2889aef4ea97e366fa0ed1e2383dd3aad +Author: Zhang Wei +Date: Sun Jun 5 23:03:58 2016 +0800 + + Migrate start command to cobra + + Signed-off-by: Zhang Wei + +commit 8ea7733a6390a67d6981888b857ab78b11c4c076 +Author: Yong Tang +Date: Sun Jun 5 11:43:07 2016 -0700 + + Use spf13/cobra for docker unpause + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker unpause` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit 4f4b59cc435fbfef236017f3aa36145c1187426b +Author: Yong Tang +Date: Sun Jun 5 15:50:48 2016 -0700 + + Use spf13/cobra for docker logs + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker logs` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit e94be2f639804c5223ebb127faec845683410eb1 +Merge: 951702a567 60e48bd6bd +Author: Alexander Morozov +Date: Sun Jun 5 15:29:01 2016 -0700 + + Merge pull request #23242 from vdemeester/migrate-rmi-to-cobra + + Use spf13/cobra for docker rmi + +commit 5899afae52b10d2457848c6e62a7476835befef3 +Author: Yong Tang +Date: Sun Jun 5 15:13:55 2016 -0700 + + Use spf13/cobra for docker diff + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker diff` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit 951702a5679b5220bfb02497bc76b65137dff1e3 +Merge: cfcb470aad dd7e59a40a +Author: Sebastiaan van Stijn +Date: Sun Jun 5 23:25:48 2016 +0200 + + Merge pull request #23280 from icecrime/remove_num_commands_test + + Remove unnecessary check for number of commands + +commit cfcb470aad367dea7b9f6df96ff12f577a22a2b0 +Merge: 1a1083ae75 5667365ed1 +Author: Sebastiaan van Stijn +Date: Sun Jun 5 23:12:25 2016 +0200 + + Merge pull request #23282 from yongtang/06052016-docs-typo + + Fix a couple of typos in docker attach docs. + +commit 5667365ed1cddb57267f7c11fc1f9d92209e5aed +Author: Yong Tang +Date: Sun Jun 5 14:03:23 2016 -0700 + + Fix a couple of typos in docker attach docs. + + This fix fixes a couple of typos in docker attach docs: + docs/reference/commandline/attach.md + man/docker-attach.1.md + + Signed-off-by: Yong Tang + +commit 60e48bd6bd24c559ed92c7217cd7798c85cbb644 +Author: Vincent Demeester +Date: Sun Jun 5 22:40:35 2016 +0200 + + Use spf13/cobra for docker rmi + + Moves image command rmi to `api/client/image/remove.go` and use cobra :) + + Signed-off-by: Vincent Demeester + +commit 1a1083ae75ac0b1018510ab80bffeab415220886 +Merge: b259558336 55cdb6dcd0 +Author: Brian Goff +Date: Sun Jun 5 16:39:22 2016 -0400 + + Merge pull request #23247 from thaJeztah/carry-22033-docker-ps-format-output + + [Carry 22033] Add a check for size field in custom format string + +commit b25955833652b6b2079d7f3ac56759c563639ca9 +Merge: 3f970819bb 63d66d2796 +Author: Vincent Demeester +Date: Sun Jun 5 22:37:15 2016 +0200 + + Merge pull request #23276 from yongtang/23211-spf13-cobra-stop + + Use spf13/cobra for docker stop + +commit 3f970819bb4231375f7821aa54670fd59e384f4d +Merge: 282067e83a 46ea8ff75d +Author: Brian Goff +Date: Sun Jun 5 16:01:52 2016 -0400 + + Merge pull request #23063 from yongtang/22961-aws-sdk-go + + Update aws-sdk-go to v1.1.30 + +commit 282067e83aef3164cd7a26df7c3169924bdc3f10 +Merge: c764234c3b 4cb71f8082 +Author: Brian Goff +Date: Sun Jun 5 15:38:16 2016 -0400 + + Merge pull request #23272 from thaJeztah/update-syntax + + Update Dockerfile highlight/syntax definitions + +commit 2f40b1b281a3be8f34d82a5170988ee46ea1f442 +Author: Brian Goff +Date: Mon Apr 11 11:17:52 2016 -0400 + + Add support for volume scopes + + This is similar to network scopes where a volume can either be `local` + or `global`. A `global` volume is one that exists across the entire + cluster where as a `local` volume exists on a single engine. + + Signed-off-by: Brian Goff + +commit 79ff6eaf21dfebad0f8131a1ede235249cd6638f +Author: Brian Goff +Date: Sat Apr 9 17:42:24 2016 -0400 + + Enhance pluginrpc-gen parser + + Now handles `package.Type` and `*package.Type` + Fixes parsing issues with slice and map types. + + Signed-off-by: Brian Goff + +commit dd7e59a40a4c93070f71adb3ec74021241586c21 +Author: Arnaud Porterie (icecrime) +Date: Sun Jun 5 11:44:50 2016 -0700 + + Remove unnecessary check for number of commands + + Testing for the number of commands in `help` output doesn't seem to + contribute much to the quality of the project, and adds additional + burden for the developer to update. + + Signed-off-by: Arnaud Porterie (icecrime) + +commit c764234c3b4490a7b6cd6239607996c502d9ce22 +Merge: 3cec900271 b25e64183c +Author: Sebastiaan van Stijn +Date: Sun Jun 5 20:05:51 2016 +0200 + + Merge pull request #23267 from vdemeester/migrate-export-to-cobra + + Use spf13/cobra for docker export + +commit 3cec9002714ee9227f75beeeccea7788a81d1fc1 +Merge: 506e8eda40 372063ce1b +Author: Sebastiaan van Stijn +Date: Sun Jun 5 20:02:33 2016 +0200 + + Merge pull request #23273 from vdemeester/deprecated-import-3-args + + Deprecated the old 3-args form of `docker import` + +commit 63d66d2796fa1916a6b40913a6a23063d6169d17 +Author: Yong Tang +Date: Sun Jun 5 10:25:21 2016 -0700 + + Use spf13/cobra for docker stop + + This fix is part of the effort to convert commands to spf13/cobra #23211. + + Thif fix coverted command `docker stop` to use spf13/cobra + + Signed-off-by: Yong Tang + +commit 506e8eda40d4c0efdb9b474fc71c01cabf08e404 +Merge: a15bc261de ed2d300ed0 +Author: Brian Goff +Date: Sun Jun 5 13:24:25 2016 -0400 + + Merge pull request #23258 from allencloud/return-err-when-volume-list-fails + + return err when volume list fails + +commit 372063ce1bd0e36e3523360b88e74a1cef55b841 +Author: Vincent Demeester +Date: Sun Jun 5 18:07:34 2016 +0200 + + Deprecated the old 3-args form of `docker import` + + It's been deprecated since November 2013 and v0.6.7. Removing the cli + side of it. + + Signed-off-by: Vincent Demeester + +commit a15bc261dec0d8d45db13b38eb9768bcdad9fbd5 +Merge: df1dd1322d 9c9cbd2c0f +Author: Brian Goff +Date: Sun Jun 5 11:53:01 2016 -0400 + + Merge pull request #23271 from albers/completion-events-detach + + bash completion for detach events + +commit 4cb71f80823af345d063cf0ad657e73ce9caa75f +Author: Sebastiaan van Stijn +Date: Sun Jun 5 17:45:21 2016 +0200 + + Update Dockerfile highlight definitions + + Signed-off-by: Sebastiaan van Stijn + +commit df1dd1322d5c9527be7187038ca3480404b1282b +Merge: 0f13b69fe2 b18ae8c9cc +Author: Vincent Demeester +Date: Sun Jun 5 17:43:12 2016 +0200 + + Merge pull request #22489 from Microsoft/jjh/shell + + Builder shell configuration + +commit 9c9cbd2c0fbaef9afe740cf9b2acab0768d0fa99 +Author: Harald Albers +Date: Sun Jun 5 08:41:58 2016 -0700 + + bash completion for detach events + + Signed-off-by: Harald Albers + +commit b25e64183cd02bffe1ac1600e860551fca05d1f3 +Author: Vincent Demeester +Date: Sun Jun 5 16:42:19 2016 +0200 + + Migrate export command to cobra + + Signed-off-by: Vincent Demeester + +commit 0f13b69fe26f98c3e06581dc5c61ce0a5065c739 +Merge: 6b4a46f282 ff3e187cc7 +Author: Vincent Demeester +Date: Sun Jun 5 16:27:15 2016 +0200 + + Merge pull request #22988 from calavera/use_client_credentials_library + + Move native credentials lookup to the client library. + +commit 6d50ecf6f9834fff94c3dfb9236ca8f9d66a526f +Author: Sebastiaan van Stijn +Date: Sun Jun 5 15:08:53 2016 +0200 + + add go-events project to maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit c088321ea88b5f4dad8a56b79d45617aa117f6c1 +Author: Dimitris Rozakis +Date: Sun Jun 5 13:01:44 2016 +0300 + + Escape brackets in hack/install.sh + + Fixes #23260 + + Signed-off-by: Dimitris Rozakis + +commit fb175bb36793ad59f2cfe9b2d92d636027fb836b +Author: Tomasz Kopczynski +Date: Sun May 29 18:56:49 2016 +0200 + + Reimplementing builder tests for Dockerfile outside context as a unit test + + Signed-off-by: Tomasz Kopczynski + +commit f7c2deda47ea4d95d4021f5b851a9a64c9103520 +Merge: d9abab6ca9 0ef545fde6 +Author: Nishant Totla +Date: Sat Jun 4 18:16:13 2016 -0700 + + Merge pull request #2326 from tomwillfixit/install_manual_typo + + Typo in install manual + +commit 0ef545fde67ceeb4c24f8311003c67e6c639acb8 +Author: tommyoshaw +Date: Sat Jun 4 18:54:59 2016 +0100 + + Typo in install manual + + Signed-off-by: tommyoshaw + +commit ff3e187cc7a56ce102a61c1a4883f57fb1aed2f7 +Author: David Calavera +Date: Sat Jun 4 10:08:22 2016 -0700 + + Use docker-credential-helpers client to talk with native creds stores. + + Signed-off-by: David Calavera + +commit feab8db60da39ecda00c86b34bf5958ae257a14f +Author: David Calavera +Date: Sat Jun 4 10:06:07 2016 -0700 + + Vendor docker-credential-helpers v0.3.0 + + Fix a bug in the vendor helpers that took packages + that started with github.com/docker/docker like if + they were from within the project. + + Signed-off-by: David Calavera + +commit 6b4a46f28266031ce1a1315f17fb69113a06efe1 +Merge: e556d6b667 5ab2434225 +Author: Sebastiaan van Stijn +Date: Sat Jun 4 18:55:23 2016 +0200 + + Merge pull request #23253 from vdemeester/carry-pr-23159 + + Carry #23159 : Use spf13/cobra for `docker run` and `docker create` + +commit 1613f172e52de8af3e0204d3d23802fa2caf323e +Author: Ruurd Pels +Date: Sat Jun 4 18:38:02 2016 +0200 + + Only animate the running and restarting icon five times. Continuously animating loads the CPU a lot and we can use the cycles better somewhere else. + +commit e556d6b6674193d37930edd722095fe487e16a09 +Merge: e975dadaa0 6180c5c12e +Author: Sebastiaan van Stijn +Date: Sat Jun 4 18:37:14 2016 +0200 + + Merge pull request #23257 from vdemeester/cobra-see-help + + Cobra - display "See 'docker cmd --help'." in error cases + +commit ed2d300ed054c10da65818904d40cfac678ada6d +Author: allencloud +Date: Sat Jun 4 23:24:14 2016 +0800 + + return err when volume list fails + + Signed-off-by: allencloud + +commit 6180c5c12e770a4bdf3f505944c9d907e5543fab +Author: Vincent Demeester +Date: Sat Jun 4 16:19:54 2016 +0200 + + Display "See 'docker cmd --help'." in error cases + + This brings back this message in case missing arguments. + + Signed-off-by: Vincent Demeester + +commit e975dadaa01de9e651f30ef11ffbc59473f07ae5 +Merge: 843720257b 496adadcec +Author: Vincent Demeester +Date: Sat Jun 4 16:07:27 2016 +0200 + + Merge pull request #23254 from thaJeztah/prepare-for-go-1.7 + + Bump engine-api 772250a752e34cacaeef7c92b8e0ddf43450b629, prepare for go 1.7 + +commit 496adadcec4ba00d230e546239ddc10e4ea41dcf +Author: Sebastiaan van Stijn +Date: Sat Jun 4 14:17:24 2016 +0200 + + Update TestHttpsInfoRogueCert for Go 1.7 + + The error message changed from + + remote error: bad certificate + + To + + remote error: tls: bad certificate + + In Go 1.7, so just checking for "bad certificate" + to make this test work on both Go 1.6 and 1.7 + + Signed-off-by: Sebastiaan van Stijn + +commit ed870716324426c5c5de2e12de48515ef8cbcf39 +Author: Sebastiaan van Stijn +Date: Sat Jun 4 14:16:36 2016 +0200 + + bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629 + + Signed-off-by: Sebastiaan van Stijn + +commit 843720257baf80659729fc5fef5495fe2f7ca170 +Merge: 3db23a4eaf d75aaa2ca0 +Author: Sebastiaan van Stijn +Date: Sat Jun 4 14:07:52 2016 +0200 + + Merge pull request #23248 from Microsoft/jjh/flakeytest + + Windows: Turn off TestBuildDockerignoreComment + +commit 5ab24342258c70438ab8edf708ebc466b1677f38 +Author: Daniel Nephin +Date: Tue May 31 22:19:13 2016 -0700 + + Convert 'docker create' to use cobra and pflag + + Return the correct status code on flag parsins errors. + + Signed-off-by: Daniel Nephin + +commit a77f2450c70312f8c26877a18bfe2baa44d4abb9 +Author: Daniel Nephin +Date: Tue May 31 16:49:32 2016 -0700 + + Convert 'docker run' to a cobra command and to use pflags + + Move container options into a struct so that tests should pass. + Remove unused FlagSet arg from Parse + Disable interspersed args on docker run + + Signed-off-by: Daniel Nephin + +commit f1b6097ec0d43c61b6a8752db9ac236665f4ab2c +Author: David Lawrence +Date: Fri Jun 3 09:41:15 2016 -0700 + + moving the passphrase.Retriever definition so fewer things have a chained dependency on github.com/docker/docker/pkg/term + + Signed-off-by: David Lawrence (github: endophage) + +commit 3db23a4eaf19d347c486f0f0ae764ea1b84491c0 +Merge: 521f79bf0e 50e470fab4 +Author: Vincent Demeester +Date: Sat Jun 4 07:50:04 2016 +0200 + + Merge pull request #23232 from thaJeztah/update-default-retries + + Healthcheck: set default retries to 3 + +commit d9abab6ca91ef6d0e5e16ca3d48e7afce2c1d26e +Merge: de6f09e5b7 d7241f3682 +Author: Allen Sun +Date: Sat Jun 4 11:48:14 2016 +0800 + + Merge pull request #2261 from allencloud/remove-engine-in-volume-create-response + + remove engine details in POST /volumes/create API + +commit 521f79bf0e81fdc5ff87ab207b834e2beef4e790 +Merge: ad8d0c9a8b a11ef10631 +Author: Brian Goff +Date: Fri Jun 3 22:07:08 2016 -0400 + + Merge pull request #23241 from vdemeester/migrate-search-to-cobra + + Use spf13/cobra for docker search + +commit ad8d0c9a8bd93a23c745efe1aac0a0692aeefa91 +Merge: e6637f8d9e 3accde6dee +Author: Brian Goff +Date: Fri Jun 3 22:03:11 2016 -0400 + + Merge pull request #23244 from LK4D4/no_interface + + attach: replace interface with simple type + +commit 3accde6dee079fbde42f1928002bce43cb15833d +Author: Alexander Morozov +Date: Fri Jun 3 10:11:52 2016 -0700 + + attach: replace interface with simple type + + Also add docs to detach events + + Signed-off-by: Alexander Morozov + +commit e6637f8d9ebd693f4a6f7992eb0c14aac4a5871e +Merge: da703f026e dcc407a820 +Author: Antonio Murdaca +Date: Sat Jun 4 00:04:09 2016 +0200 + + Merge pull request #23124 from kencochrane/fix_redhat_install_script + + Fix issues with get.docker.com install script with redhat + +commit da703f026e0793e4caf349487f63a7c1ab09d1c3 +Merge: 2d40e36af8 0cddc783cf +Author: Sebastiaan van Stijn +Date: Fri Jun 3 23:46:21 2016 +0200 + + Merge pull request #23251 from SvenDowideit/more-validation-fixes + + docs validation fixes + +commit 0cddc783cff152a383a109f70a9f7bc943dbb5ba +Author: Sven Dowideit +Date: Fri Jun 3 21:43:45 2016 +0000 + + docs validation fixes + + Signed-off-by: Sven Dowideit + +commit b18ae8c9ccc2eb6cf8aa947f25eb6f1d20089776 +Author: John Howard +Date: Tue May 3 13:56:59 2016 -0700 + + Builder default shell + + Signed-off-by: John Howard + +commit c0aadc9fef7d8b23c595607948e310e43a8e6510 +Merge: 0436f5f968 80e508c3e6 +Author: Sven Dowideit +Date: Fri Jun 3 13:54:25 2016 -0700 + + Merge pull request #1737 from SvenDowideit/fix-validation-error + + Fix validataion error + +commit 2d40e36af89b24b03ec9a502652f713353cf600a +Merge: c80a2f2937 ea86320fcc +Author: Sebastiaan van Stijn +Date: Fri Jun 3 22:28:48 2016 +0200 + + Merge pull request #23234 from yongtang/23221-utf8-bom + + Skip UTF-8 BOM bytes from Dockerfile and .dockerignore if exist + +commit de6f09e5b78d4035b41dc1aee0bdeb0bce333aa5 +Merge: 416a781b64 883ae9240b +Author: Sven Dowideit +Date: Fri Jun 3 13:28:04 2016 -0700 + + Merge pull request #2321 from SvenDowideit/aliases-need-to-be-absolute + + hugo aliases need to be absolute + +commit d75aaa2ca07eb9d0ea464ac503080177091b3b1c +Author: John Howard +Date: Fri Jun 3 13:23:35 2016 -0700 + + Windows: Turn off TestBuildDockerignoreComment + + Signed-off-by: John Howard + +commit 883ae9240b69a91cf5d433209ca23ff7dacaa0a3 +Author: Sven Dowideit +Date: Fri Jun 3 20:00:13 2016 +0000 + + hugo aliases need to be absolute + + Signed-off-by: Sven Dowideit + +commit 55cdb6dcd0f709301573ddb9f3348f9288572b91 +Author: Paulo Ribeiro +Date: Thu Apr 14 10:43:15 2016 +0100 + + Add a check for size field in custom format string + + This fix addresses an issue where including the `{{.Size}}` format + field in conjunction with `docker ps --format`, without the `--size` + flag, would not correctly display the size of containers. + + This is done by doing a check on the custom format string, and setting + the size flag on the options struct if the field is found. This struct + gets passed to the engine API which then generates the correct query. + + An integration test is included which runs `docker ps --format "table + {{.Size}}"` without `--size`, and checks that the returned output is + not `0 B`. + + Fixes #21991 + + As suggested by @cpuguy83, a parser is implemented to process the format + string as a template, and then traverses the template tree to determine + if `.Size` was called. + + This was then reworked by making use of template execution with a + pre-processor struct that will set the `--size` option if the template + calls for the field. + + The pre-processor now also sets a boolean in the context passed to the + writer. There is an integration test for this that calls `docker ps + --size --format "{{.Size}}"` and then checks that `size: {{.Size}}` is + not appended, as it would with previous behavior. + + Finally, a change was made to the formatter to not automatically + add a `{{.Size}}` if a custom format is provided. + + Signed-off-by: Paulo Ribeiro + Signed-off-by: Sebastiaan van Stijn + +commit ea640f38217e5d3796bbca49a5a1870582139d8d +Author: Joffrey F +Date: Tue May 17 16:32:54 2016 -0700 + + Remove external_name from serialized config output + + Signed-off-by: Joffrey F + +commit 427ec899df7661a114901cef83118bbe8cb8480e +Merge: 17b219454f 1298b9aa5d +Author: Joffrey F +Date: Fri Jun 3 11:57:55 2016 -0700 + + Merge pull request #3504 from denismakogon/issue-3503 + + Issue-3503: Improve timestamp validation in tests + +commit 80e508c3e6e0823e2a06505f2a611e114d568c35 +Author: Sven Dowideit +Date: Fri Jun 3 18:47:42 2016 +0000 + + Fix validataion error + + Signed-off-by: Sven Dowideit + +commit e7a8b2fed5b0ebb3b5ca2fdfbd37e0b29e093a79 +Merge: 7763122ecb 7fc40dd7cc +Author: Joffrey F +Date: Fri Jun 3 11:01:20 2016 -0700 + + Update TLS version configuration code. Tests. + + Signed-off-by: Joffrey F + +commit a11ef10631dd9338aeda2e10fedea365a7471af1 +Author: Vincent Demeester +Date: Fri Jun 3 19:50:01 2016 +0200 + + Use spf13/cobra for docker search + + - Move image command search to `api/client/image/search.go` + - Use cobra :) + + Signed-off-by: Vincent Demeester + +commit 416a781b640e8a20fe21d9203978235a2f32197e +Merge: 43fad5ab69 61f3441d07 +Author: Dongluo Chen +Date: Fri Jun 3 10:41:37 2016 -0700 + + Merge pull request #2281 from xianlubird/feature/scheduler_log + + Add scheduler detail log for node + +commit 428328908dc529b1678fb3d8b033fb0591a294e3 +Author: Vincent Demeester +Date: Fri Jun 3 19:38:03 2016 +0200 + + Deprecate /containers/(id or name)/copy endpoint + + This endpoint has been deprecated since 1.8. Return an error starting + from this API version (1.24) in order to make sure it's not used for the + next API version and so that we can remove it some times later. + + Signed-off-by: Vincent Demeester + +commit c80a2f2937463882c2c38141a710f19b608125e6 +Merge: 5429f4ef61 83ad006d47 +Author: Alexander Morozov +Date: Fri Jun 3 09:49:48 2016 -0700 + + Merge pull request #22898 from WeiZhang555/add-detach-event + + Add detach event + +commit 1a700552b2d7d0144f1a65b1ac15fee8c23fd3a4 +Merge: 0fb040969d 82e15cc82c +Author: David Lawrence +Date: Fri Jun 3 09:19:17 2016 -0700 + + Merge pull request #755 from andrewhsu/compose-v2 + + convert docker compose files to v2 + +commit 0fb040969d490abd46bb0e3a05f6c4732c63022a +Merge: 2989c44576 8ce539de5b +Author: David Lawrence +Date: Fri Jun 3 09:18:12 2016 -0700 + + Merge pull request #761 from docker/notary-version-bump + + Update NOTARY_VERSION + +commit 5429f4ef6166a593fc9d2e6dd4f689d4ff94b2b7 +Merge: b0a949e3c9 f738e6a732 +Author: Vincent Demeester +Date: Fri Jun 3 18:17:15 2016 +0200 + + Merge pull request #23239 from albers/completion-run-healthcheck + + bash completion for `docker run` healthcheck options + +commit b0a949e3c94fbc4e4cbf8ef1f4c242fc03ae127d +Merge: 147c8b7495 4b5ccd7342 +Author: Brian Goff +Date: Fri Jun 3 12:13:27 2016 -0400 + + Merge pull request #23238 from albers/completion-search--limit + + bash completion for `docker search --limit` + +commit f738e6a732aac706ceeb5d6d02ac61d7f780e1fd +Author: Harald Albers +Date: Fri Jun 3 17:04:04 2016 +0200 + + bash completion for `docker run` healthcheck options + + Signed-off-by: Harald Albers + +commit 4b5ccd73426bcaedd69ae9f740cfaf6250276ffa +Author: Harald Albers +Date: Fri Jun 3 16:32:37 2016 +0200 + + bash completion for `docker search --limit` + + Signed-off-by: Harald Albers + +commit ea86320fcc61ea9ded3eef7ba01699c4e3ccf3ce +Author: Yong Tang +Date: Fri Jun 3 07:26:36 2016 -0700 + + Skip UTF-8 BOM bytes from Dockerignore if exist + + This fix tries to address issues related to #23221 where Dockerignore + may consists of UTF-8 BOM. This likely happens when Notepad + tries to save a file as UTF-8 in Windows. + + This fix skips the UTF-8 BOM bytes from the beginning of the + Dockerignore if exists. + + Additional tests has been added to cover the changes in this fix. + + This fix is related to #23221 (UTF-8 BOM in Dockerfile). + + Signed-off-by: Yong Tang + +commit 431e7b65733f2eb627bf69502355a66a35121e04 +Author: Christy Perez +Date: Thu Jun 2 16:58:53 2016 -0500 + + trusted push test: Use a nonexistant hostname + + Before, the TCP handshake had to time out (approx 30s) before + this test completed. If you use a hostname that doesn't resolve, + then it fails faster. + + Signed-off-by: Christy Perez + +commit a596d3d1cf0a40ce577b8d1ea5ceb807d93468f2 +Author: Antonio Murdaca +Date: Fri Jun 3 15:28:19 2016 +0200 + + man: mv config-json.5 to docker-config-json.5 + + Signed-off-by: Antonio Murdaca + +commit 1514b499f04e317d6bc81bb2d46a6623db422763 +Author: Antonio Murdaca +Date: Fri Jun 3 15:27:24 2016 +0200 + + docker-engine.spec: install man8 + + Signed-off-by: Antonio Murdaca + +commit 678c80f9256021ce74184fdd6b612d9dea377fba +Author: Yong Tang +Date: Fri Jun 3 05:32:37 2016 -0700 + + Skip UTF-8 BOM bytes from Dockerfile if exists + + This fix tries to address issues in #23221 where Dockerfile + may consists of UTF-8 BOM. This likely happens when Notepad + tries to save a file as UTF-8 in Windows. + + This fix skips the UTF-8 BOM bytes from the beginning of the + Dockerfile if exists. + + Additional tests has been added to cover the changes in this + fix. + + This fix fixes #23221. + + Signed-off-by: Yong Tang + +commit 147c8b7495c0a28f741abacc928486e108d8e4a9 +Merge: 726ef47d5c 7bc9e0aebb +Author: Vincent Demeester +Date: Fri Jun 3 15:16:11 2016 +0200 + + Merge pull request #23222 from yongtang/06022016-add-missing-links-in-deprecated-docs + + Add missing links in deprecated.md + +commit 726ef47d5c50c329b5b0c30f3a0612cc7ee241b3 +Merge: 020a86b3d9 20bf00dfa5 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 15:04:37 2016 +0200 + + Merge pull request #23215 from BlackYoup/pkg-config + + make.sh: use PKG_CONFIG environment variable if it exists + +commit 020a86b3d9e6b052a3f866b7517eb0f62fd24bea +Merge: 9c1278b279 92f10fe228 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 14:25:42 2016 +0200 + + Merge pull request #23107 from yongtang/23055-docker-search-limit + + Add `--limit` option to `docker search` + +commit 9c1278b279b3253c8c4aafecdef74bffea3edc58 +Merge: f1755b2560 8913dace34 +Author: Vincent Demeester +Date: Fri Jun 3 14:23:09 2016 +0200 + + Merge pull request #23111 from yongtang/20083-dockerignore-comment + + Add support for comments in .dockerignore + +commit f1755b256070f7654ab958523cee5fbbe0f10d1d +Merge: 613286859f 10c35196b1 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 14:15:31 2016 +0200 + + Merge pull request #23227 from yongtang/06032016-engine-api + + Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 + +commit 613286859f132b9017682f717329b087fedd2190 +Merge: 766550385d 9bb54f89ad +Author: Sebastiaan van Stijn +Date: Fri Jun 3 13:53:42 2016 +0200 + + Merge pull request #23230 from thaJeztah/carry_make_install_binary + + [carry 22927] Add `make install` task + +commit 50e470fab4ebdffff74bafeefa2f7fb8c21da13e +Author: Sebastiaan van Stijn +Date: Fri Jun 3 13:28:08 2016 +0200 + + Healthcheck: set default retries to 3 + + Signed-off-by: Sebastiaan van Stijn + +commit 766550385dac63c19a9af683c5d56c2875f5cabe +Merge: d349f45dcc 8879458faa +Author: Sebastiaan van Stijn +Date: Fri Jun 3 13:22:13 2016 +0200 + + Merge pull request #22715 from allencloud/add-trace-http-pprof + + add trace in docker engine's pprof to show execution trace in binary form + +commit d349f45dcc2298f02412121cacff6fbd5b08a6ca +Merge: a11d40af9b 0829581d7e +Author: Vincent Demeester +Date: Fri Jun 3 12:44:05 2016 +0200 + + Merge pull request #23231 from thaJeztah/minor-mailmap-update + + Fix double entry in authors + +commit 0829581d7ea97d7d931527c872dbf9921757f497 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 12:40:36 2016 +0200 + + Fix double entry in authors + + Signed-off-by: Sebastiaan van Stijn + +commit 9bb54f89ad26015c79dab7c5ac210cb846e0713b +Author: Brian Goff +Date: Mon May 23 21:44:43 2016 -0400 + + Add `make install` task + + This installs docker and dockerd to `$DOCKER_MAKE_INSTALL_PREFIX/bin`, which + defaults to `/usr/local/bin` + + Signed-off-by: Brian Goff + Signed-off-by: Sebastiaan van Stijn + +commit 10c35196b19389da5bb64921b7e1f23eb054c739 +Author: Yong Tang +Date: Fri Jun 3 02:27:17 2016 -0700 + + Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 + + This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 + + This fix brings engine-api up to date, which includes changes from: + https://github.com/docker/engine-api/pull/256 + https://github.com/docker/engine-api/pull/254 + + This fix is related to + + Signed-off-by: Yong Tang + +commit a11d40af9bcfefb12839127cc46aa8b25a5d3a6f +Merge: b16f735e90 b9676643c8 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 10:20:33 2016 +0200 + + Merge pull request #23173 from thaJeztah/update-authors + + Update mailmap and re-generate Authors + +commit b16f735e9060f1561e81ad8f02afc51ba96c39f0 +Merge: 98c245c9e6 f02ffd9e19 +Author: Arnaud Porterie +Date: Thu Jun 2 22:04:35 2016 -0700 + + Merge pull request #23220 from icecrime/bump_etcd_2.3.2 + + Bump etcd to 2.3.2 + +commit acd67e25a9d419f2933ea2d6afacdfa60519e3b9 +Author: Kenfe-Mickael Laventure +Date: Thu Jun 2 20:55:53 2016 -0700 + + Do not overwrite already published deb files when releasing + + Signed-off-by: Kenfe-Mickael Laventure + +commit 83ad006d4724929ccbde4bdf768374fad0eeab44 +Author: Zhang Wei +Date: Sun May 22 22:04:39 2016 +0800 + + Add detach event + + If we attach to a running container and stream is closed afterwards, we + can never be sure if the container is stopped or detached. Adding a new + type of `detach` event can explicitly notify client that container is + detached, so client will know that there's no need to wait for its exit + code and it can move forward to next step now. + + Signed-off-by: Zhang Wei + +commit 7bc9e0aebbddb934f14ce287f0c3b419663cb480 +Author: Yong Tang +Date: Thu Jun 2 19:54:35 2016 -0700 + + Add missing links in deprecated.md doc. + + This fix tries to address several issues in deprecated.md: + 1. For deprecated and removal versions, some include link reference + to the release tag but some does not point to the release tag. This + fix adds the missing links as long as the version is <= 1.12. + 2. Technically, 1.12 is not released yet so the link to 1.12 does + not exist yet. However, at the time 1.12 is released this + deprecated.md doc should have been part of the release as well. + There is a circular dependency. This fix adds 1.12 for now. + 3. `HostConfig at API container start` has already been removed + by #22570 so this fix changes `Target For Removal In Release: v1.12` + to `Removed In Release: v1.12`. + 4. `Docker search 'automated' and 'stars' options` has not been removed + yet so this fix changes `Removed In Release: v1.14` to + `Target For Removal In Release: v1.14` + + Signed-off-by: Yong Tang + +commit 92f10fe228c1b4b527b87ac47401132322283ea3 +Author: Yong Tang +Date: Wed Jun 1 13:38:14 2016 -0700 + + Add `--limit` option to `docker search` + + This fix tries to address the issue raised in #23055. + Currently `docker search` result caps at 25 and there is + no way to allow getting more results (if exist). + + This fix adds the flag `--limit` so that it is possible + to return more results from the `docker search`. + + Related documentation has been updated. + + Additional tests have been added to cover the changes. + + This fix fixes #23055. + + Signed-off-by: Yong Tang + +commit 8913dace341c8fc9f9a3ab9518c8521c161b307f +Author: Yong Tang +Date: Wed Jun 1 15:20:54 2016 -0700 + + Add support for comment in .dockerignore + + This fix tries to address the issue raised in #20083 where + comment is not supported in `.dockerignore`. + + This fix updated the processing of `.dockerignore` so that any + lines starting with `#` are ignored, which is similiar to the + behavior of `.gitignore`. + + Related documentation has been updated. + + Additional tests have been added to cover the changes. + + This fix fixes #20083. + + Signed-off-by: Yong Tang + +commit 98c245c9e63793cf8ca03c5500e0820447c1861c +Merge: e2528712db c1be45fa38 +Author: Sven Dowideit +Date: Thu Jun 2 18:45:08 2016 -0700 + + Merge pull request #23193 from allencloud/fix-typos + + use grep to find all a/an typos + +commit f02ffd9e19acb3cc0a0ea6e58a8944be60f249e1 +Author: Arnaud Porterie +Date: Thu Jun 2 18:22:09 2016 -0700 + + Bump etcd to 2.3.2 + + Bump etcd to 2.3.2 and `github.com/ugorji/go` accordingly. + + Signed-off-by: Arnaud Porterie + +commit e2528712db8b904de0ae7c076a3ddcf163a2734d +Merge: 9be8f04950 53a1de2b16 +Author: Sven Dowideit +Date: Thu Jun 2 18:05:49 2016 -0700 + + Merge pull request #23192 from orsenthil/docfixes/ubuntu_install + + Fix the docker daemon restart command for ubuntu. + +commit 9be8f04950f918b91e3d4166597e9e2eee74fbd6 +Merge: 850031c581 3152a706c9 +Author: Sven Dowideit +Date: Thu Jun 2 18:01:02 2016 -0700 + + Merge pull request #22763 from zreigz/doc-multiple-daemons + + Add documentation for running multiple daemons + +commit 850031c581d37b13032d990eae07027901c02873 +Merge: 94b2d3554c 322cc99c69 +Author: Brian Goff +Date: Thu Jun 2 20:45:33 2016 -0400 + + Merge pull request #23026 from rhatdan/mkdir + + Need to create bind mount volume if it does not exist. + +commit 94b2d3554c84f33a598a36ba38038f7bbcd97e43 +Merge: ce255f76c7 0da0a8f9da +Author: Brian Goff +Date: Thu Jun 2 20:42:24 2016 -0400 + + Merge pull request #23136 from nalind/logscmd_read_journald_attrs + + Add support for reading journal extras details, and setting timestamps to UTC + +commit ce255f76c70a77c21d48ebd407d83cad55edf883 +Merge: d1b1b6a98e 76d8b0dab7 +Author: Michael Crosby +Date: Thu Jun 2 16:58:34 2016 -0700 + + Add User defined Healthchecks for Containers + + Carry of #22719 + +commit ad7544912138d127840a6045cea4757dbc18654c +Author: Joao Fernandes +Date: Thu Jun 2 15:22:46 2016 -0700 + + Updates docs with --dtr-external-url flag + +commit 43fad5ab69651ee81036ae80d273915a5465d93d +Merge: e69bb29b78 f62cd8c9aa +Author: Dongluo Chen +Date: Thu Jun 2 16:16:29 2016 -0700 + + Merge pull request #2319 from allencloud/fix-typos + + fix typos + +commit 76d8b0dab76610526b28a657ac13db6f8c89c0e1 +Author: Sebastiaan van Stijn +Date: Fri Jun 3 00:14:55 2016 +0200 + + Bump engine-api to fa04f66c7871183dd53a5ec666479f49b452743d + + Signed-off-by: Sebastiaan van Stijn + +commit e3594a517fc3a84a0ba25fa4814e6cbb86444f58 +Merge: 52d0020542 0589857e9e +Author: Sven Dowideit +Date: Thu Jun 2 15:04:20 2016 -0700 + + Merge pull request #3468 from SvenDowideit/more-validation-fixes + + More docs validation fixes + +commit b6c7becbfe1d76b1250f6d8e991e645e13808a9c +Author: Thomas Leonard +Date: Mon Apr 18 10:48:13 2016 +0100 + + Add support for user-defined healthchecks + + This PR adds support for user-defined health-check probes for Docker + containers. It adds a `HEALTHCHECK` instruction to the Dockerfile syntax plus + some corresponding "docker run" options. It can be used with a restart policy + to automatically restart a container if the check fails. + + The `HEALTHCHECK` instruction has two forms: + + * `HEALTHCHECK [OPTIONS] CMD command` (check container health by running a command inside the container) + * `HEALTHCHECK NONE` (disable any healthcheck inherited from the base image) + + The `HEALTHCHECK` instruction tells Docker how to test a container to check that + it is still working. This can detect cases such as a web server that is stuck in + an infinite loop and unable to handle new connections, even though the server + process is still running. + + When a container has a healthcheck specified, it has a _health status_ in + addition to its normal status. This status is initially `starting`. Whenever a + health check passes, it becomes `healthy` (whatever state it was previously in). + After a certain number of consecutive failures, it becomes `unhealthy`. + + The options that can appear before `CMD` are: + + * `--interval=DURATION` (default: `30s`) + * `--timeout=DURATION` (default: `30s`) + * `--retries=N` (default: `1`) + + The health check will first run **interval** seconds after the container is + started, and then again **interval** seconds after each previous check completes. + + If a single run of the check takes longer than **timeout** seconds then the check + is considered to have failed. + + It takes **retries** consecutive failures of the health check for the container + to be considered `unhealthy`. + + There can only be one `HEALTHCHECK` instruction in a Dockerfile. If you list + more than one then only the last `HEALTHCHECK` will take effect. + + The command after the `CMD` keyword can be either a shell command (e.g. `HEALTHCHECK + CMD /bin/check-running`) or an _exec_ array (as with other Dockerfile commands; + see e.g. `ENTRYPOINT` for details). + + The command's exit status indicates the health status of the container. + The possible values are: + + - 0: success - the container is healthy and ready for use + - 1: unhealthy - the container is not working correctly + - 2: starting - the container is not ready for use yet, but is working correctly + + If the probe returns 2 ("starting") when the container has already moved out of the + "starting" state then it is treated as "unhealthy" instead. + + For example, to check every five minutes or so that a web-server is able to + serve the site's main page within three seconds: + + HEALTHCHECK --interval=5m --timeout=3s \ + CMD curl -f http://localhost/ || exit 1 + + To help debug failing probes, any output text (UTF-8 encoded) that the command writes + on stdout or stderr will be stored in the health status and can be queried with + `docker inspect`. Such output should be kept short (only the first 4096 bytes + are stored currently). + + When the health status of a container changes, a `health_status` event is + generated with the new status. The health status is also displayed in the + `docker ps` output. + + Signed-off-by: Thomas Leonard + Signed-off-by: Sebastiaan van Stijn + +commit cc40fc62b77d1e5560d03acd58b9c5252fcb00f7 +Author: Joao Fernandes +Date: Thu Jun 2 14:30:07 2016 -0700 + + Updates docs for offline install + +commit d1b1b6a98ef5381d2f3702d2c11856f692a0a412 +Merge: eb9274844e 6e5894b551 +Author: Brian Goff +Date: Thu Jun 2 16:30:05 2016 -0400 + + Merge pull request #23212 from LK4D4/remove_unused_var + + pkg/parser/kernel: remove unused var block + +commit 61069c407a5dac073c5bf984db3babe588443906 +Author: Nathan LeClaire +Date: Thu Jun 2 13:28:09 2016 -0700 + + Use get.docker.com not test.docker.com + + Signed-off-by: Nathan LeClaire + +commit eb9274844efd5e08226a98de79f0f5237a6e2458 +Merge: 4399d3b309 d96e36cbbf +Author: Vincent Demeester +Date: Thu Jun 2 22:09:19 2016 +0200 + + Merge pull request #23140 from Microsoft/HcsshimRevendor + + Revendor hcsshim + +commit 20bf00dfa56ef9584d25777031ac4d11360386a8 +Author: Arnaud Lefebvre +Date: Thu Jun 2 21:09:09 2016 +0200 + + Use PKG_CONFIG environment variable if it exists + + pkg-config is not always available in the path + so let people choose where it's located + + Signed-off-by: Arnaud Lefebvre + +commit 4399d3b309a5af06471382ecf22c40f24d218c73 +Merge: 791f98290e afc2579d1a +Author: Sebastiaan van Stijn +Date: Thu Jun 2 21:22:49 2016 +0200 + + Merge pull request #23206 from mlaventure/fix-release-deb + + Fix release-deb script + +commit 35ea7903987d15168d4edd05781da35c52653d68 +Author: Sven Dowideit +Date: Wed Jun 1 22:19:51 2016 +0000 + + Many fixes for broken links + + Signed-off-by: Sven Dowideit + +commit 0589857e9e6abb91fca75e81d931872b3596ba7d +Author: Sven Dowideit +Date: Wed Jun 1 22:51:18 2016 +0000 + + More docs validation fixes + + Signed-off-by: Sven Dowideit + +commit d03375f7509f63ccde02d880026856c1e70efbfe +Author: Clement Ho +Date: Thu Jun 2 13:29:49 2016 -0500 + + Change npm script for lint to eslint + + Signed-off-by: Clement Ho + +commit feddf6cd4e439577ab270d8e3ba63a5d7c5c0d55 +Merge: 3828ecc654 b448455011 +Author: Sven Dowideit +Date: Thu Jun 2 11:22:55 2016 -0700 + + Merge pull request #1767 from SvenDowideit/appease-the-oss-validator + + Revert to using the full URL, as the OSS checker doesn't have access … + +commit b4484550117b8a05d06333e0fd11b84572549c11 +Author: Sven Dowideit +Date: Thu Jun 2 18:22:02 2016 +0000 + + Revert to using the full URL, as the OSS checker doesn't have access to the non-OSS docs + + Signed-off-by: Sven Dowideit + +commit ebb59eede25810eb446d42a0b1d0cf6b7c4cffb9 +Author: Nathan LeClaire +Date: Thu Jun 2 11:22:00 2016 -0700 + + Bump Docker version to 1.11.2 + + Signed-off-by: Nathan LeClaire + +commit 791f98290e0e88c76cb916d6e1d211467f36e230 +Merge: 34f54b3a11 2aee081cad +Author: Sebastiaan van Stijn +Date: Thu Jun 2 20:04:08 2016 +0200 + + Merge pull request #22806 from errordeveloper/master + + Remove MountFlags in systemd unit to allow shared mount propagation + +commit 6e5894b5511846b1be64f6fcae73a8b4ddd0ef24 +Author: Alexander Morozov +Date: Thu Jun 2 10:50:36 2016 -0700 + + pkg/parser/kernel: remove unused var block + + Signed-off-by: Alexander Morozov + +commit 34f54b3a11291b70b4316c2b4e047d8aafa95bed +Merge: cb8e7470be a7f551359a +Author: Alexander Morozov +Date: Thu Jun 2 10:48:19 2016 -0700 + + Merge pull request #22549 from allencloud/make-pkg-parsers-support-darwin + + add darwin support in package docker/pkg/parsers + +commit 3828ecc6543ea4c5e7d595f169ad2723ad393f82 +Merge: bb330cd684 db90724ab0 +Author: Richard Scothern +Date: Thu Jun 2 10:36:17 2016 -0700 + + Merge pull request #1765 from allencloud/fix-typos + + fix typos + +commit cb8e7470be022e55653e5472c72ee73ec5fc1bc6 +Merge: f69353a364 6b7f12650d +Author: Alexander Morozov +Date: Thu Jun 2 09:30:57 2016 -0700 + + Merge pull request #23208 from vdemeester/update-engine-api + + Bump engine api to 009ba16 + +commit afc2579d1a5aa3b95d90d6a1fdf7d6a4e3058fd6 +Author: Kenfe-Mickael Laventure +Date: Thu Jun 2 07:38:32 2016 -0700 + + Fix release-deb script + + Signed-off-by: Kenfe-Mickael Laventure + +commit f69353a364e0ec6ddb0cff3991ee0b44d87285c1 +Merge: 09033b8df2 efc250bc6b +Author: Vincent Demeester +Date: Thu Jun 2 17:21:38 2016 +0200 + + Merge pull request #23153 from AkihiroSuda/fix23152PkgGitutils + + Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit + +commit 09033b8df223c3d3ea1fc97bc86cd6f23e1cdfc3 +Merge: 80b3e9e810 f5df49b3dc +Author: Vincent Demeester +Date: Thu Jun 2 17:05:32 2016 +0200 + + Merge pull request #23179 from kerneltime/master + + Add VMware Docker Volume Plugin. + +commit db90724ab05add8cf882e62f2bed5338b82331f0 +Author: allencloud +Date: Thu Jun 2 13:31:13 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit 6b7f12650d8333bf088271acecea5256aef99c41 +Author: Vincent Demeester +Date: Thu Jun 2 16:56:13 2016 +0200 + + Update ContainerStart calls to use options now + + Signed-off-by: Vincent Demeester + +commit 8ea051f01261c44512bcaa76569a7fb9a200bab6 +Author: Vincent Demeester +Date: Thu Jun 2 16:55:49 2016 +0200 + + Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f + + Signed-off-by: Vincent Demeester + +commit 0da0a8f9dae35e6a9cb63b9e4a3285e24c001af3 +Author: Nalin Dahyabhai +Date: Thu Apr 14 15:21:42 2016 -0400 + + Add support for reading journal extras and in UTC + + When told to read additional attributes from logs that we've sent to the + journal, pull out all of the non-trusted, non-user fields that we didn't + hard-code ourselves. More of PR#20726 and PR#21889. + + When reading entries in the journald log reader, set the time zone on + timestamps that we read to UTC, so that we send UTC values to the client + instead of values that are local to whatever timezone dockerd happens to + be running in. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit 80b3e9e8103f0898296de6140149050877eecea3 +Merge: 171af54931 db3351ae37 +Author: Sebastiaan van Stijn +Date: Thu Jun 2 16:10:37 2016 +0200 + + Merge pull request #23183 from caarlos0/permissions + + Removed exec permissions from Dockerfile.windows + +commit 171af5493121bada5c0e8167ade44da52648d0e2 +Merge: 0aeac288a3 55a367d2fe +Author: Sebastiaan van Stijn +Date: Thu Jun 2 16:05:22 2016 +0200 + + Merge pull request #22460 from jwhonce/wip/sigpipe + + Ignore SIGPIPE events + +commit 0aeac288a33e498ad6bfa5a91f044a469c78a138 +Merge: 22aca92ee3 8bce6265fc +Author: Sebastiaan van Stijn +Date: Thu Jun 2 15:31:08 2016 +0200 + + Merge pull request #23161 from AkihiroSuda/rename-misleading-function-name + + daemon: Rename copy to copyFunc + +commit 322cc99c6962ecb56be3107061eb7f61364d05f8 +Author: Dan Walsh +Date: Thu May 26 14:39:46 2016 -0400 + + Need to create bind mount volume if it does not exist. + + In order to be consistent on creation of volumes for bind mounts + we need to create the source directory if it does not exist and the + user specified he wants it relabeled. + + Can not do this lower down the stack, since we are not passing in the + mode fields. + + Signed-off-by: Dan Walsh + +commit 22aca92ee3503f811f813be4a1349ad8e67fbbdb +Merge: 69545fe19d 5e85ec82af +Author: Vincent Demeester +Date: Thu Jun 2 12:54:43 2016 +0200 + + Merge pull request #23121 from unclejack/disallow_ecryptfs_aufs + + aufs,overlay: disable on eCryptfs + +commit 69545fe19d294d5ff4c43c2adc2795935f14ae61 +Merge: b02acfcbe0 518709a87e +Author: Vincent Demeester +Date: Thu Jun 2 12:21:52 2016 +0200 + + Merge pull request #23190 from AkihiroSuda/addendum23141 + + Fix the comment for daemon/logger.Copier + +commit c1be45fa38e82054dcad606d71446a662524f2d5 +Author: allencloud +Date: Sun May 8 09:36:10 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit f62cd8c9aa5e1ce33c1e4f1876c651c46555b7f6 +Author: allencloud +Date: Thu Jun 2 13:16:50 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit efc250bc6b1c252a5884011402b9e4dc4a1632d7 +Author: Akihiro Suda +Date: Wed Jun 1 02:36:25 2016 +0000 + + Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit + + Fix #23152 + + Signed-off-by: Akihiro Suda + +commit b02acfcbe045aa1d53acc8941bb8cd826ffce9cc +Merge: 287b0a6348 2d9c022946 +Author: Vincent Demeester +Date: Thu Jun 2 10:12:10 2016 +0200 + + Merge pull request #23197 from coolljt0725/cleanup_comment + + cleanup: clean up commented code in daemon/stats.go + +commit 2d9c02294683e78f9165585a134b090ed47d9bff +Author: Lei Jitang +Date: Thu Jun 2 14:39:12 2016 +0800 + + cleanup: clean up commented code in daemon/stats.go + + Signed-off-by: Lei Jitang + +commit 53a1de2b1651f0cd5fb3a1f5a3c26f4d5f5dd9b2 +Author: Senthil Kumaran +Date: Wed Jun 1 22:02:57 2016 -0700 + + Fix the docker daemon restart command for ubuntu. + + Signed-off-by: Senthil Kumaran + +commit 8bce6265fca22c117cf6d69d9ffd4ee78da9db8a +Author: Akihiro Suda +Date: Wed Jun 1 06:50:23 2016 +0000 + + daemon: Rename copy to copyFunc + + "copy" can be misleading for humans because Go has its own builtin "copy" function + + Signed-off-by: Akihiro Suda + +commit 518709a87e04f55babc5162861aa4ba9a423f0c8 +Author: Akihiro Suda +Date: Thu Jun 2 13:10:51 2016 +0900 + + Fix the comment for daemon/logger.Copier + + Now daemon/logger.Copier does not use ContainerID + + Addendum to #23141 + + Signed-off-by: Akihiro Suda + +commit a7f551359ad187a37663b39afdfe33122addea30 +Author: allencloud +Date: Fri May 6 18:03:01 2016 +0800 + + make pkg/parsers support darwin and solaris + + Signed-off-by: allencloud + +commit 287b0a6348d8f768db6ff840feedcb32a4c2d448 +Merge: 7e5561a438 7772d270c0 +Author: Brian Goff +Date: Wed Jun 1 23:13:38 2016 -0400 + + Merge pull request #23141 from nalind/logger-remove-cid + + Remove the logger.Message ContainerID field + +commit 61f3441d07cd25a8c26cc9fd5cfcb0e5d8f79fff +Author: xianlubird +Date: Thu May 26 10:00:58 2016 +0800 + + Add scheduler detail log for node info + + Signed-off-by: Xianlu + +commit 0436f5f968f77ba2e8dcda0cf893f2de4e752edd +Merge: 4b294d3b4e f08bf67841 +Author: French Ben +Date: Wed Jun 1 18:20:16 2016 -0700 + + Merge pull request #1702 from ClemMakesApps/add-container-id + + Add container ID to sidebar + +commit 7e5561a438bebd8bd2096231e3d2848b016a162b +Merge: 273ab8591e f437e2d148 +Author: Brian Goff +Date: Wed Jun 1 20:45:54 2016 -0400 + + Merge pull request #23151 from AkihiroSuda/fix23012PkgAuth + + Fix racy tests in pkg/authorization + +commit 273ab8591e5aaca6767c1a5ce4b66ed53897a51e +Merge: 2ca25302fe 4e2d98761d +Author: Brian Goff +Date: Wed Jun 1 20:42:54 2016 -0400 + + Merge pull request #22867 from justincormack/checklimits + + Begin a section in the check-config script to check limits + +commit db3351ae379bdaba0b863d52b9d9280836fd75c7 +Author: Carlos Alexandro Becker +Date: Wed Jun 1 21:41:19 2016 -0300 + + Removed exec permissions from Dockerfile.windows + + Signed-off-by: Carlos Alexandro Becker + +commit 4b294d3b4e603ad95cbba33144de95f2299bc8d2 +Merge: 15035af444 31358ef047 +Author: French Ben +Date: Wed Jun 1 17:35:07 2016 -0700 + + Merge pull request #1731 from ClemMakesApps/fix-flatten-children-warning + + Fix duplicate react key issue + +commit 52d0020542afa76242fce663b394f749d4fb05fe +Merge: a482479f5b 96c904a51e +Author: Nathan LeClaire +Date: Wed Jun 1 15:56:28 2016 -0700 + + Merge pull request #3405 from eedeebee/3404-add-tcsh-support-to-env-command + + Add tcsh support to --shell + +commit a482479f5bd714cd88e29d40313b92872bfca46f +Merge: 2420975f4e 73e8b0de2b +Author: Nathan LeClaire +Date: Wed Jun 1 15:54:01 2016 -0700 + + Merge pull request #3436 from tyrken/upgrade-govmomi-netip + + Upgrade govmomi to 0.6.2, use WaitForNetIP + +commit f5df49b3dcfeb1164ca60d4dbf7756603e61a299 +Author: Ritesh H Shukla +Date: Wed Jun 1 15:29:15 2016 -0700 + + Add VMware Docker Volume Plugin. + + Add reference to https://github.com/vmware/docker-volume-vsphere to Docker's list of plugins. + This is an officially supported plugin from VMware. + + Signed-off-by: Ritesh H Shukla + +commit 90f558405e76f7feaabc6f81933da9b68d4b92cc +Merge: e7bf3ddd2d 212cb9ed97 +Author: Joao Fernandes +Date: Wed Jun 1 14:55:39 2016 -0700 + + Merge pull request #2269 from SvenDowideit/docs-validatation-fixes + + Docs validation fix + +commit 2ca25302fe7033ab0129554bb679294aa04db70b +Merge: 28676fc04b da7edb5f3c +Author: Alexander Morozov +Date: Wed Jun 1 14:37:35 2016 -0700 + + Merge pull request #23120 from AkihiroSuda/fixStreamFormatter + + Fix pkg/streamformatter.TestJSONFormatProgress + +commit 28676fc04b9a307718b66bd28e8d9281d05f38ac +Merge: cbccb19212 9b2bb64a38 +Author: Alexander Morozov +Date: Wed Jun 1 14:18:23 2016 -0700 + + Merge pull request #22769 from dnephin/integrate_cobra + + Use spf13/cobra for the cli + +commit f08bf678411afabb5e875ef81d67bc01abaa0a9d +Merge: 1b68613b5a 15035af444 +Author: Clement Ho +Date: Wed Jun 1 16:12:32 2016 -0500 + + Merge branch 'master' of github.com:docker/kitematic into add-container-id + +commit 212cb9ed975af17083a31eb11af2c3b837adc17f +Author: Sven Dowideit +Date: Wed Jun 1 20:40:41 2016 +0000 + + Docs validation fix + + Signed-off-by: Sven Dowideit + +commit e7bf3ddd2dd581b7d306bbbaf905a12cacc16cdf +Author: Joao Fernandes +Date: Wed Jun 1 13:33:39 2016 -0700 + + Updates release notes + + Updates release notes to mention changes to --dtr-load-balancer-flag, and + upgrade command. + + Closes #2261 + +commit cbccb19212c186e5baf5e09b130a7fcc1d58df4c +Merge: cb36dddad1 7b08941882 +Author: Vincent Demeester +Date: Wed Jun 1 21:29:33 2016 +0200 + + Merge pull request #23090 from yongtang/05292016-remove-deprecated-docker-tag-f + + Remove deprecated -f flag on docker tag + +commit bb330cd684eb4afab9cc4f2453d7c8918099d7ee +Merge: df2184c810 e4acec1806 +Author: Sven Dowideit +Date: Wed Jun 1 11:25:54 2016 -0700 + + Merge pull request #1762 from SvenDowideit/more-docs-validation-cleanups + + Next load of docs validation fixes + +commit df2184c8109efde5cb2e57b3fa3177985ba024da +Merge: e66f9c1440 f18da7d3a3 +Author: Richard Scothern +Date: Wed Jun 1 11:23:23 2016 -0700 + + Merge pull request #1627 from luckyraul/swift_auth_url + + Swift auth version param + +commit b9676643c8d82711bfc0dd31c97cef7ce4204e9c +Author: Martin Redmond +Date: Wed Jun 1 12:29:36 2016 -0400 + + Update mailmap and re-generate Authors + + Signed-off-by: Martin Redmond + Signed-off-by: Sebastiaan van Stijn + +commit e4acec1806a4609e9e5568704e3b9721ba98e103 +Author: Sven Dowideit +Date: Wed Jun 1 17:59:13 2016 +0000 + + Next load of docs validation fixes + + Signed-off-by: Sven Dowideit + +commit 31358ef04795da8ccaf903aee8f494d48a4c66e9 +Author: Clement Ho +Date: Wed Jun 1 13:09:05 2016 -0500 + + Fix duplicate react key issue + + Signed-off-by: Clement Ho + +commit 5e85ec82af6c8ec70ed39fd8489aea730fd41561 +Author: unclejack +Date: Tue May 31 12:36:55 2016 +0300 + + aufs,overlay: disable on eCryptfs + + Signed-off-by: Cristian Staretu + +commit cb36dddad150a3bc0986736a877c8bdfcfbd346c +Merge: 4b86651053 ce160b37e1 +Author: Alexander Morozov +Date: Wed Jun 1 10:35:31 2016 -0700 + + Merge pull request #23148 from mlaventure/wait-for-containerd-before-restarting-it + + Wait for containerd to die before restarting it + +commit e66f9c14409f1834fe40278635da55ca4063c4f6 +Merge: d9c4f03bcc bf4eb92f56 +Author: Sven Dowideit +Date: Wed Jun 1 10:35:14 2016 -0700 + + Merge pull request #1759 from SvenDowideit/fix-new-doc-metadata + + Add topics to the menu + +commit 7b08941882668c1c40adb03d9227d22e0aa5e605 +Author: Yong Tang +Date: Wed Jun 1 08:22:59 2016 -0700 + + Update remote API docs for the removal of deprecated `force` in `docker tag`. + + This fix updates remote API docs for the removal of deprecated `force` in `docker tag`. + + Signed-off-by: Yong Tang + +commit 4455ec14b87d5ad474c5e11d60907bceb35e9e09 +Author: Yong Tang +Date: Sun May 29 08:16:39 2016 -0700 + + Remove deprecated -f flag on docker tag + + The -f flag on docker tag has been deprecated in docker 1.10 and + is expected to be removed in docker 1.12. + + This fix removed the -f flag on docker tag and also updated + deprecated.md. + + NOTE: A separate pull request for engine-api has been opened to + cover the related changes. + + Signed-off-by: Yong Tang + +commit 1dab9af5d5acc1fe3a1bfb84a5cc576d664095e4 +Author: Yong Tang +Date: Mon May 30 15:46:24 2016 -0700 + + Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e + + This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e. + + This fix is related to #23090. + + Signed-off-by: Yong Tang + +commit 4b86651053d92429ee2a73abd2d815a5d4c936a1 +Merge: 09be7d9ee4 0a8386c8be +Author: Vincent Demeester +Date: Wed Jun 1 18:24:28 2016 +0200 + + Merge pull request #22570 from mountkin/rm-deprecated-feature + + remove deprecated feature of passing HostConfig at API container start + +commit 09be7d9ee4533c0b60c0c2b70d0cde41a86e5049 +Merge: 8d75709f90 bf6d52bba1 +Author: Vincent Demeester +Date: Wed Jun 1 18:12:59 2016 +0200 + + Merge pull request #23085 from icecrime/gitdm.config + + Add gitdm configuration + +commit 8d75709f90ba9926d41cd7b91bb316e336af8f8c +Merge: bcf0c8ca28 a9f6d93099 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 17:55:24 2016 +0200 + + Merge pull request #23165 from thaJeztah/update-logging-code-hints + + cleanup logging driver documentation + +commit bcf0c8ca2883867ba7dcec4824a64359ee7cab12 +Merge: 466eb1bab7 c8454394f7 +Author: Brian Goff +Date: Wed Jun 1 11:09:06 2016 -0400 + + Merge pull request #23142 from Microsoft/ExtraCleanup + + Windows: Remove a double free on hcs container handle + +commit 1b68613b5a159df1f86976b5beb6fc1d731c8848 +Author: Clement Ho +Date: Wed Jun 1 10:06:09 2016 -0500 + + Add fade out animation for copy container id feedback + + Signed-off-by: Clement Ho + +commit 466eb1bab702f7afd652e57f6041124d5399fbd4 +Merge: c7aba69cc1 8e4a451448 +Author: Vincent Demeester +Date: Wed Jun 1 16:52:35 2016 +0200 + + Merge pull request #23084 from estesp/ps-fastpath + + Optimize `docker ps` when name/id filters in use + +commit ce160b37e15ddb86c45314d080718f833e551aa3 +Author: Kenfe-Mickael Laventure +Date: Tue May 31 17:47:39 2016 -0700 + + Wait for containerd to die before restarting it + + Signed-off-by: Kenfe-Mickael Laventure + +commit 0a8386c8be3fa87b7523bef7fd31c81a7f84709c +Author: Shijiang Wei +Date: Sat May 7 18:05:26 2016 +0800 + + remove deprecated feature of passing HostConfig at API container start + + Signed-off-by: Shijiang Wei + +commit c7aba69cc10faee84ba877ad4a94e4e150cb0932 +Merge: 1ba9aadbcb 054992e291 +Author: Vincent Demeester +Date: Wed Jun 1 15:42:47 2016 +0200 + + Merge pull request #22989 from Microsoft/StartCleanup + + Windows: Adding missing cleanup call when container start fails + +commit 1ba9aadbcb8444e4dd70cd83f0d14d7f3c694f10 +Merge: cdf61152bb 8b5e5c6195 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 14:56:32 2016 +0200 + + Merge pull request #23072 from dnephin/set_state_dir_of_containerd + + Set --state-dir on containerd + +commit cdf61152bb58f6d10217434c1f976fcdea15110e +Merge: 74c7363965 b18062122d +Author: Brian Goff +Date: Wed Jun 1 08:42:19 2016 -0400 + + Merge pull request #23133 from runcom/graphtests-fix + + graphtest: fix cleanup logic + +commit 74c7363965625848c32a5af80526fb65ecb26064 +Merge: 41232e4b36 896fbb470a +Author: Vincent Demeester +Date: Wed Jun 1 13:45:28 2016 +0200 + + Merge pull request #23143 from bfirsh/remove-status-column-from-clinet-libraries-page + + Remove status column from client libraries page + +commit a9f6d93099283ee06681caae7fe29bd1b2dd4c77 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 13:18:25 2016 +0200 + + cleanup logging driver documentation + + This does a minor cleanup of the logging driver + documentation; + + - Add a table-header to the driver-options + table. + - Add language hints to code-blocks to + prevent incorrect highlighting + - Wrap some code examples so that they + fit in the default layout + - Wrap text to 80-chars + - Fix ordering in menu + - Some minor rewording + + We should still create separate pages + for all available drivers (for example, + json-file, syslog, and GELF don't have + their own configuration page) + + Signed-off-by: Sebastiaan van Stijn + +commit ecca1becef64bc881f4e2cfc7cb2e44210271111 +Merge: 8dcf7360aa 3c55f11704 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 11:41:18 2016 +0200 + + Merge pull request #71 from thaJeztah/add-docker-credential-helpers + + Add docker-credential-helpers and update libcompose maintainers + +commit 82e15cc82c0ff106cc5ba827e68b44bcd177aaed +Author: Andrew Hsu +Date: Wed Jun 1 07:54:46 2016 +0000 + + rename docker-compose network for mysql + + Signed-off-by: Andrew Hsu + +commit 3152a706c9b662eb30fd571d42a70f92584a0542 +Author: Lukasz Zajaczkowski +Date: Mon May 16 12:41:07 2016 +0200 + + Add documentation for running multiple daemons + + Signed-off-by: Lukasz Zajaczkowski + +commit f437e2d1485bfb64ac0ecc85ac3b14975e9f51f6 +Author: Akihiro Suda +Date: Wed Jun 1 01:34:35 2016 +0000 + + Fix racy tests in pkg/authorization + + Fix #23012 + + Signed-off-by: Akihiro Suda + +commit 15035af44411b62bfd974bbd9defc84bea1bbc2f +Merge: 3533e06bd2 be2d011491 +Author: French Ben +Date: Tue May 31 19:46:31 2016 -0700 + + Merge pull request #1730 from docker/deb-to-zip + + Fixed release file for ubuntu as zip instead of deb + +commit 41232e4b360aca1e041aa7dbbe33af69efce6ca6 +Merge: 4a7715c978 f8dacaf0ab +Author: Tõnis Tiigi +Date: Tue May 31 19:18:02 2016 -0700 + + Merge pull request #23145 from crosbymichael/clang + + Use clang 3.5 over 3.8 + +commit be2d011491765e08b6fa50a3950db8c0f210266a +Author: French Ben +Date: Tue May 31 17:53:52 2016 -0700 + + Fixed release file for ubuntu as zip instead of deb + + Signed-off-by: French Ben + +commit 8ce539de5b4026ab43dcedece3aa5706a5d806e5 +Author: Riyaz Faizullabhoy +Date: Tue May 31 17:19:50 2016 -0700 + + Update NOTARY_VERSION + + Signed-off-by: Riyaz Faizullabhoy + +commit f8dacaf0ab7ca533cc3a33c6d06f7dca3e347955 +Author: Michael Crosby +Date: Tue May 31 16:45:42 2016 -0700 + + Use clang 3.5 over 3.8 + + the llvm apt repo was removed and finding the exact rev of the llvm + toolchain that worked perfecting in our dockerfile is a problem. + + We looked at the reasons why we were using this version of clang and it + appears to be this compiler warning. + + `was built for newer OSX version (10.11) than being linked + (10.6)` + + When you look at the dockerfile this makes sense. + + ``` + ENV OSX_SDK MacOSX10.11.sdk + ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4 + RUN set -x \ + && export OSXCROSS_PATH="/osxcross" \ + && git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \ + && ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \ + && curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \ + && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh + ENV PATH /osxcross/target/bin:$PATH + ``` + + We are basically using the 10.11 sdk but linking to 10.6 as the + min version so this warning should be expected. + + Also the docs on the osxcross project require clan 3.2+, not 3.8. + + Signed-off-by: Michael Crosby + +commit 17b219454f9239f349420fd431ae82eeadca87ac +Merge: 86b5ed1a84 dd3590180d +Author: Sven Dowideit +Date: Tue May 31 16:36:29 2016 -0700 + + Merge pull request #3522 from SvenDowideit/fix-links + + Fix links + +commit 896fbb470a5fa118039ccbd30c3bffdcc6c461ff +Author: Ben Firshman +Date: Tue May 31 16:12:14 2016 -0700 + + Remove status column from client libraries page + + They are all "active". If they are not active, we should probably + remove them. + + Signed-off-by: Ben Firshman + +commit 2fea5b6e28c6b92ee2e453ad1855d17246d6e08e +Author: Ben Firshman +Date: Tue May 31 16:11:36 2016 -0700 + + Update client libraries introduction text + + Explain what they actually are. + + Signed-off-by: Ben Firshman + +commit 63997947bc8984c8304882cb18c432d2468d11b8 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 01:04:21 2016 +0200 + + Update docs maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit e69bb29b78a32a9acf826576a07ad4eaf38f924c +Merge: 1ad2e1d65b 9044c5177c +Author: Charles Smith +Date: Tue May 31 15:52:08 2016 -0700 + + Merge pull request #2292 from SvenDowideit/fix-link + + fix link + +commit 3c55f1170468f3eee5c65a1614463914c6a9f529 +Author: Sebastiaan van Stijn +Date: Wed Jun 1 00:46:18 2016 +0200 + + Add docker-credential-helpers and update libcompose maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit 9b2bb64a3800619b5810e8baf59d72613e7ccd19 +Author: Daniel Nephin +Date: Tue May 31 14:47:51 2016 -0700 + + Make the -h flag deprecated. + + Signed-off-by: Daniel Nephin + +commit fc5a4514fbe1b402d2a0bff170486ac3de4bf8cc +Author: Daniel Nephin +Date: Thu May 26 14:57:31 2016 -0700 + + Use Args in cobra.Command to validate args. + + Also re-use context. + + Signed-off-by: Daniel Nephin + +commit 54b5cce7e467a2b4fff76f95d465544f7be5b666 +Author: Daniel Nephin +Date: Wed May 25 14:57:18 2016 -0700 + + Support usage messages on bad flags. + + Signed-off-by: Daniel Nephin + +commit 3d624ed5d6c6bc8d4cbc6fdf579bd066c2f45e12 +Author: Daniel Nephin +Date: Wed May 25 14:32:04 2016 -0700 + + Update cobra vendor + + - adds support for usage strings on flag errors + - adds support for arg validation + + Signed-off-by: Daniel Nephin + +commit 1ad2e1d65b0531552220bf7fe53af4f3bbe3cda5 +Merge: aaa4d87a4e 9663b5e46f +Author: Dongluo Chen +Date: Tue May 31 15:22:37 2016 -0700 + + Merge pull request #2297 from allencloud/return-VolumesListResponse-in-volumes-API + + return VolumesListResponse in /volumes API + +commit d96e36cbbfb076f4adb967644e7d6e2da73eb0ec +Author: Darren Stahl +Date: Tue May 31 12:51:29 2016 -0700 + + Revendor hcsshim + + Signed-off-by: Darren Stahl + +commit 667dcb0e8e550d1a80ee67c6d71979e8cfabea1f +Author: Daniel Nephin +Date: Mon May 16 17:20:29 2016 -0400 + + Update usage and help to (almost) match the existing docker behaviour + + Signed-off-by: Daniel Nephin + +commit 69264beb4093c56e8c5b256a70e1a0150294c81c +Author: Daniel Nephin +Date: Tue Apr 19 12:59:48 2016 -0400 + + Migrate volume commands to cobra. + + Signed-off-by: Daniel Nephin + +commit 6bc3e23f656f111bf72c52ebe67fa9bd7c9ab37b +Author: Daniel Nephin +Date: Tue May 10 10:58:07 2016 -0400 + + Refactor cli inspector to support new inspects. + + Signed-off-by: Daniel Nephin + +commit 8c77c73e7b43a6a01133227e93c1e3f25d8a6e70 +Author: Daniel Nephin +Date: Tue Apr 19 11:49:57 2016 -0400 + + Vendor spf13/cobra and spf13/pflag + + Signed-off-by: Daniel Nephin + +commit bf4eb92f56026c5074466b61dcc4e0885e751d11 +Author: Sven Dowideit +Date: Tue May 31 17:19:47 2016 +0000 + + Add topics to the menu + + Signed-off-by: Sven Dowideit + +commit 9044c5177c6827d1961a48188e049ac1d2e59905 +Author: Sven Dowideit +Date: Fri May 27 22:08:46 2016 +0000 + + fix link + + Signed-off-by: Sven Dowideit + +commit dd3590180da36f5359d6463003b49ea2fca90315 +Author: Sven Dowideit +Date: Tue May 31 21:18:42 2016 +0000 + + more fixes + + Signed-off-by: Sven Dowideit + +commit 73e8b0de2bbb66364f77de2a63b0bab18660eff3 +Merge: b97ae51ff4 2420975f4e +Author: Tristan Keen +Date: Tue May 31 22:11:18 2016 +0100 + + Merge branch 'master' into upgrade-govmomi-netip + +commit 7772d270c06cc6c26359b556c95563bae31c1038 +Author: Nalin Dahyabhai +Date: Tue May 31 15:46:55 2016 -0400 + + Remove the logger.Message ContainerID field + + Log drivers are instantiated on a per-container basis, and passed the + container ID (along with other information) when they're initialized. + Drivers that care about that value are caching the value that they're + passed when they're initialized and using it in favor of the value + contained in Message structures that are passed to them, so the field in + Messages is unused, so we remove it. + + Signed-off-by: Nalin Dahyabhai + +commit 4a7715c9783627ecc194dac8502a684f40a9d0bd +Merge: 0b5e84cc8d 6bd797b43f +Author: Vincent Demeester +Date: Tue May 31 22:40:58 2016 +0200 + + Merge pull request #23130 from justincormack/seccomperror + + Error out if user tries to specify a custom seccomp profile on system that does not support it + +commit 8b5e5c61955eba9af7c2975b959c4f4517485389 +Author: Daniel Nephin +Date: Fri May 27 14:45:43 2016 -0700 + + Set --state-dir on containerd. + + Signed-off-by: Daniel Nephin + +commit d9c4f03bcce7a4967b5ec07d7028786c4081b890 +Merge: 1b9ab303a4 d153bfffbd +Author: Derek McGowan +Date: Tue May 31 11:16:19 2016 -0700 + + Merge pull request #1760 from RichardScothern/revert-config + + Revert inadvertant filepath change + +commit d153bfffbdfb7a8b957ea4f57bafadcc1993e0c4 +Author: Richard Scothern +Date: Tue May 31 11:14:25 2016 -0700 + + Revert inadvertant filepath change + + Signed-off-by: Richard Scothern + +commit b18062122d76a9f53822889874aa12103d491372 +Author: Antonio Murdaca +Date: Sun May 29 11:51:06 2016 +0200 + + graphtest: fix cleanup logic + + device Base should not exists on failure: + + --- FAIL: TestDevmapperCreateBase (0.06s) + graphtest_unix.go:122: stat + /tmp/docker-graphtest-079240530/devicemapper/mnt/Base/rootfs/a subdir: + no such file or directory + --- FAIL: TestDevmapperCreateSnap (0.00s) + graphtest_unix.go:219: devmapper: device Base already + exists. + + it should be: + + --- FAIL: TestDevmapperCreateBase (0.25s) + graphtest_unix.go:122: stat + /tmp/docker-graphtest-828994195/devicemapper/mnt/Base/rootfs/a subdir: + no such file or directory + --- FAIL: TestDevmapperCreateSnap (0.13s) + graphtest_unix.go:122: stat + /tmp/docker-graphtest-828994195/devicemapper/mnt/Snap/rootfs/a subdir: + no such file or directory + + Signed-off-by: Antonio Murdaca + +commit c8454394f76865777d4cd013c606d17dcd0f9600 +Author: Darren Stahl +Date: Tue May 31 10:25:38 2016 -0700 + + Windows: Remove a double free on hcs container handle + + Signed-off-by: Darren Stahl + +commit 054992e2913cf10171eecb5f41e5c19158cf04bc +Author: Darren Stahl +Date: Wed May 25 11:08:15 2016 -0700 + + Windows: Adding missing cleanup call when container start fails + + Signed-off-by: Darren Stahl + +commit 1f57f4a25ad61cb32c8dd76655c8c92d0eca0f9e +Author: Joao Fernandes +Date: Fri May 27 10:51:47 2016 -0700 + + Adds DTR upgrade docs + + Adds instructions on how to upgrade DTR from + 2.0.0 to 2.0.1. + +commit 6bd797b43fa738efc7eed02e96c21b352aa1c25b +Author: Justin Cormack +Date: Tue May 31 16:54:55 2016 +0100 + + Error out if user tries to specify a custom seccomp profile on system that does not support it + + Fixes #23031 + + If a profile is explicitly passed but the system is not built with seccomp support, + error out rather than just running without a profile at all as we would previously. + Behaviour is unchanged if no profile is specified or unconfined is specified. + + Signed-off-by: Justin Cormack + +commit 3d66418f30aa2994e8e3d116e6b875dcbe634cb9 +Author: Andrew Hsu +Date: Tue May 24 19:06:30 2016 +0000 + + remove hostname resolution problem workaround + + Signed-off-by: Andrew Hsu + +commit 0b5e84cc8d190520e55a80530d29c455805974af +Merge: d1e9e86122 9d6989bbb6 +Author: Alexander Morozov +Date: Tue May 31 09:39:38 2016 -0700 + + Merge pull request #23046 from mountkin/fix-23045 + + fix flaky test TestImportFileWithMessage + +commit 3533e06bd2558dbc6c55bd2d8189c95cbb04f3e9 +Merge: b5636fbc8e b514738283 +Author: French Ben +Date: Tue May 31 09:37:32 2016 -0700 + + Merge pull request #1723 from bdharris08/electron-os-optionaldependencies + + Move deb rhel electron to optionalDependencies + +commit 1b9ab303a477ded9bdd3fc97e9119fa8f9e58fca +Merge: 641f102967 3069a04b8c +Author: Sven Dowideit +Date: Tue May 31 09:32:53 2016 -0700 + + Merge pull request #1735 from SvenDowideit/move-menu-page + + Make the index.html files the visible overview menu entry + +commit aaa4d87a4e24202ba74362a098d06a46d5deb8f4 +Merge: 2721be2548 e85792cfdd +Author: Allen Sun +Date: Wed Jun 1 00:23:27 2016 +0800 + + Merge pull request #2308 from NanXiao/issue-9999 + + Edited CONTRIBUTING + +commit 2721be254894940d72cf08d92cb80b960754ea80 +Merge: 13c9e87a9f 4b1e08fd9d +Author: Allen Sun +Date: Wed Jun 1 00:21:21 2016 +0800 + + Merge pull request #2311 from bedeabza/docs-typos + + typo: 'loadblancer' in Swarm at scale docs + +commit d1e9e86122ff4dc024dfccf53797b80f87a62cd4 +Merge: ba372df79c b5490d4897 +Author: Alexander Morozov +Date: Tue May 31 09:14:41 2016 -0700 + + Merge pull request #23108 from michael-holzheu/s390x-dockerfile-gcc-6.1 + + Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1) + +commit 641f1029677e49faa277f7769797518e973865fd +Merge: a5f72a6032 febcee6564 +Author: Richard Scothern +Date: Tue May 31 09:09:39 2016 -0700 + + Merge pull request #1687 from RichardScothern/signature-store + + Remove signature store from registry. + +commit 458c3d687b1b2a8b86b69fa233c45224c47ef61b +Author: Clement Ho +Date: Tue May 31 09:49:26 2016 -0500 + + Add container ID and copy functionality + + Signed-off-by: Clement Ho + +commit 4b1e08fd9d16f7a874a5f0db00c41d1619f13fc3 +Author: Dragos Badea +Date: Tue May 31 16:51:36 2016 +0300 + + typo: 'loadblancer' in Swarm at scale docs + + Signed-off-by: Dragos Badea + +commit dcc407a820fae10c142fc05aab16cc60df5ccfd9 +Author: Ken Cochrane +Date: Tue May 31 08:44:40 2016 -0400 + + Fix issues with get.docker.com install script with redhat fixes #23101 + + Signed-off-by: Ken Cochrane + +commit e85792cfdd5816f94f0d0064a174a7a6b0cd9296 +Author: Nan Xiao +Date: Tue May 31 19:30:30 2016 +0800 + + Edited CONTRIBUTING + + Signed-off-by: Nan Xiao + +commit da7edb5f3cd2200b57149aa5096f8aa70f951ed8 +Author: Akihiro Suda +Date: Tue May 31 09:09:06 2016 +0000 + + Fix pkg/streamformatter.TestJSONFormatProgress + + The test was failing if the terminal column width is <= 110. + + Addendum to #23113 + + Signed-off-by: Akihiro Suda + +commit b5490d48979c3afa29d50dc8527aa6579cd1e634 +Author: Michael Holzheu +Date: Mon May 30 15:47:54 2016 -0400 + + Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1) + + Pull request #22840 and commit 40b21745cc ("Upgrade to golang 1.6.2") + introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le. + So do this also for s390x and use "s390x/gcc:6.1" as base image. + + In addition to this use "GO15VENDOREXPERIMENT=0" for notary build + as a workaround for: + + * golang/go#15814 + * golang/go#15628 + + Signed-off-by: Michael Holzheu + +commit ba372df79c410438cd39d7c7c2b02e4ebc76bc5f +Merge: a1f1e9c6d9 709478c8a3 +Author: Lei Jitang +Date: Tue May 31 14:58:55 2016 +0800 + + Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112 + + Fix pkg/jsonmessage.TestProgress panic + +commit a1f1e9c6d9b47a51e7ddc1c123ebd8b50605e230 +Merge: ef42e2f214 cd53ec5244 +Author: Alexander Morozov +Date: Mon May 30 22:18:56 2016 -0700 + + Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk + + Fix filepath.Walk misusage in pkg/directory + +commit 709478c8a3bfaf935dcb37b4f4e0085832868eb7 +Author: Akihiro Suda +Date: Tue May 31 04:12:25 2016 +0000 + + Fix pkg/jsonmessage.TestProgress panic + + Fix #23112 + + Signed-off-by: Akihiro Suda + +commit c4886bd006e49609fb7e257571b2d3bf56c4fbf5 +Author: xianlubird +Date: Mon May 30 17:18:17 2016 +0800 + + Fix network uniq method concurrent map writes problem + + Signed-off-by: Xianlu + +commit 8e4a451448376932d57885541be22c9a38de5668 +Author: Phil Estes +Date: Sat May 28 23:31:30 2016 -0400 + + Optimize `docker ps` when name/id filters in use + + When a partial ID or name is used in `docker ps` filters, today the + entire list of containers is walked even though there are shorter paths + to acquiring the subset of containers that match the ID or name. Also, + container's locks are used during this walk, causing increased lock + contention on a busy daemon. + + Docker-DCO-1.1-Signed-off-by: Phil Estes + +commit b5147382835fa9097daefe157f21281b1fbaf47a +Author: Ben Harris +Date: Mon May 30 14:11:09 2016 -0500 + + Move deb rhel electron to optionalDependencies + + grunt-electron-installer modules for debian and redhat will not install + on windows unless we move them to optional. Grunt file will error on + those platforms if the modules fail to install for some other reason. + +commit ef42e2f214dd528e3520d394d2d648de92f703cd +Merge: edcc9577bf ef238db508 +Author: Vincent Demeester +Date: Mon May 30 18:21:26 2016 +0200 + + Merge pull request #23106 from LINBIT/master + + Add the DRBD Docker Volume Plugin to the documentation + +commit ef238db508f55f70b982a95bb37e79536fe75e4b +Author: Roland Kammerer +Date: Mon May 30 17:45:05 2016 +0200 + + Add the DRBD Docker Volume Plugin to the documentation + + Signed-off-by: Roland Kammerer + +commit edcc9577bf95c2eeaa15955e7b1c00a18cec7cb6 +Merge: f3a7abee81 5e5e1d7ada +Author: Vincent Demeester +Date: Mon May 30 15:57:13 2016 +0200 + + Merge pull request #22103 from coolljt0725/fix_22093 + + Fix docker create with duplicate volume failed to remove + +commit f3a7abee8107eb13e13dfff959998286b87a34ed +Merge: 34e0a01de2 38c49d9987 +Author: Sebastiaan van Stijn +Date: Mon May 30 14:48:31 2016 +0200 + + Merge pull request #22384 from yongtang/22358-log-tag-prefix + + Remove `docker/` prefix from log messages tag. + +commit 34e0a01de2e5f070b4d9b7d83166c5cf8fe20300 +Merge: d305b0385c 27ebd79222 +Author: Vincent Demeester +Date: Mon May 30 13:33:29 2016 +0200 + + Merge pull request #23091 from allencloud/print-network-name-when-rm + + print network name when rm successfully + +commit 2d4bced30c88fe528f1b697805fb1b198bdc33b6 +Author: Tianyi Wang +Date: Mon May 30 18:07:15 2016 +0900 + + Fix zsh completion + - List all containers on `docker rm -f` + + Signed-off-by: Tianyi Wang + +commit cd53ec524410020db312089f2623b1a50f30121e +Author: Akihiro Suda +Date: Fri May 27 02:47:32 2016 +0000 + + Fix filepath.Walk misusage in pkg/directory + + Signed-off-by: Akihiro Suda + +commit d305b0385c39319304b79cb020d770234c85e589 +Merge: 6184518fe3 5f1c5b28a7 +Author: Antonio Murdaca +Date: Sun May 29 18:23:33 2016 +0200 + + Merge pull request #23092 from albers/completion-dockerd + + bash completion for dockerd + +commit 27ebd79222759762bec8a582f143408c7a32a969 +Author: allencloud +Date: Sun May 29 23:42:45 2016 +0800 + + print network name when rm successfully + + Signed-off-by: allencloud + +commit 5f1c5b28a719d63005ce5e2190348bdfbce629c3 +Author: Harald Albers +Date: Sun May 29 07:09:05 2016 -0700 + + bash completion for dockerd + + Signed-off-by: Harald Albers + +commit 6184518fe3c902b3a38758fed551501591229b05 +Merge: c050102536 cc5024225a +Author: Sebastiaan van Stijn +Date: Sun May 29 11:21:51 2016 +0200 + + Merge pull request #23081 from ibuildthecloud/not-insane + + Change insane to infallible + +commit d7241f3682a212a25f6425af88350b8ba017438e +Author: allencloud +Date: Sun May 22 19:46:59 2016 +0800 + + remove engine details in POST /volumes/create API + + Signed-off-by: allencloud + +commit c0501025368544a64060da431a270d8f954b7e98 +Merge: 02caa73df4 bfa0885c37 +Author: Alexander Morozov +Date: Sat May 28 22:07:31 2016 -0700 + + Merge pull request #23019 from vdemeester/more-daemon-horn-moving + + Moving some more methods away from daemon.go + +commit bf6d52bba16072d0c0f85782a5907acad4067789 +Author: Arnaud Porterie +Date: Sat May 28 21:08:20 2016 -0700 + + Add gitdm configuration + + Update .mailmap and add gitdm configuration. + + Signed-off-by: Arnaud Porterie + +commit 9663b5e46f4833c61d234fbedd7d1342e4533d3a +Author: allencloud +Date: Sat May 28 20:41:29 2016 +0800 + + return VolumesListResponse in /volumes API + + Signed-off-by: allencloud + +commit 46ea8ff75d03999e08f77f526e93d8489eb0fabd +Author: Yong Tang +Date: Fri May 27 09:29:37 2016 -0700 + + Fix build errors caused by update aws-sdk-go to v1.1.30 + + This fix tries to fix build errors caused by updating + aws-sdk-go to v1.1.30. + + This fix fixes #22961. + + Signed-off-by: Yong Tang + +commit 51f0a042239f2fb6f7ca1af2571f65a56a8bc001 +Author: Yong Tang +Date: Fri May 27 09:24:48 2016 -0700 + + Update aws-sdk-go to v1.1.30 + + This fix tries to update aws-sdk-go to v1.1.30. + + The following dependencies has been added: + github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0 + github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74 + Note: the commits matches v1.1.30 of aws-sdk-go. + + The following dependency has been removed + github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1 + + This fix fixes #22961. + + Signed-off-by: Yong Tang + +commit cc5024225a37d8e804a9b797299f92084423091a +Author: Darren Shepherd +Date: Sat May 28 09:49:34 2016 -0700 + + Change insane to infallible + + Signed-off-by: Darren Shepherd + +commit 6a2221fd97eb7108d6cf625168da17621720e0e5 +Author: Oleksandr Motsak +Date: Sat May 28 16:16:45 2016 +0200 + + Adding an optional VM's UI type for the virtualbox driver ("--virtualbox-ui-type") + + NOTE: with this one can specify the UI Type: gui,sdl,separate instead of the default choice (headless) + NOTE: running X11 server is required if UI type is not headless + Signed-off-by: Oleksandr Motsak + +commit 02caa73df411debed164f520a6a1304778f8b88c +Merge: da39e9a4f9 d59458c12d +Author: Sebastiaan van Stijn +Date: Sat May 28 12:48:36 2016 +0200 + + Merge pull request #21895 from hypriot/add-raspbian-jessie-deb + + Build deb package for all Raspberry Pi's / raspbian-jessie + +commit a67ba5536db72203b22fc989b91f54f598e1d1f9 +Author: Andrey Devyatkin +Date: Sat May 28 11:39:41 2016 +0200 + + Fix #3281: Unexpected result when using build args with default values + + Fix the issue when build arg is set to None instead of empty string. Usecase: + + cat docker-compose.yml + .... args: + - http_proxy + - https_proxy + - no_proxy + + If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy, + https_proxy, no_proxy build args will be set to string None which breaks all downloads + + With this change undefined build args will be set to empty string instead of string None + + Signed-off-by: Andrey Devyatkin + +commit da39e9a4f920a15683dd0f23923c302d4db6eed5 +Merge: e0ee0ac789 f80bfdf85c +Author: Vincent Demeester +Date: Sat May 28 10:11:04 2016 +0200 + + Merge pull request #23054 from mountkin/test-comments + + make the error message in TestRunSeccompDefaultProfile more precise + +commit e0ee0ac7892ee7921c30b22df7a6ff4ae6b9d28c +Merge: 9369457603 f182748b9b +Author: Brian Goff +Date: Fri May 27 22:23:51 2016 -0400 + + Merge pull request #23074 from jstarks/fix_windows_graph_name + + Windows: fix Windows graph driver name + +commit d6daabb233e5b49e48bbd820104677e4818c56d5 +Author: Alexei Yuzhakov +Date: Sat May 28 08:22:46 2016 +0600 + + Fix incorrect syntax that prevents to open the stable version of iTerm. + +commit 936945760314801b99b471227937fc5a302f72e7 +Merge: 8a26b1dd61 937851580c +Author: Brian Goff +Date: Fri May 27 21:11:33 2016 -0400 + + Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep + + Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go + +commit f80bfdf85ca3463f59c93bf73c484f42c308fa8b +Author: Shijiang Wei +Date: Fri May 27 19:11:48 2016 +0800 + + make the error message in TestRunSeccompDefaultProfile more precise + + Signed-off-by: Shijiang Wei + +commit 3069a04b8ceb0b1d5dcb475cad797052bbfc8c12 +Author: Sven Dowideit +Date: Thu May 19 12:52:58 2016 +0000 + + Make the index.html files the visible overview menu entry + + And move menu entry definition into a page that the user has no reason to navigate to + + Signed-off-by: Sven Dowideit + +commit 8a26b1dd61c232ed5d75e305dc9618c56350214c +Merge: 58b4164feb cfca3255a8 +Author: Michael Crosby +Date: Fri May 27 17:27:08 2016 -0700 + + Merge pull request #23073 from justincormack/splitseccomptest + + Split the Seccomp tests into two + +commit 58b4164feb2ad75e6454012690be0eea9343261e +Merge: d94daf624a b4708e2754 +Author: Michael Crosby +Date: Fri May 27 16:54:19 2016 -0700 + + Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT + + Remove GO15VENDOREXPERIMENT + +commit f182748b9b7d639c4db09f4f72411aba5f811f4e +Author: John Starks +Date: Fri May 27 15:53:41 2016 -0700 + + Windows: fix Windows graph driver name + + Reverting "Windows filter storage driver" to "windowsfilter". + + Signed-off-by: John Starks + +commit d94daf624ad1749ce3b6943e617cc38e63b7560d +Merge: b1f8b45b8f d864a14620 +Author: Michael Crosby +Date: Fri May 27 16:02:00 2016 -0700 + + Merge pull request #23057 from clnperez/seccomp-bump + + Bump the seccomp versions to pull in fixes and new commits + +commit cfca3255a83c7cbaeaa623617bf71688723b21aa +Author: Justin Cormack +Date: Fri May 27 15:38:29 2016 -0700 + + Split the Seccomp tests into two + + The Seccomp tests ran 11 tests in parallel and this appears to be + hitting some sort of bug on CI. Splitting into two tests means that + I can no longer repeoduce the failure on the slow laptop where I could + reproduce the failures before. + + Obviously this does not fix the underlying issue, which I will + continue to investigate, but not having the tests failing a lot + before the freeze for 1.12 would be rather helpful. + + Signed-off-by: Justin Cormack + +commit b1f95658fae6925f37c624c191b77d3c13a03dde +Merge: bd7ebf8c50 067ed434c3 +Author: Joao Fernandes +Date: Fri May 27 15:11:40 2016 -0700 + + Merge pull request #2213 from joaofnfernandes/cs-1.11 + + Updates install docs for CSE + +commit b1f8b45b8ff7e7f3dda116fcde3067cc8fc0afb0 +Merge: 4441a6c4c6 09d0720e2f +Author: Michael Crosby +Date: Fri May 27 15:06:29 2016 -0700 + + Merge pull request #23067 from shishir-a412ed/fix_commit_issue + + Fixes Issue # 22992: docker commit failing + +commit febcee65645cf56a1f359485f738ac0a573b9a81 +Author: Richard Scothern +Date: Fri May 27 11:30:42 2016 -0700 + + Add a deprecation document detailing signature store removal + + Signed-off-by: Richard Scothern + +commit b5636fbc8e263dc69cc06e64f1279449060b04d2 +Merge: 16947449a7 2bdaddd2b1 +Author: French Ben +Date: Fri May 27 14:37:00 2016 -0700 + + Circle linux added to get some artifacts + + Circle linux added to get some artifacts + +commit 16947449a7fd7797eaf81efeb4407e6b4358a5bf +Merge: 745cfa0537 de88688cab +Author: French Ben +Date: Fri May 27 14:36:23 2016 -0700 + + Merge pull request #1710 from docker/fix-exec + + Fixed container exec + +commit 2bdaddd2b199281279f9a52eecdbc4320b24eb99 +Merge: 739e9ef43b 745cfa0537 +Author: French Ben +Date: Fri May 27 14:26:34 2016 -0700 + + Added CirclCI hooks and cleaned up packager names + + Signed-off-by: French Ben + +commit 90fba58df9caf98b3d1573dbeba34e8d7858d188 +Author: Sven Dowideit +Date: Fri May 27 21:29:47 2016 +0000 + + Fix links + + Signed-off-by: Sven Dowideit + +commit 067ed434c3fbe396f2956aa2e9bf93d03d2d534b +Author: Joao Fernandes +Date: Fri May 27 11:53:38 2016 -0700 + + Updates install docs for CSE + + Updates install docs from 1.10 to 1.11. + +commit 4441a6c4c68f6ec7acb0e2d92d72274fbf403425 +Merge: 4a031f1f80 be072a8954 +Author: Sebastiaan van Stijn +Date: Fri May 27 23:27:42 2016 +0200 + + Merge pull request #22716 from jmzwcn/issue22466-patches + + Embedded DNS problem after renaming container. Step2:change in docker… + +commit 745cfa05372e95d8e6bfbc315f86e1298d7f996b +Merge: 1a75dbfdcf f9c6e1d42b +Author: French Ben +Date: Fri May 27 14:23:30 2016 -0700 + + Merge pull request #1677 from adomenech73/ubuntu-installer + + Initial Linux installer 🎉 - Default to Debian build + +commit 1a75dbfdcf3a794586aab294983c36b791b7a6e3 +Merge: 7bca08d2bb c712f27171 +Author: French Ben +Date: Fri May 27 14:18:06 2016 -0700 + + Merge pull request #1715 from ClemMakesApps/fix-activate-with-no-open-windows + + Fix electron deprecated activate API + +commit 4a031f1f80440cc61b56e5b6e111e155e4da066d +Merge: fd7ec4b9e5 fea7acf0e9 +Author: Sebastiaan van Stijn +Date: Fri May 27 23:12:08 2016 +0200 + + Merge pull request #22621 from yongtang/05092016-remove-deprecated-command-line-short-variant-options + + Un-deprecated command line short variant options of `-c` + +commit 13c9e87a9f73df5124f16c9281f263f02c5018d8 +Merge: eaa53c768a 7d5ef9016d +Author: Alexandre Beslic +Date: Fri May 27 14:10:41 2016 -0700 + + Merge pull request #2262 from allencloud/remove-refreshVolumes-not-used + + remove unused refreshVolumes in cluster.go + +commit bd7ebf8c50eaf10a94ff5479c636caaf26acb4f0 +Author: Sven Dowideit +Date: Fri May 27 21:05:13 2016 +0000 + + Link fixes + + Signed-off-by: Sven Dowideit + +commit fd7ec4b9e58fe5ba4abab4f60b63552e11246f3c +Merge: ec3ccde18b ac043c7db6 +Author: Arnaud Porterie +Date: Fri May 27 14:03:44 2016 -0700 + + Merge pull request #22912 from duglin/FixImportTest + + Fix docker import test + +commit d59458c12d76d732e0ab564ea0e769323af6d3d6 +Author: Stefan Scherer +Date: Fri May 27 23:00:05 2016 +0200 + + Update golang 1.6.2 + + Signed-off-by: Stefan Scherer + +commit 46c61497a056042397fed7db65059feb68d28e16 +Author: Stefan Scherer +Date: Fri Apr 8 20:04:15 2016 +0200 + + Build deb for raspbian-jessie + + Signed-off-by: Stefan Scherer + +commit 2420975f4ecdf922185b72696209effb53544537 +Merge: 6002b411ce d74f273c53 +Author: Nathan LeClaire +Date: Fri May 27 13:46:51 2016 -0700 + + Merge pull request #3423 from npcode/fix-swarm-port-binding + + Fix port binding of swarm master + +commit 0c15ab69528059d21395c166b3ec3c72ec297c69 +Author: Richard Scothern +Date: Wed Apr 6 17:01:30 2016 -0700 + + Remove signature store from registry. Return a generated signature for manifest + pull. + + Signed-off-by: Richard Scothern + +commit ec3ccde18bb2b46f9d2e74fad61e7286aa292123 +Merge: 068d466cc7 397a6fefad +Author: Brian Goff +Date: Fri May 27 15:54:37 2016 -0400 + + Merge pull request #22438 from yongtang/22420-inconsistent-tmpfs-behavior + + Inconsistent --tmpfs behavior + +commit 068d466cc7cd4ef3915b983b61e9cd029936ac90 +Merge: 01409bf069 ab391c9ab5 +Author: Sebastiaan van Stijn +Date: Fri May 27 21:21:32 2016 +0200 + + Merge pull request #23060 from friism/add-power-shell-example + + Add power shell example + +commit 8dcf7360aa7ada67b26e691fa0578a6133e8d664 +Merge: d5bba27419 8fcc4a3fa0 +Author: Sebastiaan van Stijn +Date: Fri May 27 21:20:38 2016 +0200 + + Merge pull request #70 from SvenDowideit/url-and-tooling-fixes + + fix urls found by linkchecker, and clean up tooling + +commit c712f27171630397e67393dafb50fef3c42a4256 +Author: ClemMakesApps@gmail.com +Date: Fri May 27 14:03:43 2016 -0500 + + Fix electron deprecated API + + Signed-off-by: Clement Ho + +commit 8fcc4a3fa0bade76351fbdd69dc47c6bcf97cc2e +Author: Sven Dowideit +Date: Fri May 27 18:49:38 2016 +0000 + + fix urls found by linkchecker, and clean up tooling + + Signed-off-by: Sven Dowideit + +commit ab391c9ab595f01e76b82edda0800e13655cc6f3 +Author: Michael Friis +Date: Fri May 27 09:01:05 2016 -0700 + + Add powershell example and make linux build example consistent with other examples + + Signed-off-by: Michael Friis + +commit 09d0720e2fb6e30ee018887399f353f93ac2d421 +Author: Shishir Mahajan +Date: Fri May 27 14:09:37 2016 -0400 + + Fixes Issue # 22992: docker commit failing. + + 1) docker create / run / start: this would create a snapshot device and mounts it onto the filesystem. + So the first time GET operation is called. it will create the rootfs directory and return the path to rootfs + 2) Now when I do docker commit. It will call the GET operation second time. This time the refcount will check + that the count > 1 (count=2). so the rootfs already exists, it will just return the path to rootfs. + + Earlier it was just returning the mp: /var/lib/docker/devicemapper/mnt/{ID} and hence the inconsistent paths error. + + Signed-off-by: Shishir Mahajan + +commit a5f72a60320b1080ba3c86da9352d7f24442ab49 +Merge: 6a40198283 3730470b64 +Author: Richard Scothern +Date: Fri May 27 11:35:34 2016 -0700 + + Merge pull request #1688 from tt/pass-through-known-errors + + Pass through known errors + +commit 6a40198283a257ac34822a0f7f67b4a38b89af68 +Merge: 596ca8b86a 5d7600e3ca +Author: Richard Scothern +Date: Fri May 27 11:34:39 2016 -0700 + + Merge pull request #1719 from gschukin/fix_ceph_last_modifed + + Handle responce from ceph correctly if no Last-Modifed header specified + +commit c148849f0e219ff61a7a29164fd88c113faf7ef3 +Author: Andrey Devyatkin +Date: Fri May 27 19:59:27 2016 +0200 + + Fix #3281: Unexpected result when using build args with default values + + Fix the issue when build arg is set to None instead of empty string. Usecase: + + cat docker-compose.yml + .... args: + - http_proxy + - https_proxy + - no_proxy + + If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy, + https_proxy, no_proxy build args will be set to string None which breaks all downloads + + With this change undefined build args will be set to empty string instead of string None + + Signed-off-by: Andrey Devyatkin + +commit d5bba27419c3fc526f899fb9c3e19b225c750053 +Merge: cedbce7fe6 90013c7844 +Author: Sebastiaan van Stijn +Date: Fri May 27 19:43:18 2016 +0200 + + Merge pull request #69 from FreddieV4/remove-artifacts-typo + + Fix typo in removing artifacts section; docker fm --> docker rm + +commit 01409bf069a4fbf8ebcbd27e2333a9d61d462138 +Merge: f1276cd3aa f87053b9c3 +Author: Alexander Morozov +Date: Fri May 27 10:09:43 2016 -0700 + + Merge pull request #22376 from vdemeester/use-dockerd-in-integration-cli + + Use dockerd instead of docker daemon in integration-cli + +commit 90013c7844a54b4def0a359cdfd12649e42d9da6 +Author: Freddie Vargus +Date: Fri May 27 12:58:02 2016 -0400 + + Fix typo in removing artifacts section; docker fm --> docker rm + +commit f1276cd3aa8d2bff6e3ab1ac3a175deeecac405e +Merge: 1d87f788b1 32b234885e +Author: Vincent Demeester +Date: Fri May 27 18:55:48 2016 +0200 + + Merge pull request #23039 from yongtang/05262016-docs-cluster-store-opts + + Fix error in dockerd.md for incorrect cluster-store-opts example. + +commit b4708e275446aa85b6b37924dc9d3318cf69efd4 +Author: Sebastiaan van Stijn +Date: Fri May 27 18:15:01 2016 +0200 + + Remove GO15VENDOREXPERIMENT + + This environment variable is no longer + needed in Go 1.6 (as it's not the default). + + Removed this environment variable from + all Dockerfiles except the Dockerfile.s390x, + which is still using gcc 5.3 (Go 1.5) + + Signed-off-by: Sebastiaan van Stijn + +commit 1d87f788b1d544d388d599316f9999867c4c3c80 +Merge: 6e721f6432 6952135fc8 +Author: Brian Goff +Date: Fri May 27 11:31:36 2016 -0400 + + Merge pull request #23030 from Microsoft/jjh/xenonworkdir + + Windows: Default isolation and workdir + +commit 6e721f6432da2fb6976b9c1cee41e15797cf6906 +Merge: 24d2ee8c48 81d24e754d +Author: Brian Goff +Date: Fri May 27 11:20:45 2016 -0400 + + Merge pull request #23032 from tonistiigi/walk-err-fix + + Fix directory walker error checking + +commit 9d6989bbb61cc009262ed6cf2ada92e7350a58af +Author: Shijiang Wei +Date: Fri May 27 16:06:15 2016 +0800 + + fix flaky test TestImportFileWithMessage + + Signed-off-by: Shijiang Wei + +commit d864a1462037a2746b7633fb0212218d017a5532 +Author: Christy Perez +Date: Tue May 24 16:39:52 2016 -0400 + + Bump the seccomp versions to pull in fixes and new commits + enabling s390 and ppc64le function + + Signed-off-by: Christy Perez + +commit 24d2ee8c485dc2a580ee57e3afc076dda307e3c8 +Merge: ab9204c826 f7541b00b0 +Author: Vincent Demeester +Date: Fri May 27 16:57:36 2016 +0200 + + Merge pull request #22984 from Microsoft/jjh/ttymessage + + Better error on attach no tty + +commit f9c6e1d42b21340528fee03f17cf1f843bba3742 +Author: Albert Domenech +Date: Sun May 15 13:21:29 2016 +0200 + + Initial debian/ubuntu installer: + + - Used grunt-packager and grunt-electron-installer-debian + + - Added debian/ubuntu ai32 arch support + + - Added Redhat/Centos/Fedora rpm support + + - Added electron-packager to MacOSX custom task + + - Fixed OSX Linux build and better conditional legibility + + - Fixed ESLint indications + + Signed-off-by: Albert Domenech + +commit ab9204c8264019f23587291ba03fc5ac71d215b9 +Merge: 9b0d385975 cd012efa2e +Author: Brian Goff +Date: Fri May 27 10:21:40 2016 -0400 + + Merge pull request #23049 from vdemeester/search-validate-before-call + + Validate filter values before calling registry. + +commit 9b0d385975c80359b4cab2c75e4834fe803e12d5 +Merge: bd5c9f59ea fa82c0aa10 +Author: Alexander Morozov +Date: Fri May 27 06:54:57 2016 -0700 + + Merge pull request #22840 from runcom/go1.6 + + Upgrade to golang 1.6.2 + +commit cedbce7fe61d83f37ebfa39d4cfa8d27c7a94bbe +Merge: 2f81b21ab5 16ba330a46 +Author: Sebastiaan van Stijn +Date: Fri May 27 15:19:22 2016 +0200 + + Merge pull request #68 from thaJeztah/update-engine-maintainers + + Update engine maintainers + +commit 1298b9aa5d8d9f7b99c2f1130a3d3661bbda2c16 +Author: Denis Makogon +Date: Tue May 24 15:16:36 2016 +0300 + + Issue-3503: Improve timestamp validation in tests + + CLITestCase.test_events_human_readable fails due to + wrong assumption that host where tests were launched + will have the same date time as Docker daemon. + + This fix introduces internal method for validating + timestamp in Docker logs + + Signed-off-by: Denys Makogon + +commit bfa0885c37efe5734d93f5bbb9e6477f66358e7c +Author: Vincent Demeester +Date: Fri May 27 11:32:26 2016 +0200 + + Moving some more methods away from daemon.go + + Signed-off-by: Vincent Demeester + +commit cd012efa2e46ec82b7a1f742bfc6858513c4ee37 +Author: Vincent Demeester +Date: Fri May 27 11:13:12 2016 +0200 + + Validate filter values before calling registry. + + Signed-off-by: Vincent Demeester + +commit bd5c9f59ea9dde983bf40b36f16311e550a5c2e4 +Merge: 3f6fa8af45 ee76963125 +Author: Sebastiaan van Stijn +Date: Fri May 27 08:41:11 2016 +0200 + + Merge pull request #23035 from SvenDowideit/fix-links + + Fix up stale links + +commit e3e8a619cce64a127df7d7962a2694116914b566 +Author: Andrey Devyatkin +Date: Fri May 27 07:48:13 2016 +0200 + + Fix #3281: Unexpected result when using build args with default values + + Fix the issue when build arg is set to None instead of empty string. + Usecase: + + cat docker-compose.yml + .... + args: + - http_proxy + - https_proxy + - no_proxy + + If http_proxy, https_proxy, no_proxy environment variables are not defined + then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads + + With this change build args will not passed to docker engine if they are equal to string None + + Signed-off-by: Andrey Devyatkin + +commit de88688cabcb654cc9d0c3292a81ed951ff2d0b4 +Author: French Ben +Date: Thu May 26 21:34:58 2016 -0700 + + Fixed container exec + + Signed-off-by: French Ben + +commit 937851580c91a5129a0a2f236e315b8b090a91fd +Author: Akihiro Suda +Date: Fri May 27 04:08:55 2016 +0000 + + Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go + + Signed-off-by: Akihiro Suda + +commit 32b234885e798650cdff70f0459175e79a294b4d +Author: Yong Tang +Date: Thu May 26 20:04:48 2016 -0700 + + Fix error in dockerd.md for incorrect cluster-store-opts example. + + This fix fixes an error in documentation (dockerd.md). In the + example given by dockerd.md, the option `cluster-store-opts` + is assigned with an array but this option can only be assigned + as a map. + + Signed-off-by: Yong Tang + +commit 3f6fa8af4522ba9b5ce2e4a52f959970ae4ccb8a +Merge: ef89891855 c3dd6074b0 +Author: Brian Goff +Date: Thu May 26 22:51:17 2016 -0400 + + Merge pull request #22993 from rhatdan/relabel + + Multiple fixes for SELinux labels. + +commit 397a6fefadf9ac91a5c9de2447f4dea607296470 +Author: Yong Tang +Date: Sat Apr 30 19:42:19 2016 -0700 + + Inconsistent --tmpfs behavior + + This fix tries to address the issue raised in #22420. When + `--tmpfs` is specified with `/tmp`, the default value is + `rw,nosuid,nodev,noexec,relatime,size=65536k`. When `--tmpfs` + is specified with `/tmp:rw`, then the value changed to + `rw,nosuid,nodev,noexec,relatime`. + + The reason for such an inconsistency is because docker tries + to add `size=65536k` option only when user provides no option. + + This fix tries to address this issue by always pre-progating + `size=65536k` along with `rw,nosuid,nodev,noexec,relatime`. + If user provides a different value (e.g., `size=8192k`), it + will override the `size=65536k` anyway since the combined + options will be parsed and merged to remove any duplicates. + + Additional test cases have been added to cover the changes + in this fix. + + This fix fixes #22420. + + Signed-off-by: Yong Tang + +commit ce708ea0ee23b5e7a60ee6c71ab0c15f94e9231d +Merge: a47992ce0e f821c4c073 +Author: French Ben +Date: Thu May 26 17:41:57 2016 -0700 + + Merge pull request #503 from docker/kitematic-0.10.4 + + Updated kitematic to 0.10.4 + +commit ee7696312580f14ce7b8fe70e9e4cbdc9f83919f +Author: Sven Dowideit +Date: Fri May 27 00:28:46 2016 +0000 + + Fix up stale links + + Signed-off-by: Sven Dowideit + +commit 739e9ef43b6723ec53e43cca72f8417fcb02ca18 +Author: French Ben +Date: Thu May 26 17:06:20 2016 -0700 + + Added Circle Changes + + Signed-off-by: French Ben + +commit 6458d1f50f19f078cc607c2bb8dd4a08c17b1e04 +Author: Andrew Hsu +Date: Mon May 23 20:51:45 2016 +0000 + + convert docker compose files to v2 + + Signed-off-by: Andrew Hsu + +commit f821c4c073aa1078c5c047e3d960843e01622423 +Author: French Ben +Date: Thu May 26 15:43:31 2016 -0700 + + Updated kitematic to 0.10.4 + + Signed-off-by: French Ben + +commit 7bca08d2bbd036991d118ef62f802bc93ac0517a +Author: French Ben +Date: Thu May 26 15:24:16 2016 -0700 + + Kitematic 0.10.4 + + Signed-off-by: French Ben + +commit bd2c3c0e9703a161a04bdbf1f858e6ed41e0d10e +Merge: d93d8c40b5 a6ecf84fe4 +Author: French Ben +Date: Thu May 26 15:00:51 2016 -0700 + + Merge pull request #1709 from docker/fix-undefined + + Added error output when error is unknown + +commit 81d24e754d48ac8e9f0e4fe02befbf628179da43 +Author: Tonis Tiigi +Date: Thu May 26 14:59:38 2016 -0700 + + Fix directory walker error checking + + Signed-off-by: Tonis Tiigi + +commit ef89891855e132d3d0e4c92fa041f590c8e8198c +Merge: 11ddfa4b2b 989f6f852f +Author: Alexander Morozov +Date: Thu May 26 14:41:22 2016 -0700 + + Merge pull request #22888 from ibuildthecloud/host-compat + + Remove DOCKER_HTTP_HOST_COMPAT env var + +commit 11ddfa4b2b0ad1b08eb602250210a6b9d200cc58 +Merge: 67767dba6c 717209c9ff +Author: Alexander Morozov +Date: Thu May 26 14:39:57 2016 -0700 + + Merge pull request #23009 from Microsoft/WindowsLeakedHandle + + Fix a leaked process handle of the first container to start on Windows + +commit 2989c44576c7a5c3a0074b7f2bf5cc795ca61cc8 +Merge: de2c51d43b 6d7174c323 +Author: Ying Li +Date: Thu May 26 14:37:22 2016 -0700 + + Merge pull request #760 from endophage/update_docker + + updating docker, logrus, viper, cobra, and etcd dependencies + +commit a6ecf84fe48a1e7333794bff297632fe4d119a3d +Author: French Ben +Date: Thu May 26 14:08:51 2016 -0700 + + Added error output when error is unknown + + Signed-off-by: French Ben + +commit de2c51d43b777322b5e84f2b21775bf43a6ec80f +Merge: f4a68a68ed c7fd4d8fd3 +Author: David Lawrence +Date: Thu May 26 14:31:01 2016 -0700 + + Merge pull request #756 from docker/run-rethink-integration-tests + + Run rethink integration tests + +commit 6d7174c3233bda7e430ca0c9a7ff31fad578390e +Author: David Lawrence +Date: Thu May 26 11:19:05 2016 -0700 + + updating docker, logrus and etcd dependencies + Signed-off-by: David Lawrence (github: endophage) + +commit 67767dba6c815764dd7a0cb81b75ba096bf0dd0a +Merge: 8e924153e2 bd2b3d363f +Author: Phil Estes +Date: Thu May 26 16:00:39 2016 -0500 + + Merge pull request #22918 from tonistiigi/image-delete-deadlock + + Release memoryStore locks before filter/apply + +commit 6952135fc8004f669c962c5989fd2e5a05bb2510 +Author: John Howard +Date: Thu May 26 13:24:22 2016 -0700 + + Windows: Default isolation and workdir + + Signed-off-by: John Howard + +commit c46737ed026055411e1249efc96053ee6acfe37a +Author: Harald Albers +Date: Thu May 26 12:44:53 2016 -0700 + + remove command completion for `docker-compose rm --a` + + As `--all|-a` is deprecated, there's no use to suggest it any + more in command completion. + + Signed-off-by: Harald Albers + +commit eaa53c768ae7ed026e8d06252533f9d7ed2b5879 +Merge: 8a29fad06f 069339a30e +Author: Nishant Totla +Date: Thu May 26 10:44:45 2016 -0700 + + Merge pull request #2257 from allencloud/fix-unit-test-command-in-CONTRIBUTION + + fix unit test command in CONTRIBUTION.md + +commit e782541d9913fb9cfb8847b2ae80c3360a4ce214 +Author: Nishant Totla +Date: Thu May 26 10:17:53 2016 -0700 + + Refactoring code around image ref generation + + Signed-off-by: Nishant Totla + +commit 7df13112d216b4d32c92ba288603a0cbcccd9cb7 +Author: Albert Domenech +Date: Sun May 15 13:21:29 2016 +0200 + + Initial debian/ubuntu installer: + + - Used grunt-packager and grunt-electron-installer-debian + + - Added debian/ubuntu ai32 arch support + + - Added Redhat/Centos/Fedora rpm support + + - Added electron-packager to MacOSX custom task + + - Fixed OSX Linux build and better conditional legibility + + Signed-off-by: Albert Domenech + +commit 8e924153e219d040e3aa672df4e0c7baff9f8d8b +Merge: 56359cccbc e8e3dd32c5 +Author: Arnaud Porterie +Date: Thu May 26 10:00:56 2016 -0700 + + Merge pull request #22268 from Microsoft/jjh/continuationescape + + Support platform semantic file paths through ESCAPE + +commit 86b5ed1a84b5046089abcfded8922d6dc7e318a2 +Merge: 4bb80c25d3 c4229b469a +Author: Aanand Prasad +Date: Thu May 26 16:57:43 2016 +0100 + + Merge pull request #3473 from shin-/3461-merge-port-mappings + + Eliminate duplicates when merging port mappings from config files + +commit fea7acf0e9f0532af7451a3c3835a0cfabf4fb20 +Author: Yong Tang +Date: Mon May 9 19:07:04 2016 -0700 + + Un-deprecated command line short variant options of `-c`. + + Since 1.9, the following short variant options have been + deprecated in favor of their long variants: + `docker run -c (--cpu-shares)` + `docker build -c (--cpu-shares)` + `docker create -c (--cpu-shares)` + `docker update -c (--cpu-shares)` + + However, `-c` is still widely used and is considered as + a convenient option for swarm (see #16271). + + This fix undeprecated the command line short + variant options of `-c` and updated the deprecated.md. + + Signed-off-by: Yong Tang + +commit 56359cccbc9634c3cb37b1e9eb53160b6a4ffe38 +Merge: 215324251a 72fefc0441 +Author: Sebastiaan van Stijn +Date: Thu May 26 15:42:42 2016 +0200 + + Merge pull request #22976 from vdemeester/22091-condition-followup + + Invert CgroupDevicesEnabled condition + +commit 215324251aed0df84d0a5a876ccd5a7e537a41a1 +Merge: e901195634 6c5f724560 +Author: Vincent Demeester +Date: Thu May 26 15:37:55 2016 +0200 + + Merge pull request #22999 from deed02392/master + + Update debian.md + +commit 6c5f724560d3e1c47c927fa39056cd32de9f0890 +Author: deed02392 +Date: Wed May 25 22:09:29 2016 +0100 + + Update debian.md + + Updated documents markdown file on Debian installation. + Added details on the fact that backports are necessary on Wheezy as discussed in issue #16878 + + Signed-off-by: George Hafiz + +commit e9011956342ce77a4d1d28f200816d188f804b1e +Merge: 75109b32db e18296f4f0 +Author: Vincent Demeester +Date: Thu May 26 14:05:43 2016 +0200 + + Merge pull request #22474 from allencloud/make-pkg-platform-support-darwin + + add architecture_darwin.go in package docker/pkg/platform to support darwin + +commit f87053b9c387a5a577383c758dc901cb8bf539e2 +Author: Vincent Demeester +Date: Thu May 26 13:14:35 2016 +0200 + + Use dockerd instead of docker daemon in integration-cli + + Updating `integration-cli/daemon.go` to use `dockerd` instead of `docker + daemon` to start up the daemon. + + Signed-off-by: Vincent Demeester + +commit 72fefc0441d57b59f27bebdb144e0e35c0c63a0d +Author: Vincent Demeester +Date: Thu May 26 13:08:53 2016 +0200 + + Invert CgroupDevicesEnabled condition + + It feels better to test where it's required than listing everywhere it + is not required. + + Signed-off-by: Vincent Demeester + +commit 75109b32db4c23f469b57fb99300fc5d4a689dce +Merge: ecdf75dca6 636c276f67 +Author: Sebastiaan van Stijn +Date: Thu May 26 12:34:31 2016 +0200 + + Merge pull request #22861 from vdemeester/daemon-images-search-refactoring + + Daemon images search refactoring + +commit ecdf75dca64eed7cc599b6d8fedf9303ae44d0f4 +Merge: 214ab22582 f198dfd856 +Author: Vincent Demeester +Date: Thu May 26 12:18:00 2016 +0200 + + Merge pull request #22997 from aboch/ports + + Update port info on network connect/disconnect + +commit 214ab225828eda4ccbbf031350a013425985eeac +Merge: 089166ebe2 9ed6e39cdd +Author: Sebastiaan van Stijn +Date: Thu May 26 11:19:10 2016 +0200 + + Merge pull request #22991 from justincormack/seccompchown + + Do not restrict chown via seccomp, just let capabilities control access + +commit 8a29fad06f99836cb4801d526fc9b7fd271e4a07 +Merge: 7e81f14dfc cf005b3e33 +Author: Nishant Totla +Date: Wed May 25 23:08:57 2016 -0700 + + Merge pull request #2282 from nishanttotla/bump-v1.2.3-rc1 + + Bump version to v1.2.3-rc1 + +commit be072a89544300a484970fd95207bdb93c5c7d9e +Author: Daniel Zhang +Date: Fri May 13 10:45:42 2016 +0800 + + Embedded DNS problem after renaming container. Step2:change in docker/daemon side and add integration test + + Signed-off-by: Daniel Zhang + +commit 717209c9ffc5caa4782dfda39e7be9a7b581a42c +Author: Darren Stahl +Date: Wed May 25 21:33:50 2016 -0700 + + Fix a leaked process handle of the first container to start on Windows + + Signed-off-by: Darren Stahl + +commit cf005b3e33fe1d0c28403a16fcf1ad67c24c94f8 +Author: Nishant Totla +Date: Wed May 25 20:21:21 2016 -0700 + + Bump version to v1.2.3-rc1 + + Signed-off-by: Nishant Totla + +commit e18296f4f06595c4becc90bf6db4f3d2b8a625c5 +Author: allencloud +Date: Wed May 4 00:10:21 2016 +0800 + + make package docker/pkg/platform support darwin + + Signed-off-by: allencloud + +commit 05bd04350b8348b3c3bbe3156420257313e4e804 +Author: John Starks +Date: Wed May 25 19:11:51 2016 -0700 + + Support layers from external URLs + + This is used to support downloading Windows base images from Microsoft + servers. + + Signed-off-by: John Starks + +commit 7e81f14dfc8d7ce78d8c7e225450aa5443caf24b +Merge: ff40997d68 89277806cb +Author: Alexandre Beslic +Date: Wed May 25 19:07:38 2016 -0700 + + Merge pull request #2272 from nishanttotla/engine-api-version-bump + + Bumping engine-api version (with RegistryAuth fix) + +commit b7b6115bc3d449abd0073837045c2c8f84dcca5c +Author: Alexei Yuzhakov +Date: Wed May 25 20:36:18 2016 +0600 + + Make checkbox labels clickable at preferences page. + + Signed-off-by: Alexei Yuzhakov + +commit 89277806cb4d3f82fb79424c3143fa82066484fa +Author: Nishant Totla +Date: Wed May 25 17:35:28 2016 -0700 + + Fixing RegistryAuth for image pulls + + Signed-off-by: Nishant Totla + +commit 089166ebe29c1801483965b0e30b41fda53b1ec2 +Merge: e010610828 6508c015fe +Author: Alexander Morozov +Date: Wed May 25 17:40:56 2016 -0700 + + Merge pull request #23000 from jstarks/use_image_version_for_console_check + + Windows: Use image version, not OS version for TTY fixup + +commit f198dfd856ca6125ef50b11d9d698550d66c9d4e +Author: Alessandro Boch +Date: Wed May 25 13:47:38 2016 -0700 + + Update port info on network connect/disconnect + + Signed-off-by: Alessandro Boch + +commit 46ba8763bef774555c12990336ddf0ca97fec69d +Author: Nishant Totla +Date: Wed May 25 16:03:57 2016 -0700 + + Updating unit tests for updated engine-api + + Signed-off-by: Nishant Totla + +commit e010610828456fcb9ccce46723894c4dff238daf +Merge: 8863d6dc5f 486a1a03d8 +Author: Alexander Morozov +Date: Wed May 25 16:50:06 2016 -0700 + + Merge pull request #22951 from Microsoft/jjh/ise2 + + Windows: run -it not crash in PowerShell ISE + +commit f4a68a68ed30f9a64cb34e5e00a8392183d50374 +Merge: 6b743aab30 0abb4a9490 +Author: Ying Li +Date: Wed May 25 16:15:12 2016 -0700 + + Merge pull request #757 from endophage/update_distribution + + update distribution dependency + +commit c7fd4d8fd38f175d56023c52909343dc45e9ea51 +Author: Ying Li +Date: Mon May 16 21:00:54 2016 -0700 + + Try a simplified CircleCI with just Docker commands. + + Signed-off-by: Ying Li + +commit 0abb4a94908f640ec13ffa4a43ca8ee046a21ff3 +Author: David Lawrence +Date: Wed May 25 10:43:37 2016 -0700 + + update distribution dependency + Signed-off-by: David Lawrence (github: endophage) + +commit 82f1bfe0ecd7b4a34958ffa65c50be90281c1194 +Author: Nishant Totla +Date: Tue May 24 16:57:44 2016 -0700 + + Changing relevant function calls for updated engine-api + + Signed-off-by: Nishant Totla + +commit 8863d6dc5fdfaf1db5930b644eb5c271dd5a162a +Merge: 64c444b109 7711c842be +Author: Sebastiaan van Stijn +Date: Wed May 25 23:59:31 2016 +0200 + + Merge pull request #23001 from Djelibeybi/fix-oracle-docs + + Fix URLs for official Oracle installation guide. + +commit 7711c842be52cd753c13a50594da301f2158ddae +Author: Avi Miller +Date: Thu May 26 07:38:58 2016 +1000 + + Fix URLs for official Oracle installation guide. + + Signed-off-by: Avi Miller + +commit 64c444b109821fc0c6af139828140df0265729e8 +Merge: ff3dc48966 3d782cdbff +Author: Sebastiaan van Stijn +Date: Wed May 25 23:23:48 2016 +0200 + + Merge pull request #22996 from thaJeztah/update-hub-pricing-link + + update link to hub plans + +commit 596ca8b86acd3feebedae6bc08abf2a48d403a14 +Merge: 7f5c6dd882 166c4a957f +Author: Richard Scothern +Date: Wed May 25 14:08:09 2016 -0700 + + Merge pull request #1744 from tonyhb/add-config-to-middleware + + Pass in `app` as context to apply{N}Middleware + +commit 3d782cdbffd4b8bddbc8f63e3a0b762224a5d3c3 +Author: Sebastiaan van Stijn +Date: Wed May 25 23:01:13 2016 +0200 + + update link to hub plans + + Signed-off-by: Sebastiaan van Stijn + +commit ff3dc489668ca634e48f4e0a971bfd23e80699ff +Merge: d9db8960fd 541fba13fc +Author: Brian Goff +Date: Wed May 25 16:45:48 2016 -0400 + + Merge pull request #22956 from Microsoft/jjh/nonttylogin + + Fix bad error doing docker login in from non TTY + +commit d9db8960fda02769264ce0b553adf2b427c1c48a +Merge: dca92044be fb48bf518b +Author: Alexander Morozov +Date: Wed May 25 13:42:07 2016 -0700 + + Merge pull request #22949 from vdemeester/move-daemon-container-horn + + Move some container related methods and structs to smaller files + +commit f7541b00b0f68a52195ed9bac967f8f08d96aa51 +Author: John Howard +Date: Wed May 25 10:19:17 2016 -0700 + + Better error on attach no tty + + Signed-off-by: John Howard + +commit c3dd6074b0f07cd7e57d677cc06b4c57a302a02f +Author: Dan Walsh +Date: Wed May 25 15:59:55 2016 -0400 + + Multiple fixes for SELinux labels. + + SELinux labeling should be disabled when using --privileged mode + + /etc/hosts, /etc/resolv.conf, /etc/hostname should not be relabeled if they + are volume mounted into the container. + + Signed-off-by: Dan Walsh + + Signed-off-by: Dan Walsh + +commit dca92044beaada248c4bab07c1bb9d38be1cf5aa +Merge: 4746864c2b c1ad02ccc8 +Author: Michael Crosby +Date: Wed May 25 13:08:00 2016 -0700 + + Merge pull request #22985 from samuelkarp/awslogs-logging-driver + + awslogs: Fix a race in mockcwlogsclient + +commit 9ed6e39cdd7acf488d5ff2a6876793837687e4cf +Author: Justin Cormack +Date: Wed May 25 12:49:30 2016 -0700 + + Do not restrict chown via seccomp, just let capabilities control access + + In #22554 I aligned seccomp and capabilities, however the case of + the chown calls and CAP_CHOWN was less clearcut, as these are + simple calls that the capabilities will block if they are not + allowed. They are needed when no new privileges is not set in + order to allow docker to call chown before the container is + started, so there was a workaround but this did not include + all the chown syscalls, and Arm was failing on some seccomp + tests because it was using a different syscall from just the + fchown that was allowed in this case. It is simpler to just + allow all the chown calls in the default seccomp profile and + let the capabilities subsystem block them. + + Signed-off-by: Justin Cormack + +commit 7f5c6dd882d60c7deef6c54045fdb3925716bcb3 +Merge: 0bd7e971b0 3207e0c112 +Author: Richard Scothern +Date: Wed May 25 12:48:01 2016 -0700 + + Merge pull request #1748 from dmcgowan/fix-expires-in-documentation + + Update auth documentation examples to show "expires in" as int + +commit 6508c015fe764fd59438cabffcbc6102c9cf04ef +Author: John Starks +Date: Wed May 25 12:15:34 2016 -0700 + + Windows: Use image version, not OS version for TTY fixup + + A previous change added a TTY fixup for stdin on older Windows versions to + work around a Windows issue with backspace/delete behavior. This change + used the OS version to determine whether to activate the behavior. + However, the Windows bug is actually in the image, not the OS, so it + should have used the image's OS version. + + This ensures that a Server TP5 container running on Windows 10 will have + reasonable console behavior. + + Signed-off-by: John Starks + +commit 4746864c2b405bcb2526df20d572b9de9df7f3b1 +Merge: bb80563a81 ad538f6465 +Author: Sebastiaan van Stijn +Date: Wed May 25 21:03:59 2016 +0200 + + Merge pull request #22986 from SvenDowideit/add-make-test + + Add make test and other small cleanups + +commit bb80563a8123824bed23c36698e6fa01317bbe5f +Merge: a5e4aaaf71 b2643b6953 +Author: Sebastiaan van Stijn +Date: Wed May 25 20:56:54 2016 +0200 + + Merge pull request #22987 from Microsoft/jjh/labeldocs + + Docs: Label clarification + +commit c1ad02ccc8791b3c517aa37223d27792863cbf17 +Author: Samuel Karp +Date: Wed May 25 11:50:22 2016 -0700 + + awslogs: Fix a race in mockcwlogsclient + + Signed-off-by: Samuel Karp + +commit a5e4aaaf71cad9e4f57b50d92297d74c515b6c6d +Merge: 0fe4417a3b a7bf4e4832 +Author: Sebastiaan van Stijn +Date: Wed May 25 20:48:39 2016 +0200 + + Merge pull request #22661 from SvenDowideit/update-compatibility-matrix + + docs: update graphdriver compatibility matrix + +commit b2643b6953e59549eba8af51a7e783a3e4cebc46 +Author: John Howard +Date: Wed May 25 11:48:07 2016 -0700 + + Docs: Label clarification + + Signed-off-by: John Howard + +commit 3207e0c1123a808d936a5de4a3df36a8e62fefc7 +Author: Derek McGowan +Date: Wed May 25 11:43:36 2016 -0700 + + Update auth documentation examples to show "expires in" as int + + Go will fail to parse the examples since an int is expected rather than a string for the "expires in" value + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit a7bf4e4832c216bdbc9fc678262bcd2c081e914b +Author: Sven Dowideit +Date: Thu May 12 08:06:41 2016 +1000 + + docs: update graphdriver compatibility matrix + + Signed-off-by: Sven Dowideit + +commit ad538f6465776281550a7e40b59d5eb6f706b777 +Author: Sven Dowideit +Date: Wed May 25 18:30:01 2016 +0000 + + Add make test and other small cleanups + + Signed-off-by: Sven Dowideit + +commit 0fe4417a3b2c18714303f319224b74ec08674115 +Merge: 60abc96acf 750e16f57c +Author: Sebastiaan van Stijn +Date: Wed May 25 20:15:23 2016 +0200 + + Merge pull request #22908 from vdemeester/7967-since-before-image-filters + + Add before and since filter to images + +commit 60abc96acfeae1985f4f0e9e9b44376b75a235f0 +Merge: 004ce6b571 0fb6190243 +Author: David Calavera +Date: Wed May 25 09:53:53 2016 -0700 + + Merge pull request #22943 from vdemeester/21769-fix-detach-keys + + Fix escape-keys by preserving input if invalid + +commit 004ce6b57124c1a99348e1447ac9e00a970d1b34 +Merge: c7ee503082 94d0571304 +Author: Vincent Demeester +Date: Wed May 25 18:51:47 2016 +0200 + + Merge pull request #22916 from duglin/FixNetTest + + Fix flaky TestApiStatsNetworkStats test + +commit 486a1a03d86a679740d79c2ef5e2a9574342f8c3 +Author: John Howard +Date: Tue May 24 13:03:13 2016 -0700 + + Windows: run -it not crash in ISE + + Signed-off-by: John Howard + +commit 541fba13fcbef5e082e3ce08a14901edce4697b6 +Author: John Howard +Date: Tue May 24 16:38:54 2016 -0700 + + Error login from non TTY + + Signed-off-by: John Howard + +commit c7ee50308290d56b70933dfd83bd70e3a9df93d5 +Merge: 8c70ab803c 959c1a52bf +Author: John Howard +Date: Wed May 25 09:25:22 2016 -0700 + + Merge pull request #22958 from Microsoft/hcs_rpc + + Windows: Use the new HCS RPC API + +commit 8c70ab803c49816de8124703db6635e9c5c7ce25 +Merge: 53e2deb159 257494bd0a +Author: Sebastiaan van Stijn +Date: Wed May 25 17:54:39 2016 +0200 + + Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory + + Windows: Fix TestRunWorkingDirectory + +commit 53e2deb1590c8d0b6bf7c700c630dc432ea772d4 +Merge: 4d376e9cc2 d0d828e292 +Author: Brian Goff +Date: Wed May 25 11:35:23 2016 -0400 + + Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace + + Fix a race in pkg/integration.TestChannelBufferTimeout + +commit 4d376e9cc265c098c7faf03d0e75c1164cbf24e0 +Merge: a41e823c1b 75385dc216 +Author: Sebastiaan van Stijn +Date: Wed May 25 17:20:16 2016 +0200 + + Merge pull request #22960 from justincormack/seccompdefnotarm + + Do not run the seccomp tests that use default.json on non x86 architectures + +commit a41e823c1bcbaafca1081dd23a7af3fa25ac946f +Merge: cef4ea0b97 ab533f0651 +Author: Brian Goff +Date: Wed May 25 11:09:51 2016 -0400 + + Merge pull request #22969 from AkihiroSuda/fix22963LogRace + + Fix a race in daemon/logger.TestCopier + +commit cef4ea0b9759386800aae27d6fa92c80d4465745 +Merge: 5bd6067b85 1f8fbbc0d8 +Author: Brian Goff +Date: Wed May 25 10:58:31 2016 -0400 + + Merge pull request #22966 from AkihiroSuda/fix22964MemRace + + Fix a race in pkg/discovery/memory + +commit 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9 +Merge: 2a4b4a8133 0b8ea4387a +Author: Vincent Demeester +Date: Wed May 25 16:40:52 2016 +0200 + + Merge pull request #22968 from mbentley/fix-dm-docs + + Fixed lost thin pool devicemapper docs + +commit 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9 +Author: Matt Bentley +Date: Wed May 25 08:46:39 2016 -0400 + + Re-apply changes made in 24ec73f + + Signed-off-by: Matt Bentley + +commit 79205c3f061c4b690a459cb2b08b6a7df7af327c +Author: Matt Bentley +Date: Wed May 25 08:45:51 2016 -0400 + + Fix thin pool devicemapper docs overwritten + + Signed-off-by: Matt Bentley + +commit 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75 +Author: Vincent Demeester +Date: Wed May 25 13:49:10 2016 +0200 + + Add before and since filter to images + + Add support for two now filter on the `images` command : `before` and + `since`. They work the same as the one on the `ps` command but for + images. + + $ docker images --filter before=myimage + # display all images older than myimage + $ docker images --filter since=myimage + # display all images younger than myimage + + Signed-off-by: Vincent Demeester + +commit 2a4b4a813342294a6191425caba471a94c8a39f6 +Merge: cd159fba85 59bb86a964 +Author: Vincent Demeester +Date: Wed May 25 12:21:08 2016 +0200 + + Merge pull request #22962 from normalfaults/b + + fixed spelling error in windows.go + +commit fa82c0aa10cfac8c6d5e2446876dc79b2b0c1bf9 +Author: John Starks +Date: Fri May 20 10:38:31 2016 -0700 + + Windows: work around Go 1.6.2/Nano Server TP5 issue + + This works around golang/go#15286 by explicitly loading shell32.dll at + load time, ensuring that syscall can load it dynamically during process + startup. + + Signed-off-by: John Starks + Signed-off-by: Antonio Murdaca + +commit f32ccb080ac382a386cbe33ed1d11048474206c5 +Author: Stefan Scherer +Date: Sat May 21 17:42:31 2016 +0200 + + Update golang 1.6.2 for ARM + + Signed-off-by: Antonio Murdaca + +commit 40b21745cc14628fc5336fbacddf092667a70c65 +Author: Antonio Murdaca +Date: Thu May 19 21:13:35 2016 +0200 + + Upgrade to golang 1.6.2 + + Signed-off-by: Antonio Murdaca + +commit cd159fba8529efe70ea634842a024560dbfd3aec +Merge: 5383824e08 7832e2ae82 +Author: Sebastiaan van Stijn +Date: Wed May 25 10:19:41 2016 +0200 + + Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix + + Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon + +commit 5383824e08a58aa83c6ac018706569345fa9e3ea +Merge: 522698dd43 c49d327406 +Author: Lei Jitang +Date: Wed May 25 16:05:04 2016 +0800 + + Merge pull request #22974 from albers/completion-ps-filters + + bash completion for `docker ps -f {before,since}` + +commit 522698dd43e1f55b3df8a83b6b11f107a519ab84 +Merge: 9f5a2c6e33 27afaf3774 +Author: Vincent Demeester +Date: Wed May 25 09:55:10 2016 +0200 + + Merge pull request #22967 from srinsriv/master + + Update dind + +commit c49d3274067055dc830d97f1490a84aa73e403e6 +Author: Harald Albers +Date: Wed May 25 09:35:33 2016 +0200 + + bash completion for `docker ps -f {before,since}` + + Signed-off-by: Harald Albers + +commit 9f5a2c6e33bf30479f172bbc297bed7316f01855 +Merge: 29dbcbad87 90bd41a74d +Author: Vincent Demeester +Date: Wed May 25 09:11:26 2016 +0200 + + Merge pull request #22408 from yongtang/21976-allow-dns-and-net-host + + The option --dns and --net=host should not be mutually exclusive. + +commit d0d828e292733fa1d5e2d09d7f184be69129e757 +Author: Akihiro Suda +Date: Wed May 25 06:21:26 2016 +0000 + + Fix a race in pkg/integration.TestChannelBufferTimeout + + Update #22965 + + Signed-off-by: Akihiro Suda + +commit ab533f06510a14a023c056604f9520741073acd3 +Author: Akihiro Suda +Date: Wed May 25 04:19:01 2016 +0000 + + Fix a race in daemon/logger.TestCopier + + Update #22963 + + Signed-off-by: Akihiro Suda + +commit 1f8fbbc0d830ad9a887d04a25152ea344688903b +Author: Akihiro Suda +Date: Wed May 25 02:52:35 2016 +0000 + + Fix a race in pkg/discovery/memory + + Fix #22964 + + Signed-off-by: Akihiro Suda + +commit 27afaf3774d7f46028ab72192d4c1b65f8d88b87 +Author: srinsriv +Date: Tue May 24 20:38:28 2016 -0700 + + Update dind + + Typo + + Signed-off-by: Srinivasan Srivatsan + +commit 90bd41a74d57080711678bffa2bc4371020ee3a5 +Author: Yong Tang +Date: Tue May 24 18:49:11 2016 -0700 + + The option --add-host and --net=host should not be mutually exclusive. + + This fix tries to address the issue raised in #21976 and allows + the options of `--add-host` and `--net=host` to work at the same time. + + The documentation has been updated and additional tests have been + added to cover this change. + + This fix fixes #21976. + + Signed-off-by: Yong Tang + +commit 59bb86a964c38d0f2cc724c686803472bb48968b +Merge: f91acbaee4 29dbcbad87 +Author: Nirmal Mehta +Date: Tue May 24 21:43:45 2016 -0400 + + Merge branch 'master' into b + +commit f91acbaee452191f406d31e3f3fd44210aa17fbf +Author: Nirmal Mehta +Date: Tue May 24 21:43:22 2016 -0400 + + fixed spelling error in docker cli run test + + Signed-off-by: Nirmal Mehta + +commit 36a9151b27168076073770142d0b354f0e83fdb2 +Author: Nirmal Mehta +Date: Tue May 24 21:40:08 2016 -0400 + + fixed spelling error in windows.go + + Signed-off-by: Nirmal Mehta + +commit effa539600dffcb388199588f0c845f5352c9a4b +Author: Ying Li +Date: Tue May 24 17:50:22 2016 -0700 + + Run rethink tests on another container + + Signed-off-by: Ying Li + +commit 75385dc216e784d24535326376352de03eaeb059 +Author: Justin Cormack +Date: Tue May 24 17:47:30 2016 -0700 + + Do not run the seccomp tests that use default.json on non x86 architectures + + The generated profile that we check in is for amd64 and i386 architectures + and does not work correctly on arm as it is missing required syscalls, + and also specifies the architectures that are supported. It works on + ppc64le at the moment but better to skip the test as it is likely to + break in future. + + Signed-off-by: Justin Cormack + +commit 3a20b4d10be2218f9020a95f9a23d3fb1ec740b4 +Author: Ying Li +Date: Tue May 24 10:07:09 2016 -0700 + + Bump docker version in CircleCI so we can run rethink integration tests + + Signed-off-by: Ying Li + +commit 4ca754a1e88dea596094ebb9aa3d45eb5f385325 +Author: Ying Li +Date: Wed May 18 06:18:47 2016 -0500 + + Rethink requires that each subsequent replica join another existant replica. + Fix the compose file so that 2 and 3 join 1, otherwise the servers didn't + actually seem to be clustered. + + Signed-off-by: Ying Li + +commit d93d8c40b5c44ba35d4931a5eeb648ff938e92cd +Merge: 2650894bf0 8bd9ee63f4 +Author: French Ben +Date: Tue May 24 16:45:38 2016 -0700 + + Merge pull request #1701 from sibprogrammer/ip-mapping-links + + Fix ability to click on link on port mapping page (fix #1700). + +commit 959c1a52bf11dd6b3e65f10bbaa867bfabba6838 +Author: Darren Stahl +Date: Mon May 23 16:12:06 2016 -0700 + + Change Docker to use the new HCS RPC API + + Signed-off-by: Darren Stahl + +commit 8fd494ba581547047fd8055bfa3a464651cfbd53 +Author: Nishant Totla +Date: Tue May 24 16:27:10 2016 -0700 + + Updating mock and nop clients for updated engine-api + + Signed-off-by: Nishant Totla + +commit 23821fe5867427fa36c265bc994b1a2c3cf9b21f +Author: Yong Tang +Date: Thu Apr 28 22:46:57 2016 -0700 + + The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive. + + This fix tries to address the issue raised in #21976 and allows + the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host` + to work at the same time. + + The documentation has been updated and additional tests have been + added to cover this change. + + This fix fixes #21976. + + Signed-off-by: Yong Tang + +commit 257494bd0a017cad264609f1a77b9af3ab7f991c +Author: John Howard +Date: Tue May 24 15:13:06 2016 -0700 + + Windows: Fix TestRunWorkingDirectory + + Signed-off-by: John Howard + +commit 6b743aab304fa07729fa1bfa0d191f9372de3a02 +Merge: 2da7f31a68 717ac691ad +Author: David Lawrence +Date: Tue May 24 15:00:45 2016 -0700 + + Merge pull request #746 from docker/get-target-info + + Get all Target and Role data for a given target name + +commit 29dbcbad878483d9239d6a432c85620aced895c4 +Merge: bdc06cf8f8 8fc825364a +Author: Brian Goff +Date: Tue May 24 17:31:43 2016 -0400 + + Merge pull request #22925 from jstarks/fix_integration_test + + pkg/integration: Port tests to Windows + +commit 7832e2ae82ae56e9719c6930b054f643285a79b3 +Author: Christopher Jones +Date: Tue May 24 16:28:06 2016 -0400 + + Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon + + Fixes the test by loading in the architecture specific busybox + image when the test daemon starts. + + Signed-off-by: Christopher Jones + +commit 4bb80c25d3c6ddd86163d15ec71abc57d3e74a4c +Merge: 048360d1ed a34cd5ed54 +Author: Joffrey F +Date: Tue May 24 13:29:22 2016 -0700 + + Merge pull request #3483 from aanand/env-disambiguation + + Add "disambiguation" page for environment variables + +commit bdc06cf8f8f4868186e3a843482afed48361cc09 +Merge: 0802401d22 a83cedddc6 +Author: Phil Estes +Date: Tue May 24 16:08:50 2016 -0400 + + Merge pull request #22922 from justincormack/ppc64le-seccomp + + Enable seccomp on ppc64le + +commit 0802401d22790ec85a620ac1c1ee41f81025c4a8 +Merge: 86a7632d63 5cc0824730 +Author: Michael Crosby +Date: Tue May 24 13:08:06 2016 -0700 + + Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted + + Remove unused mounted function in overlay + +commit 86a7632d63bdddb95aaf1472648056a4fb737d38 +Merge: 48a53d2e8c 86d8758e2b +Author: Vincent Demeester +Date: Tue May 24 21:41:36 2016 +0200 + + Merge pull request #22091 from amitkris/build_solaris + + Get the Docker Engine to build clean on Solaris + +commit fb48bf518bfc200ee9a230a7bedaf640df4e5dae +Author: Vincent Demeester +Date: Tue May 24 17:49:26 2016 +0200 + + Move some container related methods and structs to smaller files + + Signed-off-by: Vincent Demeester + +commit 8fc825364ac60848d4278c00429838c3f28f2cd7 +Author: John Starks +Date: Mon May 23 11:15:29 2016 -0700 + + pkg/integration: Port tests to Windows + + Signed-off-by: John Starks + +commit 16ba330a4622d03ae2816536c157e0f3541a602b +Author: Sebastiaan van Stijn +Date: Tue May 24 20:31:10 2016 +0200 + + Update engine maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit 48a53d2e8c4db73c85c90c748d2f323ab458e8b9 +Merge: 38217d4353 e427e4b108 +Author: Sebastiaan van Stijn +Date: Tue May 24 20:23:52 2016 +0200 + + Merge pull request #22935 from thaJeztah/add-justin-to-maintainers + + Add Justin Cormack to maintainers + +commit 0bd7e971b05ee16641dce6e37ec0aafae7b2eeea +Merge: b9d6c7c9fb 588692f6c4 +Author: Derek McGowan +Date: Tue May 24 11:09:10 2016 -0700 + + Merge pull request #1743 from RichardScothern/tcp-bug + + Correct yaml key names in configuration + +commit 166c4a957fc1f07f14992246cbcb627e976bc74f +Author: Tony Holdstock-Brown +Date: Tue May 24 11:07:55 2016 -0700 + + Pass in `app` as context to apply{N}Middleware + + This lets us access registry config within middleware for additional + configuration of whatever it is that you're overriding. + + Signed-off-by: Tony Holdstock-Brown + +commit b9d6c7c9fbd8b2db7902f0bab1f882565f848565 +Merge: 32e9779faf 79d6008a54 +Author: Richard Scothern +Date: Tue May 24 11:04:31 2016 -0700 + + Merge pull request #1741 from leonhartX/master + + fix broken markdown + +commit 5cc082473068b00dee123f8388a79d7a48842a57 +Author: Derek McGowan +Date: Tue May 24 11:02:07 2016 -0700 + + Remove unused mounted function in overlay + + The mount check is now done by the FSChecker. This function is no longer needed and shouldn't be called. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 588692f6c4037616518a5d61be19600627e2a610 +Author: Richard Scothern +Date: Tue May 24 10:42:29 2016 -0700 + + Correct yaml key names in configuration + + Signed-off-by: Richard Scothern + +commit 32e9779faf5594ad8a20c218c7d00a4fef95a8c9 +Merge: 5bbf654999 f97eca5ad6 +Author: Richard Scothern +Date: Tue May 24 10:34:36 2016 -0700 + + Merge pull request #1734 from legionus/blob-access-controller + + Add support for blobAccessController middleware + +commit 38217d43531c721da952a9de2a89b08397f7c029 +Merge: f0d6fd93a2 a8d013495c +Author: Alexander Morozov +Date: Tue May 24 10:33:34 2016 -0700 + + Merge pull request #22932 from chenchun/fix_build + + Fix building image error if bridge network is disabled + +commit a3f9817fb6917076a925437f61e4657071d9389a +Author: Alexandre Beslic +Date: Tue May 24 10:30:56 2016 -0700 + + integration: increase retry for leader election store failure test + + Signed-off-by: Alexandre Beslic + +commit f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7 +Merge: f10a222de1 f53902aa77 +Author: Vincent Demeester +Date: Tue May 24 18:21:52 2016 +0200 + + Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md + + Fix incorrectly named "ip-mask" and "api-cors-headers" options + +commit f10a222de1cc756bb14d157b778d820fac3561aa +Merge: 7faa2a40bc 1670914b8a +Author: Sebastiaan van Stijn +Date: Tue May 24 18:13:44 2016 +0200 + + Merge pull request #22941 from AkihiroSuda/fix22940 + + Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack + +commit 8bd9ee63f444721a9aea01eaf93f117a4ae1ef73 +Author: Alexei Yuzhakov +Date: Tue May 24 22:13:31 2016 +0600 + + Fix ability to click on link on port mapping page (fix #1700). + + Signed-off-by: Alexei Yuzhakov + +commit 7faa2a40bcfc2c8600a6895d09235081730d6f46 +Merge: 1dc87a6f9f 4fa0eccd10 +Author: Sebastiaan van Stijn +Date: Tue May 24 18:06:52 2016 +0200 + + Merge pull request #22264 from aaronlehmann/updated-image-spec + + Update image specification for content-addressability changes + +commit 1dc87a6f9fb1a28613f4937267055fad37893d03 +Merge: ce07eac570 cc6a1b8bb3 +Author: Vincent Demeester +Date: Tue May 24 17:30:18 2016 +0200 + + Merge pull request #22945 from albers/completion-daemon-events + + bash completion for daemon events + +commit 1ffa76bbafb3fdd2b382db5887017a7a9754c725 +Author: Alexei Yuzhakov +Date: Tue May 24 21:26:49 2016 +0600 + + Better way to control checkboxes using labels. + + Signed-off-by: Alexei Yuzhakov + +commit cc6a1b8bb3849f2ead3f89fc18a573034e1386f1 +Author: Harald Albers +Date: Tue May 24 17:19:03 2016 +0200 + + bash completion for daemon events + + Signed-off-by: Harald Albers + +commit 0fb6190243d6101f96283e487cd4911142a05483 +Author: Vincent Demeester +Date: Tue May 24 17:14:48 2016 +0200 + + Fix escape-keys by preserving input if invalid + + Currently, using a custom detach key with an invalid sequence, eats a + part of the sequence, making it weird and difficult to enter some key + sequence. + + This fixes by keeping the input read when trying to see if it's the key + sequence or not, and "writing" then is the key sequence is not the right + one, preserving the initial input. + + Signed-off-by: Vincent Demeester + +commit 2f81b21ab51ac76387b9a8c5f53c6e7de624a47d +Merge: 91866df830 7a97998029 +Author: Sebastiaan van Stijn +Date: Tue May 24 15:56:16 2016 +0200 + + Merge pull request #67 from thaJeztah/update-swarm-maintainers + + Update Swarm maintainers + +commit 91866df8309eda8e77b8f5943269edd9a0087f2d +Merge: c3733b4643 4364231312 +Author: Sebastiaan van Stijn +Date: Tue May 24 15:54:58 2016 +0200 + + Merge pull request #65 from normalfaults/doc-fix + + fixed escape of bullet item so code block renders properly + +commit 7a9799802958ea388d40fc4b53858967cac084c3 +Author: Sebastiaan van Stijn +Date: Tue May 24 15:51:48 2016 +0200 + + Update Swarm maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit ce07eac570e90ed8aa69472bae463902c075e078 +Merge: 6a385a0022 fd7d99ed28 +Author: Vincent Demeester +Date: Tue May 24 15:33:27 2016 +0200 + + Merge pull request #22906 from nshalman/patch-1 + + Clarification about 'docker build --build-arg' + +commit fd7d99ed283bea260fa5e674ee8200038196fdac +Author: Nahum Shalman +Date: Mon May 23 10:01:59 2016 -0400 + + Clarification about 'docker build --build-arg' + + See #22860 + + Signed-off-by: Nahum Shalman + +commit 6a385a00226dc7d8a35406ae284bb6731444d524 +Merge: d76d38c7d0 cb1635c9cf +Author: Vincent Demeester +Date: Tue May 24 14:06:02 2016 +0200 + + Merge pull request #22900 from AkihiroSuda/fix22020 + + update docs/reference/commandline/cp.md + +commit 2aee081cad72352f8b0c37ba0414ebc925b022e8 +Author: Ilya Dmitrichenko +Date: Wed May 18 11:53:30 2016 +0100 + + Remove MountFlags in systemd unit to allow shared mount propagation + + Signed-off-by: Ilya Dmitrichenko + +commit 1670914b8a56ab8e6ead38739fddb416b61e444f +Author: Akihiro Suda +Date: Tue May 24 11:28:50 2016 +0000 + + Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack + + Fix #22940 + + Signed-off-by: Akihiro Suda + +commit cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6 +Author: Akihiro Suda +Date: Mon May 23 09:10:14 2016 +0000 + + update docs/reference/commandline/cp.md + + Close #22020 + + Signed-off-by: Akihiro Suda + +commit e427e4b108e9219316a56f72219a6fee93088da0 +Author: Sebastiaan van Stijn +Date: Tue May 24 00:51:19 2016 +0200 + + Add Justin Cormack to maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit 636c276f67b3cd96a95dec2f6cfc419b7f219892 +Author: Vincent Demeester +Date: Sat May 21 16:00:28 2016 +0200 + + Add Unit test to daemon.SearchRegistryForImages… + + … and refactor a little bit some daemon on the way. + + - Move `SearchRegistryForImages` to a new file (`daemon/search.go`) as + `daemon.go` is getting pretty big. + - `registry.Service` is now an interface (allowing us to decouple it a + little bit and thus unit test easily). + - Add some unit test for `SearchRegistryForImages`. + - Use UniqueExactMatch for search filters + - And use empty restore id for now in client.ContainerStart. + + Signed-off-by: Vincent Demeester + +commit d76d38c7d028754c48f842e4631c2d897e63198d +Merge: bf7bae9662 62014aaf9a +Author: Vincent Demeester +Date: Tue May 24 11:05:39 2016 +0200 + + Merge pull request #22590 from yongtang/22463-docker-daemon-events + + Emit events for docker daemon + +commit 5812b6927c6e63a339f11276f9ab42c39dc517ca +Author: Vincent Demeester +Date: Fri May 20 19:07:44 2016 +0200 + + Vendor engine-api updates + + Adds UniqueExactMatch method to filters along other changes. + + Signed-off-by: Vincent Demeester + +commit a8d013495c479cdc18fa7751413ef67334f37ee6 +Author: Chun Chen +Date: Tue May 24 16:13:54 2016 +0800 + + Fix building image error if bridge network is disabled + + Signed-off-by: Chun Chen + +commit 79d6008a54ccaac7f0e75c223c9ee592c412e7fd +Author: Ke Xu +Date: Tue May 24 16:33:30 2016 +0900 + + fix broken markdown + + Signed-off-by: Ke Xu + +commit ff40997d6840aed7e8d111ba6a6fb66c98f3fa60 +Merge: df77cf3674 9730e04896 +Author: Alexandre Beslic +Date: Tue May 24 00:06:17 2016 -0700 + + Merge pull request #2242 from dongluochen/add_maintainer_allensun + + Add Allen Sun to MAINTAINERS file + +commit bf7bae9662a2de9cdb689ac813c503fe1157d6da +Merge: d7dfe9103b 5271a69411 +Author: Vincent Demeester +Date: Tue May 24 08:38:40 2016 +0200 + + Merge pull request #22928 from friism/patch-3 + + remove duplicated text + +commit d7dfe9103bfc275494d936a5d89f3067b0aedbc9 +Merge: a5aba7752a 8bb4d31b10 +Author: Alexander Morozov +Date: Mon May 23 22:57:23 2016 -0700 + + Merge pull request #22541 from crosbymichael/graph-restore + + Implement graph driver restore on reboot + +commit a83cedddc6d3e0fe1df352ec54245090df641ab8 +Author: Justin Cormack +Date: Mon May 23 15:19:19 2016 -0700 + + Enable seccomp on ppc64le + + In order to do this, allow the socketcall syscall in the default + seccomp profile. This is a multiplexing syscall for the socket + operations, which is becoming obsolete gradually, but it is used + in some architectures. libseccomp has special handling for it for + x86 where it is common, so we did not need it in the profile, + but does not have any handling for ppc64le. It turns out that the + Debian images we use for tests do use the socketcall, while the + newer images such as Ubuntu 16.04 do not. Enabling this does no + harm as we allow all the socket operations anyway, and we allow + the similar ipc call for similar reasons already. + + Signed-off-by: Justin Cormack + +commit a5aba7752a9716cde55e94705048407bed17374f +Merge: 9bc6c4ef80 3598f2e331 +Author: Tõnis Tiigi +Date: Mon May 23 22:28:24 2016 -0700 + + Merge pull request #22926 from justincormack/seccomp-test + + Fix error channel size in seccomp test + +commit 5271a69411e93a2b694c84f7f8216f0d91404e07 +Author: Michael Friis +Date: Mon May 23 18:58:27 2016 -0700 + + remove duplicated text + + Signed-off-by: Michael Friis + +commit 62014aaf9abeb4256cb66e7ae06bfdf5a77d1140 +Author: Yong Tang +Date: Sun May 8 16:15:33 2016 -0700 + + Add filter for events emitted by docker daemon + + This fix tries to cover the issue raised in #22463 by adding + filter for events emitted by docker daemon so that user could + utilize filter to receive events of interest. + + Documentations have been updated for this fix. + + Additional tests have been added to cover the changes in this fix. + + This fix fixes #22463. + + Signed-off-by: Yong Tang + +commit 382c152a73dfa1d771334ffbe79759c5c3596144 +Author: Yong Tang +Date: Sun May 8 16:11:34 2016 -0700 + + Emit events for docker daemon + + This fix tries to cover the issue raised in #22463 by emitting + events for docker daemon so that user could be notified by + scenarios like config reload, etc. + + This fix adds the `daemon reload`, and events for docker daemon. + + Additional tests have been added to cover the changes in this fix. + + This fix fixes #22463. + + Signed-off-by: Yong Tang + +commit 94d057130461b3b56957b2755da9dae00a937e81 +Author: Doug Davis +Date: Mon May 23 11:20:41 2016 -0700 + + Fix flaky TestApiStatsNetworkStats test + + It appears that on some systems apparmor gets in the way of libc.so.6 + shared library being loaded - which means the ping fails. + + To get around this if we run ping under `/lib64/ld-linux-x86-64.so.2` + then it works. So we only do this for linux and only if the first attempt + fails. If this 2nd attempt fails then we'll show the original error to + the user for debugging. + + Also s/Output/CombinedOutput/ to help debugging in the future. It didn't + show the real error msg. + + Signed-off-by: Doug Davis + +commit 2da7f31a682ba8b88231fe13d3acd37ee86dfab0 +Merge: d936174070 ef5d62a503 +Author: Ying Li +Date: Mon May 23 18:59:21 2016 -0700 + + Merge pull request #729 from cyli/server-gun-prefixes + + Server gun prefix requirement feature + +commit 6002b411ce820eaf03ac972a7fb354bb56f7aa95 +Merge: 33f23be924 650629a936 +Author: Nathan LeClaire +Date: Mon May 23 18:28:50 2016 -0700 + + Merge pull request #3381 from bamarni/issue-3359 + + [SSH] Allow private keys with 0400 permissions (fixes #3359) + +commit 3598f2e33198686f0afa08aca640dbda8697fcb2 +Author: Justin Cormack +Date: Mon May 23 18:14:55 2016 -0700 + + Fix error channel size in seccomp test + + This was not changed when the additional tests were added. + It may be the reason for occasional test failures. + + Signed-off-by: Justin Cormack + +commit 9bc6c4ef80d8f7178c5b085bea83a5919e3abae1 +Merge: 91bc4cca58 b65e57bed5 +Author: Brian Goff +Date: Mon May 23 20:21:08 2016 -0400 + + Merge pull request #22919 from LK4D4/carry_22754 + + cli: remove unnecessary initErr type + +commit 2650894bf0aa783e6b94b491f82bfb06a2e6c8dd +Merge: c05fe9b5fa ab1c7fa66f +Author: French Ben +Date: Mon May 23 17:15:26 2016 -0700 + + Merge pull request #1691 from sibprogrammer/privileged-containers + + Add ability to run privileged containers (fix #269). + +commit 4364231312db278444451a80780a3b170c042fdd +Author: nirmalmehta +Date: Mon May 23 20:08:57 2016 -0400 + + updated per thaJeztah recommendations + + Signed-off-by: nirmalmehta + +commit 8bb4d31b10e4c3abee9ca92535461859bbf25d46 +Author: Michael Crosby +Date: Tue May 17 13:20:28 2016 -0700 + + Remove mountedLayer Mount and Unmount + + Signed-off-by: Michael Crosby + +commit 86d8758e2bb5e9d21d454ceda90b33feb8e74771 +Author: Amit Krishnan +Date: Fri Mar 25 16:38:00 2016 -0700 + + Get the Docker Engine to build clean on Solaris + + Signed-off-by: Amit Krishnan + +commit 36a82c20321936a71b30fcfde8bc6c76d6cc8d1f +Author: Michael Crosby +Date: Mon May 16 11:07:03 2016 -0700 + + Fix overlay use of rootdir and defer + + Check for the rootDir first because the mergeDir may not exist if root + is present. + + Also fix unmounting in the defer to make sure it does not have a + refcount. + + Signed-off-by: Michael Crosby + +commit 4bac8bce985b20d68422ef93de3adf4931b2dee5 +Author: Michael Crosby +Date: Tue May 10 11:42:03 2016 -0700 + + Add windows graph driver ref counter + + Signed-off-by: Michael Crosby + +commit e19499710e3728433cdc8348e985f9a825cb2336 +Author: Michael Crosby +Date: Fri May 6 14:54:28 2016 -0700 + + Remove ref counting from layer store + + Signed-off-by: Michael Crosby + +commit 5b6b8df0c1b5a54ae9a717810eedf9fc971e1321 +Author: Michael Crosby +Date: Fri May 6 13:09:45 2016 -0700 + + Add reference counting to aufs + + Signed-off-by: Michael Crosby + +commit 1ba05cdb6ade7e3abd4c4c3221b5e27645460111 +Author: Michael Crosby +Date: Fri May 6 12:04:26 2016 -0700 + + Add fast path for fsmagic supported drivers + + For things that we can check if they are mounted by using their fsmagic + we should use that and for others do it the slow way. + + Signed-off-by: Michael Crosby + +commit 31e903b0e17d01a4240f7890218a80088d32658c +Author: Michael Crosby +Date: Mon May 2 17:22:11 2016 -0700 + + Remove restart test + + This test is not applicable anymore now that containers are not stopped + when the daemon is restored. + + Signed-off-by: Michael Crosby + +commit 290be017c54ed99466339529bf8683ee00930c28 +Author: Michael Crosby +Date: Mon May 2 16:36:20 2016 -0700 + + Remove overlay pathCache + + Signed-off-by: Michael Crosby + +commit 009ee16beff4f6d3607fa251019908cc72ce0a34 +Author: Michael Crosby +Date: Mon May 2 15:44:20 2016 -0700 + + Restore ref count + + Signed-off-by: Michael Crosby + +commit 04a9533b092b8037ed85099ab4dd92b2818000dd +Author: Nishant Totla +Date: Mon May 23 15:46:33 2016 -0700 + + Updating godeps (engine-api) + + Signed-off-by: Nishant Totla + +commit ac043c7db67f268e96c7c7d0236d5316f3a2d9ac +Author: Doug Davis +Date: Mon May 23 10:00:01 2016 -0700 + + Fix docker import tests + + For me when I run the test I see: + ``` + Downloading from http://nourl/bad + Importing 283 B + Untar re-exec error: exit status 1: output: unexpected EOF + ``` + and nothing about "dial tcp" so it appears that the output is + system dependent and therefore we can't really check it. I think + checking for non-zero exit code is sufficient so I'm removing this + string check. + + Signed-off-by: Doug Davis + +commit 55a367d2fe2feecf7b95fbddcdcb3ed179c197fe +Author: Jhon Honce +Date: Thu May 5 14:03:28 2016 -0700 + + Ignore SIGPIPE events, resolves #19728 + + Using golang 1.6, is it now possible to ignore SIGPIPE events on + stdout/stderr. Previous versions of the golang library cached 10 + events and then killed the process receiving the events. + + systemd-journald sends SIGPIPE events when jounald is restarted and + the target of the unit file writes to stdout/stderr. Docker logs to stdout/stderr. + + This patch silently ignores all SIGPIPE events. + + Signed-off-by: Jhon Honce + +commit 048360d1ede924d7ed6c53417e1fc5c9c6ffc807 +Merge: 7763122ecb 33bed5c706 +Author: Joffrey F +Date: Mon May 23 13:52:51 2016 -0700 + + Merge pull request #3489 from aanand/update-openssl-mac + + Use latest OpenSSL version when building Mac binary on Travis + +commit ef5d62a503c46a318c25f425621131c11e0fab15 +Author: Ying Li +Date: Thu May 12 14:36:28 2016 -0700 + + Address code reviews and make the server endpoint list easier to read. + + Signed-off-by: Ying Li + +commit b65e57bed534b00350d091db1894fdff1c4230d5 +Author: muge +Date: Mon May 16 09:38:04 2016 +0800 + + cli: remove unnecessary initErr type + + Signed-off-by: ZhangHang + Signed-off-by: Alexander Morozov + +commit 91bc4cca58dcd698b67f6e7cad7dc225a870eafe +Merge: 2cd8b876ad c152dc48e5 +Author: Sebastiaan van Stijn +Date: Mon May 23 21:19:54 2016 +0200 + + Merge pull request #22875 from Microsoft/jjh/nativeconsoleon + + Windows: Turn on native console by default + +commit c05fe9b5fa7b6301d6e28951fd3c9934190ba70b +Merge: c377ca9f90 bca6cf391b +Author: French Ben +Date: Mon May 23 12:07:25 2016 -0700 + + Merge pull request #1690 from thaJeztah/update-bens-email + + Update ben's e-mail address + +commit 717ac691adb6bc207f10a5f864a6d21728807e7c +Author: Ying Li +Date: Mon May 23 11:53:44 2016 -0700 + + Propagate any walking errors separately from no-targets-found-errors + + Signed-off-by: Ying Li + +commit 2cd8b876ad1c235ccd932d101252423fa86aee06 +Merge: 9f1a121259 ea98cf74aa +Author: Sebastiaan van Stijn +Date: Mon May 23 20:45:27 2016 +0200 + + Merge pull request #22665 from isubuz/20788-doc-valid-tag-name + + docs: add valid chars in image name and tag + +commit bd2b3d363ff7c46e01cce4e6a41d41f24a0047da +Author: Tonis Tiigi +Date: Mon May 23 11:45:04 2016 -0700 + + Release memoryStore locks before filter/apply + + Rework memoryStore so that filters and apply run + on a cloned list of containers after the lock has + been released. This avoids possible deadlocks when + these filter/apply callbacks take locks for a + container. + + Fixes #22732 + + Signed-off-by: Tonis Tiigi + +commit c4dee70ee9e7f3d27af3b5d4f3a1ff783d694729 +Author: Riyaz Faizullabhoy +Date: Fri May 13 16:49:51 2016 -0700 + + Test GetAllTargetMetadataByName + + Signed-off-by: Riyaz Faizullabhoy + +commit 551a80e8d2fa9ad5f6edb589b5dc65fcb5d815f0 +Author: Riyaz Faizullabhoy +Date: Fri May 13 16:31:17 2016 -0700 + + Get all info for a target specified by name + + Signed-off-by: Riyaz Faizullabhoy + +commit d936174070220fa49c8c7d80266fe943c7e1ff8c +Merge: 85ef61fd03 770bb8f8c0 +Author: David Lawrence +Date: Mon May 23 11:38:54 2016 -0700 + + Merge pull request #747 from docker/multihash-checking + + Utility function for comparing multihash + +commit 85ef61fd03da8a5775ee99319d72dcdc354d72c8 +Merge: 0256cee017 9974f9b995 +Author: David Lawrence +Date: Mon May 23 11:38:16 2016 -0700 + + Merge pull request #751 from docker/fix-compose + + Fix the re-think compose file so that all the rdb nodes join the same cluster + +commit 9f1a1212593e8e9ca4fcdeeaabc09e0deee8e806 +Merge: 3ab9049be3 ef2db56bcf +Author: Alexander Morozov +Date: Mon May 23 11:29:50 2016 -0700 + + Merge pull request #22774 from Microsoft/jjh/client + + Windows: Daemon default to Hyper-V containers on client + +commit 3ab9049be31c2c205cb9bce793e3bd640072e6e7 +Merge: 0ac881b705 27f34593ea +Author: Alexander Morozov +Date: Mon May 23 11:11:21 2016 -0700 + + Merge pull request #22856 from thaJeztah/dont-warn-when-net-none + + Suppress "IPv4 forwarding" warning for --net=none + +commit 0ac881b70582bce279db124f2cd89222c1857625 +Merge: 5f95750ab4 f124829c9b +Author: Alexander Morozov +Date: Mon May 23 11:10:33 2016 -0700 + + Merge pull request #22873 from jstarks/fix_bs_del + + Windows: Work around Windows BS/DEL behavior + +commit 5f95750ab40ecc71b0424c399c35a42dc0965ad5 +Merge: b316bc42fe 4c7f0d268f +Author: Tibor Vass +Date: Mon May 23 13:43:08 2016 -0400 + + Merge pull request #22878 from vdemeester/better-default-context + + Rework usage of context.Context in api/client + +commit c3733b464351b9301916751aac26ab2753e1b293 +Merge: 72de932f37 9a28bb06bd +Author: Sebastiaan van Stijn +Date: Mon May 23 19:06:56 2016 +0200 + + Merge pull request #66 from thaJeztah/add-go-p9p-project + + Add go-p9p project to maintainers file + +commit b316bc42fe1ad8edc709bf28975fb3a52e766344 +Merge: f18224de14 d5baf8ddcf +Author: Brian Goff +Date: Mon May 23 12:26:00 2016 -0400 + + Merge pull request #22884 from vdemeester/moving-daemon-horn + + Move some image related methods & struct to smaller files + +commit aee2f8dfe4e5dd8164658effe90bbe8bd803ae4a +Author: Joao Fernandes +Date: Fri May 20 16:00:17 2016 -0700 + + Adds release notes for DTR 2.0.1 + +commit 650629a936381e55d8bbc629c46f620d575fb634 +Author: Bilal Amarni +Date: Mon May 23 16:11:41 2016 +0200 + + [SSH] Allow private keys with 0400 permissions + + Signed-off-by: Bilal Amarni + +commit a34cd5ed543cbc98b703e83c41e13ea1757ad482 +Author: Aanand Prasad +Date: Thu May 19 17:26:42 2016 +0100 + + Add "disambiguation" page for environment variables + + Signed-off-by: Aanand Prasad + +commit f18224de143e7a129ef63cdfa53fa4b0a2d90f9d +Merge: 07dc6bfb46 86d48aa111 +Author: Alexander Morozov +Date: Sun May 22 12:07:11 2016 -0700 + + Merge pull request #22892 from alexellis/20784-builder-intg2unit-tests-typo + + Typo fix wiildcard -> wildcard + +commit 86d48aa111384539b0d2bd50353c4d4c40a5750a +Author: Alex Ellis +Date: Sun May 22 18:39:35 2016 +0100 + + Typo fix wiildcard -> wildcard + + Signed-off-by: Alex Ellis + +commit 7d5ef9016d6b3f5211cc6837b52f5dc7851caf66 +Author: allencloud +Date: Sun May 22 23:01:40 2016 +0800 + + remove not used refreshVolumes in cluster.go + + Signed-off-by: allencloud + +commit 07dc6bfb46e3cd30d01e027680e18a662806bd49 +Merge: 07f79621ea 80f61c4108 +Author: Vincent Demeester +Date: Sun May 22 18:30:59 2016 +0200 + + Merge pull request #22889 from thaJeztah/carry-22151-granular-vendoring + + Allow granular vendoring + +commit 07f79621ea3aef5220d6c275fcab03bb4ed6ce22 +Merge: e0653413ec 9552e24af6 +Author: Vincent Demeester +Date: Sun May 22 17:49:08 2016 +0200 + + Merge pull request #22890 from thaJeztah/docs/slashes + + fix docs not building if branch-name contains slashes + +commit e0653413ec9242a64ef8f2d23ad426efae81bf6b +Merge: 96817cbdee cf2611f323 +Author: Vincent Demeester +Date: Sun May 22 17:48:30 2016 +0200 + + Merge pull request #22706 from tkopczynski/20784-builder-intg2unit-tests + + Reimplement more builder integration tests as unit tests + +commit 9552e24af6151eaef07a481a1125059141d01f75 +Author: Sebastiaan van Stijn +Date: Sun May 22 17:30:41 2016 +0200 + + fix docs not building if branch-name contains slashes + + similar to the changes made in a4192471cd6d6012a66c19a635a11c7f6139d683, + clean the branch-name before using it as a tag-name + for the image that's built. + + this also changes the "image name" for docs images + being built from "docs-base" to "docker-docs", to + be in line with the main Makefile + + before this change: + + /usr/bin/make -C docs docs + docker build -t "docs-base:docs/slashes" . + invalid value "docs-base:docs/slashes" for flag -t: Error parsing reference: "docs-base:docs/slashes" is not a valid repository/tag + See 'docker build --help'. + make[1]: *** [docs-build] Error 125 + make: *** [docs] Error 2 + + after this change: + + /usr/bin/make -C docs docs + docker build -t "docker-docs:docs-slashes" . + Sending build context to Docker daemon 9.165 MB + ... + + Signed-off-by: Sebastiaan van Stijn + +commit 80f61c41086cb2be8dbea023667f42a6c3c3248c +Author: Tibor Vass +Date: Tue Apr 19 09:35:06 2016 -0400 + + Allow granular vendoring + + hack/vendor.sh can now accept command line arguments + + `./hack/vendor.sh github.com/docker/engine-api` will revendor only the + engine-api dependency. + + `./hack/vendor.sh github.com/docker/engine-api v0.3.3` will vendor only + engine-api at the specified tag/commit. + + `./hack/vendor.sh git github.com/docker/engine-api v0.3.3` is the same + but specifies the VCS for cases where the VCS is something else than git + + `./hack/vendor.sh git golang.org/x/sys + eb2c74142fd19a79b3f237334c7384d5167b1b46 + https://github.com/golang/sys.git` will vendor only golang.org/x/sys + downloading from the specified URL + + Signed-off-by: Tibor Vass + Signed-off-by: Sebastiaan van Stijn + +commit 96817cbdee48c4877da7a1f42009331befc6af0d +Merge: c0c36bc150 11da243273 +Author: Sebastiaan van Stijn +Date: Sun May 22 16:30:18 2016 +0200 + + Merge pull request #22747 from sdurrheimer/zsh-completion-images-filters + + Add zsh completion for 'docker images' filters + +commit c0c36bc15096cb7a81dfb9556b1300d0cd94013a +Merge: e3079b4704 55b1724018 +Author: Sebastiaan van Stijn +Date: Sun May 22 15:54:21 2016 +0200 + + Merge pull request #22885 from yongtang/05212016-typo-in-dockernetworks-md + + Fix a typos in docs of networking guide + +commit 11da243273908719c5ab755c6765a9561693ba30 +Author: Steve Durrheimer +Date: Sun May 15 15:49:49 2016 +0200 + + Add zsh completion for 'docker images' filters + + Signed-off-by: Steve Durrheimer + +commit 989f6f852f639404f8e86e179ce5389e2d29c5d2 +Author: Darren Shepherd +Date: Sat May 21 20:40:15 2016 -0700 + + Remove DOCKER_HTTP_HOST_COMPAT env var + + Signed-off-by: Darren Shepherd + +commit ab1c7fa66ff2e79d6246154bb3667234296f9d30 +Author: Alexei Yuzhakov +Date: Sun May 22 09:29:11 2016 +0600 + + Add ability to run privileged containers (fix #269). + + Signed-off-by: Alexei Yuzhakov + +commit cf2611f3239d18919e437e82554cec178028612e +Author: Tomasz Kopczynski +Date: Sat May 21 18:33:16 2016 +0200 + + Reimplementing more builder integration tests as unit tests + + Signed-off-by: Tomasz Kopczynski + +commit d5baf8ddcfd81734e96f3405b941f5e21b24caff +Author: Vincent Demeester +Date: Sat May 21 22:36:11 2016 +0200 + + Move some image related methods & struct to smaller files + + Signed-off-by: Vincent Demeester + +commit 55b172401851a6338a325ef7930d50ace9efb067 +Author: Yong Tang +Date: Sat May 21 13:19:05 2016 -0700 + + Fix a typos in docs of networking guide + + This fix fixes a typo in the documentation (`dockernetworks.md`) + of networking user guide. + + Signed-off-by: Yong Tang + +commit ea98cf74aad3c2633268d5a0b8a2f80b331ddc0b +Author: Subhajit Ghosh +Date: Wed May 11 14:15:50 2016 +0100 + + Document valid chars in image name and tag + + - Add link to valid image name and tag formats in referenced files + - Per review comments, updated docs to remove reference to `USERNAME` and + `REGISTRYHOST`. + - Per review comment, removed links from man page. + - Per review comment, added and updated examples on `docker tag` + + Signed-off-by: Subhajit Ghosh + +commit ef2db56bcf73b3962548a474bbd4469d26f2c655 +Author: John Howard +Date: Thu Apr 14 17:12:02 2016 -0700 + + Windows: Default to Hyper-V Containers on client + + Signed-off-by: John Howard + +commit 069339a30e2432fbd2d3e2cb974309fd5b3377de +Author: allencloud +Date: Sat May 21 22:32:27 2016 +0800 + + fix unit test command in CONTRIBUTION.md + + Signed-off-by: allencloud + +commit 4c7f0d268f413b4a55ea638a97382d9316d082af +Author: Vincent Demeester +Date: Sat May 21 15:57:57 2016 +0200 + + Rework usage of context.Context in api/client + + Make better default usage on context.Context on the `api/client` package + to share the context (it is useless if not shared, which was the case + for a lot of commands). + + Signed-off-by: Vincent Demeester + +commit 9a28bb06bd65275e548191441811425b4e82824f +Author: Sebastiaan van Stijn +Date: Sat May 21 14:07:26 2016 +0200 + + Add go-p9p project to maintainers file + + Signed-off-by: Sebastiaan van Stijn + +commit bca6cf391b6f2f228832ba040ce845ce4e8916a1 +Author: Sebastiaan van Stijn +Date: Sat May 21 14:05:07 2016 +0200 + + Update ben's e-mail address + + Signed-off-by: Sebastiaan van Stijn + +commit e3079b470494a596bc8b35bc682e7c82ac9f0f9f +Merge: 7311d687e0 0cacd4bee2 +Author: Sebastiaan van Stijn +Date: Sat May 21 11:52:49 2016 +0200 + + Merge pull request #22876 from Microsoft/jjh/docsclarification + + Docs: JSON vs Shell clarification + +commit 7311d687e032b63715da74e327dfc06d3dba3b42 +Merge: 4afc4edd74 dd0fc2be8b +Author: Vincent Demeester +Date: Sat May 21 08:02:20 2016 +0200 + + Merge pull request #22775 from Microsoft/jjh/removewindowsdiff + + Windows: Remove windowsdiff graph driver + +commit 4afc4edd74a49fe35b4e19f9fc813523387d85c0 +Merge: 52debcd58a 19c43a6915 +Author: Vincent Demeester +Date: Sat May 21 07:42:26 2016 +0200 + + Merge pull request #22863 from Saser/replace-unicode-single-quote + + Replace occurrences of U+2018 and U+2019 with U+0027 in manpages + +commit 0cacd4bee2197e66105d960507f2ccac0f040263 +Author: John Howard +Date: Fri May 20 20:56:08 2016 -0700 + + Docs: JSON vs Shell clarification + + Signed-off-by: John Howard + +commit e8e3dd32c5bad727010ec787f484b98942977531 +Author: John Howard +Date: Fri Apr 22 15:04:46 2016 -0700 + + Support platform file paths through escape + + Signed-off-by: John Howard + +commit c152dc48e51630c37825a3488edf1885311483c8 +Author: John Howard +Date: Fri May 20 19:19:26 2016 -0700 + + Windows: Turn on native console by default + + Signed-off-by: John Howard + +commit f124829c9b35377de2a8316b7e23aa7a8c5d7b23 +Author: John Starks +Date: Fri May 20 19:04:20 2016 -0700 + + Windows: Work around Windows BS/DEL behavior + + In Windows containers in TP5, DEL is interpreted as the delete key, but + Linux generally interprets it as backspace. This prevents backspace from + working when using a Linux terminal or the native console terminal + emulation in Windows. + + To work around this, translate DEL to BS in Windows containers stdin when + TTY is enabled. Do this only for builds that do not have the fix in + Windows itself. + + Signed-off-by: John Starks + +commit a47992ce0e3149882746b58ae3e016826a0c2eb2 +Merge: cd650fcf0c 371a106a9d +Author: Nathan LeClaire +Date: Fri May 20 17:05:01 2016 -0700 + + Merge pull request #499 from t3easy/patch-1 + + Forget install state of docker packages + +commit dd0fc2be8b8b0bbac3d3a478ae6939d9b742612d +Author: John Howard +Date: Mon May 16 16:13:39 2016 -0700 + + Windows: Remove windowsdiff driver + + Signed-off-by: John Howard + +commit 4e2d98761dc092d232451f5f45c7667a35afa945 +Author: Justin Cormack +Date: Fri May 20 16:05:25 2016 -0700 + + Begin a section in the check-config script to check limits + + Initially this checks the kernel's maxkeys setting which is + low in some older distribution kernels, such that only 200 containers + can be created, reported in #22865. + + Signed-off-by: Justin Cormack + +commit c4229b469a7fdf37b84fdd7b911508936f442363 +Author: Joffrey F +Date: Thu May 19 15:42:37 2016 -0700 + + Improve merging for several service config attributes + + All uniqueItems lists in the config now receive the same treatment removing + duplicates. + + Signed-off-by: Joffrey F + +commit 842e372258809b0be035a7857f8577e33850cca7 +Author: Joffrey F +Date: Tue May 17 15:02:29 2016 -0700 + + Eliminate duplicates when merging port mappings from config files + + Signed-off-by: Joffrey F + +commit 9c902364fb97faeca8257ed683bdef27615d9f1f +Author: John Starks +Date: Fri May 20 13:23:01 2016 -0700 + + Revendor docker/distribution + + Signed-off-by: John Starks + +commit 5bbf65499960b184fe8e0f045397375e1a6722b8 +Merge: 4a915d6efd f0052b8434 +Author: Aaron Lehmann +Date: Fri May 20 12:55:55 2016 -0700 + + Merge pull request #1725 from jstarks/foreign_layer + + Add support for layers from foreign sources + +commit f0052b84341b588017a67d87d4edbb82c76705b3 +Author: John Starks +Date: Sat May 14 14:49:08 2016 -0700 + + Add support for layers from foreign sources + + This will be used to support downloading Windows base layers from + Microsoft URLs. + + Signed-off-by: John Starks + +commit 19c43a69156ba70c5fa11a7cc55ecbd82f8d9421 +Author: Christian Persson +Date: Fri May 20 20:15:57 2016 +0200 + + Replace U+2018 and U+2019 with U+0027 in manpages + + Signed-off-by: Christian Persson + +commit 451916417b7f83b24fd89a906dffd23c501a0406 +Author: Ying Li +Date: Tue May 10 20:22:08 2016 -0700 + + Add config parsing of the gun prefixes to the server command. + + Signed-off-by: Ying Li + +commit b4b2e515027c55c51a0283f75b0b7d82b5a2f55f +Author: Ying Li +Date: Tue May 10 17:37:55 2016 -0700 + + Update the server to reject operations on images which do not match the prefix. + + Signed-off-by: Ying Li + +commit 5accc1b5064dc0b4de527f6f698e0abfc68f8aaa +Author: Ying Li +Date: Tue May 10 12:12:31 2016 -0700 + + Documentation about new server gun prefix requirement feature + + Signed-off-by: Ying Li + +commit 27f34593eac04fa5e43a540eb13b20d739169140 +Author: Sebastiaan van Stijn +Date: Fri May 20 17:39:05 2016 +0200 + + Suppress "IPv4 forwarding" warning for --net=none + + There's no need to warn that "ip-forwarding" is disabled + if a container doesn't use networking. + + Signed-off-by: Sebastiaan van Stijn + +commit 52debcd58ac91bf68503ce60561536911b74ff05 +Merge: 642b7b1b52 5fb7f9b29e +Author: Vincent Demeester +Date: Fri May 20 17:17:10 2016 +0200 + + Merge pull request #22820 from thaJeztah/suppress-incorrect-warning + + Suppress "IPv4 forwarding" warning for --net=host + +commit 642b7b1b52cd6ab618051f158d2d5c5c6ed56b3c +Merge: 74ee26cceb e009ebdf4c +Author: Phil Estes +Date: Fri May 20 10:13:30 2016 -0500 + + Merge pull request #22369 from vdemeester/carry-pr-25074 + + Carry #20574 : Add a --filter option to `docker search` + +commit 74ee26ccebee1f33375967f32529a63e33ee6b73 +Merge: 0e9009bae3 841cf6fffb +Author: Sebastiaan van Stijn +Date: Fri May 20 15:11:35 2016 +0200 + + Merge pull request #22839 from thaJeztah/update-selinux-example + + Remove MLS example from SELinux example in run reference + +commit 841cf6fffb6a821d6c5777871090c9d2bcc95b36 +Author: Sebastiaan van Stijn +Date: Thu May 19 21:06:08 2016 +0200 + + Remove MLS example from SELinux example in run reference + + Automatic translation of MLS labels is currently not + supported, so should not be documented as an example. + + Signed-off-by: Sebastiaan van Stijn + +commit e009ebdf4c0bf0ff64da8d48eefad63d0644de3e +Author: Fabrizio Soppelsa +Date: Fri May 20 13:41:28 2016 +0200 + + Add a --filter option to `docker search` + + The filtering is made server-side, and the following filters are + supported: + + * is-official (boolean) + * is-automated (boolean) + * has-stars (integer) + + Signed-off-by: Fabrizio Soppelsa + Signed-off-by: Vincent Demeester + +commit 33bed5c7066e53cb147afcbef2e9ab78cb0ab1f0 +Author: Aanand Prasad +Date: Fri May 20 12:02:45 2016 +0100 + + Use latest OpenSSL version (1.0.2h) when building Mac binary on Travis + + Signed-off-by: Aanand Prasad + +commit 0e9009bae3a493cfce8a8334949b239efcb88f43 +Merge: 55cc1a2aa4 a01c4dc8f8 +Author: Sebastiaan van Stijn +Date: Fri May 20 12:58:28 2016 +0200 + + Merge pull request #22554 from justincormack/seccap + + Align default seccomp profile with selected capabilities + +commit 7763122ecb9854b5787a5084250f0c40879236c0 +Merge: 9a39208741 2b5b665d3a +Author: Aanand Prasad +Date: Fri May 20 11:42:43 2016 +0100 + + Merge pull request #3459 from shin-/2487-split-volume-path + + Always use the Windows version of splitdrive when parsing volume mappings + +commit 55cc1a2aa46616930a8b8357db562067138822a9 +Merge: 4c49adeaed f66f5d4bdc +Author: Vincent Demeester +Date: Fri May 20 08:51:29 2016 +0200 + + Merge pull request #22844 from normalfaults/mispell + + fixed spelling error in cli pull local test + +commit 4c49adeaed6881e8c0ad65ba62df99a5b86aded7 +Merge: 6024fc4d49 b3b5da3c55 +Author: Vincent Demeester +Date: Fri May 20 08:50:33 2016 +0200 + + Merge pull request #22843 from normalfaults/bugfix + + removed unused const in config.go + +commit 6024fc4d49560266b564c2bcff92d5961d9936a3 +Merge: de908dfd2c 3d6f5984f5 +Author: Vincent Demeester +Date: Fri May 20 08:34:00 2016 +0200 + + Merge pull request #22000 from runcom/malformed-host-header-upstream + + Ignore invalid host header between go1.6 and old docker clients + +commit c377ca9f90c96aeca853ebde077a2bb14068e8a9 +Author: French Ben +Date: Thu May 19 18:40:36 2016 -0700 + + Removed debug from util + + Signed-off-by: French Ben + +commit 878507ee2d046a752ef2107484718332b60cafc3 +Merge: e0bcf4cba5 a0332d279b +Author: French Ben +Date: Thu May 19 18:39:29 2016 -0700 + + Merge pull request #1447 from alexandrev/issue-1206 + + Fixes #1206 . In this PR we allow to add new ports using the Ports ta… + +commit f66f5d4bdc8ee12a2005df43bd279352705473d5 +Author: Nirmal Mehta +Date: Thu May 19 17:52:42 2016 -0500 + + fixed spelling error in cli pull local test + + Signed-off-by: Nirmal Mehta + +commit de908dfd2cfb640d7e55cb5092a59b75eb846948 +Merge: 376c15bbaa 131161bbc7 +Author: Alexander Morozov +Date: Thu May 19 15:23:45 2016 -0700 + + Merge pull request #22842 from wendelfleming/FixWorkDir + + builder: fixed workdir comment + +commit b3b5da3c555b8cc622c7e9ace73951b1e09c8b35 +Author: Nirmal Mehta +Date: Thu May 19 17:18:06 2016 -0500 + + removed unused const in config.go + + Signed-off-by: Nirmal Mehta + +commit 2b5b665d3ab47ab7d1bbe0049b02af126f2eaa63 +Author: Joffrey F +Date: Thu May 19 14:53:37 2016 -0700 + + Add test for path mapping with Windows containers + + Signed-off-by: Joffrey F + +commit 33f23be92483e89f838c3acdb6979f2d98ada8a1 +Merge: bbe8df52fe b2e3d81537 +Author: Nathan LeClaire +Date: Thu May 19 14:21:57 2016 -0700 + + Merge pull request #3363 from wadetandy/master + + Expose OpenStack driver's userdata param + +commit 0dc7b68b08b09e9acaca103fa18cdfaca8d0232f +Author: nirmalmehta +Date: Thu May 19 15:54:28 2016 -0500 + + fixed escape of bullet item so code block renders properly + + Signed-off-by: nirmalmehta + +commit 131161bbc7a153eac0eccf02fcfb0fc2f5d368b5 +Author: Wendel Fleming +Date: Thu May 19 15:40:46 2016 -0500 + + builder: fixed workdir comment + + Signed-off-by: Wendel Fleming + +commit 3d6f5984f52802fe2f4af0dd2296c9e2e4a1e003 +Author: Antonio Murdaca +Date: Tue Apr 12 17:21:20 2016 +0200 + + Ignore invalid host header between go1.6 and old docker clients + + BenchmarkWithHack-4 50000 37082 ns/op 44.50 + MB/s 1920 B/op 30 allocs/op + BenchmarkNoHack-4 50000 30829 ns/op 53.52 + MB/s 0 B/op 0 allocs/op + + Signed-off-by: Brian Goff + Signed-off-by: Antonio Murdaca + +commit 376c15bbaa05d1458d9a0238b8854af5de2738a1 +Merge: ebeb5a0422 beca261578 +Author: Alexander Morozov +Date: Thu May 19 12:04:52 2016 -0700 + + Merge pull request #22762 from wangxing1517/fix_mistake_400_for_500 + + Fix bug which mistakes 400 error for 500 + +commit 04b4e3e6d80d5d734edba90e55f41863b50ee45b +Author: Ken Herner +Date: Thu May 19 14:47:33 2016 -0400 + + Add test to ZFS for disk quota + + Signed-off-by: Ken Herner + +commit 373654f43e87a2e0bd5388ca4ab1852fd51a7199 +Author: Ken Herner +Date: Thu May 12 17:21:38 2016 -0400 + + Add error check after parseStorageOpt + + Signed-off-by: Ken Herner + +commit e91834043100a6ae3f80c21fd15daccc2f451528 +Author: Ken Herner +Date: Mon Apr 11 11:51:40 2016 -0400 + + Add support for setting storage size on zfs containers + + Now supports setting a containers storage size when using zfs as the + storage engine. By passing in `--storage-opt size=`, the created + container's storage size will be limited to the given size. Note that + the way zfs works, the given specified storage size will be given in + addition to the base container size. + + Example: + + The node image reports a size of `671M` from `df -h` when started. + Setting `--storage-opt size=2G` will result in a drive the size of + `671M` + `2G`, `2.7G` in total. Available space will be `2.0G`. + + The storage size is achieved by setting the zfs option `quota` to the + given size on the zfs volume. + + Signed-off-by: Ken Herner + +commit ebeb5a0422be47e703353e327606a380eb9962ab +Merge: 1691fe6d23 fb43ef649b +Author: Vincent Demeester +Date: Thu May 19 19:00:40 2016 +0200 + + Merge pull request #22481 from mrunalp/pid_container + + Add support for --pid=container: + +commit 9a39208741c35e45c6178eb4620b0cf1e70cff16 +Merge: ce8df9e789 0c8aeb9e05 +Author: Joffrey F +Date: Thu May 19 08:52:34 2016 -0700 + + Merge pull request #3482 from aanand/fix-prompt-buffering + + Fix bug where confirmation prompt doesn't show due to line buffering + +commit ce8df9e7899b55d239e9abef65a19f11b568a8b2 +Merge: ca3aef0c84 844b7d463f +Author: Aanand Prasad +Date: Thu May 19 16:46:31 2016 +0100 + + Merge pull request #3466 from shin-/3330-rm-all-default + + Update rm command to always remove one-off containers. + +commit 0c8aeb9e056caaa1fa2d1cc1133f6bd41505ec3c +Author: Aanand Prasad +Date: Thu May 19 07:41:02 2016 -0700 + + Fix bug where confirmation prompt doesn't show due to line buffering + + Signed-off-by: Aanand Prasad + +commit f53902aa776d2aa795e7eb217478abdf98e22ddf +Author: root +Date: Mon May 16 11:18:48 2016 +0800 + + Fix some mistakes in dockerd.md + + Signed-off-by: Wang Xing + +commit f97eca5ad68f3acca652f6376d5120edf6fae4ee +Author: Alexey Gladkov +Date: Wed May 18 18:54:27 2016 +0200 + + Add support for blobAccessController middleware + + Signed-off-by: Michal Minar + Signed-off-by: Alexey Gladkov + +commit beca2615782e24fa28803ada067129fdfa88c77d +Author: Wang Xing +Date: Mon May 16 17:15:45 2016 +0800 + + Fix bug which mistakes 400 error for 500 + + Signed-off-by: Wang Xing + +commit 371a106a9d58fa9badd4ab527d5f3cb2c2855abf +Author: t3easy +Date: Thu May 19 08:41:23 2016 +0200 + + Forget install state of docker packages + + After removing the binaries it is recommended to forget the install state of the packages. + +commit bbe8df52fee8cc0cd3e6cf2b11afd8f1160c356e +Merge: 0668dd6454 1a5ac12dd3 +Author: Nathan LeClaire +Date: Wed May 18 17:18:56 2016 -0700 + + Merge pull request #3406 from ronakbanka/align_flag_name + + Align machine storage path flag name + +commit 1691fe6d23b083c67aea120f05c4797220388d59 +Merge: 083dcd9c64 160a6430a9 +Author: Sebastiaan van Stijn +Date: Wed May 18 22:26:25 2016 +0200 + + Merge pull request #22821 from zunayed/patch-1 + + fix duplicate command in uninstall instructions + +commit 160a6430a91de00c065fe5900e7fd96a46f87a45 +Author: Zunayed Ali +Date: Wed May 18 15:32:14 2016 -0400 + + fix duplicate command in uninstall instructions + + Signed-off-by: Zunayed Ali + +commit 083dcd9c644e35129f21934ee401e0698b0d3c62 +Merge: 04eaa74901 aac6008800 +Author: Alexander Morozov +Date: Wed May 18 12:04:21 2016 -0700 + + Merge pull request #22812 from thaJeztah/variable-typo + + fix typo in variable + +commit 04eaa7490192ce101dec3ee3a7a0d02bb1e81426 +Merge: af705ca0ae a5b64f2847 +Author: John Howard +Date: Wed May 18 12:00:10 2016 -0700 + + Merge pull request #22712 from swernli/update_fix + + Fixing Windows update logic. + +commit 0668dd64545115a92604c48ea92ff62325351223 +Merge: cfb60c386b 2599a45b2c +Author: Nathan LeClaire +Date: Wed May 18 11:25:59 2016 -0700 + + Merge pull request #3440 from StackPointCloud/oneandone-machine-driver-doc-update + + 1&1 Cloud Server AVAILABLE_DRIVER_PLUGINS Update + +commit cfb60c386bd06da6ea587ac85721f578a2ea927d +Merge: e7fb28c18c 7902a11fab +Author: Nathan LeClaire +Date: Wed May 18 11:25:30 2016 -0700 + + Merge pull request #3438 from StackPointCloud/profitbricks-machine-driver-doc-update + + ProfitBricks Docker Machine Driver Plugs Doc Update + +commit e7fb28c18c78380370a8f29fadfc0fe7b2bfe3e7 +Merge: c19d866e25 04e5bca618 +Author: Nathan LeClaire +Date: Wed May 18 11:25:14 2016 -0700 + + Merge pull request #3435 from robertbreker/list-xs-driver-plugin + + Add Citrix XenServer to driver plugin list + +commit 5fb7f9b29e9a85f36d02c4ecec6c04498fdb4315 +Author: Sebastiaan van Stijn +Date: Wed May 18 20:10:31 2016 +0200 + + Suppress "IPv4 forwarding" warning for --net=host + + Containers using the host network stack (--net=host) + are not affected by "ip-forwarding" being disabled, + so there's not need to show a warning. + + Signed-off-by: Sebastiaan van Stijn + +commit 72de932f376e67c8f5c87d1129dc9eff3a73101f +Merge: 41ec0a4aba bc8489b4a8 +Author: Sebastiaan van Stijn +Date: Wed May 18 19:08:53 2016 +0200 + + Merge pull request #64 from thaJeztah/opensource-all-the-things + + Update maintainers with new open source projects + +commit bc8489b4a83158988578b1a6ec3881c97d4bea1e +Author: Sebastiaan van Stijn +Date: Wed May 18 18:57:01 2016 +0200 + + Update maintainers with new open source projects + + Signed-off-by: Sebastiaan van Stijn + +commit aac6008800ab06047ff000d6af487f3b52ba3019 +Author: Sebastiaan van Stijn +Date: Wed May 18 15:26:16 2016 +0200 + + fix typo in variable + + Signed-off-by: Sebastiaan van Stijn + +commit af705ca0ae1af735661ae464cb53d93a890450e7 +Merge: 9751170f08 a7781b130c +Author: Alexander Morozov +Date: Wed May 18 06:03:02 2016 -0700 + + Merge pull request #22765 from cyphar/update-boltdb + + vendor: bump boltdb to v1.2.1 + +commit 9974f9b995e3e2ff1dd9b2e46d06a6a40faffd21 +Author: Ying Li +Date: Wed May 18 06:18:47 2016 -0500 + + Rethink requires that each subsequent replica join another existant replica. + Fix the compose file so that 2 and 3 join 1, otherwise the servers didn't + actually seem to be clustered. + + Signed-off-by: Ying Li + +commit 9751170f08a143e86709879c70b4a924c3161683 +Merge: cbc404a083 60940b0818 +Author: Vincent Demeester +Date: Wed May 18 13:58:24 2016 +0200 + + Merge pull request #22778 from DoraALin/10972-docs-Support-for-non-proxied-private-registry + + doc:http pkg variables info added in pull cmd + +commit 0c552e92a42940ba35c83723084264372a15b3eb +Author: Ying Li +Date: Wed May 18 06:14:23 2016 -0500 + + Explicitly wait for all replicas to be ready on bootstrapping. While this should + be the rethinkdb default, I was running into errors sometimes after bootstrapping - + the signer and servers sometimes can't connect after bootstrapping. + + Signed-off-by: Ying Li + +commit 9371c49b59f3917f2184dad3f94938e8f708e5ac +Author: Ying Li +Date: Wed May 18 05:29:05 2016 -0500 + + Move the SERVICE_NAME environment variable definitions into the server/signer Dockerfiles + + Signed-off-by: Ying Li + +commit 60940b0818d1d483cd017469f3e5ad21edce6198 +Author: Lin Lu +Date: Tue May 17 11:26:35 2016 +0800 + + doc:proxy-setting info added in pull cmd. + Replace Note with a new secion, reduce characters in + per line in 80. Add statement suggested by + https://github.com/thaJeztah + + Signed-off-by: Lin Lu + +commit cbc404a0832bd95cce95783b87475d761be3a922 +Merge: 14b5a50f0a bdb354f19b +Author: Vincent Demeester +Date: Wed May 18 11:08:10 2016 +0200 + + Merge pull request #22785 from runcom/fix-flaky-network + + TestPsGroupPortRange: allocate less ports + +commit 14b5a50f0a95a2b8f3ed7ab7469bbab02189a09c +Merge: 28a436af36 6eb2b903a3 +Author: Vincent Demeester +Date: Wed May 18 10:55:28 2016 +0200 + + Merge pull request #22582 from aboch/vnd + + Vendoring libnetwork b66c038 + +commit db0a6cf2bbcd7a5a673833b9558f0d142a0f304c +Author: Joffrey F +Date: Thu May 12 17:38:41 2016 -0700 + + Always use the Windows version of splitdrive when parsing volume mappings + + Signed-off-by: Joffrey F + +commit c5e9aa4cf03f71bb128805b6087d4605b57a9ae9 +Author: Joao Fernandes +Date: Tue May 17 14:29:29 2016 -0700 + + Updates release notes to link to upgrade docs + + Fixes #2008 + +commit fb43ef649bc6aa11ca19c0e046518e85e1c7e2fa +Author: Mrunal Patel +Date: Fri May 6 14:56:03 2016 -0400 + + Add support for --pid=container: + + Signed-off-by: Mrunal Patel + +commit df77cf36745adfb7fadab04b3d42cfc95b833d2f +Merge: 07825a17e7 ae824704e5 +Author: Dongluo Chen +Date: Tue May 17 10:30:31 2016 -0700 + + Merge pull request #2236 from fugr/fix-handle-update-event + + fix missing handle 'update' event massage + +commit 28a436af3641f202287f98e326537a10897da9fa +Merge: 713b9541f5 01c9b968bd +Author: Vincent Demeester +Date: Tue May 17 17:06:12 2016 +0200 + + Merge pull request #22768 from mansinahar/run-cmd-doc + + Update 'run' command doc for better readability. Issue:#22721 + +commit 713b9541f5aa19aceaf18d7a8765d2fdda9d786a +Merge: 4c6838137c 09cb57b773 +Author: Brian Goff +Date: Tue May 17 08:26:25 2016 -0500 + + Merge pull request #22788 from thaJeztah/fix-typo-in-completion + + Fix typo in zsh completion + +commit 09cb57b773d1b83773120da3c4382defa37cf257 +Author: Sebastiaan van Stijn +Date: Tue May 17 13:38:46 2016 +0200 + + Fix typo in zsh completion + + Signed-off-by: Sebastiaan van Stijn + +commit bdb354f19b485238c42a86ff2a61fc7537da15ee +Author: Antonio Murdaca +Date: Tue May 17 12:23:37 2016 +0200 + + TestPsGroupPortRange: allocate less ports + + Signed-off-by: Antonio Murdaca + +commit 41ec0a4aba0e3500c33af94090b63b79bad6f7e0 +Merge: f2c568a3a4 fcff91e6eb +Author: Sebastiaan van Stijn +Date: Tue May 17 12:17:15 2016 +0200 + + Merge pull request #47 from thaJeztah/project-template + + Add project template + +commit fcff91e6eb3f6798e538bdc8f9e34a78f457163b +Author: Sebastiaan van Stijn +Date: Mon Dec 21 16:35:59 2015 +0100 + + Add project template + + This adds a basic project template that can be + used to set up new open source projects. + + Signed-off-by: Sebastiaan van Stijn + +commit a7781b130c537ba7c2ea0dde0c47b0d79f1d6629 +Author: Aleksa Sarai +Date: Mon May 16 23:47:02 2016 +1000 + + vendor: bump boltdb to v1.2.1 + + This includes a fix to soft database corruption that would cause Docker + to fail to start if the daemon died in the middle of a transaction + write. + + Signed-off-by: Aleksa Sarai + +commit 5f434cc67ec6fed0cdcd44f1d7993f1f79794ff3 +Author: Sven Dowideit +Date: Tue May 17 05:18:07 2016 +0000 + + Docs team + + Signed-off-by: Sven Dowideit + +commit 6eb2b903a39f66ce88155eb1c062c085e4959e39 +Author: Alessandro Boch +Date: Sun May 8 00:33:16 2016 -0700 + + Docker changes for libnetwork vendoring b66c038 + + Signed-off-by: Alessandro Boch + +commit 1f9e3815aa4ac7eaa707f3a9b436f23c29355a8f +Author: Alessandro Boch +Date: Sun May 8 00:32:51 2016 -0700 + + Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4 + + Signed-off-by: Alessandro Boch + +commit ebcf785f2fd81f52f06a0ea83baa4be698605876 +Author: Alessandro Boch +Date: Sun May 8 00:31:30 2016 -0700 + + Update libnetwork dependencies for b66c038 + + Signed-off-by: Alessandro Boch + +commit 844b7d463f63b4bd3915648b32432c9b3d0243c8 +Author: Joffrey F +Date: Mon May 16 14:59:33 2016 -0700 + + Update rm command to always remove one-off containers. + + Signed-off-by: Joffrey F + +commit b6573c4ca7f000dd587155d0fb05624a771f37fa +Author: Madhu Venugopal +Date: Mon May 16 14:21:18 2016 -0700 + + Release-notes for CS Engine 1.11.1-cs2 + + Signed-off-by: Madhu Venugopal + +commit 2599a45b2ca694fa86e7391438e074e6b5f15782 +Author: Matt Baldwin +Date: Mon May 16 12:21:59 2016 -0700 + + Update AVAILABLE_DRIVER_PLUGINS.md + + Change-Id: I4384eed8a61f52c1649084a972b073b17592d66a + Signed-off-by: Matt Baldwin baldwin@stackpointcloud.com + Signed-off-by: Matt Baldwin + +commit 7902a11fab09327c14886d727871fd7ee6f85ea2 +Author: Matt Baldwin +Date: Mon May 16 11:44:30 2016 -0700 + + ProfitBricks Docker Machine Driver + + Updating docs to reflect a new driver. + + Change-Id: I3d70937d8994bd9725b0c1344b1941a1402db469 + Signed-off-by: Matt Baldwin + +commit 4c6838137c10e322ce2bd64ce6db0df652e14267 +Merge: 0088b8fbbe b3bc5e0fe4 +Author: John Howard +Date: Mon May 16 11:08:05 2016 -0700 + + Merge pull request #22728 from Microsoft/jstarks/improve_import + + Windows: reexec during layer import + +commit 01c9b968bdec8ba1202eacc5ec5c7edb361db6ce +Author: mansinahar +Date: Sun May 15 12:55:19 2016 -0400 + + Update 'run' command doc for better readability + + Signed-off-by: Mansi Nahar + +commit 0088b8fbbea9ca360f8a57cb63c7adc50b4613b0 +Merge: 16e6211cf7 2dce79e05a +Author: Tibor Vass +Date: Mon May 16 09:57:19 2016 -0400 + + Merge pull request #22561 from cpuguy83/delay_start_for_discovery + + Wait for discovery on container start error + +commit f18da7d3a3f5343b3742302fe59fcc8cbd696a42 +Author: Nikita Tarasov +Date: Mon May 16 16:09:26 2016 +0300 + + update docs + + Signed-off-by: Nikita Tarasov + +commit 16e6211cf7ffcdaae11e4ded61d0e15b52c1c8a4 +Merge: 37dfd8bc8c 27d7b135d4 +Author: Antonio Murdaca +Date: Mon May 16 12:38:21 2016 +0200 + + Merge pull request #22761 from hqhq/hq_check_config_kmem + + Update check_config for MEMCG_KMEM + +commit 37dfd8bc8c83462958fc507937c8baf5d5b06bfc +Merge: 6e12d0720f 7b3dc03b66 +Author: Vincent Demeester +Date: Mon May 16 08:39:31 2016 +0200 + + Merge pull request #22757 from gondor/master + + Documentation: Updated URL to plugin reference - docker-volume-netshare + +commit 27d7b135d4475b8c7b5159792b9b6d160e4535c1 +Author: Qiang Huang +Date: Mon May 16 13:55:24 2016 +0800 + + Update check_config for MEMCG_KMEM + + CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default + since 4.6, so it's merged to CONFIG_MEMCG. + + Signed-off-by: Qiang Huang + +commit 7b3dc03b663df7f8812057e9e524026d49568432 +Author: Jeremy Unruh +Date: Sun May 15 21:20:54 2016 -0700 + + update URL for docker-volume-netshare + + Signed-off-by: Jeremy Unruh + +commit 6e12d0720fc6acdf55ee98013b33b6846645f153 +Merge: 1bcc42e038 0884dca124 +Author: Sebastiaan van Stijn +Date: Mon May 16 01:22:43 2016 +0200 + + Merge pull request #22751 from igrcic/docs-small-typo-reference-attach + + remove double "using" in reference attach docs + +commit 0884dca124beac751964256234b3b3d4e402b21a +Author: Ivan Grcic +Date: Sun May 15 23:18:01 2016 +0200 + + remove double "using" in reference attach docs + + Signed-off-by: Ivan Grcic + +commit b97ae51ff4a5192bf71a8e4cdfbf8225458cc5bb +Author: tristan.keen@gmail.com +Date: Sun May 15 16:44:09 2016 +0100 + + Upgrade to govmomi 0.6.2, use WaitFotNetIP to get correct host IP. Note includes mass deletion of other presumably no longer needed deps + + Signed-off-by: tristan.keen@gmail.com + +commit 1bcc42e0386814abdef491afa605ece79cc081d4 +Merge: e333675cd7 1391e75d45 +Author: Vincent Demeester +Date: Sun May 15 05:47:09 2016 +0200 + + Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver + + Update deprecated docs for LXC built-in exec driver + +commit 1391e75d451c8e9c51b8cd29d90e6043e59f0f04 +Author: Yong Tang +Date: Sat May 14 16:55:01 2016 -0700 + + Update deprecated docs for LXC built-in exec driver + + The LXC built-in exec driver has been deprecated in 1.8 and + further removed in 1.10, yet in deprecated.md it still shows: + ``` + Target For Removal In Release: v1.10 + ``` + + This fix changes the above to `Removed In Release:`. + + In addition, lxc-conf flag and API fields have already been + removed in 1.10 as well so the related description has also been + updated in this fix. + + Signed-off-by: Yong Tang + +commit e333675cd783f3e5e208fefbf71528ed643b9e1c +Merge: fbf3741f0d 414b9dea8a +Author: Sebastiaan van Stijn +Date: Sun May 15 02:15:45 2016 +0200 + + Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks + + Fix a typo in work-with-networks.md + +commit 414b9dea8a1bf7ef7a4b9584dd887c51b49751d4 +Author: Yong Tang +Date: Sat May 14 16:58:18 2016 -0700 + + Fix a typo in work-with-networks.md + + This fix fixes a typo in the documentation of `work-with-networks.md`. + + Signed-off-by: Yong Tang + +commit fbf3741f0d2d6328c9351c38120e6e46cdce5fdf +Merge: c80f926997 afca8a454a +Author: Sebastiaan van Stijn +Date: Sat May 14 22:27:00 2016 +0200 + + Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label + + Add zsh completion for 'docker network ls --filter label' + +commit c80f9269975114e7587a49e2b54f4a9ef8c27a43 +Merge: 14348e9cca bf9a1d5027 +Author: Sebastiaan van Stijn +Date: Sat May 14 22:25:59 2016 +0200 + + Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent + + Add zsh completion for 'docker daemon --max-concurrent-downloads --ma… + +commit 14348e9cca6b6e6040797a4417e30d4466ba7233 +Merge: 89bb4d96e4 dcca0f6dd1 +Author: Sebastiaan van Stijn +Date: Sat May 14 22:25:05 2016 +0200 + + Merge pull request #22738 from sdurrheimer/zsh-completion-logs-details + + Add zsh completion for 'docker logs --details' + +commit 04e5bca61816dc3a6f1f4e80127d914a10e8f2b4 +Author: Robert Breker +Date: Sat May 14 17:49:01 2016 +0000 + + Add Citrix XenServer to driver plugin list + + Signed-off-by: Robert Breker + +commit afca8a454ac4214461b106d26d610231df7804f3 +Author: Steve Durrheimer +Date: Sat May 14 19:38:39 2016 +0200 + + Add zsh completion for 'docker network ls --filter label' + + Signed-off-by: Steve Durrheimer + +commit bf9a1d5027d4f7d6a5e07d2774c3499d41d63c28 +Author: Steve Durrheimer +Date: Sat May 14 19:20:20 2016 +0200 + + Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads' + + Signed-off-by: Steve Durrheimer + +commit dcca0f6dd1b2fb239c0310112a5968c2f3a51aca +Author: Steve Durrheimer +Date: Sat May 14 19:13:01 2016 +0200 + + Add zsh completion for 'docker logs --details' + + Signed-off-by: Steve Durrheimer + +commit 89bb4d96e4faabe35d151add0d2313b03f248134 +Merge: aa197f147d d0ab1c360f +Author: Sebastiaan van Stijn +Date: Sat May 14 17:57:45 2016 +0200 + + Merge pull request #22737 from tkopczynski/typo-imagesandcontainers + + Small fix in images and containers docs + +commit d0ab1c360f5af7b92ab3f414e42ad817e0bd3059 +Author: Tomasz Kopczynski +Date: Sat May 14 16:09:49 2016 +0200 + + Small fix in images and containers docs + + Signed-off-by: Tomasz Kopczynski + +commit ae824704e526d005aaff958e54dfa91b5c276509 +Author: fugr +Date: Fri May 13 09:58:44 2016 +0800 + + fix missing handle 'update' event massage. + Signed-off-by: fugr + +commit aa197f147d7c984887c637607b268bdbbc4f00a2 +Merge: 2f94a367d7 d365c0e151 +Author: Vincent Demeester +Date: Sat May 14 11:49:01 2016 +0200 + + Merge pull request #22735 from yongtang/22463-22590-emit-docker-daemon-reload-event + + Vendor engine-api to allow docker daemon reload event + +commit 2f94a367d7dcb24141cbe48c4e75e3671ae3e0f1 +Merge: 3723b88406 5154856586 +Author: Vincent Demeester +Date: Sat May 14 10:12:15 2016 +0200 + + Merge pull request #22720 from thaJeztah/fix-markdown + + Fix Markdown formatting in Devicemapper docs + +commit 770bb8f8c011298d56556a7e565f2ad65fc0c5e0 +Author: Riyaz Faizullabhoy +Date: Fri May 13 20:58:15 2016 -0700 + + check the intersection of all hash algorithms, given a valid Hashes map + + Signed-off-by: Riyaz Faizullabhoy + +commit d365c0e151aa39de88575cf9e182c51e33cb2c47 +Author: Yong Tang +Date: Fri May 13 20:39:35 2016 -0700 + + Fix failed test for TestRestartPolicy + + This commit is a follow up of the last commit: + Vendor engine-api to allow docker daemon reload event. + + After vendor/engine-api has been updated, the following + unit test fails: + ``` + --- FAIL: TestRestartPolicy (0.00s) + hostconfig_test.go:177: RestartPolicy.IsNone for { 0} should have been false but was true + ``` + + The reason for the above failed unit test is that pull request: + + https://github.com/docker/engine-api/pull/200 + + updated behavior of the restart policy and makes restartpolicy.IsNone + return true if restart policy name is `""`. As a result, the above + mentioned unit test fails. + + This fix fixes the inconsistency of the unit test so that `TestRestartPolicy` + could pass again. + + Signed-off-by: Yong Tang + +commit 0f57f47ac39209a7337d0fdcd1217b6f656e971b +Author: Yong Tang +Date: Fri May 13 20:39:24 2016 -0700 + + Vendor engine-api to allow docker daemon reload event. + + This fix updated the vendored engine-api to version + e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event + type of `DaemonEventType`. The purpose is to allow emitting` + `daemon reload` event as is raised in #22463. + + This fix is related to #22463 and #22590. + + Signed-off-by: Yong Tang + +commit ade6b0736e57c4f19e875f95aea0133848084ccc +Author: Riyaz Faizullabhoy +Date: Fri May 13 17:42:40 2016 -0700 + + Utility function for comparing multihash + + Signed-off-by: Riyaz Faizullabhoy + +commit b3bc5e0fe4c62b1c0193fc19777b22636368b551 +Author: John Starks +Date: Thu May 12 21:11:18 2016 -0700 + + Windows: reexec when importing layers + + This improves reliability by doing parsing of potentially untrusted data + in a separate process. It opens the door for further security improvements + if we can lock down the reexec-ed process. It also improves import + performance by only taking the backup and restore privileges once, for the + whole process. + + Signed-off-by: John Starks + +commit 3723b8840671a5f85c43c9c1df6661f751c312fe +Merge: a213a446d7 2af7c5cfe2 +Author: Sebastiaan van Stijn +Date: Sat May 14 01:00:55 2016 +0200 + + Merge pull request #22727 from clawconduce/master + + Fix error for env variables example in docker reference + +commit 9730e04896e8dfe708c81ece709154a6e53c8b55 +Author: Dong Chen +Date: Fri May 13 14:21:12 2016 -0700 + + Add Allen Sun to MAINTAINERS file + + Signed-off-by: Dong Chen + +commit 0256cee017d09465c3dd799a93c6c452820528fb +Merge: f9cfc7500e 8245905aae +Author: Riyaz Faizullabhoy +Date: Fri May 13 14:17:54 2016 -0700 + + Merge pull request #740 from docker/rethink-perms + + Add separate users to rethinkDB databases with only read/write permissions + +commit 17486b09312c4386edcee6eec84c6fc1a4601224 +Author: sarahlynnpark +Date: Fri May 13 14:05:44 2016 -0700 + + Fix '--existing-replica-id' typo + +commit 6d40104f116abdf9740c60846320ce6d36f03edd +Author: John Starks +Date: Fri May 13 18:50:19 2016 +0000 + + Windows: revendor go-winio + + This fixes a variety of small bugs in layer handling and adds a new API + for acquiring privileges for the whole process. + + Fixes #22404 (but only for new images -- existing images will need to be + re-pushed). + + Signed-off-by: John Starks + +commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2 +Author: Charles Law +Date: Fri May 13 10:55:36 2016 -0700 + + Fix error for env variables example in docker reference + + Signed-off-by: Charles Law + +commit 07825a17e7433a1657fee1752a1bc9216574ab35 +Merge: c5f33ecb03 783079aa12 +Author: Dongluo Chen +Date: Fri May 13 10:21:32 2016 -0700 + + Merge pull request #2238 from SvenDowideit/Egnine + + Small spelling fix + +commit 5154856586eb0f81e7c3935448ed163c60b1a24d +Author: Sebastiaan van Stijn +Date: Fri May 13 15:41:45 2016 +0200 + + Fix Markdown formatting in Devicemapper docs + + Fixes some text being presented as "code". + + Also reformatted/wrapped some text and examples + + Signed-off-by: Sebastiaan van Stijn + +commit a213a446d7828c54e9ce104b38e1adfd4827871e +Merge: c4dd432fd4 d166c8fbb2 +Author: Sebastiaan van Stijn +Date: Fri May 13 14:37:45 2016 +0200 + + Merge pull request #22714 from albers/completion-logs--details + + bash completion for `docker logs --details` + +commit c4dd432fd4b0fe6feb51575a1ede8a59b43b97d9 +Merge: 29fe2f34d2 cc6bcaaddc +Author: Sebastiaan van Stijn +Date: Fri May 13 14:36:14 2016 +0200 + + Merge pull request #22713 from albers/completion-daemon-concurrent + + bash completion for `docker daemon --max-concurrent-{down,up}load` + +commit 29fe2f34d2d882ee998545aa9ba120ab251ffc61 +Merge: 9de21de453 6a96684442 +Author: Vincent Demeester +Date: Fri May 13 10:29:45 2016 +0200 + + Merge pull request #22588 from runcom/fix-authz-tests + + pkg: authorization: cleanup tests + +commit 8879458faab9ed1122cc1f00c15680bfd82705dd +Author: allencloud +Date: Fri May 13 15:24:44 2016 +0800 + + add trace in docker engine's pprof to show execution trace in binary form + + Signed-off-by: allencloud + +commit d166c8fbb21ce5ba2e456ca2b737202182dfe7f8 +Author: Harald Albers +Date: Fri May 13 08:42:43 2016 +0200 + + bash completion for `docker logs --details` + + Signed-off-by: Harald Albers + +commit cc6bcaaddcc590bd4810bcc0177ab3c3b43d5a37 +Author: Harald Albers +Date: Fri May 13 08:25:53 2016 +0200 + + bash completion for `docker daemon --max-concurrent-{down,up}load` + + Signed-off-by: Harald Albers + +commit 38c49d99870c762a0ea23dadda414f9cc59071b6 +Author: Yong Tang +Date: Wed Apr 27 19:46:54 2016 -0700 + + Remove `docker/` prefix from log messages tag. + + This fix tries to address the issue raised in #22358 where syslog's + message tag always starts with `docker/` and can not be removed + by changing the log tag templates. + + The issue is that syslog driver hardcodes `path.Base(os.Args[0])` + as the prefix, which is the binary file name of the daemon (`dockerd`). + This could be an issue for certain situations (e.g., #22358) where + user may prefer not to have a dedicated prefix in syslog messages. + There is no way to override this behavior in the current verison of + the docker. + + This fix tries to address this issue without making changes in the + default behavior of the syslog driver. An additional + `{{.DaemonName}}` has been introduced in the syslog tag. This is + assigned as the `docker` when daemon starts. The default log tag + template has also been changed from + `path.Base(os.Args[0]) + "/{{.ID}}"` to `{{.DaemonName}}/{{.ID}}`. + Therefore, there is no behavior changes when log-tag is not provided. + + In order to be consistent, the default log tag for fluentd has been + changed from `docker.{{.ID}}` to `{{DaemonName}}.{{.ID}}` as well. + + The documentation for log-tag has been updated to reflect this change. + + Additional test cases have been added to cover changes in this fix. + + This fix fixes #22358. + + Signed-off-by: Yong Tang + +commit 783079aa12a82deaa6c366e32ef09560a9da2675 +Author: Sven Dowideit +Date: Fri May 13 04:59:08 2016 +0000 + + Small spelling fix + + Signed-off-by: Sven Dowideit + +commit a5b64f2847501bc377c77a989df060646f2d87f8 +Author: Stefan J. Wernli +Date: Tue May 10 16:02:44 2016 -0700 + + Fixing Windows update logic. + + Removing the call to Shutdown from within Signal in order to rely on waitExit handling the exit of the process. + + Signed-off-by: Stefan J. Wernli + +commit 9de21de4531e01169d903751ab48a29457769610 +Merge: cf783266ff faab71701f +Author: Sebastiaan van Stijn +Date: Fri May 13 00:27:29 2016 +0200 + + Merge pull request #22462 from Microsoft/jjh/22181unittests + + Windows: Reduce CLI time, move some to unit tests + +commit ca3aef0c84a91c2cc6996ebb833f566c9243fa98 +Merge: c9fe8920c9 e5645595e3 +Author: Joffrey F +Date: Thu May 12 15:14:15 2016 -0700 + + Merge pull request #3436 from shin-/3374-exec-windows + + Fail gracefully when -d is not provided for exec command on Win32 + +commit cf783266ff314a236d3635e86a43d89677ac99ad +Merge: e811e9784f a0191a2341 +Author: Alexander Morozov +Date: Thu May 12 14:56:55 2016 -0700 + + Merge pull request #22279 from WeiZhang555/wait-channel + + Remove WaitRunning + +commit e811e9784fd95069e9d5e14960e04cb0499ccd1d +Merge: 95872b65fb feacb1205b +Author: Alexander Morozov +Date: Thu May 12 14:46:56 2016 -0700 + + Merge pull request #22544 from Microsoft/jjh/terminate + + Windows: Terminate on failed shutdown, fixes dockerd deadlock + +commit 95872b65fb65bcc275b2fa141b6a991ee085a41a +Merge: c95f1fcbd9 adabb51311 +Author: Alexander Morozov +Date: Thu May 12 14:41:55 2016 -0700 + + Merge pull request #22636 from sean-jc/fix-oom-killer-tests + + Add the swapMemorySupport requirement to OOM tests + +commit c95f1fcbd9d6acc02c9af5fd62d21921b0150cd2 +Merge: ab090291dd 6094be63ac +Author: Alexander Morozov +Date: Thu May 12 14:38:07 2016 -0700 + + Merge pull request #22679 from cyli/bump-notary-version + + Bump notary version up to 0.3.0 and re-vendor. + +commit ab090291dd15c76687672fec10eb9f4106c1cb21 +Merge: 2ae863c28f f6ecba1045 +Author: Sebastiaan van Stijn +Date: Thu May 12 23:27:57 2016 +0200 + + Merge pull request #22707 from TimWolla/patch-1 + + User network does not work with IPv6 + +commit f6ecba104556f4c68b8ad11ee8c2e6b2a27b87ff +Author: Tim Düsterhus +Date: Thu May 12 23:18:58 2016 +0200 + + Clarify that --ip does not work with IPv6 in docker run + + Closes docker/docker#22707 + + Signed-off-by: Tim Düsterhus + +commit e5645595e3057f7b6eadcde922dd9ae7e0ff9363 +Author: Joffrey F +Date: Mon May 9 16:29:27 2016 -0700 + + Fail gracefully when -d is not provided for exec command on Win32 + + Signed-off-by: Joffrey F + +commit c9fe8920c97384b02ea446d95a4d59df4a3d75a3 +Merge: 72f6a5c8d3 4bf5271ae2 +Author: Joffrey F +Date: Thu May 12 13:52:20 2016 -0700 + + Merge pull request #3457 from dnephin/fix_versions_script + + Skip invalid git tags in versions.py + +commit f9cfc7500e0f02c76d7c256cf54eb363d9d69024 +Merge: d6a189d989 49a7372650 +Author: Riyaz Faizullabhoy +Date: Thu May 12 13:43:01 2016 -0700 + + Merge pull request #743 from docker/docs-0.3-changelist-summary + + Add short changelog update to docs + +commit 2ae863c28fdae1da9794942c90efa9f217bccd83 +Merge: 150009e9d8 aed525384a +Author: Sebastiaan van Stijn +Date: Thu May 12 21:29:45 2016 +0200 + + Merge pull request #22683 from npcode/docs-no-request-status + + docs: Remove RequestStatusCode + +commit 150009e9d8dbde08d15e0a72c1022f867860f57e +Merge: 350832acfa 1fc0acc9ae +Author: Alexander Morozov +Date: Thu May 12 12:00:57 2016 -0700 + + Merge pull request #22630 from thaJeztah/refactor-overlay-compatibility + + refactor overlay storage driver compatibility check + +commit 350832acfa2f90bd4d3c280dce02843761d6f876 +Merge: b5094fbd2d 194c72611d +Author: Alexander Morozov +Date: Thu May 12 11:51:54 2016 -0700 + + Merge pull request #22698 from cpuguy83/22612_fix_map_access + + Fix concurrent map access in bytespipe + +commit 4bf5271ae2d53f8c6467642b6bd4c3372ed52da8 +Author: Daniel Nephin +Date: Thu May 12 14:41:40 2016 -0400 + + Skip invalid git tags in versions.py + + Signed-off-by: Daniel Nephin + +commit b5094fbd2dee6c2db99be5d4a7a7194e1c81b133 +Merge: e9117578a7 d8c4bb19fb +Author: John Howard +Date: Thu May 12 11:39:14 2016 -0700 + + Merge pull request #22333 from thaJeztah/update-label-description + + RFC: Add "process" labels + +commit 4fa0eccd10c5c120fe1f641285db920cf643dbe8 +Author: Aaron Lehmann +Date: Fri Apr 22 13:27:07 2016 -0700 + + Update image specification for content-addressability changes + + The image spec in image/spec/v1.md is quite a bit out of date. Not only + is it missing the changes that went into 1.10 for content + addressability, but it has inaccuracies that date back further, such as + mentioning storing tarsum in the image configuration. + + This commit creates image/spec/v1.1.md which brings the specification up + to date. It discusses content addressability, new fields in the image + configuration, the repository/tag grammar, and the current mechanism for + exporting an image. + + Signed-off-by: Aaron Lehmann + +commit 72f6a5c8d3043ff91fa899fce352ff88a6818bb1 +Merge: dc88e54010 4b01f6dcd6 +Author: Aanand Prasad +Date: Thu May 12 16:55:11 2016 +0100 + + Merge pull request #3433 from anton44eg/issue_3432 + + add msg attribute to ProjectError class + +commit dc88e540106e7f74d6d8fcb9cae52a8d56e1fb2b +Merge: f1603a3ee2 28fb91b344 +Author: Joffrey F +Date: Thu May 12 08:53:25 2016 -0700 + + Merge pull request #3399 from yorkedork/fix/env-file-validation + + Adds additional validation to 'env_vars_from_file'. + +commit e9117578a7837eda31d690d5e51d09d43a6a8fca +Merge: 475c37dd66 7368e41c07 +Author: Arnaud Porterie +Date: Thu May 12 08:51:28 2016 -0700 + + Merge pull request #22445 from yongtang/20936-22443-concurrent-connection + + Docker pull/push with max concurrency limits. + +commit 194c72611d5053f1e05dd020d02989dec872a06b +Author: Brian Goff +Date: Thu May 12 10:04:05 2016 -0400 + + Fix concurrent map access in bytespipe + + When getting and returning a buffer, need to make sure to syncronize + access to the pools map. + + Signed-off-by: Brian Goff + +commit 475c37dd66ce4b2f3994ac61a4494950e43873b9 +Merge: edf5e097a2 57e2a82355 +Author: Vincent Demeester +Date: Thu May 12 14:35:39 2016 +0200 + + Merge pull request #22694 from allencloud/fix-typos-in-docs + + docs: correct some typos + +commit edf5e097a2ee1e1b90a6634d6fa6cf1547dff65c +Merge: 7fd9f9964a 73d96a6b17 +Author: Vincent Demeester +Date: Thu May 12 14:35:21 2016 +0200 + + Merge pull request #22687 from haoshuwei/fix-docs-securitymd + + Fixing security.md + +commit 7fd9f9964aa110b22b68c45be6148aa298abeb5c +Merge: ec2b0c0889 a20b02b915 +Author: Vincent Demeester +Date: Thu May 12 13:20:07 2016 +0200 + + Merge pull request #22620 from yongtang/05092016-remove-deprecated-driver-specific-log-tags + + Remove deprecated driver specific log tags + +commit 57e2a82355c15005875fedc733dc45081af5a2d9 +Author: allencloud +Date: Thu May 12 18:38:02 2016 +0800 + + fix typos in docs + + Signed-off-by: allencloud + +commit ec2b0c08890a57a0d4e5ed9991bfc845b39b706d +Merge: 24a0f1f3e8 ed868a2e11 +Author: Vincent Demeester +Date: Thu May 12 12:09:36 2016 +0200 + + Merge pull request #22682 from hqhq/hq_update_check + + Update go-check + +commit 24a0f1f3e89476f29c22e48d1e5cbdcc39611958 +Merge: a14e85c40d 067e54eeac +Author: Vincent Demeester +Date: Thu May 12 11:22:44 2016 +0200 + + Merge pull request #22689 from thaJeztah/docs-update-menu-order + + docs: update menu order in security section + +commit 067e54eeacf691c49cc169b80acd814c62a504d0 +Author: Sebastiaan van Stijn +Date: Thu May 12 11:19:53 2016 +0200 + + docs: update menu order in security section + + Signed-off-by: Sebastiaan van Stijn + +commit a14e85c40d210252096bfb6bbef1e7b66e2e2bfd +Merge: 84a6818b11 6f06e98f57 +Author: Sebastiaan van Stijn +Date: Thu May 12 11:17:47 2016 +0200 + + Merge pull request #22579 from jfrazelle/docs-add-security-non-events + + docs: add security non-events + +commit 73d96a6b17b1fb8af71dc68d78e50f88b89f4167 +Author: Hao Shu Wei +Date: Thu May 12 16:52:03 2016 +0800 + + Fixing security.md + + Signed-off-by: Hao Shu Wei + +commit 84a6818b11e6bf74d13222d0df2fe7d1ae811bb6 +Merge: c273163e80 18eeb39985 +Author: Vincent Demeester +Date: Thu May 12 10:29:39 2016 +0200 + + Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests + + Reimplement some builder integration tests as unit tests + +commit c5f33ecb030ced3a12293394eab24e102a8f7960 +Merge: 45d2960226 97c534cae8 +Author: Dongluo Chen +Date: Wed May 11 23:34:04 2016 -0700 + + Merge pull request #2230 from kolyshkin/patch-1 + + install-manual: fix sec. swarm manager connect + +commit 6094be63ac3d29c23024daa2152719b653c78092 +Author: cyli +Date: Wed May 11 15:25:05 2016 -0700 + + Bump notary version up to 0.3.0 and re-vendor. + + Signed-off-by: cyli + +commit aed525384a8c1db1b3b9960ead49586836536785 +Author: Yi EungJun +Date: Thu May 12 14:26:39 2016 +0900 + + docs: Remove RequestStatusCode + + The requests doesn't include RequestStatusCode field. + + Signed-off-by: Yi EungJun + +commit c19d866e256a2b6d979994ed8720addd9ce16fdd +Merge: c120a925f3 b419c5d9ca +Author: David Gageot +Date: Thu May 12 07:18:12 2016 +0200 + + Merge pull request #3248 from theodthompson/patch-hyperv-check + + adding hypervisor check to virtualbox pre-create check + +commit c273163e80da5f5895db1dc1102a470ec45e0a69 +Merge: f7c79cdeae ef7cd21766 +Author: Sven Dowideit +Date: Thu May 12 14:15:39 2016 +1000 + + Merge pull request #22672 from kevinmeredith/correct_trapped_signals + + Correct docs for a docker container's clean-up. + +commit 7368e41c07c21a1e2c6a49abecd1c2fc76404e49 +Author: Yong Tang +Date: Thu May 5 21:45:55 2016 -0700 + + Docker pull/push with max concurrency limits. + + This fix tries to address issues raised in #20936 and #22443 + where `docker pull` or `docker push` fails because of the + concurrent connection failing. + Currently, the number of maximum concurrent connections is + controlled by `maxDownloadConcurrency` and `maxUploadConcurrency` + which are hardcoded to 3 and 5 respectively. Therefore, in + situations where network connections don't support multiple + downloads/uploads, failures may encounter for `docker push` + or `docker pull`. + + This fix tries changes `maxDownloadConcurrency` and + `maxUploadConcurrency` to adjustable by passing + `--max-concurrent-uploads` and `--max-concurrent-downloads` to + `docker daemon` command. + + The documentation related to docker daemon has been updated. + + Additional test case have been added to cover the changes in this fix. + + This fix fixes #20936. This fix fixes #22443. + + Signed-off-by: Yong Tang + +commit ed868a2e119ded10cdc794e2d109210c8a6b0546 +Author: Qiang Huang +Date: Thu May 12 09:19:23 2016 +0800 + + Update go-check + + It includes a small improvement, we hit test timeout sometimes + for some reason, print out the timed out case would be very + helpful. + + Signed-off-by: Qiang Huang + +commit d6a189d9899b848c4c5eb79f231adb80633d4692 +Merge: 658a25c4ef 906ada43a8 +Author: Riyaz Faizullabhoy +Date: Wed May 11 17:03:35 2016 -0700 + + Merge pull request #741 from endophage/changelog-v0.3.0 + + update changelog for v0.3.0 + +commit 49a7372650921cc1018782b72695ae5e38a6d56c +Author: Riyaz Faizullabhoy +Date: Wed May 11 17:03:19 2016 -0700 + + Add short changelog update to docs + + Signed-off-by: Riyaz Faizullabhoy + +commit 4a915d6efdea23f437cb4144211aaf2faed27774 +Merge: e69f108924 8854eed7ab +Author: Derek McGowan +Date: Wed May 11 16:30:28 2016 -0700 + + Merge pull request #1721 from cyli/change-auth-scope-grammar + + Hostnames can be optionally supported by the auth spec scope grammar + +commit f7c79cdeae67cec70c5257e808cb51eb7a90d35c +Merge: b3a1ae02a9 79490a6ad3 +Author: Arnaud Porterie +Date: Wed May 11 13:08:48 2016 -1000 + + Merge pull request #22455 from Anvil/bash-completion-failglob + + docker bash completions fails when failglob is enabled + +commit b3a1ae02a91d93efdface95ce7ed131dc397dedd +Merge: 78e9f2e9e7 7f66598583 +Author: Arnaud Porterie +Date: Wed May 11 13:08:24 2016 -1000 + + Merge pull request #22353 from Microsoft/jjh/dockercp + + Windows: docker cp platform semantically consistent paths + +commit 906ada43a86f455856df24987c6ff00c8e00e743 +Author: David Lawrence +Date: Wed May 11 14:38:27 2016 -0700 + + update changelog for v0.3.0 + Signed-off-by: David Lawrence (github: endophage) + +commit 78e9f2e9e74a0c25318054ed21c539acfb44e235 +Merge: bacce5ef4f 084c72e760 +Author: Arnaud Porterie +Date: Wed May 11 12:49:26 2016 -1000 + + Merge pull request #22368 from tianon/wheezy-lts + + Update contrib/mkimage/debootstrap to include wheezy-lts + +commit bacce5ef4f77acc9450e46bc7a4ca8ad3330b134 +Merge: 28452ca783 b9135646d6 +Author: Arnaud Porterie +Date: Wed May 11 12:44:55 2016 -1000 + + Merge pull request #22365 from dnephin/fix_selinux_for_dockerd + + Update the binary name in docker-engine-selinux/docker.fc + +commit 28452ca78346cf8824ea71be35b4773f96405b1a +Merge: dc430944b9 54d09c6c2d +Author: Arnaud Porterie +Date: Wed May 11 12:44:35 2016 -1000 + + Merge pull request #22356 from allencloud/close-http-response-body-when-attaching + + close http response body when attaching + +commit dc430944b9682b0f46806dcb7bd733d25e2b6f31 +Merge: 730b974c64 f68b61052b +Author: Arnaud Porterie +Date: Wed May 11 12:38:12 2016 -1000 + + Merge pull request #22262 from kencochrane/fix_release_deb + + Create the correct directory structure for apt-ftparchive + +commit 8854eed7ab7ea9e45638e24c67e03ea9adea5d11 +Author: cyli +Date: Wed May 11 13:41:58 2016 -0700 + + Update the auth spec scope grammar to reflect the fact that hostnames are optionally supported. + + Signed-off-by: cyli + +commit 97c534cae880be9b0fceb190f0e38fc648ae23af +Author: Kirill Kolyshkin +Date: Wed May 11 14:10:09 2016 -0700 + + install-manual: fix sec. swarm manager connect + + Apparently, without -p 4000:4000 the secondary swarm manager would be inaccessible, basically rendering it useless. + + Signed-off-by: Kir Kolyshkin + +commit 45d2960226a351935f3179fcff92c242ef2bc5df +Merge: 922472ae58 fb28924a69 +Author: Dongluo Chen +Date: Wed May 11 14:02:04 2016 -0700 + + Merge pull request #2184 from realityone/fix-reschedule-docs + + fix set reschedule policy docs + +commit 18eeb399852b7efe9459a1d77b0a5032a6b88bba +Author: Tomasz Kopczynski +Date: Sun May 8 19:22:06 2016 +0200 + + Reimplementing builder integration tests as unit tests + + Signed-off-by: Tomasz Kopczynski + +commit ef7cd217663c7f6bff5f1d49461c004e86fed867 +Author: kevinmeredith +Date: Wed May 11 14:49:24 2016 -0400 + + Correct docs for a docker container's clean-up. + + The 'Unix Signals' (https://en.wikipedia.org/wiki/Unix_signal#Handling_signals) wiki explains that: + > 'There are two signals which cannot be intercepted and handled: SIGKILL and SIGSTOP.' + + Signed-off-by: kevinmeredith + +commit 730b974c641242cedd96d5982495261aa7ba5c81 +Merge: e421668b1b 34175eb47e +Author: Antonio Murdaca +Date: Wed May 11 20:56:31 2016 +0200 + + Merge pull request #22637 from LK4D4/simplify_tcp_proxy + + pkg/proxy: remove unused 'transfered' variable + +commit e421668b1bdd611e49cd268341e75d9f5e8801c2 +Merge: 4c654eeea2 b82fc524a7 +Author: Tibor Vass +Date: Wed May 11 13:21:15 2016 -0400 + + Merge pull request #21708 from tianon/InRelease + + Also generate "InRelease" files for newer APT clients + +commit 4c654eeea209b9770071fe190d27976622298cdd +Merge: 3710f9074e 2cddd1cd1f +Author: Vincent Demeester +Date: Wed May 11 18:59:53 2016 +0200 + + Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist + + docs: update seccomp whitelist + +commit 2cddd1cd1f3135f36f6afcc84ddfda904aeee3b5 +Author: Sebastiaan van Stijn +Date: Wed May 11 18:45:27 2016 +0200 + + docs: update seccomp whitelist + + the 'modify_ldt' was listed as "blocked by default", + but was whitelisted in 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b + + this updates the documentation to reflect this + + Signed-off-by: Sebastiaan van Stijn + +commit 3710f9074e7cb752def69b1b80e4af3e6ed87daf +Merge: fd3a795a47 0a4de93e13 +Author: Sebastiaan van Stijn +Date: Wed May 11 18:05:52 2016 +0200 + + Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags + + Update deprecated docs for cli flags removal. + +commit fd3a795a478cec71d2c9fd2178c67482f04ef029 +Merge: da74f9653d 1ac1b78b3a +Author: Alexander Morozov +Date: Wed May 11 07:57:00 2016 -0700 + + Merge pull request #22278 from runcom/fixies-dockerd + + Fixies dockerd + +commit da74f9653dc11c28e0b70267a2882628945051e9 +Merge: af60a9e599 efb3946171 +Author: Alexander Morozov +Date: Wed May 11 07:41:17 2016 -0700 + + Merge pull request #22642 from amitkris/uprev_gozfs + + update go-zfs to include Solaris support + +commit 2dce79e05ab8f8fd22ca7b2f73121b2d7723f7cf +Author: Brian Goff +Date: Wed May 4 10:13:23 2016 -0400 + + Wait for discovery on container start error + + This gives discovery a chance to initialize, particularly if the K/V + store being used is in a container. + + Signed-off-by: Brian Goff + +commit 0a4de93e1371a0d62ca6f3a5121368d7ecfde3fe +Author: Yong Tang +Date: Wed May 11 06:48:07 2016 -0700 + + Update deprecated docs for cli flags removal. + + The old command line options have been deprecated in 1.8.0 and + eventually removed in 1.10.0 through PR #17724, though the + deprecated.md still shows `Target For Removal In Release`. + + This fix updates the deprecated.md and changes + `Target For Removal In Release` to `Removed In Release`. + + Signed-off-by: Yong Tang + +commit 5d7600e3cada81e26b01aa0e2713c3aef517bcdc +Author: Gleb Schukin +Date: Wed May 11 15:06:08 2016 +0300 + + Handle rare case when ceph doesn't return Last-Modified for HEAD requests in case DLO manifest doesn't have any segments + + Signed-off-by: Gleb Schukin + +commit 52eecb556c0096f0f331b52a0ee818951af576c8 +Author: Gleb Schukin +Date: Wed May 11 15:06:08 2016 +0300 + + Handle rare case when ceph doesn't return Last-Modified for HEAD requests in case DLO manifest doesn't have any segments + + Signed-off-by: Gleb Schukin + +commit 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 +Author: Antonio Murdaca +Date: Sun Apr 24 14:27:19 2016 +0200 + + contrib: init: use dockerd + + Signed-off-by: Antonio Murdaca + +commit d74f273c53e10ca3c7161c858bc448fe9fa33e11 +Author: Yi EungJun +Date: Wed May 11 17:33:18 2016 +0900 + + Fix port binding of swarm master + + The port is 3376 by default but could be modified by --swarm-host + option. + + Signed-off-by: Yi EungJun + +commit a01c4dc8f85827f32d88522e5153dddc02f11806 +Author: Justin Cormack +Date: Fri May 6 15:17:41 2016 +0100 + + Align default seccomp profile with selected capabilities + + Currently the default seccomp profile is fixed. This changes it + so that it varies depending on the Linux capabilities selected with + the --cap-add and --cap-drop options. Without this, if a user adds + privileges, eg to allow ptrace with --cap-add sys_ptrace then still + cannot actually use ptrace as it is still blocked by seccomp, so + they will probably disable seccomp or use --privileged. With this + change the syscalls that are needed for the capability are also + allowed by the seccomp profile based on the selected capabilities. + + While this patch makes it easier to do things with for example + cap_sys_admin enabled, as it will now allow creating new namespaces + and use of mount, it still allows less than --cap-add cap_sys_admin + --security-opt seccomp:unconfined would have previously. It is not + recommended that users run containers with cap_sys_admin as this does + give full access to the host machine. + + It also cleans up some architecture specific system calls to be + only selected when needed. + + Signed-off-by: Justin Cormack + +commit 8245905aaecc9a40279ffc73b220b5771a4fd8b9 +Author: Riyaz Faizullabhoy +Date: Tue May 10 16:40:46 2016 -0700 + + Add password for server and signer + + Signed-off-by: Riyaz Faizullabhoy + +commit db8fa5d3ae06e92c8d9534f7ddd24f3e02d9d0f2 +Author: Riyaz Faizullabhoy +Date: Tue May 10 15:12:06 2016 -0700 + + Use server and signer users during non-bootstrap connections, bump + gorethink + + Signed-off-by: Riyaz Faizullabhoy + +commit af60a9e599543daa70da6d5d3b07343aa780c3ad +Merge: a4bb2c7d7a 4e290986cd +Author: Alexander Morozov +Date: Tue May 10 15:06:23 2016 -0700 + + Merge pull request #22511 from crosbymichael/update-runc-containerd + + Update runc and containerd deps + +commit 34175eb47ef5de023b68cef5af529b74c68b3ab3 +Author: Alexander Morozov +Date: Tue May 10 12:24:43 2016 -0700 + + pkg/proxy: remove unused 'transfered' variable + + That simplified code a bit + + Signed-off-by: Alexander Morozov + +commit efb3946171ffa30b716a0614e8037c6b0e699771 +Author: Amit Krishnan +Date: Mon May 9 16:03:51 2016 -0700 + + update go-zfs to include Solaris support + + Signed-off-by: Amit Krishnan + +commit 922472ae586292a87b7fbce1831d8376b02e98c9 +Merge: 765a16274f 4ed5f96ea5 +Author: Dongluo Chen +Date: Tue May 10 13:49:43 2016 -0700 + + Merge pull request #2224 from allencloud/fix-bug-in-api-server + + fix bug that http server should return when handler is nil + +commit a4bb2c7d7a1da18c26626467f124d5532a9f927e +Merge: 59db39c5c8 d14a1c30f2 +Author: Sebastiaan van Stijn +Date: Tue May 10 22:08:56 2016 +0200 + + Merge pull request #22634 from thaJeztah/dj-jazzy-jess + + Add Jess to alumni + +commit e0bcf4cba529e506e9a7fbf945a899b59bcbca07 +Merge: 8df589cf8f 462cab80a7 +Author: French Ben +Date: Tue May 10 12:22:50 2016 -0700 + + Merge pull request #1667 from docker/add-pipe + + Added pipe back in + +commit 4540bbac88439a0b469b72594ba84d65980b2add +Author: Riyaz Faizullabhoy +Date: Tue May 10 11:40:09 2016 -0700 + + create users for rethink dbs + + Signed-off-by: Riyaz Faizullabhoy + +commit 462cab80a7b714a1af3bfb008a3bf5e4e8b5d976 +Author: French Ben +Date: Tue May 10 10:52:08 2016 -0700 + + Added pipe back in + + Signed-off-by: French Ben + +commit adabb51311ecac031bd72378c5ed1669d1835d40 +Author: Sean Christopherson +Date: Tue May 10 09:58:55 2016 -0700 + + Add the swapMemorySupport requirement to OOM tests + + Add the swapMemorySupport requirement to all tests related to the OOM killer. The --memory option has the subtle side effect of defaulting --memory-swap to double the value of --memory. The OOM killer doesn't kick in until the container exhausts memory+swap, and so without the memory swap cgroup the tests will timeout due to swap being effectively unlimited. + + Document the default behavior of --memory-swap in the docker run man page. + + Signed-off-by: Sean Christopherson + +commit e69f10892435aa7053170193aaab1593a6c0a671 +Merge: 050a30eac0 db713e127b +Author: Derek McGowan +Date: Tue May 10 11:02:59 2016 -0700 + + Merge pull request #1716 from dmcgowan/install-certs + + Integration Tests: Generate the certificate directory with a pretest script + +commit feacb1205b2cf9166e75e707d7b5fa2d09e80e03 +Author: John Howard +Date: Thu May 5 19:49:59 2016 -0700 + + Windows: Terminate on failed shutdown + + Signed-off-by: John Howard + +commit 59db39c5c86d89e16654fdd0dc6cf6492b42fbea +Merge: 2f7c84120d 47ef6d7969 +Author: John Howard +Date: Tue May 10 10:02:54 2016 -0700 + + Merge pull request #22619 from jterry75/master + + Adds a correct error string for network validation + +commit 1fc0acc9ae77752858057d1f6f8487ccd82372be +Author: Sebastiaan van Stijn +Date: Tue May 10 15:25:54 2016 +0200 + + refactor overlay storage driver compatibility check + + use a consistent approach for checking if the + backing filesystem is compatible with the + storage driver. + + also add an error-message for the AUFS driver if + an incompatible combination is found. + + Signed-off-by: Sebastiaan van Stijn + +commit 658a25c4efe1cd5e7151bd9bd4dcb99bc698a4b8 +Merge: 90d767b27c 31a5ebcf4b +Author: David Lawrence +Date: Tue May 10 09:04:40 2016 -0700 + + Merge pull request #724 from HuKeping/cli + + Feature: Introduce some flags on notary verify + +commit 90d767b27ca42b5ab06402d93e0f111d1edd0d66 +Merge: eadda460db 019b4b02e1 +Author: David Lawrence +Date: Tue May 10 09:01:35 2016 -0700 + + Merge pull request #728 from twistlock/automate_password + + Enable using notary client list op with user name/passwords in scripts + +commit d14a1c30f259ba5dfce5183105a2ccab81dcc64c +Author: Sebastiaan van Stijn +Date: Tue May 10 17:53:17 2016 +0200 + + Add Jess to alumni + + Signed-off-by: Sebastiaan van Stijn + +commit a20b02b9158c283402d174926c84e657e53b17a1 +Author: Yong Tang +Date: Mon May 9 19:04:09 2016 -0700 + + Remove deprecated driver specific log tags + + Since 1.9, driver specific log tag options + `syslog-tag` + `gelf-tag` + `fluentd-tag` + have been deprecated in favor of the generic tag + option which is standard across different logging + drivers. + + This fix removed the deprecated driver specific + log tag options of `syslog-tag`, `gelf-tag`, + `fluentd-tag` for 1.12 and updated the docs. + + Signed-off-by: Yong Tang + +commit 050a30eac04cc83894e80f3e4525db0b14f474bb +Merge: 42a710f889 2a4deee441 +Author: Richard Scothern +Date: Tue May 10 13:43:25 2016 +0100 + + Merge pull request #1702 from RichardScothern/api.md + + Remove the unimplemented monolithic upload section from the API + +commit 765a16274f088b764691f11a55939aaa05e3e6b9 +Merge: 34e3da3acd b1f42fb8cc +Author: Xian Chaobo +Date: Tue May 10 20:30:46 2016 +0800 + + Merge pull request #2219 from allencloud/hide-field-error-when-empty + + hide error in info when empty + +commit 42a710f8893e57a49e6180daa968ac27c5e1429a +Merge: 4ecea4b311 4f2ee029a2 +Author: Richard Scothern +Date: Tue May 10 11:44:18 2016 +0100 + + Merge pull request #1714 from RichardScothern/us-gov-west-1 + + Add 'us-gov-west-1' to the valid region list. + +commit 4ed5f96ea5e6c84d3110d5dabbe071d3d02007a1 +Author: Sun Hongliang +Date: Tue May 10 17:02:11 2016 +0800 + + fix bug that http server should return when handler is nil + + Signed-off-by: Sun Hongliang + +commit 2f7c84120dbe918fc6c7201764765d5beb448021 +Merge: e16753ce19 5248f5c3d1 +Author: Sebastiaan van Stijn +Date: Tue May 10 10:23:18 2016 +0200 + + Merge pull request #22603 from runcom/fix-docker-build + + pkg: chrootarchive: chroot_linux: fix docker build + +commit 019b4b02e167c6d16c9334e9008f36455e415ed6 +Author: Liron Levin +Date: Tue May 10 10:44:24 2016 +0300 + + Add is terminal check to tuf.go (enable using notary client with username/passwords in scripts) + + Same behavior as `/passphrase/passphrase.go` (line 104) + + Signed-off-by: Liron Levin + +commit fb28924a690c3167acd492ab528dc2156cb6aa33 +Author: realityone +Date: Thu Apr 28 18:08:53 2016 +0800 + + fix set reschedule policy docs + + Signed-off-by: realityone + +commit 31a5ebcf4b4ecd02f37a0c67edae5ed04e949e44 +Author: HuKeping +Date: Tue May 10 09:47:33 2016 +0800 + + From riyazdf's review + + Prior to this patch, if we provide a value to the output flag, we + write both to the file as well as stdout which is not consistent + with the flag description and also not the intended. + + Signed-off-by: Hu Keping + +commit 0f5d22f95f810aa3234e3e6f9b9a62a754ce628d +Author: HuKeping +Date: Sat May 7 21:25:26 2016 +0800 + + Add test for those helper functions + + Signed-off-by: Hu Keping + +commit 3b2d9e969f34e32529f6fd6b5bdd8fe30b9f4ca7 +Author: HuKeping +Date: Sat May 7 20:29:59 2016 +0800 + + Add a file to keep all the helper functions + + To prevent the tuf.go growing even more bigger, and refactor some code. + + Signed-off-by: Hu Keping + +commit 747a296e86f257b5a8a7cc6643e74cc804c9488f +Author: HuKeping +Date: Sat May 7 19:46:03 2016 +0800 + + Introduce flag --quiet on notary verify + + If --quiet(-q for short) was provided, we output nothing except errors. + + Signed-off-by: Hu Keping + +commit 75ac7f6f7255f484fd7992e62eddb65b01d79f6b +Author: HuKeping +Date: Sat May 7 19:26:40 2016 +0800 + + Introduce flag --output on notary verify + + If --output(-o for short) was provided, we write to a file, + instead of STDOUT. + + Signed-off-by: Hu Keping + +commit e48b027ac3b8e19f5ce3e16783431d3b2c022df9 +Author: HuKeping +Date: Sat May 7 18:11:51 2016 +0800 + + Introduce flag --input on notary verify + + If --input(-i for short) was provided, we read the from a file, + instead of STDIN. + + Signed-off-by: Hu Keping + +commit 47ef6d7969a3396f6ecc3bb27aac425b1a65b344 +Author: Justin Terry +Date: Mon May 9 16:35:35 2016 -0700 + + Adds a correct error string for network validation + + Fixes the negative networking test to include the new error string + from recent Windows builds. + + Signed-off-by: Justin Terry + +commit 5248f5c3d1d91ea4235ffe57962e38293af18f34 +Author: Antonio Murdaca +Date: Mon May 9 17:06:46 2016 +0200 + + pkg: chrootarchive: chroot_linux: fix docker build + + The path we're trying to remove doesn't exist after a successful + chroot+chdir because a / is only appended after pivot_root is + successful and so we can't cleanup anymore with the old path. + Also fix leaking .pivot_root dirs under /var/lib/docker/tmp/docker-builder* + on error. + + Fix https://github.com/docker/docker/issues/22587 + Introduced by https://github.com/docker/docker/pull/22506 + + Signed-off-by: Antonio Murdaca + +commit 4e290986cdf08a34ad508473bab702793503fa6b +Author: Michael Crosby +Date: Mon May 9 15:21:41 2016 -0700 + + Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a + + This syncs the protobuf version with the one that is used with + containerd. + + Signed-off-by: Michael Crosby + +commit 6889c3276c6895a8440dc8883b8cd608793199f3 +Author: Michael Crosby +Date: Mon May 9 15:17:10 2016 -0700 + + Fix containerd proto for connection + + Signed-off-by: Michael Crosby + +commit cfb976438677b15ec023b2ad4822bf1b2f63cc8f +Author: Michael Crosby +Date: Wed May 4 13:09:53 2016 -0700 + + Update runc and containerd deps + + containerd: 57b7c3da915ebe943bd304c00890959b191e5264 + runc: d49ece5a83da3dcb820121d6850e2b61bd0a5fbe + + Signed-off-by: Michael Crosby + +commit e16753ce192cc80d3e207d7b3063a9dab36983cb +Merge: e8aac7de4c a1c950913f +Author: Alexander Morozov +Date: Mon May 9 14:57:36 2016 -0700 + + Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info + + handle error when getting hostname in info api + +commit eadda460db93e166d29569bea4ae5136a446d67a +Merge: 6081e96224 6c87dbe4c6 +Author: Riyaz Faizullabhoy +Date: Mon May 9 14:38:18 2016 -0700 + + Merge pull request #726 from docker/rethink-timeouts + + Increase timeout for RethinkDB (default is 0), remove extra wait + +commit 6081e96224d19cae2b836cbd86ad19c6c7109389 +Merge: 61ac085a26 2699ced85e +Author: Ying Li +Date: Mon May 9 14:35:24 2016 -0700 + + Merge pull request #727 from cyli/save-root-role-only-on-rotate + + Do not save old root roles until the first root rotation + +commit db713e127ba35bd15595113df56ee964de24637a +Author: Derek McGowan +Date: Mon May 9 14:21:53 2016 -0700 + + Generate the certificate directory with a pretest script + + fixes #1690 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 2699ced85e59f1793b9b175d9060dc8be495d708 +Author: Ying Li +Date: Mon May 9 13:32:03 2016 -0700 + + Simplify even further and only save the previous role during a root rotation + so that in the saved roles named "root.version", the version is the latest + version for which that root role was valid. + + Signed-off-by: Ying Li + +commit e8aac7de4c2491cf7d9ba5233269602e6f5c54d3 +Merge: 251b273fd2 da1dbd2093 +Author: Sebastiaan van Stijn +Date: Mon May 9 22:59:07 2016 +0200 + + Merge pull request #22611 from tonistiigi/attach-docs + + docs: clarify docker attach + +commit da1dbd2093ec040f05f4daf9fc8ca28dc8262ec8 +Author: Tonis Tiigi +Date: Mon May 9 10:40:11 2016 -0700 + + docs: clarify docker attach + + Signed-off-by: Tonis Tiigi + +commit 6c87dbe4c6248d59793d20fa37203df4c9d0886e +Author: Riyaz Faizullabhoy +Date: Mon May 9 13:25:07 2016 -0700 + + Remove wait after dbCreate + + Signed-off-by: Riyaz Faizullabhoy + +commit 2f43fa66cc1445aa54ced4372c64210bc3719387 +Author: Ying Li +Date: Mon May 9 12:02:48 2016 -0700 + + Shift the code that saves the roles around to be slightly more clear what + roles it's saving and why. + + Signed-off-by: Ying Li + +commit 8df589cf8faf8190a25bd7ca7097e69725096396 +Merge: e8098e6e5e 684278fe06 +Author: French Ben +Date: Mon May 9 14:51:19 2016 -0400 + + Merge pull request #1529 from alexandrev/issue-1521 + + Changes to the Gruntfile to allow to create a release version on Windows + +commit e8098e6e5ed5e03068f44ede28a7489553cae6b6 +Merge: 35b3b2aa81 9ad51afdb5 +Author: French Ben +Date: Mon May 9 14:47:21 2016 -0400 + + Merge pull request #1394 from alexandrev/issue-1369 + + Fix stop the machine on close on Windows + +commit 9d717780d274978f94cd4c657c5d15503eac8a37 +Author: Ying Li +Date: Mon May 9 10:46:14 2016 -0700 + + Do not save old root roles until the first root rotation + + Signed-off-by: Ying Li + +commit 251b273fd23711ef187b05c13dbabb480bac86b0 +Merge: c5e3644f03 d73589331d +Author: Sebastiaan van Stijn +Date: Mon May 9 19:48:12 2016 +0200 + + Merge pull request #22609 from cyli/minor-docs-update + + Minor tense correction for deprecated docs + +commit d73589331df4288aa6211fb3733598bbad67b73b +Author: cyli +Date: Mon May 9 10:29:42 2016 -0700 + + Minor tense correction for deprecated docs + + Signed-off-by: cyli + +commit c5e3644f03acb71473a1c19437891f6903aca738 +Merge: fad0305ee3 47c353eb46 +Author: Brian Goff +Date: Mon May 9 13:28:08 2016 -0400 + + Merge pull request #22562 from tonistiigi/fix-loopback-release + + Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError + +commit fad0305ee3f697c70654e4ade7dfdd92483eb3e1 +Merge: 9ffd2652e2 1f0d5aba50 +Author: Alexander Morozov +Date: Mon May 9 10:10:27 2016 -0700 + + Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env + + Remove deprecated Docker Content Trust ENV passphrase variables + +commit 6f06e98f57fe4564003d5b2adbe4ef2fcfbe8df8 +Author: Jess Frazelle +Date: Sat May 7 17:19:17 2016 -0700 + + docs: add security non-events + + Signed-off-by: Jess Frazelle + Signed-off-by: Jess Frazelle + +commit 9ffd2652e249f02515410487bdc41e348e7979b1 +Merge: 20d5d10983 6a033e617f +Author: Tibor Vass +Date: Mon May 9 12:23:58 2016 -0400 + + Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror + + Allow changing wheezy deb builder backport mirror + +commit 6a033e617f6c948788c580b26c6567d7d9ef359e +Author: Kenfe-Mickael Laventure +Date: Mon May 9 09:10:30 2016 -0700 + + Allow changing wheezy deb builder backport mirror + + Signed-off-by: Kenfe-Mickael Laventure + +commit 4f2ee029a2a9b48d7f28f5013268196ed0ebe1e9 +Author: Richard Scothern +Date: Mon May 9 16:38:16 2016 +0100 + + Add 'us-gov-west-1' to the valid region list. + + Signed-off-by: Richard Scothern + +commit 20d5d10983b3e126427aa920d9f5ac8c68967c27 +Merge: 3deb2d7280 c52a373bc8 +Author: Vincent Demeester +Date: Mon May 9 14:37:34 2016 +0200 + + Merge pull request #21115 from wenchma/linkable + + update link comments + +commit 4b01f6dcd657636a6d05f453dfd58a6d3826ca5e +Author: Anton Simernia +Date: Mon May 9 18:15:32 2016 +0700 + + add msg attribute to ProjectError class + + Signed-off-by: Anton Simernia + +commit 3deb2d7280404f9fadd7af2a10bc9a0aad2fc419 +Merge: 1e4068713b 018c22880d +Author: Sebastiaan van Stijn +Date: Mon May 9 12:18:11 2016 +0200 + + Merge pull request #22572 from yongtang/05072016-add-missing-subtitle-in-deprecated-docs + + Add the missing subtitle in deprecated docs for --security-opt + +commit c52a373bc8c914f41b0451964e15c007f2754436 +Author: Wen Cheng Ma +Date: Fri Mar 11 18:13:37 2016 +0800 + + update link comments + + Signed-off-by: Wen Cheng Ma + +commit f1603a3ee2b074df4cce61842bfc3dff2af8915e +Merge: 5fa81c4044 000eaee16a +Author: Sven Dowideit +Date: Mon May 9 10:16:37 2016 +1000 + + Merge pull request #3092 from wenchma/service_image + + Update image format for service conf reference + +commit 5fa81c404463a427603e7bcf3b2e094eb45e4e4c +Merge: 3bf75b7330 3b7191f246 +Author: Sven Dowideit +Date: Mon May 9 10:15:56 2016 +1000 + + Merge pull request #3417 from spectralsun/patch-1 + + Small typo + +commit 1e4068713bdc7ac57c5134ae0469dc7ecefb8445 +Merge: ac2f4dd71b 0687d76ab1 +Author: Vincent Demeester +Date: Sun May 8 17:31:43 2016 +0200 + + Merge pull request #22589 from duglin/fixErr + + Err was never being returned + +commit 0687d76ab1f54250ee7611822d4194a44217fa83 +Author: Doug Davis +Date: Sun May 8 05:51:59 2016 -0700 + + Err was never being returned + + Signed-off-by: Doug Davis + +commit 6a96684442a7e9d6e2d00e9b11d23ea6caa88a2a +Author: Antonio Murdaca +Date: Sun May 8 14:01:23 2016 +0200 + + pkg: authorization: cleanup tests + + - do use use log pkg + - do not t.Fatal in goroutine + - cleanups + + Signed-off-by: Antonio Murdaca + +commit ac2f4dd71b9d1e7d028bf3e7cb3b662c109c5836 +Merge: 08ec3606f1 a4192471cd +Author: Vincent Demeester +Date: Sun May 8 13:50:43 2016 +0200 + + Merge pull request #22400 from runcom/fix-git-branch-name + + Makefile: clean git branch before building + +commit a4192471cd6d6012a66c19a635a11c7f6139d683 +Author: Antonio Murdaca +Date: Sun May 8 11:52:38 2016 +0200 + + Makefile: clean git branch before building + + Signed-off-by: Antonio Murdaca + +commit b1f42fb8cc5230297221e5e35e63e29e633ea0bb +Author: Sun Hongliang +Date: Sun May 8 15:32:19 2016 +0800 + + hide error in info when empty + + Signed-off-by: Sun Hongliang + +commit 1f0d5aba50803ff401197f96f6a830384d0c04c5 +Author: Yong Tang +Date: Sat May 7 09:26:34 2016 -0700 + + Remove deprecated Docker Content Trust ENV passphrase variables + + Since 1.9, Docker Content Trust Offline key has been renamed to + Root key and the Tagging key has been renamed to Repository key. + The corresponding environment variables + `DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE` + `DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE` + have also been deprecated and renamed to + `DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE` + `DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE` + + This fix removed the deprecated ENV passphrase variables for + 1.12 and updated the docs. + + Signed-off-by: Yong Tang + +commit 08ec3606f1656962084222412debf2888f15f553 +Merge: 2301052d74 bd9d14a07b +Author: Vincent Demeester +Date: Sat May 7 20:26:33 2016 +0200 + + Merge pull request #21889 from cpuguy83/logscmd_add_attrs + + Add support for reading logs extra attrs + +commit 391441c28baec698f0e3f42d88e116291e8a8e98 +Author: Shijiang Wei +Date: Sun May 8 00:20:24 2016 +0800 + + fix LogConfig for containers created before docker 1.12 on daemon startup + + Signed-off-by: Shijiang Wei + +commit 018c22880d594b1de06216aa05186f2ebe9a1e9c +Author: Yong Tang +Date: Sat May 7 08:46:15 2016 -0700 + + Add the missing subtitle in deprecated docs for --security-opt. + + The colon separator(`:`) of `--security-opt` flag was deprecated + in 1.11.0. However, the subtitle in deprecated docs is missing + so it is placed under the same subtitle as the deprecated `-e` and + `--email` flags. + + This fix adds the missing subtitle in deprecated docs. + + Signed-off-by: Yong Tang + +commit 2301052d74e602bbb0f2e3db70c4787520bc0c1c +Merge: e8b00316b2 fe1130b7ba +Author: Sebastiaan van Stijn +Date: Sat May 7 11:31:25 2016 +0200 + + Merge pull request #22569 from sunyuan3/inherit + + from inheritted to inherited + +commit e8b00316b2fbf77030fadc22d9b24fb725ebd32d +Merge: 0b59ea60b2 31cc7dc135 +Author: Sebastiaan van Stijn +Date: Sat May 7 11:21:18 2016 +0200 + + Merge pull request #22565 from tophj-ibm/ppc64le-remove-seccomp-buildtags + + ppc64le: remove seccomp from docker buildtags + +commit fe1130b7bab0d0724133b4d0e2aa0ca5a5dc0222 +Author: Yuan Sun +Date: Sat May 7 17:15:02 2016 +0800 + + from inheritted to inherited + + Signed-off-by: Yuan Sun + +commit 0b59ea60b2efaf2cb2068441bc8582f9cf5023b7 +Merge: 3b7a2f5816 4e080347af +Author: Alexander Morozov +Date: Fri May 6 23:19:26 2016 -0700 + + Merge pull request #22094 from thaJeztah/autocreate-on-windows + + Enable auto-creation of host-path on Windows + +commit 3b7a2f5816d274346797cdd80b5b657c77f73d96 +Merge: 926725b470 987b03054a +Author: Vincent Demeester +Date: Sat May 7 07:58:46 2016 +0200 + + Merge pull request #22559 from larsks/bug/clarity-on-systemd-dropins + + docs: note requirements for systemd drop-in filenames + +commit 5e5e1d7adae4af11dfa0b39ecc621b0c1fe3f85a +Author: Lei Jitang +Date: Fri May 6 22:48:02 2016 -0400 + + Fix docker create with duplicate volume failed to remove + + Signed-off-by: Lei Jitang + +commit a1c950913f251bf1c8115a549ecb0b5174cd05de +Author: allencloud +Date: Tue May 3 15:26:32 2016 +0800 + + handle error when getting hostname in info api + + Signed-off-by: allencloud + +commit a69f9b85e4869a48394f1697ca4df08a3c3f21f2 +Author: Riyaz Faizullabhoy +Date: Fri May 6 17:39:23 2016 -0700 + + Make default 60s timeout for rethindkb (default is 0) + + Signed-off-by: Riyaz Faizullabhoy + +commit bd9d14a07b9f1c82625dc8483245caf3fa7fe9e6 +Author: Brian Goff +Date: Fri Apr 8 12:15:08 2016 -0400 + + Add support for reading logs extra attrs + + The jsonlog logger currently allows specifying envs and labels that + should be propagated to the log message, however there has been no way + to read that back. + + This adds a new API option to enable inserting these attrs back to the + log reader. + + With timestamps, this looks like so: + ``` + 92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello + ``` + + The extra attrs are comma separated before the log message but after + timestamps. + + Without timestaps it looks like so: + ``` + foo=bar,hello=world hello + ``` + + Signed-off-by: Brian Goff + +commit 7f66598583fef21717016610a5708a2ce4bd57fb +Author: John Howard +Date: Tue Apr 26 19:26:12 2016 -0700 + + Windows: docker cp consistent paths + + Signed-off-by: John Howard + +commit d8c4bb19fb5cacc3f75657e4ef28ef49411680a8 +Author: Sebastiaan van Stijn +Date: Tue Apr 26 14:22:17 2016 +0200 + + Add "process" labels + + Add description for "process" labels to the reviewing + documentation. Also changed some headings from h1 -> h2 + + Signed-off-by: Sebastiaan van Stijn + +commit 4e080347af657ca3a0c103c6bc6cd6a8157d20d8 +Author: Sebastiaan van Stijn +Date: Sat Apr 16 17:21:17 2016 +0200 + + Enable auto-creation of host-path on Windows + + Auto-creation of host-paths has been un-deprecated, + so to have feature-parity between Linux and Windows, + this feature should also be present on Windows. + + This enables auto-creation on Windows. + + Signed-off-by: Sebastiaan van Stijn + +commit 926725b4704e7d050b19d1548322938ae7ad5a10 +Merge: eb52730570 3894773d6e +Author: Sebastiaan van Stijn +Date: Sat May 7 00:24:27 2016 +0200 + + Merge pull request #22433 from rhatdan/labels + + We should always return the MountLabel + +commit 31cc7dc135b606410471a553247ef75b42c3f181 +Author: Christopher Jones +Date: Fri May 6 17:24:50 2016 -0400 + + ppc64le: remove seccomp from docker buildtags + + Removes seccomp from ppc64le as a buildtag + + Signed-off-by: Christopher Jones + +commit eb52730570789dd3e48810f6a087377e5169fee9 +Merge: 16d0a89593 85988b33d2 +Author: unclejack +Date: Fri May 6 14:21:23 2016 -0700 + + Merge pull request #22506 from cpuguy83/no_chroot + + Use pivot_root instead of chroot for chrootarchive + +commit 47c353eb4694a727e4fe4d6c1c2eedf1dc3c3aa8 +Author: Tonis Tiigi +Date: Fri May 6 14:19:27 2016 -0700 + + Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError + + Signed-off-by: Tonis Tiigi + +commit 34e3da3acd232151ff355ddd2790fe22f7048ab0 +Merge: bc5217273a 3d24e74e4c +Author: Dongluo Chen +Date: Fri May 6 13:45:29 2016 -0700 + + Merge pull request #2215 from joelhandwell/patch-1 + + Krane project has been closed in favor of Machine + +commit bc5217273a8ac3aaba56831e19862eae0c41401e +Merge: 5bbecbc13b a28e2e7e30 +Author: Nishant Totla +Date: Fri May 6 13:29:42 2016 -0700 + + Merge pull request #2213 from allencloud/fix-typos-in-cluster + + fix typos in swarm/cluster.go + +commit 987b03054af8bfa5147465d4fe5d5a554cd5fee3 +Author: Lars Kellogg-Stedman +Date: Fri May 6 15:52:42 2016 -0400 + + docs: note requirements for systemd drop-in filenames + + the documentations says that you can drop "a file" into the + `docker.service.d` directory, but does not note that the file must end + with `.conf` in order to be recognized by systemd. This can lead to + some [confusion][] if readers are not previously familiar with + systemd. + + [confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11 + + Signed-off-by: Lars Kellogg-Stedman + +commit 5bbecbc13bd114f5cff9a4f30bb126cecd73ab7a +Merge: 372ad21097 54863df074 +Author: Nishant Totla +Date: Fri May 6 13:25:31 2016 -0700 + + Merge pull request #2212 from nishanttotla/update-release-checklist + + Updating Release checklist + +commit 16d0a8959381f7bc7c0fb9afbb9dd2f75431d48a +Merge: a603fa33d5 ab2baf08f0 +Author: Vincent Demeester +Date: Fri May 6 22:05:02 2016 +0200 + + Merge pull request #22485 from tkopczynski/test-utils + + Builder unit tests refactoring + +commit a603fa33d52144ccf5578d8f499c1406612bfc36 +Merge: b16fac959b d869d2b0a0 +Author: Alexander Morozov +Date: Fri May 6 12:54:53 2016 -0700 + + Merge pull request #22317 from cyli/bump-notary-version + + Bump notary version to v0.3.0-RC1 + +commit faab71701f710a8862e71d4ecd6a86cef49f67b9 +Author: John Howard +Date: Mon May 2 18:33:59 2016 -0700 + + Windows: Reduce CLI time, move some to unit tests + + Signed-off-by: John Howard + +commit b16fac959b9fc36dd339c2db0d1ef9f1b65b8a72 +Merge: ebc5a61593 207027087e +Author: Aaron Lehmann +Date: Fri May 6 11:29:01 2016 -0700 + + Merge pull request #22316 from brettdh/registry-socks-proxy + + Respect ALL_PROXY during registry operations + +commit ebc5a615931fa6a4beb6f55d04e3969380f308d9 +Merge: 4531c01509 c892a8d620 +Author: Alexander Morozov +Date: Fri May 6 11:22:27 2016 -0700 + + Merge pull request #22076 from thtanaka/rpmbuild-error + + DWZ problem with multiple golang binary caused OL7 RPM build to fail + +commit 4531c01509602a6be3741d1999fc2f5b77c16718 +Merge: cf319e295a f1ad6f127b +Author: Alexander Morozov +Date: Fri May 6 11:16:12 2016 -0700 + + Merge pull request #22236 from kencochrane/remove_git_from_rpm + + Exclude .git directories from the source RPMS and debian packages + +commit d869d2b0a07105c80a24755ac6dd12476a085453 +Author: cyli +Date: Mon Apr 25 11:13:56 2016 -0700 + + Update trust.go to reflect NotaryRepository API changes: + - Update now returns only an error + - NewNotaryRepository now takes a trustpinning configuration - we will provide an empty one for now. + + Signed-off-by: cyli + +commit 4710ed6304b8456060f4cb4401b2ed47343991e4 +Author: cyli +Date: Mon Apr 25 11:12:57 2016 -0700 + + Remove the pkcs11 build tag from the s390x Dockerfile, since it is using GCCGo 5.3, which + is still on the Go 1.4 library, whereas the Notary Yubikey library needs interfaces from + Go 1.5 + + Signed-off-by: cyli + +commit 88c6675ed2d61dfb56434dd15391f01147abc5e6 +Author: cyli +Date: Mon Apr 25 10:21:28 2016 -0700 + + Bump notary version to v0.3.0-RC1 + + Signed-off-by: cyli + +commit cf319e295adf70e93e890848afb31a9ef5340244 +Merge: 83a6508af9 107db89b6e +Author: Alexander Morozov +Date: Fri May 6 10:05:55 2016 -0700 + + Merge pull request #22537 from tophj-ibm/test-seccomp + + ppc64le: build seccomp in dockerfile + +commit 3d24e74e4cf2ed179e9d4565798981e579baad5f +Author: Joel Handwell +Date: Fri May 6 09:57:54 2016 -0400 + + Krane project has been closed in favor of Machine + + Reference: https://github.com/krane-io/krane + Signed-off-by: Joel Handwell + +commit 83a6508af9e5b911160b448af549d30a0fd95d56 +Merge: cc01017bcf e38678e660 +Author: Sebastiaan van Stijn +Date: Fri May 6 14:58:13 2016 +0200 + + Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example + + docs: update supervisord example + +commit cc01017bcf631ea82485ecb235b24008efe4359d +Merge: 9a9ebc7f85 3f77baf2ce +Author: Doug Davis +Date: Fri May 6 08:56:33 2016 -0400 + + Merge pull request #22550 from allencloud/fix-typos + + fix typos in comments + +commit eca581cf36d7994b171f8b357f78de1d923474ff +Author: Arthur Baars +Date: Thu May 5 17:16:48 2016 +0100 + + StorageDriver: GCS: allow Cancel on a closed FileWriter + + Signed-off-by: Arthur Baars + +commit 0490ff450b797e7092d98d848625bd949987d56b +Author: Arthur Baars +Date: Thu May 5 15:49:14 2016 +0100 + + Blobwriter: call BlobWriter.Size after BlobWriter.Close + + Signed-off-by: Arthur Baars + +commit 1d782c38f238ef0d7c3cafa92dc08cbf20865690 +Author: Arthur Baars +Date: Fri May 6 10:46:37 2016 +0100 + + StorageDriver: Test case for #1698 + + Signed-off-by: Arthur Baars + +commit 3f77baf2ce3a607fd1eb8fbe6e9dd9da44a8db49 +Author: allencloud +Date: Tue May 3 23:12:38 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit 54d09c6c2d5413f7a05c8a1bc4011298d93979e3 +Author: allencloud +Date: Wed Apr 27 16:48:21 2016 +0800 + + close http response body when attaching + + Signed-off-by: allencloud + +commit 9a9ebc7f85319fabbdcc98cfed10d77ac896f0f1 +Merge: f65f4dc761 d4559313d5 +Author: Sebastiaan van Stijn +Date: Fri May 6 09:26:16 2016 +0200 + + Merge pull request #22046 from cpuguy83/containerd_stdio + + Set containerd pdeathsig + +commit f65f4dc76103986542bc5472c4ae992ecfa74c07 +Merge: a7d6a6c8a8 8ba8189ee6 +Author: Vincent Demeester +Date: Fri May 6 09:12:27 2016 +0200 + + Merge pull request #22501 from michael-holzheu/22477-TestApiStatsContainerGetMemoryLimit-add-mem-cgroup-test + + TestApiStatsContainerGetMemoryLimit: Add cgroup memory test + +commit a7d6a6c8a8cdb5a71a9388b6cec14f280d3f2f80 +Merge: e9bef66021 97d95604e0 +Author: Antonio Murdaca +Date: Fri May 6 09:06:51 2016 +0200 + + Merge pull request #22538 from mrunalp/update_engine_api + + Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09 + +commit a28e2e7e30b6336ffe2d2f1f854d5032d6807052 +Author: Sun Hongliang +Date: Fri May 6 10:17:03 2016 +0800 + + fix typos in swarm/cluster.go + + Signed-off-by: Sun Hongliang + +commit 54863df074a14e35d536adbb50da168d7b43b36c +Author: Nishant Totla +Date: Thu May 5 16:59:17 2016 -0700 + + Updating Release checklist + + Signed-off-by: Nishant Totla + +commit e9bef66021a29c219c185e98db7f3017513f67a6 +Merge: 68ba274d22 4b5404f15e +Author: Brian Goff +Date: Thu May 5 21:02:39 2016 -0400 + + Merge pull request #21961 from yongtang/21956-docker-inspect-log-default-options + + Docker inspect gave default log options even when the option is emtpy. + +commit 372ad2109718fece180fd778b9dd6f4b154eba77 +Merge: 502c00b150 777964583f +Author: Nishant Totla +Date: Thu May 5 17:49:03 2016 -0700 + + Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1 + + Bump version to 1.2.2-rc1 + +commit 61ac085a262a3a9d182a0ffcb7847f37fda83002 +Merge: 64290ecfa9 6bd4f94199 +Author: David Lawrence +Date: Thu May 5 17:03:15 2016 -0700 + + Merge pull request #709 from docker/passphrase-caching-delegation + + Be less strict for password caching for delegation keys + +commit 64290ecfa9244570600ff8d4c07bed79752960a3 +Merge: 905736adc7 b3ac5b62dc +Author: David Lawrence +Date: Thu May 5 17:01:40 2016 -0700 + + Merge pull request #721 from docker/rethink-ca-flag + + Add driver-tls-ca flag for rethink + +commit 777964583fc4fc97d7acd7f10f1b45cefc4f6318 +Author: Nishant Totla +Date: Thu May 5 16:53:47 2016 -0700 + + Bump version to 1.2.2-rc1 + + Signed-off-by: Nishant Totla + +commit e38678e6601cc597b621aaf3cf630419a7963ae9 +Author: Sebastiaan van Stijn +Date: Fri May 6 01:52:51 2016 +0200 + + docs: update supervisord example + + This updates the supervisor example documentation + to use an up-to-date version of Ubuntu. + + Also reduced the use of "royal We", and tweaked some + language. + + Finally, added some language hints for code-highlighting. + + Signed-off-by: Sebastiaan van Stijn + +commit 502c00b150358d3976148df8cea7fd82a2e3282e +Merge: 5925814d84 d6e6703e29 +Author: Nishant Totla +Date: Thu May 5 16:37:50 2016 -0700 + + Merge pull request #2210 from dongluochen/swarm_hang + + Do not allow double RLock() of RWMutex + +commit b3ac5b62dc86fc6d0221d0fba416e7868019e163 +Author: Riyaz Faizullabhoy +Date: Thu May 5 15:52:49 2016 -0700 + + Add driver-tls-ca flag for rethink + + Signed-off-by: Riyaz Faizullabhoy + +commit 97d95604e0f2ac259d60257db0282561e5f52d03 +Author: Mrunal Patel +Date: Thu May 5 17:01:10 2016 -0400 + + Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09 + + Signed-off-by: Mrunal Patel + +commit c120a925f3fade5930bb66483287e903e4a2a130 +Merge: ae9f392c10 96a39d0397 +Author: Nathan LeClaire +Date: Thu May 5 15:31:11 2016 -0700 + + Merge pull request #3373 from leonhartX/issue-3191 + + #3191 add zsh completion + +commit 905736adc782c38d2a1bbad3bcbc4d504164450f +Merge: 3dd79962fa 5659554801 +Author: David Lawrence +Date: Thu May 5 15:29:00 2016 -0700 + + Merge pull request #708 from docker/signer-rethink-cleanup + + Allow for configurable notary signer db name, check allowed backends + +commit 68ba274d22355d54a96fdee06591e7ed9535733c +Merge: bb125650c9 05dec0b032 +Author: Alexander Morozov +Date: Thu May 5 14:56:41 2016 -0700 + + Merge pull request #22535 from mlaventure/fix-oraclelinux-6-rpm + + Fix rpm generation on oraclelinux-6 + +commit 107db89b6e7a465779bc3f89008fa15a4ef2d708 +Author: Christopher Jones +Date: Thu May 5 12:26:23 2016 -0400 + + ppc64le: build seccomp in dockerfile + + This pr adds in building seccomp to ppc64le. + + Signed-off-by: Christopher Jones + +commit 05dec0b032a6bde63a803141e2ccd48daa1a494e +Author: Kenfe-Mickael Laventure +Date: Thu May 5 11:57:29 2016 -0700 + + Fix rpm generation on oraclelinux-6 + + The uek kernel needs to be install first in order to get the correct + btrfs tools version. + + Signed-off-by: Kenfe-Mickael Laventure + +commit 3dd79962faee6b11406125a836e9932ae85dce92 +Merge: be2020b484 d08ecc770f +Author: David Lawrence +Date: Thu May 5 11:39:58 2016 -0700 + + Merge pull request #715 from docker/rethink-bump + + Update RethinkDB to 2.3.0, gorethink to v2 + +commit be2020b4844771b98c9e37e8ce171ff187f80319 +Merge: 1f8e5d5863 29e65f6d9a +Author: David Lawrence +Date: Thu May 5 11:30:13 2016 -0700 + + Merge pull request #719 from docker/rethink-client-certs + + Add client key and cert to rethink client tls config + +commit cd650fcf0c3a04835be9caec6d079d1a06e9d71f +Author: Nathan LeClaire +Date: Thu May 5 10:55:42 2016 -0700 + + Bump VirtualBox version + + Signed-off-by: Nathan LeClaire + +commit 1f8e5d586346ac09c34babe65cb3a71aa421e15b +Merge: 8d08576222 26cbc805e1 +Author: Ying Li +Date: Thu May 5 10:50:14 2016 -0700 + + Merge pull request #718 from twistlock/static_compile + + Enable notary client static compile + +commit d6e6703e297755f88d640ae4ffe1fbf21d44afaa +Author: Dong Chen +Date: Thu May 5 10:45:34 2016 -0700 + + Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between. + + Signed-off-by: Dong Chen + +commit 336435062c66291c814465302b50ea62ccdfff01 +Author: Nathan LeClaire +Date: Thu May 5 09:14:42 2016 -0700 + + Bump Docker Compose version + + Signed-off-by: Nathan LeClaire + +commit 4d8cb18e4c4b42cf94f6bc31da57ad8692a89dcd +Merge: c577d8fad6 aa96330d03 +Author: Nathan LeClaire +Date: Thu May 5 09:11:02 2016 -0700 + + Merge pull request #480 from docker/bump-versions + + Bump virtualbox and git versions + +commit c577d8fad668eca69bd3abd143f891192ae4c43a +Merge: ade83aa4d5 732c8a8ca3 +Author: Nathan LeClaire +Date: Thu May 5 09:09:10 2016 -0700 + + Merge pull request #486 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit bb125650c9fbff03d57c20fd8e4ecde90b3ec326 +Merge: 0d3d8d6416 2b6bc294fc +Author: Vincent Demeester +Date: Thu May 5 18:00:15 2016 +0200 + + Merge pull request #21015 from cpuguy83/add_opaque_mount_id + + When calling volume driver Mount, send opaque ID + +commit 0d3d8d6416bdadf3a6e018a18cb97f5162da1fb1 +Merge: c37ca913ff 9613acbe5c +Author: Brian Goff +Date: Thu May 5 11:37:20 2016 -0400 + + Merge pull request #22505 from runcom/authz-load-import + + integration-cli: test load/import with authz plugins + +commit c37ca913ff66b4402aaa8f54e17498a09778be51 +Merge: af916d316a c7e738d641 +Author: Vincent Demeester +Date: Thu May 5 17:26:06 2016 +0200 + + Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command + + Documentation: docker volumes: remove trailing comma from top command + +commit c7e738d641e83ab955be423b70b9ed364dba9637 +Author: objectified +Date: Thu May 5 13:08:22 2016 +0200 + + remove trailing comma from top command + + Signed-off-by: objectified + +commit af916d316af19bcfa17619c6bf84dcc0fa69cb7a +Merge: 6dd4c3569c 6118952e44 +Author: Vincent Demeester +Date: Thu May 5 13:16:06 2016 +0200 + + Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files + + Add dockerd to the list of files included in generated rpms + +commit 6dd4c3569cf5c844473cad8dea26c2e93e994131 +Merge: 4de672690c 401c8d1767 +Author: Vincent Demeester +Date: Thu May 5 13:15:45 2016 +0200 + + Merge pull request #19651 from zhuguihua/add_disk_quota_for_btrfs + + Add disk quota support for btrfs + +commit 26cbc805e1260b9f32ff5e67881e54e4f41b2b23 +Author: Liron Levin +Date: Wed May 4 14:21:35 2016 +0300 + + Enable notary client static compile + + Update pkcs11 package (missing -ldl in LDFLAGS) + + Signed-off-by: Liron Levin + +commit 4de672690ce10bf106387bd40d536bc19350345f +Merge: 378a8e7175 66fbc0c2a3 +Author: Vincent Demeester +Date: Thu May 5 09:44:09 2016 +0200 + + Merge pull request #22270 from runcom/too-many-login + + distribution: errors: do not retry if too many login attempts + +commit 378a8e71755e86bab0e6c18022bf457a9c79e166 +Merge: 6870d9789a 6b5c83bf18 +Author: Vincent Demeester +Date: Thu May 5 09:09:55 2016 +0200 + + Merge pull request #22508 from Microsoft/jjh/arg + + Windows: Support ARG in builder + +commit 401c8d17674379d9b727d25df2d560a2dfe07f27 +Author: Zhu Guihua +Date: Thu Mar 24 09:14:38 2016 +0800 + + Add disk quota support for btrfs + + Signed-off-by: Zhu Guihua + +commit 5925814d840453b07bd31d7a3d196a9b54fb3310 +Merge: 7ab56957a6 d2c9f8bc9a +Author: Dongluo Chen +Date: Wed May 4 22:33:31 2016 -0700 + + Merge pull request #2180 from ogryzek/typo-edits + + Edit typos in 'Try Swarm at scale' + +commit 29e65f6d9a64181efb48de48ecbf7cce3951fd24 +Author: Riyaz Faizullabhoy +Date: Wed May 4 16:27:26 2016 -0700 + + Add client key and cert to rethink client tls config + + Signed-off-by: Riyaz Faizullabhoy + +commit 6118952e449bb70bcc06e9d342affc593262a44e +Author: Kenfe-Mickael Laventure +Date: Wed May 4 20:45:22 2016 -0700 + + Add dockerd to the list of files included in generated rpms + + Signed-off-by: Kenfe-Mickael Laventure + +commit 96c904a51e704a5924c439bf69cfd437c8165fc3 +Author: Eric Bloch +Date: Tue May 3 22:20:08 2016 -0700 + + Add tcsh support to --shell + + Fixes #3404 + + Signed-off-by: Eric Bloch + +commit 7ab56957a649877a9d080eba2737807c2683b72e +Merge: 9a968f5c5d 24fdd12602 +Author: Charles Smith +Date: Wed May 4 19:12:37 2016 -0700 + + Merge pull request #1978 from troyfontaine/discovery_node_docs + + Added node discovery warning + +commit 85988b33d299697f410a3a92db5d537fdbee955b +Author: Brian Goff +Date: Wed May 4 13:32:51 2016 -0400 + + Use pivot_root instead of chroot for chrootarchive + + This fixes one issue with Docker running under a grsec kernel, which + denies chmod and mknod under chroot. + + Note, if pivot_root fails it will still fallback to chroot. + + Signed-off-by: Brian Goff + +commit 2a4deee4413a4027b3024113a2c880e217097754 +Author: Richard Scothern +Date: Wed May 4 15:58:08 2016 -0700 + + Remove the unimplemented monolithic upload section from the API documentation. + + Signed-off-by: Richard Scothern + +commit 080d64bf75813b67043c30e352675a05a5cfeb2d +Author: Joao Fernandes +Date: Wed May 4 15:01:47 2016 -0700 + + Improves docs for upgrading + + * fixes #1880 + +commit 6870d9789aea578f54e443293625a6b57496e10f +Merge: 6dcadaa465 a7b2f87b06 +Author: Sebastiaan van Stijn +Date: Thu May 5 00:02:02 2016 +0200 + + Merge pull request #22166 from moxiegirl/device-mapper-update + + Device mapper update + +commit 6dcadaa46524c90f5c60e3006322b86aa240aeed +Merge: 1fe9715f30 74d382ff8d +Author: Sebastiaan van Stijn +Date: Wed May 4 23:57:55 2016 +0200 + + Merge pull request #22512 from tkopczynski/typos-supervisor + + Docs: fixing typos in admin/supervisor + +commit 1fe9715f309fced92ea815fb365e08334fd49930 +Merge: 0c68402887 ce72473197 +Author: Sebastiaan van Stijn +Date: Wed May 4 23:57:16 2016 +0200 + + Merge pull request #22423 from mlaventure/rm-containers-if-rm-in-progress-on-restart + + Reset RemovalInProgress flag on daemon restart + +commit 0c68402887f7403f4fa7a6abccd3181f5f66d75d +Merge: e4a4570369 20e1b9593e +Author: Tibor Vass +Date: Wed May 4 17:55:20 2016 -0400 + + Merge pull request #22403 from mlaventure/fix-docker-build-pkgs + + Update build-deb to make correct use of DOCKER_BUILD_PKGS + +commit 6b5c83bf18fe406e397c001acb0a1d9d7e147fd9 +Author: John Howard +Date: Wed May 4 11:06:54 2016 -0700 + + Windows: Support ARG in builder + + Signed-off-by: John Howard + +commit 4ecea4b311d968fb789e30a78c8c6510996a9183 +Merge: 48aac6834a b0db8d49bd +Author: Olivier Gambier +Date: Wed May 4 13:52:21 2016 -0700 + + Merge pull request #1663 from moxiegirl/fix-flags + + Fixing nginx flag issue identified by customer + +commit f2c568a3a4d2ed1d1c00cc5b1f71d015c7f9f1f6 +Merge: 4394b8eee7 ad97260d93 +Author: moxiegirl +Date: Wed May 4 13:49:02 2016 -0700 + + Merge pull request #62 from moxiegirl/update-contribute + + Update contribute + +commit 74d382ff8de9a870d48e7fd4cc63bb9ee254f3de +Author: Tomasz Kopczynski +Date: Wed May 4 22:35:57 2016 +0200 + + Docs: fixing typos in admin/supervisor + + Signed-off-by: Tomasz Kopczynski + +commit b0db8d49bd340d0c945d9c86b032bf66a9575900 +Author: Mary Anthony +Date: Thu Apr 21 09:08:19 2016 -0700 + + Fixing issue identified by customer + Entering Seb's comment + Fix the flags + + Signed-off-by: Mary Anthony + +commit 6c29830127c0328d2c790abc38a89cba69956d7a +Merge: e8da6cb631 0a9ab358bf +Author: Joffrey F +Date: Wed May 4 13:03:11 2016 -0700 + + Merge pull request #3418 from shin-/bump-1.7.1 + + Bump 1.7.1 + +commit ad97260d93a7b99489baf0a5dd4402a5d6ea3ab9 +Author: Mary Anthony +Date: Thu Apr 21 14:07:25 2016 -0700 + + Updating the development process + Update with Michael's comments + Updated with Seb's comments + + Signed-off-by: Mary Anthony + +commit e4a4570369d53adbf74b8cb84d8b7301a32689bd +Merge: 973d6f0820 94f1e574b6 +Author: Alexander Morozov +Date: Wed May 4 12:38:13 2016 -0700 + + Merge pull request #22475 from Microsoft/jjh/twoconcurrentcontainers + + Reduce time for TestRunTwoConcurrentContainers + +commit a7b2f87b0637a3711e90c0f1d0a99dd5d32bd60f +Author: Chun Chen +Date: Tue Apr 5 15:35:24 2016 +0800 + + Add docs about how to extend devicemapper thin pool + + Signed-off-by: Chun Chen + + Update to device mapper + Entering comments + + Signed-off-by: Mary Anthony + +commit 8d08576222b3c2950f1d80bc081bd8594a65f850 +Merge: 7977c6a965 b10e89e0c0 +Author: Riyaz Faizullabhoy +Date: Wed May 4 12:04:25 2016 -0700 + + Merge pull request #716 from cyli/fix-signer-interface + + Fix signer interface to conform to expected cryptoservice behavior + +commit 0a9ab358bf7b4ff55764f8e0246cb380e6e7a2c8 +Author: Joffrey F +Date: Wed May 4 11:50:15 2016 -0700 + + Bump 1.7.1 + + Signed-off-by: Joffrey F + +commit 3c424b709ea9092a71b46a04795c041e01e1f549 +Author: Joffrey F +Date: Fri Apr 29 19:42:07 2016 -0700 + + Properly handle APIError failures in Project.up + + Signed-off-by: Joffrey F + +commit 47a40d42c723cb603fb9f5d9608f6b4d8da8b06b +Author: Joffrey F +Date: Fri Apr 29 16:37:26 2016 -0700 + + Require latest docker-py version + + Signed-off-by: Joffrey F + +commit f316b448c2242c01167d13c47d5c8691ef8221b1 +Author: Aaron Nall +Date: Wed Apr 27 22:44:28 2016 +0000 + + Add missing log event filter when using docker-compose logs. + + Signed-off-by: Aaron Nall + +commit 6bfdde685598ba2be48abffc96aa111052b21494 +Author: André R +Date: Wed Apr 27 13:45:59 2016 +0200 + + Clarify env-file doc that .env is read from cwd + + Closes #3381 + + Signed-off-by: André R + +commit 2a08d4731eaf9697e69e4d46ff945593166c54db +Author: Joffrey F +Date: Tue Apr 26 15:52:25 2016 -0700 + + Skip event objects that don't contain a status field + + Signed-off-by: Joffrey F + +commit 11d8093fc8538379e1e693e6bd4ba1cacdf10839 +Author: Joffrey F +Date: Tue Apr 26 12:21:47 2016 -0700 + + Support combination of shorthand flag and equal sign for host option + + Signed-off-by: Joffrey F + +commit d0b46ca9b205236fe8809c6b10f351feabd367f1 +Author: Daniel Nephin +Date: Tue Apr 26 11:58:41 2016 -0400 + + Upgade pip to latest + + Hopefully fixes our builds. + + Signed-off-by: Daniel Nephin + +commit b7f9fc4b289b7e8f21ce037f11987339fde2e70c +Author: Joffrey F +Date: Mon Apr 25 17:58:20 2016 -0700 + + Define WindowsError on non-win32 platforms + + Signed-off-by: Joffrey F + +commit 70a605acac3895468ee66a3ee809841c31763f63 +Author: Ben Firshman +Date: Wed Apr 20 16:35:22 2016 -0700 + + Explain the explanation about file versions + + This explanation looked like it was part of the error. Added an + extra new line and a bit of copy to explain the explanation. + + Signed-off-by: Ben Firshman + +commit 85b85bc675d4625d678f9bfa38fe5739af183a4c +Author: Ben Firshman +Date: Wed Apr 20 16:22:24 2016 -0700 + + Make validation error less robotic + + "ERROR: Validation failed in file './docker-compose.yml', reason(s):" + + is now: + + "ERROR: The Compose file './docker-compose.yml' is invalid because:" + + Signed-off-by: Ben Firshman + +commit b334b6f059c7b3db359c85059dcf01f89c7a3224 +Author: Patrice FERLET +Date: Wed Apr 20 13:23:37 2016 +0200 + + Fix the tests from jenkins + + Acceptance tests didn't set "help" command to return "0" EXIT_CODE. + + close #3354 + related #3263 + + Signed-off-by: Patrice Ferlet + +commit 0c1c338a02a8d4d4a76a04a6639b202fcc327fd3 +Author: Joffrey F +Date: Tue Apr 19 17:39:29 2016 -0700 + + Force docker-py 1.8.0 or above + + Signed-off-by: Joffrey F + +commit f655a8af9567d58e9cfc0adff77960a42f7fd4be +Author: johnharris85 +Date: Sun Apr 17 15:25:06 2016 -0400 + + Account for aliased links Fix failing tests Signed-off-by: John Harris + +commit f7cd94d4a95ce51fe70c142d79f989d6c8566c2a +Author: johnharris85 +Date: Sun Apr 17 14:01:06 2016 -0400 + + Adding tests Signed-off-by: John Harris + +commit e4d2d7ed8a134bbd947e02f2dd8a201dc2649677 +Author: johnharris85 +Date: Sun Apr 17 14:00:07 2016 -0400 + + Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris + +commit 2a8c2c8ad6a6901514fbd966706912b9dffb94f4 +Author: Daniel Nephin +Date: Fri Apr 15 15:42:36 2016 -0400 + + Unit test for skipping network disconnect. + + Signed-off-by: Daniel Nephin + +commit 5852db4d7283789c57cd317e8eaf048004521489 +Author: Daniel Nephin +Date: Mon Apr 11 13:22:37 2016 -0400 + + Set networking_config when creating a container. + + Signed-off-by: Daniel Nephin + +commit 250a7a530b6101d2e26328e4135714686e649c64 +Author: Daniel Nephin +Date: Fri Apr 8 15:45:03 2016 -0400 + + Only disconnect if we don't already have the short id alias. + + Signed-off-by: Daniel Nephin + +commit 4e8b01728346a3b74a043fcd4f40271bb5a185d1 +Author: johnharris85 +Date: Fri Apr 15 13:30:13 2016 +0100 + + Fix CLI docstring to reflect Docopt behaviour. + + Signed-off-by: John Harris + +commit a86a195c5098b6f410d7b0d874c212e28860f5da +Author: Vladimir Lagunov +Date: Fri Apr 15 15:11:50 2016 +0300 + + Fix #3248: Accidental config_hash change + + Signed-off-by: Vladimir Lagunov + +commit 3368887a291f1c4b1e5d90aef3cea56529b0ff5f +Author: Tony Witherspoon +Date: Tue Apr 12 12:29:59 2016 -0400 + + Updated StringIO import to support io module + + Signed-off-by: Tony Witherspoon + +commit e5f1429ce10beaa44a808f9337eb7b09234677a9 +Author: Tony Witherspoon +Date: Tue Apr 12 11:47:15 2016 -0400 + + Updated cli_test.py to validate against the updated help command conditions + + Signed-off-by: Tony Witherspoon + +commit 65b0e5973b748f679ae8203148394d77d957015f +Author: Tony Witherspoon +Date: Thu Apr 7 12:42:14 2016 -0400 + + updated cli_test.py to no longer expect raised SystemExit exceptions + + Signed-off-by: Tony Witherspoon + +commit 9cf483e224469b4b3114ffa2c42fbc1f0db4637a +Author: Tony Witherspoon +Date: Mon Apr 4 13:15:28 2016 -0400 + + Added code to output the top level command options if docker-compose help with no command options provided + + Signed-off-by: Tony Witherspoon + +commit 1e164ca802b91cf5c3160eeb936eff7f5ddf79cc +Author: Aanand Prasad +Date: Tue Apr 26 17:30:04 2016 +0100 + + Fix format of 'restart' option in 'config' output + + Signed-off-by: Aanand Prasad + +commit a2ded237e4f40efca98b4049b25c3d5291dc2c73 +Author: Aanand Prasad +Date: Fri Mar 18 13:14:33 2016 +0000 + + Fix output of 'config' for v1 files + + Signed-off-by: Aanand Prasad + +commit 8a9ab69a1c91025edb460dafa35a855d158b4d9a +Author: Aanand Prasad +Date: Fri Mar 18 13:01:35 2016 +0000 + + Check full error message in test_up_with_net_is_invalid + + Signed-off-by: Aanand Prasad + +commit 9cfbfd55c4cf512c8a77e8bf94163fcc79db9f7c +Author: Aanand Prasad +Date: Fri Mar 18 13:00:55 2016 +0000 + + Remove v2_only decorators on config tests + + Signed-off-by: Aanand Prasad + +commit 7977c6a965496e9e13dc20b021c596aa969ee010 +Merge: 134bdbcb90 f5ce3d1eb0 +Author: Riyaz Faizullabhoy +Date: Wed May 4 11:50:57 2016 -0700 + + Merge pull request #713 from twistlock/list_targets_basic_auth + + Enable basic authentication for list command + +commit d41e6e00fae961e7487cd609d88db62fb57c5ac9 +Merge: 0d7bf73446 e8da6cb631 +Author: Joffrey F +Date: Wed May 4 11:49:05 2016 -0700 + + Merge remote-tracking branch 'source/release' into bump-1.7.1 + +commit 8ba8189ee66fa36f7adb1f2bab6cc4c35ebfd8cd +Author: Michael Holzheu +Date: Wed May 4 08:44:03 2016 +0000 + + TestApiStatsContainerGetMemoryLimit: Add cgroup memory test + + Currently on kernels booted without the "cgroup_enable=memory" kernel + parameter the testcase TestApiStatsContainerGetMemoryLimit fails with: + + FAIL: docker_api_stats_test.go:231: TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite + + docker_api_stats_test.go:256: + c.Assert(fmt.Sprintf("%d", v.MemoryStats.Limit), checker.Equals, fmt.Sprintf("%d", info.MemTotal)) + ... obtained string = "0" + ... expected string = "33759145984" + + Fix this and skip the testcase if the kernel does not support cgroup memory + limit. In that case the output would be: + + SKIP: docker_api_stats_test.go:231: + TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite + (Test requires an environment that supports cgroup memory limit.) + + ChangeLog: + ---------- + v4: Move TestApiStatsContainerGetMemoryLimit to docker_api_stats_unix_test.go + v3: Use existing "memoryLimitSupport" from requirements_unix.go + v2: Move check to requirements.go + + Fixes #22477 + + Signed-off-by: Michael Holzheu + +commit b10e89e0c0d714c24440805ce1c0931c1b5d45ae +Author: Ying Li +Date: Tue May 3 17:15:00 2016 -0700 + + Fix signer to conform to expected signed.CryptoService behavior. + In interface tests, account for the fact that the signer doesn't keep track of roles yet. + + Signed-off-by: Ying Li + +commit 48aac6834aac94e7b7c8d3788ed7ab3a9ada611e +Merge: c1c230dee9 35dd23c649 +Author: Derek McGowan +Date: Wed May 4 11:04:48 2016 -0700 + + Merge pull request #1701 from RichardScothern/updates + + Update AUTHORS and version file + +commit c1c230dee9623945981e08e39cd41e527df8e306 +Merge: c047d34b22 e8feabc775 +Author: Richard Scothern +Date: Wed May 4 11:03:42 2016 -0700 + + Merge pull request #1626 from RichardScothern/alpine + + Use Alpine Linux as the parent image for the registry. + +commit 3b7191f246b5f7cd6b2fbdefa86547492861f025 +Author: Garrett Seward +Date: Wed May 4 10:45:04 2016 -0700 + + Small typo + + Signed-off-by: spectralsun + +commit 35dd23c649bb959cb92654c1938292849b36a96f +Author: Richard Scothern +Date: Wed May 4 10:22:07 2016 -0700 + + Update AUTHORS and version file + + Signed-off-by: Richard Scothern + +commit c047d34b22095afcd02c8e6fe46d73c1daee8e39 +Merge: 9ec0d742d6 c9c62380ff +Author: Richard Scothern +Date: Wed May 4 10:05:51 2016 -0700 + + Merge pull request #1695 from tonyhb/add-regulator-to-filesystem + + Add regulator to filesystem + +commit 66fbc0c2a3e813359654f21433abf995b6687265 +Author: Antonio Murdaca +Date: Sat Apr 23 12:27:45 2016 +0200 + + distribution: errors: do not retry on too many requests from registry + + Signed-off-by: Antonio Murdaca + +commit 305ebfda8bc39b39f018d06a554245872b1ff63a +Author: Antonio Murdaca +Date: Tue May 3 19:41:19 2016 +0200 + + vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30 + + Signed-off-by: Antonio Murdaca + +commit 9613acbe5cd517f1fd4c8d405be3cfc24d249562 +Author: Antonio Murdaca +Date: Wed May 4 18:42:36 2016 +0200 + + integration-cli: test load/import with authz plugins + + Signed-off-by: Antonio Murdaca + +commit 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30 +Merge: d4be7016ef f60f275c29 +Author: Richard Scothern +Date: Wed May 4 09:45:18 2016 -0700 + + Merge pull request #1696 from runcom/go1.6-lol + + registry: do not use http.StatusTooManyRequests + +commit f5ce3d1eb07e4e1441be9ebac2af3f01b5e9eaea +Author: Liron Levin +Date: Wed May 4 09:58:52 2016 +0300 + + Enable providing username/password for read operations + + Currently notary fails to authenticate private Docker repositories. + That is, notary fetch a token from `auth.docker.io` but receives 401 + (since basic authentication is required to fetch the bearer token for + private Docker repositories). + + Since the `AuthenticationHandler` succeed, we must retry the entire flow + with a different handler. + + Signed-off-by: Liron Levin + +commit 084c72e760cb78078f1f1bafbcd70d4dafd8e0c5 +Author: Tianon Gravi +Date: Wed Apr 27 10:55:45 2016 -0700 + + Update contrib/mkimage/debootstrap to account for Debian LTS changes + + See https://www.debian.org/News/2016/20160425 and https://wiki.debian.org/LTS/Using for more details. + + > For Debian 7 "Wheezy" LTS there will be no requirement to add a separate wheezy-lts suite to your sources.list any more. In fact you will not notice the switch to LTS because after the official security support by the Debian Security Team ends, security updates will be provided via security.debian.org 's wheezy/updates. + + Signed-off-by: Andrew "Tianon" Page + +commit 973d6f082002eb4d55cf910325ce90d4f85c63a7 +Merge: e7584a7fdf 988f481643 +Author: Brian Goff +Date: Wed May 4 10:12:29 2016 -0400 + + Merge pull request #22422 from cpuguy83/vendor_engine-api + + Update engine-api + +commit e7584a7fdf2170a5a75a2376ed914176665efab9 +Merge: c14b1e3964 8eb2188bd9 +Author: Sebastiaan van Stijn +Date: Wed May 4 15:35:45 2016 +0200 + + Merge pull request #22499 from duglin/removeQuotes + + Remove unnecessary double-double quotes + +commit c14b1e39641fd575f59ef8c8556158d595eff284 +Merge: 4c88c67058 55d61e98ba +Author: Sebastiaan van Stijn +Date: Wed May 4 15:33:21 2016 +0200 + + Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs + + Updated docker-info output and documentation + +commit 4c88c67058080d5f780100cee71a5a9938841cfb +Merge: 1c1947dd29 f6dd023b4e +Author: Vincent Demeester +Date: Wed May 4 15:21:59 2016 +0200 + + Merge pull request #21947 from boynux/fix-filter-exited + + exited=0 in filter shouldn't show "Created" ones + +commit 1c1947dd29def10260e61688112eeac665761ace +Merge: 9f29f66c29 24ec73f754 +Author: Vincent Demeester +Date: Wed May 4 15:07:53 2016 +0200 + + Merge pull request #22386 from wenchma/dockerd + + Update the `docker daemon` to `dockerd` for document + +commit 8eb2188bd93c01533e201a37e1e674f5b53cb597 +Author: Doug Davis +Date: Wed May 4 05:15:57 2016 -0700 + + Remove unnecessary double-double quotes + + Signed-off-by: Doug Davis + +commit 9f29f66c290f8149415306e0f38d0ef299b9b87c +Merge: 9c52a04f38 176e9e2ffc +Author: Sebastiaan van Stijn +Date: Wed May 4 13:37:28 2016 +0200 + + Merge pull request #22498 from Windfarer/patch-1 + + fix typo in docs + +commit 176e9e2ffc192862f104b13bdf651551c1e492f1 +Author: Eric Yang +Date: Wed May 4 19:13:00 2016 +0800 + + fix typo + + fix typo + + Signed-off-by: Qizhao Yang + +commit 9c52a04f389d4bd2eb447c13a13003d79b746abc +Merge: 82141a28f5 f74b856e1a +Author: Sebastiaan van Stijn +Date: Wed May 4 12:38:40 2016 +0200 + + Merge pull request #22446 from thaJeztah/add-daemon-reload + + Add support for reloading daemon configuration through systemd + +commit 8a5531777b5697f7928920972e6a3cce540a1c00 +Author: Sun Hongliang +Date: Tue Apr 19 21:59:52 2016 +0800 + + show container status of each node in docker info + + Signed-off-by: Sun Hongliang + +commit 1a5ac12dd36d77d5b4dc9372a2c7009937b60f5d +Author: Ronak Banka +Date: Wed May 4 16:46:56 2016 +0900 + + Align machine storage path flag name + + Signed-off-by: Ronak Banka + +commit 6bd4f94199bcd5864c3b8e289a2f9540dd970b58 +Author: Riyaz Faizullabhoy +Date: Tue May 3 18:10:48 2016 -0700 + + add positive test for passphrase caching + + Signed-off-by: Riyaz Faizullabhoy + +commit b83fd7842bb22898b3dfb6b0fd931aa8180bdd23 +Author: Ying Li +Date: Tue May 3 16:23:42 2016 -0700 + + Add a general interface test for signed.CryptoService specifying expected interface behavior. + Apply it to cryptoservice.CryptoService and signed.client.NotarySigner. + + Signed-off-by: Ying Li + +commit 9a968f5c5d762590525e1ce4a1e71ea8e3bb04d5 +Merge: b2de64872b 63418b2d63 +Author: Dongluo Chen +Date: Tue May 3 16:41:40 2016 -0700 + + Merge pull request #2207 from dongluochen/bump-1.2.1 + + Bump version to v1.2.1 + +commit c9c62380ffc1b72a6d1ea1e80cc2d806c750bd9a +Author: Tony Holdstock-Brown +Date: Tue May 3 16:03:22 2016 -0700 + + Don't wrap thead limits when using a negative int + + Signed-off-by: Tony Holdstock-Brown + +commit d08ecc770f323def92a19268ace4f6ff289b6342 +Author: Riyaz Faizullabhoy +Date: Tue May 3 15:37:36 2016 -0700 + + Update RethinkDB to 2.3.0, gorethink to v2 + + Signed-off-by: Riyaz Faizullabhoy + +commit 63418b2d6323abcdc651e05190718bae42af454e +Author: Dong Chen +Date: Tue May 3 15:20:55 2016 -0700 + + Bump version to v1.2.1 + + Signed-off-by: Dong Chen + +commit 53acf5b769625589531a88c732aab5f24141d322 +Author: Joao Fernandes +Date: Tue May 3 15:27:31 2016 -0700 + + Fixes doc P0s for 2.0 release + +commit b2de64872b65db4d88b33b1a77bf9a951a3a2577 +Merge: 31909bf847 c4007e9507 +Author: Dongluo Chen +Date: Tue May 3 15:11:39 2016 -0700 + + Merge pull request #2205 from dongluochen/containerslots + + Containerslots + +commit 31909bf847c87bbd2645b47a55de761546eeb7d0 +Merge: e8cb44fe81 50be8f4802 +Author: Nishant Totla +Date: Tue May 3 14:44:49 2016 -0700 + + Merge pull request #2200 from allencloud/use--cpu-shares-instead-of--c-since-deprecated + + use --cpu-shares instead of -c in integration test + +commit c4007e95079c6cc9e8969f8a14a53045381e1033 +Author: Dong Chen +Date: Tue May 3 10:39:47 2016 -0700 + + Carry over pr/2137 with minor updates. + + Signed-off-by: Dong Chen + +commit 82141a28f525182ee638d5a63558f9545dcd1a7d +Merge: 5892083a8f fd8a6775f5 +Author: Sebastiaan van Stijn +Date: Tue May 3 22:28:16 2016 +0200 + + Merge pull request #22482 from anujbahuguna/master + + Adding Rita Levi-Montalcini and Claude Shannon to name generator + +commit 5892083a8f26084faab9fd4ad2e348dbc8202504 +Merge: 3b0a166b10 b2b82b952c +Author: Alexander Morozov +Date: Tue May 3 13:15:26 2016 -0700 + + Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing + + minor contributing.md cleanup + +commit 3b0a166b10e63f8f3f20dd4f4a5250993a9025d3 +Merge: 61d265964f 481cc6716f +Author: Alexander Morozov +Date: Tue May 3 13:11:27 2016 -0700 + + Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer + + runSleepingContainer consistency + +commit 3bf75b7330a5e8189ba94741ea0179cb62052110 +Merge: c1c8c70800 e4bb678875 +Author: Daniel Nephin +Date: Tue May 3 15:47:47 2016 -0400 + + Merge pull request #3398 from shin-/docker-py-1.8.1 + + Require latest docker-py version + +commit f60f275c29cb215bab1594b4e9b3967bc02bd743 +Author: Antonio Murdaca +Date: Tue May 3 21:24:43 2016 +0200 + + registry: do not use http.StatusTooManyRequests + + go1.5 doesn't export http.StatusTooManyRequests while + go1.6 does. Fix this by hardcoding the status code for now. + + Signed-off-by: Antonio Murdaca + +commit fd8a6775f57c4fae1d7cc99560f4efe30e1ac9dd +Author: Anuj Bahuguna +Date: Wed May 4 00:02:04 2016 +0530 + + Adding Rita Levi-Montalcini and Claude Shannon to name generator + Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com" + + Signed-off-by: Anuj Bahuguna + +commit 481cc6716fdfda8db4481dd2a3dfde4d3d2edba5 +Author: John Howard +Date: Tue May 3 10:52:09 2016 -0700 + + RunSleepingContainer consistency + + Signed-off-by: John Howard + +commit 35b3b2aa811e8be53e8435facc6d8646c9ce5470 +Merge: 38bce4a665 b2e57b6f07 +Author: French Ben +Date: Tue May 3 14:18:57 2016 -0400 + + Merge pull request #1651 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit 94f1e574b6469021c7c7fd3cad857a011cf93815 +Author: John Howard +Date: Tue May 3 10:36:34 2016 -0700 + + Reduce time for TestRunTwoConcurrentContainers + + Signed-off-by: John Howard + +commit 61d265964f56b589c96f503906872c0a25fb89e9 +Merge: 73a8b6e3aa f2fd765450 +Author: Sebastiaan van Stijn +Date: Tue May 3 19:30:13 2016 +0200 + + Merge pull request #22468 from thaJeztah/fix-dotcloud-link + + Fix dotCloud link + +commit d4be7016effa91f17b8d25c5300cc26ae37d3fb8 +Merge: b7088d29c6 a264f9ae29 +Author: Aaron Lehmann +Date: Tue May 3 10:16:21 2016 -0700 + + Merge pull request #1693 from runcom/too-many-requests + + registry: type too many requests error + +commit ab2baf08f03b4a1ccede84b1e902dd16d1ad946f +Author: Tomasz Kopczynski +Date: Tue May 3 11:10:51 2016 +0200 + + Builder unit tests refactoring + + Signed-off-by: Tomasz Kopczynski + +commit 0ccc958b50d5dc3d6671e23fa220e5eec10572bd +Author: michael.freund +Date: Mon Apr 18 09:58:33 2016 +0200 + + Filter for containerslots-label + + Signed-off-by: michael.freund + +commit 73a8b6e3aaacd440e6666f4a64554ea7c2ca4090 +Merge: 9837ec4da5 e00ad7227e +Author: Alexander Morozov +Date: Tue May 3 09:51:19 2016 -0700 + + Merge pull request #22441 from tkopczynski/20784-builder-remote-tests + + Unit test for builder/remote.go + +commit a264f9ae293da7c255ede556c425925035e166ec +Author: Antonio Murdaca +Date: Tue May 3 10:28:40 2016 +0200 + + registry: type too many requests error + + Signed-off-by: Antonio Murdaca + +commit d0352a7448b17346ad67882cf3df3b1239481d7c +Author: Tony Holdstock-Brown +Date: Tue Apr 26 15:20:40 2016 -0700 + + Add documentation + + Signed-off-by: Tony Holdstock-Brown + +commit 33c448f14769c96d6702f9481831132b06e3cad6 +Author: Tony Holdstock-Brown +Date: Tue Apr 26 14:36:38 2016 -0700 + + Implement regulator in filesystem driver + + This commit refactors base.regulator into the 2.4 interfaces and adds a + filesystem configuration option `maxthreads` to configure the regulator. + + By default `maxthreads` is set to 100. This means the FS driver is + limited to 100 concurrent blocking file operations. Any subsequent + operations will block in Go until previous filesystem operations + complete. + + This ensures that the registry can never open thousands of simultaneous + threads from os filesystem operations. + + Note that `maxthreads` can never be less than 25. + + Add test case covering parsable string maxthreads + + Signed-off-by: Tony Holdstock-Brown + +commit 50be8f48024de720dbed4145f49eec164a2b4866 +Author: Sun Hongliang +Date: Tue May 3 16:04:15 2016 +0800 + + use --cpu-shares instead of -c in integration test + + Signed-off-by: Sun Hongliang + +commit 9837ec4da53f15f9120d53a6e1517491ba8b0261 +Merge: 1c0edf6c39 641c1808e1 +Author: Vincent Demeester +Date: Tue May 3 11:56:29 2016 +0200 + + Merge pull request #22461 from tonistiigi/fix-implicit-pull-test-arm + + Move implicit pull test to use local registry + +commit f2fd765450e024808a3019bdc118f87c97446f97 +Author: Sebastiaan van Stijn +Date: Tue May 3 11:43:43 2016 +0200 + + Fix dotCloud link + + dotCloud no longer exists, and since this part of the + readme is refering to "where it all started", replaced + the link with an archive link around the time that + Docker was publicly announced. + + Signed-off-by: Sebastiaan van Stijn + +commit e00ad7227ea1ea09506145901213640964e7bdfb +Author: Tomasz Kopczynski +Date: Sun May 1 12:58:39 2016 +0200 + + Unit test for builder/remote.go + + Signed-off-by: Tomasz Kopczynski + +commit 4b5404f15ed2944ca2d994f52618338c52611352 +Author: Yong Tang +Date: Mon Apr 11 16:07:02 2016 -0700 + + Docker inspect gave default log options even when the option is emtpy. + + This fix tries to addess the issue in #21956 where `docker inspect` + will overwrite the log config options with default option even when + the `--log-driver` is not empty and `--log-opt` is empty. In this + situation, `docker inspect` and `docker run` is different. + + With the introduction of #21153, the `HostConfig` will always have + the correct log-driver and log-opt values. + + However, the previous processing of `docker inspect` was not updated + after the change in #21153. This results in the incorrect behavior. + + This fix addresses this issue by updating `docker inspect` to conform + to #21153 so the the behavior of `docker inspect` and `docker run` is + consistent. + + A integration test has been added to cover this fix. + + This fix fixes #21956. This fix is related to #21153. + + Signed-off-by: Yong Tang + +commit e8cb44fe8177232651cc7f5cf85252305d1af834 +Merge: 8cbb1b27a4 b19599df53 +Author: Charles Smith +Date: Mon May 2 20:50:26 2016 -0700 + + Merge pull request #2072 from allencloud/update-docs-about-kernel-version + + update docs about kernel version support in production + +commit dbd4efa272895cabad15c776b150dc5a9a51ae16 +Author: Joao Fernandes +Date: Mon May 2 20:39:06 2016 -0700 + + Adds reference docs for bootstrapper + + * fixes #1914 + +commit 0d13fcbee941c555d2bc2b44c261caf6a6b1b520 +Author: Joao Fernandes +Date: Mon May 2 19:29:39 2016 -0700 + + Improves docs menu entries + +commit 96a39d03975b2340288100e0867305c68e4a6baf +Author: Ke Xu +Date: Tue May 3 11:03:12 2016 +0900 + + add docs for zsh completion + + Signed-off-by: Ke Xu + +commit dd1079d21b5381e7d5f4178d46017b9664a506f5 +Author: Joao Fernandes +Date: Mon May 2 16:58:42 2016 -0700 + + Adds docs for DTR 2.0 + + * fixes #1725 + * fixes #1830 + * fixes #1899 + * fixes #1908 + * fixes #1911 + * fixes #1912 + * fixes #1913 + * fixes #1915 + +commit 822345fb97425b549c9c47351a0072deffb8817e +Author: Joao Fernandes +Date: Mon May 2 17:57:34 2016 -0700 + + Adds unique ids for all doc pages + +commit 930a5f1810fca3b7b649e15be63c224bae6bc08d +Merge: f53e8ee0e1 4848aeaa1f +Author: Joao Fernandes +Date: Mon May 2 18:20:42 2016 -0700 + + Merge pull request #1852 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit 641c1808e187ed86d8b614e49e8e6da5146201e3 +Author: Tonis Tiigi +Date: Mon May 2 15:23:22 2016 -0700 + + Move implicit pull test to use local registry + + Using hub only works for amd64 platforms. + + Signed-off-by: Tonis Tiigi + +commit 4394b8eee70202633e2259eef27260cf05987f19 +Merge: 57a5b1dbef 0b7bc1c04d +Author: Sven Dowideit +Date: Tue May 3 10:49:26 2016 +1000 + + Merge pull request #63 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit 1c0edf6c3953d0f298d3dc1ec19f71f0b3b57b19 +Merge: ca95f64968 a9935d276e +Author: Sven Dowideit +Date: Tue May 3 10:48:29 2016 +1000 + + Merge pull request #22394 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit b7088d29c6ee508881153aed3bb46290f521e15d +Merge: 5d08dfa70c e728c8bbed +Author: Sven Dowideit +Date: Tue May 3 10:48:11 2016 +1000 + + Merge pull request #1680 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit c1c8c70800f32a160eababddaa24b4cdcce9779d +Merge: 94bcbd1fb6 87ee38ed2c +Author: Sven Dowideit +Date: Tue May 3 10:47:00 2016 +1000 + + Merge pull request #3392 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit ca95f649682fd22f9fd902a3494e138b2d161a63 +Merge: 227c83826a a2eacff5c7 +Author: Aaron Lehmann +Date: Mon May 2 17:27:27 2016 -0700 + + Merge pull request #22457 from LK4D4/fix_error_format + + image/tarexport: fix error formatting + +commit 227c83826aafbbcb3235d75cf7ab58392e552a83 +Merge: 8d4ccd1925 55a9b8123d +Author: Brian Goff +Date: Mon May 2 20:20:08 2016 -0400 + + Merge pull request #21945 from rhvgoyal/export-min-free-space + + Export Mininum Thin Pool Free Space through docker info + +commit f53e8ee0e1030e703df8431ffc3b90ebbfe66151 +Author: Sven Dowideit +Date: Mon May 2 23:41:31 2016 +0000 + + Make unique menu title + + Signed-off-by: Sven Dowideit + +commit 94bcbd1fb6af4c5b832792d7d62b14fb15bff3bf +Merge: 3e11a95056 84aa39e978 +Author: Joffrey F +Date: Mon May 2 16:04:03 2016 -0700 + + Merge pull request #3388 from andrerom/patch-1 + + Clarify env-file doc that .env is read from cwd + +commit 8d4ccd19258901697d0072ca433c0211e79e8d9d +Merge: 1c1a1280ac 638096431a +Author: Sebastiaan van Stijn +Date: Mon May 2 23:43:05 2016 +0200 + + Merge pull request #22459 from twistlock/authorization_docs_fix + + Remove response modification sections from authorization design doc + +commit 3e11a95056e46d3eabf68dca0135ff7ea94d5505 +Merge: c41f30c3ff 310b3d9441 +Author: Joffrey F +Date: Mon May 2 14:34:12 2016 -0700 + + Merge pull request #3400 from shin-/3333-raise-up-errors + + Properly handle APIError failures in Project.up + +commit 1c1a1280ac6ed77dc8e8769d9efbb0fd0f5746eb +Merge: 75e63c942e 62bd539629 +Author: Alexander Morozov +Date: Mon May 2 14:30:32 2016 -0700 + + Merge pull request #22458 from estesp/betty-junods-cast + + Add Joan & Samuel Curran, Welsh scientist and Irish physicist couple + +commit 310b3d9441c8a63dc7f2685a1eb2d3e83e1584dc +Author: Joffrey F +Date: Fri Apr 29 19:42:07 2016 -0700 + + Properly handle APIError failures in Project.up + + Signed-off-by: Joffrey F + +commit 5d08dfa70c978033fdd2d8aa8db87d6bcd4aaad7 +Merge: a1d7463d67 9a67520af7 +Author: Richard Scothern +Date: Mon May 2 13:41:26 2016 -0700 + + Merge pull request #1650 from majewsky/swift/wait-for-dlo-segments + + [Swift] wait for DLO segments to show up when Close()ing the writer + +commit 8cbb1b27a4b2f91b96bcda18c574bcfeec796173 +Merge: 1baec48803 92834d1fa1 +Author: Nishant Totla +Date: Mon May 2 13:32:04 2016 -0700 + + Merge pull request #2191 from dongluochen/testhang + + Update stats test to stop connection + +commit 1baec4880331e9c42ece7382d3437d48f07e6d6d +Merge: b69728a2c5 116748e7bc +Author: Dongluo Chen +Date: Mon May 2 13:28:18 2016 -0700 + + Merge pull request #2199 from dongluochen/pstestfailure + + Fix api/ps tests + +commit 75e63c942ec8d3852f182b9cd9c221411fc74730 +Merge: 2f6e3b0ba0 e6590b5fa2 +Author: Brian Goff +Date: Mon May 2 16:12:43 2016 -0400 + + Merge pull request #21153 from mountkin/log-validator + + inherit the daemon log options when creating containers + +commit 116748e7bc4936f889e931dd6ff0deb7e5203a87 +Author: Dong Chen +Date: Mon May 2 12:26:56 2016 -0700 + + Fix api/ps tests. + + Signed-off-by: Dong Chen + +commit 638096431a36435aae0e30b6c76c134a4728ed5d +Author: Liron Levin +Date: Mon May 2 22:19:23 2016 +0300 + + Remove response modification sections from authorization design doc + + Signed-off-by: Liron Levin + +commit 62bd539629f643d227908c5d6b445e540bb3c486 +Author: Phil Estes +Date: Mon May 2 14:19:21 2016 -0400 + + Add Joan & Samuel Curran, Welsh scientest and Irish physicist couple + + In honor of Betty Junod's cast, and her tweet about Joan Curran: + https://twitter.com/BettyJunod/status/727194712956784641 + + Docker-DCO-1.1-Signed-off-by: Phil Estes + +commit d4559313d5b0284bf2544d83e6431873c06f8349 +Author: Brian Goff +Date: Mon May 2 14:23:38 2016 -0400 + + Set Pdeathsig for containerd on SIGKILL + + Makes sure containerd exits (when started by docker) if docker gets + SIGKILL'd. + + Signed-off-by: Brian Goff + +commit 20e1b9593ee1d23c5df7c78903d27a72cee711e8 +Author: Kenfe-Mickael Laventure +Date: Thu Apr 28 16:35:21 2016 -0700 + + Update build-deb to make correct use of DOCKER_BUILD_PKGS + + An environment variable cannot directly be used as a bash array, this + patch loops through all the IFS separated value (which default to + space) instead. + + Signed-off-by: Kenfe-Mickael Laventure + +commit 988f48164346f5cae713c630d884089958748238 +Author: Brian Goff +Date: Fri Apr 29 14:01:54 2016 -0400 + + Update engine-api + + Signed-off-by: Brian Goff + +commit 2f6e3b0ba027b558adabd41344fee59db4441011 +Merge: ba6209f744 526abc00b1 +Author: Aaron Lehmann +Date: Mon May 2 11:04:19 2016 -0700 + + Merge pull request #22448 from twistlock/authorization_error_code + + Fix authorization issue - when request is denied return forbbiden exist code (403). + +commit ba6209f7448865885519face97b1ffe30396939e +Merge: 7bb23f7acc 8983d42988 +Author: Brian Goff +Date: Mon May 2 13:58:57 2016 -0400 + + Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn + + Fix lookup of dockerd when called from outside of $PATH + +commit 46a37c0fa70fb6786a85eb97c6221dc5c592465b +Author: Riyaz Faizullabhoy +Date: Mon May 2 10:28:54 2016 -0700 + + Allow for password caching for delegation keys with non-delegation PEM names + + Signed-off-by: Riyaz Faizullabhoy + +commit a2eacff5c755d3257f453c9555526549bc3753b1 +Author: Alexander Morozov +Date: Mon May 2 10:26:32 2016 -0700 + + image/tarexport: fix error formatting + + Signed-off-by: Alexander Morozov + +commit 7bb23f7acc5a0d3fc54e1e08bb2f1a88836972d7 +Merge: 2a6980c5cb 54ebe42de9 +Author: Alexander Morozov +Date: Mon May 2 10:23:10 2016 -0700 + + Merge pull request #22247 from vdemeester/22240-implicit-pull + + Fix #22240 do not pull all the tags implicitely + +commit 5659554801b754e6791117e67d22235e7a3a5de3 +Author: Riyaz Faizullabhoy +Date: Mon May 2 10:11:01 2016 -0700 + + Allow for configurable notary signer db name, actually check allowed backends on setup + + Signed-off-by: Riyaz Faizullabhoy + +commit 526abc00b138a168fb248c98efd1b90fdf679036 +Author: Liron Levin +Date: Mon May 2 11:54:09 2016 +0300 + + Fix authorization issue - when request is denied return forbbiden exist code (403). + + - Return 403 (forbidden) when request is denied in authorization flows + (including integration test) + - Fix #22428 + - Close #22431 + + Signed-off-by: Liron Levin + +commit 8983d42988ad59f1a19a0f4e9e88dfec8b1be690 +Author: Daniel Nephin +Date: Wed Apr 27 13:08:20 2016 -0400 + + Raise a more relevant error when dockerd is not available on the platform. + + Signed-off-by: Daniel Nephin + +commit 9db86a38cdc183cefade48103b9ddb44ce3032fe +Author: Daniel Nephin +Date: Wed Apr 27 12:11:32 2016 -0400 + + When exec'ing dockerd, look for it in the same directory as the docker binary first, before checking path. + + Signed-off-by: Daniel Nephin + +commit 2a6980c5cb111514d1929c619b8fc8fc2df00fd5 +Merge: b0a5762348 ba3f8a9fef +Author: Vincent Demeester +Date: Mon May 2 17:39:46 2016 +0200 + + Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat + + Make zsh completion work when ps output is custom + +commit e6590b5fa2c442546d3dcfa3e0580eb024ede823 +Author: Shijiang Wei +Date: Tue Mar 15 11:12:09 2016 +0800 + + vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13 + + Signed-off-by: Shijiang Wei + +commit 1790980ec68c2579712e97ecffcdb8fa93700bc6 +Author: Shijiang Wei +Date: Sat Mar 12 20:50:37 2016 +0800 + + inherit the daemon log options when creating containers + + Signed-off-by: Shijiang Wei + +commit 79490a6ad3a2f44c937708c841bc61633e74da77 +Author: Damien Nadé +Date: Mon May 2 16:53:43 2016 +0200 + + contrib/completion/bash/docker: _docker_docker: quoting __docker_to_extglob result to avoid failglob interference + + Signed-off-by: Damien Nadé + +commit ba3f8a9fefc9da16dc00cf01f2b1d32ec54ce20d +Author: Brian Goff +Date: Mon May 2 09:45:01 2016 -0400 + + Make zsh completion work when ps output is custom + + When `psFormat` is used in the docker client config json, if the output + is non-standard it breaks some of the completion handling for + containers. + + This fixes that by ensuring that calls to `ps` use the default/standard + formatting by calling `docker ps --format 'table'` + + Signed-off-by: Brian Goff + +commit f74b856e1ac2805fe48ceb52bc83cd7a3cec870c +Author: Sebastiaan van Stijn +Date: Mon May 2 10:27:07 2016 +0200 + + Add support for reloading daemon configuration through systemd + + This adds support for reloading the docker daemon + (SIGHIUP) so that changes in '/etc/docker/daemon.json' + can be loaded at runtime by reloading the service + through systemd ('systemctl reload docker') + + Before this change, systemd would output an error + that "reloading" is not supported for the docker + service; + + systemctl reload docker + Failed to reload docker.service: Job type reload is not applicable for unit docker.service. + + After this change, the docker daemon can be reloaded + through 'systemctl reload docker', which reloads + the configuration; + + journalctl -f -u docker.service + + May 02 03:49:20 testing systemd[1]: Reloading Docker Application Container Engine. + May 02 03:49:20 testing docker[28496]: time="2016-05-02T03:49:20.143964103-04:00" level=info msg="Got signal to reload configuration, reloading from: /etc/docker/daemon.json" + May 02 03:49:20 testing systemd[1]: Reloaded Docker Application Container Engine. + + Signed-off-by: Sebastiaan van Stijn + +commit b69728a2c5a3651ea71f242e0f1ccb4b292d903a +Merge: 2a722a4058 6cd8a06c8f +Author: Nishant Totla +Date: Sun May 1 16:54:33 2016 -0700 + + Merge pull request #2196 from allencloud/fix-typos + + fix typos in test and other files + +commit 6cd8a06c8f6f3498e01ae413236592b09740fe0e +Author: Sun Hongliang +Date: Wed Apr 27 16:56:21 2016 +0800 + + fix typos in test and other files + + Signed-off-by: Sun Hongliang + +commit b2b82b952c1752038771568661e71f235a4e5e75 +Author: Sebastiaan van Stijn +Date: Sun May 1 20:03:22 2016 +0200 + + minor contributing.md cleanup + + - added an image-link to the contributors guide + - added a link to forums.docker.com + - removed link to the docker-user Google Group, which is no longer in use + - remove the "Issue Report Template", because we now have a template for this on GitHub + - remove reference to the old "Docker-DCO-1.1-Signed-off-by" sign-off + - changed some none-https links to https + + Signed-off-by: Sebastiaan van Stijn + +commit 54ebe42de9c359e0c9f171953bd787bb997d719e +Author: Vincent Demeester +Date: Sun May 1 14:46:04 2016 +0200 + + Fix #22240 do not pull all the tags implicitely + + Signed-off-by: Vincent Demeester + +commit b0a5762348f3810b67ef3804a464961812d18eb6 +Merge: e385faa35b 043c9ef076 +Author: Sebastiaan van Stijn +Date: Sun May 1 13:50:41 2016 +0200 + + Merge pull request #22439 from sunyuan3/the + + remove "the" in docs. + +commit 043c9ef076477a391a58792930100402b48bbe1e +Author: Yuan Sun +Date: Sun May 1 15:37:11 2016 +0800 + + remove "the" in docs. + + Signed-off-by: Yuan Sun + +commit 2a722a405857e965bd3c8dea98dfe87c9f30626b +Merge: 04b70bff15 eafd9d658d +Author: Alexandre Beslic +Date: Sat Apr 30 15:43:08 2016 -0700 + + Merge pull request #2194 from allencloud/use-engineapi-to-replace-dockerclient + + use engine-api to replace dockerclient + +commit eafd9d658db64672073884796d060ec9b96a1df9 +Author: Sun Hongliang +Date: Sun May 1 00:14:00 2016 +0800 + + use engine-api to replace dockerclient + + Signed-off-by: Sun Hongliang + +commit ba901bb062d8f1fbc7cc8d9fae5b7365afb66e69 +Author: Vincent Demeester +Date: Tue Apr 26 19:00:35 2016 +0200 + + Vendor engine-api with pull fixes + + Signed-off-by: Vincent Demeester + +commit e385faa35b5026ed27f59124d632ea30e9d647d1 +Merge: d32345240c d6780c3190 +Author: Brian Goff +Date: Sat Apr 30 10:54:28 2016 -0400 + + Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter + + Add zsh completion for 'docker network ls -f driver' + +commit d32345240c39b990a00d5d3e740a90a1f57d1251 +Merge: 7a56581297 96cc1ee44c +Author: Antonio Murdaca +Date: Sat Apr 30 13:23:58 2016 +0200 + + Merge pull request #22282 from fntlnz/docs-authorization-plugins + + Mention the fact that authz plugins are available today + +commit d6780c319086379023894c6ae26301bce6b01b98 +Author: Steve Durrheimer +Date: Fri Apr 29 22:39:38 2016 +0200 + + Add zsh completion for 'docker network ls -f driver' + + Signed-off-by: Steve Durrheimer + +commit 3894773d6edf8127ddf5f811492a9b49673196e7 +Author: Dan Walsh +Date: Sat Apr 30 05:43:07 2016 -0400 + + We should always return the MountLabel + + We need to have labels applied even if a container is running in privileged + mode. On an tightly locked down SELinux system, this will cause running + without labels will cause SELinux to block privileged mode containers. + + Signed-off-by: Dan Walsh + +commit 7a5658129740cd8e4345246758aa30fe3c835d10 +Merge: 90dfb3dacc 23e418b6c9 +Author: Vincent Demeester +Date: Sat Apr 30 10:38:10 2016 +0200 + + Merge pull request #22319 from thaJeztah/network-driver-filter + + Add "driver" filter for network ls + +commit 7a442c945de5bef99e75b28e4bf988f396cb20a7 +Author: kevinBlum +Date: Fri Apr 29 20:13:59 2016 -0700 + + Added documentation pertaining to VT-X virtualization being enabled when installing Toolbox + + Added info and links to check if VT-X is enabled and how to enable it. + Added info about potential other issues of Toolbox not running when installed before enabling VT-X + Documentation pertains to issues docker/toolbox#166 and docker/docker#16182 + +commit 8f4c947d428e523a79555394332905cd801b2854 +Author: Ke Xu +Date: Sat Apr 30 11:17:01 2016 +0900 + + grep text for per-driver options + + Signed-off-by: Ke Xu + +commit 92834d1fa1561ce33fdd50a019186e5a9387bee8 +Author: Dong Chen +Date: Fri Apr 29 17:55:04 2016 -0700 + + Update stats test to stop connection + + Signed-off-by: Dong Chen + +commit 28fb91b34459dae8e0531370aa005d95321803f1 +Author: Thom Linton +Date: Fri Apr 29 16:31:19 2016 -0700 + + Adds additional validation to 'env_vars_from_file'. + + The 'env_file' directive and feature precludes the use of the name + '.env' in the path shared with 'docker-config.yml', regardless of + whether or not it is enabled. + + This change adds an additional validation to allow the use of this + path provided it is not a file. + + Signed-off-by: Thom Linton + +commit c41f30c3ffd4c830c43c8f998b893abb9be204ce +Merge: bd7ec24e25 fe17e0f948 +Author: Joffrey F +Date: Fri Apr 29 17:50:32 2016 -0700 + + Merge pull request #3385 from shin-/3316-skip-statusless-events + + Skip event objects that don't contain a status field + +commit 90dfb3dacc56d789b70f5b5f3da6791465706c6c +Merge: b391a5914c 01a34e43b3 +Author: David Calavera +Date: Fri Apr 29 17:31:39 2016 -0700 + + Merge pull request #22372 from dnephin/cli_cleanup + + Reorganize client and cli packages + +commit b391a5914c5cd040f9f85ceaab04cafca6c34461 +Merge: cd41870132 8a51f9511c +Author: David Calavera +Date: Fri Apr 29 17:29:38 2016 -0700 + + Merge pull request #22426 from sdurrheimer/zsh-completion-network-ls-filters + + Add zsh completion for 'docker network ls -f {id,name,type}' + +commit 04b70bff154ce95f65a2689efea6236209ba4c5b +Merge: 31fe6179ab a3986cac05 +Author: Dongluo Chen +Date: Fri Apr 29 17:02:08 2016 -0700 + + Merge pull request #2154 from xianlubird/master + + Fix the bug that start container mess the host config + +commit fe17e0f94835aab59f71f33e055f1c52847ce673 +Author: Joffrey F +Date: Tue Apr 26 15:52:25 2016 -0700 + + Skip event objects that don't contain a status field + + Signed-off-by: Joffrey F + +commit bd7ec24e2580f9805cd1561779b3b3d9e3b0bf4b +Merge: 8cc7d68a00 0b24883cef +Author: Joffrey F +Date: Fri Apr 29 16:39:16 2016 -0700 + + Merge pull request #3384 from shin-/3264-shorthand-host-support + + Support combination of shorthand flag and equal sign for host option + +commit e4bb678875adf1a5aa5fdc1fe542f00c4e279060 +Author: Joffrey F +Date: Fri Apr 29 16:37:26 2016 -0700 + + Require latest docker-py version + + Signed-off-by: Joffrey F + +commit a1d7463d67bcf6ee87b7bd6bbcc3aeacf02e2d52 +Merge: 024a9ed6c7 d2e29acce0 +Author: Derek McGowan +Date: Fri Apr 29 16:18:29 2016 -0700 + + Merge pull request #1669 from RichardScothern/close-after-commit + + Clean uploads + +commit 31fe6179ab22ea26e08f5bbd8b9f471d5352d52c +Merge: dd90e08024 77e88346c5 +Author: Sebastiaan van Stijn +Date: Sat Apr 30 01:05:26 2016 +0200 + + Merge pull request #2185 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit cd418701326f91c71194e2e09d71a0692705de78 +Merge: 5e58a583fc bb94cfce62 +Author: Sebastiaan van Stijn +Date: Sat Apr 30 00:39:29 2016 +0200 + + Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page + + Update remote API client libraries page + +commit 5e58a583fc0a9dd208c60690bdc7580209446e93 +Merge: e44a868bc4 668f0a2a4c +Author: Alexander Morozov +Date: Fri Apr 29 15:16:33 2016 -0700 + + Merge pull request #22427 from tonistiigi/simplify-blkio + + Simplify blkio resources setup in spec + +commit e44a868bc4a0fa2cd2cd3a3b269870ed745da50b +Merge: aa537a367c 1ac4c61c10 +Author: Sebastiaan van Stijn +Date: Sat Apr 30 00:00:48 2016 +0200 + + Merge pull request #22406 from allencloud/fix-typos + + fix typos in CHANGELOG.md and pull.go + +commit 024a9ed6c7d265ad7f74dd2bb04721eb903ff098 +Merge: 72c9bfe1b5 620a030217 +Author: Aaron Lehmann +Date: Fri Apr 29 14:40:24 2016 -0700 + + Merge pull request #1681 from aaronlehmann/preserve-authors-schema1 + + Preserve author information in schema1 manifests + +commit 3730470b641dcb7ebe50e32512ad4565fa340027 +Author: Troels Thomsen +Date: Fri Apr 29 23:34:24 2016 +0200 + + Pass through known errors + + Signed-off-by: Troels Thomsen + +commit 134bdbcb90436784114c1f3aa818b6a55ebf357a +Merge: 35010659eb f2f9e6169a +Author: Ying Li +Date: Fri Apr 29 14:24:01 2016 -0700 + + Merge pull request #698 from docker/codecov.yml + + Add a codecov config file that disables project and changes statuses + +commit ce724731973159a4fcedf16d0996571684cc3843 +Author: Kenfe-Mickael Laventure +Date: Fri Apr 29 11:38:13 2016 -0700 + + Reset RemovalInProgress flag on daemon restart + + This flag can be set on disk if the daemon were to crash or error out + while trying to remove container in which case subsequent tries to + delete the container would all fail. + + Signed-off-by: Kenfe-Mickael Laventure + +commit 668f0a2a4c04e550c957cf5eff6618c6b40d1252 +Author: Tonis Tiigi +Date: Fri Apr 29 13:39:04 2016 -0700 + + Simplify blkio resources setup in spec + + Signed-off-by: Tonis Tiigi + +commit 8a51f9511cffd8d95dd46fc1b3663a7e7e543949 +Author: Steve Durrheimer +Date: Fri Apr 29 22:04:50 2016 +0200 + + Add zsh completion for 'docker network ls -f {id,name,type}' + + Signed-off-by: Steve Durrheimer + +commit aa537a367c72174ac01fb64d6c86721c9a20bb0b +Merge: f114ab21de 6e4c87c06e +Author: Doug Davis +Date: Fri Apr 29 13:59:14 2016 -0400 + + Merge pull request #22417 from michael-holzheu/s390x-dockerfile-add-registry-and-notary + + Dockerfile.s390x: Build correct registries and notary client + +commit f114ab21de33062c8b1db83ecd772691b9ec05c4 +Merge: 9a58dd22f0 57aef3b490 +Author: John Howard +Date: Fri Apr 29 10:47:20 2016 -0700 + + Merge pull request #22340 from Microsoft/jstarks/split-service + + Windows: Support running dockerd as a service + +commit 9a58dd22f05fded46665edb10aabcf0551176863 +Merge: 55bc0a3440 5c8950e84d +Author: Vincent Demeester +Date: Fri Apr 29 19:42:19 2016 +0200 + + Merge pull request #22419 from cpuguy83/reflection_is_for_mirrors + + Remove reflection on CLI init + +commit 6e4c87c06e95f8c1aea0fa6d6575ff8c9faf8e03 +Author: Michael Holzheu +Date: Fri Apr 29 04:59:19 2016 -0400 + + Dockerfile.s390x: Build correct registries and notary client + + Sync with other Dockerfiles: + + 1) Adjust REGISTRY_COMMIT + 2) Add old shema1 registry + 3) Install notary client + + This fixes the following testcases: + + DockerSchema1RegistrySuite: + - SetUpTest + DockerTrustSuite: + - TestTrustedBuildTagFromReleasesRole + - TestTrustedBuildTagIgnoresOtherDelegationRoles + - TestTrustedPullReadsFromReleasesRole + - TestTrustedPullIgnoresOtherDelegationRoles + - TestTrustedPushWithReleasesDelegationOnly + - TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor + - TestTrustedPushSignsForRolesWithKeysAndValidPaths + - TestTrustedPushDoesntSignTargetsIfDelegationsExist + DockerRegistrySuite: + - TestPullManifestList + - TestCrossRepositoryLayerPush + DockerHubPullSuite: + - TestPullAllTagsFromCentralRegistry + + v2: Sync comments on all architectures + + Signed-off-by: Michael Holzheu + +commit 72c9bfe1b56e06505a670431daf5327cf63a296f +Merge: ba927007b0 8cded9db0d +Author: Derek McGowan +Date: Fri Apr 29 09:54:28 2016 -0700 + + Merge pull request #1683 from dmcgowan/update-golem-test-versions + + Use official docker 1.11.1 image to test docker 1.11 + +commit 35010659ebbe2baa6fa0613a2137d20a68a423c3 +Merge: c2219d664e 7e6c15d7e1 +Author: Riyaz Faizullabhoy +Date: Fri Apr 29 09:53:10 2016 -0700 + + Merge pull request #695 from docker/size-const + + Add const for max size -1 for GetMeta + +commit f2f9e6169aae136e4206e566c7ca1ffc60fc4f97 +Author: Ying Li +Date: Tue Apr 26 13:02:02 2016 -0700 + + Add a codecov config file that disables project and changes statuses + + Signed-off-by: Ying Li + +commit 7e6c15d7e1ad08a2fcc8c9c0eb2cf8ed1b3154e7 +Author: Riyaz Faizullabhoy +Date: Tue Apr 26 10:27:56 2016 -0700 + + Rename constant + + Signed-off-by: Riyaz Faizullabhoy + +commit fa1ead35e21d3eb8158b776d1fc93cb3444baba4 +Author: Riyaz Faizullabhoy +Date: Tue Apr 26 09:56:11 2016 -0700 + + More occurrences of -1 and fixup comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 4bd5c10fc8153a1eb04e0af10a5a3bb16ff9d306 +Author: Riyaz Faizullabhoy +Date: Mon Apr 25 12:39:50 2016 -0700 + + Add const for max size -1 for GetMeta + + Signed-off-by: Riyaz Faizullabhoy + +commit 5c8950e84d2384919f45209f8cc4cbf00ff29015 +Author: Brian Goff +Date: Fri Apr 29 11:16:34 2016 -0400 + + Remove reflection on CLI init + + before: + ``` + $ time docker --help + real 0m0.177s + user 0m0.000s + sys 0m0.040s + ``` + + after: + ``` + $ time docker --help + real 0m0.010s + user 0m0.000s + sys 0m0.000s + ``` + + Signed-off-by: Brian Goff + +commit 55bc0a344085338826bca00ea75ffb9e4b5e0c79 +Merge: 24a8de2b60 3932d46a78 +Author: Sebastiaan van Stijn +Date: Fri Apr 29 17:53:16 2016 +0200 + + Merge pull request #22418 from thaJeztah/update-event-api-docs + + update API example response for docker events + +commit 3932d46a7878e3e75d8119f332b927fd2107cb32 +Author: Sebastiaan van Stijn +Date: Fri Apr 29 17:37:04 2016 +0200 + + update API example response for docker events + + the events API was rewritten in 723be0a3325799fd6b2a6b689af54f5a07edf992, + but the example response in the documentation doesn't reflect the actual output + + this fixes the example response + + Signed-off-by: Sebastiaan van Stijn + +commit 1ac4c61c10b7753607d8cb17421b90475c1bd0d6 +Author: allencloud +Date: Thu Apr 28 14:08:21 2016 +0800 + + fix typos in CHANGELOG.md and pull.go + + Signed-off-by: allencloud + +commit 55d61e98baa9cfffa246b40f48b09b9865b585ca +Author: Lucas Chan +Date: Mon Mar 14 15:53:30 2016 +1100 + + Updated docker-info output and documentation + + - [x] Update man page description + - [x] Update man page sample output to something more current + + Tested with: `TESTFLAGS='-check.f DockerSuite.TestInfoEnsureSucceeds*' + make test-integration-cli` + + Signed-off-by: Lucas Chan + Signed-off-by: Sebastiaan van Stijn + +commit 23e418b6c966a43a463a064053ce0c741b8e5159 +Author: Sebastiaan van Stijn +Date: Mon Apr 25 22:21:11 2016 +0200 + + Add "driver" filter for network ls + + This add a new filter to 'docker network ls' + to allow filtering by driver-name. + + Contrary to "ID" and "name" filters, this + filter only supports an *exact* match. + + Signed-off-by: Sebastiaan van Stijn + +commit 2b6bc294fc7f9e08a9091833b021b7d2a01ad2a6 +Author: Brian Goff +Date: Mon Mar 7 21:41:44 2016 -0500 + + When calling volume driver Mount, send opaque ID + + This generates an ID string for calls to Mount/Unmount, allowing drivers + to differentiate between two callers of `Mount` and `Unmount`. + + Signed-off-by: Brian Goff + +commit 24a8de2b60c68c72924d61cb0c4587944e3be5b4 +Merge: 717842fbde 97f45bd629 +Author: Doug Davis +Date: Fri Apr 29 08:13:13 2016 -0400 + + Merge pull request #22202 from michael-holzheu/s390x-add-libseccomp-2.3.0 + + Dockerfile.s390x: Add upstream libseccomp to compile runc + +commit dd90e08024f1c1ba388a6de5204cd38154c7c119 +Merge: 9dd298589d b5a74ee875 +Author: Alexandre Beslic +Date: Thu Apr 28 18:23:25 2016 -0700 + + Merge pull request #2176 from allencloud/close-http-response-body-to-avoid-memory-leak + + close http response body to avoid potential memory leak + +commit 24ec73f754da16e37726a3f1c6a59de508e255fc +Author: Wen Cheng Ma +Date: Thu Apr 28 14:55:22 2016 +0800 + + Update the `docker daemon` to `dockerd` for document + + Signed-off-by: Wen Cheng Ma + +commit c2219d664e73ad2dca6cd84fff9ef1439dd5ac12 +Merge: 2166f84543 177711137f +Author: Ying Li +Date: Thu Apr 28 18:00:59 2016 -0700 + + Merge pull request #705 from docker/docs-fix + + Docs fix + +commit 9dd298589dd861fa668d70e514948ceadda08327 +Merge: c07a84529d f39ac0e2c2 +Author: Victor Vieux +Date: Thu Apr 28 17:59:44 2016 -0700 + + Merge pull request #2177 from jimmyxian/add-support-ps-filter-volume + + add support ps --filter volume + +commit d2c9f8bc9a674a4f215afe3651a09ee5c42c713c +Author: drew ogryzek +Date: Thu Apr 28 16:15:47 2016 -0700 + + Update Edits + + Signed-off-by: drew ogryzek + +commit 354a71b4cfc675d579430b193aa0910ad4b4911b +Author: drew ogryzek +Date: Wed Apr 27 16:07:27 2016 -0700 + + Edit typos in 'Try Swarm at scale' + + Signed-off-by: drew ogryzek + +commit 8cded9db0df16afc860a0fa58327ec0b466a87f6 +Author: Derek McGowan +Date: Thu Apr 28 14:51:13 2016 -0700 + + Use official docker 1.11.1 image to test docker 1.11 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 81bd90aae06516580a62d224077ce080a4bd902a +Merge: ebe8b01d26 d80f914a42 +Author: Viktor Stanchev +Date: Thu Apr 28 14:27:01 2016 -0700 + + Merge pull request #1850 from vikstrous/docs_stuff + + docs stuff; fix #1833; fix #1691; fix #1692; fix #1690; fix #1693; fi… + +commit 84aa39e978c16877a64f1b097875667ff6eeef95 +Author: André R +Date: Wed Apr 27 13:45:59 2016 +0200 + + Clarify env-file doc that .env is read from cwd + + Closes #3381 + + Signed-off-by: André R + +commit ba927007b0aea2e3a4ec7745a6cb4f95592d7f4e +Merge: a7dda2ce93 69ba30dc03 +Author: Richard Scothern +Date: Thu Apr 28 14:09:58 2016 -0700 + + Merge pull request #1677 from RichardScothern/tonyhb-fix-s3-gc-error + + Move GC into storage package and add tests + +commit 717842fbdeeec3e3bd56525e998a2ffcb087b4d0 +Merge: ca611fdea2 d0a65a03e9 +Author: Brian Goff +Date: Thu Apr 28 16:26:29 2016 -0400 + + Merge pull request #22370 from mlaventure/fix-experimental-builder + + Allow specifying the apt mirror to use when generating deb packages + +commit 177711137fa06dab6beca90f904f69764b78c057 +Author: Ying Li +Date: Thu Apr 28 13:19:03 2016 -0700 + + Fix service architecture tables that were misformatted, and re-link sequence diagram. + + Signed-off-by: Ying Li + +commit 27469f01fe244bdf70f34219616657b336724bc3 +Author: Ying Li +Date: Thu Apr 28 13:18:24 2016 -0700 + + Fix metadata sequence diagram that was missing arrows. + + Signed-off-by: Ying Li + +commit d0a65a03e9f789b73956e2d30447a385d6531dfe +Author: Kenfe-Mickael Laventure +Date: Wed Apr 27 10:56:34 2016 -0700 + + Allow specifying the apt mirror to use when generating deb packages + + Signed-off-by: Kenfe-Mickael Laventure + +commit 8cc7d68a002ebde1392cdecc5a8c7538c70b2fed +Merge: 61794ba97c 2efcec776c +Author: Joffrey F +Date: Thu Apr 28 12:53:04 2016 -0700 + + Merge pull request #3390 from aronahl/master + + Add missing log event filter when using docker-compose logs. + +commit 0b24883cef6ad5737b949815e107a968e96c2a55 +Author: Joffrey F +Date: Tue Apr 26 12:21:47 2016 -0700 + + Support combination of shorthand flag and equal sign for host option + + Signed-off-by: Joffrey F + +commit ae9f392c10807c0a0792bc1821b3746570095be2 +Merge: 0a5abf22b6 8ed715fd4f +Author: Nathan LeClaire +Date: Thu Apr 28 12:12:51 2016 -0700 + + Merge pull request #3365 from ndeloof/master + + Fixes #2302 Possibility to create master with manager, but without agent + +commit 620a0302177de09fad3b30ffc02c691baa084018 +Author: Aaron Lehmann +Date: Thu Apr 28 11:57:48 2016 -0700 + + Preserve author information in schema1 manifests + + When we push a schema1 manifest, we encode history information from the + image JSON into v1Compatibility strings for the respective layers. The + "author" field was not being set in these v1Compatibility strings, so if + a parent layer had an author set, it would not be preserved after + pushing through a schema1 manifest and repulling, so the image ID would + change after the pull. This change preserves the authorship information + for parent layers so that the image ID does not change. + + Signed-off-by: Aaron Lehmann + +commit 8ed715fd4f847bfb4e39a049071c25cf675ff756 +Author: Nicolas De Loof +Date: Mon Apr 25 09:43:03 2016 +0200 + + Fixes #2302 Possibility to create master with manager, but without agent + + Signed-off-by: Nicolas De Loof + +commit 2166f845432abaa36806f5613a58119f730f2a40 +Merge: b54934f353 8ab3937e9f +Author: Ying Li +Date: Thu Apr 28 10:56:56 2016 -0700 + + Merge pull request #704 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit 0a5abf22b6a002d0617a25be67415578c37b2d3f +Merge: 25c3fa64a4 fc7f35ab54 +Author: Nathan LeClaire +Date: Thu Apr 28 10:55:50 2016 -0700 + + Merge pull request #3393 from SvenDowideit/use-docs-base-oss + + convert docs Dockerfiles to use docs/base:oss + +commit 25c3fa64a45464b241e2bcb7efd8c13b1f563a6e +Merge: 445158a731 ab1ca913ad +Author: Nathan LeClaire +Date: Thu Apr 28 10:54:12 2016 -0700 + + Merge pull request #3387 from ndeloof/fix-3287 + + Introduce —swarm-join-opt to pass options to agent nodes Fixes #3285 Fix regression introduced by PR #3287 + +commit b54934f3531eb44b98513e3574fc8ccdfe765bbc +Merge: 9da826a775 52e6017dcb +Author: Riyaz Faizullabhoy +Date: Thu Apr 28 09:11:28 2016 -0700 + + Merge pull request #703 from SvenDowideit/fix-image-path + + Use markdown to link to image, so the published result shows it + +commit ca611fdea28ea559f689df97484564bebf5d472b +Merge: dbee44c9e0 8bf5613c1a +Author: Brian Goff +Date: Thu Apr 28 11:30:28 2016 -0400 + + Merge pull request #22388 from fy2462/exec-add-newline + + Fix bug: exec non-exist command miss a "\n" + +commit 2efcec776c430c527d61069f16bea298d9e4fb37 +Author: Aaron Nall +Date: Wed Apr 27 22:44:28 2016 +0000 + + Add missing log event filter when using docker-compose logs. + + Signed-off-by: Aaron Nall + +commit dbee44c9e0d9f8afbbb86efd2c0bcbd66440cbbc +Merge: 0bb4c902e0 57fad95e43 +Author: Brian Goff +Date: Thu Apr 28 11:06:17 2016 -0400 + + Merge pull request #21613 from wzyboy/support-unixgram-syslog-address + + Support unixgram syslog address + +commit 61794ba97c1034ec1522ef71fe7bc0b6ff91c6e5 +Merge: 7ad7eb71ca d3e645488a +Author: Daniel Nephin +Date: Thu Apr 28 10:33:18 2016 -0400 + + Merge pull request #3377 from shin-/3372-windowserror + + Define WindowsError on non-win32 platforms + +commit 0bb4c902e091762e88d54699ba7677c9e62a3cbd +Merge: feb8f0e10e 63aa03ce0a +Author: Sebastiaan van Stijn +Date: Thu Apr 28 15:27:28 2016 +0200 + + Merge pull request #22396 from sbellem/docs-typo-fix + + Fix typo + +commit 0b7bc1c04dc3b8407cdb96451371c5ba4bcf0f15 +Author: Sven Dowideit +Date: Thu Apr 28 13:22:41 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit 63aa03ce0a9d2390f684da3403c1cd0e004592d1 +Author: Sylvain Bellemare +Date: Thu Apr 28 15:15:08 2016 +0200 + + Fix typo + + Signed-off-by: Sylvain Bellemare + +commit 4848aeaa1f59f48c2a4fec7d6b198c4404f20f60 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:07 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit feb8f0e10ea151608ed793ec0a88c1a3749f896d +Merge: d37e22b623 ca0c1becea +Author: Brian Goff +Date: Thu Apr 28 09:11:25 2016 -0400 + + Merge pull request #22391 from thaJeztah/update-changelog-in-master + + merge changelog for v1.11.1 into master + +commit 732c8a8ca3918f507f566fa7a3ff36b39193c779 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:38 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit 77e88346c5f34c614f64173c9b5231cc2e04eb1f +Author: Sven Dowideit +Date: Thu Apr 28 12:57:35 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit 8ab3937e9f8719717dfcb12ec658d420f561d1eb +Author: Sven Dowideit +Date: Thu Apr 28 12:57:26 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit fc7f35ab546b1627fe1ea626dc1d103b73b2f480 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:23 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit b2e57b6f07d7bbdd52fd0a5871965956601fe1c3 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:20 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit a9935d276ee8c45a1fc7f3e387c173ed26c71682 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:13 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit e728c8bbed82b9cbe078ed3461cdd366e22cfdb5 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:10 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit 87ee38ed2c8da3fdee816737b55d7c7eb6e36a26 +Author: Sven Dowideit +Date: Thu Apr 28 12:57:02 2016 +0000 + + convert docs Dockerfiles to use docs/base:oss + + Signed-off-by: Sven Dowideit + +commit d37e22b6237ba99adacf200e823d50aade38c551 +Merge: 09021d6841 00e84ca4d2 +Author: Sebastiaan van Stijn +Date: Thu Apr 28 12:45:08 2016 +0200 + + Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence + + docs: remove duplicate line in "Understand the architecture" + +commit 09021d6841b825dbaab901a34617358b03ae17ac +Merge: bf7307558e 1521a41fc5 +Author: Antonio Murdaca +Date: Thu Apr 28 12:26:22 2016 +0200 + + Merge pull request #22344 from cpuguy83/seccomp_for_centos + + centos:7/oraclelinux:7 now includes libseccomp 2.2.1 + +commit ca0c1becea921300599b44dc5b4f2d6e463309ec +Author: Kenfe-Mickael Laventure +Date: Fri Apr 22 15:59:42 2016 -0700 + + Add changelog for v1.11.1 + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit 4146b8b69b4fcc5a6ddbbac63f316695c2dbbb8f) + Signed-off-by: Sebastiaan van Stijn + +commit bf7307558e42e0ad9f41316f397d880e6d4981b6 +Merge: 78eb8a5fb9 9ab0aa4336 +Author: Sebastiaan van Stijn +Date: Thu Apr 28 11:19:56 2016 +0200 + + Merge pull request #22269 from coolljt0725/skip + + Skip TestBuildNotVerboseFailure if no network + +commit 8bf5613c1aca634e517e895e90e74f4263cf030f +Author: fy2462 +Date: Thu Apr 28 15:45:24 2016 +0800 + + Fix bug: exec non-exist command miss a "\n" + + When exec a non-exist command, it should print a newline at last. + + Currently: + ``` + $ docker exec -ti f5f703ea2c0a144 bash + rpc error: code = 2 desc = "oci runtime error: exec failed: exec: + \"bash\": executable file not found in $PATH"$ + ``` + + Signed-off-by: Feng Yan + +commit ab1ca913ad9e66c67691affa4ba828f6c01e6e75 +Author: Nicolas De Loof +Date: Thu Apr 28 09:15:53 2016 +0200 + + Introduce —swarm-join-opt to pass options to agent nodes + Fixes #3285 + Fix regression introduced by PR #3287 + + Signed-off-by: Nicolas De Loof + +commit 78eb8a5fb932c2b11df47e7a22c05fe485e03adb +Merge: deb6ea4702 ee4bd806ba +Author: Vincent Demeester +Date: Thu Apr 28 09:25:13 2016 +0200 + + Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation + + API/CLI discrepancy on hostname validation (#21595). + +commit d80f914a42439d069fc5e6303affa52c1d10342b +Author: Viktor Stanchev +Date: Wed Apr 27 20:51:15 2016 -0700 + + docs stuff; fix #1833; fix #1691; fix #1692; fix #1690; fix #1693; fix #1815 + +commit 52e6017dcba5abb383f52f19f3970d8bd82f318b +Author: Sven Dowideit +Date: Thu Apr 28 03:13:13 2016 +0000 + + Use markdown to link to image, so the published result shows it + + Signed-off-by: Sven Dowideit + +commit 57fad95e4352c72c852d740e54fd693a446c552f +Author: Zhuoyun Wei +Date: Tue Mar 29 18:21:41 2016 +0800 + + Support unixgram syslog address + + - Consider unixgram:// as a valid URL prefix + - Parse unixgram:// addresses + - Update docs + + Signed-off-by: Zhuoyun Wei + +commit 9da826a7758c926f7241608f688fedcf4a1e469a +Merge: f5b4b5f810 5b78101dca +Author: Ying Li +Date: Wed Apr 27 19:57:20 2016 -0700 + + Merge pull request #694 from HuKeping/docs-fix + + Docs: some review + +commit a3986cac05207bdcc62a66b1b5c8a19c092d7f7b +Author: xianlubird +Date: Thu Apr 21 13:35:59 2016 +0800 + + Fix the bug that start container mess the host config + + Signed-off-by: Xianlu + +commit ebe8b01d265c0460ac3e760665adf60b3c049049 +Author: Madhu Venugopal +Date: Wed Apr 27 19:07:50 2016 -0700 + + Updating CS-Engine release notes for 1.11.1-cs1 + + Signed-off-by: Madhu Venugopal + +commit 9ab0aa43365cd648d7681a58b60e91f791bc920a +Author: Lei Jitang +Date: Wed Apr 27 21:29:05 2016 -0400 + + Skip TestBuildNotVerboseFailure if no network + + TestBuildNotVerboseFailure use a non-exist image busybox1, + it requires network connection to access to Dockerhub, skip + this test if there is no network. + + Signed-off-by: Lei Jitang + +commit 5b78101dcafbe42a1542eb02441f4f39b4852ae7 +Author: HuKeping +Date: Wed Apr 27 10:01:28 2016 +0800 + + Revert "Docs: review service_architecture.md" + + This reverts commit 76698409744c8a02e2fb7a5d1843d8425f9ba417. + + Relative discussion: + https://github.com/docker/notary/pull/694#discussion-diff-60949918R30 + + Signed-off-by: Hu Keping + +commit 5c2faf0da812d64589f8d74fcc05ef200f2d9d79 +Author: HuKeping +Date: Mon Apr 25 13:00:42 2016 -0400 + + Docs: update some tips and comments + + Signed-off-by: Hu Keping + +commit 4a45f8aedef1ca8077c1cd345306609d758aa05b +Author: HuKeping +Date: Mon Apr 25 12:47:07 2016 -0400 + + Docs: some review on README + + It seems it should be "apt-get install libtool" not "libtool-dev". + + Signed-off-by: Hu Keping + +commit 6dc80bde93e13d336be6924676843f6807a15291 +Author: HuKeping +Date: Mon Apr 25 10:39:38 2016 -0400 + + Docs: review docs/advanced_usage.md + + Signed-off-by: Hu Keping + +commit 04ba393efb38c94d0a36c8b3362a19ae11b1874a +Author: HuKeping +Date: Mon Apr 25 10:15:17 2016 -0400 + + Docs: some review on reference/commond-configs + + The reason why we'd like to fail the start when a wrong debug level + was provided, please take a look at: + + https://github.com/docker/notary/pull/389 + + Signed-off-by: Hu Keping + +commit 5194c4bd8b1308aed2f0fe80f0d4c18a5ba88b0f +Author: HuKeping +Date: Mon Apr 25 06:50:37 2016 -0400 + + Docs: review service_architecture.md + + Signed-off-by: Hu Keping + +commit c6359fa505fcaea6cd4c5602c0f3c7bfd1c0248d +Author: HuKeping +Date: Mon Apr 25 06:42:45 2016 -0400 + + Docs: fix some broken link + + Signed-off-by: Hu Keping + +commit c07a84529d805fcf6c6807f1b23d9b3ef76e45b6 +Merge: 797bdd5775 c70f836e88 +Author: Victor Vieux +Date: Wed Apr 27 18:09:51 2016 -0700 + + Merge pull request #2175 from nishanttotla/remove-type-conversions + + Remove type unnecessary type conversion + +commit deb6ea4702924ff390e4a57414f735b18e4d7185 +Merge: 1158c921ab 8fec7c26d4 +Author: Sebastiaan van Stijn +Date: Thu Apr 28 00:48:47 2016 +0200 + + Merge pull request #22362 from ZJU-SEL/update-doc + + update cgroup link in doc of run + +commit f5b4b5f81000938fe1285aff5936a712455adf4d +Merge: b494088c7f 117124e6da +Author: Ying Li +Date: Wed Apr 27 15:17:06 2016 -0700 + + Merge pull request #580 from docker/builder + + Bottleneck TUF Repo validation by using a builder to create one in the client and server + +commit a7dda2ce93ad96e49daf1dffcd6dfe1ddde2ad6a +Merge: 6a992e1348 09a9b0cf90 +Author: Richard Scothern +Date: Wed Apr 27 15:05:52 2016 -0700 + + Merge pull request #1665 from andrewhsu/middleware-redirect + + add middleware storage driver for redirect + +commit 445158a731ea3845e8cb217429eba06e1744eb1b +Merge: af4f3828f6 0376230a5f +Author: Nathan LeClaire +Date: Wed Apr 27 14:56:20 2016 -0700 + + Merge pull request #3378 from ahmetalpbalkan/azure-autorest-fix + + azure: create temporary file next to destination + +commit 117124e6da8343810fb8da8d156f48ac0bdd4933 +Author: Ying Li +Date: Wed Apr 27 14:45:37 2016 -0700 + + Address review comments: + - fix a spelling mistake and rename the builder retroactive-checksum-check functions + - on client update bootstrapping, we should not validate the root on disk against any trust pinning configuration + + Signed-off-by: Ying Li + +commit d2e29acce05144bb8ec8e07ff60246ebc7164745 +Author: Richard Scothern +Date: Tue Apr 19 16:31:25 2016 -0700 + + When a blob upload is committed prevent writing out hashstate in the + subsequent close. + + When a blob upload is cancelled close the blobwriter before removing + upload state to ensure old hashstates don't persist. + + Signed-off-by: Richard Scothern + +commit b494088c7f562735eaa503548c6c206803bd48ca +Merge: 2874955337 e8dc295c9d +Author: Riyaz Faizullabhoy +Date: Wed Apr 27 14:19:06 2016 -0700 + + Merge pull request #699 from endophage/remove_encrypted_package + + removed encrypted package. legacy from flynnn, we don't use it + +commit 3a313b1dc96bc82bf5f54bb619d2e20c7a1b1bc4 +Author: Ying Li +Date: Wed Apr 27 14:14:39 2016 -0700 + + Convert all use of copyKeys to testutils.CopyKeys + + Signed-off-by: Ying Li + +commit 69ba30dc03fc1e6e0cc257752eb38a9c9dcdec28 +Author: Richard Scothern +Date: Wed Apr 27 13:24:22 2016 -0700 + + Add a test with a missing _manifests directory + + Signed-off-by: Richard Scothern + +commit ea492aca1aacfdc53568ed948a7cee8658d1c813 +Author: Richard Scothern +Date: Wed Apr 27 11:49:01 2016 -0700 + + Move garbage collect code into storage package + + Signed-off-by: Richard Scothern + +commit a5aaae1f0620f3a110232821d44ecd0505b3d496 +Author: Tony Holdstock-Brown +Date: Mon Apr 25 21:14:00 2016 -0700 + + Ensure GC continues marking if _manifests is nonexistent + + Signed-off-by: Tony Holdstock-Brown + +commit 797bdd5775be775f49207bcaeeeda3830cadee55 +Merge: d0bc1833d0 8cca29e9a9 +Author: Dongluo Chen +Date: Wed Apr 27 13:08:12 2016 -0700 + + Merge pull request #2169 from allencloud/add-NodeID-in-docker-info + + add NodeID in docker info + +commit 1158c921ab49793d87fc35e15eff23434822d6ab +Merge: 861815a325 1e44bba4af +Author: Alexander Morozov +Date: Wed Apr 27 12:05:10 2016 -0700 + + Merge pull request #22361 from duglin/removeCR + + Remain extra \n on INFO log msg + +commit 01a34e43b3f7a701ee1112b960740a5aaa6bdb93 +Author: Daniel Nephin +Date: Mon Apr 25 12:05:42 2016 -0400 + + Consolidate the files in client/ + + Signed-off-by: Daniel Nephin + +commit 30e3620eaea88cf33fd7deb8c88359469c27b3f7 +Author: Daniel Nephin +Date: Thu Apr 21 18:37:08 2016 -0400 + + Refactor cliconfig so that the default constructor can exist in the package. + + Signed-off-by: Daniel Nephin + +commit 33c9edaf6c5401fc1891713d1ad8d861e6cea51f +Author: Daniel Nephin +Date: Thu Apr 21 17:51:28 2016 -0400 + + Cleanup the structure of the cli package. + + Move all flags into cli/flags + Move usage help into cli/usage.go + + Signed-off-by: Daniel Nephin + +commit e8dc295c9d3b9b6a9b6957d326eabdead67871b1 +Author: David Lawrence +Date: Wed Apr 27 10:54:36 2016 -0700 + + removed encrypted package. legacy from flynnn, we don't use it + Signed-off-by: David Lawrence (github: endophage) + +commit ab7064ea1280977350682493f4aaf74e91c8bc8c +Author: Ying Li +Date: Fri Apr 22 10:35:15 2016 -0700 + + Change minimum required version of metadata to be 1, not 0 + + Signed-off-by: Ying Li + +commit 5d1b4bc6ec28b343bbbe42df67fd7be7315d7194 +Author: Ying Li +Date: Thu Apr 21 10:56:12 2016 -0700 + + Add ConsistentInfo and snapshot/timestamp retroactive checksum tests for the builder. + + Signed-off-by: Ying Li + +commit c9e91446a1c0294bc8988f9773095b27a193424c +Author: Ying Li +Date: Wed Apr 6 11:31:20 2016 -0700 + + Builder interface cleanup and bugfixes: + - can never set an invalid repo, so we can remove the failed builder state + - once a builder is "finished", it's swapped out with one that has no state and cannot be modified + - add builder tests for the negative path cases where builder should error + - fix bug with GenerateSnapshot where we didn't check for a targets to be loaded when generating for the first time + + This also adds some negative path tests (cases in which the builder errors due to invalid input or things not being loaded) + + Signed-off-by: Ying Li + +commit d1ccf0048d7f1c7e657779cb6323610c914966a4 +Author: Ying Li +Date: Wed Apr 20 14:26:06 2016 -0700 + + Remove signed.Verify in favor of just using signed.VerifySignatures, + signed.VerifyVersion, and signed.VerifyExpiry. + + Signed-off-by: Ying Li + +commit aba6317da04ae1eddd45f55158696d332bcb677d +Author: Ying Li +Date: Tue Apr 19 22:43:18 2016 -0700 + + Remove `SetRoot`, `SetTargets`, `SetTimestamp`, and `SetSnapshot` on tuf.Repo. + Builder is the only one that sets them now. + + Signed-off-by: Ying Li + +commit 5acab543e4098bbc8b78f3624fce97cb2c4101d0 +Author: Ying Li +Date: Wed Apr 6 10:33:59 2016 -0700 + + Update the client to have an old builder and a new builder, and to only use + cached version numbers to check downloaded version numbers of cached data + validates against the old builder. + + This also removes the `GetRepo` function of the builder and adds some data + accessors instead that are necessary to do a consistent download and check + versions, that way the downloader doesn't need to fish around in the repo + itself for data in order to figure out what to download. + + Signed-off-by: Ying Li + +commit 04ec865b314ff3bf8f57accb0a0aa1a720b65f42 +Author: Ying Li +Date: Tue Apr 19 17:44:42 2016 -0700 + + Update all the server validation and generation code to use the builder. + This means that the server cannot accept any roots not signed by an + x509 key whose GUN doesn't match the GUN being updated. + + Signed-off-by: Ying Li + +commit 82c88e95a5e6f664b537660bff8d60c90ef9d58e +Author: Ying Li +Date: Sat Mar 19 16:20:01 2016 -0700 + + Convert bootstrap repo to use the builder + + Signed-off-by: Ying Li + +commit 5f3eaf411ba6a5b8eea7a1053442f8d9abc27f6c +Author: Ying Li +Date: Tue Apr 19 17:30:24 2016 -0700 + + Update the downloading client to use the builder. + Delete the remaining TUF client download tests because they are already covered by + the client update tests. + + Signed-off-by: Ying Li + +commit a34e2e1dd1aa914bf1a0d9e7e13bfe1690b2af04 +Author: Ying Li +Date: Wed Apr 6 13:49:01 2016 -0700 + + Introduce a builder which builds a TUF repo object, which can be used by + the downloading client and the server validation. This will hopefully unify + server and client validation. + + Signed-off-by: Ying Li + +commit 28749553377fd9534ce7f11b03bb7ecd2a36211d +Merge: dc445b4a3a 60c225b361 +Author: Ying Li +Date: Wed Apr 27 10:58:37 2016 -0700 + + Merge pull request #693 from docker/remove-certstore + + Remove certstore + +commit 6a992e1348f69d77da2131cd0d7388073489098b +Merge: 47d14555c0 32193bdcf0 +Author: Richard Scothern +Date: Wed Apr 27 10:08:53 2016 -0700 + + Merge pull request #1675 from sergeyfd/master + + Fix wording for dry-run flag in usage message for garbage collector. + +commit 861815a3252b88a118a91a164246401fa24fa549 +Merge: d6176bb03a 77da3bcb72 +Author: moxiegirl +Date: Wed Apr 27 09:59:30 2016 -0700 + + Merge pull request #22229 from riyazdf/notary-doc-update + + Update DCT docs with 1.11 info, fix typos + +commit 77da3bcb72ba4f936c428cb2b912c007a94cb87a +Author: Riyaz Faizullabhoy +Date: Wed Apr 20 23:05:44 2016 -0700 + + Update DCT docs with 1.11 info, fix typos + + Signed-off-by: Riyaz Faizullabhoy + +commit 97f45bd629fa3e5921c5a70f3e8087c1afbb07a6 +Author: Michael Holzheu +Date: Fri Apr 8 13:03:53 2016 -0400 + + Dockerfile.s390x: Add upstream libseccomp to compile runc + + The runc compile currently fails on s390x: + + Step 35 : RUN set -x && export GOPATH="$(mktemp -d)" && git clone + https://github.com/opencontainers/runc.git + "$GOPATH/src/github.com/opencontainers/runc" && cd + "$GOPATH/src/github.com/opencontainers/runc" && git checkout -q + "$RUNC_COMMIT" && make static BUILDTAGS="seccomp apparmor selinux" && + cp runc /usr/local/bin/docker-runc + + [snip] + + # github.com/seccomp/libseccomp-golang + Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go:25:22: + fatal error: seccomp.h: No such file or directory + // #include + + The problem is that the installed libseccomp version in trusty is too old. + + Fix this and install version 2.3.0 of libseccomp like it is done in the + x86 Dockerfile. + + Signed-off-by: Michael Holzheu + +commit ade83aa4d5c94b84181a6ef358c73041cf94c2bf +Author: Nathan LeClaire +Date: Wed Apr 27 09:54:00 2016 -0700 + + Bump to version 1.11.1 + + Signed-off-by: Nathan LeClaire + +commit b9135646d6d132e448a4da46effd7889fbf69416 +Author: Daniel Nephin +Date: Wed Apr 27 11:41:21 2016 -0400 + + Update the binary name in docker-engine-selinux/docker.fc. + + Signed-off-by: Daniel Nephin + +commit 8fec7c26d4e831481674bcab7a0539affc91da29 +Author: Hao Zhang <21521210@zju.edu.cn> +Date: Wed Apr 27 08:50:46 2016 -0400 + + update cgroup link in doc of run + + Signed-off-by: Hao Zhang <21521210@zju.edu.cn> + +commit 1e44bba4af6c417e10cbf7aa459a8225dfb89d6c +Author: Doug Davis +Date: Wed Apr 27 05:19:40 2016 -0700 + + Remain extra \n on INFO log msg + + Signed-off-by: Doug Davis + +commit d6176bb03add9c03b0ef83617648f34496713fe2 +Merge: 0147164cfd 0656105710 +Author: Vincent Demeester +Date: Wed Apr 27 12:58:49 2016 +0200 + + Merge pull request #22137 from HackToday/addevents + + Add load/save image event support + +commit f39ac0e2c24bd32ef00793fb986a3dee863679c1 +Author: Xian Chaobo +Date: Wed Apr 27 15:10:54 2016 +0800 + + add support ps --filter volume + + Signed-off-by: Xian Chaobo + +commit 60c225b3619e537277268c81cfc3e091e673276f +Author: Riyaz Faizullabhoy +Date: Tue Apr 26 16:59:15 2016 -0700 + + Type check on testutil key types + + Signed-off-by: Riyaz Faizullabhoy + +commit b5a74ee875008fc0ca1bd943662dd2e748d1d8e4 +Author: Sun Hongliang +Date: Wed Apr 27 11:41:21 2016 +0800 + + close http response body to avoid potential memory leak + + Signed-off-by: Sun Hongliang + +commit a0191a23419121544a2bae941970ff09a0d272bb +Author: Zhang Wei +Date: Tue Apr 26 11:50:12 2016 +0800 + + Remove WaitRunning + + Remove function `WaitRunning` because it's actually not necessary, also + remove wait channel for state "running" to avoid mixed use of the state + wait channel. + + Signed-off-by: Zhang Wei + +commit 32193bdcf07df973aa25372f00fcdf249f6036ff +Author: Serge Dubrouski +Date: Tue Apr 26 19:44:23 2016 -0600 + + Fix wording for dry-run flag in useage message for garbage collector. + + Signed-off-by: Serge Dubrouski + +commit 06561057103441fe176910e12674d998b8561b75 +Author: Kai Qiang Wu(Kennan) +Date: Tue Apr 19 04:45:59 2016 +0000 + + Add load/save image event support + + For every docker load and save operations, it would log related + image events. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit d0bc1833d056e36fc99d8560bf001e124a668855 +Merge: 5cb4faad2b 6998163ab1 +Author: Dongluo Chen +Date: Tue Apr 26 17:49:20 2016 -0700 + + Merge pull request #2165 from nishanttotla/change-of-context + + Change context.TODO() to context.Background() + +commit 1521a41fc578958d0238f95b43c49edab9a65a47 +Author: Brian Goff +Date: Tue Apr 26 17:09:00 2016 -0400 + + centos:7/OL:7 now includes libseccomp 2.2.1 + + Signed-off-by: Brian Goff + +commit 8cca29e9a9cf277ef469896e37e89d02e29710d6 +Author: Sun Hongliang +Date: Tue Apr 26 22:11:36 2016 +0800 + + add NodeID in docker info + + Signed-off-by: Sun Hongliang + +commit 0147164cfd0645849f2464edb2c64c601a3ab492 +Merge: 2b97201e0c 6a8ea46c67 +Author: Brian Goff +Date: Tue Apr 26 20:23:13 2016 -0400 + + Merge pull request #22329 from runcom/fix-tmpfs-order + + daemon: reorder mounts before setting them + +commit 2a3c301274b8e66178a298cd0d1669edd0cde97c +Author: Riyaz Faizullabhoy +Date: Tue Apr 26 17:04:48 2016 -0700 + + Update and rebase + + Signed-off-by: Riyaz Faizullabhoy + +commit 1976982685c4536875ed35b3038cae19ab7a9691 +Author: Riyaz Faizullabhoy +Date: Mon Apr 25 10:40:26 2016 -0700 + + Use ErrRootRotationFail when checking new root against old keys + + Signed-off-by: Riyaz Faizullabhoy + +commit ed1bf1a0a6063c779dbb83b213dd5475fbec26cc +Author: Riyaz Faizullabhoy +Date: Fri Apr 22 14:25:15 2016 -0700 + + Address review comments + + Signed-off-by: Riyaz Faizullabhoy + +commit ca9fc99ba5a0c1a9c151f939b247481e76551fb2 +Author: Riyaz Faizullabhoy +Date: Fri Apr 22 11:11:13 2016 -0700 + + Goodbye Certstore + + Signed-off-by: Riyaz Faizullabhoy + +commit 01bbd532c6a0201723fd3112cc23b59724e3ad19 +Author: Riyaz Faizullabhoy +Date: Thu Apr 21 18:01:47 2016 -0700 + + Update update logic to error out on corrupted previous root metadata + + Signed-off-by: Riyaz Faizullabhoy + +commit 5901c87feb948414673e6ea08e7a38f6c8a95410 +Author: Riyaz Faizullabhoy +Date: Thu Apr 21 17:11:46 2016 -0700 + + Update tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 9da40f07da30b68f781ad3898a63c5811c2b6fe1 +Author: Riyaz Faizullabhoy +Date: Thu Apr 21 11:18:35 2016 -0700 + + Foundation for removing certstore + + Signed-off-by: Riyaz Faizullabhoy + +commit 2b97201e0cd8301484fde379d2bf7f0ad3f36f10 +Merge: a8c5ba7517 0433801093 +Author: Michael Crosby +Date: Tue Apr 26 16:51:09 2016 -0700 + + Merge pull request #22181 from Microsoft/jjh/workdir + + Windows: Consistent build workdir handling + +commit a8c5ba75172686a2be2119a3b46c6acda02f0a36 +Merge: 4925fcbe2e 8df2066341 +Author: John Howard +Date: Tue Apr 26 15:54:52 2016 -0700 + + Merge pull request #21384 from Microsoft/10662-IOResourceControls + + Add IO Resource Controls for Windows + +commit 0433801093f1988db0e210e28352f4af71a0ac81 +Author: John Howard +Date: Tue Apr 19 20:55:30 2016 -0700 + + Windows: Consistent build workdir handling + + Signed-off-by: John Howard + +commit dc445b4a3a9965cc8c715519723618197a65810c +Merge: b5a7b2adaa 8e30157a5c +Author: Ying Li +Date: Tue Apr 26 15:28:53 2016 -0700 + + Merge pull request #697 from aaronlehmann/cosmetic + + trustmanager: Minor cosmetic source code fixes + +commit e4dd3359cc3171b98ae34edd8a0a1a19e6d61a6a +Author: Josh Hawn +Date: Sat Feb 27 15:37:07 2016 -0800 + + Regulate filesystem driver to max of 100 calls + + It's easily possible for a flood of requests to trigger thousands of + concurrent file accesses on the storage driver. Each file I/O call creates + a new OS thread that is not reaped by the Golang runtime. By limiting it + to only 100 at a time we can effectively bound the number of OS threads + in use by the storage driver. + + Docker-DCO-1.1-Signed-off-by: Josh Hawn (github: jlhawn) + + Signed-off-by: Tony Holdstock-Brown + +commit 09a9b0cf902d23a84506934a652257e0370398a1 +Author: Andrew Hsu +Date: Tue Apr 26 14:33:54 2016 -0700 + + separate the go/non-go imports and reorder + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit 57aef3b49025aac6bb084491478eb461b14b9109 +Author: John Starks +Date: Fri Apr 22 17:16:14 2016 -0700 + + Windows: Support running dockerd as a service + + This adds support for Windows dockerd to run as a Windows service, managed + by the service control manager. The log is written to the Windows event + log (and can be viewed in the event viewer or in PowerShell). If there is + a Go panic, the stack is written to a file panic.log in the Docker root. + + Signed-off-by: John Starks + +commit c70f836e884509c817b097fcfda94fa178efe920 +Author: Nishant Totla +Date: Tue Apr 26 13:42:17 2016 -0700 + + Remove type unnecessary type conversion + + Signed-off-by: Nishant Totla + +commit 5cb4faad2b4b468322d58124339013c47bca4e55 +Merge: 258e9d6752 4d9e8dc42d +Author: Nishant Totla +Date: Tue Apr 26 13:07:20 2016 -0700 + + Merge pull request #2171 from allencloud/add-return-when-getting-an-httpError + + return immediately when getting an httpError to avoid response mixture + +commit 0376230a5ffd877a9d589ad98cf3fd580427d136 +Author: Ahmet Alp Balkan +Date: Tue Apr 26 12:38:09 2016 -0700 + + azure: create temporary file next to destination + + We were doing atomic file writes by writing to /tmp + and moving to the actual destination, however some filesystems + do not support copying from /tmpfs. + + Bumping the `go-autorest` dependency version to latest. + + Fixes #3313. + + Signed-off-by: Ahmet Alp Balkan + +commit 7ad7eb71ca704a43bcdcd4a923f58fdc6e49b62a +Merge: 0cd35913c3 756ef14edc +Author: Aanand Prasad +Date: Tue Apr 26 20:34:18 2016 +0100 + + Merge pull request #3164 from aanand/fix-config-v1 + + WIP: Fix output of 'config' for v1 files + +commit 4925fcbe2e5db8e44d48af0ec12b2badb7af1752 +Merge: d3d591c536 a7eecd2b61 +Author: Brian Goff +Date: Tue Apr 26 15:01:02 2016 -0400 + + Merge pull request #22324 from WeiZhang555/fix-test-case + + Fix test case + +commit d3e645488a87840d1fab9660b98c09d2a8ec676f +Author: Joffrey F +Date: Mon Apr 25 17:58:20 2016 -0700 + + Define WindowsError on non-win32 platforms + + Signed-off-by: Joffrey F + +commit d3d591c5365d22037cb884bae4ac269dd4da28b2 +Merge: 1f72e46095 0c7eab3157 +Author: Alexander Morozov +Date: Tue Apr 26 11:24:01 2016 -0700 + + Merge pull request #22276 from Microsoft/jjh/dockerd + + Move docker and dockerd main packages in directories with same name, under `cmd/` + +commit 756ef14edc824ce2c52a2eb636c4884c95652e1e +Author: Aanand Prasad +Date: Tue Apr 26 17:30:04 2016 +0100 + + Fix format of 'restart' option in 'config' output + + Signed-off-by: Aanand Prasad + +commit 6064d200f946c8d9738e1b73a03b1f78f947e2ef +Author: Aanand Prasad +Date: Fri Mar 18 13:14:33 2016 +0000 + + Fix output of 'config' for v1 files + + Signed-off-by: Aanand Prasad + +commit 84a3e2fe79552ca94172bd3958776b01eed0e31e +Author: Aanand Prasad +Date: Fri Mar 18 13:01:35 2016 +0000 + + Check full error message in test_up_with_net_is_invalid + + Signed-off-by: Aanand Prasad + +commit a4d3dd6197b9e15cf993823d93d321778d2fdcd8 +Author: Aanand Prasad +Date: Fri Mar 18 13:00:55 2016 +0000 + + Remove v2_only decorators on config tests + + Signed-off-by: Aanand Prasad + +commit 258e9d675214a3925343f09996c92467d754139b +Merge: e19990d2f5 ef7e2777a8 +Author: Alexandre Beslic +Date: Tue Apr 26 11:19:52 2016 -0700 + + Merge pull request #2173 from vieux/fix_tests + + fix swarm build in tests + +commit 95229513b36bdb30a281b83a1907c936375fffec +Author: Madhu Venugopal +Date: Mon Apr 25 12:30:05 2016 -0700 + + Updating CS-Engine release notes for 1.10.3-cs2 and 1.10.3-cs3 + + Signed-off-by: Madhu Venugopal + +commit ef7e2777a80ff2b9bbf7f7235e9cbf84379bb2da +Author: Victor Vieux +Date: Tue Apr 26 11:16:37 2016 -0700 + + fix swarm build in tests + + Signed-off-by: Victor Vieux + +commit 8e30157a5c13d79726ca83431c4950eaa1c8c868 +Author: Aaron Lehmann +Date: Tue Apr 26 10:29:39 2016 -0700 + + trustmanager: Minor cosmetic source code fixes + + Fixing a few things I noticed scrolling through the Notary 0.3.0-RC1 + diff. + + Signed-off-by: Aaron Lehmann + +commit 4d9e8dc42db0b5027c957d0eca71f1af6581059d +Author: Sun Hongliang +Date: Wed Apr 27 01:00:10 2016 +0800 + + return immediately when getting an httpError to avoid response mixture + + Signed-off-by: Sun Hongliang + +commit 1f72e46095cca6850d00af0bca736fdf26176a03 +Merge: dc7664d62e eb59238d17 +Author: Sebastiaan van Stijn +Date: Tue Apr 26 18:51:31 2016 +0200 + + Merge pull request #22291 from thaJeztah/update-template-for-changelog + + pull-request template: ask for changelog description + +commit 0cd35913c34dd72f574ac2c53d5fb41a4665ecea +Merge: ac82597ac1 26fe8213aa +Author: Joffrey F +Date: Tue Apr 26 09:38:12 2016 -0700 + + Merge pull request #3382 from dnephin/upgrade_pip + + Upgade pip to latest - attempt to fix jenkins builds + +commit 0c7eab31577d65f0d33766af533144e358ffe651 +Author: John Howard +Date: Sat Apr 23 18:31:57 2016 -0700 + + Make dockerd debuggable + + Signed-off-by: John Howard + +commit 26fe8213aa3edcb6bfb8ec287538f9d8674ae124 +Author: Daniel Nephin +Date: Tue Apr 26 11:58:41 2016 -0400 + + Upgade pip to latest + + Hopefully fixes our builds. + + Signed-off-by: Daniel Nephin + +commit dc7664d62e4e758ba1a532dca578f53880faa388 +Merge: 6b91fd1a91 626d25a7d9 +Author: Vincent Demeester +Date: Tue Apr 26 15:32:06 2016 +0200 + + Merge pull request #22308 from tianon/dockerd-consistency + + Tweak hack/make/*-{client,daemon} to be consistent + +commit f1ad6f127bf83dfd549166120d16fceea7c9b3e6 +Author: Ken Cochrane +Date: Thu Apr 21 16:01:49 2016 -0400 + + Exclude .git directories from the source RPMS + + Ignore .git directory when creating debian sources + + Added missing DOCKER_GITCOMMIT env variable to build-deb + + Signed-off-by: Ken Cochrane + +commit a7eecd2b61296825f9a0f739dbc06ad65a3d2c5d +Author: Zhang Wei +Date: Tue Apr 26 11:05:41 2016 +0800 + + Fix test case + + "TestRestartContainerwithRestartPolicy" contains some codes that could be + flaky, it's supposed to be fixed in #22256. + + This commit removes unnecessary code, make the test case cleaner. + + Signed-off-by: Zhang Wei + +commit 6b91fd1a91bbb3148c505be9fa72d201f2ef56c9 +Merge: 3f7b6754ca 718eba8836 +Author: Vincent Demeester +Date: Tue Apr 26 13:00:38 2016 +0200 + + Merge pull request #22328 from HackToday/fixcomment + + Fix wrong comment + +commit 3f7b6754ca11cbb5a34bc54c8878df04719e5aee +Merge: dc98cb534e 204a52c689 +Author: Sebastiaan van Stijn +Date: Tue Apr 26 12:46:25 2016 +0200 + + Merge pull request #22331 from SvenDowideit/minor-api-formating-change + + Small API formating fix. + +commit 204a52c689204a4d9506d500955673f7b5361d1d +Author: Sven Dowideit +Date: Tue Apr 26 10:29:31 2016 +0000 + + Small API formating fix. + + Signed-off-by: Sven Dowideit + +commit eb59238d17ac63dcc598980044033f79052b5fa7 +Author: Sebastiaan van Stijn +Date: Mon Apr 25 11:47:36 2016 +0200 + + pull-request template: ask for changelog description + + Signed-off-by: Sebastiaan van Stijn + +commit 6a8ea46c67c3594118c7da41b1cebe062aff3f6a +Author: Antonio Murdaca +Date: Tue Apr 26 10:20:17 2016 +0200 + + daemon: reorder mounts before setting them + + Signed-off-by: Antonio Murdaca + +commit 718eba88363c14065b3a2a2dfbc9f270fc7cf63e +Author: Kai Qiang Wu(Kennan) +Date: Tue Apr 26 07:36:14 2016 +0000 + + Fix wrong comment + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 57a5b1dbef5fbaf740f4aa9943bb73d7febcbcd0 +Merge: 9dd45b421c ca392db248 +Author: Sebastiaan van Stijn +Date: Tue Apr 26 09:27:52 2016 +0200 + + Merge pull request #61 from thaJeztah/update-maintainers + + update maintainers-file + +commit dc98cb534e1ac2375112db56f5c98dd08010c4dc +Merge: 78895c92c2 fab67ab677 +Author: Vincent Demeester +Date: Tue Apr 26 08:19:47 2016 +0200 + + Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm + + Windows: revendor Azure/go-ansiterm + +commit 78895c92c2baab420ae73322cc3d15009efa221e +Merge: e2c40555f7 4677f8036e +Author: John Howard +Date: Mon Apr 25 20:53:19 2016 -0700 + + Merge pull request #22275 from Microsoft/jstarks/no_rsrc + + Windows: Add file version information + +commit 24103260a34b40bc8eae3d665ed6cf3a8267a481 +Author: Ke Xu +Date: Tue Apr 26 11:51:40 2016 +0900 + + #3191 add zsh completion + + Signed-off-by: Ke Xu + +commit 47d14555c02463c062e920198f3aeb2fcd6bcdb4 +Merge: d654cfd985 17756eb43e +Author: Richard Scothern +Date: Mon Apr 25 17:01:15 2016 -0700 + + Merge pull request #1644 from fh1ch/clarify-kid-format + + Clarify kid format for JWT token auth in docs + +commit e2c40555f76c0fddff8e17f7930ad90d4cf375b8 +Merge: 66ebc34235 e0f98c698b +Author: Brian Goff +Date: Mon Apr 25 19:54:32 2016 -0400 + + Merge pull request #22318 from mrunalp/mount_label_fix + + Fix mount label + +commit d654cfd985bcfd68bb25e891ba16c933691e7cd9 +Merge: c83afea0c9 ab2394446c +Author: Richard Scothern +Date: Mon Apr 25 16:10:19 2016 -0700 + + Merge pull request #1623 from dmcgowan/docker-integration-readme + + Integration test readme update + +commit c83afea0c91e623a4371d47243be6ce61172e20c +Merge: ef32134592 f76c622d8c +Author: Richard Scothern +Date: Mon Apr 25 16:07:54 2016 -0700 + + Merge pull request #1660 from jhaohai/cn-north-1-fix + + Add cn-north-1 to valid check + +commit ef321345922aea1e3e723dcd815e106ffed4dfd3 +Merge: 96f796fb01 21f38a74e6 +Author: Richard Scothern +Date: Mon Apr 25 16:02:48 2016 -0700 + + Merge pull request #1666 from sergeyfd/master + + Add blobWrtiter.Close() call into blobWriter.Commit() + +commit 96f796fb0190b3be58eb0949fc6041ca70e6a2c0 +Merge: cd27f179f2 987faca8a6 +Author: Richard Scothern +Date: Mon Apr 25 16:02:17 2016 -0700 + + Merge pull request #1670 from vadmeste/fix_parts_sorting + + s3 driver: Sorting completed parts by part number for a better accordance with S3 spec + +commit fab67ab677e14c908f879e362f8805c8e91570c6 +Author: John Starks +Date: Mon Apr 25 15:55:12 2016 -0700 + + Windows: revendor Azure/go-ansiterm + + go-ansiterm was previously pulling the testing package into the docker + binaries. + + Signed-off-by: John Starks + +commit 66ebc34235f32fdb37dcc9b859037944f3790bbd +Merge: 1b4286f40d da92dad59f +Author: John Howard +Date: Mon Apr 25 15:20:23 2016 -0700 + + Merge pull request #22055 from Microsoft/sjw/servicing + + Adding servicing update to postRunProcessing for Windows containers. + +commit af4f3828f626ceae5c7a225524420507c16321f4 +Merge: 6839107ecc 58122bab64 +Author: Nathan LeClaire +Date: Mon Apr 25 14:49:09 2016 -0700 + + Merge pull request #3370 from kacole2/documentation/add_rackhd_driver_plugin_to_list + + Added RackHD to the Available Driver Plugin List & Alphabetized + +commit ca392db2488d48b5c563185b4755c8d5c3d3182f +Author: Sebastiaan van Stijn +Date: Mon Apr 25 23:31:36 2016 +0200 + + update maintainers-file + + Signed-off-by: Sebastiaan van Stijn + +commit e0f98c698b49e3790fe63bff611eeda6f5b46055 +Author: Mrunal Patel +Date: Mon Apr 25 12:55:28 2016 -0700 + + Update runc and spec dependencies for mount label + + Signed-off-by: Mrunal Patel + + Set up the mount label in the spec for a container + + Signed-off-by: Mrunal Patel + +commit 00e84ca4d20ef35ab1bdc83889afbf3374ee9745 +Author: Sebastiaan van Stijn +Date: Mon Apr 25 23:16:49 2016 +0200 + + docs: remove duplicate line in "Understand the architecture" + + Signed-off-by: Sebastiaan van Stijn + +commit 1b4286f40de1237ef96f9e953a6a8c2f050b8421 +Merge: e974eadd94 2fae3d2693 +Author: Alexander Morozov +Date: Mon Apr 25 14:02:26 2016 -0700 + + Merge pull request #22306 from thaJeztah/update-integration-test-network-only + + skip TestAuthApi if no network is available + +commit 6998163ab104f0b2567e81a2331be52a9a1cb8d4 +Author: Nishant Totla +Date: Mon Apr 25 13:28:35 2016 -0700 + + Change context.TODO() to context.Background() + + Signed-off-by: Nishant Totla + +commit 58122bab64014b653eccf596ce7a6ce85a79771e +Author: Kendrick Coleman +Date: Mon Apr 25 16:58:13 2016 -0400 + + Added RackHD to the Available Driver Plugin List & Alphabetized + + Added RackHD to the list of available driver plugins. Also alphabetized the list to make it easier to read. + + Signed-off-by: Kendrick Coleman + +commit e19990d2f5b3531ee8ab04327149f6524df2f51b +Merge: 2044af6949 c882e5e5a7 +Author: Victor Vieux +Date: Mon Apr 25 13:57:53 2016 -0700 + + Merge pull request #2164 from vieux/rollback_to_1.5.4 + + rollback to Go 1.5.4 + +commit 8df2066341931d9b7ba552afa902e2ef12e5eed5 +Author: Darren Stahl +Date: Wed Feb 24 17:51:46 2016 -0800 + + Add IO Resource Controls for Windows + + Signed-off-by: Darren Stahl + +commit 6839107ecc7479e4a1d22596440a1ed76710c12e +Merge: 4e898b1806 b0ef41f624 +Author: Nathan LeClaire +Date: Mon Apr 25 12:24:00 2016 -0700 + + Merge pull request #3287 from LBaali/3285 + + Add support for --swarm-opt to agent nodes + +commit da92dad59f76421a22a955d2aed25bfeb4562385 +Author: Stefan J. Wernli +Date: Wed Apr 13 13:34:07 2016 -0700 + + Adding servicing update to postRunProcessing for Windows containers. + + This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container. + + Signed-off-by: Stefan J. Wernli + +commit 207027087e71f5587ca407e20cc252f7958bc1b3 +Author: Brett Higgins +Date: Mon Apr 25 07:54:48 2016 -0400 + + Respect ALL_PROXY during registry operations + + Use sockets.DialerFromEnvironment, as is done in other places, + to transparently support SOCKS proxy config from ALL_PROXY + environment variable. + + Requires the *engine* have the ALL_PROXY env var set, which + doesn't seem ideal. Maybe it should be a CLI option somehow? + + Only tested with push and a v2 registry so far. I'm happy to look + further into testing more broadly, but I wanted to get feedback on + the general idea first. + + Signed-off-by: Brett Higgins + +commit c4df027d41ce5af9b87aef02f08241216f3f3524 +Author: Andrew Hsu +Date: Mon Apr 25 11:40:21 2016 -0700 + + modify redirect test to include port + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit fe9509f8f3bd075a46b57f1bd86bec63a96e02fb +Author: Andrew Hsu +Date: Mon Apr 25 11:31:02 2016 -0700 + + added config doc for redirect middleware + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit 80248c3d3aabec255bd3e2c4132b985b467931ee +Author: Andrew Hsu +Date: Mon Apr 25 10:28:32 2016 -0700 + + scheme and host mandatory in baseurl + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit 059bc5f5ef965b8b668c9fc61b5af0eda589d033 +Author: Andrew Hsu +Date: Mon Apr 25 09:32:36 2016 -0700 + + separate the go/non-go imports and reorder + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit 4e898b180615bfaed960e276e39f3b749617326e +Merge: 73bf92b95d 770d5bbb6f +Author: Nathan LeClaire +Date: Mon Apr 25 11:48:35 2016 -0700 + + Merge pull request #3362 from nathanleclaire/fix_dangling_amazonec2_ssh_key + + Ensure that attempt to remove instance and SSH key both go through + +commit 626d25a7d94aa05427ecb85ba73bad1e8738c57b +Author: Tianon Gravi +Date: Mon Apr 25 10:40:07 2016 -0700 + + Tweak hack/make/*-{client,daemon} to be consistent + + Signed-off-by: Andrew "Tianon" Page + +commit e974eadd949c5d7cb91a7d4406c2e0da8b1db677 +Merge: 5611424d82 5ee737c70c +Author: Tibor Vass +Date: Mon Apr 25 14:39:45 2016 -0400 + + Merge pull request #22303 from kencochrane/fix_integration_daemon_start + + Fixing the PATH in .integration-daemon-start to find dyn docker binary + +commit 5611424d82c6cebd134c83ba99bb4ccb72703317 +Merge: 48f25161be f9e03d52e9 +Author: Tibor Vass +Date: Mon Apr 25 14:38:13 2016 -0400 + + Merge pull request #22301 from kencochrane/dynbinary-fix + + Change name from docker-client to docker in dynbinary-client + +commit 2044af694929597fa595f69eb8271a38f9e8dec8 +Merge: e4bab6cf07 fa8b2737a1 +Author: Alexandre Beslic +Date: Mon Apr 25 11:34:36 2016 -0700 + + Merge pull request #2143 from allencloud/remove-empty-vendor-in-stretchr-testify + + remove empty vendor in stretchr testify + +commit 48f25161be64b98d9d38f3dbe1fe7873e7149b78 +Merge: 17d5c97c90 e7a99ae5e1 +Author: Alexander Morozov +Date: Mon Apr 25 11:27:42 2016 -0700 + + Merge pull request #22230 from justincormack/seccomp_dropcalls + + Remove mlock and vhangup from the default seccomp profile + +commit 2fae3d2693648d1c0f5cc079f37aaba5116ba5f9 +Author: Sebastiaan van Stijn +Date: Mon Apr 25 19:17:17 2016 +0200 + + skip TestAuthApi if no network is available + + Signed-off-by: Sebastiaan van Stijn + +commit e4bab6cf07ba831cab8eaf578f3023256bba2145 +Merge: 0524ead8da 61e0ccd243 +Author: Nishant Totla +Date: Mon Apr 25 10:36:09 2016 -0700 + + Merge pull request #1942 from allencloud/api-response-status-code-comparison + + add documentation describing the difference in api response status code. + +commit 61e0ccd243978d16b79dc7bfa3352623a91096d3 +Author: Sun Hongliang +Date: Fri Mar 11 02:30:38 2016 +0800 + + add documentation describing the difference in api response status code. + + Signed-off-by: Sun Hongliang + +commit 17d5c97c900d90bee7a1ba4182bf9ea51e5c386d +Merge: e6df098390 b6db56b5eb +Author: Vincent Demeester +Date: Mon Apr 25 19:15:32 2016 +0200 + + Merge pull request #22125 from crosbymichael/restart-timeout + + Reset restart timeout if execution longer than 10s + +commit e6df098390b286abb40a87b2cb13228a6aebdf79 +Merge: 88d1ae148c 93973196f4 +Author: Aaron Lehmann +Date: Mon Apr 25 10:15:08 2016 -0700 + + Merge pull request #22254 from yongtang/22244-remote-api-auth-behavior + + Add default `serveraddress` value in remote API `/auth` + +commit 88d1ae148cb27cb685e1d6abf631d48bf3bf7408 +Merge: 28b7dc51ae 632b314b23 +Author: Vincent Demeester +Date: Mon Apr 25 18:10:04 2016 +0200 + + Merge pull request #22272 from yongtang/22271-relative-symlinks + + Relative symlinks don't work with --device argument + +commit 28b7dc51aec6a237af187badfc1953eb9dbbb142 +Merge: bee093802d 2feb88cbd3 +Author: David Calavera +Date: Mon Apr 25 09:08:38 2016 -0700 + + Merge pull request #21583 from allencloud/move-cors-into-common-config + + move cors into common config + +commit bee093802d0310c1e34a3b5fcd9c37ea16cd38f9 +Merge: 0843527e86 455858fc70 +Author: Tibor Vass +Date: Mon Apr 25 12:06:57 2016 -0400 + + Merge pull request #22299 from thaJeztah/fix-label-reload + + fix reloading of daemon labels from config + +commit 0843527e869ebeeb1e0c43f5487af3c75d0a6187 +Merge: d03ba27b76 3c45c5abfc +Author: David Calavera +Date: Mon Apr 25 09:05:09 2016 -0700 + + Merge pull request #22265 from thaJeztah/ohman-ohman + + OHMAN! Move vbatts to alumni + +commit d03ba27b76a5dee1d4e6306c66e6e842f41275fa +Merge: e8708f3049 241898d136 +Author: Doug Davis +Date: Mon Apr 25 11:50:00 2016 -0400 + + Merge pull request #22118 from michael-holzheu/22007-s390x-fix-notary-build-for-gcc-v2 + + Create "src" symlink for building notary with gcc 5 + +commit 5ee737c70c7b8f7a0a915ca048538ee12cf1d737 +Author: Ken Cochrane +Date: Mon Apr 25 11:18:34 2016 -0400 + + Fixing the PATH in .integration-daemon-start to find dynamic docker binary + + Signed-off-by: Ken Cochrane + +commit f9e03d52e9b4b80cf869f0c279278dcb8340f585 +Author: Ken Cochrane +Date: Mon Apr 25 10:44:37 2016 -0400 + + Change name from docker-client to docker in dynbinary-client + + Signed-off-by: Ken Cochrane + +commit 632b314b239d1cd5e2498f198503a2983233a9f4 +Author: Yong Tang +Date: Sat Apr 23 08:00:57 2016 -0700 + + Relative symlinks don't work with --device argument + + This fix tries to address the issue raised in #22271 where + relative symlinks don't work with --device argument. + + Previously, the symlinks in --device was implemneted (#20684) + with `os.Readlink()` which does not resolve if the linked + target is a relative path. In this fix, `filepath.EvalSymlinks()` + has been used which will reolve correctly with relative + paths. + + An additional test case has been added to the existing + `TestRunDeviceSymlink` to cover changes in this fix. + + This fix is related to #13840 and #20684, #22271. + This fix fixes #22271. + + Signed-off-by: Yong Tang + +commit e8708f30490cf09e76b5df4f1a675387eb6b1c07 +Merge: 66eb91463a e78884dafd +Author: Sebastiaan van Stijn +Date: Mon Apr 25 16:21:04 2016 +0200 + + Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info + + Fix insecure registries upppercase in docker info + +commit 455858fc70e3b752fb2495bbdda368613e6587c2 +Author: Sebastiaan van Stijn +Date: Mon Apr 25 15:57:28 2016 +0200 + + fix reloading of daemon labels from config + + commit 20a038eca68e4188e1cd812293aea8cb220cf08f changed + daemon configuration reloading to check if a value + was actually set, however, it checked for the wrong + property ("label" instead of "labels"), which resulted + in the labels only to be loaded from daemon.json if both + a "label" -and- a "labels" property was present. + + Signed-off-by: Sebastiaan van Stijn + +commit 96cc1ee44cc4412511e944d48eed14434cac2c31 +Author: Lorenzo Fontana +Date: Mon Apr 25 15:31:23 2016 +0200 + + Mention the fact that authz plugins are available today + + Signed-off-by: Lorenzo Fontana + +commit 66eb91463a2c2400a4bc059144283509e09e209b +Merge: 1e9b2355e4 192387198d +Author: Lei Jitang +Date: Mon Apr 25 20:15:31 2016 +0800 + + Merge pull request #22287 from hqhq/hq_add_blk_check + + Add CONFIG_CFQ_GROUP_IOSCHED check + +commit e78884dafd2e9f5378626c4699c6b3b713eecf03 +Author: allencloud +Date: Mon Apr 25 18:40:24 2016 +0800 + + make Insecure registries uppercase like other keys in docker info + + Signed-off-by: allencloud + +commit 192387198d02e3e75377f8fbc06840b9a6dec8bd +Author: Qiang Huang +Date: Mon Apr 25 14:08:29 2016 +0800 + + Add CONFIG_CFQ_GROUP_IOSCHED check + + blkio.weight depends on this config. + + Signed-off-by: Qiang Huang + +commit 2feb88cbd391027fddf514496a5a825848c670ab +Author: allencloud +Date: Mon Mar 28 22:57:39 2016 +0800 + + 1.move cors into common config + 2.windows can use cors, too + 3.remove function setPlatformServerConfig + + Signed-off-by: allencloud + +commit 0524ead8da66c7dbc04d97a9f57790e6c1780a42 +Merge: a8c8eb8080 95f495b589 +Author: Alexandre Beslic +Date: Sun Apr 24 16:04:40 2016 -0700 + + Merge pull request #2160 from nishanttotla/fix-typo-contributing + + Fix typo in CONTRIBUTING.md + +commit 4677f8036e8d090303ef76cbbe4f703d5c85d752 +Author: John Starks +Date: Sat Apr 23 15:11:08 2016 -0700 + + Windows: Add file version information + + This change adds file version information to docker.exe and dockerd.exe by + adding a Windows version resource with the windres tool. + + This change adds a dependency to binutils-mingw-w64 on Linux, but removes + a dependency on rsrc. Most Windows build environments should already have + windres if they have gcc (which is necessary to build dockerd). + + Signed-off-by: John Starks + +commit 1e9b2355e4f79155566d54308b58d3e87b563986 +Merge: 4e5ad97f5b 5844736c14 +Author: Tibor Vass +Date: Sun Apr 24 08:37:00 2016 -0400 + + Merge pull request #22184 from yongtang/22036-label-set + + Labels set on the command line don't override labels in Dockerfile + +commit 4e5ad97f5b2d9db237546e67de3049649c5ff5e8 +Merge: 35963cae80 91b7157064 +Author: Vincent Demeester +Date: Sun Apr 24 11:23:21 2016 +0200 + + Merge pull request #22138 from wenchma/deprecated_since_before + + Deprecated of docker ps since and before options for v1.12 + +commit fa8b2737a1419643a9be0a1bc78551810e36a7f8 +Author: Sun Hongliang +Date: Tue Apr 19 23:03:43 2016 +0800 + + remove empty vendor in stretchr testify + + Signed-off-by: Sun Hongliang + +commit 95f495b589d1672279b0be46135e5dce26f702d2 +Author: Nishant Totla +Date: Sat Apr 23 20:10:59 2016 -0700 + + Fix typo in CONTRIBUTING.md + + Signed-off-by: Nishant Totla + +commit 5844736c14b29860ea03b040e9a052e59ad75bfc +Author: Yong Tang +Date: Sat Apr 23 12:59:17 2016 -0700 + + Labels set on the command line always override labels in Dockerfile + + This fix tries to address the inconsistency in #22036 where labels + set on the command line will not override labels specified in + Dockerfile, but will override labels inherited from `FROM` images. + + The fix add a LABEL with command line options at the end of the + processed Dockerfile so that command line options labels always + override the LABEL in Dockerfiles (or through `FROM`). + + An integration test has been added for test cases specified in #22036. + + This fix fixes #22036. + + NOTE: Some changes are from #22266 (@tiborvass). + + Signed-off-by: Yong Tang + +commit 35963cae80b8459b3671bc15c478ec27e2ebf0d2 +Merge: 27f44b8af6 44ff216985 +Author: John Howard +Date: Sat Apr 23 16:54:00 2016 -0700 + + Merge pull request #22274 from tiborvass/fix-tgz-binary-split + + Add dockerd daemon binary to tgz and zip archives + +commit 44ff21698580052d037f7b84ef76b7a94567d012 +Author: Tibor Vass +Date: Sat Apr 23 18:26:05 2016 -0400 + + Add dockerd daemon binary to tgz and zip archives + + Signed-off-by: Tibor Vass + +commit 987faca8a63a462ba34b063d8f8ee9aa09d1beb9 +Author: Anis Elleuch +Date: Sat Apr 23 11:13:15 2016 +0100 + + Sorting completed parts by part number for a better accordance with the S3 spec + + Signed-off-by: Anis Elleuch + +commit 27f44b8af63d563f53c04b342cbafc3b8f27cb45 +Merge: 7a2a8344e3 c0acfccc7b +Author: John Howard +Date: Sat Apr 23 14:14:20 2016 -0700 + + Merge pull request #20639 from dnephin/split_client + + Split the binary into two: client and daemon + +commit a8c8eb8080c4b2667c5e4c46a4a7f1c85035c92f +Merge: 584e10c9f9 933ae477b6 +Author: Nishant Totla +Date: Sat Apr 23 12:55:27 2016 -0700 + + Merge pull request #2159 from allencloud/fix-and-format-changelog + + fix some typos and format CHANGELOG.md + +commit c0acfccc7be6c49bf243821e535dfe1122ff5a52 +Author: Daniel Nephin +Date: Fri Apr 22 12:37:48 2016 -0400 + + Cleanup from CR. + + Signed-off-by: Daniel Nephin + +commit 7a2a8344e3d58d5791007206debf61a9ff2fe274 +Merge: 885e5eb5f7 d9c0d67b51 +Author: Sebastiaan van Stijn +Date: Sat Apr 23 16:05:32 2016 +0200 + + Merge pull request #22128 from FWirtz/master + + Removed the outdated Node.js documentation as requested + +commit d9c0d67b51fc135b2dbf54a152105d124100eb5e +Author: Florian +Date: Mon Apr 18 23:33:40 2016 +0200 + + Remove outdated Node.js example - include a link to the new guide later! + As recommended by @moxiegirl and squashed. + + Signed-off-by: FWirtz + +commit 885e5eb5f7784f9e5d218d4446595609f83304a8 +Merge: b2926152d0 3135874543 +Author: Antonio Murdaca +Date: Sat Apr 23 13:21:21 2016 +0200 + + Merge pull request #22256 from mlaventure/use-abs-rootfs-path + + Use absolute path for rootfs in OCI config.json + +commit b2926152d00d9a6130395c6c851a9e378d859026 +Merge: 8a0d2d8e57 199472c75a +Author: Antonio Murdaca +Date: Sat Apr 23 12:28:01 2016 +0200 + + Merge pull request #22255 from crosbymichael/containerd-bump + + Bump containerd to v0.2.1 + +commit 933ae477b67a313322779eec21bcd13b6c63f15a +Author: Sun Hongliang +Date: Sat Apr 23 17:00:20 2016 +0800 + + fix some typos and format CHANGELOG.md + + Signed-off-by: Sun Hongliang + +commit c882e5e5a76f8003f98e1895822fdeacf649218e +Author: Victor Vieux +Date: Sat Apr 23 00:45:51 2016 -0700 + + rollback to Go 1.5.4 + + Signed-off-by: Victor Vieux + +commit 584e10c9f9d050eb67b960bfcc3a52058942bae2 +Merge: bf9e985d5b 7cca0cbcde +Author: Dongluo Chen +Date: Fri Apr 22 22:07:54 2016 -0700 + + Merge pull request #2158 from dongluochen/bump-1.2.1rc1 + + bump 1.2.1-rc1 + +commit bf9e985d5bdadb8d75fce1977b9fa9da3d85c60e +Merge: af4474d250 4d56ba5190 +Author: Dongluo Chen +Date: Fri Apr 22 22:05:02 2016 -0700 + + Merge pull request #2132 from nishanttotla/image-ops-engine-api + + Moving last few image operations to engine-api + +commit 93973196f4b4dafae5b94eb541a3b752ea48f66e +Author: Yong Tang +Date: Fri Apr 22 20:00:47 2016 -0700 + + Add default `serveraddress` value in remote API `/auth` + + This fix tries to address the issue in #22244 where the remote + API `/auth` will not set the default value of `serveraddress` + if not provided. This behavior happens after only in 1.11.0 + and is a regression as in 1.10.3 `serveraddress` will be assigned + with `IndexServer` if no value is provided. + + The default value `IndexServer` is assigned to `serveraddress` if + no value provided in this fix. + + An integration test `TestAuthApi` has been added to cover this change + + This fix fixes #22244. + + Signed-off-by: Yong Tang + +commit 21f38a74e69b4616a6af1e4a4982205f5626b335 +Author: Serge Dubrouski +Date: Thu Apr 21 20:04:22 2016 -0600 + + Add blobWrtiter.Close() call into blobWriter.Commit() + + Signed-off-by: Serge Dubrouski + +commit 7cca0cbcde929b95abae60d09fdef62d04dbfaa5 +Author: Dong Chen +Date: Fri Apr 22 16:49:22 2016 -0700 + + Bump 1.2.1-rc1 + + Signed-off-by: Dong Chen + +commit f41922136610f9c98fb6b0d5c0152bd8e343bc66 +Author: Joao Fernandes +Date: Fri Apr 22 17:14:38 2016 -0700 + + Cleans docs, fixes typos + +commit 8a0d2d8e57a4825fb21c0f8ef91bef513beebc35 +Merge: 8c17d58eb8 7342060b07 +Author: David Calavera +Date: Fri Apr 22 15:17:12 2016 -0700 + + Merge pull request #22168 from cpuguy83/22116_hack_in_layer_refcounts + + Add refcounts to graphdrivers that use fsdiff + +commit 73bf92b95d5bd6334e5773af890c0f5dd890c0da +Merge: 6abd00ae07 c9c6bc45f0 +Author: Nathan LeClaire +Date: Fri Apr 22 15:12:05 2016 -0700 + + Merge pull request #3360 from nathanleclaire/fix_driver_doc_404 + + Fix driver reference links + +commit b2e3d81537270e63b3cb49246cda97c62d3deacb +Author: Wade Tandy +Date: Fri Apr 22 17:40:22 2016 -0400 + + Expose OpenStack driver's userdata param + + This allows a user to pass a script or cloud-config file that can be + used to initialize the server before the server starts up. This + is particularly useful in enterprise cloud environments where the + available images on openstack might not be fully compatible with the + docker-machine provisioners. + + Signed-off-by: Wade Tandy + +commit 8c17d58eb8a90428078e9228864fa819ef8783f2 +Merge: 717f0c95b5 4316ae2ed3 +Author: David Calavera +Date: Fri Apr 22 15:02:47 2016 -0700 + + Merge pull request #22253 from runcom/restore-bug + + api: server: check for unauthorized error + +commit 770d5bbb6f493eff979f24bb0c71e72c17e05b31 +Author: Nathan LeClaire +Date: Fri Apr 22 15:00:55 2016 -0700 + + Ensure that attempt to remove instance and SSH key both go through + + Signed-off-by: Nathan LeClaire + +commit af4474d2506d38566a42057ab5803f06f5e082cb +Merge: a33d650edb b352839605 +Author: Alexandre Beslic +Date: Fri Apr 22 14:57:49 2016 -0700 + + Merge pull request #2086 from vieux/event_engine-api + + use engine-api for events + +commit b352839605c2e40b9179b663a9efb3a1e2c1c3b2 +Author: Victor Vieux +Date: Fri Apr 22 14:15:06 2016 -0700 + + @abronan's typo + + Signed-off-by: Victor Vieux + +commit a03b7097280ba32c1865a59c445d377ed51b2c0b +Author: Victor Vieux +Date: Thu Apr 21 16:45:57 2016 -0700 + + fix rebase + + Signed-off-by: Victor Vieux + +commit 4d56ba5190232f196adbfc7ed103ed9b274d337b +Author: Nishant Totla +Date: Fri Apr 15 12:10:12 2016 -0700 + + Moving last few image operations to engine-api + + Signed-off-by: Nishant Totla + +commit f68b61052ba12a0387eb0a761f05ccd16c4c3105 +Author: Ken Cochrane +Date: Fri Apr 22 15:28:15 2016 -0400 + + Create the correct directory structure for apt-ftparchive. fixes #22238 + + Signed-off-by: Ken Cochrane + +commit d60cc64dd671435b66bf10c102aaf9abdde17c3a +Author: Joao Fernandes +Date: Thu Apr 14 15:30:23 2016 -0700 + + Creates docs for install DTR 2.0 + + Adds docs about installing, uninstalling, and + cleans up a bunch of other docs. + +commit 3c45c5abfc1583c4d409b1e02c0161218572fd05 +Author: Sebastiaan van Stijn +Date: Thu Apr 21 17:58:27 2016 +0200 + + OHMAN! Move vbatts to alumni + + Signed-off-by: Sebastiaan van Stijn + +commit c9c6bc45f0e91c9b99129c0a16d0641cd7a266e9 +Author: Nathan LeClaire +Date: Fri Apr 22 11:43:15 2016 -0700 + + Fix driver reference links + + Signed-off-by: Nathan LeClaire + +commit 717f0c95b59b215c07af2d2b2dd06b1246d174ca +Merge: 86a6acf071 7bf07737b9 +Author: Brian Goff +Date: Fri Apr 22 14:31:55 2016 -0400 + + Merge pull request #22237 from tonistiigi/fix-config-removal-on-restartmanager-cancel + + Fix config cleanup on canceling restartmanager + +commit 6abd00ae07f4a867aea530f91a5daddd2b81994f +Merge: 008283733e d9d2f251db +Author: Nathan LeClaire +Date: Fri Apr 22 11:17:44 2016 -0700 + + Merge pull request #3356 from nathanleclaire/go1.6.2_bump + + Bump to Go 1.6.2 + +commit 008283733e9be4c89844ce1ccbee0f944bbbde3d +Merge: ee17cf455f 9f8f1330c7 +Author: Nathan LeClaire +Date: Fri Apr 22 10:58:53 2016 -0700 + + Merge pull request #3330 from bamarni/issue-3268 + + [Generic] Copy the public key to machine directory (fixes #3268) + +commit 86a6acf0715020412fe322e040749a9cea6c2c7a +Merge: 4377a58c12 62cb06a6c1 +Author: Alexander Morozov +Date: Fri Apr 22 10:56:01 2016 -0700 + + Merge pull request #22218 from HackToday/fixcpu + + Make cpu validation correct + +commit b6db56b5eba00c4e8ad7a6f6c5b018e15dc883eb +Author: Michael Crosby +Date: Mon Apr 18 13:10:15 2016 -0700 + + Reset restart timeout if execution longer than 10s + + Restore the 1.10 logic that will reset the restart manager's timeout or + backoff delay if a container executes longer than 10s reguardless of + exit status or policy. + + Signed-off-by: Michael Crosby + +commit 4377a58c1235c1f207a28f8ffb0599d7b3adeedf +Merge: 9b00817dc6 829d1883dc +Author: Tibor Vass +Date: Fri Apr 22 13:29:44 2016 -0400 + + Merge pull request #22015 from endophage/pkcs11_debs + + add pkcs11 build tag to deb and rpm builds + +commit 241898d136e41f80ab2dda95078f971a8248675d +Author: Michael Holzheu +Date: Mon Apr 18 18:49:59 2016 +0200 + + Create "src" symlink for building notary with gcc 5 + + With gcc 5 version 1.4.2 of go is included. This version does not support + go's "native vendoring" which is needed to build notary since git commit + 51dc1747e4ab5 ("Move the godeps workspace to the vendor directory to be + compliant with Go 1.6"). + + As a workaround create a symlink "vendor/src" that points to "vendor/". + This allows to compile notary with gcc 5. + + Closes #22007 + + Signed-off-by: Michael Holzheu + +commit 313587454334f455334dac8d32cfb96f949a29a0 +Author: Kenfe-Mickael Laventure +Date: Fri Apr 22 09:23:56 2016 -0700 + + Use absolute path for rootfs in OCI config.json + + This avoid an extra bind mount within /var/run/docker/libcontainerd + + This should resolve situations where a container having the host + /var/run bound prevents other containers from being cleanly removed + (e.g. #21969). + + Signed-off-by: Kenfe-Mickael Laventure + +commit bb94cfce62b5b07f7ec00bfbbc229c7f87b7a6e8 +Author: Ben Firshman +Date: Thu Apr 21 17:07:55 2016 -0700 + + Remove out-of-date client libraries + + For each language, if there is one library which is clearly the + best or most active, I've removed the other libraries so users + aren't mislead. + + I've removed the web UIs because they're not really client + libraries. + + Signed-off-by: Ben Firshman + +commit 199472c75a8e0c60108399de2da0247af1a0bdab +Author: Michael Crosby +Date: Fri Apr 22 09:30:57 2016 -0700 + + Bump containerd to v0.2.1 + + Signed-off-by: Michael Crosby + +commit 9e7651db4d464649bc32cf346fdee8c6900ebe0f +Author: Daniel Nephin +Date: Fri Feb 19 17:42:51 2016 -0500 + + Build two binaries client and daemon. + + Add a proxy to support 'docker daemon' + Fix configFile option, and remove a test that is no longer relevant. + Remove daemon build tag. + Remove DOCKER_CLIENTONLY from build scripts. + + Signed-off-by: Daniel Nephin + + Change docker-daemon to dockerd. + + Signed-off-by: Daniel Nephin + +commit 4316ae2ed33d158e1d8d994646a75e25a70d9320 +Author: Antonio Murdaca +Date: Fri Apr 22 16:54:32 2016 +0200 + + api: server: check for unauthorized error + + This functionality has been fixed by + 7bca93218291767c5dd8782de0ad630dbcda9995 but then it has been broken + again by a793564b2591035aec5412fbcbcccf220c773a4c and finally refixed + here. + + Basically the functionality was to prompt for login when trying to pull + from the official docker hub. + + Signed-off-by: Antonio Murdaca + +commit 9f8f1330c78e4585d2ebe4d56cfb3c7289bbf31d +Author: Bilal Amarni +Date: Wed Apr 20 11:20:07 2016 +0200 + + [Generic] Copy the public key to machine directory + + Keeping an "orphan" private key can have some drawbacks : + + http://apple.stackexchange.com/questions/18458/password-dialog-appears-when-ssh-private-key-permissions-are-set-to-0600/26252#26252 + + Signed-off-by: Bilal Amarni + +commit 9b00817dc692458f9e27e375a870ecd0dcbd0b75 +Merge: 0b67f4c895 763aceeb73 +Author: Sven Dowideit +Date: Fri Apr 22 11:26:17 2016 +1000 + + Merge pull request #22196 from thaJeztah/add-mac-address-note + + docs: add note about MAC addresses not being unique + +commit 62cb06a6c1db5599f1f5b9b95b298be83c509860 +Author: Kai Qiang Wu(Kennan) +Date: Thu Apr 21 06:50:25 2016 +0000 + + Make cpu validation correct + + There was an error in validation logic before, should use period + instead of quota, and also add check for negative + number here, if not with that, it would had cpu.cfs_period_us: invalid argument + which is not good for users. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit a33d650edbab8d35d8b5e0f1e79a80b526d24906 +Merge: 10106f3db5 7882873d0a +Author: Victor Vieux +Date: Thu Apr 21 17:52:17 2016 -0700 + + Merge pull request #2156 from vieux/1.6.2 + + switch to go 1.6.2 + +commit b5a7b2adaa2e988a91d43c9ccdb2472f1017400f +Merge: 12429b74d4 09af9b1661 +Author: David Lawrence +Date: Thu Apr 21 17:16:30 2016 -0700 + + Merge pull request #691 from docker/yubikey-doc-update + + Update docs with yubikey info for docker 1.11 + +commit 12429b74d4e58353ab68caaca82a941b32e67265 +Merge: 3b15594f59 37d35e896c +Author: David Lawrence +Date: Thu Apr 21 17:15:30 2016 -0700 + + Merge pull request #692 from docker/makebinaries-docs + + better docs for make binaries + +commit 37d35e896ce4319c33f2fed5619d294ab7e76e60 +Author: Riyaz Faizullabhoy +Date: Thu Apr 21 17:12:52 2016 -0700 + + Update gopath in dir structure + + Signed-off-by: Riyaz Faizullabhoy + +commit 7882873d0ae6867d3a645dcd8c971cf39bc18fbc +Author: Victor Vieux +Date: Thu Apr 21 16:48:04 2016 -0700 + + switch to go 1.6.2 + + Signed-off-by: Victor Vieux + +commit 10106f3db545b022781ecbf9356861c87ad8a00e +Merge: cf9806004f 4c90767e60 +Author: Dongluo Chen +Date: Thu Apr 21 17:05:52 2016 -0700 + + Merge pull request #2101 from allencloud/return-err-when-assertion-fails-in-hijack + + return an error when assertion fails in hijack + +commit d9d2f251dbb498c3c5e6bbd91c135a1f7d8918b9 +Author: Nathan LeClaire +Date: Thu Apr 21 16:54:19 2016 -0700 + + Bump to Go 1.6.2 + + Signed-off-by: Nathan LeClaire + +commit cf9806004fc1bc6e5bcc3d2a4e3008ecd8cc9848 +Merge: d9beef7635 ddd4aa2bf2 +Author: Alexandre Beslic +Date: Thu Apr 21 16:51:37 2016 -0700 + + Merge pull request #2126 from vieux/update_compose + + update compose, remove useless bash and improve tests + +commit ee17cf455f98286242077b532eb32cd80a726848 +Merge: 6204980e03 a3af149774 +Author: Nathan LeClaire +Date: Thu Apr 21 16:45:33 2016 -0700 + + Merge pull request #3355 from nathanleclaire/bump_version_in_instal_doc + + Bump version in install doc + +commit 91fe274dcf09dfd580aaa1c88fa2ddbb4758bf66 +Author: Ben Firshman +Date: Thu Apr 21 16:24:51 2016 -0700 + + Fix lasote/docker_client link + + Signed-off-by: Ben Firshman + +commit a3af149774645d61187ab0989d1e5f103bf667ad +Author: Nathan LeClaire +Date: Thu Apr 21 16:16:14 2016 -0700 + + Bump version in install doc + + Signed-off-by: Nathan LeClaire + +commit 4b217ccbf566e6e38f2c62292ebd980d920fbcda +Author: Andrew Hsu +Date: Thu Apr 21 15:54:48 2016 -0700 + + add middleware storage driver for redirect + + Signed-off-by: Andrew Hsu (github: andrewhsu) + +commit 0b67f4c8951bccfecc8bafba66e7248309fb0c7c +Merge: 6f67c13d20 ea3cbd3274 +Author: Alexander Morozov +Date: Thu Apr 21 16:00:47 2016 -0700 + + Merge pull request #22234 from tonistiigi/safer-writes + + Safer file io for configuration files + +commit 7bf07737b90f087271b5a9a3a1c8d262c154554f +Author: Tonis Tiigi +Date: Thu Apr 21 13:58:21 2016 -0700 + + Fix config cleanup on canceling restartmanager + + Signed-off-by: Tonis Tiigi + +commit ea3cbd3274664f5b16fce78d7df036f6b5c94e30 +Author: Tonis Tiigi +Date: Wed Apr 20 17:08:47 2016 -0700 + + Safer file io for configuration files + + Signed-off-by: Tonis Tiigi + +commit 6204980e039baadfb80c92e7faf416c3f485d381 +Merge: ee48500fdc 53302b32b4 +Author: Nathan LeClaire +Date: Thu Apr 21 11:04:06 2016 -0700 + + Merge pull request #3336 from ppadala/patch-1 + + [Doc] Updating instructions for adding dependencies + +commit ee48500fdc94477ee9eed217ad01aa4f82249419 +Merge: a4b432b3a9 90cb223610 +Author: Nathan LeClaire +Date: Thu Apr 21 11:03:34 2016 -0700 + + Merge pull request #3342 from bamarni/doc-generic-sshagent + + [Generic] clarified doc / messages about ssh-agent + +commit a4b432b3a9ec13745f19b160834e031919a63678 +Merge: a0f3d408d8 10b2b9f3be +Author: Nathan LeClaire +Date: Thu Apr 21 11:02:39 2016 -0700 + + Merge pull request #3350 from xyziemba/master + + Fix Default Address Space for Azure VNets + +commit 6f67c13d20b207e5ab9a038b04ccc44d337131ed +Merge: 228759fd42 9d8071a74d +Author: Michael Crosby +Date: Thu Apr 21 10:37:24 2016 -0700 + + Merge pull request #22213 from yongtang/22210-docker-http-panics + + Docker http panics caused by container deletion with empty names. + +commit e68e1e1e134e40c28bbd0db4d85bfe7d0353d598 +Author: Riyaz Faizullabhoy +Date: Thu Apr 21 10:28:02 2016 -0700 + + better docs for make binaries + + Signed-off-by: Riyaz Faizullabhoy + +commit e7a99ae5e16f8688a0735c91856d13633f48185c +Author: Justin Cormack +Date: Thu Apr 21 18:23:59 2016 +0100 + + Remove mlock and vhangup from the default seccomp profile + + These syscalls are already blocked by the default capabilities: + mlock mlock2 mlockall require CAP_IPC_LOCK + vhangup requires CAP_SYS_TTY_CONFIG + + There is therefore no reason to allow them in the default profile + as they cannot be used anyway. + + Signed-off-by: Justin Cormack + +commit 228759fd42fdb2014b2e16e15f4452bb1d5f8227 +Merge: f8945836e1 59b83d8aae +Author: Alexander Morozov +Date: Thu Apr 21 09:41:31 2016 -0700 + + Merge pull request #22172 from cpuguy83/fix_nosapce_test + + Containerize `TestDaemonNoSpaceLeftOnDeviceError` + +commit f8945836e1f9124a8ce75820b710e4cb3f26e1e1 +Merge: b006f7f640 09ca4dd322 +Author: Alexander Morozov +Date: Thu Apr 21 09:40:04 2016 -0700 + + Merge pull request #22227 from kencochrane/bump_go_1.6.2 + + Bump Go version to 1.6.2 from 1.6.1 where it was used + +commit 7342060b070df67481f8da4f394a57cac1671d56 +Author: Brian Goff +Date: Mon Apr 18 19:41:29 2016 -0400 + + Add refcounts to graphdrivers that use fsdiff + + This makes sure fsdiff doesn't try to unmount things that shouldn't be. + + **Note**: This is intended as a temporary solution to have as minor a + change as possible for 1.11.1. A bigger change will be required in order + to support container re-attach. + + Signed-off-by: Brian Goff + +commit b006f7f64020c814b2eab2c7d2f59e1539894449 +Merge: 01dd64cd10 34a66a14af +Author: Brian Goff +Date: Thu Apr 21 12:02:44 2016 -0400 + + Merge pull request #21683 from mYmNeo/growFS + + call growFS when size is a mismatch + +commit 55a9b8123d7e89692b5c25c846cf6707a8ce463a +Author: Vivek Goyal +Date: Thu Apr 21 15:42:23 2016 +0000 + + Export Mininum Thin Pool Free Space through docker info + + Right now there is no way to know what's the minimum free space threshold + daemon is applying. It would be good to export it through docker info and + then user knows what's the current value. Also this could be useful to + higher level management tools which can look at this value and setup their + own internal thresholds for image garbage collection etc. + + Signed-off-by: Vivek Goyal + +commit 01dd64cd107b2a7d4c01be9074da155d65a79c57 +Merge: c931a7c576 9abf304c25 +Author: David Calavera +Date: Thu Apr 21 08:38:27 2016 -0700 + + Merge pull request #22193 from panyufeng920/master + + optimise docs + +commit ac82597ac10c9a0dbd3bf25ebde792e9cc71efc4 +Merge: 1988dfeaf0 b67f110620 +Author: Daniel Nephin +Date: Thu Apr 21 11:32:23 2016 -0400 + + Merge pull request #3360 from bfirsh/better-validation-error-messages + + Make validation errors less robotic + +commit 1988dfeaf0bd45273780a457856da55e29188259 +Merge: da1d603463 55fcd1c3e3 +Author: Daniel Nephin +Date: Thu Apr 21 11:19:32 2016 -0400 + + Merge pull request #3359 from bfirsh/clarify-compose-file-networks-documentation + + Clarify service networks documentation + +commit c931a7c576ff09acb44be7857775dd58f0ad04ab +Merge: 70746f4c38 da90fe0218 +Author: Vincent Demeester +Date: Thu Apr 21 17:08:38 2016 +0200 + + Merge pull request #22219 from leonhartX/zsh-completion-add-disable-content-trust + + Add zsh completion for 'docker {build,create,run} --disable-content-trust' + +commit 9d8071a74db20556d0fc1b6ef3270326b3583de9 +Author: Yong Tang +Date: Wed Apr 20 18:33:53 2016 -0700 + + Docker http panics caused by container deletion with empty names. + + This fix tries to fix the http panics caused by container deletion + with empty names in #22210. + + The issue was because when an empty string was passed, `GetByName()` + tried to access the first element of the name string without checking + the length. A length check has been added. + + A test case for #22210 has been added. + + This fix fixes #22210. + + Signed-off-by: Yong Tang + +commit 70746f4c38322ca14cb62321ce73b08b18422a14 +Merge: 7bfe5408a1 e3eb24fc21 +Author: Brian Goff +Date: Thu Apr 21 09:53:03 2016 -0400 + + Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc + + Fix daemon.json storage-opts settings example + +commit 09ca4dd32232cdbbe04628e5647922002d9df175 +Author: Ken Cochrane +Date: Thu Apr 21 09:22:26 2016 -0400 + + Bump Go version to 1.6.2 from 1.6.1 where it was used + + Signed-off-by: Ken Cochrane + +commit 7bfe5408a1a627f193fec0cfae693232a83efb21 +Merge: ccf83c94d1 896ebb1ca2 +Author: Sven Dowideit +Date: Thu Apr 21 21:31:09 2016 +1000 + + Merge pull request #22216 from HackToday/fixolddoc + + Fix the old exit status example + +commit e3eb24fc21fa6f6002eef081278333f9e5e16614 +Author: Dimitry Andric +Date: Wed Apr 20 17:30:44 2016 +0200 + + The daemon.json storage-opts settings is actually a list. + + Signed-off-by: Dimitry Andric + +commit da90fe0218411933d53daac7366ce4353cd5b665 +Author: Ke Xu +Date: Thu Apr 21 16:06:09 2016 +0900 + + add zsh completion for 'docker {build,create,run} --disable-content-trust' + + Signed-off-by: Ke Xu + +commit 09af9b16613fd2bf3456da3847e2beb29ff5fdde +Author: Riyaz Faizullabhoy +Date: Wed Apr 20 23:07:54 2016 -0700 + + Update docs with yubikey info for docker 1.11 + + Signed-off-by: Riyaz Faizullabhoy + +commit f76c622d8c80eece81f103e0b56cc9db8a0bc726 +Author: jhaohai +Date: Thu Apr 21 11:51:34 2016 +0800 + + add cn-north-1 to valid check + + Signed-off-by: jhaohai + +commit 896ebb1ca2a6ae23d7511678aaab1d4e32c54ff9 +Author: Kai Qiang Wu(Kennan) +Date: Thu Apr 21 03:24:10 2016 +0000 + + Fix the old exit status example + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit a0f3d408d85d49610f71616deeec91bd039b89a9 +Merge: 8770ea01f9 d1e65edad1 +Author: Nathan LeClaire +Date: Wed Apr 20 18:49:19 2016 -0700 + + Merge pull request #3339 from ahmetalpbalkan/az-docs-fix + + azure.md: typo fix + +commit 8770ea01f9de41f91345fae3874aaf98dd593267 +Merge: da39c9fbbe fc9c01f45a +Author: Nathan LeClaire +Date: Wed Apr 20 18:48:56 2016 -0700 + + Merge pull request #3347 from exoscale/fix/exoscale-default-cloud-config + + exoscale: fix cloud-init file to be compatible with CoreOS + +commit 9abf304c255cb3194b932e92f2b87bfabaab88c9 +Author: 搏通 +Date: Thu Apr 21 09:34:28 2016 +0800 + + optimise docs + + Signed-off-by: 搏通 + +commit da1d603463afebb5cd73bc0a4dd1411b2651ee22 +Merge: a0aea42f75 75bcc382d9 +Author: Joffrey F +Date: Wed Apr 20 17:40:51 2016 -0700 + + Merge pull request #3351 from shin-/3342-setup-requirements + + Force docker-py 1.8.0 or above + +commit 3b15594f59daaf413cee4a2b85b9707e08186838 +Merge: be82a0a5f4 2d72c39e6c +Author: Ying Li +Date: Wed Apr 20 17:15:03 2016 -0700 + + Merge pull request #688 from cyli/remove-tuf-client-tests + + Remove tuf/client tests + +commit 2d72c39e6c42a00832c631127d9f57d1a3e4608d +Author: Ying Li +Date: Wed Apr 20 12:54:54 2016 -0700 + + Add a few more tests for tuf/store/memorystore. + + Also add a few tuf/client/client_test tests back that checks for download failure + if the local timestamp or snapshot is missing in the local TUF repo. + + Signed-off-by: Ying Li + +commit 283c4527376f5f38b02f911e7d98319db905ef59 +Author: Ying Li +Date: Wed Apr 20 11:01:26 2016 -0700 + + A lot of tuf/client tests are redundant - move the ones that aren't to client_update_test + and just remove tuf/client/client_test. + + Signed-off-by: Ying Li + +commit b2349a0385fc66c0175ad9569e6e843cf38197bf +Author: Ying Li +Date: Wed Apr 20 11:01:02 2016 -0700 + + Provide a nice SignAndSerialize testutil function to export metadata from a repo. + + Signed-off-by: Ying Li + +commit be82a0a5f493a3c41cb6683295d869803cea5b06 +Merge: 74a0adc902 053c2a5a79 +Author: Ying Li +Date: Wed Apr 20 16:57:01 2016 -0700 + + Merge pull request #687 from cyli/error-refactor + + Remove a redundant ErrChecksumMismatch error in tuf/client + +commit 75bcc382d9965208ecb1e8b7e6caa5cc08916cf6 +Author: Joffrey F +Date: Tue Apr 19 17:39:29 2016 -0700 + + Force docker-py 1.8.0 or above + + Signed-off-by: Joffrey F + +commit b67f110620bba758ae9b375b9f9743da317cfc45 +Author: Ben Firshman +Date: Wed Apr 20 16:35:22 2016 -0700 + + Explain the explanation about file versions + + This explanation looked like it was part of the error. Added an + extra new line and a bit of copy to explain the explanation. + + Signed-off-by: Ben Firshman + +commit 27628f8655824a0ba96ef552c1b182aa8f48fa7f +Author: Ben Firshman +Date: Wed Apr 20 16:22:24 2016 -0700 + + Make validation error less robotic + + "ERROR: Validation failed in file './docker-compose.yml', reason(s):" + + is now: + + "ERROR: The Compose file './docker-compose.yml' is invalid because:" + + Signed-off-by: Ben Firshman + +commit ccf83c94d18df4b27ca3d46ffbe008df76aa3275 +Merge: 0f14b566d9 42f9c25b51 +Author: Sebastiaan van Stijn +Date: Thu Apr 21 01:38:07 2016 +0200 + + Merge pull request #22171 from mlaventure/always-disable-metrics + + Always disable containerd metrics when started by docker + +commit b11da4f36ca680a5cf43339cdd61a07c690a6bca +Author: Joao Fernandes +Date: Thu Apr 14 12:51:27 2016 -0700 + + Adds docs for DTR upgrade + +commit 0f14b566d98304e3bd7e24d87bb509e2e18ca7ca +Merge: 24076ed4d9 145fb8de9e +Author: Sebastiaan van Stijn +Date: Thu Apr 21 01:14:56 2016 +0200 + + Merge pull request #22200 from jfrazelle/remove-self + + Remove Jess from Maintainers + +commit 10b2b9f3be55bb2dd3a449e57c217e6cd8771905 +Author: Xavier Ziemba +Date: Wed Apr 20 16:08:10 2016 -0700 + + Fix Default Address Space for Azure VNets + + RFC 1918 specifies 10.0.0.0/8, not 10.0.0.0/6, as part of the private + network address space. This fixes what appears to be a typo. + + Signed-off-by: Xavier Ziemba + +commit 55fcd1c3e32ccbd71caa14462a6239d4bf7a1685 +Author: Ben Firshman +Date: Wed Apr 20 15:58:12 2016 -0700 + + Clarify service networks documentation + + When jumping straight to this bit of the docs, it's not clear + that these are options under a service rather than the top-level + `networks` key. Added a service to make this super clear. + + Signed-off-by: Ben Firshman + +commit 74a0adc9021dc7367de4f4ed771d46c3689a7f65 +Merge: 4d85f964bc be03c1a9dc +Author: Riyaz Faizullabhoy +Date: Wed Apr 20 15:49:38 2016 -0700 + + Merge pull request #671 from HuKeping/refactor + + Rework the main for notary signer + +commit 24076ed4d9c82d387029b8a65e21873db5676f6a +Merge: 483063ad85 1c967911b9 +Author: Michael Crosby +Date: Wed Apr 20 15:39:00 2016 -0700 + + Merge pull request #22173 from amitkris/uprev_dbus + + Update godbus/dbus to v4.0.0 + +commit a0aea42f758038536ab984244a0a61f1097624dc +Merge: 6ff3c47630 e71c62b8d1 +Author: Ben Firshman +Date: Wed Apr 20 23:06:35 2016 +0100 + + Merge pull request #3326 from CRogers/patch-1 + + Readme should use new docker compose format instead of the old one + +commit 6ff3c47630439c0255a0f33ff0091ab6124a063e +Merge: 8a34ee0eaa 93901ec480 +Author: Ben Firshman +Date: Wed Apr 20 22:57:50 2016 +0100 + + Merge pull request #3222 from jonlemmon/patch-1 + + Rails Docs: Add nodejs to apt-get install command + +commit fc9c01f45af83b05b56a3f40d7e0b6951c7fd683 +Author: Vincent Bernat +Date: Wed Apr 20 21:23:08 2016 +0200 + + exoscale: fix cloud-init file to be compatible with CoreOS + + The cloud-init implementation in CoreOS is quite limited and will choke + on `manage_etc_hosts: true`. Use `manage_etc_hosts: localhost` instead + which is supported. This is also supported by the classic Python + cloud-init implementation and the result is quite similar. + + Signed-off-by: Vincent Bernat + +commit 483063ad85f7eff587f6dbf99a71f31def8d4c76 +Merge: 3022a43f42 85e880205f +Author: Vincent Demeester +Date: Wed Apr 20 21:03:18 2016 +0200 + + Merge pull request #22203 from alimate/name-gen-patch + + Added Lamport & Agnesi to the list of scientists + +commit aa96330d03fa51a0302865f09b2d7a53a5dae886 +Author: Jeffrey Morgan +Date: Wed Apr 20 11:53:55 2016 -0700 + + Bump virtualbox and git versions + + Signed-off-by: Jeffrey Morgan + +commit 053c2a5a7918fc01311dfd0361eabe0647e92632 +Author: Ying Li +Date: Tue Apr 19 17:03:24 2016 -0700 + + Remove a redundant ErrChecksumMismatch error in tuf/client, since we + already have a ErrMismatchedChecksum in tuf/data/errors. + + Also, have the CheckHashes function take a role name so that the + ErrMismatchedChecksum error can include the role name. + + Signed-off-by: Ying Li + +commit da39c9fbbe1eca505f7a86a5523af58592ac6db7 +Merge: cbb87491e1 b3db3925d9 +Author: Nathan LeClaire +Date: Wed Apr 20 10:49:15 2016 -0700 + + Merge pull request #3338 from QuentinPerez/drivers + + Add Scaleway Docker Machine Driver Plugin + +commit 763aceeb733cdd927eb2de6232f0257267b6f71e +Author: Sebastiaan van Stijn +Date: Wed Apr 20 16:45:43 2016 +0200 + + docs: add note about MAC addresses not being unique + + Signed-off-by: Sebastiaan van Stijn + +commit 85e880205f305aa7b566ac4d7dc6280d5015c2b2 +Author: Ali Dehghani +Date: Wed Apr 20 21:40:32 2016 +0430 + + Added Lamport & Agnesi to the list of scientists + + Leslie B. Lamport is an American computer scientist. Lamport is + best known for his seminal work in distributed systems and as the + initial developer of the document preparation system LaTeX. + Maria Gaetana Agnesi was an Italian mathematician, philosopher, + theologian and humanitarian. She was the first woman to write a + mathematics handbook and the first woman appointed as a Mathematics + Professor at a University. + + Signed-off-by: Ali Dehghani + +commit 3022a43f420588a5809332f284f27ec6e3ca4611 +Merge: cf03e17c5c 3447847079 +Author: Sebastiaan van Stijn +Date: Wed Apr 20 18:42:47 2016 +0200 + + Merge pull request #22201 from moxiegirl/update-readme + + Removing ref to old google group; adding forum + +commit 344784707918b39f2d23d1117b09e5a0cbbb6eb8 +Author: Mary Anthony +Date: Wed Apr 20 08:54:11 2016 -0700 + + Removing ref to old google group; adding forum + Adding email notice + user > dev and an > a + + Signed-off-by: Mary Anthony + +commit 8a34ee0eaa489af2062df8fcac3a326d2bf10e2c +Merge: cafe1315b2 ba10f1cd55 +Author: Daniel Nephin +Date: Wed Apr 20 12:18:20 2016 -0400 + + Merge pull request #3356 from metal3d/fix-help-acceptance-test + + Fix the tests from jenkins + +commit 145fb8de9ee2f57fdec74a1ea27432c68cd5820a +Author: Jess Frazelle +Date: Wed Apr 20 08:50:42 2016 -0700 + + Remove Jess from Maintainers + + Signed-off-by: Jess Frazelle + +commit cf03e17c5cfb7617d91aa4177f4bb4a5112496ad +Merge: afbe2869f0 de806a672b +Author: David Calavera +Date: Wed Apr 20 08:37:20 2016 -0700 + + Merge pull request #22191 from mavenugo/jp + + Initialize activateWait for plugins activated by json spec + +commit afbe2869f02d4891ab1dc3feeadd47fd3be2c340 +Merge: f96d15d3c3 06753c6df6 +Author: Sebastiaan van Stijn +Date: Wed Apr 20 17:17:41 2016 +0200 + + Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers + + Add Madhu Venugopal to maintainers + +commit f96d15d3c361a08ad892759d5e885625b0d48302 +Merge: fc25376762 b21d90c28f +Author: moxiegirl +Date: Wed Apr 20 06:33:37 2016 -0700 + + Merge pull request #21389 from chenchun/resize_direct_lvm + + Resize direct lvm + +commit fc25376762cdbab6e738742586e752478b80171e +Merge: 3cf4cad082 79351caec1 +Author: moxiegirl +Date: Wed Apr 20 06:32:23 2016 -0700 + + Merge pull request #22189 from thaJeztah/restructure-plugin-docs + + docs: use tables for available plugins + +commit de806a672b0810e48facc74e198e6728c1fe2c6d +Author: Madhu Venugopal +Date: Wed Apr 20 05:38:34 2016 -0700 + + Initialize activateWait for plugins activated by json spec + + Signed-off-by: Madhu Venugopal + +commit be03c1a9dc9eaaccb221e8b67d0243779fdb8697 +Author: HuKeping +Date: Wed Apr 20 20:48:02 2016 +0800 + + Add some test + + Signed-off-by: Hu Keping + +commit b3686803c1d20a2b436828b41b277157b84a722a +Author: HuKeping +Date: Wed Apr 20 20:46:23 2016 +0800 + + Pass to components exactly what they want instead of using global variable + + Signed-off-by: Hu Keping + +commit 3f1806d70ba2a25ad6979d069cf1f1f9c2917805 +Author: HuKeping +Date: Wed Apr 20 20:28:59 2016 +0800 + + Move helper function bootstrap to its own file + + Signed-off-by: Hu Keping + +commit ae889ad37a0f6cc37042f71a1df46a6b28b9ac88 +Author: HuKeping +Date: Wed Apr 20 20:25:17 2016 +0800 + + Move the configuration for TLS to its own file. + + Signed-off-by: Hu Keping + +commit 8725f6a4c73b67bed068d666296cbdafd745a4f5 +Author: HuKeping +Date: Wed Apr 20 20:18:02 2016 +0800 + + Move the configuration for API servers to its own file. + + Signed-off-by: Hu Keping + +commit 3501c0edf5c55dc08483067c4b26ebf5d4e5332d +Author: HuKeping +Date: Tue Apr 12 12:12:16 2016 +0800 + + Move the setUpCryptoservices to its own file. + + Signed-off-by: Hu Keping + +commit 79351caec1b413c9da1080fceff49eb994323734 +Author: Sebastiaan van Stijn +Date: Wed Apr 20 13:43:33 2016 +0200 + + docs: use tables for available plugins + + Signed-off-by: Sebastiaan van Stijn + +commit a80c539ce8e8d492e9831bf3f6365924a1895fac +Author: HuKeping +Date: Tue Apr 12 11:38:09 2016 +0800 + + Move the passphraseRetriever to its own file. + + Signed-off-by: Hu Keping + +commit dc147d12c4bae012b05b977e2b9aa642edc5dd60 +Author: HuKeping +Date: Tue Apr 12 11:13:56 2016 +0800 + + Add a source file to hold the configuration things for signer + + Let's name it config.go + + Signed-off-by: Hu Keping + +commit ba324344ed4770369b09804cac1b9fae6e038fa4 +Author: HuKeping +Date: Sun Apr 10 10:48:43 2016 +0800 + + Add a struct for signer config + + We can use a struct of config to hold all the necessary info that needed + to run a notary signer. + + Signed-off-by: Hu Keping + +commit ba10f1cd55adfbcd228df1b6e1044b5c87ac06c8 +Author: Patrice FERLET +Date: Wed Apr 20 13:23:37 2016 +0200 + + Fix the tests from jenkins + + Acceptance tests didn't set "help" command to return "0" EXIT_CODE. + + close #3354 + related #3263 + + Signed-off-by: Patrice Ferlet + +commit 3cf4cad0821698cefaf852c9d4b7b65df314ab35 +Merge: 34cc274a80 6d4e7b67be +Author: Sebastiaan van Stijn +Date: Wed Apr 20 12:44:29 2016 +0200 + + Merge pull request #22179 from wenchma/fix_asa + + Fix asa + +commit 90cb223610b4113f4ad1400e32156598c22270d1 +Author: Bilal Amarni +Date: Wed Apr 20 11:34:09 2016 +0200 + + [Generic] clarified doc / messages about ssh-agent + + As the IdentitiesOnly option is set with the SSH external client, + existing identities in ssh-agent won't be used unless it's the default + location. + + Signed-off-by: Bilal Amarni + +commit 06753c6df666ca77adb4d4d7a2c95425b6d31b0c +Author: Sebastiaan van Stijn +Date: Wed Apr 20 11:17:32 2016 +0200 + + Add Madhu Venugopal to maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit b0ef41f624ee6eafbeb3bc867421614b107a951e +Author: Lucien Gougerot +Date: Fri Apr 8 16:56:07 2016 +0200 + + Closes #3285 + + This modification permits the swarm-agent created by docker-machine to + take into account the —swarm-opt arguments. + + Signed-off-by: Lucien Gougerot + +commit 34cc274a801cd38df3006484b14e4c9671c47b94 +Merge: bb91bd3a89 7f33ec7507 +Author: Vincent Demeester +Date: Wed Apr 20 08:03:45 2016 +0200 + + Merge pull request #21380 from sainath14/improve_help_text_test_time + + Improve the time taken by DockerSuite.TestHelpTextVerify + +commit 6d4e7b67be77e3f290d4048c3da5d0f6540f1704 +Author: Wen Cheng Ma +Date: Wed Apr 20 11:14:47 2016 +0800 + + Fix asa + + Signed-off-by: Wen Cheng Ma + +commit b21d90c28faaa9f906c4e3b2145ddf661a19e994 +Author: Chun Chen +Date: Tue Apr 5 15:35:24 2016 +0800 + + Add docs about how to extend devicemapper thin pool + + Signed-off-by: Chun Chen + +commit 4d85f964bc7809ef8db28e23f01a35c886ac08e2 +Merge: 358add6075 59ae7af769 +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 16:49:22 2016 -0700 + + Merge pull request #682 from endophage/store_storage + + minor cleanup of filestore initialization + +commit 7f33ec750770ea751f64d516c73ce98dae64b536 +Author: Sainath Grandhi +Date: Mon Mar 21 13:06:34 2016 -0700 + + Improve the time taken by DockerSuite.TestHelpTextVerify. This test runs docker --help on all commands supported and also check the output + when it is passed with bad arguments and no arguments. This patch would divide the total number of commands into five sets and runs them in parallel. + Test time is improved from around 9 seconds to around 3 seconds + + Signed-off-by: Sainath Grandhi + +commit bb91bd3a89d93f74de99ea5158d68a92e4c6cd6a +Merge: ab6b82b856 5548966c37 +Author: Brian Goff +Date: Tue Apr 19 19:45:40 2016 -0400 + + Merge pull request #22043 from WeiZhang555/remove-start-event-failed-start + + Remove start/die event when fail to start container + +commit 59ae7af769f80d72871f3be1099c1a1d8d7fae52 +Author: David Lawrence +Date: Tue Apr 19 14:52:36 2016 -0700 + + remove unused tuf/testutils/utils.go + Signed-off-by: David Lawrence (github: endophage) + +commit 4f58eda1ec7b98e3f0eb676d86c61df1f5eecddc +Author: David Lawrence +Date: Tue Apr 19 14:51:01 2016 -0700 + + removing unused functions in SimpleFileStore + Signed-off-by: David Lawrence (github: endophage) + +commit 64ea94567b3136801c228efd7c1314b159c01ad6 +Author: David Lawrence +Date: Tue Apr 19 14:09:50 2016 -0700 + + refactoring some duplicate code in parsing x509 certs to keys + Signed-off-by: David Lawrence (github: endophage) + +commit 31f02ec0f70a52994711dcd2a2033d73be8016d4 +Author: David Lawrence +Date: Thu Apr 14 13:46:11 2016 -0700 + + minor cleanup of filestore initialization + Signed-off-by: David Lawrence (github: endophage) + +commit 358add60750328a5dea72c5cf43e29eacd9e6e97 +Merge: ebb2eb8bc6 84b1210bf7 +Author: David Lawrence +Date: Tue Apr 19 15:45:45 2016 -0700 + + Merge pull request #686 from docker/go1.6.1 + + Update go in dockerfiles to go 1.6.1 + +commit ebb2eb8bc6431e6e782bd969a5b9a091dfe3780a +Merge: b188f1ba7f 1367311d41 +Author: Ying Li +Date: Tue Apr 19 15:44:03 2016 -0700 + + Merge pull request #683 from cyli/root-rotation-tests + + Some root rotation tests and CLI warnings + +commit 1367311d416a8e0efaaa1d1118893f6bf79c2755 +Author: Ying Li +Date: Tue Apr 19 00:32:00 2016 -0700 + + Update client warning to be more clear about why you need to keep your root key past initial root rotation. + + Signed-off-by: Ying Li + +commit cc5211cdf6b54d72d22d3ca6f7810961264e566e +Author: Ying Li +Date: Fri Apr 15 15:52:35 2016 -0700 + + Fix server validation and client update tests to also test threshold when testing + root rotation with the previous root role. + + Signed-off-by: Ying Li + +commit 839a1d076fae4a5e3772ece6ff9185f5597e4ee6 +Author: Ying Li +Date: Fri Apr 15 14:54:20 2016 -0700 + + Add support for thresholds, which means signed.VerifyRoot needs to be have just like + signed.VerifySignatures. So remove signed.VerifyRoot and just use signed.VerifySignatures + instead. Also, to fix some tests, add an additional check for version when validating + metadata since versions can't be negative. + + Signed-off-by: Ying Li + +commit 0f5a40e591818390b29cd83b12fed60ace6791e0 +Author: Ying Li +Date: Fri Apr 15 13:05:55 2016 -0700 + + Use askConfirm rather than processing 'yes' or 'no' input manually everywhere. + + Signed-off-by: Ying Li + +commit 2c26ccb1183fda400628fb11fd08840a60a1bcfa +Author: Ying Li +Date: Fri Apr 15 00:15:10 2016 -0700 + + Warn users before they rotate the root key with the CLI + + Signed-off-by: Ying Li + +commit 65851590f646452c05b06c1001cbc32c95ac523e +Author: Ying Li +Date: Thu Apr 14 23:41:25 2016 -0700 + + Add a client update test for root rotations that test that the previous root ROLE is satisfied, + as opposed to just requiring we also sign with whatever key the previous root was signed with. + + Signed-off-by: Ying Li + +commit b941c1052345ec3b6c3bf4f14b2e031b520703f4 +Author: Ying Li +Date: Thu Apr 14 21:53:50 2016 -0700 + + Update server validation test to assert that old root roles do not affect + the server validation requirements at all, just the previous root role + (as opposed to a single old key being required) + + Signed-off-by: Ying Li + +commit 3aeae9029001fdf0a2535b2e816bf77d4926e93a +Author: Ying Li +Date: Thu Apr 14 19:36:02 2016 -0700 + + storage/memory's UpdateMany should fail if versions are not higher + + Signed-off-by: Ying Li + +commit 84b1210bf7db7fc5b6ce33228e87bf6e43fa1f26 +Author: Ying Li +Date: Tue Apr 19 14:57:18 2016 -0700 + + Update go in dockerfiles to go 1.6.1 because we want the HTTPS security update + + Signed-off-by: Ying Li + +commit b188f1ba7f06b9ef07850a5f8f569ce1b2c63ed6 +Merge: 4c52b3801f 8d357d44cd +Author: David Lawrence +Date: Tue Apr 19 14:59:01 2016 -0700 + + Merge pull request #684 from docker/add-by-hash + + Add by hash command + +commit 1c967911b979040a6316050b3c00d89e17cb4cb1 +Author: Amit Krishnan +Date: Tue Apr 19 14:51:43 2016 -0700 + + Update godbus/dbus to v4.0.0 + + Signed-off-by: Amit Krishnan + +commit 59b83d8aae106cdc4042c29c900069fc804b2b68 +Author: Brian Goff +Date: Tue Apr 19 17:16:18 2016 -0400 + + Containerize `TestDaemonNoSpaceLeftOnDeviceError` + + Why? Because the `mount` here will sometimes fail when run in + `debian:jessie`, which is what the environrment hosting the test suite + is running if run from the `Makefile`. + Also, why the heck not containerize it, all the things. + + Signed-off-by: Brian Goff + +commit 8d357d44cd6a388ecf03ea43233722d4f3840f7a +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 10:08:24 2016 -0700 + + Error unit tests for bad cli input, include trustpinning merge + + Signed-off-by: Riyaz Faizullabhoy + +commit 4c52b3801ff75f28fa4afceddc3736163dab2582 +Merge: a840012e88 5576e01649 +Author: David Lawrence +Date: Tue Apr 19 13:49:03 2016 -0700 + + Merge pull request #685 from docker/docs-update + + Update doc diagrams + +commit 378116d37cdc12629fa29b9e8f611f0153aece17 +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 01:05:39 2016 -0700 + + Add empty hashes check for AddTarget + + Signed-off-by: Riyaz Faizullabhoy + +commit 26c1ce1865df6486ce9ea21620e82232d2c67df4 +Author: Riyaz Faizullabhoy +Date: Fri Apr 15 15:36:53 2016 -0700 + + Include addhash command in config and insufficient arg tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 1abf013e6915e162adfc398ab93b294a1b98d757 +Author: Riyaz Faizullabhoy +Date: Fri Apr 15 15:26:15 2016 -0700 + + Add positive integration test + + Signed-off-by: Riyaz Faizullabhoy + +commit 2f7d8f9774e036b4934e97416d6ad668337a570d +Author: Riyaz Faizullabhoy +Date: Fri Apr 15 14:37:07 2016 -0700 + + addhash command with multihash functionality + + Signed-off-by: Riyaz Faizullabhoy + +commit a840012e8891a52bb3d17c8a3488ad14105d8eb0 +Merge: b8c005c304 ab4751d4a7 +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 13:38:51 2016 -0700 + + Merge pull request #624 from docker/trust-pinning + + Trust pinning configuration + +commit 42f9c25b5168e3bc8e19003cd8bfd4eabbad654c +Author: Kenfe-Mickael Laventure +Date: Tue Apr 19 13:37:18 2016 -0700 + + Always disable containerd metrics when started by docker + + Signed-off-by: Kenfe-Mickael Laventure + +commit ab6b82b85668eaa5be5ee1ba04febfae5fcec433 +Merge: eab65e438e fc2e2234c6 +Author: Brian Goff +Date: Tue Apr 19 16:28:33 2016 -0400 + + Merge pull request #22123 from crosbymichael/restart-canceled + + Remove restart canceled error + +commit ab4751d4a7be3ea25916ac724f70e31a1fa357ce +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 10:59:44 2016 -0700 + + Check that leaf cert is first in bundle + + Signed-off-by: Riyaz Faizullabhoy + +commit 5576e01649df6f232971159ef662b3f5651cd1c4 +Author: Ying Li +Date: Tue Apr 19 11:14:18 2016 -0700 + + Use cdn.rawgit.com links for doc svgs rather than relative links + + Signed-off-by: Ying Li + +commit d1e65edad1b855580a6c743cc1dd7c391bcdb21c +Author: Ahmet Alp Balkan +Date: Tue Apr 19 11:12:07 2016 -0700 + + azure.md: typo fix + + Signed-off-by: Ahmet Alp Balkan + +commit eab65e438ecc406baf935c8df544982164cff72f +Merge: 4a8519ba29 49f7b4dafb +Author: Alexander Morozov +Date: Tue Apr 19 11:05:27 2016 -0700 + + Merge pull request #22153 from vdemeester/update-engine-api-again + + Update engine api again for CopyToContainer and versions + +commit 26a95ef5a33f63b61246d2de0393584f48db73e4 +Author: Riyaz Faizullabhoy +Date: Tue Apr 19 00:41:16 2016 -0700 + + Handle cert bundles as key IDs + + Signed-off-by: Riyaz Faizullabhoy + +commit 47767002152f0c162d4874f53e58c24babeaf1bb +Author: David Lawrence +Date: Mon Apr 18 18:20:56 2016 -0700 + + add test for using a pinned cert ID when the root Public field has a bundle with intermediates + Signed-off-by: David Lawrence (github: endophage) + +commit 94a2e3a741123994a987108f78356d6bf26edc4e +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 09:56:48 2016 -0700 + + Change config to disable_tofu instead of tofu + + Signed-off-by: Riyaz Faizullabhoy + +commit 8c9424f051909fb4f27d85a481d701b73d27c104 +Author: Riyaz Faizullabhoy +Date: Fri Apr 8 13:47:23 2016 -0700 + + Allow for multiple pinned certs per gun + + Signed-off-by: Riyaz Faizullabhoy + +commit bbf51108c0a6d5361dd00344aafc0111d614a072 +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 17:38:11 2016 -0700 + + Rename certs package to trustpinning + + Signed-off-by: Riyaz Faizullabhoy + +commit 60faca0661a0151c97c729e6efc083d86b0d0b52 +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 15:03:09 2016 -0700 + + Use most specific CA prefix for pinning + + Signed-off-by: Riyaz Faizullabhoy + +commit 86d9e081fbbd63b44a1ac69ff3480e145b2d1a8c +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 16:56:42 2016 -0700 + + Refactor initialization for trust pinning, intermediate cert handling + + Signed-off-by: Riyaz Faizullabhoy + +commit b5534779dff8d507b63cd544d84a5b3ddd64fb25 +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 16:00:46 2016 -0700 + + Include trust pinning flow diagram + + Signed-off-by: Riyaz Faizullabhoy + +commit df3bd7dba6556e6381fed8bbbdcc0c73fb0a66d7 +Author: Riyaz Faizullabhoy +Date: Fri Apr 1 16:05:42 2016 -0700 + + Refactor out trust pinning check + + Signed-off-by: Riyaz Faizullabhoy + +commit c2f57536305ed0c1e6d53c1d7929233b5dc21a6f +Author: Riyaz Faizullabhoy +Date: Wed Mar 16 14:56:57 2016 -0700 + + Update CA pinning logic to include intermediates, add positive test case + + Signed-off-by: Riyaz Faizullabhoy + +commit 2d065f241d7adc96a66eeef45455f6575f8ab1df +Author: Riyaz Faizullabhoy +Date: Tue Mar 15 18:46:30 2016 -0700 + + Change config parsing, add helpers to clean up config usage + + Signed-off-by: Riyaz Faizullabhoy + +commit 043f84aa625dd1bd6d48c2552adebb261599b2c6 +Author: Riyaz Faizullabhoy +Date: Tue Mar 15 17:16:36 2016 -0700 + + Documentation for config, clean up tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 7d6fdc08cdb49d3a0e979efd40433bc2142f709a +Author: Riyaz Faizullabhoy +Date: Fri Mar 11 11:01:03 2016 -0800 + + Update function description for expected behavior, groundwork for config + in validation + + Signed-off-by: Riyaz Faizullabhoy + +commit 09f81717080f53276e6881ece57cbbbf91b8e2a7 +Author: Ying Li +Date: Fri Apr 8 14:54:57 2016 -0700 + + Update the diagrams to label the client, server, signer, and DBs + + Signed-off-by: Ying Li + +commit b8c005c30435cfca8abee12d9cfbbfc1b88372c5 +Merge: 6c524b2500 ae133606ad +Author: David Lawrence +Date: Tue Apr 19 10:51:17 2016 -0700 + + Merge pull request #647 from docker/rethinkdb + + Rethinkdb support for server+signer + +commit fc2e2234c614379d21c16e32c1b82e7819fc3eac +Author: Michael Crosby +Date: Mon Apr 18 11:48:28 2016 -0700 + + Remove restart canceled error + + It should not be an error to call a common option to cancel restarts. + + Signed-off-by: Michael Crosby + +commit 4a8519ba29a0b1f1aa2f9e9ac6d991114d8b8253 +Merge: 75cc2c926b 68f9a45440 +Author: moxiegirl +Date: Tue Apr 19 10:26:56 2016 -0700 + + Merge pull request #22148 from thaJeztah/remove-old-api-versions + + Remove API versions 1.17 and older from documentation + +commit d9beef7635db2b8a10da072de5f6ad748fd831e1 +Merge: 78bacff06a 7e119761d4 +Author: Dongluo Chen +Date: Tue Apr 19 10:20:40 2016 -0700 + + Merge pull request #2136 from doronp/Fix_Docs + + Fix docs + +commit 75cc2c926b3296ed07af130a91ed2409f823ff70 +Merge: 2f7df8e5de f812b55692 +Author: Vincent Demeester +Date: Tue Apr 19 19:15:14 2016 +0200 + + Merge pull request #21495 from HackToday/addnetworkfilter + + Add network label filter support + +commit cd27f179f2c10c5d300e6d09025b538c475b0d51 +Merge: 9d491698cc f2686b8db4 +Author: Richard Scothern +Date: Tue Apr 19 10:04:23 2016 -0700 + + Merge pull request #1635 from hopkings2008/notifytype + + use context.GetLogger to replace logrus in listener + +commit 2f7df8e5dec7c4ab121d0ea0d337b5cc4c3d5c77 +Merge: 60548927b3 84d170129a +Author: Alexander Morozov +Date: Tue Apr 19 09:45:54 2016 -0700 + + Merge pull request #22121 from tonistiigi/fix-exec-cleanup + + Clean up exec fifos on process exit + +commit 60548927b3c7bc102aabdfda0065199bbddfd8b7 +Merge: 8adc8c3a68 f310fd14a9 +Author: Brian Goff +Date: Tue Apr 19 11:43:00 2016 -0400 + + Merge pull request #22156 from jaredhocutt/netappdvp + + Add the NetApp Docker Volume Plugin to the documentation + +commit f310fd14a9a99362635198cd5b1517a053813c92 +Author: Jared Hocutt +Date: Tue Apr 19 11:05:05 2016 -0400 + + Add the NetApp Docker Volume Plugin to the documentation + + Signed-off-by: Jared Hocutt + +commit 49f7b4dafb2fc3d702304ae1bfe5834764692e1d +Author: Vincent Demeester +Date: Tue Apr 19 16:57:02 2016 +0200 + + Remove pkg/version + + Signed-off-by: Vincent Demeester + +commit 7534f17261d0bb74557ca2f7cd893d5b7b531d49 +Author: Vincent Demeester +Date: Tue Apr 19 16:56:54 2016 +0200 + + Update code for latest engine-api + + - Update CopyToContainer uses + - Use engine-api/types/versions instead of pkg/version + + Signed-off-by: Vincent Demeester + +commit 04bb3a2f45de32794a031f09dbe03fdbba711906 +Author: Vincent Demeester +Date: Tue Apr 19 15:50:20 2016 +0200 + + Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc + + Signed-off-by: Vincent Demeester + +commit 7e119761d4405e46d208f63d2895264722680c0e +Author: Doron Podoleanu +Date: Mon Apr 18 10:30:46 2016 +0300 + + Fix docs + + Signed-off-by: Doron Podoleanu + +commit b3db3925d9138288716e6ae53cc28f1994ba71ba +Author: Quentin Perez +Date: Tue Apr 19 14:41:29 2016 +0200 + + Add Scaleway Docker Machine Driver Plugin + + Signed-off-by: Quentin Perez + +commit 68f9a45440c1d87316ec5106f942a8cae9113ca0 +Author: Sebastiaan van Stijn +Date: Tue Apr 19 14:39:14 2016 +0200 + + Remove API versions 1.17 and older from documentation + + Docker 1.5 and older is no longer supported by Docker Hub, + so there's not much need to document the API for those + versions. + + Documentation is still available on GitHub, and through + the older versions of the documentation for those + that really need it. + + Signed-off-by: Sebastiaan van Stijn + +commit 9a67520af7158c32e338be5ef214d59802bec412 +Author: Stefan Majewsky +Date: Tue Apr 19 13:48:08 2016 +0200 + + wait for DLO segments to show up when Close()ing the writer + + Not just when Commit()ing the result. This fixes some errors I observed + when the layer (i.e. the DLO) is Stat()ed immediately after closing, + and reports the wrong file size because the container listing is not + yet up-to-date. + + Signed-off-by: Stefan Majewsky + +commit 8adc8c3a686be09212a894cc91dcd974b830f330 +Merge: 42a7efd691 ea531f061d +Author: Brian Goff +Date: Tue Apr 19 08:16:41 2016 -0400 + + Merge pull request #21901 from mavenugo/sid + + Add container's short-id as default network alias + +commit cafe1315b25e23544c5ce2144cf0a05b4118d3af +Merge: 984f839d33 4702703615 +Author: Aanand Prasad +Date: Tue Apr 19 12:42:19 2016 +0100 + + Merge pull request #3334 from werehuman/fix-config-hash-change + + Fix #3248: Accidental config_hash change + +commit 42a7efd69171e94063f0be2b1ad88262ee6bad81 +Merge: 9534a8220c c2d183426b +Author: Brian Goff +Date: Tue Apr 19 07:27:13 2016 -0400 + + Merge pull request #22122 from Microsoft/jjh/defaultdir + + Windows: Set default directory + +commit 984f839d330599638abfc7bdfc0754dc4f5c6d71 +Merge: d21e1c5a30 ae46bf8907 +Author: Aanand Prasad +Date: Tue Apr 19 12:14:24 2016 +0100 + + Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature + + Added code to support no argument help command + +commit d21e1c5a30f4dbe8a141bae2aa863d13f5993dee +Merge: 52fa010ac7 ad306f0479 +Author: Aanand Prasad +Date: Tue Apr 19 12:13:20 2016 +0100 + + Merge pull request #3335 from johnharris85/master + + Fix CLI docstring to reflect Docopt behaviour. + +commit 52fa010ac7f958b832039601e6b2a9bb343520ec +Merge: d4bebbb1ba 56c6e29819 +Author: Aanand Prasad +Date: Tue Apr 19 12:12:43 2016 +0100 + + Merge pull request #3337 from dnephin/check_for_short_id_alias + + Check for short id alias, and don't disconnect if it already exists + +commit 9534a8220caf1870b9ca8b09b82249c10ff77f54 +Merge: 7fd53f7c71 332e3b545b +Author: Vincent Demeester +Date: Tue Apr 19 12:17:22 2016 +0200 + + Merge pull request #22135 from yongtang/22100-docs-container-creation-param + + Docs: Container creation param descriptions not under HostConfig + +commit 91b715706493059d39c9f8b1d01c9d80ce1799d9 +Author: Wen Cheng Ma +Date: Tue Apr 19 13:50:09 2016 +0800 + + Deprecated of docker ps since and before options for v1.12 + + Deprecated note https://github.com/docker/docker/blob/master/docs/deprecated.md#docker-ps-before-and-since-options + + Signed-off-by: Wen Cheng Ma + +commit ae133606ad128d75d7b1a097ded732334f0d9e00 +Author: David Lawrence +Date: Mon Apr 18 22:07:11 2016 -0700 + + pass checksum to GetOrCreateSnapshot. One timestamp test now obsolete as we always regenerate a timestamp when regenerating a snapshot, other test has one error change because we now look for an explicit checksum, hence writing incorrect data to DB for the snapshot results in a rather than a + Signed-off-by: David Lawrence (github: endophage) + +commit 332e3b545b0c0e825364c0f09315f82546c791f0 +Author: Yong Tang +Date: Mon Apr 18 21:15:33 2016 -0700 + + Docs: Container creation param descriptions not under HostConfig + + This fix tries to fix issues mentioned in #22100 for incorrect + description of remote API's container creation params. + + Several issues have been fixed: + 1. CPU and memory related params (e.g., `MemorySwap`, `CpuShares`, etc.) + were incorrectly placed under the top level instead of under the HostConfig. + (v1.18-v1.24) + 2. The param `Cpuset` has been deprecated but was never removed. + (v1.18-v1.24) + 3. The param `PidsLimit` was not added even though the description + has been added. + (v1.23-v1.24) + + This fix fixes #22100 + + Signed-off-by: Yong Tang + +commit 3e5d6d1f310e76dab4ae32998fdcd5d4e0834885 +Author: David Lawrence +Date: Mon Apr 18 20:57:45 2016 -0700 + + review from Hukeping + Signed-off-by: David Lawrence (github: endophage) + +commit 7fd53f7c711474791ce4292326e0b1dc7d4d6b0f +Merge: aeb1e45e60 b9c94b70bf +Author: David Calavera +Date: Mon Apr 18 19:47:22 2016 -0700 + + Merge pull request #21657 from vdemeester/update-engine-api + + Update engine api with required arguments + +commit aeb1e45e60b49dc2208a9857dce1867d2191bd16 +Merge: eed9c930b8 9e5b93565c +Author: David Calavera +Date: Mon Apr 18 19:45:18 2016 -0700 + + Merge pull request #22130 from Microsoft/jstarks/win_pidfile + + Windows: don't overwrite PID file if process exists + +commit 53302b32b4377d20b5e4a552b96356d2959baa15 +Author: Pradeep Padala +Date: Mon Apr 18 17:48:47 2016 -0700 + + Updating instructions for adding dependencies + + Instructions for adding a new dependency + + Signed-off-by: Pradeep Padala + +commit db2e625341fd37335bf228345cca7649a283e5a5 +Author: Riyaz Faizullabhoy +Date: Mon Apr 18 17:35:54 2016 -0700 + + Transaction-logic for rethink + + Signed-off-by: Riyaz Faizullabhoy + +commit 9e5b93565c8a10f4b06d2bcf61305fdfb7128628 +Author: John Starks +Date: Mon Apr 18 15:09:55 2016 -0700 + + Windows: don't overwrite PID file if process exists + + pidfile.New() was opening a file in /proc to determine if the owning + process still exists. Use syscall.OpenProcess() on Windows instead. + + Other OSes may also need to be updated here. + + Signed-off-by: John Starks + +commit eed9c930b85ac1489129e4e36e0945bb3ee6954f +Merge: 2b5512a3be d17ee4b506 +Author: Michael Crosby +Date: Mon Apr 18 16:26:23 2016 -0700 + + Merge pull request #22120 from crosbymichael/stats-panic + + Create a copy of stats value before modifications + +commit c2d183426ba2fb4e850dc006d3ad3cc3bd86cc24 +Author: John Howard +Date: Mon Apr 18 10:11:37 2016 -0700 + + Windows: Set default directory + + Signed-off-by: John Howard + +commit db5d1b6fb81427c7ab34b36f6da0664a0ab4b086 +Author: Riyaz Faizullabhoy +Date: Mon Apr 18 14:52:41 2016 -0700 + + Write ack and read mode for linearizability on tuf_files table + + Signed-off-by: Riyaz Faizullabhoy + +commit 2b5512a3be52424583adada7206107f65ff8fd18 +Merge: 7f767d8ff5 b216dc9115 +Author: Alexander Morozov +Date: Mon Apr 18 15:04:24 2016 -0700 + + Merge pull request #22080 from amitkris/pkg_term_solaris + + Get pkg/term to build for Solaris + +commit 7f767d8ff5c23979042dfd66db8e9487ee8f7eb8 +Merge: c3533d58c3 e076bccb45 +Author: Alexander Morozov +Date: Mon Apr 18 14:56:34 2016 -0700 + + Merge pull request #22069 from rhvgoyal/overlay-private + + Make overlay home dir Private mount + +commit e076bccb458aeadab9380ce0636456ad6317a85f +Author: Vivek Goyal +Date: Mon Apr 18 21:48:09 2016 +0000 + + Make overlay home dir Private mount + + People have reported following issue with overlay + + $ docker run -ti --name=foo -v /dev/:/dev fedora bash + $ docker cp foo:/bin/bash /tmp + $ exit container + + Upon container exit, /dev/pts gets unmounted too. This happens because + docker cp volume mounts get propagated to /run/docker/libcontainer/.... + and when container exits, it must be tearing down mount point under + /run/docker/libcontainerd/... and as these are "shared" mounts it + propagates events to /dev/pts and it gets unmounted too. + + One way to solve this problem is to make sure "docker cp" volume mounts + don't become visible under /run/docker/libcontainerd/.. + + Here are more details of what is actually happening. + + Make overlay home directory (/var/lib/docker/overlay) private mount when + docker starts and unmount it when docker stops. Following is the reason + to do it. + + In fedora and some other distributions / is "shared". That means when + docker creates a container and mounts it root in /var/lib/docker/overlay/... + that mount point is "shared". + + Looks like after that containerd/runc bind mounts that rootfs into + /runc/docker/libcontainerd/container-id/rootfs. And this puts both source + and destination mounts points in shared group and they both are setup + to propagate mount events to each other. + + Later when "docker cp" is run it sets up container volumes under + /var/lib/dokcer/overlay/container-id/... And all these mounts propagate + to /runc/docker/libcontainerd/... Now mountVolumes() makes these new + mount points private but by that time propagation already has happened + and private only takes affect when unmount happens. + + So to stop this propagation of volumes by docker cp, make + /var/lib/docker/overlay a private mount point. That means when a container + rootfs is created, that mount point will be private too (it will inherit + property from parent). And that means when bind mount happens in /runc/ + dir, overlay mount point will not propagate mounts to /runc/. + + Other graphdrivers like devicemapper are already doing it and they don't + face this issue. + + Signed-off-by: Vivek Goyal + +commit ea531f061d3c511e376753f9863cb41f1b96d87e +Author: Madhu Venugopal +Date: Fri Apr 8 15:25:07 2016 -0700 + + Add container's short-id as default network alias + + link feature in docker0 bridge by default provides short-id as a + container alias. With built-in SD feature, providing a container + short-id as a network alias will fill that gap. + + Signed-off-by: Madhu Venugopal + +commit 4385f46d906bd7263ff1ad82b8f9165cbf248311 +Author: Riyaz Faizullabhoy +Date: Mon Apr 18 14:34:21 2016 -0700 + + Fix compose indentation for rdb3 + + Signed-off-by: Riyaz Faizullabhoy + +commit 84d170129a19855829d282e5416ce08ddb2edbd6 +Author: Tonis Tiigi +Date: Mon Apr 18 11:01:02 2016 -0700 + + Clean up exec fifos on process exit + + Signed-off-by: Tonis Tiigi + +commit cbb87491e18986311ce166131ab410d892489eb0 +Merge: 9718d6c266 b62afc85f7 +Author: Nathan LeClaire +Date: Mon Apr 18 13:08:03 2016 -0700 + + Merge pull request #3328 from bamarni/issue-3306 + + SSH - don't enable BatchMode (fixes #3306) + +commit c3533d58c36835c9560e859f09f15dbce82c3ac1 +Merge: 1cd7dd8917 1aa9369499 +Author: Tianon Gravi +Date: Mon Apr 18 12:46:09 2016 -0700 + + Merge pull request #22029 from talex5/gitcommit + + Build: pass through DOCKER_GITCOMMIT + +commit 1cd7dd89175bea9a89c433093180e5aa3c8f04b3 +Merge: 2b6d7f728e 3b3e58b639 +Author: Alexander Morozov +Date: Mon Apr 18 12:44:13 2016 -0700 + + Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows + + Workaround Windows bug discovered with Go security fix + +commit 2b6d7f728e163a82b3114c819bc7785ad22b5756 +Merge: 4e898ae64b ae75a7d3b2 +Author: Alexander Morozov +Date: Mon Apr 18 12:38:29 2016 -0700 + + Merge pull request #22088 from amitkris/update_fsnotify + + Update fsnotify to v1.2.11 + +commit 4e898ae64be25bc5a86e0e7865a37b9f596e4d17 +Merge: a4030787f5 1d02ad2a51 +Author: Brian Goff +Date: Mon Apr 18 15:29:05 2016 -0400 + + Merge pull request #22065 from thaJeztah/remove-deprecation-message + + Remove deprecation warning + +commit d17ee4b506af842b2d9fe6f8736b4636e32db599 +Author: Michael Crosby +Date: Mon Apr 18 11:12:07 2016 -0700 + + Create a copy of stats value before modifications + + Fixes #22030 + + Because the publisher uses this same value to all the + stats endpoints we need to make a copy of this as soon as we get it so + that we can make our modifications without it affecting others. + + Signed-off-by: Michael Crosby + +commit a4030787f537e79242888cc3fd8b5f3f51ce357f +Merge: dadc3087e3 494297baf8 +Author: Brian Goff +Date: Mon Apr 18 14:38:01 2016 -0400 + + Merge pull request #21993 from coolljt0725/quiet_restartmanger_cancel + + Don't throw "restartmanager canceled" error for no restart policy container + +commit dadc3087e3442fec543822e9cf87145d3507930e +Merge: ac7e011ec9 a02ae66d36 +Author: Sebastiaan van Stijn +Date: Mon Apr 18 20:25:14 2016 +0200 + + Merge pull request #22058 from WeiZhang555/remove-rpc-error + + Remove rpc error when shut down daemon + +commit 9bab389db1011e9a4d95e97068a4a95740b5d012 +Author: Riyaz Faizullabhoy +Date: Mon Apr 18 09:37:27 2016 -0700 + + Allow for tls CA file to have path relative to config for consistency + + Signed-off-by: Riyaz Faizullabhoy + +commit ac7e011ec90b110e62aafd3a1b2963634c9976a3 +Merge: e764e0215e ba353f3787 +Author: Vincent Demeester +Date: Mon Apr 18 18:21:38 2016 +0200 + + Merge pull request #22048 from thaJeztah/docs-update-api-for-labels + + docs: update API for features added in 1.11 + +commit e764e0215e11da40a1e2148efc9867be362bd2d4 +Merge: e68765d5e2 c2e088e134 +Author: Vincent Demeester +Date: Mon Apr 18 18:16:51 2016 +0200 + + Merge pull request #22086 from aboch/doc + + Clarify container external connectivity in multi-network scenario + +commit e68765d5e27568d3377f4b5de88b19be4a648a54 +Merge: 9b6c055f92 d2c5bf23f1 +Author: Sebastiaan van Stijn +Date: Mon Apr 18 18:09:28 2016 +0200 + + Merge pull request #22115 from yorkie/fix/doc-typo + + doc: fix typo + +commit d2c5bf23f16a98ca6f603f7fe2b5a31c70d4c8db +Author: yorkie +Date: Mon Apr 18 23:38:41 2016 +0800 + + doc: fix typo + + Signed-off-by: yorkie + +commit c2e088e13488904a6747809a689eac5d72a4618e +Author: Alessandro Boch +Date: Fri Apr 15 17:15:18 2016 -0700 + + Clarify container external connectivity in multi-network scenario + + Signed-off-by: Alessandro Boch + +commit d4bebbb1ba877fda9f2b8117d3ba06825e3c174c +Merge: e2cb7b0237 6d2805917c +Author: Daniel Nephin +Date: Mon Apr 18 10:13:47 2016 -0400 + + Merge pull request #3340 from johnharris85/2922-config-does-not-catch-missing-links + + Fix #2922: Config does not catch missing links + +commit 9b6c055f920b596ba487e4ce0a9bb5f7d8df393d +Merge: bbf3c0251d cbb6c6e959 +Author: Vincent Demeester +Date: Mon Apr 18 11:09:55 2016 +0200 + + Merge pull request #22098 from thaJeztah/cherry-pick-21998 + + cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin" + +commit bbf3c0251d56640859223c892c4a3855603cd3ef +Merge: 2a95488f78 b1459f1b94 +Author: Vincent Demeester +Date: Mon Apr 18 07:51:54 2016 +0200 + + Merge pull request #22097 from mavenugo/tp5 + + Vendoring libnetwork v0.8.0-dev.1 + +commit f812b55692f5d50d427684216ad6c806bac5a702 +Author: Kai Qiang Wu(Kennan) +Date: Thu Mar 24 14:31:19 2016 +0000 + + Add network label filter support + + This patch did following: + + 1) Make filter check logic same as `docker ps ` filters + + Right now docker container logic work as following: + when same filter used like below: + -f name=jack -f name=tom + it would get all containers name is jack or tom(it is or logic) + + when different filter used like below: + + -f name=jack -f id=7d1 + it would get all containers name is jack and id contains 7d1(it is and logic) + + It would make sense in many user cases, but it did lack of compliate filter cases, + like "I want to get containers name is jack or id=7d1", it could work around use + (get id=7d1 containers' name and get name=jack containers, and then construct the + final containers, they could be done in user side use shell or rest API) + + 2) Fix one network filter bug which could include duplicate result + when use -f name= -f id=, it would get duplicate results + + 3) Make id filter same as container id filter, which means match any string. + not use prefix match. + + It is for consistent match logic + + Closes: #21417 + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 6d2805917c8e3f90b20781dfe35513d12e819533 +Author: johnharris85 +Date: Sun Apr 17 15:25:06 2016 -0400 + + Account for aliased links + Fix failing tests + Signed-off-by: John Harris + +commit b1459f1b94ee94240793f769a04354705e889104 +Author: Madhu Venugopal +Date: Sat Apr 16 15:46:55 2016 -0700 + + Vendoring libnetwork v0.8.0-dev.1 + + - Fixes docker/docker#16964 + - Added maximum egress bandwidth qos for Windows + + Signed-off-by: Madhu Venugopal + +commit 377be5aa1f097166df91c95670f871959654be3a +Author: johnharris85 +Date: Sun Apr 17 14:01:06 2016 -0400 + + Adding tests + Signed-off-by: John Harris + +commit 68272b021639490929b0cdcca970ebd902ff5f09 +Author: johnharris85 +Date: Sun Apr 17 14:00:07 2016 -0400 + + Config now catches undefined service links + Fixes issue #2922 + Signed-off-by: John Harris + +commit b4f060599ad885aad25dcf94b04dba4673b49143 +Author: Nikita Tarasov +Date: Sun Apr 17 20:05:51 2016 +0300 + + docs + fix test + Signed-off-by: Nikita Tarasov + +commit b51607f9f01576fa9cc4821ee7fb3f40171f1d64 +Author: Nikita Tarasov +Date: Wed Apr 13 19:06:33 2016 +0300 + + fix test + Signed-off-by: Nikita Tarasov + + Signed-off-by: Nikita Tarasov + +commit 17756eb43e8bf7946de521a284514b860e1e9b1e +Author: Fabio Huser +Date: Sun Apr 17 12:04:15 2016 +0200 + + Clarify kid format for JWT token auth in docs + + The kid value can have an arbitrary format according JOSE specification, but Docker distribution expects a specific format (libtrust fingerprint) to work. This is not written in the documentation so far and is only mentioned in the libtrust source code itself. + + Signed-off-by: Fabio Huser + +commit b62afc85f7ebe08fcd36ba3d3c5cf98193c9271e +Author: Bilal Amarni +Date: Sun Apr 17 09:34:48 2016 +0200 + + SSH - don't enable BatchMode + + When a passphrase protected key is not yet in ssh-agent, it gives a + chance to the user to fill a prompt instead of silently failing. + + Signed-off-by: Bilal Amarni + +commit cbb6c6e959e48182f31b15046f5024572980af96 +Author: Tibor Vass +Date: Wed Apr 13 09:49:40 2016 -0400 + + runc install path changed from /usr/local/bin to /usr/local/sbin + + Signed-off-by: Tibor Vass + (cherry picked from commit 3d85e51ef4284f572cb658cfe69edc92ac3a53bb) + Signed-off-by: Sebastiaan van Stijn + +commit 2a95488f7843a773de2b541a47d9b971a635bfff +Merge: 27dd6a10b8 e035a86c1d +Author: Sebastiaan van Stijn +Date: Sat Apr 16 17:39:04 2016 +0200 + + Merge pull request #22085 from thaJeztah/remove-unused-query-parameter + + docs: remove unused "registry" parameter + +commit 27dd6a10b8515ed464e11ba409dd8c03b2287d1d +Merge: 5314296c69 d0ebc58b9c +Author: Vincent Demeester +Date: Sat Apr 16 13:34:35 2016 +0200 + + Merge pull request #21817 from tkopczynski/20784-builder-dockerfile-support + + Unit tests for builder/dockerfile/support + +commit 5314296c693d0d4d7f622940b48bc15e400032e3 +Merge: 7bfa122472 ff08036cc0 +Author: Doug Davis +Date: Sat Apr 16 10:20:58 2016 +0100 + + Merge pull request #20835 from cpuguy83/handle_stats_client_errors + + Do not remove containers from stats list on err + +commit a02ae66d361464cc24bec4fb6aa5778c9d5b8cda +Author: Zhang Wei +Date: Fri Apr 15 12:06:26 2016 +0800 + + Remove rpc error when shut down daemon + + RPC connection closing error will be reported every time we shutdown + daemon, this error is expected, so we should remove this error to avoid + confusion to user. + + Signed-off-by: Zhang Wei + +commit 78bacff06a1cfd5ea5f4196036c71e687f3bb3c5 +Merge: 7e69ac36aa 4a54b63c42 +Author: Dongluo Chen +Date: Fri Apr 15 19:25:40 2016 -0700 + + Merge pull request #2131 from jimmycmh/master + + Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404 + +commit ae75a7d3b22c619d526568dcaca7582f03214411 +Author: Amit Krishnan +Date: Fri Apr 15 18:40:07 2016 -0700 + + Update fsnotify to v1.2.11 + + Signed-off-by: Amit Krishnan + +commit 3b3e58b639729e0fb3227e21367fea3ff9c5ff03 +Author: Tibor Vass +Date: Fri Apr 15 17:34:24 2016 -0400 + + Workaround Windows bug discovered with Go security fix + + For context: https://github.com/golang/go/issues/15286 + + This commit downloads go1.5.3 in addition to go1.5.4 in order to + workaround the issue. + + It is not expected to do a Docker release without a proper fix, however + this should help unblock Docker development on Windows TP5. + + Signed-off-by: Tibor Vass + +commit ba353f37870fdeb8b875a79e1aec54dc3d1aedc4 +Author: Sebastiaan van Stijn +Date: Thu Apr 14 15:04:33 2016 +0200 + + docs: update API for features added in 1.11 + + Docker 1.11 added a feature to set labels on volumes, + networks and images (during build), but these changes + were not documented in the API documentation. + + This adds the new features to the documentation. + + Also fixes some minor formatting, and options that + were not used in the examples. + + Signed-off-by: Sebastiaan van Stijn + +commit e035a86c1d981d5e2ade303a9152ee36125a4cb9 +Author: Sebastiaan van Stijn +Date: Sat Apr 16 02:09:58 2016 +0200 + + docs: remove unused "registry" parameter + + The "registry" query-param was in added 10c0e990371e065d4fc1c9b680f03a46e5bacc5e, + and removed in docker 0.5.0 via 66a9d06d9fa7a382c6852cf047e1448e0d3e1782. + + Aparently, it was never removed from the documentation, + and included in all versions of the API docs. + + This removes it from the documentation. + + Signed-off-by: Sebastiaan van Stijn + +commit d0ebc58b9c82d2baf0c672b514ba9733ff79a3a1 +Author: Tomasz Kopczynski +Date: Tue Apr 5 23:00:37 2016 +0200 + + Unit tests for builder/dockerfile/support + + Signed-off-by: Tomasz Kopczynski + +commit b216dc9115ebc0b803551ff761f5464fcbde09e1 +Author: Amit Krishnan +Date: Fri Apr 15 11:28:44 2016 -0700 + + Get pkg/term to build for Solaris + + Signed-off-by: Amit Krishnan + +commit 56c6e298199552f630432d6fefd770e35e5d7562 +Author: Daniel Nephin +Date: Fri Apr 15 15:42:36 2016 -0400 + + Unit test for skipping network disconnect. + + Signed-off-by: Daniel Nephin + +commit 7bfa122472d9d693585bfa4af2c892678fdc3886 +Merge: 19a453e6b4 f3f981624b +Author: Brian Goff +Date: Fri Apr 15 15:47:50 2016 -0400 + + Merge pull request #22078 from yongtang/04152016-docs-remote-api-SecurityOpt + + Fix incorrect docs in remote API for the option of `SecurityOpt` + +commit 19a453e6b40177af31703f107131aae5ca81adf2 +Merge: 714cd6bd8f 55053d3537 +Author: Brian Goff +Date: Fri Apr 15 15:33:41 2016 -0400 + + Merge pull request #21939 from calavera/events_until_past + + Get events until a time in the past. + +commit 714cd6bd8f7756a8d7e2d24cc146b7b7d52618e2 +Merge: caf21c81ff 57f29f24e4 +Author: David Calavera +Date: Fri Apr 15 11:42:03 2016 -0700 + + Merge pull request #22079 from allencloud/fix-typos-in-CHANGELOG + + fix typos in changelog + +commit caf21c81ff91d48178f2616d1f5bd9c6df716b4c +Merge: d2851cc7e3 51b23d8842 +Author: David Calavera +Date: Fri Apr 15 11:41:31 2016 -0700 + + Merge pull request #22066 from thaJeztah/fail-on-unsupported-kernels + + Produce fatal error when running on kernel < 3.10.0 + +commit 57f29f24e46c845ebbd6d309a3ca5af39ee0f3ec +Author: allencloud +Date: Sat Apr 16 02:19:15 2016 +0800 + + fix typos in changelog + + Signed-off-by: allencloud + +commit f3f981624bc9329740e9a1c52e71471ca38d8171 +Author: Yong Tang +Date: Fri Apr 15 11:08:15 2016 -0700 + + Fix incorrect docs in remote API for the option of `SecurityOpt` + + This fix tries to fix the issue in remote API docs for v1.15 (Docker 1.3.x) + and v1.16 (Docker 1.4.x) where `SecurityOpts` was used but the actual field + should be `SecurityOpt`. + + This `SecurityOpt` field is verified through the source code in + v1.3.0 and v1.4.0: + https://github.com/docker/docker/blob/v1.3.0/runconfig/config.go#L35 + https://github.com/docker/docker/blob/v1.4.0/runconfig/hostconfig.go#L98 + + Signed-off-by: Yong Tang + +commit d2851cc7e313aa3a56591b69ccc952bbfab0d0f7 +Merge: a196861517 f84cabd3b8 +Author: Alexander Morozov +Date: Fri Apr 15 10:46:31 2016 -0700 + + Merge pull request #22050 from tophj-ibm/increase-timeout-stdin-close-test + + Fix flaky test TestRunExitOnStdinClose + +commit b04a5c00e08b4de438c04c342d15dea26af9f7bc +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 18:15:19 2016 -0700 + + Add more tests and restructure + + Signed-off-by: Riyaz Faizullabhoy + +commit a1968615176001904e58300339df8f6d7b9b7086 +Merge: e40e5b97c1 cacd400777 +Author: David Calavera +Date: Fri Apr 15 10:11:33 2016 -0700 + + Merge pull request #22009 from rhvgoyal/docker-cp-fix + + Mount volumes rprivate for archival and other use cases + +commit e40e5b97c1ad540aa0be568467546f27932ef3a5 +Merge: c60c3045dd 36a1c56cf5 +Author: Vincent Demeester +Date: Fri Apr 15 18:53:39 2016 +0200 + + Merge pull request #21006 from cpuguy83/volume_inspect_meta + + Allow volume drivers to provide a `Status` field + +commit c60c3045ddf719a8e486e9f1bf69c634a05724b9 +Merge: 1a14bbc61e 61ca9cc99e +Author: Tibor Vass +Date: Fri Apr 15 12:53:07 2016 -0400 + + Merge pull request #21633 from tkopczynski/20784-builder-tarsum-tests + + Builder/tarsum unit tests + +commit 9d491698ccf3eba4e87213350518dbaacf8e9650 +Merge: 05b0ab0302 b72d74464a +Author: Richard Scothern +Date: Fri Apr 15 09:52:20 2016 -0700 + + Merge pull request #1641 from RichardScothern/ifollowtherules + + Correction for JSON example. + +commit c892a8d6203dc0fb40a0b107ebbcea994c1afc0b +Author: Thomas Tanaka +Date: Fri Apr 15 09:48:53 2016 -0700 + + DWZ problem with multiple golang binary caused OL7 RPM build to fail + + Refering to this: https://fedoraproject.org/wiki/PackagingDrafts/Go + this could be due to the following bug: + https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 + + This fixes #22051 + + Signed-off-by: Thomas Tanaka + +commit 1a14bbc61e35fd2ca412e07fa6c456095756f892 +Merge: e9c231aea4 8691a77e44 +Author: Tõnis Tiigi +Date: Fri Apr 15 09:45:26 2016 -0700 + + Merge pull request #21726 from aaronlehmann/tarsum-filename-normalization + + Fix build cache false positives when build context tar contains unnormalized paths + +commit b72d74464aef6cedae39c73e63255dd13f9afa3d +Author: Richard Scothern +Date: Fri Apr 15 09:22:44 2016 -0700 + + Correction for JSON example. + + Signed-off-by: Richard Scothern + +commit e9c231aea43ea863f5f332a409b82223efe5d8f3 +Merge: 1d9a6833d3 e67c758ec3 +Author: Vincent Demeester +Date: Fri Apr 15 18:10:39 2016 +0200 + + Merge pull request #22060 from hqhq/hq_remove_tmp_code + + Remove template code for runc and containerd + +commit 36a1c56cf555f8fe9ceabeebb8fc956e05863fc7 +Author: Brian Goff +Date: Mon Mar 7 15:44:43 2016 -0500 + + Allow volume drivers to provide a `Status` field + + The `Status` field is a `map[string]interface{}` which allows the driver to pass + back low-level details about the underlying volume. + + Signed-off-by: Brian Goff + +commit cacd4007776672e918162936d8846eb51a5300e6 +Author: Vivek Goyal +Date: Wed Apr 13 18:22:41 2016 +0000 + + Mount volumes rprivate for archival and other use cases + + People have reported following problem. + + - docker run -ti --name=foo -v /dev/:/dev/ fedora bash + - docker cp foo:/bin/bash /tmp + + Once the cp operation is complete, it unmounted /dev/pts on the host. /dev/pts + is a submount of /dev/. This is completely unexpected. Following is the + reson for this behavior. + + containerArchivePath() call mountVolumes() which goes through all the mounts + points of a container and mounts them in daemon mount namespace in + /var/lib/docker/devicemapper/mnt//rootfs dir. And once we have + extracted the data required, these are unmounted using UnmountVolumes(). + + Mounts are done using recursive bind (rbind). And these are unmounted using + lazy mount option on top level mount. (detachMounted()). That means if there + are submounts under top level mounts, these mount events will propagate and + they were "shared" mounts with host, it will unmount the submount on host + as well. + + For example, try following. + + - Prepare a parent and child mount point. + $ mkdir /root/foo + $ mount --bind /root/foo /root/foo + $ mount --make-rshared /root/foo + + - Prepare a child mount + + $ mkdir /root/foo/foo1 + $ mount --bind /root/foo/foo1 /root/foo/foo1 + + - Bind mount foo at bar + + $ mkdir /root/bar + $ mount --rbind /root/foo /root/bar + + - Now lazy unmount /root/bar and it will unmount /root/foo/foo1 as well. + + $ umount -l /root/bar + + This is not unintended. We just wanted to unmount /root/bar and anything + underneath but did not have intentions of unmounting anything on source. + + So far this was not a problem as docker daemon was running in a seprate + mount namespace where all propagation was "slave". That means any unmounts + in docker daemon namespace did not propagate to host namespace. + + But now we are running docker daemon in host namespace so that it is possible + to mount some volumes "shared" with container. So that if container mounts + something it propagates to host namespace as well. + + Given mountVolumes() seems to be doing only temporary mounts to read some + data, there does not seem to be a need to mount these shared/slave. Just + mount these private so that on unmount, nothing propagates and does not + have unintended consequences. + + Signed-off-by: Vivek Goyal + +commit f84cabd3b8a737e7539d71773b842daa8f0dc66b +Author: Christopher Jones +Date: Thu Apr 14 15:16:43 2016 -0400 + + Fix flaky test TestRunExitOnStdinClose + + This test was flaky on ppc64le, where the average time to close was + around 1 second. This bumps that timeout to 60 seconds which should be + plently. + + Signed-off-by: Christopher Jones + +commit 1d9a6833d319f750a2338ca2b8f6efc318092e04 +Merge: 172ca1ca8c ea8f9c9723 +Author: Vincent Demeester +Date: Fri Apr 15 14:43:18 2016 +0200 + + Merge pull request #22063 from graingert/patch-1 + + Fix security documentation, XSS -> CSRF + +commit 4702703615ad1876b7f20e577dbb9cde59d1e329 +Author: Vladimir Lagunov +Date: Fri Apr 15 15:11:50 2016 +0300 + + Fix #3248: Accidental config_hash change + + Signed-off-by: Vladimir Lagunov + +commit 51b23d88422918c24291f5876df35f91b23a446a +Author: Sebastiaan van Stijn +Date: Fri Apr 15 14:33:56 2016 +0200 + + Produce fatal error when running on kernel < 3.10.0 + + Running on kernel versions older than 3.10 has not been + supported for a while (as it's known to be unstable). + + With the containerd integration, this has become more + apparent, because kernels < 3.4 don't support PR_SET_CHILD_SUBREAPER, + which is required for containerd-shim to run. + + Change the previous "warning" to a "fatal" error, so + that we refuse to start. + + There's still an escape-hatch for users by setting + "DOCKER_NOWARN_KERNEL_VERSION=1" so that they can + run "at their own risk". + + Signed-off-by: Sebastiaan van Stijn + +commit ad306f047969a24ab9fd2d0cf1bdc5ccd01d1bc1 +Author: johnharris85 +Date: Fri Apr 15 13:30:13 2016 +0100 + + Fix CLI docstring to reflect Docopt behaviour. + + Signed-off-by: John Harris + +commit 1d02ad2a519765179480e0ae113bcf510a2713af +Author: Sebastiaan van Stijn +Date: Fri Apr 15 13:28:59 2016 +0200 + + Remove deprecation warning + + Auto-creation of non-existing host directories + is no longer deprecated (9d5c26bed2ac287542e176d9149250927876e3f5), + so this warning is no longer relevant. + + This removes the deprecation warning. + + Also removes the "system" package here, because it's only used + on non-Windows, so basically just called os.MkdirAll() + + Signed-off-by: Sebastiaan van Stijn + +commit 4a54b63c42657a0a5712f99ffcfac25749f750fe +Author: menghui.chen +Date: Fri Apr 15 19:25:45 2016 +0800 + + Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404 + + Signed-off-by: menghui.chen + +commit b9c94b70bf2f703f260844b3862a61f93dee6337 +Author: Vincent Demeester +Date: Wed Apr 13 10:33:46 2016 +0200 + + Update client code with api changes + + Using new methods from engine-api, that make it clearer which element is + required when consuming the API. + + Signed-off-by: Vincent Demeester + +commit ea8f9c972393e0929e643190573412410bf39c6a +Author: Thomas Grainger +Date: Fri Apr 15 11:27:09 2016 +0100 + + Fix security documentation, XSS -> CSRF + + Signed-off-by: Thomas Grainger + +commit 9802d7d10f0cfbd74bc129c01f96e183b9743766 +Author: Vincent Demeester +Date: Wed Apr 13 10:33:35 2016 +0200 + + Vendor engine-api with required arguments + + Signed-off-by: Vincent Demeester + +commit 172ca1ca8c4d5157789feb97a6424104b81a3479 +Merge: bc0c8828e9 ea8c690886 +Author: Vincent Demeester +Date: Fri Apr 15 08:14:59 2016 +0200 + + Merge pull request #20924 from Microsoft/10662-CPUResourceControls + + Add CPU count and maximum resource controls for Windows + +commit 4c90767e603ec1a0f5c46e69b2950ccaa5d60644 +Author: Sun Hongliang +Date: Fri Apr 8 18:12:49 2016 +0800 + + return an error when assertion fails in hijack + + Signed-off-by: Sun Hongliang + +commit 7e69ac36aa47f46f2ab78e2321d413c381458ee2 +Merge: a799f540a1 7f5972124b +Author: Victor Vieux +Date: Thu Apr 14 22:26:55 2016 -0700 + + Merge pull request #2120 from HackToday/fixtypo + + Fix some typo + +commit a799f540a112a937fcdc273759e8d62ccd28948f +Merge: 84a28a7de4 5d66dd33a8 +Author: Victor Vieux +Date: Thu Apr 14 22:11:44 2016 -0700 + + Merge pull request #2130 from atlassian/issue-2129 + + Teardown function needs to be declared before tests. + +commit 5548966c37147875fb5e07f4ba7f633dd882c782 +Author: Zhang Wei +Date: Thu Apr 14 22:37:35 2016 +0800 + + Remove start/die event when fail to start container + + If contaner start fail of (say) "command not found", the container + actually didn't start at all, we shouldn't log start and die event for + it, because that doesnt actually happen. + + Signed-off-by: Zhang Wei + +commit e67c758ec373745300317786a27d639082a3d18d +Author: Qiang Huang +Date: Fri Apr 15 12:45:35 2016 +0800 + + Remove template code for runc and containerd + + Signed-off-by: Qiang Huang + +commit 5d66dd33a8876d9bde28558716cd2ed31a957bff +Author: Otto Jongerius +Date: Fri Apr 15 15:50:02 2016 +1200 + + Teardown function needs to be declared before tests. + + Signed-off-by: Otto Jongerius + +commit f2686b8db4a2bc08978641730040aa435823b1cf +Author: yuzou +Date: Fri Apr 15 11:17:04 2016 +0800 + + use context.GetLogger to replace logrus in listener + + Signed-off-by: yuzou + +commit f3854dc3902ea0b4f20ae512cc07dcbefd7f5bd2 +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 15:26:57 2016 -0700 + + Add unit tests, remove auth key, cleanup + + Signed-off-by: Riyaz Faizullabhoy + +commit 11a4a060a6d30efacde841e70b78e3e57d17c1ad +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 14:04:20 2016 -0700 + + Use 3 rethink db containers for high availability + + Signed-off-by: Riyaz Faizullabhoy + +commit 309096e2fa67ee7d21836e7753044710b059fed0 +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 13:54:40 2016 -0700 + + Make integration test compose file configurable + + Signed-off-by: Riyaz Faizullabhoy + +commit cb86cf5d1a41ef728cf3451c134949ece0a15cad +Author: Riyaz Faizullabhoy +Date: Tue Apr 12 10:58:15 2016 -0700 + + Add additional check and cleanups to integration test + + Signed-off-by: Riyaz Faizullabhoy + +commit edef1cd5c86d04986f2c430f712948691a958966 +Author: David Lawrence +Date: Mon Apr 11 14:48:49 2016 -0700 + + tweaking consistent store tests + Signed-off-by: David Lawrence (github: endophage) + +commit 92c17b754cf745128dedd443ca96b5b6832558ee +Author: David Lawrence +Date: Mon Apr 11 13:19:06 2016 -0700 + + make notary-signer tests work and add test for signer bootstrap + Signed-off-by: David Lawrence (github: endophage) + +commit 5d8bcee97b92354f756de99fd1ad314faab88b16 +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 13:02:04 2016 -0700 + + Update migration syntax, add integration test for rethink + + Signed-off-by: Riyaz Faizullabhoy + +commit 7f615da94f372253afe76195fb0d41040c3e0e85 +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 14:33:19 2016 -0700 + + Fix signer rethink health check query + + Signed-off-by: Riyaz Faizullabhoy + +commit b11a0b9f427acda6561516450a17050c86e542ec +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 12:45:23 2016 -0700 + + Fix docker compose commands for rethink migration + + Signed-off-by: Riyaz Faizullabhoy + +commit 29e5b7d4498cc451dd400bdad37d6d978602edf4 +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 11:22:42 2016 -0700 + + Add docstrings to fix lint + + Signed-off-by: Riyaz Faizullabhoy + +commit 0088233c935f75c8742f0e8d5ba4b89a6d9b5a6b +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 11:21:34 2016 -0700 + + Fix get key queries in signer + + Signed-off-by: Riyaz Faizullabhoy + +commit 97dcdaf91f59145803a39968cc9d8dfeaba634d1 +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 10:54:43 2016 -0700 + + Use explicit string slices for secondary index lookup + + Signed-off-by: Riyaz Faizullabhoy + +commit 01a988a8177eeb3304299efc2fd3cfc6cc6622fa +Author: Riyaz Faizullabhoy +Date: Wed Apr 6 10:14:27 2016 -0700 + + Empty result handling, and err checking + + Signed-off-by: Riyaz Faizullabhoy + +commit 6ace616c349adcbb1ff6317c21114395405291ac +Author: David Lawrence +Date: Tue Apr 5 21:25:26 2016 -0700 + + bugfixes for rethink integration + Signed-off-by: David Lawrence (github: endophage) + +commit fbe14c1a35f531dc66266f149fa0a0d8e23c3121 +Author: David Lawrence +Date: Tue Apr 5 17:58:12 2016 -0700 + + rethinkdb doesn't actually support composite primary keys + Signed-off-by: David Lawrence (github: endophage) + +commit 33f5255c8de6e06d5850caa50aaa22ca92d107d5 +Author: David Lawrence +Date: Tue Apr 5 17:44:19 2016 -0700 + + need a passthrough bootstrap on TufMetaStore + Signed-off-by: David Lawrence (github: endophage) + +commit 227092b94216ace9b94eeb57044cbef39fed5621 +Author: David Lawrence +Date: Tue Apr 5 16:52:35 2016 -0700 + + tweak how we do service aliasing, doesn't appear to work in anymore + Signed-off-by: David Lawrence (github: endophage) + +commit 67d1847cb35c297c421cdba65680407ea45c8ad4 +Author: Riyaz Faizullabhoy +Date: Tue Apr 5 16:48:42 2016 -0700 + + Remove authkey usage + + Signed-off-by: Riyaz Faizullabhoy + +commit 66d6b347d835dc1ccd103e0d0eb4eeaeefd1a28e +Author: David Lawrence +Date: Tue Apr 5 16:20:05 2016 -0700 + + cert fixtures for rethink + Signed-off-by: David Lawrence (github: endophage) + +commit db9fbc3e4ba04207a3f82f340d7c75dee52c51ef +Author: David Lawrence +Date: Tue Apr 5 15:36:06 2016 -0700 + + adding rethink compose setup + Signed-off-by: David Lawrence (github: endophage) + +commit d86227642a2658c8b4bb7ab8c79e1d843661c524 +Author: Riyaz Faizullabhoy +Date: Thu Mar 24 15:50:56 2016 -0700 + + Add bootstrapper for signer + + Signed-off-by: Riyaz Faizullabhoy + +commit ee02a50e31671a9fd0d386eb4358a56078a9485a +Author: Riyaz Faizullabhoy +Date: Thu Mar 24 14:40:50 2016 -0700 + + Add privatekeys table to bootstrapping, some cleanup + + Signed-off-by: Riyaz Faizullabhoy + +commit d95891e54f21585f3c3520f2ff17ff726d95c143 +Author: Riyaz Faizullabhoy +Date: Thu Mar 24 14:27:35 2016 -0700 + + Caching logic for TufMetaStorage + + Signed-off-by: Riyaz Faizullabhoy + +commit b196a803e22eb025efb6ccb96f99c2cee0be80ee +Author: David Lawrence +Date: Thu Mar 24 12:33:29 2016 -0700 + + updating use of indices and queries + Signed-off-by: David Lawrence (github: endophage) + +commit 30f356f94008ef56bcc4a8664f3f345128cd18c5 +Author: Riyaz Faizullabhoy +Date: Wed Mar 23 17:18:56 2016 -0700 + + Use consistent meta storage for server binary + + Signed-off-by: Riyaz Faizullabhoy + +commit 6d3b017c567038a3b6f42d0f2444cfbb11b48dc2 +Author: Riyaz Faizullabhoy +Date: Wed Mar 23 13:36:51 2016 -0700 + + Consistent metastore walks from current timestamp to checksums of snapshot/other roles + + Signed-off-by: Riyaz Faizullabhoy + +commit f8a67f8af001ca9c3d1c67115c1ca777107d3e9c +Author: Riyaz Faizullabhoy +Date: Wed Mar 23 11:18:44 2016 -0700 + + Add rethink init for signer config + + Signed-off-by: Riyaz Faizullabhoy + +commit b8c62731a61c8d007b350d296ec83ffc10346eeb +Author: David Lawrence +Date: Tue Mar 22 21:55:58 2016 -0700 + + adding bootstrapping and config update for notary server + Signed-off-by: David Lawrence (github: endophage) + +commit 045721250ff65143e6522aa1f19b76bd34cc7841 +Author: David Lawrence +Date: Mon Mar 21 13:55:45 2016 -0700 + + rethink server implementation + Signed-off-by: David Lawrence (github: endophage) + +commit 72135193b006bbed26fe956862095629ffa37638 +Author: Riyaz Faizullabhoy +Date: Mon Mar 21 14:00:55 2016 -0700 + + Skeleton for notary signer rethinkdb driver + + Signed-off-by: Riyaz Faizullabhoy + +commit fbe0626a9d76e13f4752c0e087844bbe83d273cc +Author: David Lawrence +Date: Mon Mar 21 12:07:48 2016 -0700 + + common time tracking fields + Signed-off-by: David Lawrence (github: endophage) + +commit 860714c9d314ee93324796711905adc0e1364667 +Author: David Lawrence +Date: Mon Mar 21 11:07:45 2016 -0700 + + shared connection code for rethinkdb + Signed-off-by: David Lawrence (github: endophage) + +commit 494297baf8f391ce73cdc2e885a335a266261970 +Author: Lei Jitang +Date: Thu Apr 14 21:40:20 2016 -0400 + + Don't throw "restartmanager canceled" error for no restart policy container + + Don't throw "restartmanager canceled" error for no restart policy container + and add the container id to the warning message if a container has restart policy + and has been canceled. + + Signed-off-by: Lei Jitang + +commit 622b50927456b70e55fb5f11fbca4f7a35b069bd +Author: Victor Vieux +Date: Fri Mar 25 21:46:53 2016 -0700 + + use engine-api for events + + Signed-off-by: Victor Vieux + +commit ae7174fe4c7ca17b0e3983221129e004c2d37205 +Author: Victor Vieux +Date: Fri Mar 25 21:58:20 2016 -0700 + + godeps + + Signed-off-by: Victor Vieux + +commit 1af7c3f299006ac4aa84583dd498be4ff21c2ff6 +Author: Viktor Stanchev +Date: Thu Apr 14 17:46:15 2016 -0700 + + death to pods, long live replicas + +commit 8691a77e441996fef96019b94f299a11b7244080 +Author: Aaron Lehmann +Date: Fri Apr 1 10:49:04 2016 -0700 + + Fix build cache false positives when build context tar contains unnormalized paths + + If a build context tar has path names of the form 'x/./y', they will be + stored in this unnormalized form internally by tarsum. When the builder + walks the untarred directory tree and queries hashes for each relative + path, it will query paths of the form 'x/y', and they will not be found. + + To correct this, have tarsum normalize path names by calling Clean. + + Add a test to detect this caching false positive. + + Fixes #21715 + + Signed-off-by: Aaron Lehmann + +commit 84a28a7de424e70eb35b9e3fb1874f746f894f31 +Merge: a91c6e0159 d2e375e31d +Author: Dongluo Chen +Date: Thu Apr 14 17:47:30 2016 -0700 + + Merge pull request #2116 from MHBauer/volume-rm-race + + volume rm integration test needs wait to avoid race + +commit 7f5972124b950f8112c809de49b41b09cf8c09ae +Author: Kai Qiang Wu(Kennan) +Date: Thu Apr 14 09:57:40 2016 +0000 + + Fix some typo + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit a91c6e015941b703613a35cbd80a5354cbd209df +Merge: a4dda5bc97 3680a717a1 +Author: Dongluo Chen +Date: Thu Apr 14 17:31:09 2016 -0700 + + Merge pull request #2128 from nishanttotla/container-ops-engine-api + + Move container rename and remove to engine-api + +commit a4dda5bc973ef042dc98b9b63edf7510a644ac95 +Merge: d807d97aea d006ef95f0 +Author: Dongluo Chen +Date: Thu Apr 14 17:12:48 2016 -0700 + + Merge pull request #2124 from vieux/vendor + + move dependencies to vendor/ + +commit 6c524b25002dba0cf4768fad73c5c101c9991ad2 +Merge: 2968fa7407 d49544587b +Author: David Lawrence +Date: Thu Apr 14 17:10:04 2016 -0700 + + Merge pull request #681 from docker/doc-version-note + + Add note about versioning + +commit d807d97aeaa0ea5f5a370983fcacc4527f6651d6 +Merge: 09deb06382 524f5ca79c +Author: Dongluo Chen +Date: Thu Apr 14 16:36:15 2016 -0700 + + Merge pull request #2127 from nishanttotla/container-start + + Moving start container to engine-api + +commit bc0c8828e9afc32f1660a1f679ed523376c7d3d2 +Merge: 8011228b53 190654aa2e +Author: Vincent Demeester +Date: Fri Apr 15 01:24:54 2016 +0200 + + Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info + + Show "seccomp" in docker info (#20909). + +commit 55053d3537100eaeaad9c83b43e31f22d14fde7b +Author: David Calavera +Date: Mon Apr 11 11:52:34 2016 -0700 + + Get events until a time in the past. + + This change allow to filter events that happened in the past + without waiting for future events. Example: + + docker events --since -1h --until -30m + + Signed-off-by: David Calavera + +commit 9718d6c266a767d09cc7521370d5a49c7307d596 +Merge: c4b848fb2a 9576b63077 +Author: Nathan LeClaire +Date: Thu Apr 14 16:10:59 2016 -0700 + + Merge pull request #3312 from nathanleclaire/unbreak_upgrade + + Remove lxc-docker to docker-engine migration code + +commit 3680a717a16b0522452750a76549a013d9072d1d +Author: Nishant Totla +Date: Thu Apr 14 15:57:26 2016 -0700 + + Move container rename and remove to engine-api + + Signed-off-by: Nishant Totla + +commit ea8c690886970b2929d52d8b61dcfb8becc24db9 +Author: Darren Stahl +Date: Fri Mar 4 17:24:09 2016 -0800 + + Add CPU count and maximum resource controls for Windows + + Signed-off-by: Darren Stahl + +commit c4b848fb2ad4fc23023fd4ae1f79130094d28db4 +Merge: 26cbaad949 28fcf3485e +Author: Nathan LeClaire +Date: Thu Apr 14 15:37:07 2016 -0700 + + Merge pull request #3309 from nathanleclaire/changelog_b2drc + + Add note about boot2docker RC getting behavior to changelog + +commit 9576b63077639253ad7d80f1bd3fb4d61d889470 +Author: Nathan LeClaire +Date: Thu Apr 14 15:35:12 2016 -0700 + + Remove lxc-docker to docker-engine migration code + + Signed-off-by: Nathan LeClaire + +commit e1356e1f6f6240a935c37617f787bded136a2049 +Author: Daniel Nephin +Date: Mon Apr 11 13:22:37 2016 -0400 + + Set networking_config when creating a container. + + Signed-off-by: Daniel Nephin + +commit 524f5ca79ca59173288da29509cce34896e1fa4b +Author: Nishant Totla +Date: Thu Apr 14 15:08:39 2016 -0700 + + Moving start container to engine-api + + Signed-off-by: Nishant Totla + +commit 28fcf3485eb7896e58ae372fd5891208e52bbcb7 +Author: Nathan LeClaire +Date: Thu Apr 14 14:23:42 2016 -0700 + + Add note about boot2docker RC getting behavior to changelog + + Signed-off-by: Nathan LeClaire + +commit ddd4aa2bf20b88b68c2a0e6bdadaf648a5ee379b +Author: Victor Vieux +Date: Thu Apr 14 14:19:26 2016 -0700 + + update compose, remove useless bash and improve test + + Signed-off-by: Victor Vieux + +commit d006ef95f0ce2bc1b9d31c4a86b21486346227c8 +Author: Victor Vieux +Date: Thu Apr 14 12:10:19 2016 -0700 + + move dependencies to vendor/ + + Signed-off-by: Victor Vieux + +commit 8011228b53ead375cf7645bf4e7f686324e6e9d6 +Merge: 1a87a21053 5106c51666 +Author: Vincent Demeester +Date: Thu Apr 14 22:06:49 2016 +0200 + + Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpaceleftOnDeviceError + + More logs for `TestDaemonNoSpaceleftOnDeviceError` + +commit abb5ae7fe4e3693b6099e52d43cf39e57c8e3e42 +Author: Daniel Nephin +Date: Fri Apr 8 15:45:03 2016 -0400 + + Only disconnect if we don't already have the short id alias. + + Signed-off-by: Daniel Nephin + +commit 1a87a2105321e378ddfe0636869e4ee796174d3e +Merge: 18c3869831 80d63e2e11 +Author: Sebastiaan van Stijn +Date: Thu Apr 14 21:48:02 2016 +0200 + + Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-gods + + Add example to apparmor docs + +commit 18c386983174e6d0cafe77ed8d37a70d45ba964f +Merge: 9e4b5e06f0 7429a740cd +Author: Tibor Vass +Date: Thu Apr 14 15:29:07 2016 -0400 + + Merge pull request #22040 from thaJeztah/bump-version-to-v1.12.0-dev + + Bump version to v1.12.0-dev + +commit 9e4b5e06f0618a9feca3ab07b1b4a6c6fde05409 +Merge: 6472a6d9e5 d231260868 +Author: David Calavera +Date: Thu Apr 14 12:21:47 2016 -0700 + + Merge pull request #22022 from AkihiroSuda/fixunused + + Clean up unused code + +commit 09deb06382b85de09d3c932da787d6be0df9fe62 +Merge: a764f9ac0a d365b25558 +Author: Nishant Totla +Date: Thu Apr 14 12:03:33 2016 -0700 + + Merge pull request #2123 from vieux/migrate_go_16 + + bump to 1.6.1 + +commit a764f9ac0ae4337cd5a046b00c04b6e19c375a01 +Merge: a6c1f1463c 8d99298648 +Author: Victor Vieux +Date: Thu Apr 14 11:48:51 2016 -0700 + + Merge pull request #1983 from nishanttotla/container-config-engine-api + + Updating ContainerConfig to use engine-api + +commit d365b25558e65593af8da258c9476ee5fb73cfc2 +Author: Victor Vieux +Date: Thu Apr 14 11:41:05 2016 -0700 + + bump to 1.6.1 + + Signed-off-by: Victor Vieux + +commit e8feabc77572a4ddd62ef62cb0c3307af141f9d9 +Author: Richard Scothern +Date: Fri Apr 8 08:55:11 2016 -0700 + + Use Alpine Linux as the parent image for the registry. + + Signed-off-by: Richard Scothern + +commit 2968fa74073856da15a19fce6775862e39d3b644 +Merge: 6a3c5d7cc7 f8cd53cf2f +Author: Ying Li +Date: Thu Apr 14 11:06:05 2016 -0700 + + Merge pull request #648 from cyli/cert-rotation + + Root rotation (previously root cert rotation) + +commit 80d63e2e112c75b1cc492ce52bdc0c61ef3c234c +Author: Jess Frazelle +Date: Thu Apr 7 12:05:16 2016 -0700 + + Add example to apparmor docs + + Signed-off-by: Jess Frazelle + +commit d49544587b9be36fe4725bc1b55a388e285dd313 +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 10:45:49 2016 -0700 + + Include example of version numbers + + Signed-off-by: Riyaz Faizullabhoy + +commit 6472a6d9e56bcbd32642d69bf91d3a2831b09e9c +Merge: 51be6c4f18 355ad33087 +Author: David Calavera +Date: Thu Apr 14 10:42:45 2016 -0700 + + Merge pull request #22047 from ncopa/fix-build-from-tarball + + Fix detection of git commit during build from tarball + +commit 05b0ab0302ad33f61218e2ecf263cd102b368390 +Merge: e90ff92895 098005177f +Author: Richard Scothern +Date: Thu Apr 14 10:39:58 2016 -0700 + + Merge pull request #1630 from hopkings2008/notifytype + + fix typepo for log message of layer push event in blobServiceListener… + +commit 76e265935afc3cf21f4f3e82e505949ca80e06c4 +Author: Riyaz Faizullabhoy +Date: Thu Apr 14 09:32:01 2016 -0700 + + Add note about versioning + + Signed-off-by: Riyaz Faizullabhoy + +commit 8d9929864893a8ac4f4ce903c3f1deed5c9887ea +Author: Nishant Totla +Date: Thu Apr 7 14:17:32 2016 -0700 + + Fix deprecated config for engine < 1.7, image pull waits for end of + response + + Signed-off-by: Nishant Totla + +commit e29ff44cafbfe3815d6d6e6ff4435b8a7d4fe1a3 +Author: Nishant Totla +Date: Wed Apr 6 23:35:59 2016 -0700 + + Fixing integration tests + + Signed-off-by: Nishant Totla + +commit af5ce4bdb0bc4df6689d760ed04d5e35970e79b8 +Author: Nishant Totla +Date: Wed Apr 6 18:01:38 2016 -0700 + + Returning error when Image Pull fails + + Signed-off-by: Nishant Totla + +commit 40456d092646a647489a37e4dc94f3707924c0c6 +Author: Nishant Totla +Date: Wed Apr 6 15:28:47 2016 -0700 + + Updating unit tests + + Signed-off-by: Nishant Totla + +commit f5e578188f2b9a46db36ebf6ca8f82aa820675ae +Author: Nishant Totla +Date: Wed Apr 6 15:11:05 2016 -0700 + + Updating ContainerConfig to embed HostConfig and NetworkingConfig + + Signed-off-by: Nishant Totla + +commit ff0c79e08d6688cfa7a14af121281e19eb0ab042 +Author: Nishant Totla +Date: Fri Apr 1 15:27:18 2016 -0700 + + Fix image pull bug (wait until download finishes) + + Signed-off-by: Nishant Totla + +commit 2363ea80775d0e7e96bd52c4d3e60a814785734f +Author: Nishant Totla +Date: Fri Apr 1 12:09:27 2016 -0700 + + Updating Godeps (distribution/reference) + + Signed-off-by: Nishant Totla + +commit 25241bdd08618220febd47ecdea81ff67221da33 +Author: Nishant Totla +Date: Thu Mar 31 17:42:01 2016 -0700 + + Updating Image Pull to use docker/distribution package + + Signed-off-by: Nishant Totla + +commit 0b752031434e1e15cc31292c4327092f2ecf3ee6 +Author: Nishant Totla +Date: Mon Mar 28 22:47:01 2016 -0700 + + Update container state (from PR samalba/dockerclient#/236) + + Signed-off-by: Nishant Totla + +commit 859c710bdd959d663a1a6e2626155ef89f88d090 +Author: Nishant Totla +Date: Fri Mar 25 14:34:17 2016 -0700 + + Updating scheduler unit tests + + Signed-off-by: Nishant Totla + +commit 6d2937b3ecf7a5bda6e2d00983fa8c5b3dcbe84b +Author: Nishant Totla +Date: Wed Mar 23 11:32:46 2016 -0700 + + Updating cluster unit tests + + Signed-off-by: Nishant Totla + +commit 11df80601c137d79e8b7cd166e0f21db6eb74506 +Author: Nishant Totla +Date: Tue Mar 22 14:48:00 2016 -0700 + + Updating cluster + + Signed-off-by: Nishant Totla + +commit 48cd1ebd69912aa32d505366eb54a259fa0cf1a8 +Author: Nishant Totla +Date: Tue Mar 22 14:02:21 2016 -0700 + + Updating filters + + Signed-off-by: Nishant Totla + +commit 81e1528d0f8edb89aa19f6c1a427f8a8553427b9 +Author: Nishant Totla +Date: Fri Mar 18 10:48:03 2016 -0700 + + Updating API handlers + + Signed-off-by: Nishant Totla + +commit 79575f3df6589839c10f4dd0d099e37890dbc185 +Author: Nishant Totla +Date: Thu Mar 10 14:10:37 2016 -0800 + + Updating ContainerConfig to use engine-api + + Signed-off-by: Nishant Totla + +commit 51be6c4f189643b00e7d49a78278e985b3a93e88 +Merge: d4b5abaf62 6cc2bad7f4 +Author: Brian Goff +Date: Thu Apr 14 12:04:40 2016 -0400 + + Merge pull request #22038 from thaJeztah/cherry-pick-changelog + + Update changelog in master + +commit d4b5abaf6240d27e2417a83508ae1ce3202f1da6 +Merge: 900f06ae3a 8ef76f779d +Author: Vincent Demeester +Date: Thu Apr 14 17:52:08 2016 +0200 + + Merge pull request #22044 from thaJeztah/move-filter-options-to-right-api-version + + Move volume filters to API 1.24 docs + +commit 355ad33087c1c683458b60a6bc9e1f89623ee275 +Author: Natanael Copa +Date: Thu Apr 14 17:29:12 2016 +0200 + + Fix detection of git commit during build from tarball + + Distro packagers will often use the tarball to build a package and have + the build script for the package in git. To avoid that the docker build + script picks up the git commit from the distro repo we also check for a + directory named .git before check for -unsupported builds. + + Signed-off-by: Natanael Copa + +commit 8ef76f779d6ea59cb1a8c6fde52e4d719a8c073a +Author: Sebastiaan van Stijn +Date: Thu Apr 14 17:12:28 2016 +0200 + + Move volume filters to API 1.24 docs + + This feature was added after the 1.11 code-freeze, + so will be part of the 1.12 release. Moving it to the + right API version. + + Signed-off-by: Sebastiaan van Stijn + +commit 900f06ae3a40fedbb6c6493ccb3eea2906838d8b +Merge: cb87b6eb6a 297d6c04a3 +Author: Vincent Demeester +Date: Thu Apr 14 16:00:09 2016 +0200 + + Merge pull request #22039 from senk/remove-cfengine-docs + + Remove docs for cfengine + +commit 7429a740cd9a83613cb6af4d4f2bf7f7538d9584 +Author: Sebastiaan van Stijn +Date: Thu Apr 14 15:22:18 2016 +0200 + + Bump version to v1.12.0-dev + + Signed-off-by: Sebastiaan van Stijn + +commit 297d6c04a31f39ff24fcebad8d82c43e0bcf6900 +Author: Robin Naundorf +Date: Thu Apr 14 15:21:07 2016 +0200 + + closes #11703 closes #11560 + + Signed-off-by: Robin Naundorf + +commit 6cc2bad7f4acd6d0f3be996c38f8d3dbb349421b +Author: Tibor Vass +Date: Wed Apr 13 13:30:34 2016 -0400 + + Fix some CHANGELOG entries + + Signed-off-by: Tibor Vass + (cherry picked from commit 2535db86781f2731024c945ecabd59199de0c727) + Signed-off-by: Sebastiaan van Stijn + +commit 17bce424d6e4356d0102dad55b9a0f7f03a64528 +Author: Santhosh Manohar +Date: Sun Apr 10 05:52:23 2016 -0700 + + Update Networking changelog for 1.11 + + Signed-off-by: Santhosh Manohar + (cherry picked from commit 2153d9ec9d32b882be929a79997c326d516fc44a) + Signed-off-by: Sebastiaan van Stijn + +commit d53e136a2bed649be245ce3a3d59faa344a2a755 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 18:24:37 2016 -0700 + + Minor fixes to changelog + + Some fixes in the changelog were not regressions + since 1.10.x, but only present in 1.11 release candidates + so don't need to be mentioned for the release. + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 99589731ac1e5d901436e6d0d8c03e9eddb5cccc) + Signed-off-by: Sebastiaan van Stijn + +commit bcb7649c3c44eff93ca659a12790b369023a5d97 +Author: Kenfe-Mickael Laventure +Date: Wed Apr 6 16:04:37 2016 -0700 + + Update CHANGELOG.md + + Signed-off-by: Kenfe-Mickael Laventure + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit c774c390b199ef59079cd1dc95260d1672625e50) + Signed-off-by: Sebastiaan van Stijn + +commit b7f9856a3667491e7e054033a8a4cdf9c6abdf7c +Author: Sebastiaan van Stijn +Date: Thu Mar 24 22:24:30 2016 -0700 + + Update CHANGELOG.md + + hardware signing was put back to experimental due to packaging issues + (https://github.com/docker/docker/pull/21499) + + add missing "--quiet" option for docker load + + Signed-off-by: Sebastiaan van Stijn + (cherry picked from commit 32a5308237858cc5b7bcac16cc16286fc7996a9b) + Signed-off-by: Sebastiaan van Stijn + +commit 932e58631426b56939f7bf856c245446c41299eb +Author: John Howard +Date: Wed Mar 23 13:56:31 2016 -0700 + + Verify binaries in changelog + + Signed-off-by: John Howard + (cherry picked from commit 76489af40f40385b3fd9f0a669fdc8cf3640e188) + Signed-off-by: Sebastiaan van Stijn + +commit 9f3f96220d4243bad86e40b2d3f9283ce46bef85 +Author: Kenfe-Mickael Laventure +Date: Tue Mar 22 22:54:01 2016 -0700 + + Add initial changelog for 1.11.0 + + Signed-off-by: Kenfe-Mickael Laventure + (cherry picked from commit e651c1b2b92ccfcf3b075999e2427773a9b3dbdf) + Signed-off-by: Sebastiaan van Stijn + +commit 1aa9369499783b25c64737868bb51fdbf9c84f6d +Author: Thomas Leonard +Date: Thu Apr 14 10:37:42 2016 +0100 + + Build: pass through DOCKER_GITCOMMIT + + This is useful if you want to build Docker when the .git directory is + not present. + + Signed-off-by: Thomas Leonard + +commit e71c62b8d1ce9202b3df6f156528c403e60efafe +Author: Callum Rogers +Date: Thu Apr 14 10:49:10 2016 +0100 + + Readme should use new docker compose format instead of the old one + + Signed-off-by: Callum Rogers + +commit e2cb7b0237085415ce48900309a61c73b5938520 +Merge: aebb3d5d0a 339ebc0483 +Author: Aanand Prasad +Date: Thu Apr 14 10:40:02 2016 +0100 + + Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers + + Only show port clash warning if multiple containers are about to be started + +commit aebb3d5d0acc59084f210e52eea59c0253df6bb0 +Merge: f10bc8072e 50287722f2 +Author: Aanand Prasad +Date: Thu Apr 14 10:22:01 2016 +0100 + + Merge pull request #3320 from dnephin/make_it_dev_again + + Update release notes and set version to 1.8.0dev + +commit 098005177f224e5ae3dd8c6e73e94dcd6dd128f2 +Author: yuzou +Date: Thu Apr 14 16:41:35 2016 +0800 + + fix typepo for log message of layer push event in blobServiceListener Put function. + + Signed-off-by: yuzou + +commit d231260868507174d60ff58b18b14fa5bc2d5b66 +Author: Akihiro Suda +Date: Thu Apr 14 07:04:00 2016 +0000 + + Clean up unused code + + Signed-off-by: Akihiro Suda + +commit cb87b6eb6a955e5a66b17e0a15557f37f76b85c0 +Merge: 7cd420d63a ffad0873c9 +Author: Alexander Morozov +Date: Wed Apr 13 22:50:19 2016 -0700 + + Merge pull request #21879 from WeiZhang555/fix-kill-nonexist + + Fix bug that can't kill an restarting container + +commit 7cd420d63a708c7763bceff231873c4e73b29c31 +Merge: 37f5caf8c5 9e6b1852a7 +Author: Alexander Morozov +Date: Wed Apr 13 22:47:53 2016 -0700 + + Merge pull request #21970 from cpuguy83/use_cached_path_on_ls + + Fix N+1 calling `Path()` on `volume ls` + +commit f8cd53cf2fd49b9eb3a2462fc0053d9c6912b44c +Author: Ying Li +Date: Wed Apr 13 22:25:43 2016 -0700 + + When signing the root, modify and sign a temporary root that gets assigned back into + the repo if signing was successful. This way, we don't mutate the existing root + in a failed attempt to sign it. + + Signed-off-by: Ying Li + +commit cea46f7c3ee40d77cb3fb4f1197251e73eacda54 +Author: Ying Li +Date: Tue Apr 12 10:59:01 2016 -0700 + + Change root cert rotation to be root key rotation instead + + Signed-off-by: Ying Li + +commit 37f5caf8c5d96210c90eb3b22ec7bebb5ce1990d +Merge: 7268eb97bc 4d4ef98326 +Author: Alexander Morozov +Date: Wed Apr 13 22:11:13 2016 -0700 + + Merge pull request #22013 from tonistiigi/fix-go16-panic + + Fix panic on winsize syscall + +commit 708507adde0cc7707bdd94857bd95ba81dc69671 +Author: Ying Li +Date: Tue Apr 12 00:29:17 2016 -0700 + + Require signing with all previous roles, instead of just the immediately previous role + + Signed-off-by: Ying Li + +commit 829d1883dccc8000a6781bc074fd16afe2833841 +Author: David Lawrence +Date: Wed Apr 13 17:55:50 2016 -0700 + + add pkcs11 build tag to deb and rpm builds + Signed-off-by: David Lawrence (github: endophage) + +commit 07999480d98c48de0a4163f2f1f4d63df98075bf +Author: Joao Fernandes +Date: Wed Apr 13 17:13:18 2016 -0700 + + Moves CS Engine docs to its own menu entry + +commit 4d4ef98326f0b21bbb661321499e200a1412bc64 +Author: Tonis Tiigi +Date: Wed Apr 13 17:08:00 2016 -0700 + + Fix panic on winsize syscall + + Signed-off-by: Tonis Tiigi + +commit 26cbaad9495a236a081bb42fa0b45667cb3ff464 +Merge: 4f7fed8263 6c47f4d8e2 +Author: Nathan LeClaire +Date: Wed Apr 13 14:50:15 2016 -0700 + + Merge pull request #3278 from ezarko/1361 + + Oracle Enterprise Linux provisioner + +commit 4f7fed8263636186428db0eb79aac0323e905dae +Merge: a650a404fc a18eb89f79 +Author: Nathan LeClaire +Date: Wed Apr 13 13:58:44 2016 -0700 + + Merge pull request #3302 from nathanleclaire/update_changelog + + Revise changelog for 0.7.0 + +commit ff08036cc0d1b393106570a8c141e909d894f7d3 +Author: Brian Goff +Date: Tue Mar 1 17:10:13 2016 -0500 + + Do not remove containers from stats list on err + + Before this patch, containers are silently removed from the stats list + on error. This patch instead will display `--` for all fields for the + container that had the error, allowing it to recover from errors. + + Signed-off-by: Brian Goff + +commit ada3a9aa076125c4cfcd6f8c70b64a17b4f46fba +Author: Joao Fernandes +Date: Thu Apr 7 13:27:04 2016 -0700 + + [WIP] Adds docs for DTR 2.0, docs spring cleaning + + [*] Restructures the docs to make it easier to find information + [*] Removes information that was spread all over the place + [*] Removes information about cloud installations + [*] Adds docs about system requirements, architecture + [*] Adds docs about HA, backup, restore + [ ] Install + [ ] Upgrade + [ ] Troubleshoot + [ ] CLI, API reference + +commit 190f71d61ff1e85c36a613e6d609411933e35df9 +Author: Nathan LeClaire +Date: Wed Apr 13 13:24:54 2016 -0700 + + Bump Toolbox versions for 1.11.0 release + + Signed-off-by: Nathan LeClaire + +commit a18eb89f795a3a7f196770a04c782fa1fc10943d +Author: Nathan LeClaire +Date: Wed Apr 13 11:56:53 2016 -0700 + + Revise changelog for 0.7.0 + + Signed-off-by: Nathan LeClaire + +commit 54d1cb18556a660b803fc5038b64d76dbe1e541e +Author: Ying Li +Date: Fri Apr 8 15:03:12 2016 -0700 + + Revert "Implement new (notary cert rotate) command." + + This reverts commit 684c17867740e77460f2940d3d76023f7a9647ed, and extra cert rotate test changes + + Signed-off-by: Ying Li + +commit 160ea2bc54b2f7ca0a2944c4bf1f36305a997393 +Author: Ying Li +Date: Thu Mar 24 11:20:12 2016 -0700 + + Address review comments and improve docstrings + + Signed-off-by: Ying Li + +commit 6dfeca463f9d8b4831055c99fac763804d71f11d +Author: Ying Li +Date: Thu Mar 24 00:45:20 2016 -0700 + + Add another test for finding old root roles in the root.json + + Signed-off-by: Ying Li + +commit 7bc485faae67a223bf2c6c8c11cfcf9a2fc7febe +Author: Ying Li +Date: Wed Mar 23 18:02:08 2016 -0700 + + Change root signing such that when root keys change, the role is stored as a + versioned root role in the root.json. That way we can figure out which keys were + previously root keys. + + Update tuf.Repo.sign to take a list of required roles (at most two, for root + rotations, because only the immediate root after a rotation absolutely needs + to correctly validate against the previous root role and the new root role) + instead of just a single role. + + tuf.Repo.sign now ensures that the number of signatures on the metadata satisfy + role requirements for every required role. Then it tries to sign with + whatever optional keys it can, ignoring errors and not requiring that any + particular number of signatures were produced with the optional keys. + + Signed-off-by: Ying Li + +commit 8447e0e1da10c339c53ca3e08e0b2ccbdca2ffe5 +Author: Ying Li +Date: Wed Mar 23 14:27:22 2016 -0700 + + Move the optional signing key logic from tuf/signed to tuf.Repo.sign + + Signed-off-by: Ying Li + +commit 8be82b31f0d62c4c07fae85b21089906afad0912 +Author: Ying Li +Date: Tue Mar 22 17:07:14 2016 -0700 + + Revert "Modify signed.Sign to replace, not add, signatures." + + This reverts commit aca1cf6d43ce9aa423a9de21ac5bcdca35cbe811, and modifies a test to expect 2 signatures. + + Signed-off-by: Ying Li + +commit 5a14044574460267fd7a75cc8e3c2bb025829552 +Author: Miloslav Trmač +Date: Mon Feb 1 03:10:41 2016 +0100 + + Implement new (notary cert rotate) command. + + This is a trivial wrapper around the NotaryRepository functionality. The + UI is simplest possible, a single (notary cert rotate) rotates all + certificates. + + This handles the common case (only a single certificate) + perfectly + + If there were multiple certificates, rotating all of them + regardless of age does not really hurt; we can easily extend this to + give the user more control (having the user specify a cert ID, for + example) later if necessary. + + Signed-off-by: Miloslav Trmač + +commit d835fbbca2739723ebfc6d814bc795801c85b43a +Author: Miloslav Trmač +Date: Mon Feb 1 03:07:38 2016 +0100 + + Implement root certificate rotation in NotaryRepository + + NotaryRepository can now list root certificates, and + generate new versions (as changelists to be applied + on Publish). + + This is a pretty mechanical encapsulation of the + root certificate rotation support in Repo.AddBaseKeys + and Repo.RemoveBaseKeys. The only slightly interesting + part is ListRootCert, which requires on-line access + to ensure fresh data, and depends on CertStore doing + some verification for us. + + Signed-off-by: Miloslav Trmač + +commit 34aa149cbc26b83d84c19adb5108559824ff88b8 +Author: Miloslav Trmač +Date: Tue Nov 10 16:41:28 2015 +0100 + + Implement root certificate rotation in tuf.Repo + + Repo.RotateBaseKeys() can now be used to replace the root keypair + (i.e. primarily the expiring certificate), and Repo.SignRoot will make + signatures using the old keypairs if they are available (but not fail if + they are not; only the keypairs listed in the role as trusted are + mandatory). + + To do this, we need to keep even the old, possibly currently untrusted, + keypairs around (to allow rollover from clients which trust these old + keys): + + The private keys are simply not deleted from the repo's CryptoService; + this means no change for the current setup with a long-term private key + and periodically expiring certificates, but a true rotation of the + private key will eventually require explicit management of the preserved + long-term private keys (if we are keeping several of them around, but + most are either obsolete and non-preferred or possibly even known to be + compromised, we will want to make sure that we always use the + new/preferred private key for new certificate generation). + + The public keys are tricker: + + 1) We need to keep a list of them; the private keys can be looked up + by their IDs, and that allows extracting the public part as well, + but we need a list of the key IDs. We can't just keep the key IDs + included in the role's list of authorized keys, that would make it + impossible to rotate away from a suspect or known compromsied key. + + 2) With the X.509 certificate “public keys”, key ID is not actually + sufficient to retrieve the full public key even if we have access to the + private key; we actually need to store the full public key == + certificate somewhere. And preferably without having tuf.Repo depend on + a certs.Manager, designed to deal with concepts of trust at a higher + level than TUF cares about. Actually, to the extent certs.Manager's + purpose is to manage and verify trust, storing old, possibly suspect or + known compromised certificates would be explicitly contrary to its + mission. + + So, this patch keeps around full copies of the certificates in the + root.json “keys” map (not the “roles” map of trusted keys). It means + sending to clients a little data which they don't need but it is + otherwise harmless; and keeping the certificates within the + structured and managed tuf.data.Root format could allow us to build nice + UI (e.g. show me all certificates we still carry and keep signing with, let + me drop two of them now that our company has changed a name and does not + want to advertise the history) if we ever needed to something like this + + Signed-off-by: Ying Li + +commit 816c1c980c9961a905b2ae0d25cb2ad72a61b8dc +Author: Miloslav Trmač +Date: Tue Dec 1 13:21:55 2015 +0100 + + Modify signed.Sign to replace, not add, signatures. + + The only thing depending on signed.Sign keeping old signatures was two + tests; all real users were modifying the signed data without clearing + the old signatures, and therefore implicitly relying on signing with + the keys which were used for the old signatures as well. + + This broke signing an updated root with a new certificate when the old + certificate was no longer available. + + It could have been fixed by keeping signed.Sign as is and adding the + clearing to all users, but noting actually needs the appending + semantics, the appending semantics is surprising, and switching to + replacing signatures is less code. + + Signed-off-by: Miloslav Trmač + +commit 925e956fca7fbd16fa22280f0ed252037b850c50 +Author: Miloslav Trmač +Date: Sat Nov 21 07:02:42 2015 +0100 + + Pass through any errors from signed.Sign + + Instead of silently ignoring any signing errors, and failing with a + generic ErrInsufficientSignatures, just pass through any signing errors. + + As long as the role's threshold is met, some primary keys may be + missing. But if any key does exist (whether primary or optional), failures + using that key are fatal. (This is why signed.Sign needs to know the + role's threshold; making any missing key fatal would break signatures + of roles with 2 valid keys and threshold of 1.) + + As a side effect, this improves the “snapshot key is not available” + detection in NotaryRepository.Publish, to trigger only when a key is not + available, not also when it should be available but using it is failing. + + Similarly, the ErrInsufficientSignatures error now mentions only the + missing keys, not the successfully used keys now that present but + failing keys are handled by using other error types. + + (This removes the second ErrInsufficientSignatures check because it is + no longer necessary, which also fixes the fact that it was broken by + introducing optional keys. The first, now only, ErrInsufficientSignatures + check does correctly distinguish between primary and optional keys.) + + Signed-off-by: Miloslav Trmač + +commit aa596338a6320f3ea71771c0ba00c54fd1f09060 +Author: Miloslav Trmač +Date: Sat Nov 21 07:06:06 2015 +0100 + + Add an optionalKeys parameter to signed.Sign + + Ordinarily we don't want to continue operating on signed data if the + role's threshold of signatures cannot be me and the signature is unsuable. + + OTOH we want to keep signing root.json with all older keys if they are + available (to allow migration), but in that case a missing key is not a + fatal error. + + So, split the keys passed to signed.Sign into primary and optional, + treating all current uses as primary and enforcing the role's threshold + only on primary keys. Also update the single existing test which uses + a missing/unusable key to use the optionalKeys parameter. + + Note that only the _presence_ of optionalKeys is optional; if an + optional key exists but signing using it fails, the function will fail. + + This temporarily breaks the second ErrInsufficientSignatures check + (optional keys count against the role threshold), but that will be fixed + soon. + + Signed-off-by: Miloslav Trmač + +commit f23f2093e39302a76d1812a74cd98bf3419f03b0 +Author: Miloslav Trmač +Date: Mon Jan 18 20:25:29 2016 +0100 + + Create enough signatures as role's threshold requires + + Tell signed.Sign how many signatures are necessary to sign a role, and + have it fail if it cannot create that many. + + For most uses this does not make much of a difference because the + threshold tends to be 1 and signed.Sign was already failing if no key + could be found or if no signature could be created; only >1-threshold + roles now (correctly) fail in additional situations. But the knowledge + of a role’s threshold will be useful in a future commit. + + Always use ErrInsufficientSignatures for this failure, whether this is + when loading the keys or actually using them (also fixing + ErrInsufficentSignature documentation to refer to signing and not + verification). ErrNoKeys is no longer returned by signed.Sign. + + So, adjust the “snapshot key is not available” logic in + NotaryRepository.Publish accordingly, which also makes it more precise + (actually triggering only when no snapshot key is available). + + Now that role's threshold is enforced when signing, update + TestValidateRootInvalidTimestampThreshold to create the second key + necessary to correctly sign the timestamp role. + + Signed-off-by: Miloslav Trmač + +commit a5da680e907d1d86d03e38709cf76a3fbd094e48 +Author: Miloslav Trmač +Date: Tue Nov 10 16:40:42 2015 +0100 + + Modify signed.Sign to use a slice instead of varargs + + This is a refactoring with no behavior change, but it will allow adding + more parameters to the function in the future. + + Signed-off-by: Miloslav Trmač + +commit a650a404fc3e006fea17b12615266168db79c776 +Author: Nathan LeClaire +Date: Wed Apr 13 11:39:36 2016 -0700 + + Bump version to 0.7.0 + + Signed-off-by: Nathan LeClaire + +commit 6b0b02fa83c0409f85b4597d1574011ca6de477f +Merge: 285b7e5165 4de87fd7fa +Author: Nathan LeClaire +Date: Wed Apr 13 11:30:15 2016 -0700 + + Merge pull request #3301 from nathanleclaire/bump_go_1.6.1 + + Bump to Golang 1.6.1 + +commit 7268eb97bc208f4cdf7c9119da0cfa2c9ed558a4 +Author: Tibor Vass +Date: Wed Apr 13 14:22:48 2016 -0400 + + Bump Go version to 1.5.4/1.6.1 (security fix) (#21978) + + Go 1.6.1 is for ppc64le only. + + https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ + + Dockerfile.armhf cannot currently be updated. + + Signed-off-by: Tibor Vass + +commit 38bce4a66532f5de3185a5cf820206a0337107bb +Author: French Ben +Date: Wed Apr 13 11:19:35 2016 -0700 + + Bumped version + + Signed-off-by: French Ben + +commit 4de87fd7fac7b360362603d83c2fdde6d9386ccb +Author: Nathan LeClaire +Date: Wed Apr 13 11:12:57 2016 -0700 + + Bump to Golang 1.6.1 + + Signed-off-by: Nathan LeClaire + +commit d954097c0b9e48010f980217167af6b40cf97e58 +Merge: 73ac6d199c d691b4af18 +Author: Brian Goff +Date: Wed Apr 13 13:28:59 2016 -0400 + + Merge pull request #21953 from Microsoft/jjh/containerapipostcontainerstop + + Windows: Fix deamon deadlock in docker stop + +commit 50287722f2dd9df322122395e76e7778e185cdec +Author: Daniel Nephin +Date: Wed Apr 13 12:57:22 2016 -0400 + + Update release notes and set version to 1.8.0dev + + Signed-off-by: Daniel Nephin + +commit 73ac6d199cacbcdba4c062f982b31f8d57e03f3c +Author: Tõnis Tiigi +Date: Wed Apr 13 10:21:00 2016 -0700 + + Move build endpoint handler from daemon (#21972) + + Signed-off-by: Tonis Tiigi + +commit e8da6cb631e2d3b8fc67a6aa3db7cdd83b68ac66 +Merge: 9eb1204958 0d7bf73446 +Author: Daniel Nephin +Date: Wed Apr 13 13:20:02 2016 -0400 + + Merge pull request #3319 from docker/bump-1.7.0 + + WIP: Bump 1.7.0 + +commit 6f8878872f8782d4300faeb80413c8c60f56cff1 +Author: John Starks +Date: Wed Apr 13 10:15:38 2016 -0700 + + Windows: Fix Hyper-V container ACLs for TP5 (#21974) + + In TP5, Hyper-V containers need all image files ACLed so that the virtual + machine process can access them. This was fixed post-TP5 in Windows, but + for TP5 we need to explicitly add these ACLs. + + Signed-off-by: John Starks + +commit 6a3c5d7cc73a1717b3f085e93dd2cc3d5a65ee5c +Merge: 812acce15f ef6dac2bfe +Author: Riyaz Faizullabhoy +Date: Wed Apr 13 10:12:43 2016 -0700 + + Merge pull request #680 from HuKeping/comments + + Update some comments + +commit 44fe649c2ed6c1c6ba201086c1f83ec993ce9064 +Author: Thomas Gazagnaire +Date: Wed Apr 13 18:11:39 2016 +0100 + + Graphdriver docs (#22003) + + * Fix closing strings in graphdriver plugin documentation + + Signed-off-by: Thomas Gazagnaire + + * Fix documenation for Err type in graphdriver plugins + + Fix https://github.com/docker/go-plugins-helpers/issues/24 + + Signed-off-by: Thomas Gazagnaire + + * Add missing MountLabel argument in graphdriver plugin documentation + + The real `Create` seems also to take more arguments (the `storageOpt`) which + are not exposed to the plugin API (yet?). + + Signed-off-by: Thomas Gazagnaire + + * Add missing CreateReadWrite in graphdriver plugin documentation + + Signed-off-by: Thomas Gazagnaire + +commit a6c1f1463c1b39786cfdd5700b820f0c42034942 +Merge: 612f397a3c b82aa273d9 +Author: Victor Vieux +Date: Wed Apr 13 09:59:32 2016 -0700 + + Merge pull request #2118 from vieux/update_changelog + + update CHANGELOG.md + +commit 612f397a3c9bc26e194d7277a5d5a52841b89851 +Merge: 58f60ddb09 70a180cb30 +Author: Dongluo Chen +Date: Wed Apr 13 09:56:09 2016 -0700 + + Merge pull request #2078 from moxiegirl/fix-swarm-scale-doc + + Swarm at scale with local docker vms + +commit e90ff92895eaa7ea693275c8f348357ed66b8473 +Merge: c6f63e298e 6bce49d51d +Author: Richard Scothern +Date: Wed Apr 13 09:46:43 2016 -0700 + + Merge pull request #1625 from moxiegirl/fix-1598 + + Updated per conversation with Richard + +commit 70a180cb30ea4593b8f69d14c544cf278bf54ddd +Author: Mary Anthony +Date: Tue Mar 15 11:56:48 2016 -0700 + + Redoing the example for local machines + Updating images + Adding in the Compose solution + Copy edits + Updating with Dong's comments + + Signed-off-by: Mary Anthony + +commit db05a00ba13eff9a4930844d35129c5470ae518c +Merge: 393c93d688 1a03a83d00 +Author: French Ben +Date: Wed Apr 13 09:36:47 2016 -0700 + + Merge pull request #1625 from docker/better-errors + + Improved errors and native logic + +commit 988508a2b5aa18c04fd3db143b4e4f5f207ea15e +Merge: 9333042ba1 9caf7aeefd +Author: Vincent Demeester +Date: Wed Apr 13 18:36:30 2016 +0200 + + Merge pull request #19265 from rhatdan/netsysctl + + Add support for setting sysctls + +commit 58f60ddb0977c6f820e5a5d58e8c7886d6b6a0bd +Merge: 2bbea5d1a4 ce1dffa58a +Author: Nishant Totla +Date: Wed Apr 13 09:13:18 2016 -0700 + + Merge pull request #2117 from kencochrane/more_typo_fixes + + Fixed some typos in the docs + +commit bcb7989fca4b65cae10f3d553b4a3cf633b4477d +Author: Nikita +Date: Wed Apr 13 19:37:45 2016 +0400 + + test + + Signed-off-by: Nikita Tarasov + +commit e6f8d7c28e672168b47dc19128f6e37680e7e345 +Author: Nikita +Date: Wed Apr 13 19:32:10 2016 +0400 + + Update swift.go + + Signed-off-by: Nikita Tarasov + +commit 0d7bf73446cd597e263f23b85c9fd1ea352735a6 +Author: Daniel Nephin +Date: Wed Apr 13 11:37:49 2016 -0400 + + Bump 1.7.0 + + Signed-off-by: Daniel Nephin + +commit 9333042ba140680e5693a89338a4619e16538d61 +Merge: 78729487cd c3fe4226f3 +Author: Alexander Morozov +Date: Wed Apr 13 08:24:20 2016 -0700 + + Merge pull request #21942 from tiborvass/fix-21808 + + vendor runc to fix issue#21808 + +commit 78729487cd0967459ca0e30db0785b0c6d33cc92 +Merge: 1687f77db2 783ebebff4 +Author: Sebastiaan van Stijn +Date: Wed Apr 13 17:19:16 2016 +0200 + + Merge pull request #21963 from moxiegirl/21701-issue-fix + + Update for device mapper configuration + +commit 783ebebff40ebdae27dc72b4c8c5151a01220a87 +Author: Mary Anthony +Date: Tue Apr 12 12:20:03 2016 -0700 + + Fixes #21701 devicemapper docs + Copy edit the content + Updates to existing material + Adding mbentley's comments + Updating with last minute comments + Update with Seb's comments + + Signed-off-by: Mary Anthony + +commit ef6dac2bfe9dea0f454239e2090d1cf3e91ee869 +Author: HuKeping +Date: Wed Apr 13 22:00:36 2016 +0800 + + Update code comments + + Change to a more readable format. + + Signed-off-by: Hu Keping + +commit ce1dffa58aaa881db0f5b41ee5032f259acaa303 +Author: Ken Cochrane +Date: Wed Apr 13 09:44:32 2016 -0400 + + Fixed more typos in the docs + + Signed-off-by: Ken Cochrane + +commit 6bce49d51d7381b74262e9d87a948e088c2c225a +Author: Mary Anthony +Date: Tue Apr 12 16:14:33 2016 -0700 + + Updated per conversation with Richard + Removing draft + Richard's comments and some fixes + + Signed-off-by: Mary Anthony + +commit 1687f77db2892a3221cbafd46dc11e07ddcec438 +Merge: edfe4e9fba f5336c7370 +Author: Tibor Vass +Date: Wed Apr 13 09:26:52 2016 -0400 + + Merge pull request #21994 from thaJeztah/update-binary-installation + + docs: update installation from binaries for 1.11 + +commit f5336c737086a4c1807bb2b6ab57116b5ed9d769 +Author: Sebastiaan van Stijn +Date: Wed Apr 13 14:01:25 2016 +0200 + + docs: update installation from binaries for 1.11 + + Binaries are now distributed as a '.tgz' or '.zip' + archive, and contain multiple binaries for Linux. + + This updates the instructions for 1.11. + + Also mention that the Windows 64-bit binary + actually can be used as a daemon. Given that + this is still in beta, no instructions were + added for *running* a daemon on Windows. + + Signed-off-by: Sebastiaan van Stijn + +commit fd0b628e7088c3b241ce18169d6df994e87a0918 +Author: HuKeping +Date: Wed Apr 13 21:06:48 2016 +0800 + + Update some comments + + If we update the maximum value for "infinite" in the future, it is possible + that we forget to update this comments and thus leads misunderstanding. + + Signed-off-by: Hu Keping + +commit edfe4e9fba89d0b8458e7e76132da2440c29ccbd +Merge: f5d3f528fd 82f5ef2d25 +Author: Vincent Demeester +Date: Wed Apr 13 15:23:14 2016 +0200 + + Merge pull request #21885 from triccardi-systran/20612-improve-build-cache-miss-documentation + + Improve build cache miss doc for `ARG` and `RUN` + +commit 82f5ef2d2562f9e742eb694dc4b0a1f768a4f0de +Author: Thomas Riccardi +Date: Fri Apr 8 11:23:48 2016 +0200 + + Improve build cache miss doc for `ARG` and `RUN` + + The documentation already says the cache miss happens only at `ARG` + variable usage, not declaration, but there is a very common implicit + usage: `RUN`, which this commit documents even more, improving on #21790. + + Also, use `definition` instead of `declaration`: it's the same thing, and + `definition` is already used in this documentation, contrary to + `declaration`. + + Also, distinguish between "instructions" and "variables defined by `ARG` + instructions". + + Signed-off-by: Thomas Riccardi + +commit f5d3f528fd2edeb4acf857960698262777f410c5 +Merge: 348d902768 30859c3456 +Author: Vincent Demeester +Date: Wed Apr 13 12:56:40 2016 +0200 + + Merge pull request #21965 from aboch/doc + + Update /containers/create remote API docs + +commit d2e375e31dd723a7ab3a442cb729e467fc21141e +Author: Morgan Bauer +Date: Wed Apr 13 10:24:47 2016 +0100 + + volume rm integration test needs wait to avoid race + + - additional comments in test + + Signed-off-by: Morgan Bauer + +commit 812acce15f44b16338a82d47601c3db8b737e0cd +Merge: d01d666771 39d312dac6 +Author: Ying Li +Date: Tue Apr 12 22:54:41 2016 -0700 + + Merge pull request #678 from cyli/lint-fix + + fix "make lint" to lint every file + +commit b82aa273d99b9db3689a72f7380d6f9cd376699d +Author: Victor Vieux +Date: Tue Apr 12 22:30:05 2016 -0700 + + update CHANGELOG.md + + Signed-off-by: Victor Vieux + +commit 39d312dac6ebdb67bdb67406b879624d8f5296d2 +Author: Ying Li +Date: Tue Apr 12 21:46:03 2016 -0700 + + While we're at cleanups, change "name" in keydbstore to be keyID to more + accurately reflect what the name of the key is. + + Signed-off-by: Ying Li + +commit cf4e72651444f08fe71700079950dfabdba1c40a +Author: Ying Li +Date: Tue Apr 12 16:03:56 2016 -0700 + + "make lint" wasn't actually linting every file in the repo. golint ./... + ignores buildtags, for instance, and somehow didn't pick up some code in + the signer. + + This calls golint on every go file in the repo and also fixes some linting + issues, which involves renaming two yubikey functions to avoid stuttering. + + Signed-off-by: Ying Li + +commit 2bbea5d1a42d9fa30fbe713cf8211d5f70c1231b +Merge: a213794b55 03f7a1167d +Author: Victor Vieux +Date: Tue Apr 12 22:23:49 2016 -0700 + + Merge pull request #2115 from vieux/update_to_1.5.4 + + update to go 1.5.4 + +commit a213794b55a3f7eb164e88dcc37f6ba8eded45b1 +Merge: 767c182562 418118057d +Author: Victor Vieux +Date: Tue Apr 12 21:59:32 2016 -0700 + + Merge pull request #2114 from vieux/GOOS_dockerfile + + Add GOOS buildarg in dockerfile + +commit d01d66677180f9ff17585b826d1badb0900aecb1 +Merge: a301086be0 222d76834b +Author: David Lawrence +Date: Tue Apr 12 21:57:01 2016 -0700 + + Merge pull request #656 from docker/build-run-integration-test + + Build run integration test + +commit a301086be073b1b769751763d43c23cedd06a149 +Merge: 18fa8a2fc6 20711a4128 +Author: David Lawrence +Date: Tue Apr 12 21:51:46 2016 -0700 + + Merge pull request #676 from docker/make-integration-fix + + Write to file to signal success for make integration + +commit 348d90276802aac6c76126f2fe6866c521190ecd +Merge: 40502e3813 96d7db665b +Author: Tibor Vass +Date: Wed Apr 13 00:31:27 2016 -0400 + + Merge pull request #21959 from coolljt0725/fix_21957 + + Fix docker load progressbar, fixes #21957 + +commit 18fa8a2fc68606cd9bbe120fc661f603690c4f86 +Merge: 9303df90d5 dcc41be3e1 +Author: David Lawrence +Date: Tue Apr 12 20:56:15 2016 -0700 + + Merge pull request #677 from cyli/mtrmac-cleanups + + @mtrmac's cleanups, split from root/cert rotation feature + +commit 03f7a1167d7ca5d14924be852c9640b642ab8163 +Author: Victor Vieux +Date: Tue Apr 12 20:08:36 2016 -0700 + + update to 1.5.4 + + Signed-off-by: Victor Vieux + +commit 96d7db665b06cc0bbede22d818c69dc5f6921f66 +Author: Lei Jitang +Date: Tue Apr 12 22:45:42 2016 -0400 + + Fix docker load progressbar, fixes #21957 + + Signed-off-by: Lei Jitang + +commit 393c93d688c46d7b95e3f56c636712bcc1096679 +Merge: c1c1922efc ba548056ab +Author: French Ben +Date: Tue Apr 12 18:28:27 2016 -0700 + + Merge pull request #1407 from docker/1174-refresh + + Added view menu refresh option - Fixes #1174 :8ball: + +commit ba548056ab89aab53a62e6871e83a429591d89f3 +Merge: 004973b5fa c1c1922efc +Author: French Ben +Date: Tue Apr 12 18:24:55 2016 -0700 + + Merged with master + +commit 40502e381371763ea0942b7d6511f5c98b65bc1e +Merge: fa4fea3233 c18d03a778 +Author: Brian Goff +Date: Tue Apr 12 21:23:22 2016 -0400 + + Merge pull request #21949 from aaronlehmann/vendor-distribution-1622 + + Vendor distribution to correct config blob media type in schema2 manifest + +commit d691b4af18ffbab68fb1aab3939e65b59c3e4c2a +Author: John Howard +Date: Mon Apr 11 20:48:00 2016 -0700 + + Windows: Timeout TestContainerApiPostContainerStop + + Signed-off-by: John Howard + +commit c1c1922efc3ae29aff468047d0366f8f5d2c52a2 +Merge: 70d3650dcf db5d9e015e +Author: French Ben +Date: Tue Apr 12 18:20:28 2016 -0700 + + Merge pull request #882 from FrenchBen/local-images + + Local images support! + +commit db5d9e015eb67c0ac8dda36f23b263933d7bcd13 +Author: French Ben +Date: Fri Feb 5 15:29:38 2016 -0800 + + Merged master and updated logic for local images + + Signed-off-by: French Ben + +commit 20711a412806a8ba355f89a6001bbd25d6341259 +Author: Riyaz Faizullabhoy +Date: Tue Apr 12 18:09:55 2016 -0700 + + Pipe build output to dev null + + Signed-off-by: Riyaz Faizullabhoy + +commit 76980a6e5baa546eb2528189b10edee533cef465 +Author: FrenchBen +Date: Fri Jul 17 19:06:15 2015 -0400 + + Added support for creating containers from local images + + Signed-off-by: FrenchBen + +commit 70d3650dcfb33ee6d3a8119d8015e49427bb962b +Merge: 956d9baed6 d0e490dd6e +Author: French Ben +Date: Tue Apr 12 17:59:11 2016 -0700 + + Merge pull request #1623 from docker/close-listener + + Added closing of event listener + +commit d0e490dd6e320192c9cd2f5b4c7e1a607f03bc3c +Author: French Ben +Date: Mon Apr 11 16:08:13 2016 -0700 + + Added closing of event listener + + Signed-off-by: French Ben + +commit 1a03a83d00234395ed12b5c4d36b7c5fc4f9c7ea +Author: French Ben +Date: Tue Apr 12 17:41:05 2016 -0700 + + Improved errors and native logic + + Signed-off-by: French Ben + +commit fa4fea32330c11b337873698c4a79244aabef4d2 +Merge: f3dcc1c462 2d03c54388 +Author: Aaron Lehmann +Date: Tue Apr 12 17:40:16 2016 -0700 + + Merge pull request #21337 from yongtang/21247-TestRunAttachFailedNoLeak + + Flaky test: TestRunAttachFailedNoLeak (#21247) + +commit 9e6b1852a78eda6ed2cb255d6be8a0d0e5a5ca40 +Author: Brian Goff +Date: Tue Apr 12 17:09:55 2016 -0400 + + Fix N+1 calling `Path()` on `volume ls` + + Implements a `CachedPath` function on the volume plugin adapter that we + call from the volume list function instead of `Path. + If a driver does not implement `CachedPath` it will just call `Path`. + + Also makes sure we store the path on Mount and remove the path on + Unmount. + + Signed-off-by: Brian Goff + +commit 285b7e51655d41fb5d111cbef14bce9ff24f6c3d +Merge: 7b62127404 be8f469a82 +Author: Nathan LeClaire +Date: Tue Apr 12 17:24:38 2016 -0700 + + Merge pull request #3296 from mmalchuk/master + + Correct error handling for external SSH client + +commit 418118057d679d743b2ea2172029ceedeea85da5 +Author: Victor Vieux +Date: Tue Apr 12 17:14:22 2016 -0700 + + Add GOOS buildarg in dockerfile + + Signed-off-by: Victor Vieux + +commit dcc41be3e17b0fe0c357d8259f7b9db3bd4f98c4 +Author: Ying Li +Date: Thu Mar 24 11:20:12 2016 -0700 + + Rename cert function, and also check if newCertMap is empty. + Also do not check for CKR_FUNCTION_FAILED for error translation + + Signed-off-by: Ying Li + +commit 23a1cf3c60d4d4069d34e145989eaa996f519a7f +Author: Riyaz Faizullabhoy +Date: Tue Apr 12 15:15:46 2016 -0700 + + Make file accessible to CI + + Signed-off-by: Riyaz Faizullabhoy + +commit cb080ede060e771ec98ca30dfd12397703c481dd +Author: Riyaz Faizullabhoy +Date: Tue Apr 12 10:00:25 2016 -0700 + + Fix test_output path and remove + + Signed-off-by: Riyaz Faizullabhoy + +commit 4216a37149eb9bd7eae1fb48eed099aad2c1bc47 +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 17:58:50 2016 -0700 + + Write to file to signal success for make integration + + Signed-off-by: Riyaz Faizullabhoy + +commit f3dcc1c46249ffc4a73ab2005d1ad011dff3c7df +Merge: 9438572fc0 acaef7caaf +Author: Alexander Morozov +Date: Tue Apr 12 15:07:51 2016 -0700 + + Merge pull request #21962 from Microsoft/jjh/logssincefuturefollow + + Windows: Disable flakey LogsSinceFutureFollow + +commit 767c182562f0e80415a8730be769954e0abb68f4 +Merge: 4ff0b10435 08cacffd97 +Author: Nishant Totla +Date: Tue Apr 12 14:42:01 2016 -0700 + + Merge pull request #2113 from kencochrane/doc_typo_fix + + Fixed a couple typos in the docs + +commit 4a271d4b3e11c057681225a2867ef538fd321d97 +Author: Miloslav Trmač +Date: Mon Feb 1 02:01:36 2016 +0100 + + Log certificate IDs during root verification + + "found 1 certificate" does not say which certificates are involved; log + their IDs. + + Signed-off-by: Miloslav Trmač + +commit bcc97ed2212281b20d94d388303575fbb1ffb5ae +Author: Miloslav Trmač +Date: Mon Jan 11 18:59:15 2016 +0100 + + Fill the KeyID member of ErrKeyNotFound in KeyDBStore + + (Not necessary for the rest of this PR, just a related cleanup.) + + Signed-off-by: Miloslav Trmač + +commit 229d64e0e05318e1c761c7d932d5ededf49d5f15 +Author: Miloslav Trmač +Date: Mon Jan 11 19:12:09 2016 +0100 + + Use ErrKeyNotFound in KeyStore.GetKey + + 3 out of 4 KeyStore implementations have already been returning this + type or a pointer to it; document this as a requirement, and modify + implementations to comply. + + Signed-off-by: Miloslav Trmač + +commit 12879622ac9bdf2077a07fab80b19981f95c690f +Author: Miloslav Trmač +Date: Tue Jan 26 21:12:22 2016 +0100 + + Clean up tuf/signed/sign_test.go + + - Remove Sign, no longer needed for CryptoService implementations + - Remove unused testKeyID1 + - Drop the intermediate MockCryptoService with no users; rename + StrictMockCryptoService to MockCryptoService + - Actually be strict in the new MockCryptoService, and fix key ID + use + - Clearly document what FailingCryptoService and MockCryptoService + are supposed to do + + Signed-off-by: Miloslav Trmač + +commit 01da4b1a111486b65e57daa9100a468dab515e08 +Author: Miloslav Trmač +Date: Fri Nov 6 23:45:28 2015 +0100 + + Drop an unexpected corner case in certificate rotation + + keystoremanager.certsToRemove unexpectedly returns an empty map of old + certificates when there are no new ones. While there is nothing really + great to do in that case (we don't want rotation to make a repo + completely unusable), this already can not happen so just fail instead + of having this weird case. + + Signed-off-by: Miloslav Trmač + +commit 28d1f487cf7a1a8d2e58966fa5f83e5a46f8ffe2 +Author: Miloslav Trmač +Date: Fri Nov 6 23:36:40 2015 +0100 + + Use more descriptive variable names in keystoremanager.ValidateRoot + + allValidCerts implies validity, and certsFromCN is neutral, when the + roles are at least reversed. So, talk about neutral certsFromRoot, + and trustedCerts. + + Signed-off-by: Miloslav Trmač + +commit 14a563bb51b5c40372e98185cce7928287b6f7d5 +Author: Miloslav Trmač +Date: Fri Nov 6 23:16:14 2015 +0100 + + Add a few more descriptive comments + + Signed-off-by: Miloslav Trmač + +commit 08cacffd97f5d401c72ed99d36e44041e9ef5f2d +Author: Ken Cochrane +Date: Tue Apr 12 17:26:30 2016 -0400 + + Fixed a couple typos in the docs + + Signed-off-by: Ken Cochrane + +commit 9438572fc00f928ec83c884992d5492a7a68babb +Merge: 7c16063afa 8d3467626e +Author: Alexander Morozov +Date: Tue Apr 12 14:08:36 2016 -0700 + + Merge pull request #21897 from calavera/remove_authorization_refs_from_api + + Move middleware to interfaces. + +commit 7c16063afaafaddf0b738fe9ad6221f55ee85a99 +Merge: b6a08c3f11 2a71f28a4e +Author: David Calavera +Date: Tue Apr 12 14:07:51 2016 -0700 + + Merge pull request #21714 from hallyn/2016-03-31/aufs.2 + + don't try to use aufs in a user namespace + +commit ab2394446ccde47ed07fb86743f4a425107c6298 +Author: Derek McGowan +Date: Tue Apr 12 14:03:56 2016 -0700 + + Integration test readme update + + Updates the readme to mention running the tests using golem. + Also provides instructions for making test development easier. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 30859c34569b900d3d798ad55f48f3d4fd7dc32c +Author: Alessandro Boch +Date: Tue Apr 12 13:30:30 2016 -0700 + + Update /containers/create remote API docs + + - Show how to pass the networking config in POST containers/create body + + Signed-off-by: Alessandro Boch + +commit 9303df90d5f5288873ec71ca97e818375dda1df5 +Merge: 3354e2f44f 55aee374e1 +Author: Ying Li +Date: Tue Apr 12 13:29:22 2016 -0700 + + Merge pull request #675 from docker/key-id-verification + + Key ID verification + +commit acaef7caaf6078719d8e838efad0fb1b7ce153d8 +Author: John Howard +Date: Tue Apr 12 09:39:46 2016 -0700 + + Windows: Fix flakey LogsSinceFutureFollow + + Signed-off-by: John Howard + +commit 339ebc0483cfc2ec72efba884c0de84088c2f905 +Author: Danyal Prout +Date: Sun Apr 10 15:53:42 2016 +0100 + + Fixes #2096: Only show multiple port clash warning if multiple containers + are about to be started. + + Signed-off-by: Danyal Prout + +commit c3fe4226f3aec1c59f581e636aece9cefaa9a515 +Author: Tibor Vass +Date: Mon Apr 11 14:51:19 2016 -0400 + + vendor runc to fix issue#21808 + + Signed-off-by: Tibor Vass + +commit 7b621274045fa177ad18051a8c719d6e94c185bf +Merge: bcc976ac79 a6bc7579b7 +Author: Nathan LeClaire +Date: Tue Apr 12 12:16:07 2016 -0700 + + Merge pull request #3300 from ahmetalpbalkan/azure-deps + + azure: Update SDK dependencies for better error messages + +commit b6a08c3f117c5507e41a1e19c7b44229522409b1 +Merge: d648d40ace 5ee0a94101 +Author: David Calavera +Date: Tue Apr 12 12:04:03 2016 -0700 + + Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners + + pkg: listeners: move Docker-specific semantics to docker/daemon* + +commit 3354e2f44f49198753d1d1e7aa3e5f17a3469944 +Merge: d3e0002740 9c0e58c46e +Author: David Lawrence +Date: Tue Apr 12 10:45:08 2016 -0700 + + Merge pull request #674 from cyli/godep-makefile-check + + Stop using godep in CI and Makefile since we use vendoring now + +commit 9caf7aeefd23263a209c26c8439d26c147972d81 +Author: Dan Walsh +Date: Tue Mar 29 08:24:28 2016 -0400 + + Add support for setting sysctls + + This patch will allow users to specify namespace specific "kernel parameters" + for running inside of a container. + + Signed-off-by: Dan Walsh + +commit d648d40ace5440d1a3c8c9dbc1115d40ebcbae3c +Merge: 7b5a6844c2 faf2b6f7aa +Author: Alexander Morozov +Date: Tue Apr 12 10:28:05 2016 -0700 + + Merge pull request #21904 from yongtang/21848-stats-connected-containers + + Docker stats is not working when a container is using another container's network. + +commit c6f63e298ebb1dd0a2ce5ada0c0d39e248132634 +Merge: 467fc068d8 f9bcbd44ca +Author: Richard Scothern +Date: Tue Apr 12 10:25:43 2016 -0700 + + Merge pull request #1619 from RichardScothern/gc-docs + + Extend garbage collection documentation. + +commit 7b5a6844c2a517e8b6927666e33becf341ac016b +Merge: 8cb511b7d6 c70f153f52 +Author: Alexander Morozov +Date: Tue Apr 12 10:19:47 2016 -0700 + + Merge pull request #21943 from Microsoft/jstarks/utilityvm + + Windows: support embedded utility VM images + +commit 8cb511b7d68b8d4a053ca260070ba781360bbdbf +Merge: 595104daf6 c082dad637 +Author: Alexander Morozov +Date: Tue Apr 12 10:10:48 2016 -0700 + + Merge pull request #21948 from tianon/check-config-network + + Add "VXLAN" to check-config.sh + +commit a6bc7579b7d59ad507db3f3a79b14c37b4eb3162 +Author: Ahmet Alp Balkan +Date: Tue Apr 12 10:04:43 2016 -0700 + + azure: Update SDK dependencies for better error messages + + Signed-off-by: Ahmet Alp Balkan + +commit ae46bf8907aec818a07167598efef26a778dadaa +Author: Tony Witherspoon +Date: Tue Apr 12 12:29:59 2016 -0400 + + Updated StringIO import to support io module + + Signed-off-by: Tony Witherspoon + +commit 595104daf67e9004ce771419a076b491345b5778 +Merge: a0e7e13766 fee7e7c7a3 +Author: Phil Estes +Date: Tue Apr 12 12:05:31 2016 -0400 + + Merge pull request #21960 from rhcarvalho/shm-validation-typo + + Fix a typo in hostConfig.ShmSize validation + +commit 276738f733c3512b939168c1475a6085a9482c6a +Author: Tony Witherspoon +Date: Tue Apr 12 11:47:15 2016 -0400 + + Updated cli_test.py to validate against the updated help command conditions + + Signed-off-by: Tony Witherspoon + +commit fee7e7c7a31023be9f0c26608e6cbd4e8a97d25b +Author: Rodolfo Carvalho +Date: Tue Apr 12 16:45:05 2016 +0200 + + Fix a typo in hostConfig.ShmSize validation + + Other places referring to the same configuration, including docs, have + the correct spelling. + + Signed-off-by: Rodolfo Carvalho + +commit f10bc8072ed9e2b043cf3dae602a03143858b712 +Merge: 3d3f331404 7781f62ddf +Author: Daniel Nephin +Date: Tue Apr 12 10:44:04 2016 -0400 + + Merge pull request #3310 from aanand/fix-logs-test + + Attempt to fix flaky logs test + +commit 7781f62ddf54fa635890c1772e1729ff5461fd55 +Author: Aanand Prasad +Date: Tue Apr 12 12:03:16 2016 +0100 + + Attempt to fix flaky logs test + + Signed-off-by: Aanand Prasad + +commit 3d3f331404d22230aa244880e9680db984a466dc +Merge: d05feb1a4d 3722bb38c6 +Author: Aanand Prasad +Date: Tue Apr 12 11:31:22 2016 +0100 + + Merge pull request #3303 from aanand/clarify-rm-and-down + + Clarify behaviour of rm and down + +commit be8f469a828ffd6ad8ca0baaef017c49e3bab713 +Author: Maksim Malchuk +Date: Tue Apr 12 11:43:18 2016 +0300 + + Correct error handling for external SSH client + + In some cases, (e.g. private key not accessible or has incorrect + permissions) docker-machine failed with error "Something went wrong + running an SSH command!". This commit will add the correct debug + messages and show the correct errors for the bad private keys. + Also, due to incorrect handling POSIX file permissions in Windows + some checks should be ignored. + + Signed-off-by: Maksim Malchuk + +commit a0e7e1376605541d988387967f69469d25af060a +Merge: 2bcb6d694f b0e24c7393 +Author: Vincent Demeester +Date: Tue Apr 12 10:07:12 2016 +0200 + + Merge pull request #21818 from Microsoft/jjh/tp4fortests + + Windows: Remove TP4 support from test code + +commit 5ee0a94101c30a4ac22379fdab50c0faad2d12c9 +Author: Aleksa Sarai +Date: Sat Apr 9 16:49:33 2016 +1000 + + pkg: listeners: move Docker-specific semantics to docker/daemon* + + Since there are other users of pkg/listeners, it doesn't make sense to + contain Docker-specific semantics and warnings inside it. To that end, + move the scary warning about -tlsverify and the libnetwork port + allocation code to CmdDaemon (where they belong). This helps massively + reduce the dependency tree for users of pkg/listeners. + + Signed-off-by: Aleksa Sarai + +commit 34a66a14af326a259d4ff9fb84db6f678f116a17 +Author: mYmNeo +Date: Tue Apr 12 09:27:47 2016 +0800 + + Grow the container rootfs when it is necessary + + Signed-off-by: mYmNeo + +commit f9bcbd44ca56a56b95911dd19ad529071c1c5adb +Author: Richard Scothern +Date: Mon Apr 11 12:04:37 2016 -0700 + + Extend garbage collection documentation. + + Signed-off-by: Richard Scothern + +commit 55aee374e1760647c47bdb378e038545ebe83e3c +Author: David Lawrence +Date: Mon Apr 11 17:34:35 2016 -0700 + + fixing some certs tests as additional validation meant we weren't testing what we thought we were + Signed-off-by: David Lawrence (github: endophage) + +commit c18d03a7783bb78b7568bf3c23644888995e9a5d +Author: Aaron Lehmann +Date: Mon Apr 11 17:29:17 2016 -0700 + + Vendor distribution to correct config blob media type in schema2 manifest + + @nwt noticed that the media type specified in the config section of a + schema2 manifest is application/octet-stream, instead of the correct + value application/vnd.docker.container.image.v1+json. + + This brings in https://github.com/docker/distribution/pull/1622 to fix + this. + + Signed-off-by: Aaron Lehmann + +commit f7f8a961b5319770ff22d38add7242e186e76183 +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 17:28:14 2016 -0700 + + Unit test for verifying invalid key ID + + Signed-off-by: Riyaz Faizullabhoy + +commit 7fe11bd10226efbb768e188a0686630c22928841 +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 17:26:08 2016 -0700 + + Add key ID verification to Verify + + Signed-off-by: Riyaz Faizullabhoy + +commit 467fc068d88aa6610691b7f1a677271a3fac4aac +Merge: 4c119524f1 2de3f1a62a +Author: Richard Scothern +Date: Mon Apr 11 17:23:03 2016 -0700 + + Merge pull request #1622 from aaronlehmann/schema2-config-mediatype + + Use correct media type for config blob in schema2 manifest + +commit c70f153f52c8ca75a395d4dc1c4a5759871ada19 +Author: John Starks +Date: Wed Apr 6 17:08:24 2016 -0700 + + Windows: Support embedded utility VM images + + For TP5, the utility VM for Hyper-V containers is embedded in the base + layer's contents. + + Signed-off-by: John Starks + +commit 2de3f1a62acaf3b561d312a0c69aba4a7ff20973 +Author: Aaron Lehmann +Date: Mon Apr 11 17:05:41 2016 -0700 + + Use correct media type for config blob in schema2 manifest + + The schema2 manifest builder fills in this part of the manifest based on + the descriptor it gets back from BlobIngester's Put method. It passes + the correct media type to Put, but Put ends up replacing this value with + application/octet-stream in its return value. + + This commit works around the issue in the manifest builder. Arguably Put + should not be changing the media type in its return value, but this + commit is a targeted fix to keep it very low-risk for possible inclusion + in Docker 1.11. + + Fixes #1621 (but maybe we should open a separate issue for the media + type behavior in the distribution client, and the unnecessary stat). + + Signed-off-by: Aaron Lehmann + +commit c082dad637f2b7ee07a284143566746c98bf1211 +Author: Tianon Gravi +Date: Mon Apr 11 16:42:53 2016 -0700 + + Add "VXLAN" to check-config.sh + + Signed-off-by: Andrew "Tianon" Page + +commit d093888578745cd7e1df5bc03add8ca737c95f60 +Author: Nathan LeClaire +Date: Mon Apr 11 16:40:28 2016 -0700 + + Bump Docker and Compose RC versions + + Signed-off-by: Nathan LeClaire + +commit bcc976ac794b36736258822e57ed2e1a34ff305c +Merge: e1a07a342f 618201c116 +Author: Nathan LeClaire +Date: Mon Apr 11 16:32:34 2016 -0700 + + Merge pull request #3295 from nathanleclaire/swarm_no_hostnet + + Run Swarm containers without --net host + +commit 618201c116656215d05099e7f71cc99651b53225 +Author: Nathan LeClaire +Date: Mon Apr 11 16:23:00 2016 -0700 + + Run Swarm containers without --net host + + Signed-off-by: Nathan LeClaire + +commit e1a07a342f347a126ebd18ed111da24813493ee4 +Merge: d1c9342c42 f4d772f758 +Author: Nathan LeClaire +Date: Mon Apr 11 15:57:25 2016 -0700 + + Merge pull request #3294 from nathanleclaire/revert_stat_error + + Revert "Correct error handling for external SSH client" + +commit 9c0e58c46ec760432620637ce61a9f6c5f83e75b +Author: Ying Li +Date: Mon Apr 11 15:20:04 2016 -0700 + + Stop using godep in CI and Makefile since we use vendoring now, and check for go version >= 1.6 + + Signed-off-by: Ying Li + +commit b0e24c73931d70ef543a3d69c41b0add7130cb80 +Author: John Howard +Date: Wed Apr 6 14:01:12 2016 -0700 + + Windows: Remove TP4 support from test code + + Signed-off-by: John Howard + +commit d1c9342c42630723aca6e10f19b2390942008954 +Merge: 1766abc8c5 fb4b50112d +Author: Nathan LeClaire +Date: Mon Apr 11 15:27:07 2016 -0700 + + Merge pull request #3289 from mrbuk/master + + VMware Fusion: static ip addresses (dhcp) are evaluated + +commit f4d772f75801d06df712b1c8d8938882d0c24dbf +Author: Nathan LeClaire +Date: Mon Apr 11 15:18:14 2016 -0700 + + Revert "Correct error handling for external SSH client" + + This reverts commit f2acfa9492d9352edeb722ba625adaf86bcdee7e. + + Signed-off-by: Nathan LeClaire + +commit 1766abc8c586a79c49d4c5a0d57f6e17dfebd1ec +Merge: 22a1044075 3dc8a7bdc5 +Author: Nathan LeClaire +Date: Mon Apr 11 15:15:11 2016 -0700 + + Merge pull request #3276 from tmds/master + + azure.md: extend documentation of command line options + +commit 22a1044075f9e5f045b2334ab19e89208ec8e001 +Merge: d6c595f85e d14cfaacfc +Author: Nathan LeClaire +Date: Mon Apr 11 15:14:23 2016 -0700 + + Merge pull request #3290 from mmalchuk/master + + Disable user-defined ssh_config configurations + +commit 2bcb6d694f9c8a7d4ce1b2b2a5d8a32ae5ea6085 +Merge: 577adcc1ee 45fb803316 +Author: Alexander Morozov +Date: Mon Apr 11 14:54:21 2016 -0700 + + Merge pull request #21941 from crosbymichael/copy-bins + + Improve source for containerd/runc copy + +commit d3e00027401c4e83281c56faf8d11a97cc929d6c +Merge: 22d46f847c bc4e8a0f9e +Author: David Lawrence +Date: Mon Apr 11 14:50:57 2016 -0700 + + Merge pull request #673 from cyli/fix-signer-tests + + Add the buildtags to go list ./... in the Makefile + +commit f6dd023b4e3fe13fc30a3ecce7559c1dfa54d609 +Author: boynux +Date: Mon Apr 11 23:44:05 2016 +0200 + + exited=0 in filter shouldn't show "Created" ones + + Newly created containers which are not started yet should not list + when "exited=0" filter is used with "ps -a" + + Signed-off-by: Boynux + +commit bc4e8a0f9e13af002b1143a50f68f21830ed26e2 +Author: Ying Li +Date: Mon Apr 11 14:31:41 2016 -0700 + + Change the HTTP server returned by signer config to be a pointer + + Signed-off-by: Ying Li + +commit 77b33cf10fbe1c4098e2efc0f0ba57e6067e4d49 +Author: Ying Li +Date: Mon Apr 11 13:25:23 2016 -0700 + + Add the buildtags to go list ./... in the Makefile, signer should not be pkcs11 + + Signed-off-by: Ying Li + +commit 15b0f06a9ad6778deeb9560c2f353e29d4f795da +Author: John Starks +Date: Wed Apr 6 17:46:19 2016 -0700 + + Windows: Revendor Microsoft/hcsshim + + This change supports the importing of layers that contain utility VM + images. This is necessary to support Hyper-V containers running on a + non-centrally-managed image. + + Signed-off-by: John Starks + +commit 22d46f847cc44f4dcc6d13646f1f3d6d2e5825bb +Merge: ed99253c3f f8c42e4cbf +Author: David Lawrence +Date: Mon Apr 11 12:57:26 2016 -0700 + + Merge pull request #668 from cyli/simplify-client-update-retvalue + + NotaryRepository.Update now just returns an error, rather than a client and error + +commit 45fb80331662b107ee523d184aef83fa3cae97f2 +Author: Michael Crosby +Date: Mon Apr 11 12:02:01 2016 -0700 + + Improve source for containerd/runc copy + + This improves getting the source for the binaries that are compiled on + the system so that they can be copied into the bundles output. + + Signed-off-by: Michael Crosby + +commit 2a71f28a4e1167dee32aa16ddbc819c9d9e77f71 +Author: Serge Hallyn +Date: Thu Mar 31 14:42:16 2016 -0500 + + don't try to use aufs in a user namespace + + If aufs is already modprobe'd but we are in a user namespace, the + aufs driver will happily load but then get eperm when it actually tries + to do something. So detect that condition. + + Signed-off-by: Serge Hallyn + +commit ea2d526246becbfa9cd38486958448bc1c6f606b +Author: Daniel Nephin +Date: Fri Apr 8 15:48:36 2016 -0400 + + Bump 1.7.0-rc2 + + Signed-off-by: Daniel Nephin + +commit 2160c787e3fde64af1c90ce32dcc92b63eaf3c73 +Author: Aanand Prasad +Date: Mon Apr 11 17:05:52 2016 +0100 + + Fix race condition + + If processing of all objects finishes before the queue is drained, + parallel_execute_iter() returns prematurely. + + Signed-off-by: Aanand Prasad + +commit ebae76bee8a550018624a057ca39a83b195dccab +Author: Aanand Prasad +Date: Mon Apr 11 13:03:35 2016 +0100 + + Rename a couple of functions in parallel.py + + Signed-off-by: Aanand Prasad + +commit 720dc893e2ab8411dd1c242944dc128675113137 +Author: Aanand Prasad +Date: Mon Apr 11 12:49:04 2016 +0100 + + Document parallel helper functions + + Signed-off-by: Aanand Prasad + +commit d03f4e4b325f175bcd8de2b0bdbb196b9601f3bb +Author: Aanand Prasad +Date: Mon Apr 11 12:37:00 2016 +0100 + + Small refactor to feed_queue() + + Put the event tuple into the results queue rather than yielding it from + the function. + + Signed-off-by: Aanand Prasad + +commit d05feb1a4d9984bd066c06041c90bf09a3f6a74c +Merge: 97467c7dec 7cfb5e7bc9 +Author: Daniel Nephin +Date: Mon Apr 11 12:58:11 2016 -0400 + + Merge pull request #3302 from aanand/feed-queue-refactor + + feed_queue() refactor + +commit 577adcc1eeb58ab29cfbcd50048576b9c8f64584 +Merge: 08e27a7148 45dc5b46e2 +Author: Vincent Demeester +Date: Mon Apr 11 18:34:03 2016 +0200 + + Merge pull request #21811 from shishir-a412ed/cleanup_parse_storage_opt + + parseStorageOpt: return size rather than updating devInfo.Size field + +commit ed99253c3f2cc9bcd9df9b5f6283606cc04d86bc +Merge: a14c601e13 9a38a573de +Author: Riyaz Faizullabhoy +Date: Mon Apr 11 09:24:53 2016 -0700 + + Merge pull request #672 from Anvil/patch-1 + + Minor grammar fix in TUF overview + +commit 08e27a714895fd9c996a87cf1dc8bf0b7c3bcd6a +Merge: 517c18ff2b b397f978c6 +Author: David Calavera +Date: Mon Apr 11 09:24:47 2016 -0700 + + Merge pull request #21877 from AkihiroSuda/trivial-fix + + oci: default devices don't need to be listed explicitly + +commit 8d3467626ee26cad48ad84f2181552dce7afccb6 +Author: David Calavera +Date: Fri Apr 8 16:22:39 2016 -0700 + + Move middleware to interfaces. + + This makes separating middlewares from the core api easier. + As an example, the authorization middleware is moved to + it's own package. + + Initialize all static middlewares when the server is created, reducing + allocations every time a route is wrapper with the middlewares. + + Signed-off-by: David Calavera + +commit 7cfb5e7bc9fb93549de0915f378d6cd831835d52 +Author: Aanand Prasad +Date: Mon Apr 11 17:05:52 2016 +0100 + + Fix race condition + + If processing of all objects finishes before the queue is drained, + parallel_execute_iter() returns prematurely. + + Signed-off-by: Aanand Prasad + +commit 3722bb38c66b3c3500e86295a43aafe14a050b50 +Author: Aanand Prasad +Date: Mon Apr 11 14:26:45 2016 +0100 + + Clarify behaviour of rm and down + + Signed-off-by: Aanand Prasad + +commit 45dc5b46e2018d0a8c2d15c6b2917f3581211a6e +Author: Shishir Mahajan +Date: Fri Apr 1 15:05:09 2016 -0400 + + parseStorageOpt: return size rather than updating devInfo.Size field + + Signed-off-by: Shishir Mahajan + +commit 517c18ff2b1d326986bc5448ecc770c6def8e442 +Merge: a692910277 6dd2c33217 +Author: Brian Goff +Date: Mon Apr 11 10:16:17 2016 -0400 + + Merge pull request #21914 from sanimej/libn-v0.7rc5 + + Vendor Libnetwork v0.7.0-rc.6 + +commit 9a38a573dee22ec92b10dd0708ea66f1d7ce14e2 +Author: Dams Nadé +Date: Mon Apr 11 15:43:18 2016 +0200 + + Minor grammar fix in TUF overview + + "These files" and "They" are plural. + + Signed-off-by: Damien Nadé + +commit 15c5bc2e6c79cdb2edac4f8cab10d7bcbfc175d1 +Author: Aanand Prasad +Date: Mon Apr 11 13:03:35 2016 +0100 + + Rename a couple of functions in parallel.py + + Signed-off-by: Aanand Prasad + +commit a692910277dfbd077af4db891cab0c4130962377 +Merge: 8af70e1074 51e42e6ee0 +Author: Vincent Demeester +Date: Mon Apr 11 14:01:52 2016 +0200 + + Merge pull request #20853 from WeiZhang555/fix-ShouldRestart + + Fix ShouldRestart for on-failure handle + +commit 0671b8b8c3ce1873db87c4233f88e64876d43c6a +Author: Aanand Prasad +Date: Mon Apr 11 12:49:04 2016 +0100 + + Document parallel helper functions + + Signed-off-by: Aanand Prasad + +commit 0e3db185cf79e6638c2660be8e052af113ed7337 +Author: Aanand Prasad +Date: Mon Apr 11 12:37:00 2016 +0100 + + Small refactor to feed_queue() + + Put the event tuple into the results queue rather than yielding it from + the function. + + Signed-off-by: Aanand Prasad + +commit 8af70e107438382e599baa42b8a06c0d972e1bd5 +Merge: c327d9d99b 7ad5438555 +Author: Sebastiaan van Stijn +Date: Mon Apr 11 12:24:48 2016 +0200 + + Merge pull request #21908 from sdurrheimer/zsh-completion-volume-ls-filter + + Add zsh completion for 'docker volume ls -f {dangling,driver,name}' + +commit b397f978c60d8142cfa679030f01ba00ecc5e976 +Author: Akihiro Suda +Date: Fri Apr 8 05:28:37 2016 +0000 + + oci: default devices don't need to be listed explicitly + + Eliminating these things make the code much more understandable. + + See also https://github.com/opencontainers/runtime-spec/blob/adcbe530a9652b6f61c740b5c4feb1a6ee8c5918/config-linux.md#default-devices + https://github.com/opencontainers/runc/blob/df25eddce6dce1e1123372bc6ccf98d7b3acc0ce/libcontainer/specconv/spec_linux.go#L454 + + Signed-off-by: Akihiro Suda + +commit c327d9d99b333932465d09d3cb8caecb5d317280 +Merge: 3c3b089474 a609c2c48b +Author: Vincent Demeester +Date: Sun Apr 10 22:33:55 2016 +0200 + + Merge pull request #21919 from MihaiB/docs-typo + + docs: fix grammar typo in 'Network containers' + +commit 3dc8a7bdc5b26091366164556c11cf1cd691d840 +Author: Tom Deseyn +Date: Thu Apr 7 09:12:38 2016 +0200 + + azure.md: Improve documentation based on feedback + + Signed-off-by: Tom Deseyn + +commit d14cfaacfcd9451d26dd16000cd060b321c44406 +Author: Maksim Malchuk +Date: Sun Apr 10 20:27:06 2016 +0300 + + Disable user-defined ssh_config configurations + + Using the user-defined ssh_config configurations bring more problems + instead of enchancements. + + Signed-off-by: Maksim Malchuk + +commit fb4b50112d2fa2a5b693e5b3a6e07f3321d4092e +Author: Markus Bukowski +Date: Sun Apr 10 18:27:58 2016 +0200 + + VMware Fusion: static ip addresses (dhcp) are evaluated + + Signed-off-by: Markus Bukowski + +commit a609c2c48b5d504120777db2ac1ba83bfe355b66 +Author: Mihai Borobocea +Date: Sun Apr 10 17:22:02 2016 +0300 + + docs: fix grammar typo in 'Network containers' + + Signed-off-by: Mihai Borobocea + +commit 7ad5438555c9fbe5dc3b82f993db73862974280a +Author: Steve Durrheimer +Date: Sat Apr 9 18:19:31 2016 +0200 + + Add zsh completion for 'docker volume ls -f {dangling,driver,name}' + + Signed-off-by: Steve Durrheimer + +commit 3c3b089474c387073e2088572e84e5d5aa05634c +Merge: f9386538ec 5534354996 +Author: Vincent Demeester +Date: Sun Apr 10 11:32:48 2016 +0200 + + Merge pull request #21917 from sdurrheimer/zsh-completion-new-micro-syslog-format + + Add zsh completion for '--log-opt syslog-format=rfc5424micro' + +commit 553435499670a0a2408ace95a5f6b19d4737a648 +Author: Steve Durrheimer +Date: Sat Apr 9 17:36:36 2016 +0200 + + Add zsh completion for '--log-opt syslog-format=rfc5424micro' + + Signed-off-by: Steve Durrheimer + +commit f9386538ec6744512a07b61fe06e953b52065ead +Merge: b4664e3f86 f67b711277 +Author: Vincent Demeester +Date: Sun Apr 10 10:58:25 2016 +0200 + + Merge pull request #21724 from flyinprogrammer/syslog-opts-env-labels + + enable syslog logger to have access to env and labels + +commit 51e42e6ee01eb4b5c8c7678e2fc7be0f13ef6a68 +Author: Zhang Wei +Date: Tue Mar 22 23:46:40 2016 +0800 + + Fix ShouldRestart for on-failure handle + + Currently if you restart docker daemon, all the containers with restart + policy `on-failure` regardless of its `RestartCount` will be started, + this will make daemon cost more extra time for restart. + + This commit will stop these containers to do unnecessary start on + daemon's restart. + + Signed-off-by: Zhang Wei + +commit ffad0873c9c00fb3565b24ea7fb38659b4d2c97e +Author: Zhang Wei +Date: Fri Apr 8 13:10:56 2016 +0800 + + Add test case for stopping a restarting container + + Signed-off-by: Zhang Wei + +commit b4664e3f8669ca02925c31a08822b73ee7969bd5 +Merge: 37d2e12fae a705e166cf +Author: Lei Jitang +Date: Sun Apr 10 11:17:19 2016 +0800 + + Merge pull request #21854 from WeiZhang555/restart-failure + + Fix critical bug: can't restart an restarting container + +commit 37d2e12faef82dfbfffb7da3fa8f9bf5d8db24e5 +Merge: 0f904dc256 6e14ebd030 +Author: Vincent Demeester +Date: Sat Apr 9 23:24:33 2016 +0200 + + Merge pull request #21907 from sdurrheimer/zsh-completion-syslog-format + + Add zsh completion for '--log-opt syslog-format' + +commit 0f904dc2561e7d5c4a0a9435610132e94de377a1 +Merge: 3f39035f18 f919a26a9f +Author: Vincent Demeester +Date: Sat Apr 9 22:56:00 2016 +0200 + + Merge pull request #21911 from yongtang/04092016-doc-remote-api-json + + Fix incorrect request json body for `/containers/create` in remote API docs. + +commit 3f39035f1862b20aa59c0e26f42794df9ff731bc +Merge: 4ac59a1282 1f59bc8c03 +Author: Sebastiaan van Stijn +Date: Sat Apr 9 13:40:45 2016 -0700 + + Merge pull request #21819 from tophj-ibm/fix-ensure-emptyfs-other-architectures + + Fix .ensure-emptyfs on non-x86_64 architectures + +commit faf2b6f7aaca7f9ef400e227921b8125590fc9e5 +Author: Yong Tang +Date: Sat Apr 9 06:57:04 2016 +0000 + + Docker stats is not working when a container is using another container's network. + + This fix tries to fix the issue in #21848 where `docker stats` will not correctly + display the container stats in case the container reuse another container's + network stack. + + The issue is that when `stats` is performed, the daemon will check for container + network setting's `SandboxID`. Unfortunately, for containers that reuse another + container's network stack (`NetworkMode.IsConnected()`), SandboxID is not assigned. + Therefore, the daemon thinks the id is invalid and remote API will never return. + + This fix tries to resolve the SandboxID by iterating through connected containers + and identify the appropriate SandboxID. + + A test case for `stats` remote API has been added to check if `stats` will return + within the timeout. + + This fix fixes #21848. + + Signed-off-by: Yong Tang + +commit f919a26a9fb96ef07133183b4f693ff9508ae823 +Author: Yong Tang +Date: Sat Apr 9 18:30:48 2016 +0000 + + Fix incorrect request json body for `/containers/create` in remote API docs. + + This fix tries to fix the incorrect request json body for + `/containers/create` in remote API docs. + + When using the example json request for `/containers/create`, there are two + errors: + (1). `invalid character '"' after object key:value pair` + This is because a `,` is missing after `"Volumes": {}` + This issue exists in v1.20-v1.24 + (2). `Invalid --security-opt: ""` + This is becasue in `"SecurityOpt": [""]` line, an empty string + `""` is passed yet `""` is not a valid `SecurityOpt`. Either no string, + or a valid string (e.g., "no-new-privileges") could be used. + This issue exists in v1.15-v1.24 + + This fix updates the docs and correct the above two issues. + + Signed-off-by: Yong Tang + +commit 6dd2c3321793c3fe60abb94b88018e4b096f12c7 +Author: Santhosh Manohar +Date: Fri Apr 8 19:00:35 2016 -0700 + + Vendor Libnetwork v0.7.0-rc.6 + + Signed-off-by: Santhosh Manohar + +commit 4ac59a12824059f1323e5faee78a37f4612ed54f +Merge: 417fce0b77 94985b4bff +Author: Vincent Demeester +Date: Sat Apr 9 18:51:20 2016 +0200 + + Merge pull request #21905 from npcode/docs-authorization-RequestUri + + Fix errata; s/RequestUri/ReqestURI/ + +commit 417fce0b77d21d8481c6e8b0cad6cb25c6da7bb8 +Merge: a01f4dc229 aef02273d9 +Author: Vincent Demeester +Date: Sat Apr 9 18:50:42 2016 +0200 + + Merge pull request #21906 from allencloud/fix-typos-pkg + + fix typos in pkg + +commit 6e14ebd030ac8803438a183d5135100320caa035 +Author: Steve Durrheimer +Date: Sat Apr 9 17:34:46 2016 +0200 + + Add zsh completion for '--log-opt syslog-format' + + Signed-off-by: Steve Durrheimer + +commit aef02273d9cdf8144b95c9c9a8d1e119d24b2d9d +Author: allencloud +Date: Sat Apr 9 21:18:15 2016 +0800 + + fix typos in pkg + + Signed-off-by: allencloud + +commit a01f4dc2292ecba30b1e3db3251e6408610f8c8f +Merge: f2ed337ac9 a0a6d031d7 +Author: Vincent Demeester +Date: Sat Apr 9 13:46:58 2016 +0200 + + Merge pull request #21853 from coolljt0725/fix_stats + + Fix docker stats missing mem limit + +commit 94985b4bfff4fec6f4a7cb0b0f8b641a7dcfcbd1 +Author: Yi EungJun +Date: Sat Apr 9 19:15:55 2016 +0900 + + Fix errata; s/RequestUri/ReqestURI/ + + Signed-off-by: Yi EungJun + +commit f2ed337ac9834b600dbe5afbdaa2146c9e5d71c1 +Merge: fec6cd2eb9 e57900a269 +Author: John Howard +Date: Fri Apr 8 20:53:25 2016 -0700 + + Merge pull request #21740 from mindlapse/fixErrorMsg + + Improved message when pushing a non-existant image + +commit fec6cd2eb988f77d7442fd8edd8cc864c87ae88b +Merge: fd67c8b203 ef5bfad321 +Author: John Howard +Date: Fri Apr 8 20:44:03 2016 -0700 + + Merge pull request #20525 from Microsoft/sjw/update-graphdriver-create + + Adding readOnly parameter to graphdriver Create method + +commit 956d9baed6bba90cd3508640c5f1d92702a02cab +Merge: b8495ee800 61447303d1 +Author: French Ben +Date: Fri Apr 8 19:47:20 2016 -0700 + + Merge pull request #1619 from docker/modify-cmd + + Updated default cmd + +commit 61447303d18f28fa0870fce176d50d7f9ada971d +Author: French Ben +Date: Fri Apr 8 19:46:58 2016 -0700 + + Updated default cmd + + Signed-off-by: French Ben + +commit fd67c8b2031722dd9255996b84bbfb236ce45cfb +Merge: eaa1e8a8c4 c7076d2670 +Author: Sebastiaan van Stijn +Date: Fri Apr 8 17:55:16 2016 -0700 + + Merge pull request #21868 from anusha-ragunathan/not-exp-requirement + + Add non-experimental daemon as a test requirement. + +commit eaa1e8a8c49c58fb3770d673c8c7dcd4c1da4d17 +Merge: 3bac588335 fdfaaeb9aa +Author: Sebastiaan van Stijn +Date: Fri Apr 8 17:52:22 2016 -0700 + + Merge pull request #21839 from WeiZhang555/add-start-event + + Add missing "start" event back for auto-restart container + +commit f67b7112775fd9957cc156cc4483e11b8c0c981a +Author: Alan Scherger +Date: Fri Apr 1 15:25:11 2016 +0000 + + enable syslog logger to have access to env and labels + + Signed-off-by: Alan Scherger + +commit 3bac588335bd2af28726bc803885fc0b2ae73554 +Merge: f62b26571a 76122f95e9 +Author: Sebastiaan van Stijn +Date: Fri Apr 8 17:46:41 2016 -0700 + + Merge pull request #21900 from vieux/type + + fix typo in comment + +commit b8495ee800e2e520d8379590e6efa9f40c5d8f28 +Merge: fb0445af7c 71199eacf0 +Author: French Ben +Date: Fri Apr 8 17:02:28 2016 -0700 + + Merge pull request #1617 from docker/add-issue-template + + Added issue template + +commit 71199eacf0dedb33b42f28f2f35de9ef95aa4a30 +Author: French Ben +Date: Fri Apr 8 17:01:08 2016 -0700 + + Added issue template + + Signed-off-by: French Ben + +commit 97467c7decf9b931f2dfed85884ed0617e01cd57 +Merge: 80614cff9b 4192a009da +Author: Victoria +Date: Fri Apr 8 16:56:57 2016 -0700 + + Merge pull request #3295 from londoncalling/docs-format-followup-PR3275 + + added some formatting on the Wordress steps, and made heading levels … + +commit f62b26571a2727b1fabfb7e88cbdbcfa2144a1fa +Merge: a3007ceccc 3c220cfcba +Author: David Calavera +Date: Fri Apr 8 16:43:07 2016 -0700 + + Merge pull request #21894 from Microsoft/sjw/nanoserver-fix + + Fixing warning to correctly output error string. + +commit 4192a009da5cbae5c811b3b965e4ecb4572c95f6 +Author: Victoria Bialas +Date: Fri Apr 8 16:40:07 2016 -0700 + + added some formatting on the Wordress steps, and made heading levels in these sample app topics consistent + + Signed-off-by: Victoria Bialas + +commit 80614cff9b62b323b5a8e40abbbf3868eae6fb42 +Merge: 3ca8858897 d4e9a3b6b1 +Author: Victoria +Date: Fri Apr 8 16:12:44 2016 -0700 + + Merge pull request #3275 from activatedgeek/patch-1 + + Updated Wordpress tutorial + +commit 4c119524f157213cee2f297303a43a55d2d78b9d +Merge: 437eeeda44 dbb6e28da2 +Author: Richard Scothern +Date: Fri Apr 8 15:38:24 2016 -0700 + + Merge pull request #1604 from ArdaXi/custom-s3-skip-region-check + + Only check validity of S3 region if not using custom endpoint + +commit 437eeeda449d3ecfae280f9eda256b5ed7f51476 +Merge: 55f1b7651f 67321cb622 +Author: Richard Scothern +Date: Fri Apr 8 15:38:06 2016 -0700 + + Merge pull request #1605 from majewsky/swift/deal-with-outdated-container-listings + + registry/storage/swift: detect and fix outdated container listings + +commit 4ff0b1043567b007884dcaf53a1262cb1c4d5cc1 +Merge: 6404badef1 621cf86cfb +Author: Dongluo Chen +Date: Fri Apr 8 15:10:47 2016 -0700 + + Merge pull request #2103 from dongluochen/bump-v1.2.0-rc3 + + Bump version to v1.2.0-rc3 + +commit 3c220cfcbad901c9366c209e83dc917ee4cf4f0c +Author: Stefan J. Wernli +Date: Fri Apr 8 15:04:04 2016 -0700 + + Fixing warning to correctly output error string. + + Signed-off-by: Stefan J. Wernli + +commit a3007ceccc6b0bc7c79f0c63254f70b899299597 +Merge: f832183e33 0e3846e280 +Author: David Calavera +Date: Fri Apr 8 14:56:22 2016 -0700 + + Merge pull request #21773 from yongtang/21765-stats-HumanSize-to-BytesSize + + Change HumanSize to BytesSize for memory output in `docker stats`. + +commit 621cf86cfb6e4cf96452e358c40be708dda3f299 +Author: Dong Chen +Date: Fri Apr 8 14:46:41 2016 -0700 + + Bump version to v1.2.0-rc3 + + Signed-off-by: Dong Chen + +commit 1f59bc8c03df18686b93a0cd619cf2c55cbcf421 +Author: Christopher Jones +Date: Wed Apr 6 16:39:30 2016 -0400 + + Fix .ensure-emptyfs on non-x86_64 architectures + + Now that we are checking if the image and host have the same architectures + via #21272, this value should be null so that the test passes on non-x86 + machines + + Signed-off-by: Christopher Jones + +commit 6404badef1d61ba20d564eb8798be2af34dc8c7d +Merge: 42fc136b39 1dee9cb3f0 +Author: Victor Vieux +Date: Fri Apr 8 14:37:00 2016 -0700 + + Merge pull request #2102 from nishanttotla/fix-httpclientandscheme-signature + + Returning and handling error from HTTPClientAndScheme + +commit f832183e33a690e297bd6dacf7a9cd812025daac +Merge: e626011bfb 3cf856ce0c +Author: Sebastiaan van Stijn +Date: Fri Apr 8 14:33:09 2016 -0700 + + Merge pull request #21884 from albers/completion-volume-ls-filter + + bash completion for `docker volume ls -f {driver,name}` + +commit 1dee9cb3f05ec00a599e7d923602b3e47d6e4a70 +Author: Nishant Totla +Date: Fri Apr 8 12:02:16 2016 -0700 + + Returning and handling error from HTTPClientAndScheme + + Signed-off-by: Nishant Totla + +commit d4e9a3b6b144d2dd126dee2369c10284ec52cdbc +Author: Sanyam Kapoor +Date: Wed Apr 6 23:05:40 2016 +0530 + + Updated Wordpress tutorial + + The new tutorial now uses official Wordpress Docker Image. + + Signed-off-by: Sanyam Kapoor <1sanyamkapoor@gmail.com> + +commit 0e3846e280195cb47c47a7739b475b281dd301cb +Author: Yong Tang +Date: Tue Apr 5 19:30:35 2016 +0000 + + Change HumanSize to BytesSize for memory output in `docker stats`. + + This fix tries to fix the discrepancy between `docker stats` and + `docker run` where `docker run` uses RAMInBytes for all memory + related inputs but `docker stats` uses HumanSize for all memory + related outputs. + + To be consistent, `docker stats` needs to use BytesSize for all + memory related outputs to conform to RAMInBytes in `docker run`. + + This fix addresses this issue. As BytesSize is used, the test + cases needs to be adjusted to match `KiB/MiB/GiB` instead of + `KB/MB/GB`. + + The documentation has also been updated. + + This fix fixes #21765. + + Signed-off-by: Yong Tang + +commit 275b54641a9210a33ad41cd8c36ba98f6357a044 +Author: Daniel Nephin +Date: Fri Apr 8 11:59:06 2016 -0400 + + Remove extra ensure_image_exists() which causes duplicate builds. + + Signed-off-by: Daniel Nephin + +commit 68b4ef6cf25daeb013a9a2372fc40f0db9d32f6d +Author: Aanand Prasad +Date: Fri Apr 8 19:07:40 2016 +0100 + + Reduce queue timeout + + Signed-off-by: Aanand Prasad + +commit de6496c6c9cb76c4c6dec800834ec11d4c1b2003 +Author: Aanand Prasad +Date: Fri Apr 8 19:06:07 2016 +0100 + + Hold state in an object + + Signed-off-by: Aanand Prasad + +commit 79edda680449eff24f1333246e98c9492dc9b681 +Author: Aanand Prasad +Date: Fri Apr 8 18:54:02 2016 +0100 + + Refactor so there's only one queue + + Signed-off-by: Aanand Prasad + +commit a81b9dc6a0cb642b7350005af290cd7ac7105847 +Author: Aanand Prasad +Date: Fri Apr 8 18:53:16 2016 +0100 + + Test events coming out of parallel_execute_stream in error case + + Signed-off-by: Aanand Prasad + +commit 868133e881df2b065f02334bac50707e4400faa8 +Author: Aanand Prasad +Date: Fri Apr 8 18:48:07 2016 +0100 + + Extract get_deps test helper + + Signed-off-by: Aanand Prasad + +commit d3899418b74b34613a8d0ab85114eb31c4a0713e +Author: Aanand Prasad +Date: Fri Apr 8 18:30:28 2016 +0100 + + Move queue logic out of parallel_execute() + + Signed-off-by: Aanand Prasad + +commit 09e359fc8dc43ff025cba4e7cd3fb08c07ca1ba3 +Author: Aanand Prasad +Date: Fri Apr 8 17:46:13 2016 +0100 + + Abort operations if their dependencies fail + + Signed-off-by: Aanand Prasad + +commit cdef2b5e3bc8cbffeea8d13d81eef1cc1f6d1a6e +Author: Aanand Prasad +Date: Fri Apr 8 12:58:19 2016 +0100 + + Refactor setup_queue() + + - Stop sharing set objects across threads + - Use a second queue to signal when producer threads are done + - Use a single consumer thread to check dependencies and kick off new + producers + + Signed-off-by: Aanand Prasad + +commit b865f35f1792f6f927a8d3b48cc0d68c5d79e8ca +Author: Joffrey F +Date: Wed Apr 6 13:28:45 2016 -0700 + + Use docker-py 1.8.0 + + Signed-off-by: Joffrey F + +commit 73d57a1acbdab8109fb7ae54dae3e41a89b3d551 +Author: Daniel Nephin +Date: Tue Apr 5 11:26:23 2016 -0400 + + Prevent unnecessary inspection of containers when created from an inspect. + + Signed-off-by: Daniel Nephin + +commit 1dea8abe69234714c3f39b2e8286abeb1ef1582c +Author: Joffrey F +Date: Wed Mar 30 11:58:28 2016 -0700 + + Include docker-py requirements fix + + Signed-off-by: Joffrey F + +commit 7dd29e8239fc66c88226e326ed94315262f70d29 +Author: Joffrey F +Date: Wed Mar 30 11:11:19 2016 -0700 + + Re-enabling assert_hostname when instantiating docker_client from the environment. + + Signed-off-by: Joffrey F + +commit 98d7a1e9dd1c6b69f911bc5966caf732a20a7fea +Author: Joffrey F +Date: Tue Mar 29 18:05:37 2016 -0700 + + Remove obsolete assert_hostname tests + + Signed-off-by: Joffrey F + +commit a2adf31caaabc08c8a1fadd05a8aa0502abe4d2a +Author: Joffrey F +Date: Tue Mar 29 18:01:27 2016 -0700 + + Update docker-py version to include match_hostname fix Removed unnecessary assert_hostname computation in tls_config_from_options + + Signed-off-by: Joffrey F + +commit 44715f18bd8f867567de6baaf18115a63853f3b0 +Author: Joffrey F +Date: Mon Mar 28 17:39:20 2016 -0700 + + Fix assert_hostname logic in tls_config_from_options + + Signed-off-by: Joffrey F + +commit bd0f6d8d7b94e622c4d7807ffe56e2b4b45f50c7 +Author: Steve Durrheimer +Date: Fri Mar 25 19:25:33 2016 +0100 + + Add zsh completion for 'docker-compose run -w --workdir' + + Signed-off-by: Steve Durrheimer + +commit d434098b9491875275e9f29a2dfde75aa4aff0f2 +Author: Steve Durrheimer +Date: Fri Mar 25 19:15:34 2016 +0100 + + Add zsh completion for 'docker-compose up --build' + + Signed-off-by: Steve Durrheimer + +commit e863894e2d665d1accb08224403da420329dcf33 +Author: Steve Durrheimer +Date: Fri Mar 25 19:09:53 2016 +0100 + + Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' + + Signed-off-by: Steve Durrheimer + +commit 94afcfaf9d602aa7dd358473c2d8872e5e631afc +Author: Steve Durrheimer +Date: Fri Mar 25 19:03:36 2016 +0100 + + Add zsh completion for 'docker-compose exec' command + + Signed-off-by: Steve Durrheimer + +commit c6c1afd5688b4e90dac0acec0c8d520ab69edcd9 +Author: Steve Durrheimer +Date: Fri Mar 25 18:52:28 2016 +0100 + + Add zsh completion for 'docker-compose rm -a --all' + + Signed-off-by: Steve Durrheimer + +commit 3ca8858897ed7918d135202395bee965bcefc8b0 +Merge: e5443717fb 83df95d511 +Author: Daniel Nephin +Date: Fri Apr 8 15:45:37 2016 -0400 + + Merge pull request #3292 from dnephin/fix_up_build + + Remove extra ensure_image_exists() which causes duplicate builds. + +commit 83df95d5118a340fca71ca912825b3e9ba89ff96 +Author: Daniel Nephin +Date: Fri Apr 8 11:59:06 2016 -0400 + + Remove extra ensure_image_exists() which causes duplicate builds. + + Signed-off-by: Daniel Nephin + +commit e5443717fb45737d98ff985069d252c953870f7e +Merge: 91a545813a be27e266da +Author: Daniel Nephin +Date: Fri Apr 8 15:15:41 2016 -0400 + + Merge pull request #3291 from aanand/parallel-execute-refactor + + Parallel execution refactor/fixes + +commit 91a545813abc9a58306a3afca6e6fc877425dda1 +Merge: 958f96c78a 3ef6b17bfc +Author: Daniel Nephin +Date: Fri Apr 8 15:15:01 2016 -0400 + + Merge pull request #3276 from shin-/bump_docker_py + + Use docker-py 1.8.0 + +commit be27e266da9bbb252e74d71ab22044628c6839d2 +Author: Aanand Prasad +Date: Fri Apr 8 19:07:40 2016 +0100 + + Reduce queue timeout + + Signed-off-by: Aanand Prasad + +commit 5450a67c2d75192b962c3c36cf73a417af4386b3 +Author: Aanand Prasad +Date: Fri Apr 8 19:06:07 2016 +0100 + + Hold state in an object + + Signed-off-by: Aanand Prasad + +commit 54b6fc42195da8f7ca1b45828e49ce5e378baee0 +Author: Aanand Prasad +Date: Fri Apr 8 18:54:02 2016 +0100 + + Refactor so there's only one queue + + Signed-off-by: Aanand Prasad + +commit ffab27c0496769fade7f2aa32bd86f66a3c9c0e5 +Author: Aanand Prasad +Date: Fri Apr 8 18:53:16 2016 +0100 + + Test events coming out of parallel_execute_stream in error case + + Signed-off-by: Aanand Prasad + +commit 3720b50c3b8c5534c0b139962f7f6d95dd32a066 +Author: Aanand Prasad +Date: Fri Apr 8 18:48:07 2016 +0100 + + Extract get_deps test helper + + Signed-off-by: Aanand Prasad + +commit af9526fb820f40a8b7eafb16d29f990b1696f4fe +Author: Aanand Prasad +Date: Fri Apr 8 18:30:28 2016 +0100 + + Move queue logic out of parallel_execute() + + Signed-off-by: Aanand Prasad + +commit a14c601e13325e1c98188ad095246294e73f6f13 +Merge: ce1f9d6b11 7404f4ff55 +Author: David Lawrence +Date: Fri Apr 8 10:27:09 2016 -0700 + + Merge pull request #666 from cyli/tuf-embed-signed-common + + Embed SignedCommon in Root, Snapshot, and Timestamp + +commit ce1f9d6b11ce98abfdff8acc0af0f223d53429b0 +Merge: 77bf588830 31851edf81 +Author: Ying Li +Date: Fri Apr 8 10:14:46 2016 -0700 + + Merge pull request #669 from HuKeping/master + + Kind of cleanup + +commit 141b96bb312d85753de2189227941512bd42f33e +Author: Aanand Prasad +Date: Fri Apr 8 17:46:13 2016 +0100 + + Abort operations if their dependencies fail + + Signed-off-by: Aanand Prasad + +commit 222d76834bc1db612505737b40a3c3ed2a68c1a5 +Author: Riyaz Faizullabhoy +Date: Tue Apr 5 10:13:48 2016 -0700 + + Sleep for 1s after push, add comment about certs + + Signed-off-by: Riyaz Faizullabhoy + +commit 36ad744e7930f607422c01b39a39cea0c275bd4e +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 11:13:32 2016 -0700 + + Also allow for non-localhost notary server for notary client + + Signed-off-by: Riyaz Faizullabhoy + +commit b00a8641d6b060e85aa103b39b782d5a73dca716 +Author: Riyaz Faizullabhoy +Date: Fri Apr 1 21:26:07 2016 -0700 + + allow for configurable notary server + + Signed-off-by: Riyaz Faizullabhoy + +commit ce6737d6939c4df570a6df30d7ce53cfcfadea00 +Author: Riyaz Faizullabhoy +Date: Fri Apr 1 11:04:15 2016 -0700 + + Clear tuf data, and pass build context directly to docker build + + Signed-off-by: Riyaz Faizullabhoy + +commit bc5eef1131aa37ab4229f4a8c87f0607852e0c8b +Author: Riyaz Faizullabhoy +Date: Fri Apr 1 09:49:53 2016 -0700 + + Fix key rotate flag, update build and run test to use local images + + Signed-off-by: Riyaz Faizullabhoy + +commit 470d6f8f85390eced3f48ac4855bfb46c9d071b4 +Author: Riyaz Faizullabhoy +Date: Thu Mar 31 14:02:13 2016 -0700 + + Add docker run and build commands to DCT integration test + + Signed-off-by: Riyaz Faizullabhoy + +commit bcdf541c8c6ccc0070ab011a909f244f501676d6 +Author: Aanand Prasad +Date: Fri Apr 8 12:58:19 2016 +0100 + + Refactor setup_queue() + + - Stop sharing set objects across threads + - Use a second queue to signal when producer threads are done + - Use a single consumer thread to check dependencies and kick off new + producers + + Signed-off-by: Aanand Prasad + +commit e626011bfb139346570a3b6320c0bad3f6c29b0c +Merge: 1e9115ced4 50a6181005 +Author: David Calavera +Date: Fri Apr 8 07:58:28 2016 -0700 + + Merge pull request #21760 from hqhq/hq_minimum_reservation + + Add minimum limit for memory reservation + +commit 1e9115ced45a2a71072d05bfda0106ee11746372 +Merge: 7f865e4953 472030e9cc +Author: David Calavera +Date: Fri Apr 8 07:54:53 2016 -0700 + + Merge pull request #21883 from albers/completion-syslog-format + + bash completion for `--log-opt syslog-format` + +commit a705e166cf3bcca62543150c2b3f9bfeae45ecfa +Author: Zhang Wei +Date: Thu Apr 7 22:05:29 2016 +0800 + + Fix critical bug: can't restart a restarting container + + When user try to restart a restarting container, docker client report + error: "container is already active", and container will be stopped + instead be restarted which is seriously wrong. + + What's more critical is that when user try to start this container + again, it will always fail. + + This error can also be reproduced with a `docker stop`+`docker start`. + + And this commit will fix the bug. + + Signed-off-by: Zhang Wei + +commit 7f865e49538a2391d26de795efc0981a6db02127 +Merge: 6fbc206436 5175c9a5ea +Author: Brian Goff +Date: Fri Apr 8 09:33:23 2016 -0400 + + Merge pull request #21777 from Microsoft/jjh/killTP4 + + Windows: So long TP4, so long... + +commit 3cf856ce0cfa2d619515ea3f98cf559660e24f1e +Author: Harald Albers +Date: Fri Apr 8 13:43:45 2016 +0200 + + bash completion for `docker volume ls -f {driver,name}` + + Signed-off-by: Harald Albers + +commit 472030e9cc3f3f80824eaa9f32e656f17801ec5b +Author: Harald Albers +Date: Fri Apr 8 13:19:25 2016 +0200 + + bash completion for `--log-opt syslog-format` + + Signed-off-by: Harald Albers + +commit 6fbc2064369f0fa691c22266abc07f49166fabac +Merge: fb9523442d 7581cf96fb +Author: Vincent Demeester +Date: Fri Apr 8 11:31:17 2016 +0200 + + Merge pull request #21844 from yongtang/21793-syslog-timestamp-rfc5424-microsecond + + Additional syslog-format option to allow microsecond resolution in syslog timestamp. + +commit fb9523442da7da497ee29db63d0ae2591c0cfa1a +Merge: d5ef62f489 d0344731ef +Author: Vincent Demeester +Date: Fri Apr 8 11:19:52 2016 +0200 + + Merge pull request #21878 from TrumanLing/fix_typo + + fix typo + +commit d0344731ef11a5951c86f444ac40e27f2472db01 +Author: LingFaKe +Date: Fri Apr 8 22:08:58 2016 +0800 + + fix typo + + Signed-off-by: Ling FaKe + +commit 76122f95e9173c1182b8dd44e1aa236a045d4e6a +Author: Victor Vieux +Date: Fri Apr 8 00:05:31 2016 -0700 + + fix typo in comment + + Signed-off-by: Victor Vieux + +commit ee4bd806ba6ccac0013eb812e7f30bfcfe12d22a +Author: Yong Tang +Date: Tue Mar 29 16:37:43 2016 +0000 + + API/CLI discrepancy on hostname validation (#21595). + + This fix tries to fix the discrepancy between API and CLI on hostname + validation. Previously, the hostname validation was handled at the + CLI interface in runconfig/opts/parse.go and return an error if the + hostname is invalid. However, if an end user use the remote API to + pass the hostname, the error will not be returned immediately. + Instead the error will only be thrown out when the container creation + fails. This creates behavior discrepancy between API and CLI. + + In this fix, the hostname validation was moved to + verifyContainerSettings so the behavior will be the same for API and + CLI. + + After the change, since CLI does not handle the hostname validation + any more, the previous unit tests about hostname validation on CLI + in runconfig/opts/parse_test.go has to be updated as well because + there is no validation at this stage. All those unit tests are moved + to integration test TestRunTooLongHostname so that the hostname + validation is still properly covered as before. + + Note: Since the hostname validation moved to API, the error message + changes from `invalid hostname format for --hostname:` to + `invalid hostname format:` as well because `--hostname` is passed + to CLI only. + + This fix fixes #21595. + + Signed-off-by: Yong Tang + +commit 7581cf96fbe0cddacf246f2982634190ebe455c9 +Author: Yong Tang +Date: Thu Apr 7 06:03:28 2016 +0000 + + Additional syslog-format option to allow microsecond resolution in syslog timestamp. + + This fix tries to add an additional syslog-format of `rfc5424micro` which follows + the same as rfc5424 except that it use microsecond resolution for timestamp. The + purpose is to solve the issue raised in #21793 where log events might lose its + ordering if happens on the same second. + + The timestamp field in rfc5424 is derived from rfc3339, though the maximium + resolution is limited to "TIME-SECFRAC" which is 6 (microsecond resolution). + + The appropriate documentation (`docs/admin/logging/overview.md`) has been updated + to reflect the change in this fix. + + This fix adds a unit test to cover the newly introduced format. + + This fix fixes #21793. + + Signed-off-by: Yong Tang + +commit 5174f976fd8f8568135b53d77aee4e08001725aa +Author: Nathan LeClaire +Date: Thu Apr 7 21:32:16 2016 -0700 + + Bump Docker RC, Kitematic, and Machine RC versions + + Signed-off-by: Nathan LeClaire + +commit d5ef62f4895206abd4ab2b5e61a49a59d37d1ecf +Merge: 6ad89f4d2f a22092b136 +Author: John Howard +Date: Thu Apr 7 21:24:32 2016 -0700 + + Merge pull request #21872 from Microsoft/sjw/nanoserver-fix + + Fixing nanoserver image load bug. + +commit fdfaaeb9aa72404bde5207510bf5910893414b5d +Author: Zhang Wei +Date: Thu Apr 7 11:38:12 2016 +0800 + + Add missing "start" event back for auto-restart container + + When container is automatically restarted based on restart policy, + docker events can't get "start" event but only get "die" event, this is + not consistent with previous behavior. This commit will add "start" + event back. + + Signed-off-by: Zhang Wei + +commit 6ad89f4d2fdf5b0c176479f990f02c3676dc44b0 +Merge: fdd5b5de62 b83e9df760 +Author: Sebastiaan van Stijn +Date: Thu Apr 7 20:37:14 2016 -0700 + + Merge pull request #21874 from Hyzhou/master + + Fix the docker image --no-trunk output format + +commit fdd5b5de6290f351a91b80f4e6634fbb87862776 +Merge: 64f10251bd cf7944bf6f +Author: John Howard +Date: Thu Apr 7 20:13:38 2016 -0700 + + Merge pull request #21774 from Microsoft/jstarks/support_non_base_layered_images + + Windows: support non-base-layered images + +commit d6c595f85ee644582e75e1bb9f26c72bd4c26b5f +Author: Nathan LeClaire +Date: Thu Apr 7 19:56:46 2016 -0700 + + Bump version to v0.7.0-rc3 + + Signed-off-by: Nathan LeClaire + +commit f6f812a95ea3fc951e9afcac480d656731877bfd +Merge: 5b4159d0d8 2ecc55937c +Author: Nathan LeClaire +Date: Thu Apr 7 19:49:41 2016 -0700 + + Merge pull request #3275 from nathanleclaire/fix_rc_version_mismatch + + Fix RC version mismatch bug + +commit b19599df53f9a3ad04977fc2d75c6cbc24d08938 +Author: Sun Hongliang +Date: Sun Apr 3 12:33:57 2016 +0800 + + update docs about overlay network in kernel version support + + Signed-off-by: Sun Hongliang + +commit 64f10251bd034e1b2bd1c4d5f07ee633b4fcced8 +Merge: 681b5e0ed4 9b2c3aa894 +Author: Brian Goff +Date: Thu Apr 7 22:35:19 2016 -0400 + + Merge pull request #21863 from LK4D4/narrow_interface + + pkg/archive: use more narrow interface for CompressStream + +commit a0a6d031d76c1bf9d5581a8310b8a2d1df4b7b82 +Author: Lei Jitang +Date: Thu Apr 7 22:09:07 2016 -0400 + + Fix docker stats missing memory limit + + Signed-off-by: Lei Jitang + +commit 681b5e0ed45f535d123d997884ce4ffb2907932f +Merge: 3e14070c88 47afe6bd0a +Author: Brian Goff +Date: Thu Apr 7 21:56:43 2016 -0400 + + Merge pull request #21867 from calavera/remove_reference_from_api + + Remove reference package dependency from the api. + +commit 31851edf818722cdf88746689f752109d13d00c1 +Author: HuKeping +Date: Thu Apr 7 21:02:55 2016 +0800 + + Kind of cleanup + + Move the configuration parsing for notary-server to its own file. + + Signed-off-by: Hu Keping + +commit 3e14070c880dc1f3d9ca81c55f84ccebe8d89ad2 +Merge: 0c4f28e51a ccd0da908a +Author: Brian Goff +Date: Thu Apr 7 21:14:42 2016 -0400 + + Merge pull request #21815 from Microsoft/jjh/fixunittest + + Windows: Fix failing unit tests + +commit b83e9df7609e705a85545a8a63db81ef73d85b0e +Author: Hyzhou <1187766782@qq.com> +Date: Fri Apr 8 08:52:10 2016 +0800 + + Fix the docker image --no-trunk output format + + docker 1.10 change the output format of image id. + + Signed-off-by: hyzhou.zhy + +commit 0c4f28e51a45bdc21ba9fa1630bdf52c944778eb +Merge: fc352287c1 20390f65c4 +Author: Brian Goff +Date: Thu Apr 7 20:56:33 2016 -0400 + + Merge pull request #21871 from tonistiigi/fix-restartpolicy-on-restart + + Fix restart monitor stopping on manual restart + +commit cf7944bf6f64c844b74ad937a79d66dafaf99673 +Author: John Starks +Date: Tue Mar 29 09:53:00 2016 -0700 + + Windows: Support ApplyDiff on a base layer + + This adds support to the Windows graph driver for ApplyDiff on a base + layer. It also adds support for hard links, which are needed because the + Windows base layers double in size without hard link support. + + Signed-off-by: John Starks + +commit 9b486999f280c1a5a283a0bbe80ae0991e82ced7 +Author: John Starks +Date: Wed Mar 30 14:23:51 2016 -0700 + + Windows: revendor Microsoft/go-winio and Microsoft/hcsshim + + These changes add support for importing base layers and change the tar + metadata for Windows layers to better match the intent of the tar format. + + Signed-off-by: John Starks + +commit d45a26d7e24719814bc321db6fa173110af30740 +Author: John Starks +Date: Mon Mar 28 18:14:05 2016 -0700 + + Windows: Support non-base-layered images + + Previously, Windows only supported running with a OS-managed base image. + With this change, Windows supports normal, Linux-like layered images, too. + + Signed-off-by: John Starks + +commit 42fc136b397e68a158355264f06a6ddce38a3443 +Merge: 336719a774 aaa10d16b7 +Author: Alexandre Beslic +Date: Thu Apr 7 17:28:40 2016 -0700 + + Merge pull request #2095 from vieux/fix_cleanup_test_master + + fix restart docker in tests + +commit 7404f4ff55df4722c2d2e0d2f0aee7136fad56a5 +Author: Ying Li +Date: Tue Apr 5 14:26:38 2016 -0700 + + Embed SignedCommon in Root, Snapshot, and Timestamp, as it's already + embedded in Targets. This way we can easily get a SignedCommon object + out after calling RootFromSigned, etc. + + Signed-off-by: Ying Li + +commit 336719a7748cfc7099e0704441c45b0bce083a08 +Merge: 34d4cae503 69eabdc81f +Author: Alexandre Beslic +Date: Thu Apr 7 17:15:31 2016 -0700 + + Merge pull request #2089 from vieux/fix_possible_data_race + + fix possible data race with failure count + +commit fc352287c17cb044dca49b253dee9050748535ad +Merge: 14015eedb1 1771d35b48 +Author: Sebastiaan van Stijn +Date: Thu Apr 7 17:01:30 2016 -0700 + + Merge pull request #21816 from estesp/case-of-the-missing-else + + Don't perform external setkey when net==host + +commit a22092b13695c44790bb443ac8b536965b1cdba3 +Author: Stefan J. Wernli +Date: Thu Apr 7 15:58:57 2016 -0700 + + Fixing nanoserver image load bug. + + Fixes an issue that prevents nano server images from loading properly. Also updates logic for custom image loading to avoid preventing daemon start because an image failed to load. + + Signed-off-by: Stefan J. Wernli + +commit 20390f65c487cfbe18e1f21650086a00e41eadff +Author: Tonis Tiigi +Date: Thu Apr 7 16:12:05 2016 -0700 + + Fix restart monitor stopping on manual restart + + Signed-off-by: Tonis Tiigi + +commit 2ecc55937c19d2090d58a989223ac1a449cae87d +Author: Nathan LeClaire +Date: Mon Apr 4 18:32:21 2016 -0700 + + Fix RC version mismatch bug + + Signed-off-by: Nathan LeClaire + +commit 47afe6bd0a0dc806c36d0978a8d3e23f75ef87fe +Author: David Calavera +Date: Thu Apr 7 14:29:18 2016 -0700 + + Remove reference package dependency from the api. + + Signed-off-by: David Calavera + +commit 77bf588830a15870f93b65f4c6d73a5da72473b1 +Merge: 819499d6d7 4301c3f402 +Author: Riyaz Faizullabhoy +Date: Thu Apr 7 15:00:54 2016 -0700 + + Merge pull request #670 from cyli/stop-installing-go-vet + + Do not install go vet on the Dockerfile + +commit c7076d26709f3fa277bd11e1dffdc8fc7833d38e +Author: Anusha Ragunathan +Date: Thu Apr 7 14:41:40 2016 -0700 + + Add non-experimental daemon as a test requirement. + + For test that should be exclusively run only in regular daemon builds + and not in the experimental version, add a requirement. + + Verified using TestCleanupMountsAfterDaemonKill. + - On regular daemon, the test ran. + - On experimental daemon, the test skipped. + + Signed-off-by: Anusha Ragunathan + +commit 34d4cae5038bb790f4adcd8f507f4fa56c47ba38 +Merge: 75b3569594 ac6341066d +Author: Dongluo Chen +Date: Thu Apr 7 14:18:52 2016 -0700 + + Merge pull request #2050 from abronan/fix_session_consul_leader_failure + + Fix Consul Leader Election Failure on multi-server and leader soft-restart + +commit aaa10d16b7252627c8709b18ae36b88feb79ca17 +Author: Victor Vieux +Date: Thu Apr 7 14:14:25 2016 -0700 + + fix restart docker in tests + + Signed-off-by: Victor Vieux + +commit 4301c3f402c8c056e9522bc06f0e27f4a6958cb4 +Author: Ying Li +Date: Thu Apr 7 14:09:57 2016 -0700 + + Pin the version of oscross, similarly to docker/docker + + Signed-off-by: Ying Li + +commit 55436e6348688506f27442427f3b3de37e07e31b +Author: Ying Li +Date: Thu Apr 7 14:09:27 2016 -0700 + + Do not install go vet on the Dockerfile, as it should already be in the image, and godeps no longer necessary + + Signed-off-by: Ying Li + +commit 14015eedb16c11b2f7e7a0b5ca45e78d24d34c7a +Merge: 14aa019d2d 3f358aeaca +Author: Sebastiaan van Stijn +Date: Thu Apr 7 13:42:17 2016 -0700 + + Merge pull request #21750 from LK4D4/flaky_format_test + + integration-cli: try to make TestEventsTimestampFormats less flaky + +commit 14aa019d2de3bd7f21d29d920bd074015a0e7d8d +Merge: 07f5804899 07fe6947a4 +Author: Vincent Demeester +Date: Thu Apr 7 22:39:23 2016 +0200 + + Merge pull request #21859 from tonistiigi/vendor-net-fork + + vendor: patch template init in trace pkg for performance + +commit 69eabdc81f9ea2997362347276f1997dfebe8bf1 +Author: Victor Vieux +Date: Sat Mar 26 10:23:25 2016 -0700 + + fix possible data race with failure count + + Signed-off-by: Victor Vieux + +commit 9b2c3aa8946eee15e5938f03c2202b16a7f22875 +Author: Alexander Morozov +Date: Thu Apr 7 13:21:05 2016 -0700 + + pkg/archive: use more narrow interface for CompressStream + + Signed-off-by: Alexander Morozov + +commit 07f580489908bf6a3373daac1473045406e1130d +Merge: 1fbdd354c2 80d6f672f5 +Author: Vincent Demeester +Date: Thu Apr 7 22:03:44 2016 +0200 + + Merge pull request #21806 from Microsoft/RemoveSymlinkTests + + Stop running symlink-volume tests on Windows + +commit ac6341066da09da32d71bc1c95e373eecac886c9 +Author: Alexandre Beslic +Date: Thu Apr 7 12:23:47 2016 -0700 + + Fix Consul Leader Election Failure on multi-server + + This fixes an error with Consul which fails to see a new + swarm leader after a consul leader soft restart because + of session renewal and missing status update. + + Signed-off-by: Alexandre Beslic + +commit 07fe6947a403124041dda50eb6d7f00e74f96ce7 +Author: Tonis Tiigi +Date: Thu Apr 7 11:00:54 2016 -0700 + + vendor: patch template init in trace pkg for performance + + Temporarily include a fork of golang/net package + that includes a performance patch. Measured performance + gain is ~60ms for every `docker run` command. + + Signed-off-by: Tonis Tiigi + +commit f5b80640fe1302233dcb2968729cb3ec48aa7377 +Merge: 5d0aab4a8e 9f47e43b5c +Author: Tony Witherspoon +Date: Thu Apr 7 12:46:27 2016 -0400 + + Merge branch '3191_2_help_cli_feature' of https://github.com/twitherspoon/compose into 3191_2_help_cli_feature + +commit 9f47e43b5c20e18b49a69923e3a2581a31e0762a +Merge: 129fb5b356 958f96c78a +Author: twitherspoon +Date: Thu Apr 7 12:43:34 2016 -0400 + + Merge branch 'master' into 3191_2_help_cli_feature + +commit 5d0aab4a8e3a231f6fd548be6f9881ddefc60cfc +Author: Tony Witherspoon +Date: Thu Apr 7 12:42:14 2016 -0400 + + updated cli_test.py to no longer expect raised SystemExit exceptions + + Signed-off-by: Tony Witherspoon + +commit 1fbdd354c2df5cebf981fcd6afe1355fbb040fd8 +Merge: e82830ecde 3785844c5b +Author: Jess Frazelle +Date: Thu Apr 7 16:41:25 2016 +0000 + + Merge pull request #21855 from vdemeester/makefile-typo + + Fixing a typo in Makefile + +commit e82830ecde02b3a607d5f3b470f2c4eff17c37e7 +Merge: 4f8a6f3e02 2b849e0263 +Author: Tibor Vass +Date: Thu Apr 7 12:30:45 2016 -0400 + + Merge pull request #21628 from clnperez/systemd-tasksmax-workaround + + Build-deb hack for systemd tasksmax + +commit 2b849e0263576a818fafd73ba0467633db3bb6cb +Author: Christy Perez +Date: Tue Mar 29 12:30:53 2016 -0500 + + Build-deb hack for systemd tasksmax + + Since we can't use the TasksMax value in the docker.service + file by default, we can uncomment it at buildtime. + + See docker/docker/pull/21491 for some background. + + Signed-off-by: Christy Perez + +commit 6c47f4d8e2fb0ec545304f7b78e3d8bc8901c737 +Author: Eric A. Zarko +Date: Tue Apr 5 11:54:51 2016 -0700 + + Adding Oracle Enterprise Linux provisioner + + Fixes #1361 + Fixes #3164 + Corrected copy/paste typo in libmachine/provision/fedora_test.go + Preserve environment when performing yum update for proxy settings. + + Signed-off-by: Eric A. Zarko + +commit 4f8a6f3e02135ade04d31b493ed08af4b308b9e0 +Merge: d5dfc4e526 a47cd63915 +Author: Brian Goff +Date: Thu Apr 7 12:02:33 2016 -0400 + + Merge pull request #21840 from tonistiigi/fix-closing-attach-streams + + Fix closing attach streams on lost tcp connection + +commit 3785844c5bdd57ded9a6410579e3a356b126c26e +Author: Vincent Demeester +Date: Thu Apr 7 16:10:09 2016 +0200 + + Fixing a typo in Makefile + + A typo is present in the new awesome `make help`, fixing that. + + Signed-off-by: Vincent Demeester + +commit d5dfc4e5262a56181b2203c3fb6474ebe3a4ae92 +Merge: 2e236d0255 c6f45fd2ee +Author: Vincent Demeester +Date: Thu Apr 7 10:09:02 2016 +0200 + + Merge pull request #21820 from estesp/lazy-init-useradd + + Lazy init useradd and remove init() + +commit 2e236d0255bd6f4f5f37c2512f89b22655d47d1f +Merge: 334f73f5b4 824c72f472 +Author: Vincent Demeester +Date: Thu Apr 7 10:07:25 2016 +0200 + + Merge pull request #21828 from dmcgowan/fix-overlay-on-overlay-test + + Fix overlay test running on overlay + +commit 334f73f5b4162ffc3bfb5a07323c83e732bfbfa6 +Merge: 36bc01c0cb 0c0198a5e6 +Author: Vincent Demeester +Date: Thu Apr 7 10:01:28 2016 +0200 + + Merge pull request #21842 from tonistiigi/fix-flaky-testsaveloadparents + + Fix flaky TestSaveLoadParents + +commit 36bc01c0cb6ff48b70aad17231d8561bc418096f +Merge: 8785952282 0b207e7558 +Author: Vincent Demeester +Date: Thu Apr 7 09:28:58 2016 +0200 + + Merge pull request #21835 from HackToday/fixsecurity + + Fix deprecated format for security-opt + +commit 8785952282a444358e934678b3833be935340259 +Merge: d7a04c7416 dbd9b7e121 +Author: Vincent Demeester +Date: Thu Apr 7 09:19:38 2016 +0200 + + Merge pull request #21830 from anusha-ragunathan/auplink + + Be more lenient on auplink errors. + +commit d7a04c741693295f4ee708bb3504a48bbbf824db +Merge: da0985fd16 5fdbce3185 +Author: Vincent Demeester +Date: Thu Apr 7 08:56:43 2016 +0200 + + Merge pull request #21841 from WeiZhang555/error-typo + + Fix typo + +commit 0c0198a5e671928b67db6a3be35f1a419f633af4 +Author: Tonis Tiigi +Date: Wed Apr 6 21:57:32 2016 -0700 + + Fix flaky TestSaveLoadParents + + Signed-off-by: Tonis Tiigi + +commit 5fdbce3185913b82f516938deedb954c612d7d5d +Author: Zhang Wei +Date: Thu Apr 7 12:46:55 2016 +0800 + + Fix typo + + Signed-off-by: Zhang Wei + +commit a47cd639158ee9cfd228c0ae8257301b8510f3ad +Author: Tonis Tiigi +Date: Wed Apr 6 16:49:45 2016 -0700 + + Fix closing attach streams on lost tcp connection + + Signed-off-by: Tonis Tiigi + +commit 824c72f4727504e3a8d37f87ce88733c560d4129 +Author: Derek McGowan +Date: Wed Apr 6 21:06:42 2016 -0700 + + Fix overlay test running on overlay + + Overlay tests were failing when /var/tmp was an overlay mount with a misleading message. + Now overlay tests will be skipped when attempting to be run on overlay. + Tests will now use the TMPDIR environment variable instead of only /var/tmp + + Fixes #21686 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit da0985fd16ef642856a249cd523f5c043748e6a5 +Merge: 9d7f6bb921 b967e381aa +Author: Jess Frazelle +Date: Thu Apr 7 02:51:27 2016 +0000 + + Merge pull request #21821 from vieux/make_help + + add `make help` + +commit 0b207e75585cd4ba9a40460d87766052dd7508a7 +Author: Kai Qiang Wu(Kennan) +Date: Thu Apr 7 02:09:13 2016 +0000 + + Fix deprecated format for security-opt + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 75b3569594e9549f5b2cdb583f9e623f2e5dccd1 +Merge: 335b2edda3 d403254ed2 +Author: Victor Vieux +Date: Wed Apr 6 18:26:19 2016 -0700 + + Merge pull request #1995 from allencloud/validate-overcommitRatio-not-to-be-negative + + validate swarm.overcommit and add integration test for cluster options + +commit dbd9b7e121c2e20e5429fdc97421c9510746161e +Author: Anusha Ragunathan +Date: Wed Apr 6 18:21:24 2016 -0700 + + Be more lenient on auplink errors. + + On aufs, auplink is run before the Unmount. Irrespective of the + result, we proceed to issue a Unmount syscall. In which case, + demote erros on auplink to warning. + + Signed-off-by: Anusha Ragunathan + +commit d403254ed2d34ecebac6741d5b5a201077608c4c +Author: Sun Hongliang +Date: Fri Mar 18 23:46:29 2016 +0800 + + 1.validate cluster option swarm.overcommit + 2.change swarm.createretry's error info and add its integration test + Signed-off-by: Sun Hongliang + +commit 335b2edda3217af4c0acd0259ba3201780d5a3ec +Merge: ee30452059 6d2a411818 +Author: Dongluo Chen +Date: Wed Apr 6 17:58:25 2016 -0700 + + Merge pull request #2093 from vieux/do_not_go_get_vet + + do not go get vet in travis + +commit 6d2a4118189990243c8417c63ceba98893fab1f5 +Author: Victor Vieux +Date: Wed Apr 6 17:48:17 2016 -0700 + + do not go get vet in travis + + Signed-off-by: Victor Vieux + +commit ee30452059e35b6b32de7b2d873c7138b0b8dc14 +Merge: e7077ff5e3 65a5d54727 +Author: Victor Vieux +Date: Wed Apr 6 17:20:09 2016 -0700 + + Merge pull request #2080 from allencloud/log-warn-when-getting-engine-label-named-node + + send warn message if got an engine with label "node" + +commit b967e381aac05bd309a0ce9eb2f0c46d4a60d8a7 +Author: Victor Vieux +Date: Wed Apr 6 14:45:32 2016 -0700 + + remove docker info warnings (if any) from Makefile + + Signed-off-by: Victor Vieux + +commit c72b51b09c2a51ef82b00a8ab69002088f2f3249 +Author: Victor Vieux +Date: Wed Apr 6 13:45:21 2016 -0700 + + add `make help` + Signed-off-by: Victor Vieux + +commit 9d7f6bb921d7ea9a0954fe0e4e7612742935a540 +Merge: 76aefc18f9 818a5198e4 +Author: John Howard +Date: Wed Apr 6 15:36:39 2016 -0700 + + Merge pull request #21733 from Microsoft/sjw/updatepending + + Adding postRunProcessing infrastructure for hanlding Windows Update. + +commit fb0445af7c97323abdd9a08f32b3f2c62ff01556 +Merge: be6d9864ea ff06972d1f +Author: French Ben +Date: Wed Apr 6 15:16:53 2016 -0700 + + Merge pull request #1606 from docker/remove-localstorage + + Remove localstorage + +commit c6f45fd2eef00d6dcdcf319400c0c6cd891e9d2a +Author: Phil Estes +Date: Wed Apr 6 17:24:17 2016 -0400 + + Lazy init useradd and remove init() + + This should not have been in init() as it causes these lookups to happen + in all reexecs of the Docker binary. The only time it needs to be + resolved is when a user is added, which is extremely rare. + + Docker-DCO-1.1-Signed-off-by: Phil Estes + +commit 55f1b7651f6242617133312ff8af5c2e4e3628ea +Merge: 27e0be3e95 e4817cfc94 +Author: Richard Scothern +Date: Wed Apr 6 14:46:12 2016 -0700 + + Merge pull request #1590 from RichardScothern/s3-permission-scopes + + Document required IAM permissions for S3 storage driver. + +commit ff06972d1f2756810aa7c59a2057014d40becb42 +Author: French Ben +Date: Wed Apr 6 14:44:46 2016 -0700 + + Removed all localstorage checks + + Signed-off-by: French Ben + +commit be6d9864ea8e143c2ca111f07faec37fb2cf153b +Merge: 5e0356659d 20a0a4b670 +Author: French Ben +Date: Wed Apr 6 14:36:30 2016 -0700 + + Merge pull request #1603 from docker/1591-update-terminal + + Updated path to work properly on linux - Fixes #1591 + +commit 76aefc18f988d1c21382e3be88edcb6c99a91ea7 +Merge: d82e522e36 8b408fd66b +Author: Tibor Vass +Date: Wed Apr 6 17:31:59 2016 -0400 + + Merge pull request #21691 from tonistiigi/fix-gccgo-make + + Fix building gccgo from makefile + +commit 3f358aeaca2bf02ea33e6d487a69f60fff88084c +Author: Alexander Morozov +Date: Mon Apr 4 10:13:10 2016 -0700 + + integration-cli: try to make TestEventsTimestampFormats less flaky + + Fix #21749 + + Signed-off-by: Alexander Morozov + +commit e4817cfc94befcfae80a7568d2c3245477e946e5 +Author: Richard Scothern +Date: Wed Apr 6 14:22:08 2016 -0700 + + Remove ListAllMyBuckets from the S3 permission scope. + + Signed-off-by: Richard Scothern + +commit d82e522e36a6d1ce89185bcddd05511c0a074eed +Merge: 65464d11f1 8a957bafa5 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 14:18:33 2016 -0700 + + Merge pull request #21810 from aboch/vnd + + Vendoring libnetwork v0.7.0-rc.4 + +commit 65464d11f1b1aac6a5b9792cb599e23f376d169d +Merge: 40dc921da2 331c8a86d4 +Author: Alexander Morozov +Date: Wed Apr 6 14:11:33 2016 -0700 + + Merge pull request #21809 from Microsoft/jjh/tp4removal + + Windows: Remove TP4 support from main codebase + +commit f8c42e4cbfbe1da54a722bcbc639533a35dc64e5 +Author: Ying Li +Date: Wed Apr 6 14:08:08 2016 -0700 + + NotaryRepository.Update now just returns an error, rather than a client + an error, because we don't actually use the client anymore. + + Signed-off-by: Ying Li + +commit 818a5198e4a76cd63ff84a7796ff3b0b91302552 +Author: Stefan J. Wernli +Date: Fri Apr 1 17:02:38 2016 -0700 + + Adding postRunProcessing infrastructure for hanlding Windows Update. + + Signed-off-by: Stefan J. Wernli + +commit ef5bfad3210a9e9c8b761f2c11c0c6289490ebff +Author: Stefan J. Wernli +Date: Thu Feb 18 17:24:59 2016 -0800 + + Adding readOnly parameter to graphdriver Create method + + Since the layer store was introduced, the level above the graphdriver + now differentiates between read/write and read-only layers. This + distinction is useful for graphdrivers that need to take special steps + when creating a layer based on whether it is read-only or not. + Adding this parameter allows the graphdrivers to differentiate, which + in the case of the Windows graphdriver, removes our dependence on parsing + the id of the parent for "-init" in order to infer this information. + + This will also set the stage for unblocking some of the layer store + unit tests in the next preview build of Windows. + + Signed-off-by: Stefan J. Wernli + +commit 1771d35b4852be197c90c19ba5aada940e133c2b +Author: Phil Estes +Date: Wed Apr 6 16:45:43 2016 -0400 + + Don't perform external setkey when net==host + + This else case was lost in the migration from native execdriver to OCI + implementation via runc. There is no need to have external setkey when + --net=host. + + Docker-DCO-1.1-Signed-off-by: Phil Estes + +commit ccd0da908ac2b0743ca2c8e80c589295fd3b2563 +Author: John Howard +Date: Wed Apr 6 13:42:15 2016 -0700 + + Windows: Fix failing unit tests + + Signed-off-by: John Howard + +commit 3ef6b17bfc1d6aeb97b5ef2ac77c3659cd28ac4e +Author: Joffrey F +Date: Wed Apr 6 13:28:45 2016 -0700 + + Use docker-py 1.8.0 + + Signed-off-by: Joffrey F + +commit 40dc921da21e4f1fd165f1d7da87d600e3eb8609 +Merge: 5709f8e422 5ee8652a21 +Author: Phil Estes +Date: Wed Apr 6 16:27:14 2016 -0400 + + Merge pull request #21805 from LK4D4/unused_stuff + + all: remove some unused funcs and variables + +commit 5709f8e4227e0e1da333739c44003a3f47279bd5 +Merge: 02297d5a33 91e5bb9541 +Author: Vincent Demeester +Date: Wed Apr 6 22:14:14 2016 +0200 + + Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys + + Client print error when specify wrong detach keys + +commit 02297d5a33958abac7d83ee8ec5aada32152db79 +Merge: 2bbe75cdb6 5bd1786387 +Author: Tibor Vass +Date: Wed Apr 6 16:10:53 2016 -0400 + + Merge pull request #21794 from coolljt0725/cleanipc_quiet + + Don't throw error on clenaup ipc mounts if it does not exists + +commit 2bbe75cdb62d4f53c6bd3f1586aa782b7b116f31 +Merge: 8c361eb5da 68ade49ada +Author: Sebastiaan van Stijn +Date: Wed Apr 6 13:01:22 2016 -0700 + + Merge pull request #21783 from vieux/fix_21772 + + do not trim one char from {{.Names}} each time it is used in --format + +commit 8c361eb5da51318168d7d1bd2214f7369de28394 +Merge: 6bd429cb2a a038cccf88 +Author: Tibor Vass +Date: Wed Apr 6 15:56:42 2016 -0400 + + Merge pull request #21723 from devimc/master + + Fix compilation errors with btrfs-progs-4.5 + +commit 6bd429cb2aabfed7a39748aa3fefd047883f893a +Merge: 40ccb7114e 0bfc9c8de0 +Author: Tibor Vass +Date: Wed Apr 6 15:21:38 2016 -0400 + + Merge pull request #21802 from tiborvass/carry-21716 + + Carry 21716: When container had no layer data, cleanupContainer crashed + +commit 8a957bafa58e2eed8f31722c7fcc3709ca509a29 +Author: Alessandro Boch +Date: Wed Apr 6 12:18:21 2016 -0700 + + Vendoring libnetwork v0.7.0-rc.4 + + Signed-off-by: Alessandro Boch + +commit 331c8a86d489e573fcbf1df3c4f813bbc3168624 +Author: John Howard +Date: Wed Apr 6 12:01:29 2016 -0700 + + Windows: Remove TP4 support from main code + + Signed-off-by: John Howard + +commit 5f1a7833a15def1a8f2df873e3de3e4f6e90d8a8 +Author: French Ben +Date: Wed Apr 6 11:41:58 2016 -0700 + + added comment for error + + Signed-off-by: French Ben + +commit e7077ff5e3e620695ac8606131e28cf0480694ac +Merge: ba9b348bda b6f646cacd +Author: Victor Vieux +Date: Wed Apr 6 11:13:05 2016 -0700 + + Merge pull request #2074 from allencloud/log-err-when-remove-fails-in-rescheduling + + log err when remove container fails in rescheduling + +commit 40ccb7114e7aceca38e66b365d4f54e4f4d64d0c +Merge: 27f50c40e6 606cf5310d +Author: Brian Goff +Date: Wed Apr 6 14:12:38 2016 -0400 + + Merge pull request #21768 from shishir-a412ed/fix_docker_run + + Ignore os.IsNotExist errors when calling ToDiskLocking + +commit 68ade49adab15429168903f5600ab64ce7f7c8c5 +Author: Victor Vieux +Date: Sat Mar 26 11:29:57 2016 -0700 + + do not trim one char from {{.Names}} each time it is used in --format + + Signed-off-by: Victor Vieux + +commit 27f50c40e6d2fffaf0bb7811f9c602943fea5e24 +Merge: a79e79c58e cf73ebf280 +Author: Alexander Morozov +Date: Wed Apr 6 11:01:23 2016 -0700 + + Merge pull request #21804 from mlaventure/arm-fix + + Skip migration unit test on non amd64 platform + +commit a79e79c58e7da0ab8519e708271f0e45a341c3d2 +Merge: 636e7760e2 5b892819a6 +Author: Tibor Vass +Date: Wed Apr 6 13:54:21 2016 -0400 + + Merge pull request #21780 from sanimej/libn-v0.7rc2 + + Vendor Libnetwork v0.7.0-rc.3 + +commit 5ee8652a21756b1b4719e3477bd871d13b237c12 +Author: Alexander Morozov +Date: Wed Apr 6 10:40:01 2016 -0700 + + all: remove some unused funcs and variables + + Signed-off-by: Alexander Morozov + +commit 636e7760e2413e5871dad5492506ee77b7b4a020 +Merge: 3d800dc019 4a698c9c43 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 10:18:11 2016 -0700 + + Merge pull request #21787 from npcode/fix-docs-plugin-api-markdown + + Fix incorrect markdown rendering + +commit 3d800dc0192d0d246b0c1888bbe94aca5d52e1d2 +Merge: bbcbed3b54 4ed2040258 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 10:15:37 2016 -0700 + + Merge pull request #21712 from yongtang/21335-docs-container-with-volumes + + Remote API docs give incorrect example for creating a container with volumes. + +commit cf73ebf280c6a1ac8106bb8374f990fe08f221d8 +Author: Kenfe-Mickael Laventure +Date: Wed Apr 6 09:55:52 2016 -0700 + + Skip migration unit test on non amd64 platform + + Signed-off-by: Kenfe-Mickael Laventure + +commit bbcbed3b54ca5e1ed4f23bb4bf58397e8f7d645b +Merge: 0e5694412b 9a7f2e7268 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 10:02:32 2016 -0700 + + Merge pull request #21799 from coolljt0725/fix_docs + + Correct the description of --group-add in run.md + +commit 0e5694412b267b13ec00b1c159beef3930eeed38 +Merge: c7cf245053 66b8714da4 +Author: Sebastiaan van Stijn +Date: Wed Apr 6 10:00:11 2016 -0700 + + Merge pull request #21790 from thaJeztah/carry-21241-explain-build-cache + + [carry 21241] explain the impact on build caching more clearly + +commit 958f96c78a8c2a16a381de091247cd1e8a4c4f11 +Merge: 86530287d6 b33d7b3dd8 +Author: Daniel Nephin +Date: Wed Apr 6 12:45:46 2016 -0400 + + Merge pull request #3269 from dnephin/fix_logs_and_scale_down + + Prevent unnecessary inspection of containers + +commit 0bfc9c8de07cb2ad716d522952b2901080161909 +Author: mYmNeo +Date: Tue Apr 5 09:30:05 2016 +0800 + + when container had no layer data, cleanupContainer crashed + + Signed-off-by: mYmNeo + +commit ce87de21a7594f5d49987a7333f1f0e77984f117 +Author: mYmNeo +Date: Fri Apr 1 14:52:29 2016 +0800 + + fix TestCreateShrinkRootfs and TestCreateShrinkRootfs + + Signed-off-by: mYmNeo + +commit 90f512427f3a10144a8f589ea9b18d36cf48b94c +Author: mYmNeo +Date: Wed Apr 6 09:45:30 2016 +0800 + + fix test requirement about devicemapper and not overlay + + Signed-off-by: mYmNeo + +commit ba9b348bdaccd3e514c745804258f3c20a41c274 +Merge: 08090d51f8 bb4a26f238 +Author: moxiegirl +Date: Wed Apr 6 09:17:02 2016 -0700 + + Merge pull request #2046 from allencloud/fix-typos-in-docs + + fix typos in docs + +commit c7cf2450537cf5f5f6d24067447376402ddf2680 +Merge: f3da0c9055 3f81b49352 +Author: Tibor Vass +Date: Wed Apr 6 12:16:28 2016 -0400 + + Merge pull request #21751 from tonistiigi/runc-maskedpaths + + Define readonly/mask paths in spec + +commit 606cf5310d20518b4a9dfbe4d8e6b872f8683d9e +Author: Shishir Mahajan +Date: Mon Apr 4 16:04:32 2016 -0400 + + Ignore os.IsNotExist errors when calling ToDiskLocking + + Signed-off-by: Shishir Mahajan + +commit b33d7b3dd88dbadbcd4230e38dc0a5504f9a6297 +Author: Daniel Nephin +Date: Tue Apr 5 11:26:23 2016 -0400 + + Prevent unnecessary inspection of containers when created from an inspect. + + Signed-off-by: Daniel Nephin + +commit f3da0c9055ea73dec1d793d4ff524a58ad67f635 +Merge: e24673def2 4982a732f3 +Author: John Howard +Date: Wed Apr 6 07:52:07 2016 -0700 + + Merge pull request #21669 from msabansal/expose + + Enabling expose support for Windows TP5 + +commit e24673def241339303064aeac939d4f86c992915 +Merge: 891023617a 50d5d55f56 +Author: Brian Goff +Date: Wed Apr 6 10:39:55 2016 -0400 + + Merge pull request #21795 from mountkin/refactor-init + + refactor the init function in docker_utils.go + +commit 891023617ab8ddc04848db52439080f9127e99b7 +Merge: c760ea3d93 83809de7d4 +Author: Brian Goff +Date: Wed Apr 6 10:23:53 2016 -0400 + + Merge pull request #21779 from Microsoft/jjh/dockerfile + + Windows: Dockerfile for TP5 + +commit c760ea3d93b075c19806f532e637d586631a0303 +Merge: bb9b17314d d6ab2ad36d +Author: Brian Goff +Date: Wed Apr 6 10:20:58 2016 -0400 + + Merge pull request #21785 from Microsoft/jjh/nodeletenat + + Windows: integration-cli don't delete nat + +commit 9a7f2e726885386f57d115f8652b0ae87b20dce6 +Author: Lei Jitang +Date: Wed Apr 6 21:52:10 2016 +0800 + + Correct the description of --group-add in run.md + + Signed-off-by: Lei Jitang + +commit 67321cb6229009f784f9d710421d8aea3e0879be +Author: Stefan Majewsky +Date: Tue Apr 5 16:46:39 2016 +0200 + + detect outdated container listings during Stat() and getAllSegments() + + Signed-off-by: Stefan Majewsky + +commit 50d5d55f566b65b506bf54ccf0d897a0cb95734e +Author: Shijiang Wei +Date: Wed Apr 6 13:32:02 2016 +0800 + + refactor the init function in docker_utils.go + + Signed-off-by: Shijiang Wei + +commit dbb6e28da26452f89dff7b5d1c99063079795033 +Author: Arien Holthuizen +Date: Wed Apr 6 13:34:14 2016 +0200 + + Only check validity of S3 region if not using custom endpoint + + Signed-off-by: Arien Holthuizen + +commit 5bd1786387bdb0af2e665fecde3ac08f8db61008 +Author: Lei Jitang +Date: Wed Apr 6 07:34:31 2016 -0400 + + Don't throw error on clenaup ipc mounts if it does not exists + + Signed-off-by: Lei Jitang + +commit 66b8714da4e92b3587cbbf25116541f4de63169e +Author: mikelinjie <294893458@qq.com> +Date: Wed Mar 16 15:26:57 2016 +0800 + + make the cache miss clear + + Signed-off-by: mikelinjie <294893458@qq.com> + Signed-off-by: Sebastiaan van Stijn + +commit bb9b17314df38756af70b060838e751756e5a646 +Merge: 81b01b44c6 2f69d7689d +Author: Lei Jitang +Date: Wed Apr 6 15:29:40 2016 +0800 + + Merge pull request #21789 from npcode/docs-plugins-authorization-null + + Use 'null' instead of 'nil' for json + +commit 819499d6d794b827b70b628d3a57520e01ba43d0 +Merge: 6e84b596ca b623214737 +Author: Ying Li +Date: Wed Apr 6 00:23:32 2016 -0700 + + Merge pull request #652 from docker/docs-update + + Include docs about what happens if a client's keys get compromised + +commit 2f69d7689dcb2ed95093599f0acef7d5445f83b0 +Author: Yi EungJun +Date: Wed Apr 6 16:10:30 2016 +0900 + + Use 'null' instead of 'nil' for json + + When describe json response, 'null' is better than 'nil' which is not in + json specification. + + Signed-off-by: Yi EungJun + +commit 4a698c9c43804df1d6096e09ff682477efae3431 +Author: Yi EungJun +Date: Wed Apr 6 15:37:49 2016 +0900 + + Fix incorrect markdown rendering + + The docker document site [1] rendered the list of plugin implements + incorrectly. + + [1]: https://docs.docker.com/engine/extend/plugin_api + + Signed-off-by: Yi EungJun + +commit b6f646cacd420660a408f75cd44af27476c54503 +Author: Sun Hongliang +Date: Mon Apr 4 13:22:37 2016 +0800 + + log err when remove container fails in rescheduling + + Signed-off-by: Sun Hongliang + +commit 5b892819a60a0a91c168c6a2c1e22c958be143ca +Author: Santhosh Manohar +Date: Tue Apr 5 16:39:16 2016 -0700 + + Vendor Libnetwork v0.7.0-rc.3 + + Signed-off-by: Santhosh Manohar + +commit 81b01b44c66203d6cb1d7b277a716593055523cb +Merge: fc9912fd00 34700cc1f3 +Author: Aaron Lehmann +Date: Tue Apr 5 20:32:14 2016 -0700 + + Merge pull request #21767 from allencloud/fix-typos + + fix typos + +commit 34700cc1f3cf663dc4eecacbb6f06240ad679919 +Author: allencloud +Date: Tue Apr 5 20:53:04 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit d6ab2ad36d8c184bd7ea140df8b4894eff42b02d +Author: John Howard +Date: Tue Apr 5 19:29:43 2016 -0700 + + Windows: integration-cli don't delete nat + + Signed-off-by: John Howard + +commit 83809de7d45d3465977b2f7a7cf585863cec445c +Author: John Howard +Date: Tue Apr 5 16:25:43 2016 -0700 + + Windows: Dockerfile for TP5 + + Signed-off-by: John Howard + +commit 08090d51f8ed598a4769436f31e900dd6101a841 +Merge: 1f61d438de 2a778b3600 +Author: Dongluo Chen +Date: Tue Apr 5 18:49:05 2016 -0700 + + Merge pull request #2090 from HackToday/fixolddoc + + Fix old NODE column + +commit 2a778b36009db0c495f65c3e7aabfaf3b0cd3044 +Author: Kai Qiang Wu(Kennan) +Date: Wed Apr 6 01:39:33 2016 +0000 + + Fix old NODE column + + Some fixes was missed in last PR. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 50a61810056a421fb94acf26277995f2c1f31ede +Author: Qiang Huang +Date: Wed Apr 6 09:37:51 2016 +0800 + + Add minimum limit for memory reservation + + Kernel has no limit for memory reservation, but in different + kernel versions, the default behavior is different. + + On kernel 3.13, + docker run --rm --memory-reservation 1k busybox cat /sys/fs/cgroup/memory/memory.soft_limit_in_bytes + the output would be 4096, but on kernel 4.1, the output is 0. + + Since we have minimum limit for memory and kernel memory, we + can have this limit for memory reservation as well, to make + the behavior consistent. + + Signed-off-by: Qiang Huang + +commit 1f61d438de1d540f70e19e7553d63a6d3cfe04c7 +Merge: d0cd5ea554 8afd32a631 +Author: Victor Vieux +Date: Tue Apr 5 17:48:49 2016 -0700 + + Merge pull request #2088 from HackToday/fixolddoc + + Fix doc for NODE column + +commit 8afd32a631a63126788c73b7ba87574c8750c3ad +Author: Kai Qiang Wu(Kennan) +Date: Wed Apr 6 00:40:43 2016 +0000 + + Fix doc for NODE column + + Swarm docker ps output nolonger have NODE column, So this updates the doc + + Fixes: #2081 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 20a0a4b6705f9348d41dbb83fda606e07e58438d +Author: French Ben +Date: Tue Apr 5 17:14:34 2016 -0700 + + Updated path to work properly on linux + + Signed-off-by: French Ben + +commit 5175c9a5eac3b8261d0f8152db87a5fbffb2698f +Author: John Howard +Date: Tue Apr 5 15:32:40 2016 -0700 + + Windows: So long TP4, so long... + + Signed-off-by: John Howard + +commit 80d6f672f5b5819aecf37ca902195558151cc87b +Author: Darren Stahl +Date: Tue Apr 5 13:21:20 2016 -0700 + + Stop running symlink-volume tests on Windows + + Signed-off-by: Darren Stahl + +commit fc9912fd00f5e12a6f0904f3c758275724ba3318 +Merge: 806a8e22b9 194eaa5c0f +Author: John Howard +Date: Tue Apr 5 16:16:25 2016 -0700 + + Merge pull request #21272 from Microsoft/jstarks/manifest_updates + + Add os_version and os_features to Image + +commit 6e84b596ca1386e14a547a69e234659cf5836ec0 +Merge: 1f3c04a0b1 38cfb6f961 +Author: Ying Li +Date: Tue Apr 5 15:59:05 2016 -0700 + + Merge pull request #665 from cyli/changelist-assert-require + + Change assert to require in client/changelist + +commit 27e0be3e9528a054b22dcf6b6fd1ad0245f187b6 +Merge: 75e55632fd 2ea61dc04f +Author: Richard Scothern +Date: Tue Apr 5 15:38:01 2016 -0700 + + Merge pull request #1583 from dmcgowan/golem-integration-tests + + Update docker integration tests to use golem + +commit 38cfb6f961c88c2734b5fc4238149f5c720f6e5b +Author: Ying Li +Date: Tue Apr 5 11:27:36 2016 -0700 + + Change assert to require in client/changelist package. + + Signed-off-by: Ying Li + +commit b62321473789c704c02ee4ab68348821a5540d36 +Author: Ying Li +Date: Thu Mar 31 22:14:04 2016 -0700 + + Link Audit PDF. Other grammatical and formatting changes. + + Signed-off-by: Ying Li + +commit 4881afd56c871f8e5cd2836c79fedaa1232a97f3 +Author: Ying Li +Date: Thu Mar 31 22:08:44 2016 -0700 + + Single space after a full stop in already-touched files + + Signed-off-by: Ying Li + +commit 7cbe4da88fd199bd6185d79c0ee3f4773c478da0 +Author: Ying Li +Date: Thu Mar 31 22:04:01 2016 -0700 + + Turn external links into html tags that target a new window. + Make the links to www.theupdateframework.com consistent. + Link to a particular git sha of the TUF spec. + + Signed-off-by: Ying Li + +commit ac213d44c8bd12a8f379ed4e391f2800e3ff81a9 +Author: Ying Li +Date: Thu Mar 31 19:06:05 2016 -0700 + + Update README to link to our other docs + + Signed-off-by: Ying Li + +commit 1396e8890dd4847f908481e5ccff51ef7f25fc54 +Author: Ying Li +Date: Wed Mar 30 18:45:34 2016 -0700 + + Convert the key compromise data into a tabular format + + Signed-off-by: Ying Li + +commit 3ad94c8e51bd6bf8957aa76981477b34e8933999 +Author: Ying Li +Date: Wed Mar 30 18:45:12 2016 -0700 + + Bump GO version requirement in README to 1.6 + + Signed-off-by: Ying Li + +commit 71c5e29ee168b280e792a7f3880eb8be124cca09 +Author: Ying Li +Date: Wed Mar 30 14:04:51 2016 -0700 + + Address review comments with regard to key hierarchy + + Signed-off-by: Ying Li + +commit bbc70996cdb7618a5a3f90815e663c4c25aa5a8b +Author: Ying Li +Date: Wed Mar 30 13:05:40 2016 -0700 + + Include docs about what happens if a client's keys get compromised + + Signed-off-by: Ying Li + +commit 806a8e22b96900bc1db5541d316c1cd91c493bea +Merge: 83bc8d2b8c 9a25b1d942 +Author: Alexander Morozov +Date: Tue Apr 5 14:43:57 2016 -0700 + + Merge pull request #21755 from cpuguy83/bytespipe_allocs + + Improve performance/reduce allocs of bytespipe + +commit 1f3c04a0b1a3823b22a6a9cbd57f886ad4cee0a3 +Merge: 90c91d568f de36693ce7 +Author: Riyaz Faizullabhoy +Date: Tue Apr 5 13:46:56 2016 -0700 + + Merge pull request #651 from docker/update-vendor-test + + Update vendoring test to use new vendor structure + +commit de36693ce7d2e751f016fbcf5478c80b95a548e6 +Author: Riyaz Faizullabhoy +Date: Tue Apr 5 11:03:24 2016 -0700 + + Remove vendor from GOPATH, use GO15VENDOREXPERIMENT flag + + Signed-off-by: Riyaz Faizullabhoy + +commit 66bd0579a37279a0950685c817d4a7e9bc5744fc +Author: Riyaz Faizullabhoy +Date: Wed Mar 30 10:29:27 2016 -0700 + + Update vendoring test to use new vendor structure + + Signed-off-by: Riyaz Faizullabhoy + +commit 90c91d568fe53a19eba17c4414590713919dc5a2 +Merge: 7bd09c523b 79238e087f +Author: Ying Li +Date: Tue Apr 5 13:14:53 2016 -0700 + + Merge pull request #664 from cyli/tuf-assert-require + + Finish converting assert to require in tuf/* packages + +commit d0cd5ea554ac000252a3b1b8c044ec906abcdbd4 +Merge: cdb3a59493 012dffeee3 +Author: Victor Vieux +Date: Tue Apr 5 12:28:33 2016 -0700 + + Merge pull request #2077 from nishanttotla/update-engine-api-backward-compat + + Updating apiClient version based on engine version + +commit 012dffeee3d754e61b4e9744d39e8ea573efce41 +Author: Nishant Totla +Date: Tue Apr 5 09:17:16 2016 -0700 + + Updating apiClient version using server version + + Signed-off-by: Nishant Totla + +commit 79238e087ff4a4c812a087c3f7b95f71d2dcf0a5 +Author: Ying Li +Date: Tue Apr 5 11:20:45 2016 -0700 + + Change assert to require in tuf/* packages + + Signed-off-by: Ying Li + +commit 7bd09c523b05ad3f764a0d9b3d76971f9fd34b69 +Merge: 69a25b8906 4657bbd3c5 +Author: David Lawrence +Date: Tue Apr 5 10:55:39 2016 -0700 + + Merge pull request #655 from docker/server-signer-alpine + + Convert the server and signer images to use alpine + +commit 69a25b8906e2106624382d0535848a73ec943863 +Merge: 8757f5edb8 f0e7be69c9 +Author: David Lawrence +Date: Tue Apr 5 10:07:37 2016 -0700 + + Merge pull request #661 from docker/cryptoservice-require + + Update to use require for cryptoservice package + +commit 9a25b1d942da88439ec04797ff6f1c33c3b5562d +Author: Brian Goff +Date: Thu Mar 31 09:50:50 2016 -0700 + + Improve performance/reduce allocs of bytespipe + + Creates a `fixedBuffer` type that is used to encapsulate functionality + for reading/writing from the underlying byte slices. + + Uses lazily-loaded set of sync.Pools for storing buffers that are no + longer needed so they can be re-used. + + ``` + benchmark old ns/op new ns/op delta + BenchmarkBytesPipeWrite-8 138469 48985 -64.62% + BenchmarkBytesPipeRead-8 130922 56601 -56.77% + + benchmark old allocs new allocs delta + BenchmarkBytesPipeWrite-8 18 8 -55.56% + BenchmarkBytesPipeRead-8 0 0 +0.00% + + benchmark old bytes new bytes delta + BenchmarkBytesPipeWrite-8 66903 1649 -97.54% + BenchmarkBytesPipeRead-8 0 1 +Inf% + ``` + + Signed-off-by: Brian Goff + +commit 8757f5edb8d6f9b937e2543105da6efdc795de4f +Merge: 541b63d9cc cb6bf2e1a2 +Author: David Lawrence +Date: Tue Apr 5 10:05:54 2016 -0700 + + Merge pull request #660 from docker/cmd-require-tests + + Use require instead of assert for cmd + +commit 541b63d9cc6a9931423f149900c6a15026c7f2c7 +Merge: b9b0d1f788 ad7200b8bb +Author: David Lawrence +Date: Tue Apr 5 10:04:28 2016 -0700 + + Merge pull request #662 from docker/signer-require + + Use require instead of assert for signer package + +commit b9b0d1f788e227a85f733fbc7138bb534b4322a9 +Merge: 1a7d2ca35d 5d0b926b7f +Author: David Lawrence +Date: Tue Apr 5 10:03:37 2016 -0700 + + Merge pull request #663 from docker/trustmanager-require + + Use require for certs and trustmanager + +commit 75e55632fd4937c145cf7c6864300cccbe8fcfe2 +Merge: 20fa47886d 25c5efdef9 +Author: Richard Scothern +Date: Tue Apr 5 09:46:12 2016 -0700 + + Merge pull request #1597 from tonyhb/log-upload-copy-errors + + Ensure we log io.Copy errors and bytes copied/total in uploads + +commit cbb7c27621afc3f5a800becbeadb19622f7adce9 +Author: Nishant Totla +Date: Tue Apr 5 09:16:50 2016 -0700 + + Updating Godeps (engine-api) + + Signed-off-by: Nishant Totla + +commit 83bc8d2b8c0afcf339cd24e19a472db8aa3514e5 +Merge: 8d31b0f051 0cad90911f +Author: Vincent Demeester +Date: Tue Apr 5 13:58:14 2016 +0200 + + Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix + + Fix spelling error in names-generator.go + +commit 0cad90911f8b9fab9b9acc940b5759ee1939306e +Author: Lars Butler +Date: Tue Apr 5 12:28:08 2016 +0200 + + Fix spelling error in names-generator.go + + Signed-off-by: Lars Butler + +commit 8d31b0f0515a800d9af29783ff3aa601196cf55c +Merge: deedb063b3 737219bbdb +Author: Vincent Demeester +Date: Tue Apr 5 09:38:35 2016 +0200 + + Merge pull request #21719 from senk/21710-fix-client-help-text + + Fixing help text of "docker network --help" to be consistent + +commit deedb063b3a451621e10eefaa78ded4413508051 +Merge: d20933c461 16dfb38fb8 +Author: Vincent Demeester +Date: Tue Apr 5 09:37:39 2016 +0200 + + Merge pull request #21713 from sunyuan3/kernel-memory20160401 + + Add pause status check for --kernel-memory + +commit c1904a1729136db8f60e489339ba14e9c5197a2b +Author: Tom Deseyn +Date: Tue Apr 5 06:05:31 2016 +0200 + + azure.md: extend documentation of command line options + + Improve doc of azure-subnet-prefix, azure-use-private-ip and + azure-no-public-ip options. + https://github.com/docker/machine/issues/3249 + + Signed-off-by: Tom Deseyn + +commit 65a5d54727f08a3cd4a74a5c3863b7572ff9ecb5 +Author: Sun Hongliang +Date: Tue Apr 5 11:06:16 2016 +0800 + + send warn message if got an engine with label "node" + + Signed-off-by: Sun Hongliang + +commit 2ea61dc04fcdba86a296c348dc35b98c6acf4d11 +Author: Derek McGowan +Date: Wed Mar 30 16:07:22 2016 -0700 + + Add temporary cache directory + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 17f7f60d779dd34d9f3cd2c85c398074cbc6d424 +Author: Derek McGowan +Date: Wed Mar 30 13:55:24 2016 -0700 + + Update docker integration tests to use golem + + Use registry example from golem repository. + Use the golem test runner for the docker integration environment + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 3f81b4935292d5daedea9de4e2db0895986115da +Author: Tonis Tiigi +Date: Mon Apr 4 14:27:44 2016 -0700 + + Define readonly/mask paths in spec + + This vendors in new spec/runc that supports + setting readonly and masked paths in the + configuration. Using this allows us to make an + exception for `—-privileged`. + + Signed-off-by: Tonis Tiigi + +commit 5b4159d0d8a1c96cf585b23710f2090ddb9c9384 +Merge: bc54d366d5 f8640357c3 +Author: Nathan LeClaire +Date: Mon Apr 4 18:41:20 2016 -0700 + + Merge pull request #3266 from bamarni/patch-1 + + [doc] typo in generic driver + +commit 1a7d2ca35d45fae7de2e22974ceb58c82dbb0981 +Merge: d36e485198 15908298bd +Author: Ying Li +Date: Mon Apr 4 17:39:31 2016 -0700 + + Merge pull request #657 from docker/server-assert-to-requires + + Change github.com/docker/notary/server/... tests to use require + +commit f44673e28631749d3e1eb20ef00e8deccd620dd8 +Author: Nathan LeClaire +Date: Mon Apr 4 17:34:14 2016 -0700 + + Bump OSX build for changed archive format + +commit bc54d366d54a833f1a09fcc56cffde7d97b54c0e +Merge: 1f27895379 6c3faf7d05 +Author: Nathan LeClaire +Date: Mon Apr 4 17:30:17 2016 -0700 + + Merge pull request #3269 from ahmetalpbalkan/azure_msg + + azure: more accurate messages for resources created + +commit 1f278953797f848612cdd0ec63f4d0470c93e384 +Merge: 60dbecbbd5 3e3138fcd7 +Author: Nathan LeClaire +Date: Mon Apr 4 17:30:00 2016 -0700 + + Merge pull request #3265 from bamarni/issue-3262 + + [DigitalOcean] Fix missing identity file error + +commit 25c5efdef9c709d378c5a1005d3f8ae5e9349a33 +Author: Tony Holdstock-Brown +Date: Mon Apr 4 17:18:09 2016 -0700 + + Ensure we log io.Copy errors and bytes copied/total in uploads + + Signed-off-by: Tony Holdstock-Brown + +commit 1b79e8579a8f1d886b6b675c08d31e8e76762351 +Author: Nathan LeClaire +Date: Mon Apr 4 17:00:06 2016 -0700 + + Update to new Windows archive format (zip) + + Signed-off-by: Nathan LeClaire + +commit 15908298bd3d1c03d6e6ae6dc95d551c9917f84b +Author: Ying Li +Date: Fri Apr 1 20:44:41 2016 -0700 + + Use require, not assert, in server/... tests. + + Signed-off-by: Ying Li + +commit 85b400518bb891e35b64944c8f084923508951e2 +Author: Nathan LeClaire +Date: Mon Apr 4 16:09:47 2016 -0700 + + Update to Machine 0.7.0-rc2 and Docker 1.11.0-rc3 + + Signed-off-by: Nathan LeClaire + +commit 60dbecbbd5d7580f4cd622cb15e90f181862da4f +Merge: 9b04627c81 29bd4dbf09 +Author: Nathan LeClaire +Date: Mon Apr 4 15:39:58 2016 -0700 + + Merge pull request #3272 from nathanleclaire/release_v-0.7.0-rc2_bump + + Bump version and modify release script for 0.7.0-rc2 + +commit 29bd4dbf0995f262ad38e630b2d19a33d3c6e844 +Author: Nathan LeClaire +Date: Mon Apr 4 09:49:38 2016 -0700 + + Bump version and modify release script for 0.7.0-rc2 + + Signed-off-by: Nathan LeClaire + +commit 9b04627c819f475ab7bc11e1c1459883213123aa +Merge: 5b9663f896 49d8473288 +Author: Nathan LeClaire +Date: Mon Apr 4 15:38:09 2016 -0700 + + Merge pull request #3273 from nathanleclaire/activate_rc_auto_download + + Make boot2docker RC download work for Machine RCs + +commit d36e48519867a6ad270e4e9c02c155d491ff48ff +Merge: b79d6d088b 0a025196ce +Author: Ying Li +Date: Mon Apr 4 15:09:57 2016 -0700 + + Merge pull request #659 from docker/require-passphrase + + Use require instead of assert for passphrase package + +commit 4657bbd3c584875d55ca0d5a23cfd8b26f1d5e51 +Author: Ying Li +Date: Fri Apr 1 11:08:56 2016 -0700 + + Attempt to suppress progress bars when building for the integration test + + Signed-off-by: Ying Li + +commit 93730582d7f39abd2b8bbb7a15bda036b633095d +Author: Ying Li +Date: Thu Mar 31 19:32:10 2016 -0700 + + Add -fno-PIC options due to https://github.com/golang/go/issues/14851 + + Signed-off-by: Ying Li + +commit a021d16392aeafe324ef070cff7818e1c6b3fb4b +Author: Ying Li +Date: Thu Mar 17 15:12:05 2016 -0700 + + Convert the server and signer to use the alpine image and to remove apks after build + + Signed-off-by: Ying Li + +commit 5d0b926b7f5b227520dd97f72ebe408e9f6f1873 +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 14:02:29 2016 -0700 + + Use require for certs and trustmanager + + Signed-off-by: Riyaz Faizullabhoy + +commit b419c5d9ca22e075df1930dd1d2ace0f850563c3 +Author: theodthompson +Date: Tue Mar 29 13:21:45 2016 -0700 + + adding hypervisor check to hyper-v driver + + Signed-off-by: Theo Thompson + +commit f0e7be69c981afade416c7a5a5c9af005ca7875e +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 12:10:16 2016 -0700 + + Update to use require for cryptoservice package + + Signed-off-by: Riyaz Faizullabhoy + +commit ad7200b8bb8e83d29673e303c1dc4b9e7833af62 +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 13:57:45 2016 -0700 + + Use require instead of assert for signer package + + Signed-off-by: Riyaz Faizullabhoy + +commit d20933c46159d93ee532ebb229d990fa20b1009c +Merge: 35268ee824 619bf56778 +Author: Michael Crosby +Date: Mon Apr 4 13:28:50 2016 -0700 + + Merge pull request #21722 from cyphar/make-listeners-new-pkg + + move docker/listeners to pkg/listeners + +commit 194eaa5c0f843257e66b68bd735786308a9d93b2 +Author: John Starks +Date: Wed Mar 16 18:45:40 2016 -0700 + + Add os_version and os_features to Image + + These fields are needed to specify the exact version of Windows that an + image can run on. They may be useful for other platforms in the future. + + This also changes image.store.Create to validate that the loaded image is + supported on the current machine. This change affects Linux as well, since + it now validates the architecture and OS fields. + + Signed-off-by: John Starks + +commit 49d84732885918f9d7f3c7dfe8c3db9855a14788 +Author: Nathan LeClaire +Date: Mon Apr 4 11:15:46 2016 -0700 + + Make boot2docker RC download work for Machine RCs + + Signed-off-by: Nathan LeClaire + +commit cdb3a594938cf3b24a4b5b02b3538afcaea6fc71 +Merge: 6006693add 92b3e03220 +Author: Alexandre Beslic +Date: Mon Apr 4 12:07:13 2016 -0700 + + Merge pull request #2069 from vieux/increase_timeout + + increate timeout in 'leader election - rescheduling' test + +commit cb6bf2e1a2484392bd7157682563a44cc24a0228 +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 12:05:04 2016 -0700 + + Update assert to require for cmd + + Signed-off-by: Riyaz Faizullabhoy + +commit 0a025196ce00f180eff772cb14f469231d9f2b7c +Author: Riyaz Faizullabhoy +Date: Mon Apr 4 11:53:14 2016 -0700 + + Use require instead of assert for passphrase package + + Signed-off-by: Riyaz Faizullabhoy + +commit b79d6d088beace841d99d84511825f368edd9ad0 +Merge: 80cf65ce56 5e46a4aadc +Author: Ying Li +Date: Mon Apr 4 11:20:36 2016 -0700 + + Merge pull request #658 from HuKeping/error-types + + Error types + +commit 20fa47886d8ab72eb1e29b1160ed716e7ffac36a +Merge: ff6f38ccb6 bf9f80eaff +Author: Richard Scothern +Date: Mon Apr 4 10:39:54 2016 -0700 + + Merge pull request #1592 from estesp/manifest-spec-example-fix + + Correct examples and architecture references in v2.2 spec + +commit 129fb5b356eddbb9d4939bd04e6944559f905672 +Author: Tony Witherspoon +Date: Mon Apr 4 13:15:28 2016 -0400 + + Added code to output the top level command options if docker-compose help with no command options provided + + Signed-off-by: Tony Witherspoon + +commit 35268ee82448be77fa31b145f4bff5fc6d1c72f4 +Merge: 0ed27f686f b8f38747e6 +Author: Alexander Morozov +Date: Mon Apr 4 09:30:23 2016 -0700 + + Merge pull request #21730 from thaJeztah/improve-udev-error + + Improve udev unsupported error message + +commit 0ed27f686f4a7d441b21bf13a98555e1326e0f74 +Merge: 8eb8a1d6b8 e7d54a4133 +Author: Tibor Vass +Date: Mon Apr 4 09:45:36 2016 -0400 + + Merge pull request #21745 from kencochrane/fix_release_sh_typo + + Fixed a typo in release.sh + +commit e7d54a4133a17c480f143530580f5734f835c5fe +Author: Ken Cochrane +Date: Mon Apr 4 09:27:14 2016 -0400 + + Fixed a typo in release.sh + + Signed-off-by: Ken Cochrane + +commit 86530287d6fdc13e52ffbc3fe2447888ecc6e197 +Merge: c72d62f96d c1026e815a +Author: Aanand Prasad +Date: Mon Apr 4 12:52:54 2016 +0100 + + Merge pull request #2627 from bfirsh/update-roadmap + + Update roadmap + +commit 91e5bb954131904af150b06bd22b007559a8ce27 +Author: Zhang Wei +Date: Wed Mar 23 19:34:47 2016 +0800 + + Let client print error when speicify wrong detach keys + + Fix #21064 + + Let client print error message explicitly when user specifies wrong + detach keys. + + Signed-off-by: Zhang Wei + +commit e1a4332c13d0bdc5e960102a4f0dfd8e1fb6ffaf +Author: Zhang Wei +Date: Mon Apr 4 15:32:26 2016 +0800 + + vendor engine-api 8924d6900370b4c7e7984b + + Signed-off-by: Zhang Wei + +commit bb4a26f2385409c34cc8962db7a11a6b718f8da1 +Author: Sun Hongliang +Date: Tue Mar 29 18:58:52 2016 +0800 + + fix typos in docs + + Signed-off-by: Sun Hongliang + +commit 6c3faf7d057918235d017aabdc22696b47d22b34 +Author: Ahmet Alp Balkan +Date: Sun Apr 3 17:23:29 2016 -0700 + + azure: more accurate messages for resources created + + Addresses #3250. We now print 'Configuring' instead of + 'Creating' for upsert operations. + + Signed-off-by: Ahmet Alp Balkan + +commit bf9f80eaffb0eabc768762bc4ff03ded277ea594 +Author: Phil Estes +Date: Sun Apr 3 17:50:22 2016 -0400 + + Correct examples and architecture references in v2.2 spec + + Add link to the official list of $GOOS and $GOARCH values and correct + values that were incorrectly listed in the spec examples. + + Docker-DCO-1.1-Signed-off-by: Phil Estes + +commit e57900a2695165bda111758e931e7c3c38449a9f +Author: Dave MacDonald +Date: Sun Apr 3 16:25:07 2016 -0400 + + Improved message when pushing a non-existant image + + The prior error message caused confusion. If a user attempts to push an + image up to a registry, but they misspelled (or forgot to properly tag + their image) they would see the message 'Repository does not exist', which + is not very clear and causes some to think that there might be a problem + with the registry or connectivity to it, when the problem was simply just + that an image with that tag specified does not exist locally. + + Signed-off-by: Dave MacDonald + +commit 5e46a4aadcd5232540fa8f345e9f5271b2ec85b8 +Author: HuKeping +Date: Mon Apr 4 01:48:52 2016 +0800 + + Update test + + Use concrete error types rather than check the strings. + + Signed-off-by: Hu Keping + +commit 52ffe6172d35ce9144088dfade682c0f170f3ce9 +Author: HuKeping +Date: Mon Apr 4 00:57:08 2016 +0800 + + Use concrete error types rather than generic errors + + Use concrete error types for functions "CheckHashes" + and "CheckValidHashStructures". + + Signed-off-by: Hu Keping + +commit a20c92c85fd11298e8386d2f67f712cc38b9a5dc +Author: HuKeping +Date: Mon Apr 4 00:26:25 2016 +0800 + + Add some error types + + Signed-off-by: Hu Keping + +commit 4ed20402580c4476360736f2bdaa2604dc76cd54 +Author: Yong Tang +Date: Fri Apr 1 01:57:40 2016 +0000 + + Remote API docs give incorrect example for creating a container with volumes. + + This fix tries to address the issue mentioned in Docker Remote API where + the examples for creating a container (`POST /containers/create`) with + volumes were incorrect. In the previous remote API document, the `Mounts` + fields was used for volume creation yet since v1.20 `Volumes` should be + used. + + This fix fixes #21335. + + Signed-off-by: Yong Tang + +commit f8640357c3c53bffd6f69e1186dec144aa9440c3 +Author: Bilal Amarni +Date: Sat Apr 2 16:11:55 2016 +0200 + + [doc] typo in generic driver + + Signed-off-by: Bilal Amarni + +commit 3e3138fcd7ad084beae0cf200af08b43700f78e2 +Author: Bilal Amarni +Date: Sat Apr 2 09:31:30 2016 +0200 + + [DigitalOcean] Fix missing identity file error + + When using the --digitalocean-ssh-key-fingerprint flag, no SSH key pair + is generated. Keeping the driver's SSHKeyPath option empty makes sure + the ssh client won't perform any validation on the private key. + + Signed-off-by: Bilal Amarni + +commit 6006693addd3d3cb94edbf4589099e86551bf729 +Merge: ccb2bea9cf 4a256436fe +Author: Dongluo Chen +Date: Fri Apr 1 16:09:28 2016 -0700 + + Merge pull request #2071 from dongluochen/bump-1.2.0-rc2 + + Bump version to 1.2.0-rc2 + +commit 4a256436fe12339b7dbc5b0ef1761647eba3b870 +Author: Dong Chen +Date: Fri Apr 1 14:38:38 2016 -0700 + + Bump version to 1.2.0-rc2 + + Signed-off-by: Dong Chen + +commit ccb2bea9cf56a4fb1bddf6df160fc4e8497a3417 +Merge: 2906a670a3 b300f73a45 +Author: Nishant Totla +Date: Fri Apr 1 13:53:45 2016 -0700 + + Merge pull request #2068 from vieux/engine_api_network_create + + use engine-api for network operations + +commit b8f38747e60eb76e19f08129ab27cb808d21c22a +Author: Sebastiaan van Stijn +Date: Fri Apr 1 13:31:44 2016 -0700 + + Improve udev unsupported error message + + Show a different message if a dynamic binary + is running, but doesn't have udev sync support. + + Signed-off-by: Sebastiaan van Stijn + +commit c1026e815a114b1210070d2daa56599d62d9a76e +Author: Ben Firshman +Date: Sun Jan 10 12:50:38 2016 +0000 + + Update roadmap + + Bring it inline with current plans: + + - Use in production is not necessarily about the command-line + tool, but also improving file format, integrations, new tools, + etc. + + Signed-off-by: Ben Firshman + +commit c72d62f96d951035453f2c5dc14f60f9fdb0e239 +Merge: a63a05964b a53b29467a +Author: Ben Firshman +Date: Fri Apr 1 20:53:37 2016 +0100 + + Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images + + Update wordpress example to use official images + +commit a63a05964ba19d9197428cdb6662f8727b379f49 +Merge: 9509508f3e 3034803258 +Author: Daniel Nephin +Date: Fri Apr 1 15:12:18 2016 -0400 + + Merge pull request #3249 from aanand/better-env-substitution-example + + Better variable substitution example + +commit 8eb8a1d6b8f89941d0d5db5b59cd6f912d7426db +Merge: 4a7bd7eaef 365401703d +Author: Michael Crosby +Date: Fri Apr 1 11:15:05 2016 -0700 + + Merge pull request #21709 from crosbymichael/clear-notify-socket + + Clear nofity socket from containerd env + +commit 365401703d382861e86072d2813c2eacae56000f +Author: Michael Crosby +Date: Thu Mar 31 17:56:21 2016 -0700 + + Clear nofity socket from containerd env + + Signed-off-by: Michael Crosby + +commit 9509508f3e69144d902963d05d0238b339d9134d +Merge: 85e2fb63b3 1a7a65f84d +Author: Joffrey F +Date: Fri Apr 1 10:32:13 2016 -0700 + + Merge pull request #3226 from shin-/3210-assert-hostname + + Fix assert_hostname logic in tls_config_from_options + +commit a038cccf88998814249a7a40b71a33a680e3f02f +Author: Julio Montes +Date: Fri Apr 1 08:58:29 2016 -0600 + + Fix compilation errors with btrfs-progs-4.5 + + btrfs-progs-4.5 introduces device delete by devid + for this reason btrfs_ioctl_vol_args_v2's name was encapsulated + in a union + + this patch is for setting btrfs_ioctl_vol_args_v2's name + using a C function in order to preserve compatibility + with all btrfs-progs versions + + Signed-off-by: Julio Montes + +commit 619bf56778c55813c7c9dc81052ee4a277bfd22a +Author: Aleksa Sarai +Date: Sat Apr 2 00:51:29 2016 +1100 + + pkg: listeners: clean up to act like a library + + Now that listeners is no longer an internal of the client, make it less + Docker-specific (despite there still being some open questions as how to + deal with some of the warnings that listeners has to emit). We should + move as much of the Docker-specific stuff (especially the port + allocation) to docker/ where it belongs (or maybe pass a check function). + + Signed-off-by: Aleksa Sarai + +commit e3a8c8388f8c6f1f67204cdd16b7b685fadda6c3 +Author: Aleksa Sarai +Date: Sat Apr 2 00:43:05 2016 +1100 + + pkg: listeners: separate out the listeners package + + This code will be used in containerd and is quite useful in general to + people who want a nice way of creating listeners from proto://address + arguments (even supporting socket activation). Separate it out from + docker/ so people can use it much more easily. + + Signed-off-by: Aleksa Sarai + +commit 737219bbdbd5c18a2f581c73ac740ea44266b82b +Author: Robin Naundorf +Date: Fri Apr 1 14:03:04 2016 +0200 + + Fixing help text of "docker network --help" to be consistend + Changed from hashmap to multidimensional array as in "docker volume --help" + closes #21710 + + Signed-off-by: Robin Naundorf + +commit 16dfb38fb89e4c57c53c54d3559b9fb388e367d4 +Author: Yuan Sun +Date: Fri Apr 1 10:32:46 2016 +0800 + + Add pause status check for --kernel-memory + + Signed-off-by: Yuan Sun + +commit 1a7a65f84da129cb3491c2dec3f37367444ce807 +Author: Joffrey F +Date: Wed Mar 30 11:58:28 2016 -0700 + + Include docker-py requirements fix + + Signed-off-by: Joffrey F + +commit b82fc524a73e918ff4d58c079ac276113b3c6e51 +Author: Tianon Gravi +Date: Thu Mar 31 17:28:44 2016 -0700 + + Also generate "InRelease" files for newer APT clients + + Signed-off-by: Andrew "Tianon" Page + +commit 4a7bd7eaef0038b006cf23adface84081e5aab3b +Merge: 3acb466f2d 44a50abe7b +Author: Sebastiaan van Stijn +Date: Thu Mar 31 16:39:25 2016 -0700 + + Merge pull request #20410 from tkopczynski/20236-info-insecure-registry + + Add insecure registries to docker info + +commit 2906a670a35736587bebf3b02e71598f755c97dc +Merge: 7c1dcadb98 07a47d54a4 +Author: Victor Vieux +Date: Thu Mar 31 15:50:05 2016 -0700 + + Merge pull request #2060 from allencloud/fix-typos + + fix typos + +commit 3acb466f2d28ffd4bd0567778d9798460d386e5a +Merge: ad4750cf3a fda99a7e16 +Author: Tibor Vass +Date: Thu Mar 31 18:40:37 2016 -0400 + + Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows + + Change the windows bundle from a .tgz to a .zip file + +commit ff6f38ccb69afa96214c7ee955359465d1fc767a +Merge: 2c803d6fd0 20525e390a +Author: Olivier Gambier +Date: Thu Mar 31 15:21:40 2016 -0700 + + Merge pull request #1588 from aaronlehmann/golint-godep-location + + Makefile: don't look for golint and godep in specific places + +commit ad4750cf3a1c89f0b9d2ccebdc4f61b7be33109f +Merge: 42494720c2 07b568cb53 +Author: Alexander Morozov +Date: Thu Mar 31 15:06:35 2016 -0700 + + Merge pull request #21694 from LK4D4/remove_unused_pkg + + pkg: cleanup some unused code + +commit 0f4427b3c3f31c08d85c9f38d83f8734d62e860f +Author: Richard Scothern +Date: Thu Mar 31 14:34:59 2016 -0700 + + Document required IAM permissions for S3 storage driver. + + Signed-off-by: Richard Scothern + +commit 42494720c2a8d31867587c1b633d8f439e54b319 +Merge: dd94c88376 5c161ade98 +Author: Sebastiaan van Stijn +Date: Thu Mar 31 14:18:31 2016 -0700 + + Merge pull request #21687 from allencloud/fix-typos + + fix typos + +commit 2c803d6fd0781886acfd98dfbd924fa68ef8b2ba +Merge: a11f6b6cfd c3ec1745c0 +Author: Olivier Gambier +Date: Thu Mar 31 14:04:57 2016 -0700 + + Merge pull request #1587 from aaronlehmann/build-docs + + docs: No need to change GOPATH to use vendored code + +commit dd94c88376560e2690ac21058c566adae4251bb8 +Merge: 6b4f7e6b7f 85354fb77c +Author: Aaron Lehmann +Date: Thu Mar 31 14:03:58 2016 -0700 + + Merge pull request #21698 from tonistiigi/fix-flaky-websocket-attach-test + + Fix flaky TestGetContainersAttachWebsocket + +commit 5b9663f8960af73c048e14cc60566ae487c07728 +Merge: 7f5eeb9a9f f9dd2f5c97 +Author: Olivier Gambier +Date: Thu Mar 31 13:57:58 2016 -0700 + + Merge pull request #3260 from nathanleclaire/remove_coverage_send + + Remove coverage-send (buggy) from Travis build + +commit 6b4f7e6b7f9f43a9a72746f09231de80bd2fcfc4 +Merge: f19f91d0da b9966f3a81 +Author: David Calavera +Date: Thu Mar 31 13:55:27 2016 -0700 + + Merge pull request #21696 from LK4D4/cleanup_unused_daemon + + daemon: remove some unused code + +commit f19f91d0da710b45603e1f3b95a3709c57cd888a +Merge: 3e03fc913a df9cc3d922 +Author: Tibor Vass +Date: Thu Mar 31 16:35:06 2016 -0400 + + Merge pull request #21693 from cyli/fix-trusted-build-and-run + + Request pull credentials when using trusted reference + +commit 3e03fc913a01a460b8487aa7537370392c00d5c3 +Merge: 00031c15b5 b38cee9f9c +Author: David Calavera +Date: Thu Mar 31 13:11:43 2016 -0700 + + Merge pull request #21692 from tonistiigi/fix-events-timer + + Fix race with event timer stopping early + +commit fda99a7e1653e045ec5901955a59ff1123016d93 +Author: Ken Cochrane +Date: Thu Mar 31 12:27:50 2016 -0400 + + Change the windows .tgz to a .zip file + + Signed-off-by: Ken Cochrane + +commit 00031c15b5b2226292eb9575bc3b390bdcd83a56 +Merge: 2d18ed7e4b 8a4225cd5a +Author: David Calavera +Date: Thu Mar 31 12:40:57 2016 -0700 + + Merge pull request #21679 from tonistiigi/no-pivot-root + + Bring back support for DOCKER_RAMDISK + +commit f9dd2f5c97d30c9950f7875bd2057c9a09ac15da +Author: Nathan LeClaire +Date: Thu Mar 31 12:24:21 2016 -0700 + + Remove coverage-send (buggy) from Travis build + + Signed-off-by: Nathan LeClaire + +commit 07b568cb5342789839aabba0ee6d41e7275099e8 +Author: Alexander Morozov +Date: Thu Mar 31 10:53:21 2016 -0700 + + pkg: cleanup some unused code + + Signed-off-by: Alexander Morozov + +commit 85354fb77c77aabe6ba1f53c90aa2395b4e81866 +Author: Tonis Tiigi +Date: Thu Mar 31 11:31:48 2016 -0700 + + Fix flaky TestGetContainersAttachWebsocket + + Signed-off-by: Tonis Tiigi + +commit b9966f3a81e89640d0de8fa5ae8d38213df0b8fe +Author: Alexander Morozov +Date: Thu Mar 31 11:24:12 2016 -0700 + + daemon: remove some unused code + + Signed-off-by: Alexander Morozov + +commit 7c1dcadb987ec5449a7fb41e8e1071858bbbe42f +Merge: 248cc597c0 b50529ccce +Author: Victor Vieux +Date: Thu Mar 31 11:02:33 2016 -0700 + + Merge pull request #2065 from dongluochen/UpdateEngineApi + + Update engine-api + +commit 20525e390a3cc5aa627cf7ecbb6ae637001fedcf +Author: Aaron Lehmann +Date: Thu Mar 31 11:00:28 2016 -0700 + + Makefile: don't look for golint and godep in specific places + + Using $GOPATH/bin/godep or $GOPATH/bin/golint is problematic because + $GOPATH can contain multiple colon-separated paths. + + We should just run these like normal binaries. The user should make sure + their $PATH contains $GOPATH/bin, if necessary. This is part of normal + Go setup. + + Signed-off-by: Aaron Lehmann + +commit df9cc3d9228cb07474dd046736c6f83513c4923d +Author: cyli +Date: Thu Mar 31 10:56:19 2016 -0700 + + Request pull credentials when using trusted reference + + Signed-off-by: cyli + +commit 2d18ed7e4b911ae61131fa7f3dedb0fae1d1ae3b +Merge: 61ca308676 2f3b602285 +Author: Alexander Morozov +Date: Thu Mar 31 10:54:45 2016 -0700 + + Merge pull request #21356 from cpuguy83/stdcopy_allocs + + Optimizations for StdWriter + +commit 7f5eeb9a9fa56cf67b7317c0cda4c9b039cdc599 +Merge: c43988594f 8a0e6946b5 +Author: Nathan LeClaire +Date: Thu Mar 31 10:52:49 2016 -0700 + + Merge pull request #3252 from ahmetalpbalkan/azure-improv + + driver/azure: Performance improvements + +commit c3ec1745c045a8bd3a562261e44bbd3526988d8a +Author: Aaron Lehmann +Date: Thu Mar 31 10:46:02 2016 -0700 + + docs: No need to change GOPATH to use vendored code + + Now that we are using "native" Go vendoring, there is no need to + manipulate GOPATH. + + Fixes #1586 + + Signed-off-by: Aaron Lehmann + +commit a11f6b6cfd10eca7d285b2804218cccc58c52d53 +Merge: 04ff3c0359 093fbdbfc4 +Author: Aaron Lehmann +Date: Thu Mar 31 10:42:12 2016 -0700 + + Merge pull request #1418 from dmcgowan/oauth-spec + + Add specification for using OAuth with the token server + +commit 8b408fd66bd3edbcb90450cb4722d31ce5078be8 +Author: Tonis Tiigi +Date: Thu Mar 31 10:35:56 2016 -0700 + + Fix building gccgo from makefile + + Signed-off-by: Tonis Tiigi + +commit 8a4225cd5ad3ad56a7e896f675080c0ed38982a3 +Author: Tonis Tiigi +Date: Wed Mar 30 22:03:10 2016 -0700 + + Bring back support for DOCKER_RAMDISK + + Fixes #21631 + + Signed-off-by: Tonis Tiigi + +commit b50529ccce566d872150ed4afa684fb13000b61e +Author: Dong Chen +Date: Wed Mar 30 13:30:09 2016 -0700 + + Update engine-api. + + Signed-off-by: Dong Chen + +commit b38cee9f9c79d1f12001348303b78462d99664ed +Author: Tonis Tiigi +Date: Thu Mar 31 09:48:20 2016 -0700 + + Fix race between with event timer stopping early + + Signed-off-by: Tonis Tiigi + +commit 61ca308676e29be58e5a9322746311f47a415bfd +Merge: b27f17c9ea eb0f9f6641 +Author: David Calavera +Date: Thu Mar 31 09:44:05 2016 -0700 + + Merge pull request #21685 from runcom/int-fix-tiny + + integration-cli: add info to fatal log + +commit c43988594f14c752f8e1db86ede5d2e7a977406b +Merge: 51fb3f0c0c 5d92f351de +Author: Victoria +Date: Thu Mar 31 09:26:05 2016 -0700 + + Merge pull request #3259 from londoncalling/docs-fix-ocean-example-3257 + + fixed typos which were referencing the wrong example machines + +commit 5d92f351de71ff4d842fd39b42e8fda738458965 +Author: Victoria Bialas +Date: Thu Mar 31 08:38:52 2016 -0700 + + fixed typos which were referencing the wrong example machnines + + Signed-off-by: Victoria Bialas + +commit 3034803258612e66bff99cdcc718253633da6bb3 +Author: Aanand Prasad +Date: Thu Mar 31 15:45:14 2016 +0100 + + Better variable substitution example + + Signed-off-by: Aanand Prasad + +commit b27f17c9ea03f486fb31f4ce246eeec754f400d9 +Merge: 0d93335962 c018018b69 +Author: Sebastiaan van Stijn +Date: Thu Mar 31 07:40:41 2016 -0700 + + Merge pull request #21688 from mcuadros/patch-1 + + documentation: adding gce-docker plugin to plugins.md + +commit 0d933359623429b301a79874c68b8539dda52d4b +Merge: 47fa54aea3 5d2f6b3ea3 +Author: moxiegirl +Date: Thu Mar 31 07:32:57 2016 -0700 + + Merge pull request #21681 from senk/21653-api-docs-revisit + + Fixed api docs + +commit c018018b69771ce1becc71d82e2f912ad55dcde5 +Author: Máximo Cuadros +Date: Thu Mar 31 15:14:42 2016 +0200 + + documentation: adding gce-docker plugin to plugins.md + + Signed-off-by: Máximo Cuadros + +commit eb0f9f664116ca28d844144929f4b578fe2d1dc8 +Author: Antonio Murdaca +Date: Thu Mar 31 12:36:59 2016 +0200 + + integration-cli: add info to fatal log + + Signed-off-by: Antonio Murdaca + +commit 47fa54aea39035515f45a4c98408e75c5085a2cb +Merge: 3d4b3cb424 1a85c8ebbe +Author: Vincent Demeester +Date: Thu Mar 31 11:52:18 2016 +0200 + + Merge pull request #21664 from calavera/label_one_layer_images + + Apply build labels to images with only a FROM tag. + +commit 3d4b3cb424ef599a0aa63f44d30c62ef37ca130b +Merge: 60821fe288 930ae3dbcb +Author: Vincent Demeester +Date: Thu Mar 31 11:49:37 2016 +0200 + + Merge pull request #21676 from aaronlehmann/tmpfile-close + + Pull: only close temporary file once + +commit 60821fe288ce1c53fdf5ab553b9f1d4571f1ec11 +Merge: 79e0eb2000 da38ac6c79 +Author: Antonio Murdaca +Date: Thu Mar 31 11:38:57 2016 +0200 + + Merge pull request #21665 from cyphar/bump-runc + + vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e + +commit 79e0eb20007d0468a6e2c50a36b673ad3e829017 +Merge: 156c5db889 90bb5301b5 +Author: Antonio Murdaca +Date: Thu Mar 31 11:35:21 2016 +0200 + + Merge pull request #21671 from mavenugo/rc1 + + Vendor Libnetwork v0.7.0-rc.1 + +commit 156c5db889b29e28e0176019b1996af4a5465a77 +Merge: f4b915ad7d 0538981c31 +Author: Antonio Murdaca +Date: Thu Mar 31 11:35:02 2016 +0200 + + Merge pull request #21677 from aaronlehmann/layer-store-locking + + Fix layer store Get locking + +commit f4b915ad7d72a059e7bba15424e012873b9b49ac +Merge: e6f2429e01 ea1d8d6f82 +Author: Vincent Demeester +Date: Thu Mar 31 10:26:28 2016 +0200 + + Merge pull request #21572 from konstruktoid/systemd_doc + + systemctl show, no need to sudo + +commit e6f2429e017eb3c41bbc77442e81a23635287625 +Merge: c7b63338f0 28d3c22e55 +Author: Vincent Demeester +Date: Thu Mar 31 10:14:23 2016 +0200 + + Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme + + change validateNoSchema to validateNoScheme + +commit 5d2f6b3ea3d307c32089757d84c94fab3d8e55d7 +Author: Robin Naundorf +Date: Thu Mar 31 08:27:03 2016 +0200 + + Fixed docs fixes #21653 + Fixed some http status codes and decreased site-order for docker_remote_api_v1.24.md to appear in the right order in the menu + Signed-off-by: Robin Naundorf + +commit 44a50abe7b16368bdc8b70e01cb095dc46cbbbaf +Author: Tomasz Kopczynski +Date: Tue Feb 16 23:45:48 2016 +0100 + + Add insecure registries to docker info + + Signed-off-by: Tomasz Kopczynski + +commit c7b63338f0c46b2ca0efee3b8a590c2e2033ea14 +Merge: ffee5588cd 05cc737f54 +Author: Sebastiaan van Stijn +Date: Wed Mar 30 23:25:23 2016 -0700 + + Merge pull request #21637 from tonistiigi/refactor-cleanup + + Fix container mount cleanup issues + +commit ffee5588cd9be4c67c73476998af1ecbc61250b6 +Merge: 81d9eaa27e 511a70583f +Author: Sebastiaan van Stijn +Date: Wed Mar 30 23:10:04 2016 -0700 + + Merge pull request #21372 from anusha-ragunathan/ctrd-rebase + + Update mount state of live containers after a daemon crash. + +commit 07a47d54a4198029c4ad78e2b1d7038b5711eda9 +Author: Sun Hongliang +Date: Wed Mar 30 19:53:23 2016 +0800 + + fix typos + + Signed-off-by: Sun Hongliang + +commit 930ae3dbcb11091955ca936c280d13f24494b245 +Author: Aaron Lehmann +Date: Wed Mar 30 19:26:12 2016 -0700 + + Pull: only close temporary file once + + Close could be called twice on a temporary download file, which could + have bad side effects. + + This fixes the problem by setting to ld.tmpFile to nil when the download + completes sucessfully. Then the call to ld.Close will have no effect, + and only the download manager will close the temporary file when it's + done extracting the layer from it. ld.Close will be responsible for + closing the file if we hit the retry limit and there is still a partial + download present. + + Fixes #21675 + + Signed-off-by: Aaron Lehmann + +commit 5c161ade98107ce48a77e3525321c436734a43ec +Author: allencloud +Date: Mon Mar 28 18:57:55 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit 28d3c22e55259281c70fd90780a1b0d388450ddf +Author: allencloud +Date: Tue Mar 29 14:36:38 2016 +0800 + + 1.change validateNoSchema into validateNoScheme + 2.change schema into scheme in docs and some annotations. + + Signed-off-by: allencloud + +commit 0538981c31a714a4183e846a4b512deb7879cc29 +Author: Aaron Lehmann +Date: Wed Mar 30 19:34:51 2016 -0700 + + Fix layer store Get locking + + Get was calling getReference without layerL held. This meant writes to + the references map could race. Such races are dangerous because they can + corrupt the map and crash the process. + + Fixes #21616 + Fixes #21674 + + Signed-off-by: Aaron Lehmann + +commit 90bb5301b51ec6a6c77b910855441feef10492ff +Author: Madhu Venugopal +Date: Wed Mar 30 18:12:23 2016 -0700 + + Vendor Libnetwork v0.7.0-rc.1 + + - Fixes https://github.com/docker/libnetwork/issues/1051 + - Fixes https://github.com/docker/libnetwork/issues/985 + - Fixes https://github.com/docker/libnetwork/issues/945 + - Log time taken to set sandbox key + - Limit number of concurrent DNS queries + + Signed-off-by: Madhu Venugopal + +commit 81d9eaa27e4efb5cad52b57ca2e9d71a0c9b2272 +Merge: c43deb2ea1 6fa0239772 +Author: Brian Goff +Date: Wed Mar 30 18:00:32 2016 -0700 + + Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint + + Windows: escape entrypoint before passing to libcontainerd + +commit 04ff3c0359d7ff6a5eef61d0d4c5cb2fe2f4234c +Merge: 13f72ef7dc 4c9bed2507 +Author: Richard Scothern +Date: Wed Mar 30 17:46:27 2016 -0700 + + Merge pull request #1578 from majewsky/do-not-swallow-error + + don't swallow errors in Swift driver's GetContent() + +commit 13f72ef7dc4c1b021a11fc77c225a4854d84328b +Merge: ee8450ff13 eb0b7f0173 +Author: Richard Scothern +Date: Wed Mar 30 17:46:04 2016 -0700 + + Merge pull request #1560 from RichardScothern/gc + + Fix signature handling with GC. + +commit 05cc737f5411a0effd299429140d031c4ad8dd05 +Author: Tonis Tiigi +Date: Tue Mar 29 15:27:04 2016 -0700 + + Fix container mount cleanup issues + + - Refactor generic and path based cleanup functions into a single function. + - Include aufs and zfs mounts in the mounts cleanup. + - Containers that receive exit event on restore don't require manual cleanup. + - Make missing sandbox id message a warning because currently sandboxes are always cleared on startup. libnetwork#975 + - Don't unmount volumes for containers that don't have base path. Shouldn't be needed after #21372 + + Signed-off-by: Tonis Tiigi + +commit 4982a732f34640217d05eee255905fcb12a7f939 +Author: msabansal +Date: Wed Mar 30 15:54:16 2016 -0700 + + Enabling expose support for Windows TP5 + + Signed-off-by: msabansal + +commit da38ac6c79fe902ed0687afc73d731c95c6d491a +Author: Aleksa Sarai +Date: Thu Mar 31 08:25:51 2016 +1100 + + vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e + + Also modify an integration test that hardcoded the error string so it + uses the exported error variable from libcontainer/user. + + Signed-off-by: Aleksa Sarai + +commit eb0b7f0173d0c54d1db7c76ef4b7d55b5fc7710a +Author: Richard Scothern +Date: Tue Mar 29 10:47:22 2016 -0700 + + Update the gc documentation. + + Signed-off-by: Richard Scothern + +commit c43deb2ea159c02a5ece2394e7b77619e1aad3e3 +Merge: 0dac544448 d9c3b653c0 +Author: Tibor Vass +Date: Wed Mar 30 19:38:32 2016 -0400 + + Merge pull request #21662 from anusha-ragunathan/ctrd_debugLogs + + Redirect containerd stdout/stderr to the docker stream. + +commit 0dac5444489a34e86bd3e289b33fab3f17c1bf70 +Merge: a7742e4379 ab62ecf393 +Author: David Calavera +Date: Wed Mar 30 16:15:34 2016 -0700 + + Merge pull request #21309 from nalind/journal-error-reporting + + Improve error reporting when following journals + +commit 4324b70c50b3c7f60b9a121470e4c6db0ba86388 +Author: Richard Scothern +Date: Thu Mar 24 16:03:25 2016 -0700 + + Fix signature handling with GC. + + If a schema 1 manifest is uploaded with the `disablesignaturestore` option set + to true, then no signatures will exist. Handle this case. + + If a schema 1 manifest is pushed, deleted, garbage collected and pushed again, the + repository will contain signature links from the first version, but the blobs will + not exist. Disable the signature store in the garbage-collect command so + signatures are not fetched. + + Signed-off-by: Richard Scothern + +commit 80b310ca447d52ce107775841645f382f775346d +Author: Richard Scothern +Date: Wed Mar 23 16:42:50 2016 -0700 + + Add a --dry-run flag. If enabled this will print the mark and sweep process + with removing any files. + + Signed-off-by: Richard Scothern + +commit ee8450ff13538d829a9a7909da9b979764d56865 +Merge: e5aa9c8e56 9b5caf64cf +Author: Richard Scothern +Date: Wed Mar 30 16:05:57 2016 -0700 + + Merge pull request #1581 from RichardScothern/docs + + Manifest delete documentation enhancement + +commit a7742e437943bb0c59cc9e01fd9f5e68259ad3ec +Merge: ea7d2192e2 d12b7c7e3e +Author: David Calavera +Date: Wed Mar 30 15:20:05 2016 -0700 + + Merge pull request #21636 from calavera/remove_builder_from_api + + Remove builder dependency from the api. + +commit ea7d2192e2fedbf9e764a574b48498a95045cc00 +Merge: 9d5c26bed2 b2f2f162ad +Author: David Calavera +Date: Wed Mar 30 15:18:54 2016 -0700 + + Merge pull request #21661 from twistlock/client_cert_auth_docs + + Add short description about default authentication method in authorization docs + +commit 9d5c26bed2ac287542e176d9149250927876e3f5 +Merge: 8c06ba3665 0f70f53826 +Author: David Calavera +Date: Wed Mar 30 15:18:08 2016 -0700 + + Merge pull request #21666 from thaJeztah/undeprecate-auto-generated-paths + + Un-deprecate auto-creation of host directories for mounts + +commit 0f70f53826ac311ca1653827c0d6bc170f300e84 +Author: Sebastiaan van Stijn +Date: Wed Mar 30 15:00:09 2016 -0700 + + Un-deprecate auto-creation of host directories for mounts + + Auto-creation of host-directories was marked deprecated in + Docker 1.9, but was decided to be too much of an backward-incompatible + change, so it was decided to keep the feature. + + Signed-off-by: Sebastiaan van Stijn + +commit e5aa9c8e562a4c9704a0eb341e27f447a59e7fa0 +Merge: 791865af71 e388517d21 +Author: Richard Scothern +Date: Wed Mar 30 14:29:48 2016 -0700 + + Merge pull request #1577 from xiekeyang/context + + type judgment in context + +commit 791865af71dc75e301bd6464f29821ba5b687aa4 +Merge: 0eefe17730 267e268775 +Author: Richard Scothern +Date: Wed Mar 30 14:29:27 2016 -0700 + + Merge pull request #1582 from aaronlehmann/garbagecollect-errors + + garbagecollect: Clean up errors + +commit 1a85c8ebbe1ab508bcd47b883b9732c032509503 +Author: David Calavera +Date: Wed Mar 30 17:26:02 2016 -0400 + + Apply build labels to images with only a FROM tag. + + Signed-off-by: David Calavera + +commit 248cc597c002871a78c4f960f642d421ff8c7b7d +Merge: d8bd5f9a53 e60b93aef3 +Author: Alexandre Beslic +Date: Wed Mar 30 14:09:03 2016 -0700 + + Merge pull request #2053 from allencloud/make-port-0-in-checkAddrFormat-invalid + + make port 0 invalid in checkAddrFormat + +commit 8a0e6946b523197c726c46e39ec3dcbf8ea50a63 +Author: Ahmet Alp Balkan +Date: Wed Mar 30 13:12:20 2016 -0700 + + driver/azure: atomic write for tenant ID file + + Signed-off-by: Ahmet Alp Balkan + +commit 8c06ba366555ef2ac98ca5372ea632a28e37c950 +Merge: 8dabc0c39b 7df5b32834 +Author: David Calavera +Date: Wed Mar 30 13:11:55 2016 -0700 + + Merge pull request #21625 from kencochrane/fix_tgz_directory + + Change the directory inside of tgz files. + +commit 6fa0239772e672eefb98cef91ca8d806b86182b0 +Author: John Starks +Date: Mon Mar 28 17:35:56 2016 -0700 + + Windows: escape entrypoint before passing to libcontainerd + + This makes Windows behavior consistent with Linux -- the entry point must + be an executable, not an executable and set of arguments. + + Signed-off-by: John Starks + +commit 86ab343c3e98ded1ee1b12f04396ae011a0e6de6 +Author: John Starks +Date: Mon Mar 28 17:26:34 2016 -0700 + + Windows: fix tests depending on entrypoint split behavior + + Existing tests assume that the entrypoint in a docker run command will be + split into multiple arguments, which is inconsistent with Linux. Fix the + tests depending on this behavior. + + Signed-off-by: John Starks + +commit d9c3b653c0776bdfc4af9129ebbf41160a793cf3 +Author: Anusha Ragunathan +Date: Wed Mar 30 12:25:51 2016 -0700 + + Redirect containerd stdout/stderr to the docker stream. + + Its useful to have containerd logs as part of docker. + Containerd metrics are too chatty, so set interval to 0. + + Signed-off-by: Anusha Ragunathan + +commit 500d7d20c56149c7b0c9af7aba4d9d9b5b37ca11 +Author: Ahmet Alp Balkan +Date: Mon Mar 28 13:28:40 2016 -0700 + + driver/azure: Performance improvements + + Making Azure operation polling intervals more frequent to + detect completions faster (and thus making machine creations + faster). + + Reduce one Azure API call for each machine command by caching + the discovered Azure Active Directory tenant ID of the user’s + Azure subscription into a local file. This also makes Azure + driver commands faster. + + Signed-off-by: Ahmet Alp Balkan + +commit d8bd5f9a53b6e11d5b64c7c17f43f6b2258945ac +Merge: d2bbd6bc19 8a003a5fa8 +Author: Dongluo Chen +Date: Wed Mar 30 12:11:51 2016 -0700 + + Merge pull request #2056 from nishanttotla/image-list-engine-api + + Moving Image handling to engine-api + +commit ec99e2b16ffeefb7b4bd644bc6373ffc823dd084 +Author: Ahmet Alp Balkan +Date: Mon Mar 28 13:02:24 2016 -0700 + + Update azure dependencies + + Signed-off-by: Ahmet Alp Balkan + +commit 267e268775319d4a3c48ad744c90cf620a8885b5 +Author: Aaron Lehmann +Date: Wed Mar 30 11:35:24 2016 -0700 + + garbagecollect: Clean up errors + + - Clean up error messages + + - Add a missing error check on the result of blobService.Enumerate. + + Signed-off-by: Aaron Lehmann + +commit b2f2f162ad768a1e66d5921146f24bfd0698b302 +Author: Liron Levin +Date: Wed Mar 30 21:14:33 2016 +0300 + + Add short description about default authentication method in authorization docs + + Following the discussion in #21556, adding a short description of the + default user authentication mechanism (without requiring authentication + plugins) + Signed-off-by: Liron Levin + +commit 78a8be07adc0f83ec627d6865eb17da5c69093fa +Author: Joffrey F +Date: Wed Mar 30 11:11:19 2016 -0700 + + Re-enabling assert_hostname when instantiating docker_client from the + environment. + + Signed-off-by: Joffrey F + +commit 8dabc0c39b868e1c80f85541bbeeac17f05ca88f +Merge: a5e220b1e3 593e29156d +Author: Tibor Vass +Date: Wed Mar 30 14:04:51 2016 -0400 + + Merge pull request #21574 from tkopczynski/20784-builder-context-tests + + Builder/context unit tests + +commit 8a003a5fa84adbb3c55f8943100c04395da01a97 +Author: Nishant Totla +Date: Wed Mar 30 11:00:05 2016 -0700 + + Reusing ImageListOptions for ImageFilterOptions + + Signed-off-by: Nishant Totla + +commit 9b5caf64cfe509451f54b19670862c6f629a28a1 +Author: Richard Scothern +Date: Wed Mar 30 10:52:43 2016 -0700 + + Add a note to the delete manifest section to aid getting the correct + digest to delete manifests. + + Signed-off-by: Richard Scothern + +commit d27b82207cc0ef4364b56a3d1e823b47791836ba +Author: Joffrey F +Date: Tue Mar 29 18:05:37 2016 -0700 + + Remove obsolete assert_hostname tests + + Signed-off-by: Joffrey F + +commit 51fb3f0c0cd4263d4c042667b04e505f157bb723 +Merge: 88827d3324 5f802ce66c +Author: Nathan LeClaire +Date: Wed Mar 30 10:52:29 2016 -0700 + + Merge pull request #3251 from jsirois/jsirois/driver/test_flags + + Add a test for create command flag handling. + +commit 5f802ce66cd98691d298348a7f2ada1ccfcb0b50 +Author: John Sirois +Date: Tue Mar 29 15:48:39 2016 -0600 + + Add a test for create command flag handling. + + This complements the fix in 705865fa by adding a test for unset flags + with defaults as well as other combinations of set and unset flags. + + Signed-off-by: John Sirois + +commit ebdbefecdadd30b3f938d9650a93987f870c6a3d +Author: Nishant Totla +Date: Wed Mar 30 10:15:35 2016 -0700 + + Updating image related unit tests to use engine-api + + Signed-off-by: Nishant Totla + +commit 7de9f6ee62b6334bf2fcbc5c77d422446eeac628 +Author: Nishant Totla +Date: Wed Mar 30 09:46:38 2016 -0700 + + Moving over images to use engine-api + + Signed-off-by: Nishant Totla + +commit 80cf65ce565d72aaa3c61a18633429869bdb4494 +Merge: 7be7b6beb5 39c3f46006 +Author: Riyaz Faizullabhoy +Date: Wed Mar 30 09:12:53 2016 -0700 + + Merge pull request #650 from HuKeping/tiny-refactor + + Tiny refactor + +commit a5e220b1e314489ecde4fdd7129296eaaaeb6f96 +Merge: 450b472174 ad03f920c9 +Author: Vincent Demeester +Date: Wed Mar 30 17:17:33 2016 +0200 + + Merge pull request #21640 from hqhq/hq_remove_tryit + + Remove the tryit tutotial in README + +commit 450b472174affb0da266fc0c4d57705c454b8735 +Merge: 0bdcbe5dd2 370dbe0cd9 +Author: Sebastiaan van Stijn +Date: Wed Mar 30 08:07:46 2016 -0700 + + Merge pull request #21648 from senk/21627-fix-api-docs + + Fixed some differences between API and Docs + +commit 4c9bed25078f55c1bb01a9a676f8e0fe91ac0288 +Author: Stefan Majewsky +Date: Wed Mar 30 16:04:01 2016 +0200 + + don't swallow errors in Swift driver's GetContent() + + In 326c3a9c49486f4c5dbb16508f08b6b766bd4852, which was only intended to + be a refactoring commit, the behavior of this block subtly changed so + that unknown types of errors would be swallowed instead of propagated. + + I noticed this while investigating an error similar to #1539 aka + docker/docker#21290. It appears that during GetContent() for a + hashstate, the Swift proxy produces an error. Since this error was + silently swallowed, an empty []byte is used to restart the hash, then + producing the digest of the empty string instead of the layer's digest. + + This PR will not fix the issue, but it should make the actual error more + visible by propagating it into `blobWriter#resumeDigest' and + 'blobWriter#validateBlob', respectively. + + Signed-off-by: Stefan Majewsky + +commit 0bdcbe5dd2a6f917aa057ecdd0a3d3a33bad261f +Merge: 4745656e18 e6d87c0706 +Author: Vincent Demeester +Date: Wed Mar 30 14:07:37 2016 +0200 + + Merge pull request #21624 from LK4D4/fix_store_races + + volume/store: fix couple of races with accessing maps + +commit 370dbe0cd98e924e8641a72a437281dd7bce9f3d +Author: Robin Naundorf +Date: Wed Mar 30 10:12:11 2016 +0200 + + Fixed some differences between API and Docs in v1.22,v1.23,v1.24 + + Signed-off-by: Robin Naundorf + +commit e60b93aef3a2a6482831eded8855e0a2b0e5163f +Author: Sun Hongliang +Date: Wed Mar 30 19:43:29 2016 +0800 + + make port 0 invalid in checkAddrFormat + + Signed-off-by: Sun Hongliang + +commit 4745656e189de7f5ca2985c6c8c00392c458ad53 +Merge: 2f35c6b3fb a2dbf7626c +Author: Vincent Demeester +Date: Wed Mar 30 12:19:47 2016 +0200 + + Merge pull request #21645 from albers/completion-history--human + + bash completion for `docker history --human` + +commit 39c3f460062a7641243b2c5da3069d296c21c59f +Author: HuKeping +Date: Tue Mar 29 21:18:07 2016 +0800 + + Tiny refactor + + It is a little wired to use "err.ServeHTTP". Via the sample from + docker/distribution, we can use "challenge" as the variable name here. + + Signed-off-by: Hu Keping + +commit e388517d21a6b73573e14c89e2c7ae4d75469e5a +Author: xiekeyang +Date: Wed Mar 30 17:35:22 2016 +0800 + + type judgment in context + + Signed-off-by: xiekeyang + +commit 190654aa2ee880c2052c0887a215b85d24049f6d +Author: Yong Tang +Date: Tue Mar 29 04:10:37 2016 +0000 + + Show "seccomp" in docker info (#20909). + + This pull request added a `SecurityOptions` field in the `GET /info` + output to show if there is `apparmor`, `seccomp`, or `selinux` suport. + + The API changes are updated in the documentation and the update in + `GET /info` is covered by the test case in `TestInfoApi`. + + This pull request fixes #20909. + + Signed-off-by: Yong Tang + +commit 2f35c6b3fb4aad381ac3e47b17aef900600d7784 +Merge: 71cab5b0dc 33a8ab29ed +Author: Vincent Demeester +Date: Wed Mar 30 11:08:15 2016 +0200 + + Merge pull request #21491 from pcarrier/pcarrier/wtf + + docker.service: don't limit tasks + +commit 71cab5b0dc904033f3869210441547a7e201c281 +Merge: d02e24f27d 752b31d3fe +Author: Sebastiaan van Stijn +Date: Tue Mar 29 23:07:12 2016 -0700 + + Merge pull request #21629 from thaJeztah/bump-runc + + Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa + +commit d2bbd6bc19124a4babd6ae8a61232d4eec5be214 +Merge: 2e9daede48 7402cf6354 +Author: Dongluo Chen +Date: Tue Mar 29 23:06:55 2016 -0700 + + Merge pull request #2038 from allencloud/make-2xx-response-status-codes-compatile-with-docker + + make 2xx response status code compatible with docker engine + +commit a2dbf7626c9950aab5049f0e485e053232be1e5f +Author: Harald Albers +Date: Tue Mar 29 21:56:24 2016 -0700 + + bash completion for `docker history --human` + + Signed-off-by: Harald Albers + +commit 61ca9cc99e1e7ba18c0d04237ba5fbcf30e3bd74 +Author: Tomasz Kopczynski +Date: Sun Mar 13 13:41:59 2016 +0100 + + Builder/tarsum unit tests + + Signed-off-by: Tomasz Kopczynski + +commit d02e24f27d761c2f24c0a5f4dfe1fbfe692e5f14 +Merge: d800be743d 0dea21f446 +Author: Alexander Morozov +Date: Tue Mar 29 21:40:38 2016 -0700 + + Merge pull request #21603 from aaronlehmann/testtransfer-flakiness-2 + + Fix flaky test TestTransfer (take 2) + +commit d800be743db5bcd1bfdcd948619af5811ff7aec8 +Merge: 457eb89bd5 8d18e6b30f +Author: Tibor Vass +Date: Wed Mar 30 00:09:22 2016 -0400 + + Merge pull request #21591 from riyazdf/hardware-signing-non-experimental + + move hardware signing out of experimental, remove yubico-piv-tool deps + +commit 2d03c543888efbd634480ffc8ac5d2e09c8ea881 +Author: Yong Tang +Date: Sat Mar 19 03:24:57 2016 +0000 + + Flaky test: TestRunAttachFailedNoLeak (#21247) + + This pull request tries to diagnosis and fix the flaky test of + TestRunAttachFailedNoLeak. The test failed several times in + Docker CI but is very difficult to repeat even in CI. + + This pull request first try to repeat the issue at the Jenkins + server with some diagnosis message added to the output in case + the test fails again. + + Since the added ouputs will only be invoked when test fails, + it will not add any unnecessary content in normal situations. + + Signed-off-by: Yong Tang + +commit 457eb89bd50ebee912db5cf65cd7332d46d5e27c +Merge: eaf138af1f d773927985 +Author: Sebastiaan van Stijn +Date: Tue Mar 29 19:11:36 2016 -0700 + + Merge pull request #21638 from yongtang/21605-docs-Warnings-in-volumes-API + + Update documentations for `Warnings` fields in `GET /volumes` API + +commit d77392798550e47fd3719ad658c6a92d1282d5b2 +Author: Yong Tang +Date: Wed Mar 30 01:35:39 2016 +0000 + + Update documentations for `Warnings` fields in `GET /volumes` API + + This fix updated documentations to add the `Warnings` fields in + `GET /volumes` API. + + The `Warnings` has been part of the `GET /volumes` API response + since Docker 1.10 (v1.21). However, the `Warnings` field is not + in the documentation so there are some confusions (See #21606). + + This fix updated the related documentations in v1.22, v1.23, and + v1.24 and added this field to the API. + + This fix is related to #21605. + + Signed-off-by: Yong Tang + +commit 71c86acaa4af0af5dec9baf7f1f4d7b236f249a3 +Author: Joffrey F +Date: Tue Mar 29 18:01:27 2016 -0700 + + Update docker-py version to include match_hostname fix + Removed unnecessary assert_hostname computation in tls_config_from_options + + Signed-off-by: Joffrey F + +commit 7402cf63540baa22d916320998d34de0deb03087 +Author: Sun Hongliang +Date: Sun Mar 27 18:36:16 2016 +0800 + + make 2xx response status code compatible with docker + 1. POST /images/load from 201 to 200 + 2. POST /images/{name:.*}/tag from 200 to 201 + 3. POST /containers/{name:.*}/rename from 200 to 204 + + Signed-off-by: Sun Hongliang + +commit ad03f920c93d2a5eea456bd17548bc591f7b0425 +Author: Qiang Huang +Date: Wed Mar 30 08:47:24 2016 +0800 + + Remove the tryit tutotial in README + + It's no longer there. + + Signed-off-by: Qiang Huang + +commit eaf138af1fba339d13bc4cccd75e61e37603a51a +Merge: 99adcaebc0 745892a7b2 +Author: Sebastiaan van Stijn +Date: Tue Mar 29 17:28:12 2016 -0700 + + Merge pull request #21598 from aaronlehmann/not-found-error + + Change v1 pull 404 message to include tag + +commit 752b31d3fe6fcbea9e14247c3896334734eba7f2 +Author: Sebastiaan van Stijn +Date: Tue Mar 29 13:35:19 2016 -0700 + + Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa + + This includes fixes for; + + - outputing errors for missing seccomp options on seccomp versions < 2.3 + - cap set apply EPERM errors on ARM systems + + Signed-off-by: Sebastiaan van Stijn + +commit d12b7c7e3e5566f49f81189b757bcd0e4ef09956 +Author: David Calavera +Date: Tue Mar 29 15:51:14 2016 -0700 + + Remove builder dependency from the api. + + Signed-off-by: David Calavera + +commit 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7 +Merge: 7e63ed90aa 7ed3d265a4 +Author: David Calavera +Date: Tue Mar 29 17:00:10 2016 -0700 + + Merge pull request #21592 from anusha-ragunathan/docker-systemd + + When using systemd, pass expected cgroupsPath and cli options to runc. + +commit 7e63ed90aa99caed7d9052263bb005807511fa00 +Merge: bf18ab1869 e96d086afd +Author: Sebastiaan van Stijn +Date: Tue Mar 29 16:52:04 2016 -0700 + + Merge pull request #21610 from albers/completion-no-new-privileges + + bash completion for `docker {run,create} --security-opt no-new-privileges + +commit bf18ab1869a3dfeb10b0d4d97e1c5e152321d548 +Merge: 34e05f5cb1 39b9b63e36 +Author: Sebastiaan van Stijn +Date: Tue Mar 29 16:42:13 2016 -0700 + + Merge pull request #21623 from albers/completion-options-false + + bash completions: Improve consistency for boolean options with default=true + +commit 34e05f5cb1449034e5fcbb8467be311bf0c2c6b7 +Merge: 8899896992 114be249f0 +Author: David Calavera +Date: Tue Mar 29 16:34:19 2016 -0700 + + Merge pull request #21630 from LK4D4/fix_create_list_races + + daemon: register container as late as possible + +commit 2e9daede487df9cdddcf5c90d776e8d445b40dec +Merge: 0b50dbd503 4516d1ae16 +Author: Nishant Totla +Date: Tue Mar 29 16:11:01 2016 -0700 + + Merge pull request #1982 from MHBauer/apiClient-rmi + + use apiClient for various things + +commit 0eefe1773016cc69ef4da528b14dfcd7fde419b3 +Merge: 19ad02e6ac f4bdc6287a +Author: Stephen Day +Date: Tue Mar 29 15:58:51 2016 -0700 + + Merge pull request #1546 from arschles/doc-storage + + Add documentation for how to register new StorageDrivers + +commit 5106c51666ce3452454d63141b259aa7d3713e90 +Author: Brian Goff +Date: Tue Mar 29 15:24:05 2016 -0700 + + More logs for `TestDaemonNoSpaceleftOnDeviceError` + + Signed-off-by: Brian Goff + +commit 4516d1ae16f5898f395a9e2c53b27c371144ff34 +Author: Morgan Bauer +Date: Thu Mar 17 14:55:38 2016 -0700 + + use apiClient for volumes management + + - create volume + - list volumes + + Signed-off-by: Morgan Bauer + +commit 7be7b6beb56303815c81c3c4b814803be95a1b6b +Merge: 041642fdb0 0a60261fab +Author: Riyaz Faizullabhoy +Date: Tue Mar 29 15:00:41 2016 -0700 + + Merge pull request #642 from HuKeping/constant + + Use constant + +commit 0be5b31f27d8bf4e2eb878adf82dafd1c9d201b4 +Author: Morgan Bauer +Date: Thu Mar 17 12:26:13 2016 -0700 + + use apiClient for listing networks in refresh + + Signed-off-by: Morgan Bauer + +commit 08a475d661f7ef56982ae0922eea22f193e4302e +Author: Morgan Bauer +Date: Wed Mar 16 23:42:28 2016 -0700 + + use apiClient for removing volumes + + Signed-off-by: Morgan Bauer + +commit cac394368042b4409111254d144f579cda664945 +Author: Morgan Bauer +Date: Wed Mar 16 21:13:20 2016 -0700 + + use apiClient for removing networks + + Signed-off-by: Morgan Bauer + +commit 1e22226b71c43f6698ce617ca3f544650091d61d +Author: Morgan Bauer +Date: Wed Mar 16 16:15:07 2016 -0700 + + use apiClient for removing images + + - remove unused argument + - unit test of new client + + Signed-off-by: Morgan Bauer + +commit 511a70583fbb901f57acb44d501cca8e6dcbce2c +Author: Anusha Ragunathan +Date: Fri Mar 4 14:41:53 2016 -0800 + + Update mount state of live containers after a daemon crash. + + Fix unmount issues in the daemon crash and restart lifecycle, w.r.t + graph drivers. This change sets a live container RWLayer's activity + count to 1, so that the RWLayer is aware of the mount. Note that + containerd has experimental support for restore live containers. + + Added/updated corresponding tests. + + Signed-off-by: Anusha Ragunathan + +commit f4bdc6287a2deca809f1fe3d8ca27a0bc62dea57 +Author: Aaron Schlesinger +Date: Thu Mar 24 09:35:04 2016 -0700 + + Remove the example + + Instead, direct users to the one in the factory package + + Signed-off-by: Aaron Schlesinger + +commit 204ad474e424829e282c2c3a7e0ff7a040146279 +Author: Aaron Schlesinger +Date: Fri Mar 18 16:28:42 2016 -0700 + + Add documentation for how to register new StorageDrivers + + This commit adds context-specific documentation on StorageDriver, + StorageDriverFactory, and the factory’s Register func, explaining how + the internal registration mechanism should be used. + + This documentation follows from the thread starting at + https://github.com/deis/builder/pull/262/files#r56720200. + + cc/ @stevvooe + + Signed-off-by: Aaron Schlesinger + +commit 88827d33249112780ca518fa5df5becf504d16df +Merge: 9c645cb823 a6f19ef936 +Author: Nathan LeClaire +Date: Tue Mar 29 14:40:58 2016 -0700 + + Merge pull request #3243 from tpires/3141_fix_check_docker_running + + FIX #3141 Refactor netstat command and tests + +commit 8899896992d855b3e039c5f11ecafd83e8e45757 +Merge: d78f8f2796 a7851e2556 +Author: Brian Goff +Date: Tue Mar 29 14:37:53 2016 -0700 + + Merge pull request #21620 from LK4D4/fix_libcd_race + + libcontainerd: reuse our pkg/locker + +commit 9c645cb82353192823740e5809c075785d6149d5 +Merge: 90b4c3895d 705865fa70 +Author: Nathan LeClaire +Date: Tue Mar 29 14:37:09 2016 -0700 + + Merge pull request #3245 from jsirois/jsirois/issues/3242 + + Fixup create command flag application. + +commit 90b4c3895dc21cd52239bd0c6d8759478a244f4e +Merge: 0d58079bf5 f2acfa9492 +Author: Nathan LeClaire +Date: Tue Mar 29 14:36:37 2016 -0700 + + Merge pull request #3235 from mmalchuk/master + + Correct error handling for external SSH client + +commit 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6 +Author: Anusha Ragunathan +Date: Thu Mar 24 09:18:03 2016 -0700 + + When using systemd, pass expected cgroupsPath and cli options to runc. + + runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName + format and the "--systemd-cgroup" option to be set. Update docker accordingly. + + Fixes 21475 + + Signed-off-by: Anusha Ragunathan + +commit 0b50dbd503b74314af2f3c69d111e73960e67851 +Merge: 3461df4032 ea5f2e0f63 +Author: Victor Vieux +Date: Tue Mar 29 14:08:40 2016 -0700 + + Merge pull request #2048 from dongluochen/FixContainerStateString + + Godep update dockerclient + +commit 114be249f022535f0800bd45987c4e9cd1b321a4 +Author: Alexander Morozov +Date: Tue Mar 29 13:52:18 2016 -0700 + + daemon: register container as late as possible + + fixes races between list and create + + Signed-off-by: Alexander Morozov + +commit 7a62610b878fc3920288de3059dd06560cb276a9 +Merge: 5d6d325ec4 06d681e1fb +Author: Nathan LeClaire +Date: Tue Mar 29 12:59:28 2016 -0700 + + Merge pull request #415 from kmpm/verbose-error + + More information on errors in start.sh + +commit ea5f2e0f63c125656aa651874e6066ded04666e9 +Author: Dong Chen +Date: Tue Mar 29 12:01:56 2016 -0700 + + Godep update dockerclient + + Signed-off-by: Dong Chen + +commit 7df5b32834237eac4c338f0ce1cba65b86bbe642 +Author: Ken Cochrane +Date: Tue Mar 29 14:39:28 2016 -0400 + + Change the directory inside of tgz files. + + Currently the directory inside of the tgz files is /usr/local/bin + and this is causing some confusion, and problems with people who already + have stuff in those directories. This commit changes the directory + to /docker to help remove the confusion. + + Signed-off-by: Ken Cochrane + +commit d78f8f2796bd9b2370f817dacca0b27d8601ff4c +Merge: 0fa96f2463 a7e9bf6cb7 +Author: David Calavera +Date: Tue Mar 29 11:30:35 2016 -0700 + + Merge pull request #21608 from albers/build-clone-https + + Use https for `git clone` in build + +commit 0fa96f246312661416bd8ea5010dc1a77a769323 +Merge: e42c164763 16bf3eede0 +Author: David Calavera +Date: Tue Mar 29 11:29:30 2016 -0700 + + Merge pull request #21593 from aboch/bdvnd + + Vendoring boltb/bolt v1.2.0 + +commit 705865fa70a789eeb3e19ea5b7214596e63da4a4 +Author: John Sirois +Date: Tue Mar 29 11:36:28 2016 -0600 + + Fixup create command flag application. + + Previously StringSlice flag defaults were not respected. These use + special handling and that handling did not take account of default + values, always over-writing them. Expand the CommandLine interface to + take advantage of the underlying codegansta/cli.Context IsSet method and + guard default string slice overwrites with an IsSet test. + + Signed-off-by: John Sirois + +commit e6d87c0706d178407ffccaab5c3ffc13a9e7b02e +Author: Alexander Morozov +Date: Tue Mar 29 10:46:29 2016 -0700 + + volume/store: fix couple of races with accessing maps + + Signed-off-by: Alexander Morozov + +commit 19ad02e6ac497f5dee280af38b6f79029c7de2d4 +Merge: 60b9f1756d 6018bdf58a +Author: Richard Scothern +Date: Tue Mar 29 10:30:19 2016 -0700 + + Merge pull request #1559 from moxiegirl/fix-925 + + Update the Duration value for Cloudfront + +commit 39b9b63e364dc5e2bbc3e73f29b75f9de5c5dbf0 +Author: Harald Albers +Date: Tue Mar 29 09:57:10 2016 -0700 + + bash completions: Improve consistency for options with default=true + + Completion of these options was not handled consistently. + Now all such options immediatly complete with =false appended. + + Signed-off-by: Harald Albers + +commit 745892a7b271cf0f1770a8ec3698aaf61573e5f2 +Author: Aaron Lehmann +Date: Mon Mar 28 17:16:56 2016 -0700 + + Change v1 pull 404 message to include tag + + The current error message is "Error: image [name] not found". This makes + sense from the perspective of the v1 pull, since we found the repository + doesn't exist over the v1 protocol. However, in the vast majority of + cases, this error will be produced by fallback situations, where we + first try to pull the tag with the v2 protocol, and then fall back the + v1 protocol, which probably isn't even supported by the server. + Including the tag in the error message makes a lot more sense since the + actual repository may exist on v2, but not the tag. + + Signed-off-by: Aaron Lehmann + +commit 6018bdf58a15321ce0e1a973053351d9ac50a643 +Author: Mary Anthony +Date: Tue Mar 29 09:53:13 2016 -0700 + + Updating example + + Signed-off-by: Mary Anthony + +commit a7851e2556edb3e5333b6fe53160755fb5b7d616 +Author: Alexander Morozov +Date: Tue Mar 29 09:43:12 2016 -0700 + + libcontainerd: reuse our pkg/locker + + it fixes race with access to containerMutexes + + Signed-off-by: Alexander Morozov + +commit e42c164763edc00cf41131ac0c1431fda27e6f21 +Merge: c1706d722f afeba190a5 +Author: Sebastiaan van Stijn +Date: Tue Mar 29 09:41:21 2016 -0700 + + Merge pull request #18747 from thaJeztah/update-authors + + Update AUTHORS + +commit c1706d722fdb0d5017ee0251cfaa4c352a26c986 +Merge: 1da40fb4ba 73672c5bd8 +Author: Tibor Vass +Date: Tue Mar 29 12:09:10 2016 -0400 + + Merge pull request #21619 from mlaventure/use-debian-llvm-repo + + Update the llvm repo to use the debian jessie url + +commit 85e2fb63b3309280a602f1f76d77d3a82e53b6c2 +Merge: 024a810617 8ae8f7ed4b +Author: Aanand Prasad +Date: Tue Mar 29 16:50:12 2016 +0100 + + Merge pull request #3218 from sdurrheimer/zsh-completion-run-workdir + + Add zsh completion for 'docker-compose run -w --workdir' + +commit 024a8106179e868717ae80aba37696981e88eb96 +Merge: 668d45c7cc 9729c0d3c7 +Author: Aanand Prasad +Date: Tue Mar 29 16:49:49 2016 +0100 + + Merge pull request #3217 from sdurrheimer/zsh-completion-up-build + + Add zsh completion for 'docker-compose up --build' + +commit 668d45c7cc1714d788c6870f83f7f0e3477893c0 +Merge: 09ea74245d 9d58b19ecc +Author: Aanand Prasad +Date: Tue Mar 29 16:49:36 2016 +0100 + + Merge pull request #3216 from sdurrheimer/zsh-completion-logs + + Add zsh completion for 'docker-compose logs -f --follow --tail -t --t… + +commit 09ea74245d7700d3a4488d9ea852db276b8522ee +Merge: 386edd892c 63b448120a +Author: Aanand Prasad +Date: Tue Mar 29 16:49:15 2016 +0100 + + Merge pull request #3215 from sdurrheimer/zsh-completion-exec-command + + Add zsh completion for 'docker-compose exec' command + +commit 386edd892c7827f7214ae22abc9cea0f25907842 +Merge: aa50023507 0f1fb42326 +Author: Aanand Prasad +Date: Tue Mar 29 16:48:53 2016 +0100 + + Merge pull request #3214 from sdurrheimer/zsh-completion-rm-all + + Add zsh completion for 'docker-compose rm -a --all' + +commit 1da40fb4badd116a7591dd2c19009146770c9a89 +Merge: d33480474f f0d26e1665 +Author: Arnaud Porterie +Date: Tue Mar 29 08:40:49 2016 -0700 + + Merge pull request #21586 from calavera/remove_runconfig_from_routes + + Remove runconfig package dependency from the API. + +commit 73672c5bd8ad170224957734bd1eaf20b11680ba +Author: Kenfe-Mickael Laventure +Date: Tue Mar 29 08:37:13 2016 -0700 + + Update the llvm repo to use the debian jessie url + + Signed-off-by: Kenfe-Mickael Laventure + +commit d33480474f33523743ae49c1b96737fbfbeb1a6f +Merge: 78076d5cf9 0d9b94c4c5 +Author: Alexander Morozov +Date: Tue Mar 29 07:52:18 2016 -0700 + + Merge pull request #21599 from tonistiigi/separate-daemon-exec-root + + Use separate exec-root for test daemons + +commit 188206eeded75367c2a58a2553a0e8325e76aba9 +Author: Mary Anthony +Date: Thu Mar 24 15:59:26 2016 -0700 + + Fixes and closes #925 + Seconds to minutes as per code + Correction per Derek + Clarifying failure case + + Signed-off-by: Mary Anthony + + Clarifying failure case + + Signed-off-by: Mary Anthony + +commit 06d681e1fbc0c90d462b15bfd1eca724200726f9 +Author: Peter Magnusson +Date: Mon Feb 15 10:57:07 2016 +0100 + + More information on errors in start.sh + + By adding a variable which holds which step of the script that is about to be performed + one can show a more describing error message. + + Instead of + + Looks like something went wrong... Press any key to continue... + + One will get for example + + Looks like something went wrong in step ´Checking status on default´... Press any key to continue... + + This will aid when troubleshooting and reporting issues. + + Signed-off-by: Peter Magnusson + +commit e96d086afdb111fc4b587d4e82c857dbfec4e87e +Author: Harald Albers +Date: Tue Mar 29 09:59:04 2016 +0200 + + bash completion for `docker {run,create} --security-opt no-new-privileges` + + Signed-off-by: Harald Albers + +commit 78076d5cf9413476a8d4e27822b96fef7a55e055 +Merge: 4aa36da9ad 3e3ac8abea +Author: Vincent Demeester +Date: Tue Mar 29 09:58:20 2016 +0200 + + Merge pull request #21585 from tophj-ibm/ppc64le-bump-go1.6 + + ppc64le: bump golang back to 1.6 + +commit 4aa36da9ad35ff93db6420c3ffcc87c5ed64a7a5 +Merge: 6eb3835995 e42f85080b +Author: Vincent Demeester +Date: Tue Mar 29 09:56:08 2016 +0200 + + Merge pull request #21602 from aaronlehmann/login-log-message + + Correct login debug log message + +commit a7e9bf6cb70117005dbcd4a987a7f30e3c605656 +Author: Harald Albers +Date: Tue Mar 29 09:35:42 2016 +0200 + + Use https for `git clone` in build + + Signed-off-by: Harald Albers + +commit 6eb38359954269103f2a3094283c4cb0a1cb63f9 +Merge: 08db95161a 0f217cead8 +Author: Vincent Demeester +Date: Tue Mar 29 09:34:17 2016 +0200 + + Merge pull request #21529 from LK4D4/test_exit_early + + integration-cli: exit early if daemon immedately crashed + +commit 08db95161a1dc7c5bfe570652d4eb859025a62cb +Merge: b9d59e86d3 fb5ea0c0ef +Author: Vincent Demeester +Date: Tue Mar 29 09:27:53 2016 +0200 + + Merge pull request #21597 from aaronlehmann/mention-docker-login + + Mention "docker login" in push/pull documentation + +commit b9d59e86d35bd2cfba0c77c323b14b05a238eae6 +Merge: 9021b048f5 75f0015c50 +Author: Vincent Demeester +Date: Tue Mar 29 09:25:16 2016 +0200 + + Merge pull request #21576 from albers/docs-daemon--containerd + + docs for `docker daemon --containerd` + +commit 9021b048f5c2c92baddcefcfeedc731a32b5cca7 +Merge: 53f3248d90 555d8cb293 +Author: Vincent Demeester +Date: Tue Mar 29 09:20:15 2016 +0200 + + Merge pull request #21589 from tkopczynski/20784-builder-tests + + Builder/dockerignore tests + +commit 53f3248d90713b5d3209c6b931d99f58592691eb +Merge: e6aa40a017 c70c0e4d0b +Author: Vincent Demeester +Date: Tue Mar 29 09:18:16 2016 +0200 + + Merge pull request #21561 from HackToday/addman + + Add man change for volume filter + +commit e6aa40a017e0c11186fb9053b9e71e34b93ebe1c +Merge: f95058aa0f b16decfccf +Author: Vincent Demeester +Date: Tue Mar 29 08:52:54 2016 +0200 + + Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli + + CLI flag for docker create(run) to change block device size. + +commit 3461df4032a65ef96bdb1580e696cd9113999868 +Merge: 082d197ea6 e98cf00409 +Author: Victor Vieux +Date: Mon Mar 28 22:50:28 2016 -0700 + + Merge pull request #2042 from vieux/update_build + + support private images, labels and other new flags in docker build + +commit f95058aa0fee0b816aa84e51fd886528d2eb0afb +Merge: eeaf14395e 02f951b67a +Author: Sebastiaan van Stijn +Date: Mon Mar 28 19:25:10 2016 -0700 + + Merge pull request #21596 from trumpcard/master + + Fix a link in the volumes doc to the deprecated doc. + +commit 082d197ea6a38e989040a259669d60f29a5d4298 +Merge: c567e4e675 0ebb26bdd4 +Author: Dongluo Chen +Date: Mon Mar 28 19:05:13 2016 -0700 + + Merge pull request #2043 from nishanttotla/print-version-in-info + + Printing engine version in Info + +commit eeaf14395e05b331b82d429d161f5d76f7b1837d +Merge: 6114072ffc 270562f439 +Author: Sebastiaan van Stijn +Date: Mon Mar 28 19:01:15 2016 -0700 + + Merge pull request #21541 from yongtang/20909-engine-api + + Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9. + +commit 6114072ffc78adda9888b31c70b95e73a8ea3c2e +Merge: 051c5ddadc ff3525c80f +Author: Sebastiaan van Stijn +Date: Mon Mar 28 18:45:41 2016 -0700 + + Merge pull request #21587 from Microsoft/jjh/bridgeconfig + + Windows: bridgeConfig rework + +commit 0dea21f4462706290c85e6d74b165ceae7e9cfee +Author: Aaron Lehmann +Date: Mon Mar 28 18:27:29 2016 -0700 + + Fix flaky test TestTransfer (take 2) + + TestTransfer failed in CI: + https://jenkins.dockerproject.org/job/Docker-PRs-experimental/17103/console + + This is the same issue as https://github.com/docker/docker/pull/21233, + but only one of the code paths was fixed in that PR. The one which + handles the first progress update was not - it still assumed that the + progress indication should be 0/10. + + Signed-off-by: Aaron Lehmann + +commit e42f85080b8254ee025f30cf7860641836df649f +Author: Aaron Lehmann +Date: Mon Mar 28 18:22:24 2016 -0700 + + Correct login debug log message + + I noticed the following message in a daemon log: + + ``` + attempting v2 login to registry endpoint {%!s(bool=false) https://registry:5000 v2 %!s(bool=false) %!s(bool=true) %!s(*tls.Config=&{ [] map[] 0xc82075c030 [] 0 false [49196 49200 49195 49199 49162 49161 49172 49171 53 47] true false [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] 769 0 [] {{0 0} 0} {{0 0} 0 0 0 0} []})} + ``` + + loginV2 tries to log an APIEndpoint as a string, but this struct does + not have a String method. Log the actual URL that will be used as the + endpoint, instead. + + Signed-off-by: Aaron Lehmann + +commit 0ebb26bdd4a4f6cb3933a223d24f034657363008 +Author: Nishant Totla +Date: Mon Mar 28 17:40:50 2016 -0700 + + Printing engine version in Info + + Signed-off-by: Nishant Totla + +commit 7116aefe4310c77a6d8f80a9f928ce6437e8bb49 +Author: Joffrey F +Date: Mon Mar 28 17:39:20 2016 -0700 + + Fix assert_hostname logic in tls_config_from_options + + Signed-off-by: Joffrey F + +commit 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e +Author: Tonis Tiigi +Date: Mon Mar 28 17:33:09 2016 -0700 + + Use separate exec-root for test daemons + + Fixes #21545 + + Signed-off-by: Tonis Tiigi + +commit f2acfa9492d9352edeb722ba625adaf86bcdee7e +Author: Maksim Malchuk +Date: Sat Mar 26 00:02:41 2016 +0300 + + Correct error handling for external SSH client + + In some cases, (e.g. private key not accessible or has incorrect + permissions) docker-machine failed with error "Something went wrong + running an SSH command!". This commit will add the correct debug + messages and show the correct errors for the bad private keys. + + Signed-off-by: Maksim Malchuk + +commit fb5ea0c0efec238aeeff7c5c3742a0e4eccff2c7 +Author: Aaron Lehmann +Date: Mon Mar 28 17:10:11 2016 -0700 + + Mention "docker login" in push/pull documentation + + It was suggested to me that documentation for "docker pull" and "docker + push" should reference "docker login", to make clearer how to specify + credentials for a push or pull operation. Add a note to the manual pages + and reference documentation explaining how registry credentials are + managed. + + Signed-off-by: Aaron Lehmann + +commit 051c5ddadc17ffb8a0f9923df0f0b2206ae0eba9 +Merge: 1e1da2a29b 824c24e680 +Author: Michael Crosby +Date: Mon Mar 28 17:00:43 2016 -0700 + + Merge pull request #21552 from tonistiigi/aufs-mount-locks + + Protect aufs mounts with locks + +commit 02f951b67a889f9bc4fefc602e58efa194d767b7 +Author: Brian Trump +Date: Mon Mar 28 16:55:24 2016 -0700 + + Fix a link in the volumes doc to the deprecated doc. + + Signed-off-by: Brian Trump + +commit 1e1da2a29bf79fadc8a970f4acaa4333723e4880 +Merge: 553edd1d19 a4d4243b91 +Author: Sebastiaan van Stijn +Date: Mon Mar 28 16:25:52 2016 -0700 + + Merge pull request #21582 from kamigerami/fixes-21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md + + fixes-#21581-no--subnetwork-option-as-specified-in-docs + +commit 553edd1d19193a1413515fdf3807a6136c4fc0a6 +Merge: d7382c1fa3 75a271603c +Author: Tõnis Tiigi +Date: Mon Mar 28 16:15:18 2016 -0700 + + Merge pull request #21251 from cyphar/refactor-copyonbuild + + pkg: archive: don't fail Untar if xattrs are not supported + +commit 0a60261fabc0912bb67f0ab8c0287aa8784326c7 +Author: HuKeping +Date: Mon Mar 28 23:41:53 2016 +0800 + + Use constant for root role + + Signed-off-by: Hu Keping + +commit ddff581bd88f8b24232a56ebc0d05531f15b9980 +Author: HuKeping +Date: Mon Mar 28 23:41:46 2016 +0800 + + Use constant for targets role + + Signed-off-by: Hu Keping + +commit 16bf3eede024f2efd088c6209e0042a040a9b8fb +Author: Alessandro Boch +Date: Mon Mar 28 15:49:41 2016 -0700 + + Vendoring boltb/bolt v1.2.0 + + Signed-off-by: Alessandro Boch + +commit c567e4e67574461aeb4b9fbda452dd561c068d2c +Merge: d848e92b93 ba0a39c518 +Author: Dongluo Chen +Date: Mon Mar 28 15:44:43 2016 -0700 + + Merge pull request #1987 from allencloud/log-error-when-getting-swarm-kernel-and-os-info + + handle error when getting kernel and os info error + +commit d7382c1fa3c21012fd40a13f1265bcec3e3cf2ab +Merge: 121b78c27d 2623b3496e +Author: David Calavera +Date: Mon Mar 28 15:42:21 2016 -0700 + + Merge pull request #21577 from albers/completion-dm.min_free_space + + bash completion for `dm.min_free_space` + +commit a6f19ef93688fb0247e25e35868eb12d74106547 +Author: Tiago Pires +Date: Mon Mar 28 23:15:00 2016 +0100 + + FIX #3141 Refactor netstat command and tests + + Updated `netstat` command to minimize its output with `-t` and `-l` + flags. + Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to + avoid `matchNetstatOut` returning `true` when remote machine has a + similar port to dockerPort listening (e.g. dockerPort := 2376 and + remote machine has port 23760 listening). + Refactored `utils_test.go` with more accurate `netstat` output. + + Signed-off-by: Tiago Pires + +commit d848e92b93536c9e64b1f5aa6842d0f131b2cbae +Merge: b5bc256046 b963ffca3e +Author: Victor Vieux +Date: Mon Mar 28 15:27:29 2016 -0700 + + Merge pull request #2041 from vieux/update_dockerclient + + update dockerclient to get labels on volumes, networks, etc... + +commit 121b78c27d8237954d072d4e343070b2a3ded5e5 +Merge: be390c30cd 8ec8564691 +Author: Arnaud Porterie +Date: Mon Mar 28 15:08:40 2016 -0700 + + Merge pull request #21590 from tonistiigi/apt-mirror + + Allow specifying apt mirror in dockerfile + +commit 8d18e6b30f0a33463c749079d87cad8fa9c19d52 +Author: Riyaz Faizullabhoy +Date: Mon Mar 28 11:36:20 2016 -0700 + + move hardware signing out of experimental, remove dependencies to yubico-piv-tool + + Signed-off-by: Riyaz Faizullabhoy + +commit 60b9f1756d9f50305faac3e604ed7f58d3ba4b5f +Merge: 72ec74834b 1ea9a3638d +Author: Olivier Gambier +Date: Mon Mar 28 13:56:24 2016 -0700 + + Merge pull request #1570 from RichardScothern/version + + Rev base version to 2.4.0 + +commit 1ea9a3638df0475e3c8c1896c86d5092af01e618 +Author: Richard Scothern +Date: Mon Mar 28 13:54:28 2016 -0700 + + Rev base version to 2.4.0 + + Now that we've tagged a release candidate, we can now say all builds are + "2.4.0+unknown" if the makefile is not used. + + Signed-off-by: Richard Scothern + +commit 8ec8564691dc1ebf757c93fe51f6b64a8fcb49af +Author: Tonis Tiigi +Date: Mon Mar 28 13:47:28 2016 -0700 + + Allow specifying apt mirror in dockerfile + + Signed-off-by: Tonis Tiigi + +commit 555d8cb293705bd2ad2d8cac7881616756eca767 +Author: Tomasz Kopczynski +Date: Sat Mar 5 21:35:06 2016 +0100 + + Dockerignore tests + + Signed-off-by: Tomasz Kopczynski + +commit f0d26e1665f7552972db5b041554cc7b45bc3060 +Author: David Calavera +Date: Mon Mar 28 14:22:23 2016 -0400 + + Remove runconfig package dependency from image and container routers. + + Use an interface to specify the behavior of a configuration decoder. + + Signed-off-by: David Calavera + +commit 3ca29823d42ab1e2b1ea76981ccc9aa11e858cb2 +Author: David Calavera +Date: Mon Mar 28 13:41:06 2016 -0400 + + Remove runconfig dependency from network routes. + + Signed-off-by: David Calavera + +commit be390c30cdde978ea1a5417875876e4f3ae52655 +Merge: cf91a1be45 c6ad1980a2 +Author: David Calavera +Date: Mon Mar 28 12:44:07 2016 -0700 + + Merge pull request #21523 from LK4D4/cancellable_routes + + Embed context.Context to routes with usage of CloseNotify + +commit ff3525c80f9118e2320e480dde75887c50d6ac0a +Author: John Howard +Date: Mon Mar 28 11:55:20 2016 -0700 + + Windows: bridgeConfig rework + + Signed-off-by: John Howard + +commit 3e3ac8abeaf892bbb985e7b70b37f6eee1731338 +Author: Christopher Jones +Date: Mon Mar 28 14:02:06 2016 -0400 + + ppc64le: bump golang back to 1.6 + + Despite the current issue with unix sockets and golang, I'm bumping this back up to 1.6. + Go <1.6 has major compatibility issues on ppc64* including not supporting dynamic binding, + so we would have to go back to gccgo, which is worse in a lot of other categories. Ultimately for us, + the amount of people affected by this issue isn't worth switching compilers. + + Signed-off-by: Christopher Jones + +commit 0d58079bf51768f374752b160b017073dd8519a9 +Merge: 8141874120 b85531506a +Author: Nathan LeClaire +Date: Mon Mar 28 11:55:39 2016 -0700 + + Merge pull request #3233 from AndreLouisCaron/env-silent-in-cmd + + Silences docker-machine env command on Windows. + +commit cf91a1be45fc4f1d4e3338610f921d665d406b04 +Merge: dd7691423f 477fe4846a +Author: David Calavera +Date: Mon Mar 28 11:39:22 2016 -0700 + + Merge pull request #21553 from tonistiigi/test-repeat + + Add support for repeating integration tests + +commit dd7691423f685bc4d724224913556c7e2cf4bc56 +Merge: dd757deae0 276a20dd42 +Author: David Calavera +Date: Mon Mar 28 11:37:23 2016 -0700 + + Merge pull request #21566 from allencloud/upper-case-docker-info-display + + upper case docker info details + +commit dd757deae06c55d7c2c1dcf5177dcfe7de386a61 +Merge: d48b1c6de5 3c157713b3 +Author: David Calavera +Date: Mon Mar 28 11:36:02 2016 -0700 + + Merge pull request #21556 from twistlock/basic_authn_client_cert + + Extend Docker authorization with TLS user information + +commit d48b1c6de5440cb571737e914d50f434d860567a +Merge: 22ca91b084 62475684b9 +Author: David Calavera +Date: Mon Mar 28 11:31:55 2016 -0700 + + Merge pull request #21579 from albers/completion-run--userns + + bash completion for `docker {run,create} --userns` + +commit 22ca91b08469be0143e8504e0599924380af28bd +Merge: 20ab670090 39d7ff233b +Author: David Calavera +Date: Mon Mar 28 11:31:39 2016 -0700 + + Merge pull request #21580 from sdurrheimer/zsh-completion-create-run-userns + + Add zsh completion for 'docker {create,run} --userns' + +commit 20ab6700902ff516d387209eeec9057131390a0a +Merge: 3b39363495 020998e24c +Author: David Calavera +Date: Mon Mar 28 11:29:31 2016 -0700 + + Merge pull request #21584 from albers/completion-fix--security-opt + + fix bash completion for `docker run --security-opt` + +commit 3b3936349500fa1b8f5bfdc4c3c5d62109112c4b +Merge: 35986d4824 6dede879fd +Author: Tõnis Tiigi +Date: Mon Mar 28 10:47:11 2016 -0700 + + Merge pull request #21578 from VorT3x/master + + Fix misspellings + +commit 72ec74834b2b84441791b4fc16c431c6b0d5a742 +Merge: f4b6fc8d68 321e0420bf +Author: Richard Scothern +Date: Mon Mar 28 10:34:48 2016 -0700 + + Merge pull request #1569 from GameScripting/patch-1 + + added heading to get more focus into the headers that need to be set + +commit 5d6d325ec4a62a630fee041929ec255318987a4d +Author: Nathan LeClaire +Date: Mon Mar 28 10:13:16 2016 -0700 + + Bump to 1.11.0-rc2 + + Signed-off-by: Nathan LeClaire + +commit 321e0420bf47ab3d401aa05f4e3d1de0c4f4e932 +Author: Daniel Huhn +Date: Mon Mar 28 18:02:58 2016 +0200 + + added heading to get more focus into the headers that need to be set + + Signed-off-by: Daniel Huhn + +commit 020998e24cc9bdf16204f1db18cf4886897c1541 +Author: Harald Albers +Date: Mon Mar 28 08:07:28 2016 -0700 + + fix bash completion for `docker run --security-opt` + + Signed-off-by: Harald Albers + +commit a4d4243b9105d03b1e519729e8e8fd4b16084760 +Author: kamjar gerami +Date: Mon Mar 28 16:58:42 2016 +0200 + + fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs + + Signed-off-by: kamjar gerami + +commit b16decfccfdb0749c490be9272cb7b4789be87b4 +Author: Shishir Mahajan +Date: Sun Mar 20 00:42:58 2016 -0400 + + CLI flag for docker create(run) to change block device size. + + Signed-off-by: Shishir Mahajan + +commit 62475684b9cb09ba5cc3f2dd3b3ad88031b391ba +Author: Harald Albers +Date: Mon Mar 28 06:11:52 2016 -0700 + + bash completion for `docker {run,create} --userns` + + Signed-off-by: Harald Albers + +commit 39d7ff233bbc2f333cce30124bfd6f52bba1ae2a +Author: Steve Durrheimer +Date: Mon Mar 28 15:39:27 2016 +0200 + + Add zsh completion for 'docker {create,run} --userns' + + Signed-off-by: Steve Durrheimer + +commit 270562f439684a8fca84617ab7ceb494b7afd301 +Author: Yong Tang +Date: Sat Mar 26 13:40:29 2016 +0000 + + Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9. + + This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9 + in order to support `SecurityOptions` in `Info`. + + See #20909, #21172 for details related to `SecurityOptions`. + + Signed-off-by: Yong Tang + +commit 6dede879fd8e0c5f599631d125753d360ead3bc0 +Author: Dmitri Logvinenko +Date: Mon Mar 28 16:17:21 2016 +0300 + + Fix misspellings + + Signed-off-by: Dmitri Logvinenko + +commit 35986d48248c59bbb98aec21bb9a20142fd31ee4 +Merge: 7015195c60 63b29eda68 +Author: Lei Jitang +Date: Mon Mar 28 20:46:39 2016 +0800 + + Merge pull request #21575 from sdurrheimer/zsh-completion-daemon-containerd + + Add zsh completion for 'docker daemon --containerd' + +commit 63b29eda68683bad2e375fee97b4d106a5ca5a77 +Author: Steve Durrheimer +Date: Mon Mar 28 13:56:08 2016 +0200 + + Add zsh completion for 'docker daemon --containerd' + + Signed-off-by: Steve Durrheimer + +commit 75f0015c50fef03067c5d54097fb6eb8cb62200b +Author: Harald Albers +Date: Mon Mar 28 04:47:24 2016 -0700 + + docs for `docker daemon --containerd` + + Signed-off-by: Harald Albers + +commit 2623b3496ead7c275d2e54bdfcdab0eab528be51 +Author: Harald Albers +Date: Mon Mar 28 05:20:06 2016 -0700 + + fix wrong option name in `dm.min_free_space` examples + + Signed-off-by: Harald Albers + +commit eae4e84c6618e2633347477d788eb351529b0361 +Author: Harald Albers +Date: Mon Mar 28 05:15:56 2016 -0700 + + bash completion for storage option `dm.min_free_space` + + Signed-off-by: Harald Albers + +commit 7015195c604c6dc5f1a7d2773818e3b90991304f +Merge: bd6a08f739 aeaba46c2c +Author: Vincent Demeester +Date: Mon Mar 28 13:48:15 2016 +0200 + + Merge pull request #21573 from albers/completion-daemon--containerd + + bash completion for `docker daemon --containerd` + +commit 593e29156dcda362e4e4b9a95b4fce22a024ba79 +Author: Tomasz Kopczynski +Date: Tue Mar 8 22:43:38 2016 +0100 + + Builder/context unit tests + + Signed-off-by: Tomasz Kopczynski + +commit aeaba46c2c411523fc03ce5fcdf51f50e14b80ce +Author: Harald Albers +Date: Mon Mar 28 04:29:53 2016 -0700 + + bash completion for `docker daemon --containerd` + + Signed-off-by: Harald Albers + +commit ea1d8d6f82ee76f35b98b6ce2e3c543f24cf4b6c +Author: Thomas Sjögren +Date: Mon Mar 28 13:06:12 2016 +0200 + + systemctl show, no need to sudo + + Signed-off-by: Thomas Sjögren + +commit 276a20dd426524c254e8b2a4cc9047bcc62fd321 +Author: allencloud +Date: Mon Mar 28 15:46:53 2016 +0800 + + upper case docker info details + + Signed-off-by: allencloud + +commit 67b0ec377148aa5700ab60e5af3d34e411111b3a +Author: HuKeping +Date: Mon Mar 21 16:27:24 2016 +0800 + + Use constant for snapshot + + Signed-off-by: Hu Keping + +commit bd6a08f73968bdead92004d45012a559b0a3e002 +Merge: 4afeabfdad 59d8878558 +Author: Vincent Demeester +Date: Mon Mar 28 11:11:59 2016 +0200 + + Merge pull request #21560 from Microsoft/jjh/psignal + + Windows: psignal alias not required + +commit b5bc2560463c4511533fb4ff3f25a7a9081efcdb +Merge: 4db4e951c7 ae46892a29 +Author: Nishant Totla +Date: Sun Mar 27 22:08:13 2016 -0700 + + Merge pull request #2037 from CodeJuan/master + + typo, the port of consul is 8500 + +commit 0f217cead8260ab45f9749074d954e5e9e76187b +Author: Alexander Morozov +Date: Fri Mar 25 14:42:30 2016 -0700 + + integration-cli: exit early if daemon immedately crashed + + this reduces execution of TestInfoDiscoveryInvalidAdvertise from 11s to 0.2s + + Signed-off-by: Alexander Morozov + +commit c6ad1980a2eb2994940bdf7f79835ffdbed2b44d +Author: Alexander Morozov +Date: Sun Mar 27 21:53:25 2016 -0700 + + use router.Cancellable for pull and push + + Signed-off-by: Alexander Morozov + +commit ae46892a29f0b85f62e11546054f143360dc4979 +Author: CodeJuan +Date: Sun Mar 27 17:59:53 2016 +0800 + + typo, the port of consul is 8500 + + Signed-off-by: codejuan + +commit c70c0e4d0be94ab2e0944a16be08389d178003bc +Author: Kai Qiang Wu(Kennan) +Date: Mon Mar 28 03:11:06 2016 +0000 + + Add man change for volume filter + + It was forgetton to add change in man for new-added volume filters. + This change adds that. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 4db4e951c7b1bb502ae5bbb8dec5fb3376296bd2 +Merge: a3b84856e8 da7128cc16 +Author: Nishant Totla +Date: Sun Mar 27 18:36:32 2016 -0700 + + Merge pull request #2031 from allencloud/fix-minor-typo + + fix minor typo + +commit a3b84856e8124b16ef0c2985940b7a7a92e4182f +Merge: 78f239ba1e 8751437324 +Author: Nishant Totla +Date: Sun Mar 27 18:35:15 2016 -0700 + + Merge pull request #2035 from allencloud/fix-typo-in-changelog + + fix typo in changelog.md + +commit 78f239ba1eddbdf886579e568d384e2ad98ce350 +Merge: a5cba297ed ec0c3f7bbd +Author: Xian Chaobo +Date: Mon Mar 28 09:30:13 2016 +0800 + + Merge pull request #2028 from allencloud/log-err-when-starting-rescheduled-container-fails + + output error when starting a rescheduled container fails + +commit 93901ec4805b0a72ba71ae910d3214e4856cd876 +Author: Jon Lemmon +Date: Mon Mar 28 13:29:01 2016 +1300 + + Rails Docs: Add nodejs to apt-get install command + + When using the latest version of Rails, the tutorial currently errors when running `docker-compose up` with the following error: + + ``` + /usr/local/lib/ruby/gems/2.3.0/gems/bundler-1.11.2/lib/bundler/runtime.rb:80:in `rescue in block (2 levels) in require': There was an error while trying to load the gem 'uglifier'. (Bundler::GemRequireError) + ``` + + Installing nodejs in the build fixes the issue. + + Signed-off-by: Jon Lemmon + +commit 59d8878558f97055d8abb1fa347df437cf8f90aa +Author: John Howard +Date: Sun Mar 27 17:23:34 2016 -0700 + + Windows: psignal alias not required + + Signed-off-by: John Howard + +commit a0332d279bb90e9849d52315f1c57562bfce5058 +Author: Alexandre Vazquez +Date: Sun Mar 27 16:03:11 2016 +0200 + + Updating the branch to the latest master and making it work with the new docker daemon evolutions + +commit 49833aaccded7f7533cff4100dc8841deda0493c +Merge: e6badec155 cac4c6fbae +Author: Alexandre Vazquez +Date: Sun Mar 27 15:28:36 2016 +0200 + + Merge branch 'master' into issue-1206 + +commit 3c157713b31f542a4180e31da4cae7d677330a6f +Author: Liron Levin +Date: Sun Mar 27 15:53:37 2016 +0300 + + Extend Docker authorization with TLS user information + + Currently Docker authorization framework does not use any user + information, which already available in the Docker context for TLS + connection. + The purpose of this CR is to complete the existing authz work by adding + the basic client certificate details (SUBJECT_NAME) and authentication + method (TLS) to the authz request. + + We think this should be the default behavior when no extended + authorization module is specified (currently WIP under #20883). + + Signed-off-by: Liron Levin + +commit 33a8ab29ed9e51697772a0642b8d651b9a845532 +Author: Pierre Carrier +Date: Thu Mar 24 16:14:30 2016 -0700 + + docker.service: don't limit tasks + + Signed-off-by: Pierre Carrier + +commit 4afeabfdadf1715a63d0efdb0891038141307913 +Merge: 1aa07d6f11 ff31f166f2 +Author: Vincent Demeester +Date: Sun Mar 27 11:52:41 2016 +0200 + + Merge pull request #21547 from sdurrheimer/zsh-completion-gelf-compression + + Add zsh completion for gelf-compression log driver options + +commit ff31f166f205432f07059dbce2b07e25a10abf1f +Author: Steve Durrheimer +Date: Sat Mar 26 22:31:17 2016 +0100 + + Add zsh completion for gelf-compression log driver options + + Signed-off-by: Steve Durrheimer + +commit 1aa07d6f119d478bd1a60a0d56e67b0ccc092ffb +Merge: 49a73ca121 f3a27a6fac +Author: Vincent Demeester +Date: Sun Mar 27 10:22:50 2016 +0200 + + Merge pull request #21546 from sdurrheimer/zsh-completion-ps-filters + + Add zsh completion for 'docker ps --filter' values + +commit 49a73ca1211dbf9771bcdd578b31958708b0e628 +Merge: 98132f850b ca3ff89e56 +Author: Vincent Demeester +Date: Sun Mar 27 10:18:57 2016 +0200 + + Merge pull request #21548 from sdurrheimer/zsh-completion-etwlogs-gcplogs-log-drivers + + Add zsh completion for etwlogs and gcplogs log drivers + +commit 98132f850b879a4c677c88b85f3c5e9771544678 +Merge: 8dbecd5936 6983f05b42 +Author: Vincent Demeester +Date: Sun Mar 27 10:18:02 2016 +0200 + + Merge pull request #21544 from allencloud/fix-typo + + fix typos + +commit afeba190a5e533a6a276cd8f5889202389b8f9d3 +Author: Sebastiaan van Stijn +Date: Thu Dec 17 15:39:50 2015 +0100 + + Update AUTHORS + + Signed-off-by: Sebastiaan van Stijn + +commit 8dbecd5936499940f044016042319a24d81a9df6 +Merge: d954186efb a1d6c60ee0 +Author: Tõnis Tiigi +Date: Sat Mar 26 23:10:23 2016 -0700 + + Merge pull request #21540 from senk/patch-containerd + + Fixes typo in containerd-parameter usage instructions. Fixes #21538 + +commit 477fe4846ac72a77d7b045d1b5619bc7cfdbb9aa +Author: Tonis Tiigi +Date: Sat Mar 26 22:56:45 2016 -0700 + + Add support for repeating integration tests + + `TEST_REPEAT=n` runs the test suite again n times or + until the first failure without doing building and + daemon setup. Useful for debugging flaky tests. + + Signed-off-by: Tonis Tiigi + +commit 824c24e6802ad3ed7e26b4f16e5ae81869b98185 +Author: Tonis Tiigi +Date: Sat Mar 26 22:53:47 2016 -0700 + + Protect aufs mounts with locks + + Parallel aufs mount calls produce invalid argument error. + + Fixes #21545 + + + Signed-off-by: Tonis Tiigi + +commit d954186efb6e18a02ca401a77bde2637529a5e95 +Merge: a5dc6c3ca1 93ffc2d954 +Author: Sebastiaan van Stijn +Date: Sat Mar 26 18:04:53 2016 -0700 + + Merge pull request #21542 from sdurrheimer/zsh-completion-journald-tag + + Add zsh completion for journald tag opt + +commit a5dc6c3ca135b16d9a2b60b181ad7e2fcbb3b909 +Merge: db00de5d37 ca2cca0255 +Author: Sebastiaan van Stijn +Date: Sat Mar 26 18:03:27 2016 -0700 + + Merge pull request #21543 from sdurrheimer/zsh-completion-update-restart + + Add zsh completion for 'docker update --restart' + +commit db00de5d378acd270211c55591dc28ce3fd4c8af +Merge: 6f9872180c b0235ffddd +Author: Sebastiaan van Stijn +Date: Sat Mar 26 17:57:46 2016 -0700 + + Merge pull request #21549 from sdurrheimer/zsh-completion-pull-push-disable-content-trust + + Add zsh completion for 'docker {pull,push} --disable-content-trust' + +commit b0235ffdddede003b3e125ffdef796a185e8a43e +Author: Steve Durrheimer +Date: Sat Mar 26 22:49:53 2016 +0100 + + Add zsh completion for 'docker {pull,push} --disable-content-trust' + + Signed-off-by: Steve Durrheimer + +commit ca3ff89e56026d31ec0fdd2bf59b0db3ca5be3c1 +Author: Steve Durrheimer +Date: Sat Mar 26 22:36:06 2016 +0100 + + Add zsh completion for etwlogs and gcplogs log drivers + + Signed-off-by: Steve Durrheimer + +commit f3a27a6fac8d32a2930821a83bcceb750ff8070a +Author: Steve Durrheimer +Date: Sat Mar 26 21:53:27 2016 +0100 + + Add zsh completion for 'docker ps --filter' values + + Signed-off-by: Steve Durrheimer + +commit cac4c6fbae3dffd910208dd8158842b2802a438d +Merge: 83c1940741 5e0356659d +Author: Alexandre Vazquez +Date: Sat Mar 26 20:37:39 2016 +0100 + + Merge branch 'master' of https://github.com/kitematic/kitematic + +commit 875143732439cef4c66b2ec5012ebee1965d9ee2 +Author: Sun Hongliang +Date: Sat Mar 26 22:17:07 2016 +0800 + + fix typo in changelog.md + + Signed-off-by: Sun Hongliang + +commit ca2cca025579c92aaab0a27b6740c72f88788b1d +Author: Steve Durrheimer +Date: Sat Mar 26 15:07:02 2016 +0100 + + Add zsh completion for 'docker update --restart' + + Signed-off-by: Steve Durrheimer + +commit 6983f05b42527dec87de9b2ecaf1d948038860fc +Author: allencloud +Date: Sat Mar 26 22:06:45 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit 93ffc2d9544742f1c78043fd449fe7e7ef59bbf3 +Author: Steve Durrheimer +Date: Sat Mar 26 14:54:11 2016 +0100 + + Add zsh completion for journald tag opt + + Signed-off-by: Steve Durrheimer + +commit a1d6c60ee094e12b7373cc86b78d89ba0a3e5090 +Author: Robin Naundorf +Date: Sat Mar 26 09:38:00 2016 +0100 + + Fixes #21538 + + typo corrected + + Signed-off-by: Robin Naundorf + +commit 6f9872180ca4a6f1c69e385025f1bbd3879e3edc +Merge: 9f6322e497 65ab7fa2b3 +Author: Sebastiaan van Stijn +Date: Sat Mar 26 00:02:02 2016 -0700 + + Merge pull request #21537 from senk/patch-1 + + Added 2nd experimental feature currently active + +commit 65ab7fa2b3316bfe38b7f57fe2d5a9c6593ed075 +Author: Robin Naundorf +Date: Sat Mar 26 07:20:09 2016 +0100 + + Added 2nd experimental feature currently active + + Signed-off-by: Robin Naundorf + +commit da7128cc16bec48b8a4f381fa50f7ed374f7ab36 +Author: Sun Hongliang +Date: Sat Mar 26 10:33:11 2016 +0800 + + fix minor typo + + Signed-off-by: Sun Hongliang + +commit 2f3b6022858aab2d70e380d126e6dcec227c0d38 +Author: Brian Goff +Date: Sun Mar 20 23:25:11 2016 -0400 + + Optimizations for StdWriter + + Avoids allocations and copying by using a buffer pool for intermediate + writes. + + ``` + benchmark old ns/op new ns/op delta + BenchmarkWrite-8 996 175 -82.43% + + benchmark old MB/s new MB/s speedup + BenchmarkWrite-8 4414.48 25069.46 5.68x + + benchmark old allocs new allocs delta + BenchmarkWrite-8 2 0 -100.00% + + benchmark old bytes new bytes delta + BenchmarkWrite-8 4616 0 -100.00% + ``` + + Signed-off-by: Brian Goff + +commit 3fad3b03a3118a9c3e372d8623177863b9fa5961 +Author: Joao Fernandes +Date: Fri Mar 25 16:12:32 2016 -0700 + + Adds documentation to deprecate search API + + Starting on DTR 2.0 the /search API endpoint will no longer be available. + Changed the release notes of DTR 1.4.3 to allow customers to prepare for that + change. + + Fixes DTR-1899 + +commit 9f6322e497a63d5837841d89bb7c6b3cbb866283 +Merge: 8fabc9aee0 62e7fde80f +Author: Sebastiaan van Stijn +Date: Fri Mar 25 16:07:05 2016 -0700 + + Merge pull request #21461 from thaJeztah/add-ubuntu-16.04-xenial + + docs: add Ubuntu 16.04 "xenial" + +commit 92b3e03220c04faee2be19862e9f2ccf0872e319 +Author: Victor Vieux +Date: Fri Mar 25 15:46:59 2016 -0700 + + increate timeout in 'leader election - rescheduling' test + + Signed-off-by: Victor Vieux + +commit b300f73a45d8da158bc4601f4950ecff3d7ec2c8 +Author: Victor Vieux +Date: Fri Mar 25 15:40:37 2016 -0700 + + more network + + Signed-off-by: Victor Vieux + +commit 5e13bcf8ffdb4a8833f775d27f8214758d1682ca +Author: Victor Vieux +Date: Fri Mar 25 15:35:04 2016 -0700 + + use engine-api for network create + + Signed-off-by: Victor Vieux + +commit 8fabc9aee0c15f4a154febc46532b711b75b0f69 +Merge: 0524a9783d 5bfd29b9fb +Author: David Calavera +Date: Fri Mar 25 14:58:56 2016 -0700 + + Merge pull request #21527 from sdurrheimer/zsh-completion-build-network-volume-label + + Add zsh completion for 'docker {build, volume create, network create}… + +commit a5cba297edd5e9e891d5410aa59f69d7fddda0ba +Merge: 195b55d06c ffba4054dc +Author: Victor Vieux +Date: Fri Mar 25 14:46:38 2016 -0700 + + Merge pull request #2025 from vieux/watchdog_primary + + enable rescheduling watchdog only when primary + +commit 0524a9783d5210bf3e24794fb9a81c256393b83b +Merge: 64456f3c6d 8f4b7a3361 +Author: David Calavera +Date: Fri Mar 25 13:52:49 2016 -0700 + + Merge pull request #21508 from vdemeester/remove-client-unused-method + + Removing DockerCli.pullImage as it's never used + +commit 5bfd29b9fbc97392d540013a8225671e2f83c407 +Author: Steve Durrheimer +Date: Fri Mar 25 20:43:43 2016 +0100 + + Add zsh completion for 'docker {build, volume create, network create} --label' + + Signed-off-by: Steve Durrheimer + +commit 64456f3c6d1712c939d1aefe0db1510b9c4841d3 +Merge: 7512d3ce3b 995e5beda7 +Author: Vincent Demeester +Date: Fri Mar 25 20:04:03 2016 +0100 + + Merge pull request #21522 from albers/docs-labels-everywhere + + docs for labels on build, networks and volumes + +commit 7512d3ce3b074d5e6c91feb51efa36b9c4b255b4 +Merge: 786305ed0c 396ffa2faf +Author: Sebastiaan van Stijn +Date: Fri Mar 25 11:39:33 2016 -0700 + + Merge pull request #21516 from sdurrheimer/zsh-completion-logopt-fluentd + + Add zsh completion for new fluentd log driver options + +commit 62c9e62edcf3d96d251fd06a48437b2fa2f56ad6 +Author: Alexander Morozov +Date: Fri Mar 25 11:33:54 2016 -0700 + + use router.Cancellable instead of direct CloseNotify + + Signed-off-by: Alexander Morozov + +commit 396ffa2faf4b16bf6d6dbd813e967038bb2b4034 +Author: Steve Durrheimer +Date: Fri Mar 25 18:26:32 2016 +0100 + + Add zsh completion for new fluentd log driver options + + Signed-off-by: Steve Durrheimer + +commit 8ae8f7ed4befe40578eddb005907f49943a063cb +Author: Steve Durrheimer +Date: Fri Mar 25 19:25:33 2016 +0100 + + Add zsh completion for 'docker-compose run -w --workdir' + + Signed-off-by: Steve Durrheimer + +commit 995e5beda74b99dfc920f6a79aee977ff5a15a72 +Author: Harald Albers +Date: Fri Mar 25 11:16:19 2016 -0700 + + docs for labels on build, networks and volumes + + Signed-off-by: Harald Albers + +commit 9729c0d3c72f0c16932efd9dd2574d08f3d5a3a7 +Author: Steve Durrheimer +Date: Fri Mar 25 19:15:34 2016 +0100 + + Add zsh completion for 'docker-compose up --build' + + Signed-off-by: Steve Durrheimer + +commit 195b55d06c9fac199d797ddad1ea3940e6e236a5 +Merge: 3990430ab1 96980d954d +Author: Nishant Totla +Date: Fri Mar 25 11:14:53 2016 -0700 + + Merge pull request #2016 from dongluochen/Dockerbug14203 + + Skip unstable tests from Docker bug 14203 + +commit 9d58b19ecc21c56c5b6763361265fe66c2652601 +Author: Steve Durrheimer +Date: Fri Mar 25 19:09:53 2016 +0100 + + Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' + + Signed-off-by: Steve Durrheimer + +commit 786305ed0cd8f9b8b8a66b6b77907b2f8635e95b +Merge: 73f8654759 77a50ffa59 +Author: David Calavera +Date: Fri Mar 25 11:07:48 2016 -0700 + + Merge pull request #21486 from Microsoft/jjh/execroot + + Windows: Remove --exec-root + +commit 73f8654759a2a66448d548e37b20b735b45322d9 +Merge: e811dab6a9 c162cdb15f +Author: David Calavera +Date: Fri Mar 25 11:07:18 2016 -0700 + + Merge pull request #21493 from Microsoft/jjh/nativeconsole2 + + Windows: Native console disableNewlineAutoReturn + +commit e811dab6a9ee72ac6ddc7bef5f755ae426245553 +Merge: 4bd03fe71b 4bf770a4c6 +Author: David Calavera +Date: Fri Mar 25 11:06:47 2016 -0700 + + Merge pull request #21503 from AkihiroSuda/fix-Dockerfile-simple + + Update Dockerfile.simple so that it can be successfuly built + +commit 4bd03fe71b3f5670b89d10f32ee02af666dfe7ae +Merge: aa7be04e52 f8009d10bb +Author: David Calavera +Date: Fri Mar 25 11:06:13 2016 -0700 + + Merge pull request #21517 from sdurrheimer/zsh-completion-load-quiet + + Add zsh completion for 'docker load -q --quiet' + +commit aa7be04e525554c1c71e32ac57cda1f45c91d806 +Merge: e2221d1f37 a2958aa18f +Author: David Calavera +Date: Fri Mar 25 11:05:45 2016 -0700 + + Merge pull request #21520 from albers/completion-labels-everywhere + + bash completion for labels on build, networks and volumes + +commit 63b448120a960194d3d0f23f751ec5e5534e397e +Author: Steve Durrheimer +Date: Fri Mar 25 19:03:36 2016 +0100 + + Add zsh completion for 'docker-compose exec' command + + Signed-off-by: Steve Durrheimer + +commit a2958aa18f148ce2672b2f0c237c288d3f200add +Author: Harald Albers +Date: Fri Mar 25 10:56:04 2016 -0700 + + bash completion for labels on build, networks and volumes + + Signed-off-by: Harald Albers + +commit 0f1fb42326cb000efe6f06f7c1974430c474afe0 +Author: Steve Durrheimer +Date: Fri Mar 25 18:52:28 2016 +0100 + + Add zsh completion for 'docker-compose rm -a --all' + + Signed-off-by: Steve Durrheimer + +commit e2221d1f37d1204ccca51722aa21fc11939a41ba +Merge: fc3d87f80f d6ccc0e09f +Author: Tõnis Tiigi +Date: Fri Mar 25 10:50:43 2016 -0700 + + Merge pull request #21468 from coolljt0725/remove_useless_log + + Do not return error on hijacked connection for docker exec + +commit 62e7fde80fde2efda14d2b60061106ea48715c50 +Author: Sebastiaan van Stijn +Date: Wed Mar 23 17:12:07 2016 -0700 + + docs: add Ubuntu 16.04 "xenial" + + Signed-off-by: Sebastiaan van Stijn + +commit fc3d87f80fcf4eaf971a63b38a20227534645f3d +Merge: 2c224fb06a 54aa3a3c21 +Author: Tõnis Tiigi +Date: Fri Mar 25 10:47:40 2016 -0700 + + Merge pull request #21474 from jfrazelle/fastness-for-the-storage-driver-gods + + set the default storage driver as the users current default + +commit 2c224fb06ad3c20ca9c32ee733904b3478c60a7b +Merge: ed95d753b4 181d2725d7 +Author: Brian Goff +Date: Fri Mar 25 13:46:41 2016 -0400 + + Merge pull request #21509 from kencochrane/add_better_unsupported_message + + Added a better message for when we build an unsupported Docker version + +commit f8009d10bba6bb179466456bf5564883d5b7deac +Author: Steve Durrheimer +Date: Fri Mar 25 18:36:45 2016 +0100 + + Add zsh completion for 'docker load -q --quiet' + + Signed-off-by: Steve Durrheimer + +commit ed95d753b45b24cb8f1b70e33ff6a4587a668477 +Merge: e262817682 996138bf8e +Author: Arnaud Porterie +Date: Fri Mar 25 10:34:09 2016 -0700 + + Merge pull request #21511 from tiborvass/fix-release-scripts + + Fix release scripts + +commit 24fdd1260213348c6d5b0a45eb06dc858e9711b9 +Author: Troy Fontaine +Date: Fri Mar 25 12:32:54 2016 -0500 + + Correctly added note as requested + + Signed-off-by: Troy Fontaine + +commit 3990430ab1b0132092db35419c8a67b7842364be +Merge: 510ea94890 c04cae5bf0 +Author: Morgan Bauer +Date: Fri Mar 25 10:32:38 2016 -0700 + + Merge pull request #2013 from allencloud/add-read-lock-only-when-necessary + + add read lock for eventsHandler when only it is necessary. + +commit e2628176821d3c18f33b8c1c549d33d7b12cdb9b +Merge: 7307998a44 f01e1c865f +Author: Arnaud Porterie +Date: Fri Mar 25 10:30:12 2016 -0700 + + Merge pull request #21514 from tonistiigi/disable-privileged-test-in-userns + + Disable privileged test in user namespace + +commit bdd9388c4262d228c57ce637a8e6fad003684df1 +Author: Alexander Morozov +Date: Wed Mar 23 10:01:34 2016 -0700 + + api/server/router: add Cancellable function + + Signed-off-by: Alexander Morozov + +commit 7307998a44237a8943792c279b81ff5a387a86fa +Merge: f7cd8b2da0 f2401a0f69 +Author: Brian Goff +Date: Fri Mar 25 13:09:23 2016 -0400 + + Merge pull request #21399 from LK4D4/fix_builder_race + + builder: replace cancelled channel with net/context + +commit f7cd8b2da01c6c99d217d883d3eb628d1118380b +Merge: d7b341bc06 06e357da35 +Author: Arnaud Porterie +Date: Fri Mar 25 09:56:53 2016 -0700 + + Merge pull request #21515 from albers/completion-logopt-fluentd + + bash completion for new fluentd log driver options + +commit 8f4b7a33617534dea29c0b61ee93225b9c998a7c +Author: Vincent Demeester +Date: Fri Mar 25 17:41:19 2016 +0100 + + Removing DockerCli.pullImage as it's never used + + This function is never used nor exported. It has been superseeded by + pullImageCustomOut. + + Signed-off-by: Vincent Demeester + +commit f01e1c865f35bd6578a2c0ef5b2d530538588ecb +Author: Tonis Tiigi +Date: Fri Mar 25 09:31:36 2016 -0700 + + Disable privileged test from in user namespace + + Signed-off-by: Tonis Tiigi + +commit d7b341bc06c880efbc015b6cf75e69638800ff4b +Merge: e80f8364bf 42df9edc4a +Author: Alexander Morozov +Date: Fri Mar 25 09:16:18 2016 -0700 + + Merge pull request #21477 from cpuguy83/better_logging_on_integration + + Better logging for errors in some tests + +commit 996138bf8e6acde9a937755ef81459f7d7566fc9 +Author: Tibor Vass +Date: Fri Mar 25 10:54:36 2016 -0400 + + Fix release scripts + + Add some missing dependencies in the Dockerfile: + - apt-utils for apt-ftparchive.conf + - bsdmainutils for our use of the column command in + hack/make/generate-index-listing + + We also ensure that the docker daemon is started before calling + release-deb or release-rpm, since .detect-daemon-osarch, which is sourced + in each of them, requires the daemon to be running. + + This commit also gets completely rid of s3cmd and fixes references to + AWS_* environment variables (changing from AWS_ACCESS_KEY to + AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order + to please awscli. Also AWS_DEFAULT_REGION is now important to specify, + the default has been set to the region used by get.docker.com and + test.docker.com. + + Signed-off-by: Tibor Vass + +commit f2401a0f6960734093be307a27bba85a3c2ecfcd +Author: Alexander Morozov +Date: Tue Mar 22 10:49:03 2016 -0700 + + builder: replace cancelled channel with net/context + + Also stop execution of run immediately if request was cancelled. + + Signed-off-by: Alexander Morozov + +commit 181d2725d7ac8da5174b1a13d3ee413057af57b8 +Author: Ken Cochrane +Date: Fri Mar 25 10:09:03 2016 -0400 + + Added a better message for when we build an unsupported version + + Signed-off-by: Ken Cochrane + +commit 42df9edc4a6ccfff6869fd14b2128ca3312e99db +Author: Brian Goff +Date: Thu Mar 24 12:43:04 2016 -0400 + + Better logging for errors in some tests + + Signed-off-by: Brian Goff + +commit e80f8364bf4a334d353c2bd7173d5214cd38988b +Merge: 9fbe1d9917 800b9c5a26 +Author: Brian Goff +Date: Fri Mar 25 09:47:49 2016 -0400 + + Merge pull request #21432 from vikstrous/fix_volume_store_race2 + + fix race condition between list and remove volume + +commit b85531506a2c6996af1dbc40cf051aebdca03720 +Author: Andre Caron +Date: Thu Mar 24 18:49:32 2016 -0400 + + Silences docker-machine env command on Windows. + + Signed-off-by: Andre Caron + +commit ec0c3f7bbda35ef10be88a2b1c7b68a5e02a0df4 +Author: Sun Hongliang +Date: Fri Mar 25 19:28:46 2016 +0800 + + output error when starting a rescheduled container fails. + + Signed-off-by: Sun Hongliang + +commit 06e357da35801f85d440034724b5c71bcf2c45a3 +Author: Harald Albers +Date: Fri Mar 25 03:31:48 2016 -0700 + + bash completion for new fluentd log driver options + + Signed-off-by: Harald Albers + +commit 9fbe1d9917f8c3993300b88a056f81522b9a28ab +Merge: 36458b5787 e73152bf27 +Author: Vincent Demeester +Date: Fri Mar 25 10:22:01 2016 +0100 + + Merge pull request #21465 from runcom/fix-test + + integration-cli: fix wrong test and add log + +commit 36458b578759839e101c8a7774ff9a0aa64abadc +Merge: 2de29fb9c2 61277c395b +Author: Sebastiaan van Stijn +Date: Fri Mar 25 01:08:09 2016 -0700 + + Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks + + Fix symlink copying for deb init scripts + +commit 4bf770a4c6940df9c538d3dac2b014fbc9ca9ac2 +Author: Akihiro Suda +Date: Fri Mar 25 13:19:13 2016 +0900 + + Update Dockerfile.simple so that it can be successfuly built + + * build-essential is needed by `make` + * libapparmor-dev is needed by runc + * seccomp is needed by runc + * Go is neeeded by runc + + Signed-off-by: Akihiro Suda + +commit 2de29fb9c2eaee803d69625a7105953da941356e +Merge: d5019972e5 8e9305ef94 +Author: Vincent Demeester +Date: Fri Mar 25 08:07:38 2016 +0100 + + Merge pull request #21361 from HackToday/addfilter + + Add name/driver filter support for volume + +commit 61277c395bf0f9b560e684085d0a134406a7c179 +Author: Tonis Tiigi +Date: Thu Mar 24 23:06:22 2016 -0700 + + Fix symlink copying for deb init scripts + + Signed-off-by: Tonis Tiigi + +commit d5019972e5d3ec800a1bef0cd2250b2ad9484100 +Merge: f3d824771a dd33d18045 +Author: Alexander Morozov +Date: Thu Mar 24 23:03:13 2016 -0700 + + Merge pull request #21499 from cyli/hardware-signing-experimental-again + + Move hardware signing back to experimental again + +commit f3d824771a10a8143ea97afb6864d0a587c7b7e3 +Merge: b35aaa9d1e 8784bd6fde +Author: Sebastiaan van Stijn +Date: Thu Mar 24 22:56:39 2016 -0700 + + Merge pull request #21487 from tonistiigi/fix-old-dind + + Fix setting cgroup permission to user/privileged devices + +commit b35aaa9d1e284d17e8468ae1407e03405be4258c +Merge: 641bd7652f 3e0bd74a3d +Author: Arnaud Porterie +Date: Thu Mar 24 22:44:49 2016 -0700 + + Merge pull request #21489 from calavera/downgrade_go + + Downgrade to Go 1.5.3. + +commit 641bd7652f0f65712bab60f7a5f8e299dcb5643c +Merge: de4cc7cd13 66d3dcc6f7 +Author: Alexander Morozov +Date: Thu Mar 24 22:42:24 2016 -0700 + + Merge pull request #20589 from coolljt0725/fix_restore_terminal + + cli: move setRawTerminal and restoreTerminal to holdHijackedConnection + +commit dd33d18045e50a198d3d75db8fba12f126e93937 +Author: cyli +Date: Thu Mar 24 21:08:03 2016 -0700 + + Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga" + + This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing + changes made to d3afe34b51e7588984cc21a2f48da116645e52e3. + + Signed-off-by: cyli + +commit ec7db8551eb2e66a305a17f38832463ea1074571 +Author: Troy Fontaine +Date: Thu Mar 24 22:27:46 2016 -0500 + + Added suggested modifications + + Signed-off-by: Troy Fontaine + +commit de4cc7cd13a8dd4d83770e0ef9405ec7d8f91864 +Merge: 9ff767bcc0 610ec8c739 +Author: Sebastiaan van Stijn +Date: Thu Mar 24 18:59:53 2016 -0700 + + Merge pull request #21484 from albers/docs-load--quiet + + add docs for `docker load --quiet` + +commit e98cf0040982254d88509627c44e94d2a95de784 +Author: Victor Vieux +Date: Thu Mar 24 16:36:53 2016 -0700 + + support private images, labels and other new flags in docker build + + Signed-off-by: Victor Vieux + +commit 9ff767bcc06c924fd669d881a34847aa4fbaab5e +Merge: 6748ecb005 ec77c124de +Author: Tibor Vass +Date: Thu Mar 24 21:26:08 2016 -0400 + + Merge pull request #21492 from mavenugo/civ6 + + Add "--ipv6" flag in IT for network create when using ipv6 subnets + +commit 66d3dcc6f7648ab5af3c7f876c2b9c63ab2899ac +Author: Lei Jitang +Date: Thu Mar 24 21:25:50 2016 -0400 + + cli: move setRawTerminal and restoreTerminal to holdHijackedConnection + + In this way, we can restore the Terminal as soon as possible once the hijacked + connection end. This not only fix weird output if cli enable -D, but also + remove duplicate code. + + Signed-off-by: Lei Jitang + +commit 8e9305ef946843ce2f8ef47909d6a866eab5dfa8 +Author: Kai Qiang Wu(Kennan) +Date: Mon Mar 21 07:39:48 2016 +0000 + + Add name/driver filter support for volume + + This change include filter `name` and `driver`, + and also update related docs to reflect that filters usage. + + Closes: #21243 + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit c04cae5bf049c749923d5644c970d455509a5b9b +Author: Sun Hongliang +Date: Thu Mar 24 00:24:01 2016 +0800 + + add read lock for eventsHandler when only it is necessary. + + Signed-off-by: Sun Hongliang + +commit 5e8bad38f62007fb479e0917ea48ba4386f7b1d5 +Author: Victor Vieux +Date: Thu Mar 24 16:36:23 2016 -0700 + + update godeps + + Signed-off-by: Victor Vieux + +commit ec77c124de3f57a18d3459ed75c8a286ce14fe32 +Author: Madhu Venugopal +Date: Thu Mar 24 16:19:59 2016 -0700 + + Add "--ipv6" flag in IT for network create when using ipv6 subnets + + Signed-off-by: Madhu Venugopal + +commit 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb +Author: David Calavera +Date: Thu Mar 24 18:41:34 2016 -0400 + + Downgrade to Go 1.5.3. + + To not hit the issue with the request Host header. + + Signed-off-by: David Calavera + +commit f4b6fc8d681c42137b7d2bb544b087462bc34d47 +Merge: 687fc1e164 31d5dd5175 +Author: Aaron Lehmann +Date: Thu Mar 24 15:53:26 2016 -0700 + + Merge pull request #1557 from tonyhb/gc-logging + + Utulize config log format within gc + +commit c162cdb15fb08786c85d76fb438f003e72857f5c +Author: John Howard +Date: Thu Mar 24 15:37:47 2016 -0700 + + Windows: Native console disableNewlineAutoReturn + + Signed-off-by: John Howard + +commit fcdf7c37950dab9658556b1566b4363fa930878b +Merge: 3c75e2a275 d3485bb454 +Author: Nathan LeClaire +Date: Thu Mar 24 15:07:28 2016 -0700 + + Merge pull request #459 from kramos/master + + Allowing you to override 'default' as the name for a machine + +commit 6748ecb0050f2c6a9a57e824f23b5b4afb35240d +Merge: ed25df9a07 accf28a7db +Author: Alexander Morozov +Date: Thu Mar 24 14:31:59 2016 -0700 + + Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version + + Remove unnecessary hardcoded version. + +commit ed25df9a07f4b0ddf21fed5358eba8870fb06a9c +Merge: f2847f8ab3 bb66d7144f +Author: Tibor Vass +Date: Thu Mar 24 17:29:55 2016 -0400 + + Merge pull request #21387 from kencochrane/change_packages + + Packaging changes required for new containerd binaries + +commit 31d5dd517500a7eb912aab6f21a6fced26298846 +Author: Tony Holdstock-Brown +Date: Thu Mar 24 11:33:01 2016 -0700 + + utulize config log format within gc + + Signed-off-by: Tony Holdstock-Brown + +commit 8784bd6fdeb7bd87fcbbdee884d42d1dca0c4cca +Author: Tonis Tiigi +Date: Thu Mar 24 14:07:22 2016 -0700 + + Fix wrong variable name on blkio resources + + Signed-off-by: Tonis Tiigi + +commit ee6123588067eb067ec1c02cc340d7493c8cd9a6 +Author: Tonis Tiigi +Date: Thu Mar 24 12:01:12 2016 -0700 + + Fix setting cgroup permission to user/privileged devices + + Signed-off-by: Tonis Tiigi + +commit f2847f8ab3467b43eccf0a9580d4ea3e8abdf146 +Merge: 1e8d1b5faa aae4bcf773 +Author: Sebastiaan van Stijn +Date: Thu Mar 24 14:10:48 2016 -0700 + + Merge pull request #21315 from hqhq/hq_check_quota + + Add validation for cpu period and quota + +commit d3485bb45449b81a56dfe728bd6a4e98418f4e92 +Author: Markos Rendell +Date: Mon Mar 21 23:34:58 2016 +0000 + + Allowing you to override 'default' as the name for a machine using the env + variable DOCKER_MACHINE_NAME + + Signed-off-by: Markos Rendell + +commit 1e8d1b5faaa113944ed0bc6b565b90c490a5b654 +Merge: 9558d249e9 fa44b4e81e +Author: Sebastiaan van Stijn +Date: Thu Mar 24 13:42:28 2016 -0700 + + Merge pull request #21463 from yongtang/21445-too-long-hostname + + More descriptive error when running a container with a too long hostname (#21445) + +commit b963ffca3e13bc98775d1e8cab28cf0de1f64ad2 +Author: Victor Vieux +Date: Thu Mar 24 13:41:38 2016 -0700 + + improve volume inspect test + + Signed-off-by: Victor Vieux + +commit 510ea94890a760efbb67e85234c7cbdc8f653e74 +Merge: 69c44967be f208be4b95 +Author: Nishant Totla +Date: Thu Mar 24 13:34:36 2016 -0700 + + Merge pull request #2022 from pietervisser/patch-1 + + Fixes typo in docs 03-create-cluster.md + +commit 9558d249e9586aff906391d1e5bda1b181641c98 +Merge: 68c920883e 8850b223ed +Author: David Calavera +Date: Thu Mar 24 13:29:46 2016 -0700 + + Merge pull request #21478 from albers/ignore-bashrc + + re-add .bashrc to .gitignore + +commit bb66d7144f7d0a617f5985486ae36bbbaa5461ba +Author: Ken Cochrane +Date: Mon Mar 21 20:37:31 2016 -0400 + + Packaging changes required for new containerd binaries + + These are the changes required due to the new binaries that containerd introduced. + The rpm, and deb packages now include 5 binaries. + + docker, containerd, containerd-shim, ctr, and runc + + The tar files also include all 5 binaries. + + Signed-off-by: Ken Cochrane + +commit 8141874120abdc5c9056b6dbeb09bfb76a3eb290 +Merge: 5239e6ed03 751cdcea27 +Author: Nathan LeClaire +Date: Thu Mar 24 13:17:31 2016 -0700 + + Merge pull request #3230 from nathanleclaire/bump_v0.7.0-rc1 + + Add changes for 0.7.0-rc1 + +commit e5dbf29484fa31781fd6160b05cfc5897c3a947f +Author: Victor Vieux +Date: Thu Mar 24 13:09:36 2016 -0700 + + update dockerclient to get labels on volumes, networks, etc... + + Signed-off-by: Victor Vieux + +commit 687fc1e164845f5b716f39bcef19e4833cf1c1f9 +Merge: f2d128e2b0 ba60866139 +Author: Olivier Gambier +Date: Thu Mar 24 13:07:41 2016 -0700 + + Merge pull request #1558 from RichardScothern/AUTHORS + + Update AUTHORS + +commit ba608661394aec4c816ad0821aee17f0046bb96f +Author: Richard Scothern +Date: Wed Mar 23 17:23:18 2016 -0700 + + Update AUTHORS + + Signed-off-by: Richard Scothern + +commit 751cdcea27fcfd1fb65e8808e5e6bbce7e9f0d8b +Author: Nathan LeClaire +Date: Thu Mar 24 12:47:06 2016 -0700 + + Add changes for 0.7.0-rc1 + + Signed-off-by: Nathan LeClaire + +commit 3c75e2a275ec72ddc3ca112ec204ffc97573083c +Author: Nathan LeClaire +Date: Thu Mar 24 12:22:13 2016 -0700 + + Bump versions for 1.10.0-rc1 + + Signed-off-by: Nathan LeClaire + +commit 77a50ffa59c5ba0e22d754fad4cded57efb84e37 +Author: John Howard +Date: Thu Mar 24 11:42:03 2016 -0700 + + Windows: Remove --exec-root + + Signed-off-by: John Howard + +commit 800b9c5a2698aae5c43f42d4c9c1a41280b556a6 +Author: Viktor Stanchev +Date: Tue Mar 22 13:24:09 2016 -0700 + + fix race condition between list and remove volume + + This was done by making List not populate the cache. + + fixes #21403 + + Signed-off-by: Viktor Stanchev + +commit 1ad88662c04c0b8a8a119f051323af93c8a4d0ab +Author: Daniel Nephin +Date: Wed Mar 23 22:05:23 2016 -0400 + + Bump 1.7.0 + + Signed-off-by: Daniel Nephin + +commit 827573a5940072acdc45140014032122ee7baeb8 +Merge: aa50023507 9eb1204958 +Author: Daniel Nephin +Date: Thu Mar 24 14:31:17 2016 -0400 + + Merge remote-tracking branch 'docker/release' into bump-1.7.0 + +commit 041642fdb00409697145233a6c4931febb3cdf09 +Merge: d60cdec18b 7b7b81526a +Author: Ying Li +Date: Thu Mar 24 11:26:54 2016 -0700 + + Merge pull request #634 from docker/cross-compile-notary + + make cross and make integration endpoints + +commit aa5002350788f7c6d0823462c84aa9be359ee1e4 +Merge: d1d8df7f72 12ad3ff301 +Author: Daniel Nephin +Date: Thu Mar 24 14:26:03 2016 -0400 + + Merge pull request #3057 from shin-/2636-env-file + + Add support for a default environment file + +commit 68c920883e0cdbcf5aca14ba9a185c67ad3bf401 +Merge: 1ab51e44e6 aa9170f066 +Author: David Calavera +Date: Thu Mar 24 11:03:50 2016 -0700 + + Merge pull request #21483 from albers/completion-load--quiet + + bash completion for `docker load --quiet` + +commit f2d128e2b07c87c4b70f37e6be11afea3fab417c +Merge: 9cd193d395 a92c93d770 +Author: Richard Scothern +Date: Thu Mar 24 10:57:58 2016 -0700 + + Merge pull request #1493 from thaJeztah/fix-storage-driver-links + + Fix broken links in configuration + +commit 610ec8c7396ea4cc20465b99cf326684c82d23ff +Author: Harald Albers +Date: Thu Mar 24 18:57:44 2016 +0100 + + add docs for `docker load --quiet` + + Signed-off-by: Harald Albers + +commit 12ad3ff30194e8b4cd5d5e8874fffba297f09dc4 +Author: Joffrey F +Date: Tue Mar 22 15:42:30 2016 -0700 + + Injecting os.environ in Environment instance happens outside of init method + + Signed-off-by: Joffrey F + +commit 1506f997def80fdfc4cf6e0377a1cabeaad35d43 +Author: Joffrey F +Date: Tue Mar 22 11:43:03 2016 -0700 + + Better windows support for Environment class + + Signed-off-by: Joffrey F + +commit b99037b4a61e10c9377dd707e35860cec298a268 +Author: Joffrey F +Date: Mon Mar 21 18:32:13 2016 -0700 + + Add support for DOCKER_* variables in .env file + + Signed-off-by: Joffrey F + +commit 9cd193d395564140976a9e8f0af23f43a330b890 +Merge: b787035d8b 37c2b9e3f1 +Author: Richard Scothern +Date: Thu Mar 24 10:57:07 2016 -0700 + + Merge pull request #1556 from dmp42/6.fix-codecov + + Fix codecov following vendor + +commit c7afe16419945d74f956fa065f7b9f79712ed626 +Author: Joffrey F +Date: Mon Mar 21 16:33:58 2016 -0700 + + Account for case-insensitive env on windows platform + + Signed-off-by: Joffrey F + +commit 36f1b4589cd0dfd343c0b597abe56824d95cea09 +Author: Joffrey F +Date: Mon Mar 21 16:08:07 2016 -0700 + + Limit occurrences of creating an environment object. + .env file is always read from the project_dir + + Signed-off-by: Joffrey F + +commit 0ff53d9668670efe99736e045d4476bccf9435ca +Author: Joffrey F +Date: Mon Mar 14 13:02:55 2016 -0700 + + Less verbose environment invocation + + Signed-off-by: Joffrey F + +commit dcdcf4869b6df77e16e243ace9e49c136d336b78 +Author: Joffrey F +Date: Thu Mar 10 17:29:01 2016 -0800 + + Mention environment file in envvars.md + + Signed-off-by: Joffrey F + +commit 21aa7a0448703e3e59bc39300a82f68ded659f45 +Author: Joffrey F +Date: Tue Mar 8 17:48:23 2016 -0800 + + Documentation for .env file + + Signed-off-by: Joffrey F + +commit f48da96e8b5a732399d5ab18e32c53156934e694 +Author: Joffrey F +Date: Tue Mar 8 17:18:04 2016 -0800 + + Test get_project_name from env file + + Signed-off-by: Joffrey F + +commit d55fc85feadf51e753c06b34f7cc200305915a54 +Author: Joffrey F +Date: Tue Mar 8 16:55:05 2016 -0800 + + Added default env file test. + + Signed-off-by: Joffrey F + +commit 1801f83bb83f59fd508e5f9ad85b4c14d1f9d1d7 +Author: Joffrey F +Date: Tue Mar 8 16:54:14 2016 -0800 + + Environment class cleanup + + Signed-off-by: Joffrey F + +commit fd020ed2cfa2fb2b03a31a3fe87d6da47edfd713 +Author: Joffrey F +Date: Mon Mar 7 17:46:55 2016 -0800 + + Tests use updated get_config_paths_from_options signature + + Signed-off-by: Joffrey F + +commit 5831b869e879b1350f0610f41b2dbd58c5e6285f +Author: Joffrey F +Date: Mon Mar 7 17:18:19 2016 -0800 + + Update tests for new environment handling + + Signed-off-by: Joffrey F + +commit b9ca5188a21f99a2798c5451049e27be3e75ac27 +Author: Joffrey F +Date: Mon Mar 7 17:16:25 2016 -0800 + + Remove Environment singleton, instead carry instance during config processing + + Project name and compose file detection also updated + + Signed-off-by: Joffrey F + +commit bf8e501b5e7f255459dd232afa937d065b28f905 +Author: Joffrey F +Date: Mon Mar 7 14:42:17 2016 -0800 + + Fix pre-commit config + + Signed-off-by: Joffrey F + +commit c69d8a3bd2584044348aa6a444cf22ed1fd5f43d +Author: Joffrey F +Date: Tue Mar 1 15:49:42 2016 -0800 + + Implement environment singleton to be accessed throughout the code + + Load and parse environment file from working dir + + Signed-off-by: Joffrey F + +commit d1d8df7f72215d412561d759cce362437d67db79 +Merge: d78b013bb0 60470fb9f1 +Author: Daniel Nephin +Date: Thu Mar 24 13:55:59 2016 -0400 + + Merge pull request #3192 from shin-/use-dockerpy-1.8 + + Require docker-py 1.8.0rc2 + +commit d78b013bb0459c6db8f3413202db1270a4f039ab +Merge: aabeb56527 b030c3928a +Author: Joffrey F +Date: Thu Mar 24 10:44:36 2016 -0700 + + Merge pull request #3204 from albers/completion-rm--all + + bash completion for `docker-compose rm --all` + +commit aabeb5652775e4f4036178405d6fab4cdb4ec328 +Merge: 84a2e634a8 c9b02b7b34 +Author: Joffrey F +Date: Thu Mar 24 10:44:19 2016 -0700 + + Merge pull request #3206 from albers/completion-exec + + bash completion for `docker-compose exec` + +commit 8850b223ed4c04cc671a977cadc3942e5e5f7f64 +Author: Harald Albers +Date: Thu Mar 24 17:41:16 2016 +0100 + + re-add .bashrc to .gitignore + + .bashrc was removed in 29fbc9cc1d67759974ec4cb746840ae160d842bc + but is still needed. It serves as a hook to customize the build environment. + + Signed-off-by: Harald Albers + +commit fa44b4e81ee87f1c2b39ad335a22795415c8cdf2 +Author: Yong Tang +Date: Thu Mar 24 04:41:21 2016 +0000 + + More descriptive error when running a container with a too long hostname (#21445) + + This fix tries to fix issues encountered when running a container with a hostname + that is longer than HOST_NAME_MAX(64). + + Previously, `could not synchronise with container process` was generated as the + length of the regex check was missing. + + This fix covers the length check so that a hostname that is longer than + HOST_NAME_MAX(64) will be given a correct error message. + + Several unit tests cases and additional integration test cases are added as well. + + This fix closes #21445. + + Signed-off-by: Yong Tang + +commit aa9170f0664d51dfa682d652d930acc74a220106 +Author: Harald Albers +Date: Thu Mar 24 18:39:57 2016 +0100 + + bash completion for `docker load --quiet` + + Signed-off-by: Harald Albers + +commit 1ab51e44e60816eac8c8120d5cadfac2600416b1 +Merge: e88dff6bb4 ef0570abfc +Author: Vincent Demeester +Date: Thu Mar 24 18:39:26 2016 +0100 + + Merge pull request #21481 from albers/completion-ps-filter-volumes + + bash completion for `docker ps -f volume` + +commit 7b7b81526af75942b4d6b7a80a7ad560a49a9694 +Author: Ying Li +Date: Thu Mar 24 10:36:58 2016 -0700 + + Move .build to buildscripts + + Signed-off-by: Ying Li + +commit 8d18c33f5aa5a3b47634bd8dc7c1ce5df1b97d82 +Author: Ying Li +Date: Thu Mar 17 11:07:54 2016 -0700 + + Use a container to run the client integration tests + + Signed-off-by: Ying Li + +commit 08c6669473a73fc81ff732edb4c1939b84ac7239 +Author: Ying Li +Date: Wed Mar 16 15:55:57 2016 -0700 + + Add integration tests that build the docker images and the client binary + + Signed-off-by: Ying Li + +commit 5617ee4720155a975bf61de6e42e5e0167f83dc3 +Author: Ying Li +Date: Tue Mar 8 10:58:17 2016 -0800 + + Cross compile notary binaries inside a Docker container + + Signed-off-by: Ying Li + +commit e88dff6bb46edd546e5f6cbe775f1234ca757834 +Merge: 2b6b2e1af8 2164018d82 +Author: David Calavera +Date: Thu Mar 24 10:34:37 2016 -0700 + + Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd + + Remove the verbosity of copy_containerd + +commit 2b6b2e1af853d465d22f5a57e71aea89852340eb +Merge: 731c59f545 cb5b8767b6 +Author: Vincent Demeester +Date: Thu Mar 24 18:34:20 2016 +0100 + + Merge pull request #21464 from coolljt0725/cleanup_dot + + Cleanup: remove redundant period + +commit 731c59f5451cc370e4b006c411073785af0833c1 +Merge: 57575a2695 25c9bd81f6 +Author: David Calavera +Date: Thu Mar 24 10:32:59 2016 -0700 + + Merge pull request #21471 from allencloud/fix-typos-in-daemon-unix + + fix typos in daemon_unix.go + +commit 37c2b9e3f1a1be54beab5c5f7955cb52a9589ec2 +Author: Olivier Gambier +Date: Thu Mar 24 10:30:14 2016 -0700 + + Fix codecov following vendor + + Signed-off-by: Olivier Gambier + +commit a92c93d77064561d8acf2d38da8d79f347f3b245 +Author: Sebastiaan van Stijn +Date: Fri Feb 26 10:32:56 2016 +0100 + + Fix broken links in configuration + + HTML links are not converted by HUGO, so will work + on GitHub, but not in the online documentation. + + Converted the HTML table (and links) to Markdown + to fix broken links. + + Also added a header for the table, because none + was present. + + Signed-off-by: Sebastiaan van Stijn + +commit ef0570abfc9999cd3ddcf954b2ca5222f757c1a9 +Author: Harald Albers +Date: Thu Mar 24 18:18:39 2016 +0100 + + bash completion for `docker ps -f volume` + + Signed-off-by: Harald Albers + +commit 60470fb9f121eaf690d5594a1a01639f20d152fd +Author: Joffrey F +Date: Wed Mar 23 16:33:00 2016 -0700 + + Require docker-py 1.8.0rc2 + + Signed-off-by: Joffrey F + +commit 69c44967be8f9955f347817ab1a4f58f20bed64e +Merge: dcf2608798 3843dbb381 +Author: Dongluo Chen +Date: Thu Mar 24 10:12:11 2016 -0700 + + Merge pull request #2017 from allencloud/fix-typos-in-mesos + + fix typos in /swarm/cluster/mesos/cluster.go + +commit 84a2e634a8d204ac0da05f0ac102482b75b43c9a +Merge: 87231a25be 732531b722 +Author: Daniel Nephin +Date: Thu Mar 24 13:09:35 2016 -0400 + + Merge pull request #3200 from dnephin/disable_broken_test + + Disable a test that is failing against 1.11.0rc1. + +commit c9b02b7b34de0463ff22ee7bfda666543d1f2955 +Author: Harald Albers +Date: Thu Mar 24 18:02:12 2016 +0100 + + bash completion for `docker-compose exec` + + Signed-off-by: Harald Albers + +commit 87231a25becbac94f405be17f5df31d7bb061e90 +Merge: 353c4deb19 d8fb9d8831 +Author: Joffrey F +Date: Thu Mar 24 09:56:12 2016 -0700 + + Merge pull request #3202 from albers/completion-logs + + bash completion for new `docker logs` options + +commit 353c4deb19a64b0f9b58b4040b7bc011d1ce71d6 +Merge: 2b063d332e 5416e4c99b +Author: Joffrey F +Date: Thu Mar 24 09:55:58 2016 -0700 + + Merge pull request #3203 from albers/completion-up--build + + bash completion for `docker-compose up --build` + +commit f208be4b9534fc6e258ee1187a47c4d1ba0e96c8 +Author: Pieter +Date: Thu Mar 24 16:47:23 2016 +0100 + + Fixes typos in docs 'Swarm at scale' + + Minor typos + + Signed-off-by: Pieter Visser + +commit 54aa3a3c210cd16b687f0e6b6356888d90215752 +Author: Jess Frazelle +Date: Thu Mar 24 09:12:40 2016 -0700 + + set the default storage driver as the users current default + + Signed-off-by: Jess Frazelle + +commit accf28a7dbdd46203c661d30b80326df4d447cea +Author: David Calavera +Date: Wed Mar 23 18:30:06 2016 -0400 + + Remove unnecessary hardcoded version. + + The server configuration already keeps the current version + if the daemon. This patch changes the middleware logic + to use it rather than using the global value. + + This removes the dockerversion package dependency from the api. + + Signed-off-by: David Calavera + +commit 732531b722453d62a3202d5bbc76a42f30c6e2cc +Author: Daniel Nephin +Date: Thu Mar 24 12:07:53 2016 -0400 + + Disable a test that is failing against 1.11.0rc1. + + Signed-off-by: Daniel Nephin + +commit b030c3928a3d06cce644542001f41712d3c5fbb1 +Author: Harald Albers +Date: Thu Mar 24 17:29:04 2016 +0100 + + bash completion for `docker-compose rm --all` + + Signed-off-by: Harald Albers + +commit 5416e4c99bea4a5c80705e7813d76bf8fa927578 +Author: Harald Albers +Date: Thu Mar 24 17:21:56 2016 +0100 + + bash completion for `docker-compose up --build` + + Signed-off-by: Harald Albers + +commit d8fb9d8831143c1f037f6a494883cfa9b6d85313 +Author: Harald Albers +Date: Thu Mar 24 17:11:10 2016 +0100 + + bash completion for new `docker logs` options + + Signed-off-by: Harald Albers + +commit 25c9bd81f6d293996856daeb19108ebb2522416b +Author: allencloud +Date: Thu Mar 24 23:57:11 2016 +0800 + + fix typos in daemon_unix.go + + Signed-off-by: allencloud + +commit 2b063d332e0a2b0f8cd276dcab3fec84abab442b +Merge: b09b6e390f 5b2c2e332f +Author: Aanand Prasad +Date: Thu Mar 24 15:11:55 2016 +0000 + + Merge pull request #3196 from albers/completion-daemon-options + + bash completion for new TLS options + +commit b09b6e390faca5634c4d34ad07c583dddc2eeeca +Merge: 2a09fb02db 8282bb1b24 +Author: Daniel Nephin +Date: Thu Mar 24 10:48:50 2016 -0400 + + Merge pull request #3199 from aanand/add-tls-flags-to-overview + + Add TLS flags to CLI reference + +commit 8282bb1b24cc0f51210ffd94a55edf8876bcb814 +Author: Aanand Prasad +Date: Thu Mar 24 14:41:51 2016 +0000 + + Add TLS flags to CLI reference + + Signed-off-by: Aanand Prasad + +commit ab62ecf393b92d1e644f82c4711b6618b7c572a5 +Author: Nalin Dahyabhai +Date: Fri Mar 18 09:06:30 2016 -0400 + + Open the journald following descriptor earlier + + Following a journal log almost always requires a descriptor to be + allocated. In cases where we're running out of descriptors, this means + we might get stuck while attempting to start following the journal, at a + point where it's too late to report it to the client and clean up + easily. The journal reading context will cache the value once it's + allocated, so here we move the check earlier, so that we can detect a + problem when we can still report it cleanly. + + Signed-off-by: Nalin Dahyabhai + +commit 8d597d25a86c608e2e1e4ef150d7e9eb68306bc0 +Author: Nalin Dahyabhai +Date: Thu Mar 17 18:25:14 2016 -0400 + + Improve error reporting when following journals + + When we set up to start following a journal, if we get error results + from sd_journal_get_fd() or sd_journal_get_events() that prevent us from + following the journal, report the error instead of just mysteriously + failing. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit 57575a2695a822eb19bda555b1dbb9451d2c0881 +Merge: 2131558963 8891afd838 +Author: Brian Goff +Date: Thu Mar 24 09:38:21 2016 -0400 + + Merge pull request #21460 from tonistiigi/exec-ulimits + + Add ulimit support to libcontainerd addprocess + +commit ffba4054dcca9f85f8e39012df4674af47066f85 +Author: Victor Vieux +Date: Thu Mar 24 01:59:42 2016 -0700 + + enable rescheduling watchdog only when primary + + Signed-off-by: Victor Vieux + +commit d6ccc0e09fe42d9f0d929dbf8d68ce790f4c8b9e +Author: Lei Jitang +Date: Thu Mar 24 08:52:13 2016 -0400 + + Do not return error on hijacked connection for docker exec + + Signed-off-by: Lei Jitang + +commit dcf2608798f75e74732be6a0046db5f513a969ba +Merge: ef1c777887 040f63cd47 +Author: Xian Chaobo +Date: Thu Mar 24 20:36:32 2016 +0800 + + Merge pull request #1992 from dongluochen/AddNodeSpecUpdate + + Periodically update node spec + +commit cb5b8767b6988855daa1a264202be929c24c6177 +Author: Lei Jitang +Date: Thu Mar 24 08:26:04 2016 -0400 + + Cleanup: remove redundant period + + Signed-off-by: Lei Jitang + +commit 21315589632fadb3a5460ee0a278f2511e6a7d13 +Merge: b64627b798 a1d8441117 +Author: Vincent Demeester +Date: Thu Mar 24 12:31:27 2016 +0100 + + Merge pull request #21428 from estesp/reenable-shared-nstests-userns + + Re-enable shared namespace tests for userns CI runs + +commit 5b2c2e332fb5a142b7ed7bdebdcefc4441d0bab9 +Author: Harald Albers +Date: Thu Mar 24 11:15:25 2016 +0100 + + bash completion for TLS options + + Signed-off-by: Harald Albers + +commit 9094c4d97de72dc8ba8d607e21823c44f67896aa +Author: Harald Albers +Date: Thu Mar 24 10:43:09 2016 +0100 + + prepare bash completion for new TLS options + + Up to now there were two special top-level options that required special + treatment: --project-name and --file (and their short forms). + For 1.7.0, several TLS related options were added that have to be passed + to secondary docker-compose invocations as well. + This commit introduces a scalable treatment of those options. + + Signed-off-by: Harald Albers + +commit e73152bf273418cbee3d5862dd2ccfbdf2d6e8fc +Author: Antonio Murdaca +Date: Thu Mar 24 11:10:41 2016 +0100 + + integration-cli: fix wrong test and add log + + Signed-off-by: Antonio Murdaca + +commit d60cdec18b018191aca31d5bdab524b6b21325f6 +Merge: 7fe071b57a 376acc8ef8 +Author: Ying Li +Date: Wed Mar 23 22:54:24 2016 -0700 + + Merge pull request #586 from docker/ci-docker-test + + Add script that "vendors" notary into docker and runs trust integration tests + +commit 376acc8ef854897fbc83b74403f1f6bacb6a0a9f +Author: Ying Li +Date: Mon Feb 29 21:58:37 2016 -0500 + + Use GOPATH to figure out the docker and notary dirs in the fake vendor script + + Signed-off-by: Ying Li + +commit a434db406468eacc4d4618b428d8261f5db32fde +Author: Ying Li +Date: Mon Feb 22 16:12:27 2016 -0800 + + Add script that "vendors" notary into docker and runs trust integration tests. + + Signed-off-by: Ying Li + +commit 7fe071b57a75116530448c28f1a33ebe78c872ab +Merge: a6c0e7d5ab be72081f84 +Author: David Lawrence +Date: Wed Mar 23 21:16:13 2016 -0700 + + Merge pull request #636 from docker/notary-dct-doc-update + + Update notary docs to reflect DCT delegations behavior + +commit b64627b798de1bf1a1f2071a23f35b799d1fe369 +Merge: 713cfffb5a 22d997b374 +Author: Arnaud Porterie +Date: Wed Mar 23 19:56:27 2016 -0700 + + Merge pull request #21457 from tonistiigi/update-runc + + Update runc/containerd + +commit 8891afd8385aeb490f8b7d9db8c3828bc7d24dc1 +Author: Tonis Tiigi +Date: Wed Mar 23 19:54:32 2016 -0700 + + Add ulimit support to libcontainerd addprocess + + Signed-off-by: Tonis Tiigi + +commit 713cfffb5a9a837163cb9c842d3842276001e117 +Merge: 55bbea3751 b0280c37a0 +Author: Sebastiaan van Stijn +Date: Wed Mar 23 19:50:25 2016 -0700 + + Merge pull request #21458 from crosbymichael/grpc-logs + + Remove grpc logging to stderr + +commit 3843dbb381fbbe1905e128798c662bbb67ebd6ef +Author: Sun Hongliang +Date: Thu Mar 24 10:49:28 2016 +0800 + + fix typos in /swarm/cluster/mesos/cluster.go + + Signed-off-by: Sun Hongliang + +commit 55bbea375100716ebc0ef16edab567b0627cff0d +Merge: 5ef04b1c6d 65d79e3e5e +Author: Brian Goff +Date: Wed Mar 23 22:39:38 2016 -0400 + + Merge pull request #21454 from anusha-ragunathan/fix_overlay + + Move layer mount refcounts to mountedLayer + +commit 5ef04b1c6d1ca94c83c7ce52faae908a278ce6ea +Merge: 68674f739f 93e02efa90 +Author: Sebastiaan van Stijn +Date: Wed Mar 23 19:34:21 2016 -0700 + + Merge pull request #21268 from calavera/remove_dockerfile_from_api + + Remove dockerfile dependency from the API. + +commit 68674f739f218a45419c33a0c25cb6cbfbd0f4af +Merge: 3f568b19e8 f154227608 +Author: Brian Goff +Date: Wed Mar 23 22:27:44 2016 -0400 + + Merge pull request #21443 from calavera/fix_network_path_issue + + Fix network path issue + +commit 96980d954d764fb8a5af1e03c11e16c43e978f68 +Author: Dong Chen +Date: Wed Mar 23 18:29:16 2016 -0700 + + Skip unstable tests from Docker bug 14203. + + Signed-off-by: Dong Chen + +commit be72081f84c7d55730b35878fd14b9595ee32769 +Author: Riyaz Faizullabhoy +Date: Mon Mar 21 09:33:14 2016 -0700 + + Formatting and wording fixes from review + + Signed-off-by: Riyaz Faizullabhoy + +commit 68066cc85764cad6030d1198e67adb6fa2bc3287 +Author: Riyaz Faizullabhoy +Date: Fri Mar 18 10:41:12 2016 -0700 + + Update notary docs to reflect DCT delegations behavior + + Signed-off-by: Riyaz Faizullabhoy + +commit b787035d8b5973cb4cb0f14771f699dd9f93e9d8 +Merge: 87a997249d f64981b472 +Author: Richard Scothern +Date: Wed Mar 23 16:41:44 2016 -0700 + + Merge pull request #1545 from jonjohnsonjr/typos + + Fix typos in docs/spec/api.md + +commit 87a997249d7432b910ed46dec5e5fde62a44638c +Merge: 9e690c7fa2 7e552e1972 +Author: Richard Scothern +Date: Wed Mar 23 16:41:29 2016 -0700 + + Merge pull request #1522 from RichardScothern/tag-events + + Send tag events to notification listeners + +commit 3f568b19e80531e34a664fe4200987e7044f6b22 +Merge: 82b9e60369 2caf09d37b +Author: Sebastiaan van Stijn +Date: Wed Mar 23 16:36:29 2016 -0700 + + Merge pull request #21430 from tophj-ibm/remove-seccomp-ppc64le + + ppc64le: remove seccomp from Dockerfile + +commit 5239e6ed039e21993d164d950ef285eeff98e5b5 +Merge: 899206ced7 196d2924ac +Author: Nathan LeClaire +Date: Wed Mar 23 16:26:59 2016 -0700 + + Merge pull request #3223 from ahmetalpbalkan/azure-known-issue + + azure.md: Add known issue notice + +commit 9e690c7fa2e77ed9a1bebb12c9fe7c1874c08b2d +Merge: 1354eb9967 bc9c820e4b +Author: Stephen Day +Date: Wed Mar 23 16:19:39 2016 -0700 + + Merge pull request #1491 from RichardScothern/relative-url + + Return relative URLs + +commit 7e552e19726acebd891d1cefe6bd98a3c925cbdc +Author: Richard Scothern +Date: Wed Mar 9 16:13:02 2016 -0800 + + Update documentation and examples in notifications.md + + Signed-off-by: Richard Scothern + +commit b0280c37a08a77871947b1045073601deb601eaa +Author: Michael Crosby +Date: Wed Mar 23 15:41:47 2016 -0700 + + Remove grpc logging to stderr + + Signed-off-by: Michael Crosby + +commit 22d997b3745e278d5a2b0b85d56c0d2b166e3a74 +Author: Tonis Tiigi +Date: Tue Mar 22 19:55:25 2016 -0700 + + Update runc/containerd + + Contains fixes for: + - pid.max fix that is causing hang on network stats test. + - fix for early stdin close containerd-shim + - better logging for `could not synchronise with container process` + + Signed-off-by: Tonis Tiigi + +commit bc9c820e4bf152b94933ab43ed865b3717a709f2 +Author: Richard Scothern +Date: Mon Feb 22 17:49:23 2016 -0800 + + Enable URLs returned from the registry to be configured as relative. + + Signed-off-by: Richard Scothern + +commit 2a09fb02db77e6be46a7f8bd85ae97634aee549f +Merge: c3eca82749 d1ea4d72ac +Author: Victoria +Date: Wed Mar 23 15:08:25 2016 -0700 + + Merge pull request #3182 from londoncalling/docs-fix-links-build-errors + + fixed links showing as build errors per PR #3180 + +commit d1ea4d72ac81aa7bda7384ce6ee80a6fc6d62de8 +Author: Victoria Bialas +Date: Mon Mar 21 18:24:11 2016 -0700 + + fixed links showing as build errors per PR #3180 + + fixed links per build errors + + Signed-off-by: Victoria Bialas + +commit afe2bdd1c5194ac85a59adf1fdd14c9da054356e +Author: Richard Scothern +Date: Fri Mar 18 15:30:47 2016 -0700 + + Propogate tag as a functional argument into the notification system to attach + tags to manifest push and pull event notifications. + + Signed-off-by: Richard Scothern + +commit 899206ced7c6e822e486f1c6643aff72ac0eb98d +Merge: 137adfe306 bc89bf5e8d +Author: Nathan LeClaire +Date: Wed Mar 23 14:47:15 2016 -0700 + + Merge pull request #3221 from nathanleclaire/dont_munge_bootlocal_on_restart + + Prevent /var/lib/boot2docker/bootlocal.sh munging on restart + +commit 65d79e3e5e537039b244afd7eda29e721a93d84f +Author: Brian Goff +Date: Wed Mar 9 16:23:04 2016 -0500 + + Move layer mount refcounts to mountedLayer + + Instead of implementing refcounts at each graphdriver, implement this in + the layer package which is what the engine actually interacts with now. + This means interacting directly with the graphdriver is no longer + explicitly safe with regard to Get/Put calls being refcounted. + + In addition, with the containerd, layers may still be mounted after + a daemon restart since we will no longer explicitly kill containers when + we shutdown or startup engine. + Because of this ref counts would need to be repopulated. + + Signed-off-by: Brian Goff + +commit 57ca2a210108d31f8cbe9660bcd6cd469a937ff7 +Author: Anusha Ragunathan +Date: Wed Mar 23 13:20:46 2016 -0700 + + Fix use of mounted() in overlay. + + Handle error and mounted case separately. + + Signed-off-by: Anusha Ragunathan + +commit 82b9e60369d3d5d0dea1a10edc7c95b2bbe16685 +Merge: bc3b07e115 baac2f4867 +Author: David Calavera +Date: Wed Mar 23 14:25:35 2016 -0700 + + Merge pull request #21446 from cpuguy83/plugin_activation_issue + + Fix panic in loading plugins + +commit a6c0e7d5ab8837889113b28568453497d1f74772 +Merge: d09e047d19 26fbc45780 +Author: Ying Li +Date: Wed Mar 23 14:13:47 2016 -0700 + + Merge pull request #568 from docker/server-generates-snapshot-timestamp-immediately + + Server generates snapshot and timestamp immediately + +commit 26fbc45780ef562c441cadc014331d5fe739a272 +Author: David Lawrence +Date: Wed Mar 23 13:40:38 2016 -0700 + + fixing a panic in relation to the json.RawMessage updates + Signed-off-by: David Lawrence (github: endophage) + +commit e8cdc32f0be11cb3ccf4fc2bc0eadb701638a62d +Author: Ying Li +Date: Fri Mar 18 17:18:58 2016 -0700 + + Clean up after rebase and address review comments + + Signed-off-by: Ying Li + +commit 210eab829ffeb17d3cd5bcd67c4b29e99cc1f8db +Author: Ying Li +Date: Wed Mar 9 14:16:57 2016 -0800 + + Error (and add tests for this) if the root in the server store is corrupt + + Signed-off-by: Ying Li + +commit 3b80293a0c439e7e4cb1b8dd60bd48cf72f0da60 +Author: Ying Li +Date: Wed Mar 9 13:04:09 2016 -0800 + + Add test cases generating a timestamp from previous timestamps + + Signed-off-by: Ying Li + +commit 433a298a8b9ae57f770c91aabd09be43363dcc26 +Author: Ying Li +Date: Mon Feb 29 15:33:59 2016 -0500 + + Simplify the validateRoot logic in server validators + + Signed-off-by: Ying Li + +commit c0796f17efd3d9e44a77d5a6025bc7e73825aefb +Author: Ying Li +Date: Tue Feb 16 22:18:04 2016 -0800 + + Rename 'validateSnapshot' to 'loadAndValidateSnapshot' since it loads now + + Signed-off-by: Ying Li + +commit d3bb063fb27122ba693f88fdb43b5b156f9b8f4c +Author: Ying Li +Date: Thu Feb 11 15:26:55 2016 -0800 + + Update the server to generate the timestamp on update, just like snapshot. + + Signed-off-by: Ying Li + +commit 1b919fac355bd62cb8b9325b20d325dce3c4ce6b +Author: Ying Li +Date: Wed Feb 10 19:39:01 2016 -0800 + + Change GetOrCreateSnapshot to only create a new snapshot if the old is expired. + + This is in preparation for the server validation automatically generating a snapshot + when an update is applied. + + Signed-off-by: Ying Li + +commit 49be037bdd3a4923644c6858bfc19c3fe39212c9 +Author: Ying Li +Date: Wed Feb 10 19:20:37 2016 -0800 + + Change GetOrCreateTimestamp to only create a new timestamp if the old is expired. + + This is in preparation for the server validation automatically generating a timestamp + when an update is applied. + + Signed-off-by: Ying Li + +commit 9ff2558f81e3bedb0598ba8351b3a8628c2379c2 +Author: David Lawrence +Date: Mon Jan 18 11:32:37 2016 -0800 + + unifying timestamp generation code so server/timestamp/timestamp.go isn't going its own unique version + Signed-off-by: David Lawrence (github: endophage) + +commit 1354eb99676b442d916f0b2400b8f9ea67a54a9b +Merge: d7fd863ba4 37606af003 +Author: Aaron Lehmann +Date: Wed Mar 23 13:03:52 2016 -0700 + + Merge pull request #1554 from felixonmars/patch-1 + + Replace a strange comma with a space. + +commit 2164018d82a7c9857c8196b863a538f5d47f5265 +Author: Vincent Demeester +Date: Wed Mar 23 19:02:38 2016 +0100 + + Remove the verbosity of copy_containerd + + Signed-off-by: Vincent Demeester + +commit d7fd863ba47ab86775b1742ebde14181954e5dac +Merge: c8d8e7e357 abc9c65e34 +Author: Richard Scothern +Date: Wed Mar 23 12:43:44 2016 -0700 + + Merge pull request #1544 from dmp42/move-to-vendor + + Move to vendor + go1.6 + +commit d09e047d1937fb80bf75c9484b949b06acc97aee +Merge: 2e70ce0b3b 9bac73b7f7 +Author: David Lawrence +Date: Wed Mar 23 12:42:47 2016 -0700 + + Merge pull request #646 from endophage/vendor_update + + update vendoring + +commit baac2f48674d42863f9fdca5ef3056b4c6ed707e +Author: Brian Goff +Date: Wed Mar 23 15:25:15 2016 -0400 + + Fix panic in loading plugins + + When a plugin is first found, it is loaded into the available plugins + even though it's not activated yet. + If activation fails it is taken out of the list. + While it is in the list, other callers may see it and try to check it's + manifest. If it is not fully activated yet, the manifest will be nil and + cause a panic. + + This is especially problematic for drivers that are down and have not + been activated yet. + + We could just not load the plugin into the available list until it's + fully active, however that will just cause multiple of the same plugin + to attemp to be loaded. + + We could check if the manifest is nil and return early (instead of + panicing on a nil manifest), but this will cause a 2nd caller to receive + a response while the first caller is still waiting, which can be + awkward. + + This change uses a condition variable to handle activation (instead of + sync.Once). If the plugin is not activated, callers will all wait until + it is activated and receive a broadcast from the condition variable + signaling that it's ok to proceed, in which case we'll check if their + was an error in activation and proceed accordingly. + + Signed-off-by: Brian Goff + +commit bc3b07e1159c4e9de29250f8af86accd740b6459 +Merge: 5e502a1f1b bbdd34c370 +Author: Arnaud Porterie +Date: Wed Mar 23 12:24:16 2016 -0700 + + Merge pull request #21437 from tiborvass/fix-hub-test + + test: Do not check error message from hub, it is not needed + +commit abc9c65e344d7315764427597efc5b12990da3fe +Author: Olivier Gambier +Date: Wed Mar 23 11:49:34 2016 -0700 + + Make dep-validate more selective + + Signed-off-by: Olivier Gambier + +commit f1542276081aa91396495059638d3ea30d4e5a10 +Author: Yong Tang +Date: Wed Mar 23 04:12:22 2016 +0000 + + Fix Docker core dumps when removing network with special characters (#21401). + + This fix tries to fix Docker core dumps when removing network with special + characters. The issue is from the fact that when docker client tries to + pass the command to API, the networkID is not escaped in case of special + characters. This also means other commands (not just `docker network rm`) + may face the same issue (e.g., `docker network connect`). + + This fix adds the URL path escape to properly handle it. In addition, an + integration test for network create and delete is added to cover the cases + in #21401. + + This fix fixes #21401. + + Signed-off-by: Yong Tang + (cherry picked from commit f8dc5562d0a74792c46b9382181ddf97e5d7cdac) + Signed-off-by: David Calavera + +commit 58385bc8a51e538f64a0d91c3259f20c6c289c86 +Author: David Calavera +Date: Wed Mar 23 15:05:19 2016 -0400 + + Vendor engine-api 0.3.1. + + Signed-off-by: David Calavera + +commit 196d2924ac48075d6e794931d4c5d43947da3b82 +Author: Ahmet Alp Balkan +Date: Wed Mar 23 11:42:34 2016 -0700 + + azure.md: Add known issue notice + + Signed-off-by: Ahmet Alp Balkan + +commit 9bac73b7f78ad60c72ef19be58870625d29c880d +Author: David Lawrence +Date: Tue Mar 22 22:54:11 2016 -0700 + + update vendoring + Signed-off-by: David Lawrence (github: endophage) + +commit 5e502a1f1bdb67deb221102bda35016a7e13fe61 +Merge: 38227b96c0 9fb41520af +Author: Michael Crosby +Date: Wed Mar 23 11:31:00 2016 -0700 + + Merge pull request #21438 from tiborvass/do-not-stay-up-late + + Revert VERSION bump to 1.11.0-dev + +commit 9fb41520af3210466062a5a779148d2b0b8e3914 +Author: Tibor Vass +Date: Wed Mar 23 14:27:33 2016 -0400 + + Revert VERSION bump to 1.11.0-dev + + Signed-off-by: Tibor Vass + +commit bbdd34c370949a2db9f139720b4498bc0952e700 +Author: Tibor Vass +Date: Wed Mar 23 14:11:44 2016 -0400 + + test: Do not check error message from hub, it is not needed + + Signed-off-by: Tibor Vass + +commit 38227b96c08188931d38fcf08a048937b2d9da69 +Merge: faf5645a62 928ea1e957 +Author: Tibor Vass +Date: Wed Mar 23 13:08:23 2016 -0400 + + Merge pull request #21431 from tiborvass/bump_apiversion_to_v1.24 + + Bump API Version to v1.24 + +commit faf5645a62190e5482af09c537a40247f47b9e43 +Merge: 1f40cc15c7 dd51e85c05 +Author: David Calavera +Date: Wed Mar 23 10:02:59 2016 -0700 + + Merge pull request #21425 from tiborvass/fix-release-sh + + Fix release.sh script + +commit 1f40cc15c7776d40e743cc62bf9b1c1dd23ce86e +Merge: f4dfe15cbe d274456f3e +Author: Jess Frazelle +Date: Wed Mar 23 10:02:34 2016 -0700 + + Merge pull request #21176 from cyphar/fix-apparmor-profile-execpath + + profiles: apparmor: remove unused fields + +commit c3eca8274967d2e9846567fef9acb389bb1b8b9e +Merge: 2be2029791 dfac48f3f5 +Author: Aanand Prasad +Date: Wed Mar 23 17:01:32 2016 +0000 + + Merge pull request #3128 from dnephin/add_network_settings_to_config_hash + + Include network settings as part of the service config hash. + +commit 928ea1e957812c351b77bb33be7f3ef9fd629231 +Author: Tibor Vass +Date: Wed Mar 23 12:26:23 2016 -0400 + + Bump API Version to v1.24 + + Signed-off-by: Tibor Vass + +commit 2caf09d37b5865882dfa8c60d5362fd6d2ba54fd +Author: Christopher Jones +Date: Wed Mar 23 12:11:08 2016 -0400 + + ppc64le: remove seccomp from Dockerfile + + Removes the seccomp buildtag when building runc. + Because seccomp isn't currently being built, this would cause + the build to fail. + + Signed-off-by: Christopher Jones + +commit dd51e85c050076be09fc7414bda1f261b61e60ad +Author: Tibor Vass +Date: Tue Mar 22 22:46:46 2016 -0400 + + Fix release.sh script + + Use aws instead of s3cmd. + Make sure the release script works with the docker-prepended binary + names. + + Signed-off-by: Tibor Vass + +commit f4dfe15cbedd00668d1ad6fe26544cfb814f35ea +Merge: 6ad9def11a 38d746462c +Author: Vincent Demeester +Date: Wed Mar 23 16:27:53 2016 +0100 + + Merge pull request #21420 from icecrime/update_arm_build + + Update Dockerfile.armhf + +commit 75a271603c761c18c7deb186d08943dcf85b739d +Author: Aleksa Sarai +Date: Wed Mar 16 22:54:57 2016 +1100 + + pkg: archive: don't fail Untar if xattrs are not supported + + Since certain filesystems don't support extended attributes, ignore + errors produced (emitting a warning) when attempting to apply extended + attributes to file. + + Signed-off-by: Aleksa Sarai + +commit a1d84411178bdf72be83ad292543a1ea70aa3f69 +Author: Phil Estes +Date: Wed Mar 23 09:37:15 2016 -0400 + + Re-enable shared namespace tests for userns CI runs + + Allow --net=container and --ipc=container tests to run when user + namespaces are enabled. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 37606af0033caa6022fbe425206cc106e84d6d48 +Author: Felix Yan +Date: Wed Mar 23 17:33:03 2016 +0800 + + Replace a strange comma with a space. + + I believe it's a typo somehow? :) + + Signed-off-by: Felix Yan + +commit 6ad9def11a4cff5f2e45f756b3de28888fc584b9 +Merge: bc3149b75f bb68b666c5 +Author: Vincent Demeester +Date: Wed Mar 23 10:14:20 2016 +0100 + + Merge pull request #21386 from Microsoft/jjh/mountfix + + Windows: Fix mountinfo + +commit bc3149b75f26fec36fa91157bfd6103adaa13148 +Merge: cb41c36108 009399dc8e +Author: Tibor Vass +Date: Wed Mar 23 03:58:59 2016 -0400 + + Merge pull request #21413 from tiborvass/docker-prefix + + Add `docker-` prefix to runc and containerd binaries + +commit cb41c36108f8f46af8e7de0d4c64751300137f3f +Merge: f668e36652 e91de9fb9d +Author: Tibor Vass +Date: Wed Mar 23 03:41:58 2016 -0400 + + Merge pull request #21424 from tonistiigi/revert-one_ctr_to_rule_them_all + + Revert "Move layer mount refcounts to mountedLayer" + +commit e91de9fb9d175541acc95834de486d33feef552a +Author: Tonis Tiigi +Date: Wed Mar 23 00:33:02 2016 -0700 + + Revert "Move layer mount refcounts to mountedLayer" + + This reverts commit 563d0711f83952e561a0d7d5c48fef9810b4f010. + + Signed-off-by: Tonis Tiigi + +commit f668e36652e26f92c0f1a7fa3f648e5ed444b68e +Merge: 92a3ece35a 14e1325656 +Author: Lei Jitang +Date: Wed Mar 23 14:12:12 2016 +0800 + + Merge pull request #21407 from LK4D4/log_stats_errors + + daemon: log errors from stats calls + +commit 009399dc8ed8a4b635b0e229bf07b685e286d8d9 +Author: Tibor Vass +Date: Tue Mar 22 20:55:47 2016 -0400 + + Add `docker-` prefix to runc and containerd binaries + + Signed-off-by: Tibor Vass + +commit 92a3ece35a10092af0944f175a15b2390f6c666e +Merge: f26193e2cf 563d0711f8 +Author: Tõnis Tiigi +Date: Tue Mar 22 21:19:00 2016 -0700 + + Merge pull request #21107 from cpuguy83/one_ctr_to_rule_them_all + + Move layer mount refcounts to mountedLayer + +commit 38d746462c7a883f4b56f0e68cda200e8d30024e +Author: Arnaud Porterie +Date: Tue Mar 22 20:19:39 2016 -0700 + + Update Dockerfile.armhf + + Use official Go 1.6 release, and update golang/tools and golang/lint + hashes accordingly. + + Signed-off-by: Arnaud Porterie + +commit f26193e2cfa04e4fa37cebe62de07eb46e0efed7 +Merge: 55304e2e55 c937b43abd +Author: Sebastiaan van Stijn +Date: Tue Mar 22 18:41:15 2016 -0700 + + Merge pull request #21340 from SvenDowideit/workdir-does-a-mkdir-p + + WORKDIR is like calling mkdir - but we've not told people + +commit 55304e2e553c566d55efb01d609db381d34ec77d +Merge: 694b32df51 00bf3c85d0 +Author: Michael Crosby +Date: Tue Mar 22 17:44:43 2016 -0700 + + Merge pull request #21381 from mlaventure/selinux-pcp_pmcd + + Give selinux pcp_pmcd_t type access to /var/lib/docker + +commit 694b32df51ac82afdf4695569e87dad7eaf71de4 +Merge: 7bc052ae04 14dc4a7158 +Author: Tibor Vass +Date: Tue Mar 22 20:33:18 2016 -0400 + + Merge pull request #21370 from tonistiigi/expose-layer-ids + + Expose RootFS in image inspect + +commit 7bc052ae0449139bc0d6f2002c62cd849fb098bf +Merge: d0d17a0693 37e2103e64 +Author: Tibor Vass +Date: Tue Mar 22 20:31:10 2016 -0400 + + Merge pull request #21411 from mlaventure/fix-unauth-to-central + + Update TestPushToCentralRegistryUnauthorized to match updated hub + +commit d0d17a069371663b6ad60b0edb5d9beb5d9a175b +Merge: fb1365639e 5e3a8ef887 +Author: Tibor Vass +Date: Tue Mar 22 20:29:16 2016 -0400 + + Merge pull request #21397 from kencochrane/update-release-script + + Updated release.sh script to stop uploading binaries + +commit ef1c777887af0d3cb591bf2a24397b5b36a8491b +Merge: 027b34a2bc 5f08cabef6 +Author: Nishant Totla +Date: Tue Mar 22 17:26:24 2016 -0700 + + Merge pull request #2010 from dongluochen/ReleaseDocUpdate + + small updates to RELEASE-CHECKLIST.md + +commit a53b29467a681405e51318561ac0167ab2665504 +Author: Ben Firshman +Date: Tue Mar 22 17:17:06 2016 -0700 + + Update wordpress example to use official images + + The orchardup images are very old and not maintained. + + Signed-off-by: Ben Firshman + +commit fb1365639e7be8bb5e114de0b28e4a22c01530ee +Merge: d02d48b4b1 3eb0a80f29 +Author: David Calavera +Date: Tue Mar 22 17:15:01 2016 -0700 + + Merge pull request #21406 from LK4D4/fix_streams_race + + builder: synchronize stderr and stdout + +commit 5f08cabef695ebf65adb5f809789fba45780f07b +Author: Dong Chen +Date: Tue Mar 22 17:14:19 2016 -0700 + + update RELEASE-CHECKLIST.md + + Signed-off-by: Dong Chen + +commit d02d48b4b19f327fdcfcc220f4c8154274b017f5 +Merge: 28af4789e6 5ff66748da +Author: David Calavera +Date: Tue Mar 22 17:11:34 2016 -0700 + + Merge pull request #21402 from crosbymichael/tar-binaries + + Add containerd and runc binaries to tgz output + +commit 28af4789e6a183d3b684b9cf7f0061607a4e6a13 +Merge: 3ce494f48c 9e9c73a528 +Author: Sebastiaan van Stijn +Date: Tue Mar 22 16:41:10 2016 -0700 + + Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0 + + Vendor engine-api v0.3.0 + +commit 3ce494f48cc37b1e4065b62e58ec1c0a5df0e00c +Merge: 506fb9810c 8af4f89cba +Author: Tibor Vass +Date: Tue Mar 22 19:40:27 2016 -0400 + + Merge pull request #21367 from mlaventure/containerd-docs-cleanup + + Remove unneeded references to execDriver + +commit 027b34a2bce1ffc78cbde54212a6ddc19ad486c4 +Merge: 1d17bc6d37 27cf675aba +Author: Dongluo Chen +Date: Tue Mar 22 16:18:51 2016 -0700 + + Merge pull request #2009 from dongluochen/bump-1.2.0-rc1 + + Bump version to 1.2.0-rc1 + +commit 37e2103e640861b02a1ea0253df749a527a87e1b +Author: Kenfe-Mickael Laventure +Date: Tue Mar 22 16:15:29 2016 -0700 + + Update TestPushToCentralRegistryUnauthorized to match updated hub + + The error message was changed from "unauthorized: access to the + requested resource is not authorized" to "unauthorized: authentication + required". + + Signed-off-by: Kenfe-Mickael Laventure + +commit 27cf675abacdea51706f78d3f6bfe2d80ee6f88e +Author: Dong Chen +Date: Tue Mar 22 15:57:55 2016 -0700 + + Bump version to 1.2.0-rc1 + + Signed-off-by: Dong Chen + +commit 5ff66748daecb9674b22983b84ac95c76e04ed00 +Author: Michael Crosby +Date: Tue Mar 22 14:12:29 2016 -0700 + + Export GOOS and GOARCH in subprocess for tgz + + Signed-off-by: Michael Crosby + +commit 2be2029791658a0fa44f95bfbb76ec561926dde2 +Merge: 4f5123bda9 2cc87555cb +Author: Daniel Nephin +Date: Tue Mar 22 18:24:52 2016 -0400 + + Merge pull request #3139 from shin-/1716-tls-flags-support + + Add support for TLS config command-line options + +commit 9e9c73a52893e658e391dfc44d4cea38fa6af980 +Author: David Calavera +Date: Tue Mar 22 18:12:16 2016 -0400 + + Vendor engine-api v0.3.0 + + I tagged the current commit so we have a better reference + of what's in this release. + + Signed-off-by: David Calavera + +commit 506fb9810c60177b360b9dabab516828b90ffc48 +Merge: 8b8fcb796f fbdb3c3a4b +Author: David Calavera +Date: Tue Mar 22 15:09:42 2016 -0700 + + Merge pull request #21396 from aboch/vnn + + Vendoring libnetwork v0.7.0-dev.10 + +commit 8b8fcb796f85bc8f5146fa61ce667699f0436591 +Merge: 2ec1764d45 ab3772f72f +Author: Tibor Vass +Date: Tue Mar 22 17:57:17 2016 -0400 + + Merge pull request #21303 from riyazdf/notary-vendor-docker1.11 + + vendor notary for docker1.11 + +commit 1d17bc6d372eba2a32b34f91adb38173cda92cca +Merge: 7e1bcc36e5 0436dd1f26 +Author: Dongluo Chen +Date: Tue Mar 22 14:52:25 2016 -0700 + + Merge pull request #2004 from dongluochen/DuplicateNetworkEndpoints + + Skip redundant endpoints in "network inspect" + +commit 2e70ce0b3b85bb9ae8af0f60e8caf36aa7ac146e +Merge: 151b72c990 731710f628 +Author: David Lawrence +Date: Tue Mar 22 14:48:29 2016 -0700 + + Merge pull request #641 from docker/one-key-per-line + + Print one key and/or path per line when listing delegations + +commit 2ec1764d45de9269522cb084ec87c87dd6f3c4e0 +Merge: acaec7f67c 3536c09cea +Author: David Calavera +Date: Tue Mar 22 14:29:12 2016 -0700 + + Merge pull request #21400 from LK4D4/fix_volumes_race + + volume/local: fix race in List + +commit 0436dd1f26caaf2efce43d6da78d9ef68ad51a65 +Author: Dong Chen +Date: Tue Mar 22 14:10:57 2016 -0700 + + An endpoint is duplicate/stale if its ID is part of endpoint index. + + Signed-off-by: Dong Chen + +commit acaec7f67cc67049182d162d2ac8ed7b5db90559 +Merge: 53d2e5e9d7 faeff5118f +Author: David Calavera +Date: Tue Mar 22 14:07:06 2016 -0700 + + Merge pull request #21385 from tonistiigi/load-parent-chain + + Add parent references support to load/save + +commit 14e1325656257c9d96cd01c03e624c99cfc35d31 +Author: Alexander Morozov +Date: Tue Mar 22 14:01:51 2016 -0700 + + daemon: log errors from stats calls + + I encountered silent errors ignoring when runc failed to parse pids.max + + Signed-off-by: Alexander Morozov + +commit 3eb0a80f29629a1c022dc914437b176271d476fc +Author: Alexander Morozov +Date: Tue Mar 22 13:57:24 2016 -0700 + + builder: synchronize stderr and stdout + + it's concurrent streams and should be synchronized before writing to response. + Otherwise there will be race in writing to *bufio.Writer in + net/http.response. + + Signed-off-by: Alexander Morozov + +commit 14dc4a7158a141b5c13aa63231e467f0c3235850 +Author: Tonis Tiigi +Date: Mon Mar 21 09:56:51 2016 -0700 + + Expose RootFS in image inspect + + Fixes #20451 + + Signed-off-by: Tonis Tiigi + +commit fbdb3c3a4b15720c0df3a59d4bef0773b365c2b1 +Author: Alessandro Boch +Date: Tue Mar 22 12:30:39 2016 -0700 + + Vendoring libnetwork v0.7.0-dev.10 + + Signed-off-by: Alessandro Boch + +commit aca7e73a69c13ec0e64cc60a9ebfeb92aca3d9a6 +Author: Michael Crosby +Date: Tue Mar 22 12:23:17 2016 -0700 + + Copy containerd binaries in tgz + + Signed-off-by: Michael Crosby + +commit bc89bf5e8de10ee3f4caa0f0be220dfe6c79d910 +Author: Nathan LeClaire +Date: Tue Mar 22 12:22:15 2016 -0700 + + Prevent /var/lib/boot2docker/bootlocal.sh munging on restart + + Signed-off-by: Nathan LeClaire + +commit 53d2e5e9d754ce8fbef733759e9ec450514133e3 +Merge: 62d4556654 fc214b4408 +Author: Tibor Vass +Date: Tue Mar 22 15:12:33 2016 -0400 + + Merge pull request #21270 from ehazlett/resource-labels + + Add Label support for Images (build), Networks and Volumes on Creation + +commit 78568f2eb54a6455dad566923f3c6f03ac300405 +Author: Michael Crosby +Date: Tue Mar 22 11:49:01 2016 -0700 + + Add function for copy containerd + + This adds a function for copying containerd and other binaries as well + as adding a hash for those files. + + Signed-off-by: Michael Crosby + +commit 2cc87555cb1e1c1c8322ca4dcae21f00025800aa +Author: Joffrey F +Date: Mon Mar 21 14:23:31 2016 -0700 + + tls_config_from_options unit tests + + Signed-off-by: Joffrey F + +commit 137adfe306ac905f8b8203f14f6a331bed70ac42 +Merge: cec812ae2f 05aea83271 +Author: Nathan LeClaire +Date: Tue Mar 22 11:49:39 2016 -0700 + + Merge pull request #3214 from exoscale/feature/update-egoscale + + exoscale: support for CoreOS + +commit cec812ae2fd10a080efa27773b0ef0c8877f44f4 +Merge: c390ecd730 bd5ea7c335 +Author: Nathan LeClaire +Date: Tue Mar 22 11:49:21 2016 -0700 + + Merge pull request #3215 from sivel/rackspace-active-timeout + + Add --rackspace-active-timeout argument to rackspace driver + +commit c390ecd730d4aea336a8c494c3d4764ff1d6d1a8 +Merge: 593fe2b4d0 1d09691a35 +Author: Nathan LeClaire +Date: Tue Mar 22 11:48:40 2016 -0700 + + Merge pull request #3218 from dgageot/simple-appveyor + + Simplify appveyor config + +commit 472711531749aa3e9909ec8e386e4bd73027530b +Author: Joffrey F +Date: Mon Mar 21 12:10:00 2016 -0700 + + Bump docker-py version to include tcp host fix + + Signed-off-by: Joffrey F + +commit 442dff72b4568656821189e3d45617e3f87f63c9 +Author: Joffrey F +Date: Mon Mar 21 12:06:29 2016 -0700 + + Improve assert_hostname setting in tls_config_from_options + + Signed-off-by: Joffrey F + +commit 26f3861791a82ddee9171a6710f595b0136c4ab3 +Author: Joffrey F +Date: Thu Mar 17 16:09:45 2016 -0700 + + Specifying --tls no longer overrides all other TLS options + Add an option to skip hostname verification + + Signed-off-by: Joffrey F + +commit 7166408d2a9f9972e4a7f60f30228808f2260117 +Author: Joffrey F +Date: Wed Mar 16 13:40:13 2016 -0700 + + Fixed typos + simplified TLSConfig creation process. + + Signed-off-by: Joffrey F + +commit 1ac33ea7e5f5c2c4d4facd5b52143f0a962515bc +Author: Joffrey F +Date: Tue Mar 15 14:19:25 2016 -0700 + + Add support for TLS config command-line options + + Signed-off-by: Joffrey F + +commit 62d45566544344b6f562bff7792976702ed8938b +Merge: de9ff4bdc0 2b278f4846 +Author: David Calavera +Date: Tue Mar 22 11:40:12 2016 -0700 + + Merge pull request #21383 from estesp/shared-userns-net-ipc + + Allow net and IPC namespaces to be shared when userns=on + +commit 7e1bcc36e582188fa9d06bd6425219887e7cf85e +Merge: 11f42c3c2f 4b0b029ce2 +Author: Victor Vieux +Date: Tue Mar 22 11:37:30 2016 -0700 + + Merge pull request #2006 from p8952/master-to-manager + + Change "master" to "manager" + +commit ab3772f72fcb189c742510326069474ea625042f +Author: Riyaz Faizullabhoy +Date: Thu Mar 17 10:23:18 2016 -0700 + + vendor notary for docker1.11 + + Signed-off-by: Riyaz Faizullabhoy + +commit 3536c09ceaa2d94a43a3a3228b096ba7a61f558d +Author: Alexander Morozov +Date: Tue Mar 22 11:21:38 2016 -0700 + + volume/local: fix race in List + + Signed-off-by: Alexander Morozov + +commit 151b72c990d718aec01ca2260707031273e06516 +Merge: fe7742ca70 a5dede1c2f +Author: David Lawrence +Date: Tue Mar 22 11:20:11 2016 -0700 + + Merge pull request #645 from docker/delegation-password-env + + Delegation password environment var + +commit d1444b56e942327e5f9c97db91414d7fca9fce40 +Author: Olivier Gambier +Date: Tue Mar 22 10:42:33 2016 -0700 + + Fix GCS + + Signed-off-by: Olivier Gambier + +commit 4b0b029ce2b1a69ad14ae48e148b737cd0723d3a +Author: Peter Wilmott +Date: Tue Mar 22 17:42:23 2016 +0000 + + Change "master" to "manager" + + The Docker Swarm documentation states that: + + "Some documentation still refers to a primary manager as a “master”, but + that term has been superseded." + + This change attempts to remove remaining references to "master" in order + to keep documentation consistent. + + Signed-off-by: Peter Wilmott + +commit 59401e277b15d0676c2d958bdddd318a44c1da64 +Author: Olivier Gambier +Date: Mon Mar 21 18:04:27 2016 -0700 + + Dependency validation enforce + + Signed-off-by: Olivier Gambier + +commit 53e3c1d7b215c60a6d6933d19f72f8797d2a0381 +Author: Olivier Gambier +Date: Mon Mar 21 12:08:47 2016 -0700 + + Fix godeps + + Signed-off-by: Olivier Gambier + +commit 77e69b9cf3d9e707ef2f5bbfe815e80708974e1a +Author: Olivier Gambier +Date: Fri Mar 18 14:07:13 2016 -0700 + + Move to vendor + + Signed-off-by: Olivier Gambier + +commit de9ff4bdc0e17a0fd455790972d83133f424ef9d +Merge: 0dcdd1c5b8 b0ac69b67e +Author: Tibor Vass +Date: Tue Mar 22 13:45:12 2016 -0400 + + Merge pull request #21223 from cpuguy83/add_nocp_to_vols + + Add explicit flags for volume cp/no-cp + +commit 5e3a8ef887f9a2721338c574781a927ad28d881e +Author: Ken Cochrane +Date: Tue Mar 22 13:42:54 2016 -0400 + + Updated release.sh script to stop uploading binaries + + Signed-off-by: Ken Cochrane + +commit 0dcdd1c5b84c4a066882ea52dd81b5b3a624897a +Merge: e8774fbb9f 1bf5eb20e5 +Author: Michael Crosby +Date: Tue Mar 22 10:29:56 2016 -0700 + + Merge pull request #21341 from duglin/tweakBuild + + Add containerd/runc exes to bundle dir after build + +commit a5dede1c2f22193a49cc443a7fd90467fd5e7e8b +Author: Riyaz Faizullabhoy +Date: Tue Mar 22 10:21:15 2016 -0700 + + Update docs with delegation env var + + Signed-off-by: Riyaz Faizullabhoy + +commit d045bd44e04110919d8ec7c6cf71c82e54b280e1 +Author: Dong Chen +Date: Tue Mar 22 01:49:06 2016 -0700 + + Skip redundant endpoints in "network inspect" + + Signed-off-by: Dong Chen + +commit d1dbc3dbd4f632819790ba65a6fc57663623ea2e +Author: Riyaz Faizullabhoy +Date: Tue Mar 22 10:09:38 2016 -0700 + + Add delegation passphrase env var + + Signed-off-by: Riyaz Faizullabhoy + +commit e8774fbb9f76a2ed7d02039a1a6c490fdbe0160c +Merge: 7720338713 5a701c3e4c +Author: Vincent Demeester +Date: Tue Mar 22 17:26:32 2016 +0100 + + Merge pull request #21366 from martinmosegaard/master + + Fix plural typo in 'save' command help + +commit fc214b4408d915e3510f61c7584ca01c176d1373 +Author: Evan Hazlett +Date: Wed Mar 16 17:52:34 2016 -0400 + + add label support for build, networks and volumes + + build: implement --label + + Signed-off-by: Evan Hazlett + + network: allow adding labels on create + + Signed-off-by: Evan Hazlett + + volume: allow adding labels on create + + Signed-off-by: Evan Hazlett + + add tests for build, network, volume + + Signed-off-by: Evan Hazlett + + vendor: libnetwork and engine-api bump + + Signed-off-by: Evan Hazlett + +commit 563d0711f83952e561a0d7d5c48fef9810b4f010 +Author: Brian Goff +Date: Wed Mar 9 16:23:04 2016 -0500 + + Move layer mount refcounts to mountedLayer + + Instead of implementing refcounts at each graphdriver, implement this in + the layer package which is what the engine actually interacts with now. + This means interacting directly with the graphdriver is no longer + explicitly safe with regard to Get/Put calls being refcounted. + + In addition, with the containerd, layers may still be mounted after + a daemon restart since we will no longer explicitly kill containers when + we shutdown or startup engine. + Because of this ref counts would need to be repopulated. + + Signed-off-by: Brian Goff + +commit 4f5123bda9e6b39fdf36853477751c7e77040a5f +Merge: aaa7b09369 f1dce50b3d +Author: Aanand Prasad +Date: Tue Mar 22 10:14:52 2016 +0000 + + Merge pull request #3168 from dnephin/fix_tty_timeout + + Handle all timeout errors consistently + +commit aaa7b093696f5a591898d41e71ae8c653c219041 +Merge: a20b84e6d2 5c968f9e15 +Author: Aanand Prasad +Date: Tue Mar 22 10:14:28 2016 +0000 + + Merge pull request #3181 from dnephin/fix_partial_change_test_failure + + Fix flaky partial_change state test + +commit a20b84e6d2bccee29013b18fd51adfd82eef95db +Merge: 6718e82966 2bf5e46857 +Author: Aanand Prasad +Date: Tue Mar 22 10:12:21 2016 +0000 + + Merge pull request #3178 from aanand/2774-off-one-offs + + Remove one-off containers in `rm` and `down` + +commit 77203387133ecc2c5c1f40e8ea2f7b547adc2bd8 +Merge: 666563b190 df6def3c0c +Author: Sebastiaan van Stijn +Date: Tue Mar 22 08:26:54 2016 +0100 + + Merge pull request #21388 from zhuguihua/move_zfs_options_to_correct_place_in_man_page + + Move ZFS options to correct place in man page + +commit 05aea83271ad22d7d0673d997d5c07a0e6b16acc +Author: Vincent Bernat +Date: Mon Mar 21 16:16:04 2016 +0100 + + exoscale: add support for CoreOS + + The egoscale binding for exoscale was limiting the images that could be + selected by a user to Ubuntu one only. Enable the use of arbitrary + images. For example, the following images are now available: + + - centos-6.6 + - centos-7.1 + - coreos-stable-835 + - debian-7 + - debian-8 + - ubuntu-12.04 + - ubuntu-14.04 + - ubuntu-15.10 + + The default user for non-Ubuntu images are not "ubuntu". Let the user + choose the appropriate user ("core" for CoreOS and "debian" for Debian). + + CoreOS user are likely to want the ability to provide custom user data + as it enables the configuration of the etcd cluster. We add an option to + provide custom user data file. Moreover, we remove some of the default + options as they are not supported in CoreOS and are useless on + Debian/Ubuntu: + + - Resizing of rootfs is already done on all images by default. + - Docker Machine will set the hostname as part of the provisioning. + + Signed-off-by: Vincent Bernat + +commit 5a701c3e4cd63f0b17b4fe9ab13c8cbe0ea5d353 +Author: Martin Mosegaard Amdisen +Date: Tue Mar 22 08:16:52 2016 +0100 + + Update 'save' command help + + Based on review feedback. + + Signed-off-by: Martin Mosegaard Amdisen + +commit df6def3c0c1e2a566f3af3499865f8e9bf9da568 +Author: Zhu Guihua +Date: Tue Mar 22 14:50:49 2016 +0800 + + Move ZFS options to correct place in man page + + Signed-off-by: Zhu Guihua + +commit 666563b190b7c97dc9db334ef03768ee8432b20e +Merge: 9f327b4c28 88d73ebff4 +Author: Vincent Demeester +Date: Tue Mar 22 07:42:21 2016 +0100 + + Merge pull request #21046 from cyli/use-notary-cli + + Sign all first-level delegation roles when doing a trusted push + +commit 1d09691a355debbf6f91585a4f6023c07d56f9a6 +Author: David Gageot +Date: Tue Mar 22 07:05:58 2016 +0100 + + Simplify appveyor config + + Signed-off-by: David Gageot + +commit bb68b666c51eb145a4376c239878d1d985afe01e +Author: John Howard +Date: Mon Mar 21 21:37:00 2016 -0700 + + Windows: Fix mountinfo + + Signed-off-by: John Howard + +commit 9f327b4c2805d3280e4e0ae6fe2d6522e8e753a7 +Merge: adc6ed5a10 c44e7a3e63 +Author: Arnaud Porterie +Date: Mon Mar 21 21:49:48 2016 -0700 + + Merge pull request #21373 from aaronlehmann/client-user-agent-registry-operations + + Pass upstream client's user agent through to registry on operations beyond pulls + +commit c937b43abd302b7643e0257a843ffda60f101fcc +Author: Sven Dowideit +Date: Sat Mar 19 22:20:40 2016 +1000 + + WORKDIR is like calling mkdir - but we've not told people + + Signed-off-by: Sven Dowideit + +commit adc6ed5a1051695cb488c57eea918d3c73566a04 +Merge: c22d09f563 52237787fa +Author: David Calavera +Date: Mon Mar 21 19:59:27 2016 -0700 + + Merge pull request #21354 from Microsoft/jjh/getpids + + Windows: Minimal docker top implementation + +commit faeff5118f710f7c4f6173c309b52aaba24118c9 +Author: Tonis Tiigi +Date: Mon Mar 21 13:52:36 2016 -0700 + + Add parent references support to load/save + + Restores the correct parent chain relationship + between images on docker load if multiple images + have been saved. + + Signed-off-by: Tonis Tiigi + +commit 2b278f48460453691c63ad81b0c87b50d8b18979 +Author: Phil Estes +Date: Mon Mar 21 21:30:21 2016 -0400 + + Allow net and IPC namespaces to be shared when userns=on + + Now that the namespace sharing code via runc is vendored with the + containerd changes, we can disable the restrictions on container to + container net and IPC namespace sharing when the daemon has user + namespaces enabled. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit aae4bcf773a88f854c720387040a0a289a2fca87 +Author: Qiang Huang +Date: Tue Mar 22 08:53:57 2016 +0800 + + Remove dot in suffix to avoid double dot error message + + Signed-off-by: Qiang Huang + +commit b041fdc0d53c209a5e0614d2b35c6fa2209fe12d +Author: Qiang Huang +Date: Fri Mar 18 11:16:53 2016 +0800 + + Add validation for cpu period and quota + + Accoding to: + https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt + + It has minimal and maximal limit. + + Signed-off-by: Qiang Huang + +commit 1bf5eb20e53b7e242792fcbe399cb997b6a2ba4b +Author: Doug Davis +Date: Sat Mar 19 09:39:55 2016 -0700 + + Add containerd/runc exes to bundle dir after build + + Not sure if this is the right setup given the containerd change but I need + to have the built version of the nested exes (containerd, runc...) available + to me after the build is completed so I'm always testing using the latest + versions. This PR will copy them into the same bundles dir so people can + them use them if they wish w/o having to build each separately. + + Signed-off-by: Doug Davis + +commit b0ac69b67ef79c6c937f84bee3df20a1924ad334 +Author: Brian Goff +Date: Mon Mar 14 23:31:42 2016 -0400 + + Add explicit flags for volume cp/no-cp + + This allows a user to specify explicitly to enable + automatic copying of data from the container path to the volume path. + This does not change the default behavior of automatically copying, but + does allow a user to disable it at runtime. + + Signed-off-by: Brian Goff + +commit 593fe2b4d06fe26d5a5fb80c3807c7acc268d0c1 +Merge: e536ed6738 a5da41de6e +Author: Nathan LeClaire +Date: Mon Mar 21 17:31:52 2016 -0700 + + Merge pull request #3168 from jtnord/issue-2989 + + [Issue-2989] Allow non administrators to create docker-machines + +commit 00bf3c85d04f58a86f96ff63a3bd7eeaaa5f76fe +Author: Kenfe-Mickael Laventure +Date: Mon Mar 21 16:27:59 2016 -0700 + + Give selinux pcp_pmcd_t type access to /var/lib/docker + + Signed-off-by: Kenfe-Mickael Laventure + +commit c8d8e7e357a1e5cf39aec1cfd4b3aef82414b3fc +Merge: 4562cb5a78 5b0a484739 +Author: Aaron Lehmann +Date: Mon Mar 21 16:17:18 2016 -0700 + + Merge pull request #1534 from jstarks/windows_platform + + Add osversion and osvariant to platform specification + +commit c22d09f56336b31a0569c424957b13f7baf01a92 +Merge: f9f8708dc6 93f5770511 +Author: Tibor Vass +Date: Mon Mar 21 19:11:09 2016 -0400 + + Merge pull request #21377 from LK4D4/fix_compile + + runconfig/opts: fix compilation issue + +commit 5c968f9e15e09bb53337a41560ddd2cd517d80c9 +Author: Daniel Nephin +Date: Mon Mar 21 19:07:50 2016 -0400 + + Fix flaky partial_change state test. + + Signed-off-by: Daniel Nephin + +commit 4562cb5a7896fa3a189babbb2ca33e55232967d2 +Merge: d06d6d3b09 92a9ee34d4 +Author: Richard Scothern +Date: Mon Mar 21 16:01:16 2016 -0700 + + Merge pull request #1547 from jzwlqx/issue1535 + + fix manifest revision search, closes #1535 + +commit 6718e82966624cce03ca14ec96fa9eb9239da1d7 +Merge: 28120148f4 be1476f24b +Author: Daniel Nephin +Date: Mon Mar 21 18:40:51 2016 -0400 + + Merge pull request #3179 from dnephin/fix_tmpfs_test_failure + + Only allow tmpfs with the v2 format + +commit 93f57705110e196dca1cf2b2ce7d261ee97b9e4e +Author: Alexander Morozov +Date: Mon Mar 21 15:01:08 2016 -0700 + + runconfig/opts: fix compilation issue + + it was introduced with #20566 as a result of merge + + Signed-off-by: Alexander Morozov + +commit f9f8708dc661a5a433642fddcbde1d2eb5461893 +Merge: 278d3962a8 3b6ffc8022 +Author: Arnaud Porterie +Date: Mon Mar 21 14:49:16 2016 -0700 + + Merge pull request #20566 from AndrewGuenther/20371-validate-hostname + + Ensure --hostname is valid + +commit c44e7a3e632c3ea961cb8c12ba45371f54e6699c +Author: Aaron Lehmann +Date: Fri Mar 18 14:42:40 2016 -0700 + + Pass upstream client's user agent through to registry on operations beyond pulls + + This adds support for the passthrough on build, push, login, and search. + + Revamp the integration test to cover these cases and make it more + robust. + + Use backticks instead of quoted strings for backslash-heavy string + contstands. + + Signed-off-by: Aaron Lehmann + +commit 278d3962a8cb6a42e9841789bdb8b49a29617e24 +Merge: 11b4c89087 d1502afb63 +Author: Arnaud Porterie +Date: Mon Mar 21 14:26:59 2016 -0700 + + Merge pull request #21306 from mgoelzer/issue20001-nodeps + + Pass upstream client's user agent through to registry on image pulls + +commit 11f42c3c2f4eabebeb6679d3f9287647158987c0 +Merge: 2de0f86b5f e2dbd70357 +Author: Dongluo Chen +Date: Mon Mar 21 14:11:42 2016 -0700 + + Merge pull request #1999 from allencloud/remove-parameter-in-createDiscovery + + remove parameter which is not used in createDiscovery + +commit 11b4c89087cb7d6014e6106521ebb92fa74d01ab +Merge: 3ac32cd72e 1ae9dcf97d +Author: Alexander Morozov +Date: Mon Mar 21 14:03:36 2016 -0700 + + Merge pull request #21301 from cpuguy83/cleaner_file_log + + Fixes some issues with jsonfile write/read + +commit a5da41de6e29ca728057a68940a79ffee985a91e +Author: James Nord +Date: Wed Mar 9 13:06:50 2016 +0000 + + Allow hyper-v driver to be used from non admin accounts and clean up the fixed disk after convertion. + + Signed-off-by: James Nord + +commit 3ac32cd72e2cbb4201666a260ef8b2b740c6bc78 +Merge: 7bbf58ed0d 800a7d513d +Author: Tibor Vass +Date: Mon Mar 21 16:41:03 2016 -0400 + + Merge pull request #21106 from yongtang/20122-volume-one-character + + Fix one-character directory issue in the volume option (#20122). + +commit 8af4f89cba09105f3d581926aca6e231326f7054 +Author: Kenfe-Mickael Laventure +Date: Fri Mar 18 12:43:17 2016 -0700 + + Remove unneeded references to execDriver + + This includes: + - updating the docs + - removing dangling variables + + Signed-off-by: Kenfe-Mickael Laventure + +commit 88d73ebff43ef6031f169e8333f2d67e4f4f9d93 +Author: cyli +Date: Fri Mar 18 16:11:37 2016 -0700 + + Include documentation on how to add the targets/releases delegation to a repo + + Signed-off-by: cyli + +commit be1476f24b5d19eca5078b7305bd6425c7ee7d78 +Author: Daniel Nephin +Date: Mon Mar 21 14:41:28 2016 -0400 + + Only allow tmpfs on v2. + + Signed-off-by: Daniel Nephin + +commit fe7742ca7075f9a220e5e28da8e36d9aa930d345 +Merge: c0c7dd38ac bfee37d471 +Author: David Lawrence +Date: Mon Mar 21 11:40:00 2016 -0700 + + Merge pull request #639 from docker/rawmessage_pointer_toplevel + + update top level Signed.Signed to be a *json.RawMessage + +commit 2bf5e468574f5863ed57a1b5327668e61a578130 +Author: Aanand Prasad +Date: Mon Mar 21 18:08:07 2016 +0000 + + Stop and remove still-running one-off containers in 'down' + + Signed-off-by: Aanand Prasad + +commit 623ccc2f319ec28929c75a09bba76916c84f0d2b +Author: cyli +Date: Wed Mar 16 19:59:18 2016 -0700 + + Pull, Pull-A, and Build will only pull tags from the targets role or the targets/releases role. + It will ignore tags in all other delegation roles. + + Signed-off-by: cyli + +commit ca57f4e6a8ac7861009d03957e1b508036eac98f +Author: Riyaz Faizullabhoy +Date: Wed Mar 9 00:18:30 2016 -0800 + + Add test for targets/releases preference when pulling + + Signed-off-by: Riyaz Faizullabhoy + +commit 497a58e6e48277bbee214d701e3d671eb8975797 +Author: cyli +Date: Mon Mar 7 11:48:11 2016 -0800 + + Trusted push now adds the tag to every first level delegation role for which we have keys + and for which the tag conforms to path restrictions. + + Signed-off-by: cyli + +commit 7bbf58ed0d60e26a6514ac8219277ffb8ca63d17 +Merge: d82ad12df8 c9db9e4ff1 +Author: Vincent Demeester +Date: Mon Mar 21 18:42:10 2016 +0100 + + Merge pull request #21360 from WeiZhang555/clean + + Clean dead code + +commit d82ad12df813824d9166478068536d7d78cf0b69 +Merge: a05fdd6806 13086f387b +Author: Vincent Demeester +Date: Mon Mar 21 18:09:14 2016 +0100 + + Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd + + fluentd logger: support all options besides Unix sockets + +commit bd5ea7c335099900a96368f25899306042635a02 +Author: Matt Martz +Date: Mon Mar 21 11:48:31 2016 -0500 + + Add --rackspace-active-timeout argument to rackspace driver + + Signed-off-by: Matt Martz + +commit a05fdd680662d36c6d79add46b07ad5dcee7f6d7 +Merge: 2a4c970aeb 264b5b6083 +Author: Alexander Morozov +Date: Mon Mar 21 09:46:28 2016 -0700 + + Merge pull request #21283 from runcom/update-test + + vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793 + +commit a2317dfac26d5709bf460671bd7e054567fc94de +Author: Aanand Prasad +Date: Mon Mar 21 16:15:49 2016 +0000 + + Remove one-off containers in 'docker-compose down' + + Signed-off-by: Aanand Prasad + +commit 2a4c970aeb23cace02963eb364474e6197388170 +Merge: be8459c248 f25d9f0f23 +Author: Arnaud Porterie +Date: Mon Mar 21 08:54:03 2016 -0700 + + Merge pull request #21342 from tonistiigi/cleanup-libcontainer + + Convert libnetwork stats directly to api types + +commit be8459c24891648849cb6123b6f60c885e03a99f +Merge: 336d585292 4570cfd3ba +Author: David Calavera +Date: Mon Mar 21 08:41:31 2016 -0700 + + Merge pull request #21313 from Microsoft/sjw/logs_fix + + Fixing logs file handle leak. + +commit 336d585292cb2551b423c0dcd0646cf152f9a6a4 +Merge: c2550c4f7b 4461bc45b6 +Author: David Calavera +Date: Mon Mar 21 08:40:52 2016 -0700 + + Merge pull request #21336 from Microsoft/jjh/fixunmount + + Windows: Fix unmount for Hyper-V Containers + +commit c2550c4f7bf82b58e0f2e614cbae2d523282b432 +Merge: 5008a34072 3cf8a9ede7 +Author: David Calavera +Date: Mon Mar 21 08:38:13 2016 -0700 + + Merge pull request #21362 from frenkel/engine-api-update-for-openbsd + + Update vendored engine-api for OpenBSD support + +commit 81f6d86ad9121e022b61c03be8977bd79e1b2fdd +Author: Aanand Prasad +Date: Mon Mar 21 15:14:31 2016 +0000 + + Warn when --all is not passed to rm + + Signed-off-by: Aanand Prasad + +commit 1ae9dcf97dc6ccaf7a7977fe8ae1812b691ccba2 +Author: Brian Goff +Date: Thu Mar 17 12:13:23 2016 -0400 + + Fixes some issues with jsonfile write/read + + This cleans up some of the use of the filepoller which makes reading + significantly more robust and gives fewer changes to fallback to the + polling based watcher. + In a lot of cases, if the file was being rotated while we were adding it + to the watcher, it would return an error that the file doesn't exist and + would fallback. + In some cases this fallback could be triggered multiple times even if we + were already on the fallback/poll-based watcher. + + It also fixes an open file leak caused by not closing files properly on + rotate, as well as not closing files that were read via the `tail` + function until after the log reader is completed. + + Prior to the above changes, it was relatively simple to cause the log + reader to error out by having quick rotations, for example: + ``` + $ docker run --name test --log-opt max-size=10b --log-opt max-files=10 + -d busybox sh -c 'while true; do usleep 500000; echo hello; done' + $ docker logs -f test + ``` + After these changes I can run this forever without error. + + Another fix removes 2 `os.Stat` calls when rotating files. The stat + calls are not needed since we are just calling `os.Rename` anyway, which + will in turn also just produce the same error that `Stat` would. + These `Stat` calls were also quite expensive. + Removing these stat calls also seemed to resolve an issue causing slow + memory growth on the daemon. + + Signed-off-by: Brian Goff + +commit 1bc946967497d848e4ac18a8420fddd793236a31 +Author: Aanand Prasad +Date: Mon Mar 21 14:42:57 2016 +0000 + + Don't allow boolean values for one_off in Project methods + + Signed-off-by: Aanand Prasad + +commit a826c244ed49996252fbeff238ae44c4fd3f33f8 +Author: Martin Mosegaard Amdisen +Date: Mon Mar 21 15:15:40 2016 +0100 + + Fix plural typo in 'save' command help + + The form "Save an images" is not correct. + Either "Save an image" or "Save images" work, but since + the save commands accepts multiple images, I chose the + latter. + + Fixed in all places where I could grep "Save an image(s)". + + Signed-off-by: Martin Mosegaard Amdisen + +commit 5008a34072e55f7df87774a5e7beca979718c3c2 +Merge: c9488fe280 81707de23f +Author: Antonio Murdaca +Date: Mon Mar 21 15:09:13 2016 +0100 + + Merge pull request #21333 from cpuguy83/sigpipe + + Don't forward SIGPIPE from client to container + +commit c9488fe280682cbb66379136c4a181ed65cac665 +Merge: fffa83353f 9014ac2d15 +Author: Sebastiaan van Stijn +Date: Mon Mar 21 13:38:35 2016 +0100 + + Merge pull request #21364 from thaJeztah/carry-21188-fix-docker-info-docs + + docs: fix incorrect output for "/info" endpoint + +commit fffa83353f5f133227dccdd4c652749c31b634d3 +Merge: 722f06dae3 8926af95e4 +Author: Sebastiaan van Stijn +Date: Mon Mar 21 13:16:52 2016 +0100 + + Merge pull request #21246 from nerdalert/vlan_docs + + Updates to macvlan/ipvlan experimental docs + +commit 5826a2147b1817c278dd8918e9cc8bbce6844b9e +Author: Joffrey F +Date: Wed Mar 16 19:47:46 2016 -0700 + + Use enum to represent 3 possible states of the one_off filter + + Signed-off-by: Joffrey F + +commit 187ea4cd814a3de1201afe5a50097935183d7f9f +Author: Joffrey F +Date: Tue Mar 15 17:00:24 2016 -0700 + + Add --all option to rm command - remove one-off containers + + Signed-off-by: Joffrey F + +commit 28120148f4e1380096407626f846eda8f6970f36 +Merge: d5ef0dfa92 85c7d3e5ce +Author: Aanand Prasad +Date: Mon Mar 21 12:10:12 2016 +0000 + + Merge pull request #3137 from dnephin/add_tmpfs_to_config + + Add support for docker run --tmpfs flag. + +commit 9014ac2d15b65559468ef0496061a38b919e1680 +Author: Arnaud Porterie +Date: Mon Mar 14 09:13:08 2016 -0700 + + docs: fix incorrect output for "/info" endpoint + + OomScoreAjd is not part of `/info` output + Wrong field name `DiscoveryBackend` in API reference + + Signed-off-by: Arnaud Porterie + Signed-off-by: Sebastiaan van Stijn + +commit 3cf8a9ede71081efbade168fa6ff6d65d2a0e4eb +Author: Frank Groeneveld +Date: Mon Mar 21 12:11:11 2016 +0100 + + Update vendored engine-api for OpenBSD support + + Signed-off-by: Frank Groeneveld + +commit 722f06dae3fe18865978d0f7f531ceea15b4f51a +Merge: 1a7afc075d 3ca6ad5b9e +Author: Sebastiaan van Stijn +Date: Mon Mar 21 11:06:54 2016 +0100 + + Merge pull request #21353 from Microsoft/jjh/tidylibcontainerdmore + + Windows: Tidy after libcontainerd + +commit 13086f387b28ceea5aff5924e430f41608884a9b +Author: Pierre Carrier +Date: Sun Jan 24 05:51:03 2016 -0800 + + fluentd logger: support all options besides Unix sockets + + Mostly useful for docker/docker#19438. + + Signed-off-by: Pierre Carrier + +commit 1a7afc075dbe948ea4016a2fcbfae3c37a69ab98 +Merge: 02a90d0399 c3ef69270a +Author: Sebastiaan van Stijn +Date: Mon Mar 21 10:28:25 2016 +0100 + + Merge pull request #21355 from yongtang/20188-plugins-docs + + Update plugin docs for the covering of remote plugins (#20188). + +commit 02a90d039946eff71ad116aafc2655050fde0dba +Merge: 9ea7e082ef 7942160638 +Author: Sebastiaan van Stijn +Date: Mon Mar 21 10:17:10 2016 +0100 + + Merge pull request #21345 from duglin/BetterError + + Add the name of the exe that's trying to be executed + +commit c9db9e4ff1ca2e563328c6c618184d9aa8393ac5 +Author: Zhang Wei +Date: Mon Mar 21 16:43:24 2016 +0800 + + Clean dead code + + Signed-off-by: Zhang Wei + +commit 800a7d513d3b80478a7996cb2c357b72f65e0b09 +Author: Yong Tang +Date: Fri Mar 11 01:06:53 2016 +0000 + + Fix one-character directory issue in the volume option (#20122). + + The issue comes from the implementation of volumeSplitN() where a + driver letter (`[a-zA-Z]:`) was assumed to follow either `:`, `/`, + or `\\`. + + In Windows driver letter appears in two situations: + a. `^[a-zA-Z]:` (A colon followed by `^[a-zA-Z]:` is OK as colon is + the separator in volume option) + b. A string in the format like `\\?\C:\Windows\...` (UNC). + Therefore, a driver letter can only follow either a `:` or `\\` + + This PR removes the condition of `/` before the driver letter so + that options like `-v /tmp/q:/foo` could be handled correctly. A + couple of tests has also been added. + + This PR fixes #20122. + + Signed-off-by: Yong Tang + +commit c3ef69270ad397f9e43fc78c15b87ea19b011024 +Author: Yong Tang +Date: Mon Mar 21 02:42:10 2016 +0000 + + Update plugin docs for the covering of remote plugins (#20188). + + This fix updates the Plugin API docs to cover the case of remote + plugins which could be deployed on a host different from the + docker host, through spec or json files. + + This fix closes #20188. + + Signed-off-by: Yong Tang + +commit 79421606388169151c31d1c34079a98f53170ab8 +Author: Doug Davis +Date: Sat Mar 19 15:01:15 2016 -0700 + + Add the name of the exe that's trying to be executed + so that the user knows what's not in the container but should be. + Its not always easy for the user to know what exact command is being run + when the 'docker run' is embedded deep in something else, like a Makefile. + Saw this while dealing with the containerd migration. + + Signed-off-by: Doug Davis + +commit 52237787fa82c12b018d71b1e00f28492be35dad +Author: John Howard +Date: Sun Mar 20 15:58:23 2016 -0700 + + Windows: Minimal docker top implementation + + Signed-off-by: John Howard + +commit 3ca6ad5b9e6e37766d26c29f6a99bbd80961473c +Author: John Howard +Date: Sun Mar 20 15:59:52 2016 -0700 + + Windows: Tidy after libcontainerd + + Signed-off-by: John Howard + +commit 9ea7e082ef833f1b4cd09e630cc18dbfe53f9f2b +Merge: 09a69ed8b9 f10c8e786b +Author: Jess Frazelle +Date: Sun Mar 20 12:28:58 2016 -0700 + + Merge pull request #21343 from pandrew/fix-debian-policy-rule + + Fix debian policy rule + +commit 09a69ed8b9907742db00190999341cb642352117 +Merge: 9e530247e0 99b16b3523 +Author: Brian Goff +Date: Sun Mar 20 14:04:11 2016 -0400 + + Merge pull request #21344 from tonistiigi/fix-seccomp-profiles + + Reuse profiles/seccomp package + +commit 9c2a0739fb9c5e3636425d669f0ab860ea1bfbae +Author: Pierre Carrier +Date: Tue Jan 19 00:07:13 2016 -0800 + + bump fluent-logger-golang version + + This version supports async connections. + + Signed-off-by: Pierre Carrier + +commit d89dae6e4becc16e80e3781ac68b9fbb855947b3 +Author: Pierre Carrier +Date: Fri Jan 29 16:05:46 2016 -0800 + + Revert "Added flag to ignore fluentd connect error on container start" + + This reverts commit 3cf82ff1ab14e1ddd2b629524e894ac359168388. + + Signed-off-by: Pierre Carrier + +commit d1502afb63a10df0bfce20ae2957774cfb3e58d8 +Author: Mike Goelzer +Date: Tue Mar 8 18:18:53 2016 -0800 + + Pass upstream client's user agent through to registry on image pulls + + Changes how the Engine interacts with Registry servers on image pull. + Previously, Engine sent a User-Agent string to the Registry server + that included only the Engine's version information. This commit + appends to that string the fields from the User-Agent sent by the + client (e.g., Compose) of the Engine. This allows Registry server + operators to understand what tools are actually generating pulls on + their registries. + + Signed-off-by: Mike Goelzer + +commit d274456f3eb9f2a3dc518985ec22d236d3bc3f6c +Author: Aleksa Sarai +Date: Sun Mar 20 18:08:20 2016 +1100 + + profiles: apparmor: actually calculate version + + In order to check that we can have the `ptrace` rule, we need to + actually calculate the version of apparmor_parser. + + Signed-off-by: Aleksa Sarai + +commit 64fb664908f7d3368d1bbfd1efb56cd45e5ed7a3 +Author: Aleksa Sarai +Date: Sun Mar 20 19:01:49 2016 +1100 + + profiles: apparmor: remove unused fields + + ExecPath isn't used by anything, and the signal apparmor rule isn't used + because it refers to a peer that we don't ship. + + Signed-off-by: Aleksa Sarai + +commit 99b16b3523461551b03362305c36811372344af2 +Author: Tonis Tiigi +Date: Sat Mar 19 14:07:17 2016 -0700 + + Reuse profiles/seccomp package + + Signed-off-by: Tonis Tiigi + +commit f25d9f0f236db5b3d8671c4e25016ca5a0f8535d +Author: Tonis Tiigi +Date: Sat Mar 19 12:57:41 2016 -0700 + + Remove unused libcontainer vendoring + + Signed-off-by: Tonis Tiigi + +commit f10c8e786b32ca4202702a57787830c2d0a9eef3 +Author: Paul Liljenberg +Date: Sat Mar 19 20:58:19 2016 +0100 + + Fix debian policy rule + + Fix issue in debian policy by removeing double quotes. + + Signed-off-by: Paul Liljenberg + +commit d36376f86c8944f6955f537a1a12f4072f8d7403 +Author: Tonis Tiigi +Date: Sat Mar 19 12:56:45 2016 -0700 + + Convert libnetwork stats directly to api types + + Signed-off-by: Tonis Tiigi + +commit e2dbd703575c808716e0369ecedd50e087d6ce2f +Author: Sun Hongliang +Date: Sat Mar 19 23:12:09 2016 +0800 + + remove parameter which is not used in createDiscovery + + Signed-off-by: Sun Hongliang + +commit 9e530247e066ef7a32e35a1f0f818c1e4048ad54 +Merge: b77573f48e e331df5aee +Author: Vincent Demeester +Date: Sat Mar 19 15:14:10 2016 +0100 + + Merge pull request #21338 from Microsoft/jjh/lcdcleanup + + Windows: libcontainerd cleanup + +commit 264b5b60832bf1f1342618d059c0ece3358de7e1 +Author: Antonio Murdaca +Date: Fri Mar 18 18:54:05 2016 +0100 + + distribution: errors: do not retry if no token in response + + Signed-off-by: Antonio Murdaca + +commit c48439af7f33fccc17013ae7f9e64d4c107502f1 +Author: Antonio Murdaca +Date: Sat Mar 19 12:19:43 2016 +0100 + + vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793 + + - fix and add integration tests + + Signed-off-by: Antonio Murdaca + +commit 92a9ee34d440ac82860340a05c3b60f78b77449c +Author: 姜继忠 +Date: Wed Mar 16 14:12:56 2016 +0800 + + fix manifest revision search, closes #1535 + + Signed-off-by: 姜继忠 + +commit 4461bc45b6fafaabaf3a8158e2f785f836331bb5 +Author: John Howard +Date: Fri Mar 18 20:09:54 2016 -0700 + + Windows: Fix unmount for Hyper-V Containers + + Signed-off-by: John Howard + +commit e331df5aeefc1ebaa7a79ceb78350aba8cdabba1 +Author: John Howard +Date: Fri Mar 18 20:29:27 2016 -0700 + + Windows: libcontainerd cleanup + + Signed-off-by: John Howard + +commit 2de0f86b5fab0d95704c0d7554cadaa84bb631c9 +Merge: e8cfa68946 ee5e94fd63 +Author: Morgan Bauer +Date: Fri Mar 18 19:53:41 2016 -0700 + + Merge pull request #1998 from dongluochen/HostnameUpdate + + Docker changes hostname/domain in container config + +commit b77573f48e4022c7b8b829c4a33c6963fe08e18a +Merge: 131c59193f 0e025b4bb1 +Author: Jess Frazelle +Date: Fri Mar 18 18:03:15 2016 -0700 + + Merge pull request #21274 from jfrazelle/fix-variables-that-werent-being-used + + fix variables that werent being called + +commit 131c59193f16d1f752103f97302546ec819cb6f7 +Merge: e5a3f86e44 719a43ca35 +Author: Brian Goff +Date: Fri Mar 18 20:53:17 2016 -0400 + + Merge pull request #21325 from frenkel/openbsd-support + + Support OpenBSD build + +commit e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d +Merge: 06e98f0a5c 94d70d8355 +Author: Jess Frazelle +Date: Fri Mar 18 17:21:18 2016 -0700 + + Merge pull request #20662 from tonistiigi/containerd-integration + + Containerd integration + +commit e8cfa68946278a023f56976ac0a303665e91d8c0 +Merge: a4fb6f0604 01fc95fe31 +Author: Dongluo Chen +Date: Fri Mar 18 17:15:32 2016 -0700 + + Merge pull request #1994 from allencloud/log-more-details-when-constraint-or-affinity-fails + + classify whether constraint error or affinity error + +commit 7fc40dd7ccb5b839340c666a0902eb7bc47c80a1 +Author: Kalle Møller +Date: Mon Mar 14 01:54:15 2016 +0100 + + Adding ssl_version to docker_clients kwargs + + Select tls version based of COMPOSE_TLS_VERSION + + Changed from SSL to TLS + + Also did docs - missing default value + + Using getattr and raises AttributeError in case of unsupported version + + Signed-off-by: Kalle Møller + +commit ee5e94fd631d53967a31b0813f18bcbd6c7f89c5 +Author: Dong Chen +Date: Fri Mar 18 17:14:00 2016 -0700 + + Update mesos test. + + Signed-off-by: Dong Chen + +commit 731710f6289dd5fee6fe1655995c09411dcfa6d1 +Author: Riyaz Faizullabhoy +Date: Fri Mar 18 16:21:48 2016 -0700 + + Print one key and/or path per line when listing delegations + + Signed-off-by: Riyaz Faizullabhoy + +commit 530061be03a0837a3cb0ff5f3d542c3dad46d499 +Merge: f6fd2a3bd9 c35033b8ae +Author: Nathan LeClaire +Date: Fri Mar 18 16:25:20 2016 -0700 + + Merge pull request #440 from 6uliver/master + + Pass start.sh first argument as a command for bash + +commit c35033b8aef16d3489a8f71f93e6ee89e16e6c92 +Author: Roland Németh <6uliver@gmail.com> +Date: Sat Mar 19 00:18:59 2016 +0100 + + Pass all arguments to start.sh as commands not just the first one + +commit bfee37d471f77682db330746d71533862838c8e0 +Author: David Lawrence +Date: Fri Mar 18 14:09:53 2016 -0700 + + update top level Signed.Signed to be a *json.RawMessage + Signed-off-by: David Lawrence (github: endophage) + +commit 951c2d1cca61b45a4b413c24b8e40b75031d6653 +Author: Dong Chen +Date: Fri Mar 18 16:18:01 2016 -0700 + + Docker engine updates hostname/domainname. + + Signed-off-by: Dong Chen + +commit a4fb6f06045ca9c8dc7b58f41673813d4d12210a +Merge: a91f1818c4 1e821e48ed +Author: Dongluo Chen +Date: Fri Mar 18 16:05:21 2016 -0700 + + Merge pull request #1997 from nishanttotla/context-plumbing + + Plumbing context through all engine-api calls + +commit 06e98f0a5cf59c040e9f753d60f33ba22256d55c +Merge: 03003619af cb9aeb0413 +Author: Jess Frazelle +Date: Fri Mar 18 16:02:38 2016 -0700 + + Merge pull request #21232 from calavera/consolidate_security_opts_format + + Consolidate security options to use `=` as separator. + +commit 8926af95e4af4c3f8c6e28d1d054b9b6b7a13ff9 +Author: Brent Salisbury +Date: Wed Mar 16 06:39:47 2016 -0400 + + Updates to macvlan/ipvlan experimental docs + + - Added a few more diagrams. + - Fixed typos and a few additional details. + - Moved experimental images to a new directory + in /experimental/images per @cpuguy83 suggestion. + + Signed-off-by: Brent Salisbury + +commit dfac48f3f58fb777ae8d5e577f1fb1c6fc000e4c +Author: Daniel Nephin +Date: Wed Mar 16 22:37:28 2016 -0400 + + Make a new flaky test less flaky. + + Signed-off-by: Daniel Nephin + +commit 089ec6652223acdde9c594aadfc104237e1cfbf8 +Author: Daniel Nephin +Date: Mon Mar 14 22:02:25 2016 -0400 + + Include network settings as part of the service config hash. + + Signed-off-by: Daniel Nephin + +commit 85c7d3e5ce821c7e8d6a7c85fc0b786f3a60ec93 +Author: Philip Walls +Date: Sat Feb 20 01:18:40 2016 +0000 + + Add support for docker run --tmpfs flag. + + Signed-off-by: Philip Walls + +commit f1dce50b3da1ccd4f66939965a749b660a48fe16 +Author: Daniel Nephin +Date: Fri Mar 18 16:09:44 2016 -0400 + + Handle all timeout errors consistently. + + Signed-off-by: Daniel Nephin + +commit 25cbc2aae907886d46ff1e55a2c6dea535966e41 +Author: Daniel Nephin +Date: Fri Mar 18 18:19:16 2016 -0400 + + Fix flaky network test. + + Signed-off-by: Daniel Nephin + +commit f64981b472981f36a792c1fb6408639c783d5a7b +Author: Jon Johnson +Date: Thu Mar 17 16:11:31 2016 -0700 + + Fix typos in docs/spec/api.md + + Fix grammatical and formatting issues. + Add links to sections or other documents where appropriate. + + Signed-off-by: Jon Johnson + +commit 1e821e48ed0501a9c33a17c3ee2dd46eca1d21ea +Author: Nishant Totla +Date: Fri Mar 18 14:22:07 2016 -0700 + + Plumbing context through all calls to engine-api client + + Signed-off-by: Nishant Totla + +commit c0c7dd38acebef523ac208983515078b1c8c4a47 +Merge: 5ff849ee82 c483853c79 +Author: David Lawrence +Date: Fri Mar 18 14:34:33 2016 -0700 + + Merge pull request #638 from docker/fix-arg-order + + Fix Create arg order for signer + +commit 611f273c76186b2718aeca29ceb6b43e1951bee7 +Author: Nishant Totla +Date: Fri Mar 18 14:19:30 2016 -0700 + + Updating Godeps (engine-api) + + Signed-off-by: Nishant Totla + +commit c483853c79c1356f3b436f8edc933e2c74fb0207 +Author: Riyaz Faizullabhoy +Date: Fri Mar 18 13:59:16 2016 -0700 + + Fix Create arg order for signer + + Signed-off-by: Riyaz Faizullabhoy + +commit 81707de23ff6d0b03bd8d5cda87efac7939d9d46 +Author: Brian Goff +Date: Fri Mar 18 16:50:18 2016 -0400 + + Don't forward SIGPIPE from client to container + + Signed-off-by: Brian Goff + +commit 94d70d835500bec3b171425271916d3e40f29635 +Author: John Howard +Date: Fri Mar 18 11:53:27 2016 -0700 + + Windows libcontainerd implementation + + Signed-off-by: John Howard + Signed-off-by: John Starks + Signed-off-by: Darren Stahl + Signed-off-by: Tonis Tiigi + +commit 6eebe85290327ee9934ea996b6ef82c579789d97 +Author: Tonis Tiigi +Date: Fri Mar 18 11:51:59 2016 -0700 + + Remove execdriver package + + Signed-off-by: Tonis Tiigi + +commit 9c4570a958df42d1ad19364b1a8da55b891d850a +Author: Tonis Tiigi +Date: Fri Mar 18 11:50:19 2016 -0700 + + Replace execdrivers with containerd implementation + + Signed-off-by: Tonis Tiigi + Signed-off-by: Kenfe-Mickael Laventure + Signed-off-by: Anusha Ragunathan + +commit cc83031ade5c4baed722c31603d56d54e4679681 +Author: Tonis Tiigi +Date: Fri Mar 18 11:43:13 2016 -0700 + + Vendor containerd, specs, runc + + Signed-off-by: Tonis Tiigi + +commit 14299daacaf4e80735615ff9f42ba2479cf04486 +Author: Tonis Tiigi +Date: Fri Mar 18 11:37:37 2016 -0700 + + Vendor updated grpc, protobuf + + Signed-off-by: Tonis Tiigi + +commit 03003619af04d62c9d02b79031bdd26d0254f3cb +Merge: 6c6363c726 d3b650062f +Author: Brian Goff +Date: Fri Mar 18 16:28:51 2016 -0400 + + Merge pull request #21332 from jfrazelle/change-email + + change email + +commit d3b650062faec3d1cc05eae8847d88d8227c1c4a +Author: Jessica Frazelle +Date: Fri Mar 18 13:17:28 2016 -0700 + + change email + + Signed-off-by: Jessica Frazelle + +commit 6c6363c726ccfec97d577eff1cc60314f15dc841 +Merge: ea0025a7e1 cdd7fddfec +Author: Vincent Demeester +Date: Fri Mar 18 20:52:02 2016 +0100 + + Merge pull request #21269 from mlaventure/inspect-bind-mounts + + Update inspect/ps to properly handle bind mounts + +commit 5ff849ee82d717c7cd767c69288b76a321a206a9 +Merge: 127c4f26cf c54183bc27 +Author: Riyaz Faizullabhoy +Date: Fri Mar 18 11:57:20 2016 -0700 + + Merge pull request #552 from docker/flatten-keystore + + Flatten keystore by adding key info map + +commit 5e0356659d4fdfb13232a7b82be033b5ee041bc9 +Merge: ca4c38ccae 032f94b637 +Author: French Ben +Date: Fri Mar 18 11:36:30 2016 -0700 + + Merge pull request #1551 from dasrick/1550-duplicated-entry + + #1550 enhancement remove duplicated entry in package.json + +commit c54183bc27038c33c36d63fbf596f80e16a921e7 +Author: Riyaz Faizullabhoy +Date: Thu Mar 10 11:54:44 2016 -0800 + + Add error case to keyInfo generation, test yubikey backup, fix rebase conflicts + + Signed-off-by: Riyaz Faizullabhoy + +commit e1613cdcb2e61544a0b7f7de760c0327e35aca9c +Author: Riyaz Faizullabhoy +Date: Thu Mar 10 11:26:00 2016 -0800 + + Address review comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 8336bba11459767e9d488841dbb9509358a08bee +Author: Riyaz Faizullabhoy +Date: Wed Mar 2 20:07:53 2016 -0800 + + Change passwd to add back to the same keystore type, special handling + for yubi + + Signed-off-by: Riyaz Faizullabhoy + +commit be66056edb5468be0bb1833709b777a5153386fc +Author: Riyaz Faizullabhoy +Date: Wed Mar 2 18:19:40 2016 -0800 + + change API to specify keyID instead of name + + Signed-off-by: Riyaz Faizullabhoy + +commit 5984b88f14cdeba3a56d8209d6ae28bf4297d895 +Author: Riyaz Faizullabhoy +Date: Wed Mar 2 10:48:37 2016 -0800 + + configure backing up logic for yubikey + + Signed-off-by: Riyaz Faizullabhoy + +commit 1ed9c352d7c4759d64cff5bcefc2a1fcd76c09a8 +Author: Riyaz Faizullabhoy +Date: Tue Mar 1 18:36:48 2016 -0800 + + change ks.AddKey to be consistent with CryptoService + + Signed-off-by: Riyaz Faizullabhoy + +commit 9ecd899e258171496d2aae2e857f87a838f3bf10 +Author: Riyaz Faizullabhoy +Date: Tue Mar 1 15:09:00 2016 -0800 + + Removing key import and gun from cryptoservice + + Signed-off-by: Riyaz Faizullabhoy + +commit 9dd45b421c833e5458869bcec6afa8f635e8cff4 +Merge: 2342879763 755fad6f8b +Author: Sebastiaan van Stijn +Date: Fri Mar 18 19:29:30 2016 +0100 + + Merge pull request #60 from vdemeester/update-maintainers + + Update project maintainers + +commit 1aad807439383d4244307589c541d5b00f5ce2e3 +Author: Riyaz Faizullabhoy +Date: Fri Feb 26 13:39:47 2016 -0800 + + update role checks for empty gun + + Signed-off-by: Riyaz Faizullabhoy + +commit 38056b75ea6d1df675d1e5aadbe071539ecd602c +Author: Riyaz Faizullabhoy +Date: Mon Feb 22 09:46:10 2016 -0800 + + keydbstore updates + + Signed-off-by: Riyaz Faizullabhoy + +commit 7bd550a39a588461e71cbfe643b4bbddbd5817a6 +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 09:36:39 2016 -0800 + + import refactor + + Signed-off-by: Riyaz Faizullabhoy + +commit c7bccd79e38e76a6000296a437027036a048a333 +Author: Riyaz Faizullabhoy +Date: Wed Feb 17 10:23:45 2016 -0800 + + addressing review comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 2a37590ea6a7e08bac7ba1f71011019e5d7fbf87 +Author: Riyaz Faizullabhoy +Date: Fri Feb 12 14:53:07 2016 -0800 + + update interface and comments + + Signed-off-by: Riyaz Faizullabhoy + +commit c41cee3e5d22867a63bdef7f44094669d1f02273 +Author: Riyaz Faizullabhoy +Date: Thu Feb 11 18:20:06 2016 -0800 + + simplify export logic with new keymap + + Signed-off-by: Riyaz Faizullabhoy + +commit 0f39dd7aa8fd6b7c8912066d7bb3429e62a90d1c +Author: Riyaz Faizullabhoy +Date: Thu Feb 11 09:28:20 2016 -0800 + + add GetKeyInfo test for memory store + + Signed-off-by: Riyaz Faizullabhoy + +commit 97e845e295dbb8cb43f4df70c460920cdc41286d +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 17:32:19 2016 -0800 + + AddKey for cryptoservice + + Signed-off-by: Riyaz Faizullabhoy + +commit 95af5d4800c1d057ef193f393221b33310fdcebd +Author: Riyaz Faizullabhoy +Date: Tue Feb 9 09:32:41 2016 -0800 + + try cleaning up removekey, debugging tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 23eb203a63ef3da17930128fd1a8b2a58f865438 +Author: Riyaz Faizullabhoy +Date: Mon Feb 8 17:25:00 2016 -0800 + + add key info api, use for passwd + + Signed-off-by: Riyaz Faizullabhoy + +commit 351b247aec2c54561355a9f41033705483875e2b +Author: Riyaz Faizullabhoy +Date: Fri Feb 5 17:21:26 2016 -0800 + + add tests for initial keystore state, and after removing and adding + + Signed-off-by: Riyaz Faizullabhoy + +commit bbaef4faba00ac71d3c46487af221255a7499c45 +Author: Riyaz Faizullabhoy +Date: Mon Feb 1 16:00:09 2016 -0800 + + Flatten keystore by adding map, simple tests + Signed-off-by: Riyaz Faizullabhoy + +commit 4570cfd3ba900253c18066a0299d64551dbf85cc +Author: Stefan J. Wernli +Date: Thu Mar 17 17:48:21 2016 -0700 + + Fixing logs file handle leak. + Docker logs was only closing the logger when the HTTP response writer received a close notification, however in non-follow mode the writer never receives a close. This means that the daemon would leak the file handle to the log, preventing the container from being removed on Windows (file in use error). This change explicitly closes the log when the end of stream is hit. + + Signed-off-by: Stefan J. Wernli + +commit 755fad6f8bdd7d5af895b64a9c0fed263f6469e2 +Author: Vincent Demeester +Date: Fri Mar 18 18:57:42 2016 +0100 + + Update project maintainers + + Signed-off-by: Vincent Demeester + +commit ad3231a1521216e1ebf77854c89394711fc74972 +Author: Vincent Demeester +Date: Fri Mar 18 18:57:35 2016 +0100 + + Merge Curators and Docs maintainers. + + Signed-off-by: Vincent Demeester + +commit d06d6d3b093302c02a93153ac7b06ebc0ffd1793 +Merge: ec6ac0c05e ea148448a2 +Author: Derek McGowan +Date: Fri Mar 18 10:37:55 2016 -0700 + + Merge pull request #1542 from runcom/typed-errors + + registry: client: auth: type errors + +commit 040f63cd47d4f0b22bfecd46e64df20cba0df3a4 +Author: Dong Chen +Date: Tue Mar 15 19:30:35 2016 -0700 + + Force node spec update. + + Signed-off-by: Dong Chen + +commit ea0025a7e104dfcb53f331ece6b784d893011afd +Merge: a30332e705 73046cb8d8 +Author: Vincent Demeester +Date: Fri Mar 18 18:07:48 2016 +0100 + + Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api + + handle kernel version error in version api + +commit 1ff65860b7aa6cfc5a3a01b5b0c6fe8979ae1f4f +Merge: 316aa9080e c6f871bcf2 +Author: Joao Fernandes +Date: Fri Mar 18 10:02:29 2016 -0700 + + Merge pull request #1343 from thaJeztah/fix-indentation + + Fix indentation in quick-start docs + +commit a30332e705b3c75647859383e86d65a48fa5c412 +Merge: ae75435dae f43683d60d +Author: Antonio Murdaca +Date: Fri Mar 18 17:45:05 2016 +0100 + + Merge pull request #21183 from thaJeztah/fix-flaky-TestUpdateRestartPolicy + + Fix flaky TestUpdateRestartPolicy on Windows + +commit ae75435dae9cb386eb213774f97fe35cdcafff49 +Merge: 6eaf4434ee 53c5de2921 +Author: David Calavera +Date: Fri Mar 18 09:08:22 2016 -0700 + + Merge pull request #20200 from thockin/14282-hostname-domainname-v2 + + Don't smoosh hostname and domainname in API + +commit 6eaf4434eed297423133b79aa162a6b60165ad2d +Merge: 8ef56e1f98 48ccdd46ae +Author: Sebastiaan van Stijn +Date: Fri Mar 18 17:01:30 2016 +0100 + + Merge pull request #21238 from yongtang/21211-TestRestartStoppedContainer + + Fix flaky test of TestRestartStoppedContainer (#21211). + +commit 8ef56e1f98377a10ae970db6b83bf7f269b73f7c +Merge: d2a8621b20 52c0f36f7b +Author: David Calavera +Date: Fri Mar 18 08:53:21 2016 -0700 + + Merge pull request #21311 from nalind/journal-race + + Fix a couple of races in the journald log reader + +commit d5ef0dfa92eb5e966d1e234c3465f84c098fd707 +Merge: 3a63a0815d e3c1b5886a +Author: Daniel Nephin +Date: Fri Mar 18 11:25:41 2016 -0400 + + Merge pull request #3162 from albers/completion-workdir + + bash completion for `docker-compose run --workdir` + +commit 719a43ca3530c424c3875d8c066f7ab09195dfdc +Author: Frank Groeneveld +Date: Fri Mar 18 14:53:19 2016 +0100 + + Cli binary can now be build on OpenBSD + + Signed-off-by: Frank Groeneveld + +commit 01fc95fe31c60cd439b1c6e01f2671a9d3d9e1f2 +Author: Sun Hongliang +Date: Fri Mar 18 21:51:31 2016 +0800 + + classify whether constraint error or affinity error + + Signed-off-by: Sun Hongliang + +commit d2a8621b2002611a2c451540f69d0573ff5a055a +Merge: 9f00b4b79c ae466aafcb +Author: Sebastiaan van Stijn +Date: Fri Mar 18 14:29:55 2016 +0100 + + Merge pull request #21316 from estesp/daemon-dump-stack-note + + Add documentation on the stack trace dump capability of the daemon + +commit ae466aafcbd3e000ff9ec2e8bd354fc3cc3729e5 +Author: Phil Estes +Date: Fri Mar 18 02:19:07 2016 -0400 + + Add documentation on the dump-stack-traces capability of the daemon + + Add a paragraph about how to force a stack trace dump to the daemon log. + This feature was added in Docker 1.9 I believe, but documentation was + never added. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 9f00b4b79c2625a689233fa993dbab2e47778ffd +Merge: aa6d0f5310 f1d34ac2eb +Author: Vincent Demeester +Date: Fri Mar 18 14:06:59 2016 +0100 + + Merge pull request #21302 from allencloud/fix-typos-in-several-files + + fix typos in several files + +commit aa6d0f5310230166f31163d2704d890abf98b66f +Merge: 3d13fddd2b bd061b8df6 +Author: Sebastiaan van Stijn +Date: Fri Mar 18 12:44:42 2016 +0100 + + Merge pull request #21321 from dsheets/patch-1 + + project/ISSUE-TRIAGE.md: fix shinny -> shiny typo + +commit e3c1b5886aa8d28a3fa29d9c58b9868c0db2e831 +Author: Harald Albers +Date: Fri Mar 18 10:47:17 2016 +0100 + + bash completion for `docker-compose run --workdir` + + Signed-off-by: Harald Albers + +commit bd061b8df64b3015dc69b86a5c1de10ff37265cc +Author: David Sheets +Date: Fri Mar 18 09:42:49 2016 +0000 + + ISSUE-TRIAGE: fix shinny -> shiny typo + + Signed-off-by: David Sheets + +commit ea148448a2610f39a92121f388e3fcee6125321a +Author: Antonio Murdaca +Date: Fri Mar 18 09:12:27 2016 +0100 + + registry: client: auth: type errors + + Signed-off-by: Antonio Murdaca + +commit 3d13fddd2bc4d679f0eaa68b0be877e5a816ad53 +Merge: 46dde68158 edf0da968c +Author: Sebastiaan van Stijn +Date: Fri Mar 18 09:18:03 2016 +0100 + + Merge pull request #21318 from wenchma/fix-doc + + Update the document error + +commit edf0da968ca8d653a6e4c9333e55530305cb3625 +Author: Wen Cheng Ma +Date: Fri Mar 18 15:23:27 2016 +0800 + + Update the document error + + Signed-off-by: Wen Cheng Ma + +commit 48ccdd46aea4bb16925d0a333f792a712f1c11dc +Author: Yong Tang +Date: Wed Mar 16 03:10:49 2016 +0000 + + Fix flaky test of TestRestartStoppedContainer (#21211). + + This fix addressed the issue of test TestRestartStoppedContainer + in #21211. Inside the test, a `docker restart` command is + followed by a `docker logs` command. However, `docker restart` + returns immediately so there is no guarantee that `docker logs` + will wait until the restarted container completes the command + `echo foobar`. + + This fix use the check of `{{.State.Running}} = false` to make + sure that the restarted container has already finished, before + invoking the `docker logs` command. The timeout is set to 20s + to make sure it passes WindowsTP4 check. + + This fixes #21211. + + Signed-off-by: Yong Tang + +commit f1d34ac2eb3611cde8c4a438f367595eb08a6fe8 +Author: allencloud +Date: Fri Mar 18 01:15:32 2016 +0800 + + fix typos in several files + + Signed-off-by: allencloud + +commit a91f1818c46a3ac6253d66d83972220702532595 +Merge: 9de8f77d55 5aa339ed38 +Author: Xian Chaobo +Date: Fri Mar 18 08:55:24 2016 +0800 + + Merge pull request #1963 from allencloud/validate-duration-flag-positive + + validate duration flags: --delay, --timeout,--replication-ttl + +commit 46dde68158c851da0bdd8dc22342d35609a19a61 +Merge: 6dd69afd37 3c6aa163a3 +Author: Sebastiaan van Stijn +Date: Fri Mar 18 01:44:01 2016 +0100 + + Merge pull request #21305 from yongtang/031716-typo + + Fix several typos in the documentation. + +commit 316aa9080ead4b17342c1b507e19917268544f4c +Author: Joao Fernandes +Date: Mon Mar 7 16:26:59 2016 -0800 + + Fixes install docs with bad indentation + +commit 5b0a4847390d5b22b5ff7972518ad1f64f896871 +Author: John Starks +Date: Tue Mar 15 19:26:02 2016 -0700 + + Add os.version and os.features to platform spec + + These changes are needed to differentiate Windows images. + + Signed-off-by: John Starks + +commit 6dd69afd37fc0d2131387e78f8efd741c713d505 +Merge: 41c1c6501e b54058bafe +Author: Brian Goff +Date: Thu Mar 17 19:35:03 2016 -0400 + + Merge pull request #21307 from Microsoft/jstarks/fix_long_paths + + Windows: revendor Microsoft/hcsshim to v0.1.0 + +commit cdd7fddfec70cca2cc228519794281988ef2a15a +Author: Kenfe-Mickael Laventure +Date: Wed Mar 16 16:15:04 2016 -0700 + + Update TestPsShowMounts to also test bind mounts + + Signed-off-by: Kenfe-Mickael Laventure + +commit 8451a08ed52b976fffb0cf34be0a48dcc36bdcbe +Author: Kenfe-Mickael Laventure +Date: Wed Mar 16 14:10:16 2016 -0700 + + Update filter volume to allow filtering by bind mount source + + Signed-off-by: Kenfe-Mickael Laventure + +commit cb8cc56c225cfc74b81f22a0f2ca8ce7bdccfe04 +Author: Kenfe-Mickael Laventure +Date: Wed Mar 16 13:26:15 2016 -0700 + + Fix inspect to print bind mounts source path instead of an empty string + + Signed-off-by: Kenfe-Mickael Laventure + +commit 52c0f36f7b7aa794932fa41dfe50dc85f78e6146 +Author: Nalin Dahyabhai +Date: Thu Mar 17 16:19:54 2016 -0400 + + Fix a race in cleaning up after journald followers + + When following a journal-based log, it was possible for the worker + goroutine, which reads the journal using the journal context and sends + entry data down the message channel, to be scheduled after the function + which started it had returned. This could create problems, since the + invoking function was closing the journal context object and message + channel before it returned, which could trigger use-after-free segfaults + and write-to-closed-channel panics in the worker goroutine. + + Make the cleanup in the invoking function conditional so that it's only + done when we're not following the logs, and if we are, that it's left to + the worker goroutine to close them. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit 4d200cd6938c1416e34bf43576b0d528b73e8ba3 +Author: Nalin Dahyabhai +Date: Thu Mar 17 16:17:11 2016 -0400 + + Fix a race in maintaining the journald reader list + + The journald log reader keeps a map of following readers so that it can + close them properly when the journald reader object itself is closed, + but it was possible for its worker goroutine to be scheduled so that the + worker attempted to remove a reader from the map before the reader had + been added to the map. This patch adds the item to the map before + starting the goroutine which is expected to eventually remove it. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit b54058bafe07718a02e81a19b2dfc779dcdf11ba +Author: John Starks +Date: Thu Mar 17 21:08:07 2016 +0000 + + Windows: revendor Microsoft/hcsshim to v0.1.0 + + This (the first tagged hcsshim release) fixes long-path bugs on + Windows TP5 that affect commit and save. These bugs were blocking + commit of Windows containers that had node.js installed. + + Signed-off-by: John Starks + +commit 0e025b4bb16c0d4cc6b3f0c040713d061b9b051a +Author: Jessica Frazelle +Date: Wed Mar 16 19:43:26 2016 -0700 + + fix variables that werent being called + + Signed-off-by: Jessica Frazelle + +commit 41c1c6501e53698961cfdcab47eb5ab37ede667b +Merge: 0910946dc4 c18e7f3a04 +Author: Alexander Morozov +Date: Thu Mar 17 11:42:15 2016 -0700 + + Merge pull request #21266 from estesp/dockremap-system-user + + Change subordinate range-owning user to be a system user + +commit 3a63a0815d4c0e39fbd921cc6abf54ed1eee3ef4 +Merge: 72ed4d3f97 50fe014ba9 +Author: Daniel Nephin +Date: Thu Mar 17 14:40:22 2016 -0400 + + Merge pull request #3158 from aanand/windows-install-docs + + Windows install docs + +commit 3c6aa163a3fd04c344a2072ab379f0778734b269 +Author: Yong Tang +Date: Thu Mar 17 18:27:56 2016 +0000 + + Fix several typos in the documentation. + + This pull request fixes several typos in the documentation. + + Signed-off-by: Yong Tang + +commit 0910946dc446ffa1f6264ca70f7382f16f798ce5 +Merge: e6d3a9849c 441907e2cd +Author: David Calavera +Date: Thu Mar 17 11:18:08 2016 -0700 + + Merge pull request #21296 from icecrime/add_programmerq + + Add @programmerq to docker/docker curators + +commit e6d3a9849c96201681915944947a0e5452619929 +Merge: d3afe34b51 f7fa83c910 +Author: Tibor Vass +Date: Thu Mar 17 14:16:40 2016 -0400 + + Merge pull request #21003 from riyazdf/hardware-signing-ga + + Move hardware signing out of experimental + +commit 50fe014ba9f6af3dc75cb5f5548dcf0c9825cd05 +Author: Aanand Prasad +Date: Thu Mar 17 18:10:32 2016 +0000 + + Remove hardcoded host from Engine install URLs + + Signed-off-by: Aanand Prasad + +commit 10dfd54ebedd900525a7cde6ac52853821965d6b +Author: Aanand Prasad +Date: Thu Mar 17 18:09:38 2016 +0000 + + Update install page with link to Windows Toolbox install instructions + + Signed-off-by: Aanand Prasad + +commit 9de8f77d5594d437164098373aa4a3b614da2f34 +Merge: c147d3d6f0 129f38366e +Author: Victor Vieux +Date: Thu Mar 17 11:00:56 2016 -0700 + + Merge pull request #1986 from allencloud/move-experiemental-about-rescheduling-out-of-config + + move more details about rescheduling out of experimental + +commit 72ed4d3f97c4bd5d4ba5e7b7ac8d702204ec7eaf +Merge: 312d764c9c 92d69b0cb6 +Author: Aanand Prasad +Date: Thu Mar 17 17:56:34 2016 +0000 + + Merge pull request #3152 from aanand/update-mac-install-url + + Update Mac Engine install URL in error message + +commit c147d3d6f0090cc5b296b60e4b18a5415d99bbd2 +Merge: 73179d4dd8 4b04286f90 +Author: Nishant Totla +Date: Thu Mar 17 10:54:02 2016 -0700 + + Merge pull request #1988 from allencloud/fix-typos-in-watchdog + + fix typos in watchdog + +commit ec6ac0c05e450c93c08bacbd0484914a9634228b +Merge: 609aa7cc53 3a2231fe39 +Author: Richard Scothern +Date: Thu Mar 17 10:46:51 2016 -0700 + + Merge pull request #1531 from aaronlehmann/empty-errors-slice + + Don't return empty errcode.Errors slices + +commit d3afe34b51e7588984cc21a2f48da116645e52e3 +Merge: 3df99b7fd2 ae1002219b +Author: David Calavera +Date: Thu Mar 17 10:45:56 2016 -0700 + + Merge pull request #21292 from runcom/pkg-error-truncindex + + pkg: truncindex: provide more info in error + +commit 3df99b7fd2262e4f6ff486408a785de1947257fa +Merge: 2b9ceea896 4141a00921 +Author: David Calavera +Date: Thu Mar 17 10:39:15 2016 -0700 + + Merge pull request #21295 from rhvgoyal/fix-variable-assignment + + Fix the assignment to wrong variable + +commit cb9aeb0413ca75bb3af7fa723a1f2e6b2bdbcb0e +Author: David Calavera +Date: Tue Mar 15 18:34:29 2016 -0400 + + Consolidate security options to use `=` as separator. + + All other options we have use `=` as separator, labels, + log configurations, graph configurations and so on. + We should be consistent and use `=` for the security + options too. + + Signed-off-by: David Calavera + +commit 2b9ceea896ae0b0d1cf8c1a02b32a88861601b7e +Merge: b4da157846 24710fd3e2 +Author: Michael Crosby +Date: Thu Mar 17 10:32:21 2016 -0700 + + Merge pull request #21293 from cpuguy83/wtf_gcp + + Do not call out to Google on init + +commit b4da1578463f65b4703021b72ad17753fb29cdb4 +Merge: 9d62c11ab5 450fa7536e +Author: David Calavera +Date: Thu Mar 17 10:29:33 2016 -0700 + + Merge pull request #21286 from rhatdan/seccomp-man + + Fix documentation on --security-opt seccomp + +commit e536ed6738075511ff96a0d652b5c0b893b38df1 +Merge: e0f41d3014 6baf69e236 +Author: David Gageot +Date: Thu Mar 17 17:59:54 2016 +0100 + + Merge pull request #3200 from ppadala/patch-1 + + Specify the format for azure-image specification + +commit e0f41d30141c4c0b38e6381e1cd9556cf8ee115f +Merge: 5802eed1c7 c146111ede +Author: David Gageot +Date: Thu Mar 17 17:59:17 2016 +0100 + + Merge pull request #3204 from znz/fix-typo + + fix a typo (--create -> create) + +commit 9d62c11ab5e7982836eb94d31f2fd7703fb46c13 +Merge: 04c7d94c71 6d43dc99e5 +Author: Arnaud Porterie +Date: Thu Mar 17 09:50:02 2016 -0700 + + Merge pull request #21276 from nerdalert/mcvlan-v6-ci + + Remove v6 IT test for experimental macvlan driver + +commit ba0a39c51846050923d4687363e7c3075ebf3a0b +Author: Sun Hongliang +Date: Thu Mar 17 20:55:08 2016 +0800 + + handle error when getting kernel and os info error + + Signed-off-by: Sun Hongliang + +commit 73046cb8d8d04a952c0e2daf068af25cd72786f6 +Author: allencloud +Date: Fri Mar 18 00:31:50 2016 +0800 + + handle kernel version error in version api + + Signed-off-by: allencloud + +commit 127c4f26cfc112f2959338e372b0c4dae5f6ddec +Merge: f943677613 2fd125c489 +Author: David Lawrence +Date: Thu Mar 17 09:27:02 2016 -0700 + + Merge pull request #620 from endophage/rawmessage_pointer + + json.RawMessage needs to be a pointer + +commit f9436776138824e021c5146468db8d229c899c5c +Merge: 71f09691f0 e09bdd5630 +Author: David Lawrence +Date: Thu Mar 17 09:26:43 2016 -0700 + + Merge pull request #623 from docker/vestigial_signatures + + remove signatures that are no longer valid during signing + +commit 04c7d94c710bdb6c8378bdf896fd67455ba23199 +Merge: 8d742bbe2f 8dd88afb5b +Author: Alexander Morozov +Date: Thu Mar 17 09:16:02 2016 -0700 + + Merge pull request #21273 from jfrazelle/remove-dead-code + + remove dead code + +commit 441907e2cd9a3f975182e07c595950ed10fd1eb8 +Author: Arnaud Porterie +Date: Thu Mar 17 09:07:16 2016 -0700 + + Add @programmerq to docker/docker curators + + Signed-off-by: Arnaud Porterie + +commit 312d764c9ccc5b6958fcd76518de21cf1f54341e +Merge: b2b58402b3 20bf05a6e3 +Author: Joffrey F +Date: Thu Mar 17 08:51:33 2016 -0700 + + Merge pull request #3156 from graingert/fix-type-error-in-exc-handling + + Fix TypeError in Exception handling + +commit 8d742bbe2f240f48f3452780d5ed432e1a4a9624 +Merge: 553ffa7fd7 2d2d1bb2c6 +Author: Vincent Demeester +Date: Thu Mar 17 16:46:19 2016 +0100 + + Merge pull request #21294 from samoht/fix-typo + + Fix typo in the triaging guidelines + +commit b2b58402b3b8495f5161b88ecb39adf2be557f7a +Merge: 371ea479f5 7424938fc8 +Author: Daniel Nephin +Date: Thu Mar 17 11:44:42 2016 -0400 + + Merge pull request #3154 from aanand/move-ip-docs-to-reference + + Move ipv4_address/ipv6_address docs to reference section + +commit c146111edede5ff011ae1ae3066322d25d7afa1e +Author: Kazuhiro NISHIYAMA +Date: Fri Mar 18 00:18:56 2016 +0900 + + fix a typo (--create -> create) + + Signed-off-by: Kazuhiro NISHIYAMA + +commit 553ffa7fd77d3dd18a77e601dccf0892996474c5 +Merge: cf9d0c8ae2 ca64269165 +Author: David Calavera +Date: Thu Mar 17 08:20:26 2016 -0700 + + Merge pull request #21279 from WeiZhang555/typo + + Fix typo + +commit 4141a00921e3ae814736249ec1806d5d35c8d46c +Author: Vivek Goyal +Date: Thu Mar 17 15:19:08 2016 +0000 + + Fix the assignment to wrong variable + + We should be assigning value to minFreeMetadata instead of minFreeData. This + is copy/paste error. + + Signed-off-by: Vivek Goyal + +commit 20bf05a6e3b79370a680da844dc6c59e77cda293 +Author: Thomas Grainger +Date: Thu Mar 17 13:59:51 2016 +0000 + + Fix TypeError in Exception handling + + Traceback (most recent call last): + File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in + sys.exit(main()) + File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main + log_api_error(e) + File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error + if 'client is newer than server' in e.explanation: + TypeError: 'str' does not support the buffer interface + + Signed-off-by: Thomas Grainger + +commit 2d2d1bb2c6485a1f41ecbc3ab0d93cfd83f63150 +Author: Thomas Gazagnaire +Date: Thu Mar 17 15:07:52 2016 +0000 + + Fix a typo in the triaging guidelines + + Spotted by @dgageot + + Signed-off-by: Thomas Gazagnaire + +commit f906ca52eacf93bc98b97b0d9b7af1a606029661 +Author: Thomas Gazagnaire +Date: Thu Mar 17 15:07:12 2016 +0000 + + Remove trailing whitespaces + + Signed-off-by: Thomas Gazagnaire + +commit 24710fd3e228398dc02c72ab3f0efe70d70c313e +Author: Brian Goff +Date: Thu Mar 17 10:58:23 2016 -0400 + + Do not call out to Google on init + + The GCP logging driver is calling out to GCP cloud service on package + init. + This is regardless if you are using GCP logging or not. + + This change makes this happen on the first invocation of a new GCP + logging driver instance instead. + + Signed-off-by: Brian Goff + +commit ae1002219bc5d602c552ba952bc45e440cf3aae7 +Author: Antonio Murdaca +Date: Thu Mar 17 15:53:12 2016 +0100 + + pkg: truncindex: provide more info in error + + Signed-off-by: Antonio Murdaca + +commit 4b04286f909f1027f345d975005c3c277ef35c11 +Author: Sun Hongliang +Date: Thu Mar 17 22:20:26 2016 +0800 + + fix typos in watchdog + + Signed-off-by: Sun Hongliang + +commit 6d43dc99e5e67210ca502ec2eca12ae1ee9c2600 +Author: Brent Salisbury +Date: Thu Mar 17 00:44:12 2016 -0400 + + Remove v6 IT test for experimental macvlan driver + + -Temporary until we find the source of CI/v6 issue with driver + + Signed-off-by: Brent Salisbury + +commit cf9d0c8ae2dd12c10e4234f4857fdf559505ae41 +Merge: 8bbe3de4b3 1a9f5f4c69 +Author: Vincent Demeester +Date: Thu Mar 17 13:47:40 2016 +0100 + + Merge pull request #21257 from yongtang/21247-TestRunAttachFailedNoLeak + + Fix flaky test TestRunAttachFailedNoLeak in #21247. + +commit 129f38366ede43090fd61d721e5858b3cab0eee7 +Author: Sun Hongliang +Date: Thu Mar 17 20:13:46 2016 +0800 + + move more experimental out of rescheduling + + Signed-off-by: Sun Hongliang + +commit 450fa7536edc03fb5b071c0d04af534b2f8572ff +Author: Dan Walsh +Date: Thu Mar 17 08:03:50 2016 -0400 + + Fix documentation on --security-opt seccomp + + Missing documentation and man pages on seccomp options. + Signed-off-by: Dan Walsh + +commit 7424938fc8c78eb10f28c5dd0e2b5805f87a4e6e +Author: Aanand Prasad +Date: Thu Mar 17 11:32:36 2016 +0000 + + Move ipv4_address/ipv6_address docs to reference section + + Signed-off-by: Aanand Prasad + +commit 92d69b0cb6f2d192b02a85d79fd7d99baedadf79 +Author: Aanand Prasad +Date: Thu Mar 17 09:56:44 2016 +0000 + + Update Mac Engine install URL in error message + + Signed-off-by: Aanand Prasad + +commit 73179d4dd892393daf0bcf82fe95eec6bdc9d01b +Merge: 4cdc2556e3 b61dfa7497 +Author: Nishant Totla +Date: Thu Mar 17 02:07:11 2016 -0700 + + Merge pull request #1985 from dongluochen/RefreshContainerAtTransitState + + Force inspect for containers in Restarting state + +commit 032f94b637705c8d7ecbf8b5cc4e0767bafa8a3e +Author: Enrico Hoffmann +Date: Thu Mar 17 10:04:29 2016 +0100 + + #1550 enhancement remove duplicated entry in package.json + +commit 8bbe3de4b3cd951719120e47b4f97653c11566f7 +Merge: 9c20d920a6 96896f2d0b +Author: Antonio Murdaca +Date: Thu Mar 17 09:37:36 2016 +0100 + + Merge pull request #21262 from justincormack/newsyscalls + + Add new syscalls in libseccomp 2.3.0 to seccomp default profile + +commit ca64269165fb30765d7ea0b0b231674df8da157b +Author: Zhang Wei +Date: Thu Mar 17 16:13:51 2016 +0800 + + Fix typo + + Signed-off-by: Zhang Wei + +commit 3b6ffc8022c701f63fbdd603cae783ac1ed3c201 +Author: Andrew Guenther +Date: Sun Feb 21 15:08:58 2016 -0800 + + Ensure --hostname is valid + + Validates whether the given hostname is RFC 1123 + (https://tools.ietf.org/html/rfc1123) compliant. + + Fixes #20371 + + Signed-off-by: Andrew Guenther + +commit 9c20d920a6c0a6a3196a782ef31c6ab60b180410 +Merge: b1e9a5eaf1 46da04388f +Author: Arnaud Porterie +Date: Wed Mar 16 20:55:28 2016 -0700 + + Merge pull request #21275 from tonistiigi/fix-vendor-vagrantfile + + Remove vagrantfiles from vendor + +commit 46da04388f144579a638aeb09ec5c10c800120d0 +Author: Tonis Tiigi +Date: Wed Mar 16 20:30:47 2016 -0700 + + Remove vagrant files from vendor + + Signed-off-by: Tonis Tiigi + +commit 1a9f5f4c69451c580595d67844f41937b3293069 +Author: Yong Tang +Date: Wed Mar 16 15:21:29 2016 +0000 + + Fix flaky test TestRunAttachFailedNoLeak in #21247. + + The issue of the flaky test is because when the second container + starts, the first container in the detached mode may have only + been created and not yet entering the running state. So the + port 8000 might be used by the second container first. + + This fix added a check to make sure the first container is already + in running state, before the second container is invoked. + + This fix fixes #21247. + + Signed-off-by: Yong Tang + +commit 71f09691f0160f6acdeedde193f209c5bc6fd30e +Merge: d7857bbf57 7f367292eb +Author: Ying Li +Date: Wed Mar 16 20:10:11 2016 -0700 + + Merge pull request #632 from HuKeping/typo + + Docs: typo + +commit 7f367292ebcd113a5bce52889b2c21a76dadde37 +Author: HuKeping +Date: Thu Mar 17 09:50:45 2016 +0800 + + Docs: typo + + Signed-off-by: Hu Keping + +commit b1e9a5eaf1c8826b13fa502e5bce00a453ab4091 +Merge: 4227119588 f0d83c4cdb +Author: David Calavera +Date: Wed Mar 16 19:20:10 2016 -0700 + + Merge pull request #21258 from runcom/res.body.leaks + + *: fix response body leaks + +commit 8dd88afb5b5f8ce353c00bfc71edf8238f3a0452 +Author: Jessica Frazelle +Date: Wed Mar 16 19:15:14 2016 -0700 + + remove dead code + + Signed-off-by: Jessica Frazelle + +commit 93e02efa909896548496a5bd6621221aa541dc50 +Author: David Calavera +Date: Wed Mar 16 19:07:41 2016 -0400 + + Remove dockerfile dependency from the API. + + Move context parsing to the backend. + + Signed-off-by: David Calavera + +commit 4227119588297a0ac36a4f5fe4ac9457e04b6918 +Merge: f3acca2fc8 6223291965 +Author: Tõnis Tiigi +Date: Wed Mar 16 18:56:49 2016 -0700 + + Merge pull request #21261 from aboch/vnd + + Vendoring libnetwork v0.7.0-dev.8 + +commit b61dfa7497007ed12f303da6a58e40987f7d8305 +Author: Dong Chen +Date: Wed Mar 16 18:10:59 2016 -0700 + + Force inspect for containers in Restarting state. + + Signed-off-by: Dong Chen + +commit 4cdc2556e3725fca1ba5f8b94e4214f1f075f26d +Merge: fc1d6a2f1d 07143cea03 +Author: Victor Vieux +Date: Wed Mar 16 17:32:57 2016 -0700 + + Merge pull request #1984 from vieux/fix_doc_resch + + fix duplicate rescheduling.md + +commit 07143cea036ba3698d0e29926d54356be29cc1c1 +Author: Victor Vieux +Date: Wed Mar 16 17:27:32 2016 -0700 + + fix duplicate rescheduling.md + + Signed-off-by: Victor Vieux + +commit fc1d6a2f1d31d30973fd3cecbd88ddd6e14db67c +Merge: 0744188c9b b9ce995ebf +Author: Victor Vieux +Date: Wed Mar 16 17:26:55 2016 -0700 + + Merge pull request #1975 from moxiegirl/fix-reschedule-doc + + Updating the documentation + +commit 0744188c9b3058aef1a9da9b0de255b573278116 +Merge: 85f6d57f21 c35d95fac4 +Author: Victor Vieux +Date: Wed Mar 16 17:20:18 2016 -0700 + + Merge pull request #1981 from dongluochen/ContainerRestartEvent + + Docker restart event should trigger container inspect + +commit 85f6d57f21ea411808e63de24470d724d0a2f598 +Merge: 968aae4f9c b05dee4d6e +Author: Dongluo Chen +Date: Wed Mar 16 17:19:29 2016 -0700 + + Merge pull request #1972 from vieux/pass-host-config + + HostConfig for /start endpoint + +commit f3acca2fc8c84afd41b05c8bc9b3dba00036e6ac +Merge: 581fc536a6 3b74be8ab7 +Author: Sebastiaan van Stijn +Date: Wed Mar 16 23:48:59 2016 +0000 + + Merge pull request #20962 from lyndaoleary/docs-engine-edits + + Edited content in the Hello World section + +commit c35d95fac4afe18b92fda7001af45ed03e697b84 +Author: Dong Chen +Date: Wed Mar 16 16:27:35 2016 -0700 + + Docker restart would change container state. Should do a container inspect to update status. + + Signed-off-by: Dong Chen + +commit 6baf69e23616a0dd1fa6e4312d82b10fc92ee8b0 +Author: Pradeep Padala +Date: Wed Mar 16 16:01:43 2016 -0700 + + Specify the format for azure-image specification + + Signed-off-by: Pradeep Padala + +commit e09bdd5630722d5b92dfca1bf3610eec6c310ce3 +Author: David Lawrence +Date: Mon Mar 14 17:05:03 2016 -0700 + + remove signatures that are no longer valid during signing, either because the key is no longer a valid signing key for the role, or the signature is invalid. + Signed-off-by: David Lawrence (github: endophage) + + Signed-off-by: David Lawrence (github: endophage) + +commit 968aae4f9c3f0d7c8a1f70024fbd8f263ea3ccfa +Merge: c05c7905e9 26931816c4 +Author: Victor Vieux +Date: Wed Mar 16 15:59:44 2016 -0700 + + Merge pull request #1977 from dongluochen/RetryEventMonitor + + Swarm manager should retry EventMonitoring on failure + +commit 609aa7cc5317c8c2a97b735ed0435473afa2eeaf +Merge: 2c635d1f7e 75b5a1b1f6 +Author: Richard Scothern +Date: Wed Mar 16 15:58:22 2016 -0700 + + Merge pull request #1538 from runcom/body-leaks + + registry: client: repository: close response body + +commit d7857bbf5711761fdaf9ba1f213e3e4c69cec0db +Merge: dda52a3fa1 b65723fce3 +Author: David Lawrence +Date: Wed Mar 16 15:56:36 2016 -0700 + + Merge pull request #616 from docker/remove-role-fallback + + Remove delegation role fallback when applying targets changes + +commit 5802eed1c71d27bb980ec5ae9ab3c05e9785c0fc +Merge: 25672016fa ab559c542f +Author: Nathan LeClaire +Date: Wed Mar 16 15:54:33 2016 -0700 + + Merge pull request #3196 from troyfontaine/aws_docs_update + + Updated docs for AWS + +commit c05c7905e9229a61e458b2be621658125f7392fd +Merge: f2a034f84e a9869dcb0e +Author: Victor Vieux +Date: Wed Mar 16 15:50:43 2016 -0700 + + Merge pull request #1882 from dongluochen/SkipTestsWithDocker1.9Issue + + Docker issue #14203 affects nodemanagement tests in Docker 1.9. + +commit f2a034f84e32ecd20c3654b3778f72199cf773da +Merge: e0b5e6f5fa 56affa1ada +Author: Dongluo Chen +Date: Wed Mar 16 15:47:20 2016 -0700 + + Merge pull request #1979 from vieux/fix_image_matching_via_id + + fix image matching via id + +commit c18e7f3a0419e35aeab4eefa51f3c17fbd72381f +Author: Phil Estes +Date: Wed Mar 16 18:44:10 2016 -0400 + + Change subordinate range-owning user to be a system user + + Change user/group creation to use flags to adduser/useradd to enforce it + being a system user. Use system user defaults that auto-create a + matching group. These changes allow us to remove all group creation + code, and in doing so we also removed the code that finds available uid, + gid integers and use post-creation query to gather the system-generated + uid and gid. + + The only added complexity is that today distros don't auto-create + subordinate ID ranges for a new ID if it is a system ID, so we now need + to handle finding a free range and then calling the `usermod` tool to + add the ranges for that ID. Note that this requires the distro supports + the `-v` and `-w` flags on `usermod` for subordinate ID range additions. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 26931816c42425c4408a113a19a88db7439470e7 +Author: Dong Chen +Date: Tue Mar 15 16:48:33 2016 -0700 + + Manager should retry EventMonitoring on failure. + + Signed-off-by: Dong Chen + +commit 56affa1ada4d5dd9ae5ee945c4b1d2361af9665e +Author: Victor Vieux +Date: Wed Mar 16 15:12:56 2016 -0700 + + fix image matching via id + + Signed-off-by: Victor Vieux + +commit b65723fce32970756315a1bcf448e8673c54a232 +Author: Riyaz Faizullabhoy +Date: Wed Mar 9 16:43:05 2016 -0800 + + Remove mentions of fallback + + Signed-off-by: Riyaz Faizullabhoy + +commit 83f7c758caadbc10703aeeb00cd2a1a5be9d038f +Author: Riyaz Faizullabhoy +Date: Wed Mar 9 12:01:48 2016 -0800 + + Remove delegation role fallback when applying targets changes + + Signed-off-by: Riyaz Faizullabhoy + +commit dda52a3fa1017fa8e5d9f6bd26954747ae8dec83 +Merge: 66a39cb30c e5b2246004 +Author: Riyaz Faizullabhoy +Date: Wed Mar 16 15:08:30 2016 -0700 + + Merge pull request #631 from docker/add-defaults-to-cache + + Add defaults to cache-control config parsing + +commit e5b22460040e985796aa35c79493c3c3ed01dcd4 +Author: Ying Li +Date: Wed Mar 16 11:04:17 2016 -0700 + + Update docs with regards to the server configuration + + Signed-off-by: Ying Li + +commit f1d78f8d6efca975c621fb42118bbffb2401eac0 +Author: Ying Li +Date: Wed Mar 16 10:58:06 2016 -0700 + + Add defaults for cache headers, and add tests to ensure that default configs can successfully be parsed + + Signed-off-by: Ying Li + +commit 96896f2d0bc16269778dd4f60a4920b49953ffed +Author: Justin Cormack +Date: Wed Mar 16 21:17:32 2016 +0000 + + Add new syscalls in libseccomp 2.3.0 to seccomp default profile + + This adds the following new syscalls that are supported in libseccomp 2.3.0, + including calls added up to kernel 4.5-rc4: + mlock2 - same as mlock but with a flag + copy_file_range - copy file contents, like splice but with reflink support. + + The following are not added, and mentioned in docs: + userfaultfd - userspace page fault handling, mainly designed for process migration + + The following are not added, only apply to less common architectures: + switch_endian + membarrier + breakpoint + set_tls + I plan to review the other architectures, some of which can now have seccomp + enabled in the build as they are now supported. + + Signed-off-by: Justin Cormack + +commit 581fc536a678c52132b0a6d5ba067ff00051bd66 +Merge: f2b1b44de8 8567286ed6 +Author: Alexander Morozov +Date: Wed Mar 16 14:10:59 2016 -0700 + + Merge pull request #21219 from vdemeester/update-engine-api + + Update engine api to use net/context.Context all accross the client API + +commit 371ea479f5995a31145ee1f597aae8c08110aa25 +Merge: abddabfb0a bf96edfe11 +Author: Aanand Prasad +Date: Wed Mar 16 21:03:25 2016 +0000 + + Merge pull request #3075 from dnephin/reactive_logs + + Display logs for new containers started after the command is run + +commit 62232919650438a6ae2b18714b4fe223d34277f5 +Author: Alessandro Boch +Date: Wed Mar 16 13:25:44 2016 -0700 + + Vendoring libnetwork v0.7.0-dev.8 + + Signed-off-by: Alessandro Boch + +commit f2b1b44de81ec9c7fd404fb3e0b4eefd83939a94 +Merge: f81754811f 1b5c2e1d72 +Author: David Calavera +Date: Wed Mar 16 13:44:18 2016 -0700 + + Merge pull request #21212 from runcom/wip-token-service-tests + + distribution: errors: do not access the errors slice if it's empty + +commit abddabfb0accc137cd55c51c012038ed099ea087 +Merge: dd40331b44 e5529a89e1 +Author: Aanand Prasad +Date: Wed Mar 16 20:26:18 2016 +0000 + + Merge pull request #3135 from dnephin/fix_down_idempotency + + Make down idempotent, continue to remove resources if one is missing + +commit 8567286ed65c8aca180b4590acf7d9ef61e15955 +Author: Vincent Demeester +Date: Wed Mar 16 20:19:22 2016 +0100 + + Update api/client file to use context + + Signed-off-by: Vincent Demeester + +commit 48339017dbb7a09827445d8c1a9db9ae6ecb8a4a +Author: Vincent Demeester +Date: Wed Mar 16 20:19:13 2016 +0100 + + Vendor engine-api to fba5dc8 + + It plumbs net/context.Context through entire API, see docker/engine-api#140 + + Signed-off-by: Vincent Demeester + +commit 02476b23a796bfc2c51413a62cfc6329d5fa88cb +Author: Vincent Demeester +Date: Wed Mar 16 20:25:04 2016 +0100 + + Clean Vagrantfile from vendoring + + Signed-off-by: Vincent Demeester + +commit 75b5a1b1f6f38dcaf7a50421ea93442f223ae320 +Author: Antonio Murdaca +Date: Wed Mar 16 19:46:40 2016 +0100 + + registry: client: repository: close response body + + Signed-off-by: Antonio Murdaca + +commit 66a39cb30cbd62a05f2f23c2a586ca6d62f12a4e +Merge: 75883b3d4c 4898d252ee +Author: Ying Li +Date: Wed Mar 16 11:14:38 2016 -0700 + + Merge pull request #625 from mtrmac/dont-ignore-errors + + Don't silently ignore swizzler errors + +commit dd40331b44af2f292b7578e607bcb428e35adb51 +Merge: 1696506ff4 20c29f7e47 +Author: Joffrey F +Date: Wed Mar 16 10:58:15 2016 -0700 + + Merge pull request #3102 from shin-/1477-a-modest-proposal + + Add flag to up/down to remove orphaned containers + +commit f81754811fda48524133cc57ba8dac7aaf31274c +Merge: 45b2a57d1c 825b582207 +Author: David Calavera +Date: Wed Mar 16 10:42:25 2016 -0700 + + Merge pull request #21112 from allencloud/validate-configs-from-file + + add validating configs from configuration file + +commit f6fd2a3bd93349ad5cba74d3012e53aafbbb091c +Merge: 7b711beb67 c09fcb8c44 +Author: Nathan LeClaire +Date: Wed Mar 16 10:37:43 2016 -0700 + + Merge pull request #183 from nickho/proxy-for-toolbox + + Add proxy variables to docker-machine command if they exists + +commit 4898d252ee16d7a49635efe656fa69397e90d770 +Author: Miloslav Trmač +Date: Tue Mar 15 15:36:02 2016 +0100 + + Don't silently ignore swizzler errors + + These calls can fail, and errors would cause false failures later in the + tests. + + Signed-off-by: Miloslav Trmač + +commit 75883b3d4c59c0694eda65d70a148d5b40cabcb6 +Merge: d5671984cf 9cc5a7d9ea +Author: Riyaz Faizullabhoy +Date: Wed Mar 16 09:54:45 2016 -0700 + + Merge pull request #630 from HuKeping/replace + + Package replace + +commit f7fa83c9101a015e03af86746f4c9de90d4146e3 +Author: Riyaz Faizullabhoy +Date: Tue Mar 15 16:25:44 2016 -0700 + + Improve messaging and binary generation for pkcs11 + + Signed-off-by: Riyaz Faizullabhoy + +commit f0d83c4cdb49adb53fdaf4216a4395c23d5cc8e9 +Author: Antonio Murdaca +Date: Wed Mar 16 16:38:13 2016 +0100 + + *: fix response body leaks + + Signed-off-by: Antonio Murdaca + +commit 45b2a57d1c36d6f0140c0dea8769d58d04a9fc67 +Merge: eff27d2b77 e91ca0e239 +Author: Phil Estes +Date: Wed Mar 16 08:49:17 2016 -0700 + + Merge pull request #21242 from cyphar/fix-userns-permissions + + daemon: use 0711 for /var/lib/docker + +commit eff27d2b77a2cd42122b53db9a6906f419cfc7ed +Merge: 3221c7a3c6 29fbc9cc1d +Author: David Calavera +Date: Wed Mar 16 08:24:31 2016 -0700 + + Merge pull request #21217 from LK4D4/cleanup_gitignore + + gitignore: cleanup some not needed entries + +commit 3221c7a3c6367c3223c0e1b82b3de7adbbca8651 +Merge: 72e39d58b7 59573fb3c6 +Author: David Calavera +Date: Wed Mar 16 08:23:39 2016 -0700 + + Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write + + Windows: fix various npipe bugs + +commit 72e39d58b7226a82aae0e26fc041d430d6623ce2 +Merge: 5f8a0ceeda 854ceaaa9e +Author: David Calavera +Date: Wed Mar 16 08:22:29 2016 -0700 + + Merge pull request #21256 from albers/completion-gelf-compression + + bash completion for gelf-compression log driver settings + +commit 854ceaaa9ee5aa4c9f0b824ed3a0536decf29ef1 +Author: Harald Albers +Date: Wed Mar 16 15:58:58 2016 +0100 + + bash completion for gelf-compression log driver settings + + Signed-off-by: Harald Albers + +commit 5f8a0ceeda003df141ab462a8ad20dad4f5b5fe4 +Merge: bd97e4f95a 137c8601a8 +Author: Vincent Demeester +Date: Wed Mar 16 14:35:14 2016 +0100 + + Merge pull request #21250 from runcom/comment-fix + + registry: endpoint_v1: fix outdated comment + +commit bd97e4f95a72b26b59bf42c74f6b221bebbd685c +Merge: 2b1b235acf 8a90e8a19b +Author: Vincent Demeester +Date: Wed Mar 16 14:30:04 2016 +0100 + + Merge pull request #21203 from HackToday/fixfilter + + Add check about filter name for containers + +commit 1696506ff4fc09fa3d61d081347417d9386f2453 +Merge: 94b1862579 52b791a264 +Author: Aanand Prasad +Date: Wed Mar 16 12:45:00 2016 +0000 + + Merge pull request #3136 from dnephin/add_workdir_to_run + + Add workdir to run + +commit 137c8601a8c744d464855755ce756f07e83aa0b7 +Author: Antonio Murdaca +Date: Wed Mar 16 12:53:07 2016 +0100 + + registry: endpoint_v1: fix outdated comment + + Signed-off-by: Antonio Murdaca + +commit c09fcb8c44d59c2388af4fe143795e42a6ed2347 +Author: Nicolas Radde +Date: Mon Sep 14 16:22:12 2015 +0200 + + Add proxy variables to docker-machine command if they exists + + Signed-off-by: Nicolas Radde + +commit e91ca0e239f1e6c71a5a6c789ec8177806773355 +Author: Aleksa Sarai +Date: Wed Mar 16 19:24:03 2016 +1100 + + daemon: use 0711 for /var/lib/docker + + This fixes problems encountered when running with a remapped root (the + syscalls related to the metadata directory will fail under user + namespaces). Using 0711 rather than 0701 (which solved the problem + previously) fixes the issue. + + Signed-off-by: Aleksa Sarai + +commit 9cc5a7d9eae832706f4353d383170a14ba2077ab +Author: HuKeping +Date: Wed Mar 16 16:21:35 2016 +0800 + + Package replace + + Replace the use of the "assert" package with the "require" package. + + Signed-off-by: Hu Keping + +commit 1b5c2e1d722757a55364fb45cf3fcec7f2c75fb4 +Author: Antonio Murdaca +Date: Mon Mar 14 21:11:35 2016 +0100 + + distribution: errors: do not access the errors slice if it's empty + + - cherry-pick from 1.10.3 branch: 0186f4d4223a094a050d06f456355da3ae431468 + - add token service test suite + - add integration test (missing in 1.10.3 branch) + + Signed-off-by: Antonio Murdaca + +commit 2b1b235acf9aa029218e1bd5cd97a369c500e4f5 +Merge: aa76ddd353 7cf894ce10 +Author: Phil Estes +Date: Tue Mar 15 23:03:42 2016 -0700 + + Merge pull request #21222 from aaronlehmann/pull-with-no-layers + + Fix pulling images that contain no layers at all + +commit e8eb144e24bdf0ef0613b58abc617737fa8e55d4 +Author: Troy Fontaine +Date: Tue Mar 15 23:24:46 2016 -0500 + + Added node discovery warning + + Signed-off-by: Troy Fontaine + +commit ca4c38ccae4ced0bafe567a1cb5ecbe2a895882e +Merge: a7c6a4dd1e 3ca0c24fd7 +Author: French Ben +Date: Tue Mar 15 21:17:06 2016 -0700 + + Merge pull request #1546 from saltybeagle/patch-1 + + Grammar fix, s/seem/seems/ + +commit aa76ddd35307a007b14e955f7d7d787cb13bc0ea +Merge: 133b3cccb5 2f4aa96584 +Author: Alexander Morozov +Date: Tue Mar 15 20:59:56 2016 -0700 + + Merge pull request #21233 from aaronlehmann/testtransfer-flakiness + + Fix flaky test TestTransfer + +commit 8a90e8a19b8108ecdff325fc19dbdf945aa15fad +Author: Kai Qiang Wu(Kennan) +Date: Tue Mar 15 03:54:12 2016 +0000 + + Add check about filter name for containers + + Fixes: #21202 + We add valid check about filters like network, images, + volumes did. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit a7c6a4dd1e8b8ca12341a81dda4c4550bc56db7a +Merge: cd3ea2c619 570cd6a187 +Author: French Ben +Date: Tue Mar 15 20:49:47 2016 -0700 + + Merge pull request #1544 from Bigguy34/master + + fix for displaying no description on repo containers that had short descriptions + +commit ab559c542f2a3a4534b14b4c16300344412a93a3 +Author: Troy Fontaine +Date: Tue Mar 15 22:44:20 2016 -0500 + + Added suggested modifications + + Signed-off-by: Troy Fontaine + +commit 5aa339ed387a3c603dba68560889be8efa369b2b +Author: Sun Hongliang +Date: Sun Mar 13 19:08:39 2016 +0800 + + validate duration flags:--delay, --timeout,--replication-ttl + + Signed-off-by: Sun Hongliang + +commit d5671984cf496b87777c264e7a1352b204807db7 +Merge: 33eeb49c25 44cccbb4db +Author: Riyaz Faizullabhoy +Date: Tue Mar 15 18:50:37 2016 -0700 + + Merge pull request #571 from docker/cli-server-rotate + + Change the CLI to be able to rotate server managed keys + +commit 44cccbb4db44c6d8e6fdda09cc007e2da4a20526 +Author: Ying Li +Date: Fri Mar 11 18:14:23 2016 -0800 + + Make all key rotations publish immediately, not just remote key rotations + + Signed-off-by: Ying Li + +commit 59573fb3c6e8e55278c973b9c799db6ed9c0f9c7 +Author: John Starks +Date: Tue Mar 15 15:11:02 2016 -0700 + + Windows: add support for CloseWrite() to npipe transport + + This relies on changes to go-winio to support CloseWrite() when the pipe + is in message mode. This fixes an issue where stdin is not properly closed + when there is no more input to docker run. + + Signed-off-by: John Starks + +commit 87c2aad6f11c4993222dd29fb8c7c520b19ac8d9 +Author: John Starks +Date: Wed Mar 16 01:23:36 2016 +0000 + + Windows: revendor go-winio with npipe fixes + + This revendor provides support for CloseWrite() in the npipe transport, + fixes a performance regression introduced in Go 1.6, and improves + npipe performance by allowing the pipe buffer size to be specified. + + Signed-off-by: John Starks + +commit baaa703249568bbbcbc59726d6c70533892e87b3 +Author: Ying Li +Date: Mon Mar 7 15:46:00 2016 -0800 + + Update advanced usage documentation + + Signed-off-by: Ying Li + +commit fa5edc40af7efdc0de23fd56605f0ef00c4a1bed +Author: Ying Li +Date: Tue Mar 1 18:00:38 2016 -0500 + + Publish only the key rotation changes after a remote key rotation + + Signed-off-by: Ying Li + +commit 4e5e2f386ac5a8cfa805a4a93095e6582be1d55c +Author: Ying Li +Date: Wed Feb 17 13:21:39 2016 -0800 + + Clean up yubikeys between each cmd/notary/keys_test.go test + + Signed-off-by: Ying Li + +commit b6c484023137fb756fc0f46111aa0940dbf01ead +Author: Ying Li +Date: Wed Feb 17 11:53:46 2016 -0800 + + Update comments, and publish in the CLI after remote key rotation + + Signed-off-by: Ying Li + +commit e3716f0be91e7166bc5e349a1defee4c3d114082 +Author: Ying Li +Date: Mon Feb 15 14:13:34 2016 -0800 + + Change the CLI for rotate key to require a role type + + Signed-off-by: Ying Li + +commit 07b9f504e49c7e98f9ddbcf98ead6759b6fb7a5c +Author: Ying Li +Date: Fri Feb 12 18:11:00 2016 -0800 + + Update the CLI and client to no longer reject remote timestamp rotations. + + Signed-off-by: Ying Li + +commit 33eeb49c25c92ae2d39a32f7cd120786bd6c571a +Merge: c74fab9401 4022e97b08 +Author: David Lawrence +Date: Tue Mar 15 17:44:22 2016 -0700 + + Merge pull request #626 from docker/use-requires + + Use 'require' instead of 'assert' in client and TUF client tests + +commit 133b3cccb50dadf2b8b10519e3c8d8b924a91b76 +Merge: 354f9a8fd1 e84a303543 +Author: Phil Estes +Date: Tue Mar 15 17:00:55 2016 -0700 + + Merge pull request #21108 from tianon/detect-daemon-osarch + + Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection" + +commit 354f9a8fd11f36c2c9a779a366e7779678e25a2f +Merge: 08603dad63 32eff909b4 +Author: Sebastiaan van Stijn +Date: Wed Mar 16 00:42:38 2016 +0100 + + Merge pull request #20947 from thaJeztah/fix-pull-examples + + Fix Docker pull examples + +commit 08603dad63c068759eb7cd6a01e5331d1212ef9d +Merge: cc12d2bfaa b5725434c6 +Author: David Calavera +Date: Tue Mar 15 16:37:47 2016 -0700 + + Merge pull request #21221 from tiborvass/changelog-1.10.3 + + Changelog from 1.10.3 to master + +commit 32eff909b4d3072524041fffc9d43efe87d2116f +Author: Sebastiaan van Stijn +Date: Fri Mar 4 15:58:07 2016 +0100 + + Update Docker pull examples + + The old examples no longer worked due to changes in + the client and Docker Hub. + + This updates the "docker pull" documentation and + adds more examples and explanation of the features. + + Signed-off-by: Sebastiaan van Stijn + +commit 2f4aa9658408ac72a598363c6e22eadf93dbb8a7 +Author: Aaron Lehmann +Date: Tue Mar 15 16:26:16 2016 -0700 + + Fix flaky test TestTransfer + + This test was checking that it received every progress update that was + produced. But delivery of these intermediate progress updates is not + guaranteed. A new update can overwrite the previous one if the previous + one hasn't been sent to the channel yet. + + The call to t.Fatalf exited the current goroutine which was consuming + the channel, which caused a deadlock and eventual test timeout rather + than a proper failure message. + + Failure seen here: + https://jenkins.dockerproject.org/job/Docker-PRs-experimental/16400/console + + Signed-off-by: Aaron Lehmann + +commit 20c29f7e47ade7567ee35f3587790f6235d17d59 +Author: Joffrey F +Date: Wed Mar 9 17:35:56 2016 -0800 + + Add flag to up/down to remove orphaned containers + Add --remove-orphans to CLI reference docs + Add --remove-orphans to bash completion file + Test orphan warning and remove_orphan option in up + + Signed-off-by: Joffrey F + +commit 036d2d99a2335975ddac57cae2186f66d5b94acd +Author: Troy Fontaine +Date: Tue Mar 15 18:10:04 2016 -0500 + + Updated docs for AWS + + Signed-off-by: Troy Fontaine + +commit cc12d2bfaae135e63b1f962ad80e6943dd995337 +Merge: db182507c1 dc56a76bc9 +Author: Antonio Murdaca +Date: Tue Mar 15 22:54:55 2016 +0100 + + Merge pull request #21022 from hqhq/hq_fix_race_resize + + Fix race condition with exec and resize + +commit db182507c1153b0ed3b0d30d4f41ab4ad8050882 +Merge: 4adf74ad42 b0fb0f1993 +Author: David Calavera +Date: Tue Mar 15 14:42:57 2016 -0700 + + Merge pull request #21128 from allencloud/handle-kernel-and-os-error-in-info-api + + handle kernel and os info error in /info api + +commit 4adf74ad4290a6cf72426cabc3b0d8f3753615e6 +Merge: 6852d87659 5abd881883 +Author: Antonio Murdaca +Date: Tue Mar 15 22:41:14 2016 +0100 + + Merge pull request #21117 from justincormack/restart_syscall + + Allow restart_syscall in default seccomp profile + +commit 6852d876593322a7b87caf5846e488984e77e7c0 +Merge: bb23b20ee7 a9c6169138 +Author: Antonio Murdaca +Date: Tue Mar 15 22:40:37 2016 +0100 + + Merge pull request #21193 from amitkris/flush_fix + + Remove flush(stdout) in pkg/chrootarchive/diff_unix.go + +commit bb23b20ee7e963614c913dab25f67fedfd029a24 +Merge: a2039f117c 53ba08c874 +Author: David Calavera +Date: Tue Mar 15 14:39:45 2016 -0700 + + Merge pull request #21110 from hypriot/fix-arm-kernel-modules + + Improve checking dummy kernel module + +commit a2039f117cd6f1969312894edcfd2652cf7f3995 +Merge: 0f59b0b12c bb05c18892 +Author: David Calavera +Date: Tue Mar 15 14:37:19 2016 -0700 + + Merge pull request #21218 from runcom/len-check-fix + + daemon: update: check len inside public function + +commit 0f59b0b12c37b5a3b4ad1c8a0cb91c93ff4228a9 +Merge: 6c2f4381d3 bd94baa353 +Author: Antonio Murdaca +Date: Tue Mar 15 22:35:46 2016 +0100 + + Merge pull request #19831 from cloudflare/optimize-gelf + + GELF logger: Add gelf-compression-type and gelf-compression-level + +commit b9ce995ebf706d9c37530e2766efcc778373f763 +Author: Mary Anthony +Date: Tue Mar 15 14:06:01 2016 -0700 + + Updating the documentation + + Signed-off-by: Mary Anthony + +commit 4022e97b08e515d3d49005e763a4cc2eb812552d +Author: Ying Li +Date: Tue Mar 15 13:52:48 2016 -0700 + + Use 'require' instead of 'assert' in client and TUF client tests + + Signed-off-by: Ying Li + +commit 6c2f4381d30780f27f7a6abe9fc344cbbf68e179 +Merge: 6f2d8b411e 027f4fdca6 +Author: Jess Frazelle +Date: Tue Mar 15 13:37:20 2016 -0700 + + Merge pull request #21226 from calavera/fix_experimental_deb_builds + + Move debian rules to the right place before creating the package. + +commit e0b5e6f5fa1adb6e0864c70bb1d7e7059adc4d14 +Merge: e90d93d6e7 51a63c13c8 +Author: Dongluo Chen +Date: Tue Mar 15 13:36:44 2016 -0700 + + Merge pull request #1933 from allencloud/compatile-api-response-status-code + + fix two swarm apis' response status code + +commit e90d93d6e7beeae587fa9cf4d4cd5283aa906ace +Merge: c142e12e79 e7ce927e9d +Author: Victor Vieux +Date: Tue Mar 15 13:28:37 2016 -0700 + + Merge pull request #1957 from mqliang/get-warm-typo + + fix typo in get-swarm.md + +commit c142e12e7932059fe53051ce92bf9f8d306f51c2 +Merge: 81b6fded58 97efac9d0c +Author: Victor Vieux +Date: Tue Mar 15 13:28:09 2016 -0700 + + Merge pull request #1958 from mqliang/provision-typo + + fix typo in provision-with-machine.md + +commit 027f4fdca678ae955db6f115d6af15d532f6cf4b +Author: David Calavera +Date: Tue Mar 15 16:15:34 2016 -0400 + + Move debian rules to the right place before creating the package. + + debhelper has changed the way it performs path validations and + building the deb package fails when it tries to compress the files. + + Signed-off-by: David Calavera + +commit 52b791a2647af6e7ace5b2b1ea480fbec16dc08d +Author: Daniel Nephin +Date: Fri Feb 26 14:24:02 2016 -0800 + + Split off build_container_options() to reduce the complexity of run + + Signed-off-by: Daniel Nephin + +commit 658803edf885f490168e223d07b2b1a2cbd22aae +Author: Simon van der Veldt +Date: Mon Feb 22 21:05:59 2016 +0100 + + Add -w or --workdir to compose run to override workdir from commandline + + Signed-off-by: Simon van der Veldt + +commit bf96edfe11789d4ce13b869be578cc274794cdfc +Author: Daniel Nephin +Date: Mon Mar 7 15:58:25 2016 -0500 + + Reduce the args of some functions by including presenters as part of the thread_args. + + Signed-off-by: Daniel Nephin + +commit 81b6fded5844db4b2f4d3c5fd84d85730856ceb0 +Merge: b771a7cb14 082f4b65af +Author: Nishant Totla +Date: Tue Mar 15 12:00:42 2016 -0700 + + Merge pull request #1971 from vieux/rescheduling_out + + move rescheduling out of experimental + +commit 25672016fafa6824b0b386e5d83ca7ffa0e5440e +Merge: 3e1aaca74e b898c07ad6 +Author: Nathan LeClaire +Date: Tue Mar 15 11:40:11 2016 -0700 + + Merge pull request #3194 from ahmetalpbalkan/azure-static-ip + + azure: Add --azure-static-public-ip flag + +commit 3e1aaca74e55e94e590d687d36ce99d3267008b4 +Merge: 282fdebeaf 9914e4027e +Author: Nathan LeClaire +Date: Tue Mar 15 11:39:52 2016 -0700 + + Merge pull request #3195 from BSWANG/master + + Add docker daemon systemd requirement on redhat + +commit 282fdebeaf4bfeecad1cf24589552a07f3b5724e +Merge: ef4823f2ac f0ac1c00ea +Author: Nathan LeClaire +Date: Tue Mar 15 11:39:10 2016 -0700 + + Merge pull request #3124 from StefanScherer/set-nictype1 + + Add flag --virtualbox-nictype to set NIC type of eth0 + +commit b771a7cb14af51c7d0475a8a1e3b58fd485456ed +Merge: 66b78ef043 408f3cff8e +Author: Victor Vieux +Date: Tue Mar 15 11:19:37 2016 -0700 + + Merge pull request #1973 from dongluochen/MaxThreadCount + + Increase max thread count to 50k + +commit 7cf894ce1013e5843d5c151f24520b51d34515d0 +Author: Aaron Lehmann +Date: Tue Mar 15 11:10:03 2016 -0700 + + Fix pulling images that contain no layers at all + + The download manager assumed there was at least one layer involved in + all images. This can be false if the image is essentially a copy of + `scratch`. + + Fix a nil pointer dereference that happened in this case. Add + integration tests that involve schema1 and schema2 manifests. + + Fixes #21213 + + Signed-off-by: Aaron Lehmann + +commit b5725434c6b01f5e25841d0d5165fd5b68187dca +Author: Tibor Vass +Date: Wed Mar 9 13:38:57 2016 -0500 + + Update CHANGELOG with reverts + + Signed-off-by: Tibor Vass + (cherry picked from commit 320d17b2a2b42a71089b7109797dc4c0f6a06fa8) + +commit 1f4e87f6384cf8a7c956cdb3f4bb37b0bf4a7095 +Author: Antonio Murdaca +Date: Tue Mar 8 15:56:16 2016 +0100 + + distribution: registry: do not access the errors slice if it's empty + + Signed-off-by: Antonio Murdaca + (cherry picked from commit 0186f4d4223a094a050d06f456355da3ae431468) + +commit 1c64becab64b1c665887cf45fbdb6fb4dce8c77c +Author: Tibor Vass +Date: Mon Mar 7 17:52:17 2016 -0500 + + Update CHANGELOG for 1.10.3 + + Signed-off-by: Tibor Vass + (cherry picked from commit f33460253887ec05b804cfa9f1daee8d1fd229e1) + +commit a9c61691389ed373ada399d25f55a9d10405b4ea +Author: Amit Krishnan +Date: Mon Mar 14 13:22:05 2016 -0700 + + Remove flush(stdout) in pkg/chrootarchive/diff_unix.go and improve error reporting of flush() to fix #21103 + pkg/chrootarchive/diff_unix.go erroneously calls flush on stdout, which tries to read from stdout returning an error. + This has been fixed by removing the call and by modifying flush to return errors and checking for these errors on calls to flush. + + Signed-off-by: Amit Krishnan + +commit 6f2d8b411eaaa6b4ea2a46e5164325450259573b +Merge: 69f297bfee 06d95003b3 +Author: David Calavera +Date: Tue Mar 15 10:26:30 2016 -0700 + + Merge pull request #21162 from estesp/copyastar-dir-create + + Fix CopyWithTar creation of new destination dir as remapped root + +commit e5529a89e19fb2325c73c479e23962dbe9e5ef36 +Author: Daniel Nephin +Date: Tue Mar 15 12:43:37 2016 -0400 + + Make down idempotent, continue to remove resources if one is missing. + + Signed-off-by: Daniel Nephin + +commit e8a93821d43753f19f0511ae8903fe05dac534d5 +Author: Daniel Nephin +Date: Mon Mar 7 15:34:53 2016 -0500 + + Fix race condition where a container stopping and starting again would cause logs to miss logs. + + Signed-off-by: Daniel Nephin + +commit 8d9adc0902bf7c4b056007d7e6fb6188f2193fdf +Author: Daniel Nephin +Date: Mon Mar 7 15:08:31 2016 -0500 + + Fix flaky log test by using container status, instead of boolean state. + + Signed-off-by: Daniel Nephin + +commit 3f7e5bf76895413048ed5af88279899261394b32 +Author: Daniel Nephin +Date: Mon Mar 7 15:04:42 2016 -0500 + + Filter logs by service names. + + Signed-off-by: Daniel Nephin + +commit 48ed68eeaa371ee31b8aac7186681d86eb84015e +Author: Daniel Nephin +Date: Mon Mar 7 14:56:14 2016 -0500 + + Fix geneartors for python3. + + Signed-off-by: Daniel Nephin + +commit 4312c93eae2594aafacb695be50480ac6b0341d5 +Author: Daniel Nephin +Date: Thu Mar 3 18:57:07 2016 -0500 + + Add an acceptance test to show logs behaves properly for stopped containers. + + Signed-off-by: Daniel Nephin + +commit 4cad2a0c5f973c51675e26b67cb84bb1fa03b0f8 +Author: Daniel Nephin +Date: Thu Mar 3 18:53:47 2016 -0500 + + Handle events for removed containers. + + Signed-off-by: Daniel Nephin + +commit 44c1747127d320fe35b407aad775cb1a41fd77a4 +Author: Daniel Nephin +Date: Wed Mar 2 17:04:52 2016 -0500 + + Add tests for reactive log printing. + + Signed-off-by: Daniel Nephin + +commit 65797558f8740fb2bab5333395e903264a4f1042 +Author: Daniel Nephin +Date: Tue Mar 1 17:44:25 2016 -0500 + + Refactor log printing to support containers that are started later. + + Signed-off-by: Daniel Nephin + +commit 2c635d1f7eaff4d7ce4f83e659f07fa97a6aec71 +Merge: a5d372535e 772e6f4057 +Author: Richard Scothern +Date: Tue Mar 15 10:08:36 2016 -0700 + + Merge pull request #1532 from RichardScothern/azure-error-types + + Update missing blob error checking with latest Azure API + +commit bb05c188927cdc7a5f86dceace3a4043b0dfeb28 +Author: Antonio Murdaca +Date: Tue Mar 15 17:12:20 2016 +0100 + + daemon: update: check len inside public function + + Signed-off-by: Antonio Murdaca + +commit 69f297bfeef33145c4c23b5e555f39aa443cd60f +Merge: 21e531014d 2bcf50bdd4 +Author: Phil Estes +Date: Tue Mar 15 09:17:45 2016 -0700 + + Merge pull request #21191 from tophj-ibm/ppc64le-update-dockerfile + + ppc64le: update dockerfile hashes and notary + +commit 825b58220705ed2870d89233a6f75c680b691476 +Author: allencloud +Date: Fri Mar 11 16:50:49 2016 +0800 + + add validating configs from configuration file + + Signed-off-by: allencloud + +commit 3a2231fe392c7a1212eee3bb89c9cb9a255057bc +Author: Aaron Lehmann +Date: Tue Mar 15 09:03:56 2016 -0700 + + Include status code in UnexpectedHTTPResponseError + + Signed-off-by: Aaron Lehmann + +commit 53c5de29217f9633117cb01ada180d1133d76737 +Author: Tim Hockin +Date: Sat Feb 13 15:44:05 2016 -0800 + + Don't smoosh hostname and domainname in API + + This allows users to provide a FQDN as hostname or to use distinct hostname and + domainname parts. Depends on https://github.com/docker/libnetwork/pull/950 + + Signed-off-by: Tim Hockin + +commit 21e531014db65422e1a3000fd3596459f55870c4 +Merge: daabb45d0a 3f445e63b4 +Author: Phil Estes +Date: Tue Mar 15 08:17:25 2016 -0700 + + Merge pull request #20177 from jheiss/12076-net_hostname + + Allow --hostname with --net=host + +commit 29fbc9cc1d67759974ec4cb746840ae160d842bc +Author: Alexander Morozov +Date: Tue Mar 15 07:33:05 2016 -0700 + + gitignore: cleanup some not needed entries + + Signed-off-by: Alexander Morozov + +commit b0fb0f19934287f428d14d1267183fe9194a4fdf +Author: allencloud +Date: Fri Mar 11 23:08:25 2016 +0800 + + handle kernel and os info error in /info api + + Signed-off-by: allencloud + +commit 94b1862579049585c48a9f4039f275c02ebeb234 +Merge: e5cd869c61 34de1f0a4c +Author: Aanand Prasad +Date: Tue Mar 15 11:51:44 2016 +0000 + + Merge pull request #2679 from IlyaSkriblovsky/dependency-ordered-start-stop + + Parallel up/start/stop + +commit daabb45d0ac6c332ef0b54c30f70dfa2b459d362 +Merge: 43b5e1ed40 0c7c9df804 +Author: Sebastiaan van Stijn +Date: Tue Mar 15 12:42:47 2016 +0100 + + Merge pull request #21196 from LK4D4/detect_leaks_util + + integration-cli: move goroutines info helpers to separate funcs + +commit bd94baa353498df2457b3d5aa192cc488b9fa0c6 +Author: Daniel Dao +Date: Thu Jan 21 12:44:25 2016 +0000 + + add gelf option to customize compression type and level + + this allows user to choose the compression type (i.e. gzip/zlib/none) using + --log-opt=gelf-compression-type=none or the compression level (-1..9) using + --log-opt=gelf-compression-level=0 for gelf driver. + + Signed-off-by: Daniel Dao + +commit 43b5e1ed40ded2d59f8505df254d2f95fbdf8132 +Merge: 68ca76320f 2f634e4691 +Author: Vincent Demeester +Date: Tue Mar 15 11:18:27 2016 +0100 + + Merge pull request #21205 from geekylucas/21195-update-docs-debian-image-size + + Update docs: A more accurate size for debian image + +commit 68ca76320fe1ca56d6b9dfed6ca84741f957a495 +Merge: f9fe796eab 59648fc1e9 +Author: Sebastiaan van Stijn +Date: Tue Mar 15 11:13:10 2016 +0100 + + Merge pull request #21190 from runcom/cleanup + + *: remove unused stuff + +commit f9fe796eabd015cbf861df2550a8bffd861a5b25 +Merge: 37a1fadae6 b1619766c0 +Author: Vincent Demeester +Date: Tue Mar 15 10:59:52 2016 +0100 + + Merge pull request #21209 from HackToday/fixdocps + + Add the missed volume filter + +commit 66b78ef043fd4a2f75aa080db7f8d5b93c11c774 +Merge: e24cc12814 b9d0d8927f +Author: Xian Chaobo +Date: Tue Mar 15 17:33:13 2016 +0800 + + Merge pull request #1962 from allencloud/validate-refresh-time-interval-posotive + + force to validate min and max refresh interval to be positive + +commit b1619766c0131a02774c7ec2b158c2fdf7206d05 +Author: Kai Qiang Wu(Kennan) +Date: Tue Mar 15 09:26:41 2016 +0000 + + Add the missed volume filter + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 9914e4027e33c6767bd35254a7504c37fc93eb60 +Author: bingshen.wbs +Date: Tue Mar 15 16:19:54 2016 +0800 + + add systemd requirement + + Signed-off-by: bingshen.wbs + +commit 2f634e4691d13616cf8c714ec7653616ec3b121a +Author: Lucas Chan +Date: Tue Mar 15 18:09:58 2016 +1100 + + Update docs: A more accurate size for debian image + + Fixes: #21195 + + The current size of the debian image is 125.1 MB so I have updated the Markdown to say "under 150". Also removed "extremely" (minimal) as requested. Documentation built and tested using `make docs`. + + Signed-off-by: Lucas Chan + +commit b898c07ad6a01d7134a09ba4baaa715a57e3cec6 +Author: Ahmet Alp Balkan +Date: Mon Mar 14 21:47:51 2016 -0700 + + azure: Add --azure-static-public-ip flag + + This flag creates Azure VMs with static public IPs that don’t + get released when the VM is deallocated. + + Signed-off-by: Ahmet Alp Balkan + +commit b05dee4d6e855fa0c5c8d085d472f41985998667 +Author: Victor Vieux +Date: Mon Mar 14 17:59:33 2016 -0700 + + HostConfig for /start endpoint + + Signed-off-by: Victor Vieux + +commit 408f3cff8eaf63349607fae48872fbd7f4b54826 +Author: Dong Chen +Date: Mon Mar 14 18:35:02 2016 -0700 + + Increase max thread count to 50k + + Signed-off-by: Dong Chen + +commit ef4823f2ac9df6f08b5aa5e7cb04360d42295e94 +Merge: 6d41f4ae46 9fd035ecba +Author: Nathan LeClaire +Date: Mon Mar 14 18:28:51 2016 -0700 + + Merge pull request #3159 from ahmetalpbalkan/azure-arm + + New Microsoft Azure docker-machine driver + +commit e24cc12814172e8b23608af19642fcb4aba569cb +Merge: 2ce00c6ce9 5075e95612 +Author: Dongluo Chen +Date: Mon Mar 14 18:24:15 2016 -0700 + + Merge pull request #1796 from nishanttotla/list-conflicting-constraints + + Print all constraints when container can't be scheduled + +commit 37a1fadae6390e38da85d3fffe7a49e00de2830e +Merge: bfed97b688 de64171510 +Author: Brian Goff +Date: Mon Mar 14 21:18:01 2016 -0400 + + Merge pull request #21097 from thaJeztah/dont-run-without-udev-sync + + Fail when devicemapper doesn't support udev-sync + +commit c74fab940195de953fd58d0993a4f673cdeb1e4a +Merge: 751f6b5a26 e25746dac3 +Author: David Lawrence +Date: Mon Mar 14 17:56:59 2016 -0700 + + Merge pull request #601 from docker/cache-headers + + Return cache control headers when returning metadata from server + +commit 751f6b5a26a19cfa0d004ac798651de9ade1af15 +Merge: cd0b43a6b8 b5b3d7c7c8 +Author: David Lawrence +Date: Mon Mar 14 17:39:54 2016 -0700 + + Merge pull request #622 from docker/snapshot-docs + + Include note about docker1.11 default snapshot key behavior + +commit 9fd035ecba468e3befb2dac92fabb6b04cede152 +Author: Ahmet Alp Balkan +Date: Mon Mar 14 17:34:50 2016 -0700 + + azure.md: Address docs comments + + Signed-off-by: Ahmet Alp Balkan + +commit e25746dac3b68a2e341f4d5011b7a7496442a127 +Author: Ying Li +Date: Fri Mar 11 16:23:19 2016 -0800 + + Use a CacheControlHandler that wraps other handlers instead + + Signed-off-by: Ying Li + +commit 082f4b65af31a67e5646f9bed1cdd9cf36a38bd8 +Author: Victor Vieux +Date: Mon Mar 14 17:18:36 2016 -0700 + + move rescheduling out of experimental + + Signed-off-by: Victor Vieux + +commit 84f5ed28d2f1eaeb8488c3c02e199a099311fbab +Author: Ying Li +Date: Tue Mar 1 18:17:04 2016 -0500 + + Move the configuration parsing for notary-server to its own file + + Signed-off-by: Ying Li + +commit e1397f4b035e344a1b06a16a6392193c3f413bb9 +Author: Ying Li +Date: Fri Feb 26 17:23:30 2016 -0800 + + Use updated-at for last modification date for getting current metadata + + Signed-off-by: Ying Li + +commit 329b47d2531179322623490e8ed51d103deb00a0 +Author: Ying Li +Date: Fri Feb 26 17:11:19 2016 -0800 + + Parse for cache control options in the server config file + + Signed-off-by: Ying Li + +commit 9b022a9cdaf60bc248edf44318089efc0157dcaf +Author: Ying Li +Date: Fri Feb 26 16:45:12 2016 -0800 + + Modify server handler to set cache headers based upon a cache configuration object + + Signed-off-by: Ying Li + +commit 802673fc9dbbce3c938773c43ffd51130ea838e3 +Author: Ying Li +Date: Fri Feb 26 10:51:55 2016 -0800 + + Add cache control headers to Getting metadata + + Signed-off-by: Ying Li + +commit 8768c12901f9688752b9b5732652151660fb2c4b +Author: Ying Li +Date: Thu Feb 25 16:55:19 2016 -0800 + + Return the creation date for GetChecksum and GetCurrent from the server database store. + + Signed-off-by: Ying Li + +commit 5075e95612d41b0a467b4e23899180919ba8e7f1 +Author: Nishant Totla +Date: Wed Feb 10 18:22:34 2016 -0800 + + Printing entire set of unsatisfiable constraints for container scheduling + + Signed-off-by: Nishant Totla + +commit ac3a8b6ac9208bed348b33ca47c6629a7dd0866e +Author: Nishant Totla +Date: Wed Feb 10 15:53:53 2016 -0800 + + Adding functions to list filter constraints of all types + + Signed-off-by: Nishant Totla + +commit bfed97b6881393be51e81b97040f3874b61b8d72 +Merge: f500951598 2e222f69b3 +Author: Vincent Batts +Date: Mon Mar 14 20:10:43 2016 -0400 + + Merge pull request #20786 from rhvgoyal/min-free-space + + devmapper: Add a new option dm.min_free_space_percent + +commit f5009515989f6e16d3e9955a7905d1fe64e73642 +Merge: d8539347bf 1a40dd535f +Author: Brian Goff +Date: Mon Mar 14 20:09:15 2016 -0400 + + Merge pull request #20121 from solganik/master + + syslog format + +commit 570cd6a1876cb8deae6dd9c043b539cc1bbd0409 +Author: Thomas Florin +Date: Mon Mar 14 19:06:54 2016 -0500 + + Updated Jest config to work on windows + + Signed-off-by: Thomas Florin + +commit a5d372535e75fcea48e5c7ae44f400d39da265cb +Merge: 1dbe50bac4 8bd613aa11 +Author: Richard Scothern +Date: Mon Mar 14 16:28:24 2016 -0700 + + Merge pull request #1502 from RichardScothern/auth-url-endpoints + + URL parse auth endpoints to normalize hostname to lowercase. + +commit 772e6f4057f1fc47214442dd1c41da082bacbc0c +Author: Richard Scothern +Date: Mon Mar 14 11:18:27 2016 -0700 + + Update missing blob error checking with latest Azure API + + Signed-off-by: Richard Scothern + +commit 0c7c9df8048353f3ff84d88d4311196546ba56cf +Author: Alexander Morozov +Date: Mon Mar 14 15:52:50 2016 -0700 + + integration-cli: move goroutines info helpers to separate funcs + + Signed-off-by: Alexander Morozov + +commit 6d41f4ae469747ef3f977a02bc926a507d3c7444 +Merge: ae3244d172 93fe1d199f +Author: Nathan LeClaire +Date: Mon Mar 14 15:25:12 2016 -0700 + + Merge pull request #3172 from xinxian0458/issue-3145 + + fixed issue-3145, enable engine-install-url in CentOS. + +commit cd0b43a6b82d053bc209ea5e21cf34ec7b8f31e5 +Merge: ca90842799 06ba32ea47 +Author: David Lawrence +Date: Mon Mar 14 15:18:46 2016 -0700 + + Merge pull request #617 from docker/no-keys-canonical-id + + Message canonical key ids on error + +commit 7b711beb6767c113d57db9ed736affa1f9871ffb +Author: Nathan LeClaire +Date: Mon Mar 14 15:14:36 2016 -0700 + + Fix Circle timeout due to no output + + Signed-off-by: Nathan LeClaire + +commit 0b40091629cfadb215efaa5613e2baf2788d3daa +Author: Joao Fernandes +Date: Tue Mar 1 17:28:10 2016 -0800 + + Fixes wrong instruction on upgrade docs + + Fixed an instruction that was pulling the + dockerhubenterprise/trusted-registry-dev image instead of + docker/trusted-registry. + + Fixed minor indentation issues, and broken links. + + Signed-off-by: Joao Fernandes + +commit d8539347bfb9c019a29b56ea36f1538900bc543b +Merge: 01f165169b 6993e891d1 +Author: David Calavera +Date: Mon Mar 14 15:11:55 2016 -0700 + + Merge pull request #20111 from twistlock/19995_skip_user_ns + + Run privileged containers when userns are specified - feature proposal + +commit 00938bd954bfbd83390525f8ee8e4778c53882cc +Author: Nathan LeClaire +Date: Mon Mar 14 14:57:39 2016 -0700 + + Fix deploy script exit code check + + Signed-off-by: Nathan LeClaire + +commit f0ac1c00eab8261a07dec27372847daebe3176a7 +Author: Stefan Scherer +Date: Sat Feb 27 15:30:31 2016 +0100 + + Add flag --virtualbox-nictype to set nictype1 + + Signed-off-by: Stefan Scherer + +commit 1ac22866fc433dd6f574b5b0b22480560685815e +Author: Nathan LeClaire +Date: Mon Mar 14 14:41:56 2016 -0700 + + Revise Circle config again slightly to automatically pass tests + + Signed-off-by: Nathan LeClaire + +commit 3ca0c24fd74fd48cfc08343dd2382a126ce2ea63 +Author: Brett Bieber +Date: Mon Mar 14 16:24:09 2016 -0500 + + Grammar fix, s/seem/seems/ + + The subject of the sentence `an error` is singular, therefore `seems` should be used instead of `seem`. + +commit 01f165169b6913320defdc9ce3995614e4c286d1 +Merge: fa8417d9ef 7369ddd89f +Author: Brian Goff +Date: Mon Mar 14 16:39:01 2016 -0400 + + Merge pull request #21151 from mountkin/optimize-test + + optimize slow tests + +commit 2ce00c6ce9a37e45cf4186c6e59dfe0dd2d3e784 +Merge: 42b1620f4d 172048942d +Author: Nishant Totla +Date: Mon Mar 14 13:37:04 2016 -0700 + + Merge pull request #1967 from allencloud/fix-typo-it's-to-its + + fix typos + +commit fa8417d9efbb765904c018f484f0f0985a6955d8 +Merge: 90ce409e35 e31217fbc4 +Author: Sebastiaan van Stijn +Date: Mon Mar 14 21:34:48 2016 +0100 + + Merge pull request #21192 from ohadschn/master + + Fix Remote API doc double slash typo in cURL command + +commit 90ce409e3581b455ab8ac6532684ef3e9475772a +Merge: c5aedcdac9 f8d14bd4c6 +Author: Vincent Demeester +Date: Mon Mar 14 21:08:49 2016 +0100 + + Merge pull request #20949 from imjching/master + + Fix typo for download and upload retry messages + +commit 34de1f0a4ca5ea8ba404b4ca34a0a488d2fccb9c +Author: Ilya Skriblovsky +Date: Mon Mar 14 22:56:58 2016 +0300 + + Removed unused parallel.parallel_stop + + Signed-off-by: Ilya Skriblovsky + +commit 5df774bd10b68f801368548609ab36ff9eb4885f +Author: Ilya Skriblovsky +Date: Fri Mar 11 12:59:24 2016 +0300 + + Fixed testing error handling by `up` + + Signed-off-by: Ilya Skriblovsky + +commit f933381a1253f5195406f80be746812a5bfa45a7 +Author: Ilya Skriblovsky +Date: Thu Mar 10 23:32:15 2016 +0300 + + Dependency-ordered start/stop/up + + Signed-off-by: Ilya Skriblovsky + +commit e31217fbc46e2dc99fa281332f9465562b26f073 +Author: Ohad Schneider +Date: Mon Mar 14 21:07:44 2016 +0200 + + Fix Remote API doc typo in cURL command + + Either a single slash or localhost should be specified after http in the cURL URL, not http:// (double slash) + + Signed-off-by: ohadschn + +commit c5aedcdac9c30e764c22d1be1dd2c08c52c74fcc +Merge: 7ae1990526 d17bb23ae6 +Author: David Calavera +Date: Mon Mar 14 11:50:50 2016 -0700 + + Merge pull request #21149 from yongtang/21124-TestJSONFormatProgress + + Fix flaky test TestJSONFormatProgress (#21124) + +commit b5b3d7c7c85390d99ed248f3dc763870a846854a +Author: Riyaz Faizullabhoy +Date: Mon Mar 14 11:44:23 2016 -0700 + + Include note about docker1.11 default snapshot key behavior + + Signed-off-by: Riyaz Faizullabhoy + +commit 2bcf50bdd41174b2519cab66b1fef0eb8bc78f9b +Author: Christopher Jones +Date: Mon Mar 14 14:21:44 2016 -0400 + + ppc64le: update dockerfile hashes and notary + + Now that we are using gc/go 1.6, update a few hashes as well + as actually building the notary binary + + Signed-off-by: Christopher Jones + +commit 59648fc1e9d99cae7f4c5f692fe25a73d0651a71 +Author: Antonio Murdaca +Date: Mon Mar 14 18:41:30 2016 +0100 + + *: remove unused stuff + + Signed-off-by: Antonio Murdaca + +commit cd6482ecb8c420a1179541a1e28c2db4d6dda744 +Author: Aaron Lehmann +Date: Mon Mar 14 10:06:30 2016 -0700 + + Don't return empty errcode.Errors slices + + If this slice ends up empty after parsing the HTTP response body, it + means the body is not well-formed. We've probably encountered an error + message produced by something that uses a different JSON schema, or + an error that just happens to validate as JSON. + + An empty errcode.Errors slice is not a very useful thing to return, + since its Error() output is just ``. Detect this case, and instend + return an UnexpectedHTTPResponseError. + + Signed-off-by: Aaron Lehmann + +commit 53ba08c87426ef7417bfae53d0d87fd54290e9c4 +Author: Stefan Scherer +Date: Fri Mar 11 07:55:07 2016 +0100 + + Improve checking dummy kernel module + + Signed-off-by: Stefan Scherer + +commit 7ae199052678c08cceec069a6014edfc4034c0f8 +Merge: df20b5cfd3 94336cb5dd +Author: moxiegirl +Date: Mon Mar 14 10:24:12 2016 -0700 + + Merge pull request #21158 from thaJeztah/add-alias-for-removed-docs + + Add redirects for old Docker Cloud tutorial + +commit df20b5cfd337bb3093fd87e278501fbca4480d54 +Merge: 8e74cf59d0 16e4c4e481 +Author: David Calavera +Date: Mon Mar 14 10:17:38 2016 -0700 + + Merge pull request #21002 from tonistiigi/fix-id-noprefix + + Fix docker run for 64 byte hex ID + +commit 8e74cf59d06ce0052193ec8216db5dca7eec4981 +Merge: 3d42393e7f 7bb815e296 +Author: David Calavera +Date: Mon Mar 14 10:16:45 2016 -0700 + + Merge pull request #21048 from LK4D4/fix_attach_leak + + daemon: fix hanging attaches on initial start failures + +commit 3d42393e7f4434a03002cf6649af79e5405cae07 +Merge: 0b962f72a9 8ff884548f +Author: Brian Goff +Date: Mon Mar 14 13:04:16 2016 -0400 + + Merge pull request #21161 from Microsoft/jjh/TestLogsPerformanceProblem + + Windows: Improve TestLogsContainers performance + +commit f8d14bd4c6a0e3c58130be159b05b8aa63374f6e +Author: Jay +Date: Fri Mar 4 23:15:44 2016 +0800 + + Fix typo for download and upload retry messages + + Signed-off-by: Jay + +commit 0b962f72a97c5e1cde020cc948704e61ab8dfc0a +Merge: 3771a1713b 6d23c3c57a +Author: Aaron Lehmann +Date: Mon Mar 14 09:47:13 2016 -0700 + + Merge pull request #21159 from runcom/fix-retry-push-bug + + distribution: errors: do not retry if no credentials provided + +commit 3771a1713bac935721ffe2ed7c828a47dbe4924e +Merge: d95723f5ef e207645307 +Author: David Calavera +Date: Mon Mar 14 09:46:49 2016 -0700 + + Merge pull request #21131 from estesp/gcc-devmapper-test-broken + + Fix gcc compile test with proper flag ordering + +commit d95723f5efbda12c854491250b06931b47145228 +Merge: b9361f02da 68bda672dc +Author: David Calavera +Date: Mon Mar 14 09:45:29 2016 -0700 + + Merge pull request #21123 from justincormack/libseccomp23 + + Update statically linked libseccomp to 2.3.0 + +commit e84a303543e19157372dbf31853e29a9c1257491 +Author: Tianon Gravi +Date: Mon Mar 14 09:30:45 2016 -0700 + + Add explicit code to handle older versions of Docker, too + + Signed-off-by: Andrew "Tianon" Page + +commit b9d0d8927f4146a9a80f7ace7e29ede8cfc38aaf +Author: Sun Hongliang +Date: Sun Mar 13 18:33:04 2016 +0800 + + force to validate min and max refresh interval to be positive + + Signed-off-by: Sun Hongliang + +commit e639851f454f836ac1d419ff182e2595337dc0cf +Author: Thomas Florin +Date: Mon Mar 14 11:25:49 2016 -0500 + + fix for displaying no description on repo containers that had short descriptions + + Signed-off-by: Thomas Florin + +commit e5cd869c6119f75a0c33e5ed90d121ee9aa72a84 +Merge: 9853b876af 0a091055d2 +Author: Aanand Prasad +Date: Mon Mar 14 16:18:29 2016 +0000 + + Merge pull request #3095 from dnephin/refactor_command_dispatch + + Refactor command dispatch and fix api version mismatch error + +commit 9853b876af18ecee67c8aec8159ade776310baf8 +Merge: 99d68be815 1485a56c75 +Author: Aanand Prasad +Date: Mon Mar 14 16:12:46 2016 +0000 + + Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docs + + Better Compose in production docs + +commit d17bb23ae6efba6e76e7a56b856705400e26a61b +Author: Yong Tang +Date: Sat Mar 12 05:50:02 2016 +0000 + + Fix flaky test TestJSONFormatProgress (#21124) + + In TestJSONFormatProgress, the progress string was used for comparison. + However, the progress string (progress.String()) uses time.Now().UTC() + to generate the timeLeftBox which is not a fixed value and cannot be + compared reliably. + + This PR fixes the issue by stripping the timeLeftBox field before doing + the comparison. + + This PR fixes #21124. + + Signed-off-by: Yong Tang + +commit 6993e891d10c760d22e0ea3d455f13858cd0de46 +Author: Liron Levin +Date: Mon Feb 8 16:23:24 2016 +0200 + + Run privileged containers when userns are specified + + Following #19995 and #17409 this PR enables skipping userns re-mapping + when creating a container (or when executing a command). Thus, enabling + privileged containers running side by side with userns remapped + containers. + + The feature is enabled by specifying ```--userns:host```, which will not + remapped the user if userns are applied. If this flag is not specified, + the existing behavior (which blocks specific privileged operation) + remains. + + Signed-off-by: Liron Levin + +commit b9361f02da25108af75238093959634e433d72a0 +Merge: f480c69625 76cd0f6811 +Author: Vincent Demeester +Date: Mon Mar 14 15:49:44 2016 +0100 + + Merge pull request #20970 from dmcgowan/login-oauth + + OAuth support for registries + +commit f480c696251906d86c800b5cf3660c48335e361c +Merge: 93e04e705a 62fef18d69 +Author: Sebastiaan van Stijn +Date: Mon Mar 14 15:06:40 2016 +0100 + + Merge pull request #20990 from sds/fix-data-volume-rest-api-docs + + Fix documentation for creating containers with data volumes + +commit 93e04e705a3cdd639b90aef18ca98eb5db9518d3 +Merge: 30999ba50c 2a02914892 +Author: Brian Goff +Date: Mon Mar 14 10:00:57 2016 -0400 + + Merge pull request #21134 from tophj-ibm/fix-logtest-on-empty-log + + Fix error-checking when looking at empty log + +commit 30999ba50c8b1258de8cc6b5f05452114a87590e +Merge: 901c67a8ee db700a678d +Author: Sebastiaan van Stijn +Date: Mon Mar 14 13:34:06 2016 +0100 + + Merge pull request #21138 from tophj-ibm/add-notary-binary-test-requirement + + Add notary binary requirement for tests + +commit f43683d60dc6d33c7e5569b24b46d2608a11d865 +Author: Sebastiaan van Stijn +Date: Mon Mar 14 12:49:24 2016 +0100 + + Fix flaky TestUpdateRestartPolicy on Windows + + Add another 30 seconds, because it still fails sometimes :'( + + Signed-off-by: Sebastiaan van Stijn + +commit 6d23c3c57a733436d902b7883f2f0b00846df9e2 +Author: Antonio Murdaca +Date: Sat Mar 12 20:34:07 2016 +0100 + + integration-cli: add tests for case a) and d) in #21054 + + - add test for pull from private registry with no credentials + - add test for push to docker hub with no credentials + + Signed-off-by: Antonio Murdaca + Signed-off-by: Antonio Murdaca + Signed-off-by: Antonio Murdaca + +commit 901c67a8eeabc64e53539b5f3d5aac9c9196a037 +Merge: d4a4cb99e3 2ef00ba89f +Author: Vincent Demeester +Date: Mon Mar 14 11:36:04 2016 +0100 + + Merge pull request #21160 from mavenugo/staleep + + Include all endpoints in network inspect object + +commit d4a4cb99e3a447d7711140ff377a3ece0e6bc1a2 +Merge: f3485bc125 f6bd62a8d7 +Author: Lei Jitang +Date: Mon Mar 14 16:09:20 2016 +0800 + + Merge pull request #21177 from HackToday/fixtypo + + Fix the typo url and info + +commit f6bd62a8d735d4748dc4e5e4235e04284a7f5af6 +Author: Kai Qiang Wu(Kennan) +Date: Mon Mar 14 06:16:43 2016 +0000 + + Fix the typo url and info + + Some info is not consistent between context and word. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 93fe1d199ffef8aa83e694ba133c0526311ea525 +Author: Jie Zhang +Date: Mon Mar 14 14:24:44 2016 +0800 + + fixed issue-3145, enable engine-install-url in CentOS. + + Signed-off-by: Jie Zhang + +commit 42b1620f4d34a88f785991fcb082caff46e47fde +Merge: a80ca0e51a 295c4da8d0 +Author: Nishant Totla +Date: Sun Mar 13 22:10:46 2016 -0700 + + Merge pull request #1966 from arunwizz/issue-1965 + + Fixed typo for word consul + +commit 172048942d7362949516f7b1db00f2f830014d8a +Author: Sun Hongliang +Date: Mon Mar 14 02:46:43 2016 +0800 + + fix typos. + + Signed-off-by: Sun Hongliang + +commit f3485bc125afbb0930674e9f5a4f02cdd9989aea +Merge: 2d74f78ab5 d2aa521822 +Author: Sebastiaan van Stijn +Date: Mon Mar 14 01:38:26 2016 +0100 + + Merge pull request #21120 from lirantal/feature/21119-docker-config-for-windows + + closes #21119 updating documentation for Windows and OSx users + +commit 2ef00ba89fc04b0a7571aa050d8a11c06f758d9b +Author: Madhu Venugopal +Date: Sat Mar 12 13:29:25 2016 -0800 + + Include all endpoints in network inspect object + + Prior to this change, the "docker network inspect" contains only the + endpoints that have active local container. This excludes all the remote + and stale endpoints. By including all the endpoints, it makes debugging + much simpler and also allows the user to cleanup any stale endpoints + using "docker network disconnect -f {network} {endpoint-name}". + + Signed-off-by: Madhu Venugopal + +commit a80ca0e51acb3aa2456ccc42cac61341df771941 +Merge: 9a1133f7c7 c1f5e17371 +Author: Nishant Totla +Date: Sun Mar 13 12:02:41 2016 -0700 + + Merge pull request #1952 from mqliang/filter-typo + + Filter typo in document + +commit 9a1133f7c7d68e506a0c965e302d568d8ac562bc +Merge: 4b2f0fe637 aa70529d3f +Author: Nishant Totla +Date: Sun Mar 13 12:01:55 2016 -0700 + + Merge pull request #1959 from mqliang/intstall-w-typo + + fix typo in install-w-machine.md + +commit 2d74f78ab59c4e24c5f328f3d85671359b8ed828 +Merge: a04e16ac35 9cb6b51fa2 +Author: Alexander Morozov +Date: Sun Mar 13 11:32:58 2016 -0700 + + Merge pull request #21122 from mavenugo/mviv + + Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers + +commit ae3244d17275de25e1693a9954c457be1c4d2a31 +Merge: 67485c60a8 1ff3d36665 +Author: David Gageot +Date: Sun Mar 13 18:33:39 2016 +0100 + + Merge pull request #3186 from dweomer/readme-fix-outbound-404-to-unoffocial-master-binaries + + address #2718 by removing the section with bad link + +commit 51a63c13c827669efb53dd8d65f02d575540cd07 +Author: Sun Hongliang +Date: Wed Mar 9 01:01:55 2016 +0800 + + fix three swarm api response status code + + Signed-off-by: Sun Hongliang + +commit d2aa521822135009168fe5a13d372fbc6969dc91 +Author: Liran Tal +Date: Fri Mar 11 14:27:06 2016 +0200 + + closes #21119 - updating documentation for Windows and OSx users + + Updating Docker's documentation file docker configuration file on Windows hosts. + This is of importance for Windows users whom are utilizing the Docker Toolbox. + + Signed-off-by: Liran Tal + +commit a04e16ac35e8dd9ec10462cccebf13cf29b49a51 +Merge: ed6fb41321 94c929099f +Author: Brian Goff +Date: Sun Mar 13 11:30:32 2016 -0400 + + Merge pull request #20977 from allencloud/fix-delete-response-status-code + + return status code http.StatusNoContent in deleting network when OK + +commit 295c4da8d054685f83c2b8943f9f032bb9ce143a +Author: Arun Y +Date: Sun Mar 13 19:58:29 2016 +0530 + + Fixed typo for word consul + + Developer Certificate of Origin + Version 1.1 + + Copyright (C) 2004, 2006 The Linux Foundation and its contributors. + 660 York Street, Suite 102, + San Francisco, CA 94110 USA + + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + + Developer's Certificate of Origin 1.1 + + By making a contribution to this project, I certify that: + + (a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + + (b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + + (c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + + (d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. + + Signed-off-by: Arun Y + +commit aa70529d3f4bac701818f85d63934f72b62da258 +Author: mqliang +Date: Sun Mar 13 15:53:27 2016 +0800 + + fix typo in install-w-machine.md + + Signed-off-by: mqliang + +commit 1ff3d366653c6c49236dcf211034825a929d47f0 +Author: Jacob Blain Christen +Date: Sun Mar 13 00:44:53 2016 -0700 + + address #2718 by removing the section referring to unofficial master binaries in the README + + Signed-off-by: Jacob Blain Christen + +commit 97efac9d0c65cc857c9cb6d7fe43bd42025d9ad3 +Author: mqliang +Date: Sun Mar 13 15:36:46 2016 +0800 + + fix typo in provision-with-machine.md + + Signed-off-by: mqliang + +commit e7ce927e9da7243adba1bc1618fea3db81659710 +Author: mqliang +Date: Sun Mar 13 15:20:38 2016 +0800 + + fix typo in get-swarm.md + + Signed-off-by: mqliang + +commit 06d95003b3ddd22d26121280d645e48582a4f931 +Author: Phil Estes +Date: Sat Mar 12 23:05:45 2016 -0500 + + Fix CopyWithTar creation of new destination dir as remapped root + + If the destination does not exist, it needs to be created with ownership + mapping to the remapped uid/gid ranges if user namespaces are enabled. + This fixes ADD operations, similar to the prior fixes for COPY and WORKDIR. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit c1f5e1737146b02818b7653f17e89a87b028dde1 +Author: mqliang +Date: Sat Mar 12 18:53:16 2016 +0800 + + fix broken example list + + Signed-off-by: mqliang + +commit 44200e7a04e143b91ee2c77c04f91da20051b104 +Author: Ahmet Alp Balkan +Date: Sat Mar 12 18:18:53 2016 -0800 + + Case-insensitive Azure Resource Provider matching + + Signed-off-by: Ahmet Alp Balkan + +commit 8ff884548f9dfcc67a1a3bc186957c964fb62fe4 +Author: John Howard +Date: Sat Mar 12 16:15:14 2016 -0800 + + Fix TestLogsContainers performance + + Signed-off-by: John Howard + +commit 4b2f0fe637bd2c3575d01173b8dee20ac2ecc0d1 +Merge: 957f81036b 2d7c594270 +Author: Nishant Totla +Date: Sat Mar 12 15:04:19 2016 -0800 + + Merge pull request #1953 from mqliang/multi-manager-typo + + remove redundant word in docs + +commit ed6fb41321dac41f5a8975be2ca3c64fa78e28f1 +Merge: 4e7df42aa8 36506b7944 +Author: Vincent Demeester +Date: Sat Mar 12 23:53:24 2016 +0100 + + Merge pull request #21155 from mountkin/broken-links + + docs: fix broken links + +commit 497d545093bce4f01455bf8d2e1658435dbb040b +Author: Antonio Murdaca +Date: Sat Mar 12 18:01:01 2016 +0100 + + distribution: errors: do not retry if no credentials provided + + Fix and add test for case c) in #21054 + + Signed-off-by: Antonio Murdaca + +commit 4e7df42aa872a0244e5d4bbc5b8876046f922c7d +Merge: c46ab3d593 084241a37b +Author: Jess Frazelle +Date: Sat Mar 12 11:25:15 2016 -0800 + + Merge pull request #21150 from cyphar/fix-pids-stats + + client: stats: fill in stats info on client + +commit c46ab3d593bdce9fda37f9a042a2c52bd446a289 +Merge: b7aae84b5f 219e5fdda3 +Author: Sebastiaan van Stijn +Date: Sat Mar 12 15:15:48 2016 +0100 + + Merge pull request #21154 from runcom/fix-typos-1 + + docs: add $ before HOME + +commit 36506b7944cf9cea9b3618f00ecfc68a41f86dd8 +Author: Shijiang Wei +Date: Sat Mar 12 21:24:55 2016 +0800 + + docs: fix broken links + + Signed-off-by: Shijiang Wei + +commit 219e5fdda36a18104f7593da9ed8ca097a60aab3 +Author: Antonio Murdaca +Date: Sat Mar 12 14:11:01 2016 +0100 + + docs: add $ before HOME + + Signed-off-by: Antonio Murdaca + +commit 94336cb5dd7bce9f34901a86000a124a6d6c68ef +Author: Sebastiaan van Stijn +Date: Sat Mar 12 13:51:26 2016 +0100 + + Add redirects for old Docker Cloud tutorial + + This page has been deleted from the Docker Cloud tutorials, + so adding redirects for the old locations. + + Signed-off-by: Sebastiaan van Stijn + +commit 2d7c5942702d7cd383d25ee5cec96314b1d67c0a +Author: mqliang +Date: Sat Mar 12 19:03:33 2016 +0800 + + remove redundant word in docs + + Signed-off-by: mqliang + +commit 7369ddd89fb0c2a85640013265d1e6d9ba8b31c9 +Author: Shijiang Wei +Date: Sat Mar 12 18:58:29 2016 +0800 + + speed up DockerSuite.TestRunApparmorProcDirectory + + Signed-off-by: Shijiang Wei + +commit fc284a856947538d3cc086e53740b2b782df53b9 +Author: Shijiang Wei +Date: Sat Mar 12 18:58:03 2016 +0800 + + speed up DockerSuite.TestRunContainerWithReadonlyRootfs + + Signed-off-by: Shijiang Wei + +commit 2803654488fddf81997af424586a78d5e7fd472d +Author: mqliang +Date: Sat Mar 12 18:50:12 2016 +0800 + + fix typo in filter.md + + Signed-off-by: mqliang + +commit b7aae84b5fe0789a98228409174f1d4619ab2245 +Merge: 77f501a0c6 1fbaf6ee8b +Author: Vincent Demeester +Date: Sat Mar 12 10:48:18 2016 +0100 + + Merge pull request #21145 from Microsoft/jjh/fixunittestfailures + + Windows CI: Fix unit test failures + +commit 084241a37b5d3f680228e6bd6cb50f9d0507a365 +Author: Aleksa Sarai +Date: Sat Mar 12 14:45:30 2016 +1100 + + client: stats: fill in stats info on client + + This code was lost in a rebase in the PIDs cgroup merge, fix it so that + `docker stats` actually shows statistics from the PIDs cgroup. + + Signed-off-by: Aleksa Sarai + +commit 1fbaf6ee8b6cd0c149472bf465bbffb4e78f8b96 +Author: John Howard +Date: Fri Mar 11 19:31:08 2016 -0800 + + Windows CI: Fix unit test failures + + Signed-off-by: John Howard + +commit 77f501a0c6f1b584aeb0e0856e6af1ba1fbdc156 +Merge: c73f2c95cb b756f89e1d +Author: Arnaud Porterie +Date: Fri Mar 11 18:49:38 2016 -0800 + + Merge pull request #21140 from Microsoft/FlakyTestFix + + Fixing flaky tests on Windows (again) + +commit c73f2c95cbb89e54ae4a60701afb66d5cf1ed5dd +Merge: 471a1aeda8 11d3f7092e +Author: Tibor Vass +Date: Fri Mar 11 20:42:44 2016 -0500 + + Merge pull request #21017 from cpuguy83/use_forked_gocheck + + Use forked gocheck + +commit 2fd125c489551bfbc523264b107caa3d50aec6d8 +Author: David Lawrence +Date: Fri Mar 11 16:08:21 2016 -0800 + + json.RawMessage needs to be a pointer when embedded in a larger JSON struct to avoid double encoding problems. + + Signed-off-by: David Lawrence (github: endophage) + + Signed-off-by: David Lawrence (github: endophage) + +commit 1dbe50bac44f56f579642d49e33be02f017a541a +Merge: c03b5fc5ee fcb247dfce +Author: Brian Bland +Date: Fri Mar 11 16:14:46 2016 -0800 + + Merge pull request #1523 from matt-duch/master + + registry/storage/driver/s3-aws kms support + +commit 9cb6b51fa24b95789693fa65aa58fe3ad1f36014 +Author: Brent Salisbury +Date: Thu Mar 10 03:36:17 2016 -0500 + + docs for experimental vlan net drivers + + Signed-off-by: Brent Salisbury + +commit afeea8c9ca71780cd02abc86ad61e587f26be620 +Author: Brent Salisbury +Date: Fri Mar 11 00:59:49 2016 -0500 + + Experimental it for net vlan drivers + + Signed-off-by: Brent Salisbury + Signed-off-by: Madhu Venugopal + +commit 67485c60a898e7d7e7a61b1cfd8d8a2665ce8ff5 +Merge: 5648ebe83b 0db41d0a92 +Author: Nathan LeClaire +Date: Fri Mar 11 15:52:36 2016 -0800 + + Merge pull request #3165 from paul-callahan/3060-vboxnet-iface-conflict + + add code and tests to detect vboxnet collision with host interfaces + +commit 471a1aeda8d66114d6690d45ea706bfb3e2034fc +Merge: e2d245ad81 9596e3c501 +Author: Sebastiaan van Stijn +Date: Sat Mar 12 00:44:01 2016 +0100 + + Merge pull request #21047 from icecrime/update_patch_process + + Update patch release process + +commit 9596e3c50172fb21940f941fab686bfecfc6d239 +Author: Arnaud Porterie +Date: Tue Mar 8 16:59:15 2016 -0800 + + Update patch release process + + Signed-off-by: Arnaud Porterie + +commit fcb247dfce4c7a5d6c6f2e10424b76a91394c868 +Author: Matt Duch +Date: Wed Mar 9 18:52:59 2016 -0600 + + registry/storage/driver/s3-aws kms support + + Signed-off-by: Matt Duch + +commit c03b5fc5ee9e4364cc216c712ab8a53daf3b1273 +Merge: ab49f85db8 5967d33342 +Author: Brian Bland +Date: Fri Mar 11 15:06:07 2016 -0800 + + Merge pull request #1438 from BrianBland/newStorageDriverWriter + + Adds new StorageDriver.FileWriter interface + +commit b756f89e1d399146fd96c20152bd4efc8505bb62 +Author: Darren Stahl +Date: Fri Mar 11 14:48:52 2016 -0800 + + Fixing flaky tests on Windows (again) + + Signed-off-by: Darren Stahl + +commit db700a678d1da4275553ff7201e2597c7a8016ee +Author: Christopher Jones +Date: Fri Mar 11 17:11:35 2016 -0500 + + Add notary binary requirement for tests + + This PR adds the "notary" binary requirement for tests. + + Previously, NotaryHosting was checking for the "notary-server" + binary under the name notaryBinary. This renames that reference to + notaryServerBinary, so that notaryBinary can rightly refer + to the actual "notary" binary. + + Currently only one test actually uses the notary binary, so it's been + updated accordingly. + + Signed-off-by: Christopher Jones + +commit 9047cd40c2b2eb0609132800b9b8752d1cad0fcc +Author: Madhu Venugopal +Date: Fri Mar 11 04:40:33 2016 -0800 + + Vendor libnetwork v0.7.0-dev.7 + + * Experimental support for macvlan and ipvlan drivers + + Signed-off-by: Madhu Venugopal + +commit e2d245ad816af8ace52647345ca77b9d0eab641e +Merge: 81b7a1b756 ed6e33eede +Author: Alexander Morozov +Date: Fri Mar 11 14:20:39 2016 -0800 + + Merge pull request #21076 from calavera/fix_builtin_graphdriver_init + + Make sure we call every graph init with the same root path. + +commit ed6e33eedeaa6b7da44d3b0b3e2eac020b09277a +Author: David Calavera +Date: Wed Mar 9 18:23:31 2016 -0500 + + Make sure we call every graph init with the same root path. + + Remove O(n^2) check for several prior configured drivers. + + Signed-off-by: David Calavera + +commit ca908427995afd521cec36a9d65b911ceea926f3 +Merge: 571df4ba86 2136ca54ba +Author: David Lawrence +Date: Fri Mar 11 14:13:14 2016 -0800 + + Merge pull request #593 from HuKeping/add-sha512 + + Add SHA-512 + +commit 12afe715407b57f1b2c0c9a68c20c8714e73890f +Author: Nathan LeClaire +Date: Fri Mar 11 13:53:23 2016 -0800 + + Add deploy script to VCS + + Signed-off-by: Nathan LeClaire + +commit 957f81036b2328ad53cff1972db44458aa85e333 +Merge: 7f54d5e085 8cbffa9492 +Author: Dongluo Chen +Date: Fri Mar 11 13:44:48 2016 -0800 + + Merge pull request #1943 from nishanttotla/removing-dead-code + + Deleting redundant code from volume.go + +commit 7f54d5e08578d8595cbb6e1827f09320cd682940 +Merge: 63997816a5 134df4293c +Author: Dongluo Chen +Date: Fri Mar 11 13:38:18 2016 -0800 + + Merge pull request #1866 from gradywang/issue-1860 + + Support rescind offer in swarm. + +commit 809104d7ea28678c49122936551a8c388b084862 +Author: Ahmet Alp Balkan +Date: Fri Mar 11 13:31:03 2016 -0800 + + azure.md: Documentation clarification + + Signed-off-by: Ahmet Alp Balkan + +commit 63997816a516c7d7ab8de41be4947ec339760798 +Merge: ba31ab2d4b e7065eabf7 +Author: Victor Vieux +Date: Fri Mar 11 13:09:49 2016 -0800 + + Merge pull request #1945 from jimmyxian/add-support-ps-node-filter + + Add support ps node filter + +commit 81b7a1b7565eb22cca9870f1725e73a82646000c +Merge: 949e53a0f1 ae66d536a5 +Author: Sebastiaan van Stijn +Date: Fri Mar 11 22:08:25 2016 +0100 + + Merge pull request #21077 from moxiegirl/carry-20160 + + Document Volume Removal in User Guide + +commit ae66d536a5928c9134a4a70761ebc93de0320197 +Author: Aditi Rajagopal +Date: Mon Feb 8 15:37:21 2016 -0600 + + Document Volume Removal in User Guide + + Resolves: #20113 + Signed-off-by: Aditi Rajagopal + + Carry #20160 + Tighten language + Updating with comments + Removing articles which is empty + Adding Brian's comments + Putting back what I took out + + Signed-off-by: Mary Anthony + +commit 5648ebe83b9d1ffe076ac5b71d318bbea87a131d +Merge: ccc5fe6c7d 63ea976b1d +Author: David Gageot +Date: Fri Mar 11 21:21:35 2016 +0100 + + Merge pull request #3097 from tpires/1858-generic-engine-port + + FIX #1858 Add engine port + +commit 2a0291489247b79058f0f94a2af7c5b3f89b78af +Author: Christopher Jones +Date: Fri Mar 11 15:09:00 2016 -0500 + + Fix error-checking when looking at empty log + + Fixes a bug when the log output is empty. + + The length of a slice containing an empty string is 1, not 0, so + the test fails to catch when the log is empty. Instead, take a look at + out, which is just a string. + + Signed-off-by: Christopher Jones + +commit e2076453071f9fc82478557919d327c958eec712 +Author: Phil Estes +Date: Fri Mar 11 15:08:58 2016 -0500 + + Fix gcc compile test with proper flag ordering + + This test for libdevmapper was always silently failing because the + linker never got the `-ldevmapper` information. Putting the flag last + corrects the test. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 11d3f7092e38e1e90d926595c5a4ab9ff0da535c +Author: Brian Goff +Date: Fri Mar 11 14:06:56 2016 -0500 + + use per-check timeouts + + Signed-off-by: Brian Goff + +commit e6e0837cbbebca0736f27b473ffa14c991c77787 +Author: Brian Goff +Date: Mon Mar 7 22:22:36 2016 -0500 + + Use forked gocheck and vendor + + Signed-off-by: Brian Goff + +commit 571df4ba8606b9f11432a21f827a52a7b1780dd0 +Merge: 00cadc9734 7e1a9947de +Author: Riyaz Faizullabhoy +Date: Fri Mar 11 11:28:27 2016 -0800 + + Merge pull request #618 from HuKeping/tiny + + Tiny refactor + +commit 949e53a0f1407a550051753f3d92cad5e0670edc +Merge: 9842c7a741 11d10b77ac +Author: Arnaud Porterie +Date: Fri Mar 11 11:14:37 2016 -0800 + + Merge pull request #21127 from icecrime/add_john_maintainer + + Add @jhowardmsft to maintainers + +commit 11d10b77acd106c9a5857de382a719efb6b65a47 +Author: Arnaud Porterie +Date: Fri Mar 11 08:52:01 2016 -0800 + + Add @jhowardmsft to maintainers + + Signed-off-by: Arnaud Porterie + +commit 9842c7a741ee480c71bfd8e71e1f22893d010411 +Merge: 12c67f42d8 bbeb859b64 +Author: David Calavera +Date: Fri Mar 11 10:16:40 2016 -0800 + + Merge pull request #21129 from allencloud/fix_typos + + fix typos + +commit 16e4c4e481aca8d5a99d5a4760b5d27bf5bbb9fd +Author: Tonis Tiigi +Date: Mon Mar 7 10:56:24 2016 -0800 + + Fix docker run for 64 byte hex ID + + Fixes #20972 + + Also makes sure there is no check to registry if + no image is found for the prefixed IDs. + + Signed-off-by: Tonis Tiigi + +commit 12c67f42d85103c57c14f27579ff46fccdc3ee07 +Merge: 1c0474ed63 87535ca2e9 +Author: David Calavera +Date: Fri Mar 11 09:31:55 2016 -0800 + + Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry + + Remove Windows-specific default registry definitions + +commit 5abd881883883a132f96f8adb1b07b5545af452b +Author: Justin Cormack +Date: Fri Mar 11 11:01:20 2016 +0000 + + Allow restart_syscall in default seccomp profile + + Fixes #20818 + + This syscall was blocked as there was some concern that it could be + used to bypass filtering of other syscall arguments. However none of the + potential syscalls where this could be an issue (poll, nanosleep, + clock_nanosleep, futex) are blocked in the default profile anyway. + + Signed-off-by: Justin Cormack + +commit 1c0474ed63ac08a3e280ecf7eebcb9e53ae92c8d +Merge: 9ad946eded b9ef2682b9 +Author: Tibor Vass +Date: Fri Mar 11 10:54:48 2016 -0500 + + Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand + + Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand + +commit bbeb859b6490a03d7c4265762711b551c22e914d +Author: allencloud +Date: Fri Mar 11 23:02:17 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit ae6ee5e4af2e57bdcf5ee3a1e6155ba3cf58cb98 +Author: Daniel Dao +Date: Thu Jan 21 12:28:25 2016 +0000 + + upgrade go-gelf vendor + + Signed-off-by: Daniel Dao + +commit 63ea976b1da7e92a6a49b3486b1aa426c043421c +Author: Tiago Pires +Date: Mon Feb 22 17:27:01 2016 +0000 + + FIX #1858 Add engine port + + Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on + Docker engine. + Updated `generic` driver documentation. + + Signed-off-by: Tiago Pires + +commit 68bda672dc0fb53c5247047104e09c7f8346e24e +Author: Justin Cormack +Date: Fri Mar 11 13:01:30 2016 +0000 + + Update statically linked libseccomp to 2.3.0 + + Fixes #20550 + + This update to libseccomp supports the new versions of socket + system calls that can be called directly rather than via the + socketcall syscall in kernel versions 4.3 or later with new glibc. + + Note this library version now supports s390x and ppc64le, so + seccomp can be potentially be enabled for these architectures now. + + Signed-off-by: Justin Cormack + +commit 2136ca54ba89afd7d2aa8c498ac1dc880dd8b8b8 +Author: HuKeping +Date: Fri Mar 11 16:20:02 2016 +0800 + + [MISC 4/4] distinguish nil and empty map + + Since the function len(X) will return 0 no matter X is nil or + an empty map. + + We should distinguish that. + + Signed-off-by: Hu Keping + +commit 9501cddc1dab2975cdbeade467926aaee219fc04 +Author: HuKeping +Date: Fri Mar 11 10:17:56 2016 +0800 + + [MISC 3/4] Refactor: move test helper function to test package + + The helper function "GetSupportedHashes" is only used in tests, + it's better to move it to the relevant test file. + + Since it's for the test, remove the origin test code for it. + + And it also a good idea to call "NewfileMeta" instead of implement + once again. + + Signed-off-by: Hu Keping + +commit 30c9cfc113c87cea625a56e34d43d1dd1fbfd8fa +Author: HuKeping +Date: Fri Mar 11 09:57:41 2016 +0800 + + [MISC 2/4] Constant: use constant instead of some literal string + + Replace the "sha256" by the constant defined in the notary-const file. + + Signed-off-by: Hu Keping + +commit 6cd6b4726cc616b85c107dccbb31443a010b12fb +Author: HuKeping +Date: Fri Mar 11 09:51:40 2016 +0800 + + [MISC 1/4] Tiny refactor + + Reduce function "snapshotExpired" in a simpler form and replace the + literal string by the constants defined in the data package. + + Signed-off-by: Hu Keping + +commit 7e1a9947de5289c38af6c5f548a23ce9b6424ecd +Author: HuKeping +Date: Fri Mar 11 14:05:03 2016 +0800 + + Tiny refactor + + If we can use a simple name for the local variable. + + Signed-off-by: Hu Keping + +commit a667cd88c3dc9262f4ef4e2a317c10f6cdcdf5ae +Author: Tianon Gravi +Date: Thu Mar 10 19:19:33 2016 -0800 + + Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection" + + Instead of being split between three files, let's let `hack/make/.detect-daemon-osarch` be our single source of truth for multiarch detection/vars. Not only does it make it slightly easier to make sure we change everything properly when these bits have to change, but it also makes it so that all bits of `hack/make.sh` (especially `hack/make/.ensure-frozen-images`) work properly outside the context of the `Makefile` on all platforms. + + Signed-off-by: Andrew "Tianon" Page + +commit 9ad946eded6fb05ddc331bd565473ea68b83bdd9 +Merge: edf3c0f112 94445b2fea +Author: Brian Goff +Date: Thu Mar 10 22:45:55 2016 -0500 + + Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx + + Fix the vendoring script on MacOS X + +commit 134df4293cffa439ee542ff3644332b20d58ef48 +Author: Yongqiao Wang +Date: Wed Feb 24 15:46:31 2016 +0800 + + Support rescind offer in swarm. + + Signed-off-by: Yongqiao Wang + +commit 2f61b0a44546f343f62f40d375a03807109bb90c +Author: HuKeping +Date: Mon Feb 29 21:24:17 2016 +0800 + + [PATCH 8/8] Add some test + + For the added functions of this patch set. + + Signed-off-by: Hu Keping + +commit 4d9e2e5e16da147f84a4095c49cab51e1330e753 +Author: HuKeping +Date: Mon Feb 29 15:13:16 2016 +0800 + + [PATCH 7/8] Update the server side + + Signed-off-by: Hu Keping + +commit bf978558977d335555a72a71ad73bc0140135241 +Author: HuKeping +Date: Sat Feb 27 19:22:27 2016 +0800 + + [PATCH 6/8] Add sha512 check when downloading TUF roles + + Since the timestamp role need not the hash checking during the downloading, + thi patch only includes: + - snapshot.json + - root.json + - target.json + + Signed-off-by: Hu Keping + +commit 95ed108c123c652686b70f69b6346f13c1e8d53c +Author: HuKeping +Date: Fri Feb 26 19:32:41 2016 +0800 + + [PATCH 5/8] Add sha512 check on CLI command + + Include: + - verify + + Signed-off-by: Hu Keping + +commit 206d02ab4d8cdacc33f329736f80d2bd3062130b +Author: HuKeping +Date: Thu Feb 25 19:11:10 2016 +0800 + + [PATCH 4/8] Add sha512 when updating + + Actually there are two way to implement this. + + One is check the present hash algorithm first and then only update + what we have. + + The other is update/add both sha256 and sha512 no matter whether we + have the hash of sha512 or not. + + Personally I prefer the latter, for it brings much less change of the + code and will also not affect the validate of the old clients. + + Signed-off-by: Hu Keping + +commit 6b96c7e56dc786ecd4b26a2c4aae38fe3a6ae8a8 +Author: HuKeping +Date: Wed Feb 24 18:04:57 2016 +0800 + + [PATCH 3/8] Add sha512 when creating target, snapshot and timestamp + + Signed-off-by: Hu Keping + +commit 30790aaa6813aca19b1908d7626a9b2dd10fc813 +Author: HuKeping +Date: Sat Feb 27 22:31:10 2016 +0800 + + [PATCH 2/8] Add some helper functions + + Include: + - A helper function to verify checksums generate by different hash algorithms. + - A helper function to generate checksums of all the supported hash algorithms. + - A helper fucntion to do a sanity check for every checksum. + + Signed-off-by: Hu Keping + +commit 7344f4e3da9becee44a939e9bfbe8259ee0d86bc +Author: HuKeping +Date: Sat Feb 27 11:06:08 2016 +0800 + + [PATCH 1/8] Create constants for sha256 and sha512 + + Signed-off-by: Hu Keping + +commit 87535ca2e9fee074b4174ecc5b01c91a9e922f54 +Author: Aaron Lehmann +Date: Thu Mar 10 12:26:32 2016 -0800 + + Remove Windows-specific default registry definitions + + Going forward, Docker won't use a different default registry on Windows. + This changes Windows to use the standard Docker Hub registry as the + default registry. + + There is a plan in place to migrate existing images from the Windows + registry to Hub's normal registry, in advance of the 1.11 release. In + the mean time, images on the Windows registry can be accessed by + prefixing them with `registry-win-tp3.docker.io/`. + + Signed-off-by: Aaron Lehmann + +commit e7065eabf7c3f892ac9a778d3c832867f6a003d4 +Author: Xian Chaobo +Date: Fri Mar 11 10:31:33 2016 +0800 + + add support ps node filter + + Signed-off-by: Xian Chaobo + +commit dc56a76bc9f16b2d57b9d64822e305c1e787fcf0 +Author: Qiang Huang +Date: Fri Mar 11 09:59:50 2016 +0800 + + Fix race condition with exec and resize + + When I use `docker exec -ti test ls`, I got error: + ``` + ERRO[0035] Handler for POST /v1.23/exec/9677ecd7aa9de96f8e9e667519ff266ad26a5be80e80021a997fff6084ed6d75/resize returned error: bad file descriptor + ``` + + It's because `POST /exec//start` and + `POST /exec//resize` are asynchronous, it is + possible that exec process finishes and ternimal + is closed before resize. Then `console.Fd()` will + get a large invalid number and we got the above + error. + + Fix it by adding synchronization between exec and + resize. + + Signed-off-by: Qiang Huang + +commit 94445b2fea906df1bedec40284591d752def18e2 +Author: Ken Cochrane +Date: Thu Mar 10 20:27:44 2016 -0500 + + Put back the hack that was originally in place. + + Signed-off-by: Ken Cochrane + +commit edf3c0f11240368baf54ece0b3cb2b5214294b89 +Merge: 1d094255d5 8d9396c5f9 +Author: Brian Goff +Date: Thu Mar 10 20:18:30 2016 -0500 + + Merge pull request #21102 from tiborvass/template-improve-contrast + + Improve github templates + +commit 2342879763c532098732b5df991a090301672ce2 +Author: moxiegirl +Date: Thu Mar 10 17:01:25 2016 -0800 + + moving row to top + +commit ec33a7dfc3c6038b18ae586bde0176e2cd1f72a6 +Author: Ahmet Alp Balkan +Date: Thu Mar 10 16:59:28 2016 -0800 + + Add RELEASE.md note about deprecation notice + + Signed-off-by: Ahmet Alp Balkan + +commit 5967d333425a8dd5d36c5bb456098839654d38af +Author: Brian Bland +Date: Thu Mar 10 16:46:43 2016 -0800 + + Removes ceph rados driver in favor of Swift API gateway support + + Signed-off-by: Brian Bland + +commit ccc5fe6c7db8a8936952b8ff5c7fde727a39003a +Merge: 5a270c9751 4a4f060122 +Author: Nathan LeClaire +Date: Thu Mar 10 16:48:27 2016 -0800 + + Merge pull request #3176 from clnperez/build-w-alternate-workspace + + Add example for building using existing workspace + +commit ce3cb54482cae16961e979b2f15c807d840cfd3d +Author: Ahmet Alp Balkan +Date: Thu Mar 10 15:38:05 2016 -0800 + + Update default image to Ubuntu 15.10 + + - Default image now is ubuntu server 15.10. This ensures consistency with + other cloud drivers. + - Better error message when virtual machine already exists. + - Change default SSH user from `ubuntu` to `docker-user`. + + Signed-off-by: Ahmet Alp Balkan + +commit 8368901af29615cb9e79fe722e67570ffc001f0a +Author: Nathan LeClaire +Date: Thu Mar 10 15:48:57 2016 -0800 + + Bump to Docker version 1.10.3 + + Signed-off-by: Nathan LeClaire + +commit 1d094255d57090d34b2c11c12b253c277ae1ce28 +Merge: 496aca386a 59586d02b1 +Author: Sebastiaan van Stijn +Date: Fri Mar 11 00:48:55 2016 +0100 + + Merge pull request #21045 from calavera/registry_config_options + + Move registry service options to the daemon configuration. + +commit 8d9396c5f93ff0f8597e07abf88839071999eadf +Author: Tibor Vass +Date: Thu Mar 10 17:59:45 2016 -0500 + + Improve github templates + + Add more contrast and change `you` to `I` in pull requests template. + + Signed-off-by: Tibor Vass + +commit 0db41d0a921600ac9496a62d8e8bf440b6fbaf5c +Author: Paul Callahan +Date: Tue Mar 8 09:43:22 2016 -0800 + + add code and tests to detect vboxnet collision with host interfaces + + exclude existing host-only nets from list of host interfaces + + interface and mocks for system calls to net.* + + Signed-off-by: Paul Callahan + +commit 4a4f0601229f7a500c915a37197feb04f1957c86 +Author: Christy Perez +Date: Thu Mar 10 16:25:32 2016 -0600 + + Add example for building using existing workspace + + If you already have docker machine cloned, or want to use an + existing workspace to clone it to, this helps with what your + GOPATH should be set to. + + Also cleanining up the formatting of the previous block to + match others on the page. + + Signed-off-by: Christy Perez + +commit 8cbffa9492162ac21d6741d92cfdb9ad91550f10 +Author: Nishant Totla +Date: Thu Mar 10 14:14:28 2016 -0800 + + Deleting redundant code from volume.go + + Signed-off-by: Nishant Totla + +commit ab49f85db8bacccc8899cc34833503dc4e54dcde +Merge: db17a23b96 2be1b4ef4f +Author: Brian Bland +Date: Thu Mar 10 13:48:59 2016 -0800 + + Merge pull request #1512 from kmala/master + + Added support to specifiy custom endpoint + +commit ba31ab2d4b341c211faa98ea569ab6f97e0a578f +Merge: 8e35ac6c52 05d9995985 +Author: Nishant Totla +Date: Thu Mar 10 13:47:14 2016 -0800 + + Merge pull request #1872 from echupriyanov/volume_info_fix + + Fix get volume call for volumes with non-local drivers + +commit 9488696814f481d2b0dce03d77657ec6860b9701 +Author: Ken Cochrane +Date: Thu Mar 10 13:47:26 2016 -0500 + + Fix the vendoring script on MacOS X + + The version of sed on MacOS X is different then the one on linux. The mac version + requires a parameter for the inline (-i) flag, where this isn't required on linux. + On the mac it thinks the -e flag is the parameter, and it causes the vendoring script + to fail. + + This fix adds an empty string '' as a parameter to sed, which works fine on both the + mac and linux versions. + + Signed-off-by: Ken Cochrane + +commit 496aca386a0bb2ea3a5a42314642ba4693e616ae +Merge: 2b8e7ad460 04e9087d5d +Author: Sebastiaan van Stijn +Date: Thu Mar 10 22:36:50 2016 +0100 + + Merge pull request #20190 from rhatdan/volumeMan + + Add a parent man page for docker volumes command + +commit 2b8e7ad4609e668d2187e81055e1e76ed0c11552 +Merge: 9ff7439162 e8026d8a98 +Author: Arnaud Porterie +Date: Thu Mar 10 13:33:04 2016 -0800 + + Merge pull request #20478 from msabansal/HNSIntegration + + Windows libnetwork integration + +commit 8194e43910af42b355dc23558d599d0c303039d4 +Merge: 3d7b69f4df 24fcb7e83a +Author: Nathan LeClaire +Date: Thu Mar 10 12:15:03 2016 -0800 + + Merge pull request #443 from embray/uninstall-clean-registry + + Remove the DOCKER_TOOLBOX_INSTALL_PATH registry when Toolbox is uninstalled + +commit de641715105a116042ad9be5e1b2d1bb2962eb9c +Author: Sebastiaan van Stijn +Date: Thu Mar 10 19:13:44 2016 +0100 + + Fail when devicemapper doesn't support udev-sync + + Now what we provide dynamic binaries for all plaforms, + we shouldn't try to run docker without udev sync support. + + This change changes the previous warning to an Error, + unless the user explicitly overrides the warning, in + which case they're at their own risk. + + Signed-off-by: Sebastiaan van Stijn + +commit 1485a56c758ff77ea5bab07bf9d4b0ac3efb2472 +Author: Ben Firshman +Date: Wed Mar 9 14:58:34 2016 -0800 + + Better Compose in production docs + + The Compose/Swarm integration has been working really well for + users, so it seems pretty safe to remove the scary warnings about + it not being ready. + + Signed-off-by: Ben Firshman + +commit 59586d02b1cc004f14cd7ff6b454211f562da326 +Author: David Calavera +Date: Tue Mar 8 16:03:37 2016 -0500 + + Move registry service options to the daemon configuration. + + Allowing to set their values in the daemon configuration file. + + Signed-off-by: David Calavera + +commit 9ff74391620c65661d2d543598fe96efb37f08fc +Merge: 790d8f8520 845dce8465 +Author: David Calavera +Date: Thu Mar 10 08:28:36 2016 -0800 + + Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting + + Windows: Revendor github.com/Microsoft/go-winio + +commit 790d8f8520d23d16cc0a141e6fd56246a45b327a +Merge: 943ae26bc0 021a12ef1b +Author: David Calavera +Date: Thu Mar 10 08:27:54 2016 -0800 + + Merge pull request #21018 from hqhq/hq_fix_race_exec_tty + + Fix race condition when exec with tty + +commit 943ae26bc01913fefe415defc575ea10e24f6a2b +Merge: e7093a95cf 8514880997 +Author: Alexander Morozov +Date: Thu Mar 10 08:08:32 2016 -0800 + + Merge pull request #20958 from calavera/basic_function_templates + + Provide basic string manipulation functions for template executions. + +commit 7bb815e2960c97c5cc0624566ac51581bdd884ab +Author: Alexander Morozov +Date: Tue Mar 8 16:54:33 2016 -0800 + + daemon: fix hanging attaches on initial start failures + + Attach can hang forever if there is no data to send. This PR adds notification + of Attach goroutine about container stop. + + Signed-off-by: Alexander Morozov + +commit 04e9087d5d8d6e4b9857ebe10e153da67433d401 +Merge: dc8259f0ac e7093a95cf +Author: Dan Walsh +Date: Thu Mar 10 09:33:09 2016 -0500 + + Merge branch 'master' of github.com:docker/docker into volumeMan + + Signed-off-by: Dan Walsh + +commit e7093a95cf324c7928e340c5a388062a1ed05625 +Merge: f70f570641 97e07ca10a +Author: Sebastiaan van Stijn +Date: Thu Mar 10 15:12:23 2016 +0100 + + Merge pull request #21043 from runcom/plugin-sdk + + docs: extend: plugins: mention the sdk + systemd socket activation + +commit 97e07ca10ac315b3d6bbaf72fbe1fd4f7b9a3a2d +Author: Antonio Murdaca +Date: Tue Mar 8 22:34:35 2016 +0100 + + docs: extend: plugins: mention the sdk + systemd socket activation + + Signed-off-by: Antonio Murdaca + +commit f70f570641b8e7cec5767f26cc7fc9f31f6294e7 +Merge: 49485b769c 205844875c +Author: Sebastiaan van Stijn +Date: Thu Mar 10 10:59:15 2016 +0100 + + Merge pull request #21073 from moxiegirl/close-carry-20377 + + Add missing fields for NetworkSettings + +commit 06ba32ea47f1eff2e19f048f0e66acf005dca0f3 +Author: Riyaz Faizullabhoy +Date: Wed Mar 9 11:29:29 2016 -0800 + + Message canonical key ids on error + + Signed-off-by: Riyaz Faizullabhoy + +commit e8026d8a98ef30ff0ada303404e02567caebb1b0 +Author: msabansal +Date: Wed Mar 9 20:33:21 2016 -0800 + + Windows libnetwork integration + + Signed-off-by: msabansal + +commit 49485b769cdcc220418a36cfd3c1e50fd03b130d +Merge: d99be399c3 34b82a69b9 +Author: Aaron Lehmann +Date: Wed Mar 9 20:24:56 2016 -0800 + + Merge pull request #21063 from allencloud/fix-typos + + fix some typos. + +commit d99be399c35df921970bb8bebf4b4bdf774849b3 +Merge: bd7c95e306 b8a5fb76ea +Author: Brian Goff +Date: Wed Mar 9 22:27:37 2016 -0500 + + Merge pull request #21019 from aboch/se + + Add port configs to Sandbox and libnetwork vendoring + +commit 34b82a69b94ef9c7913e2809ae918e6f4331201e +Author: allencloud +Date: Thu Mar 10 00:17:57 2016 +0800 + + fix some typos. + + Signed-off-by: allencloud + +commit 00cadc9734bc5f7a8f3aead3488b130ee4a4dc8a +Merge: 40a24c3793 be91b3342c +Author: David Lawrence +Date: Wed Mar 9 18:03:47 2016 -0800 + + Merge pull request #614 from docker/bump-dependencies + + Bump go-connections and canonical go dependencies to the latest version + +commit bd7c95e306c747e21e0dea48d068adc1c7b59132 +Merge: fcff343cb4 6cbff9505c +Author: Arnaud Porterie +Date: Wed Mar 9 17:53:13 2016 -0800 + + Merge pull request #21074 from mlaventure/test-userns-centos + + Update UserNamespaceInKernel test requirement to handle redhat + +commit 3f445e63b4568845f439c5d30a99ba10603b1938 +Author: Jason Heiss +Date: Wed Mar 9 20:40:12 2016 -0500 + + Allow --hostname with --net=host + + Docker creates a UTS namespace by default, even with --net=host, so it + is reasonable to let the user set the hostname. Note that --hostname is + forbidden if the user specifies --uts=host. + + Closes #12076 + Signed-off-by: Jason Heiss + +commit 3d7b69f4df51a2497ef76d34cc5536b8ee852d67 +Merge: de744b6f0f 03b4f72ce6 +Author: Nathan LeClaire +Date: Wed Mar 9 16:41:41 2016 -0800 + + Merge pull request #439 from todorez/ndis5-opt + + add VirtualBox NDIS5 driver option to the installer + +commit 8514880997bd1bc944769dcc41e52307bb01f7ff +Author: David Calavera +Date: Fri Mar 4 12:29:44 2016 -0500 + + Provide basic string manupilation functions for template executions. + + This change centralizes the template manipulation in a single package + and adds basic string functions to their execution. + + Signed-off-by: David Calavera + +commit 99d68be815f06d43d2b28321586d7531fe17ea33 +Merge: 8a86e204a0 ee136446a2 +Author: Daniel Nephin +Date: Wed Mar 9 16:28:15 2016 -0800 + + Merge pull request #3011 from mdaue/2804 + + Fix #2804: Add ipv4 and ipv6 static addressing + +commit cf844a7920d17653a72a8775fc962b210e56b614 +Merge: b994cdd1f7 07efa668a8 +Author: moxiegirl +Date: Wed Mar 9 16:18:32 2016 -0800 + + Merge pull request #59 from moxiegirl/fix-chat-link + + Removing links to old Google groups + +commit 8e35ac6c5276fb2a10a989ec1586ee03c71a5a38 +Merge: 9390d5f335 6af37c4888 +Author: Victor Vieux +Date: Wed Mar 9 15:55:40 2016 -0800 + + Merge pull request #1938 from nishanttotla/info-engine-api + + Updating info function to use engine-api + +commit 7b961604543507fb35f76c5307cced4a5c1db9a9 +Author: Ahmet Alp Balkan +Date: Wed Mar 9 15:43:49 2016 -0800 + + Friendly deprecation notice for old driver VMs + + Signed-off-by: Ahmet Alp Balkan + +commit ee136446a2e5d1a2b108f586e872f40d801485d6 +Author: Matt Daue +Date: Tue Feb 23 21:19:11 2016 -0500 + + Fix #2804: Add ipv4 and ipv6 static addressing + + - Added ipv4_network and ipv6_network to the networks section in the + service section for each configured network + - Added feature documentation + - Added unit tests + + Signed-off-by: Matt Daue + +commit 2be1b4ef4f3b489b3dcaeb21ed20ec6a641b4070 +Author: Keerthan Mala +Date: Sat Mar 5 11:46:44 2016 -0700 + + Added support to specifiy custom endpoint + + Signed-off-by: Keerthan Reddy Mala + +commit 07efa668a85844c591d62f6d7bb4c34679314120 +Author: Mary Anthony +Date: Wed Mar 9 14:35:43 2016 -0800 + + Removing links to old Google groups + + Signed-off-by: Mary Anthony + +commit b8a5fb76ea3d2ba3168380757cb5a746350ea451 +Author: Alessandro Boch +Date: Tue Mar 8 18:47:23 2016 -0800 + + Add Exposed ports and port-mapping configs to Sandbox + + Signed-off-by: Alessandro Boch + +commit 6af37c488859824bb83f0c58a99b65290e48d284 +Author: Nishant Totla +Date: Tue Mar 8 16:29:58 2016 -0800 + + Updating info function to use engine-api + + Signed-off-by: Nishant Totla + +commit 76cd0f681184afc44302b954a0775b0cfd748c4f +Author: Derek McGowan +Date: Fri Mar 4 13:31:40 2016 -0800 + + Update docs to mention identity token usage for /auth + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit ba0aa5311aa27fe77166f03d8bcc0174e2985913 +Author: Aaron Lehmann +Date: Fri Mar 4 12:00:18 2016 -0800 + + Add support for identity tokens in client credentials store + + Update unit test and documentation to handle the new case where Username + is set to to indicate an identity token is involved. + + Change the "Password" field in communications with the credential helper + to "Secret" to make clear it has a more generic purpose. + + Signed-off-by: Aaron Lehmann + +commit a6d0c66b4c923cddeaea09f5b41ad353ea7a9b5f +Author: Aaron Lehmann +Date: Tue Feb 23 16:29:16 2016 -0800 + + Change Docker client to support OAuth-based flow for login + + This mechanism exchanges basic auth credentials for an identity token. + The identity token is used going forward to request scoped-down tokens + to use for registry operations. + + Signed-off-by: Aaron Lehmann + +commit e896d1d7c4459c4b357efdd780e9fb9dd9bc90e0 +Author: Derek McGowan +Date: Tue Feb 23 15:18:04 2016 -0800 + + Add support for identity token with token handler + + Use token handler options for initialization. + Update auth endpoint to set identity token in response. + Update credential store to match distribution interface changes. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 5730259f324a59a6dddf63a950ab8eb9cde3ca0c +Author: Derek McGowan +Date: Wed Mar 9 13:47:27 2016 -0800 + + Vendor updates to distribution + + Pull in changes for refresh token in the registry client + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit db17a23b961978730892e12a0c6051d43a31aab3 +Merge: 46b2c3fadf a59448784b +Author: Olivier Gambier +Date: Wed Mar 9 13:40:47 2016 -0800 + + Merge pull request #1521 from dmcgowan/oauth-client-id-on-get + + Add client ID to token fetch to GET endpoint + +commit fcff343cb49f37d7c5b59c121b0cd1900e44c542 +Merge: 9bfdb93e3a 8706c5124a +Author: David Calavera +Date: Wed Mar 9 13:27:12 2016 -0800 + + Merge pull request #21067 from LK4D4/remove_comment + + Remove obsolete comment + +commit a59448784be77ad402043504eee25a14b1bf6015 +Author: Derek McGowan +Date: Wed Mar 9 12:44:55 2016 -0800 + + Add client ID to token fetch to GET endpoint + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 205844875cb848b04fef401d3e7fcc3a8959bba0 +Author: Kanstantsin Shautsou +Date: Wed Feb 17 03:47:03 2016 +0300 + + Add missing fields for NetworkSettings + + Dump from 1.10.1 has this fields. + + Signed-off-by: Kanstantsin Shautsou + + Close and carry #20377 + Include David's request + + Signed-off-by: Mary Anthony + +commit 6cbff9505c992bd1e61ea7943737dac04ba665ea +Author: Kenfe-Mickael Laventure +Date: Wed Mar 9 11:20:41 2016 -0800 + + Update UserNamespaceInKernel test requirement to handle redhat + + On redhat based distribution, checking that USER_NS is compiled in the + kernel is not sufficient, we also have to check that the feature as + been enabled. + + With this commit, it is now done by checking the content of + `/sys/module/user_namespace/parameters/enable`. + + Signed-off-by: Kenfe-Mickael Laventure + +commit 093fbdbfc40f8cc1774cb10a550030d440cf7de2 +Author: Derek McGowan +Date: Wed Mar 9 12:35:20 2016 -0800 + + Add client_id to get token endpoint + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 1a40dd535fb12cade584f085baa23734e8a9bb0e +Author: Solganik Alexander +Date: Wed Feb 3 22:59:27 2016 +0200 + + Fixes #18712. Add rfc5424 log format for syslog. + + Previously docker used obsolete rfc3164 syslog format for syslog. rfc3164 explicitly + uses semicolon as a separator between 'TAG' and 'Content' section of the log message. + Docker uses semicolon as a separator between image name and version tag. + When {{.ImageName}} was used as a tag expression and contained ":" syslog parser mistreated + "tag" part of the image name as syslog message body, which resulted in incorrect "syslogtag" been reported by syslog + daemon. + Use of rfc5424 log format partually fixes the issue as it does not use semicolon as a separator. + However using default rfc5424 syslog format itroduces backward incompatability because rsyslog template keyword %syslogtag% + is parsed differently. In rfc3164 it uses the "TAG" part reported before the "pid" part. In rfc5424 it uses "appname" part reported + before the pid part, while tag part is introduced by %msgid% part. + For more information on rsyslog configuration properties see: http://www.rsyslog.com/doc/master/configuration/properties.html + + Added two options to specify logging in either rfc5424, rfc3164 format or unix format omitting hostname in order to keep backwards compatability with + previous versions. + + Signed-off-by: Solganik Alexander + +commit f988741823c1c510e97f2508d6a5bed68f65440a +Author: Solganik Alexander +Date: Wed Feb 3 22:40:19 2016 +0200 + + Fixes #18712: Vendoring srslog to latest version. + + In order to solve the issue metioned in https://github.com/docker/docker/issues/18712 + it is required to use rfc5424 log formatted message, made available in latest srslog library. + + Signed-off-by: Solganik Alexander + +commit 9bfdb93e3aaedf5c050def582d6c820cec00f300 +Merge: f97ab358cb f446771f0b +Author: Brian Goff +Date: Wed Mar 9 15:19:26 2016 -0500 + + Merge pull request #21053 from WeiZhang555/vendor-engine-api + + Vendor docker/engine-api + +commit 8a86e204a0908458273584e4fe5f5b952af713ce +Merge: 7a30fc0983 0049743615 +Author: Daniel Nephin +Date: Wed Mar 9 11:12:34 2016 -0800 + + Merge pull request #3063 from albers/completion-multiple-compose-files + + add support for multiple compose files to bash completion + +commit 7a30fc09837d4a9b2bc2d19f5f4a799d123c5fec +Merge: 7033042656 88a719b4b6 +Author: Joffrey F +Date: Wed Mar 9 10:56:50 2016 -0800 + + Merge pull request #3089 from ltiao/patch-1 + + Fixed indentation level in example. + +commit 70330426564daa452a70146d0a9792f89ce79590 +Merge: 7de9b08ca5 81b7fba33e +Author: Joffrey F +Date: Wed Mar 9 10:55:05 2016 -0800 + + Merge pull request #3039 from dbonev/3020-build-arguments-object-syntax + + Allowing null for build args + +commit 8706c5124a09ba4ad49ca2eb009bdcaec98b7637 +Author: Alexander Morozov +Date: Wed Mar 9 09:38:39 2016 -0800 + + Remove obsolete comment + + There is no more race + + Signed-off-by: Alexander Morozov + +commit f97ab358cb9443816ff436aac410ef75ca385530 +Merge: 016be53236 a9f2006f10 +Author: Tõnis Tiigi +Date: Wed Mar 9 09:30:54 2016 -0800 + + Merge pull request #21013 from calavera/events_since_nano + + Compare event nanoseconds properly to filter since a specific date. + +commit 016be532368ac45d425b770e0b02aa12de7d5620 +Merge: 5d3ae7f989 deeb5c95e2 +Author: David Calavera +Date: Wed Mar 9 09:15:01 2016 -0800 + + Merge pull request #21056 from askb/optimize-TestBuildUsersAndGroups + + Optimized integration test case DockerSuite.TestBuildUsersAndGroups fixes #19425 + +commit 94c929099fdfd200eda90529ae8d2ed90c8e3c97 +Author: allencloud +Date: Sun Mar 6 00:41:51 2016 +0800 + + 1.return status code http.StatusNoContent in deleting network when successful + 2.modify docker_api_network_test.go + 3.modify docker_remote_api_v1.23.md + + Signed-off-by: allencloud + +commit 5d3ae7f98999e3f01125c5dd9ac73757dbb849ef +Merge: faacbcf53e 526c2fe942 +Author: Phil Estes +Date: Wed Mar 9 10:32:09 2016 -0500 + + Merge pull request #20965 from yongtang/19425-DockerSuite.TestRunUnshareProc + + Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc. + +commit faacbcf53e8c702c211d9be549d06c1aff6fb100 +Merge: 3d09842713 65a381ae32 +Author: Sebastiaan van Stijn +Date: Wed Mar 9 15:58:38 2016 +0100 + + Merge pull request #20930 from cloojure/patch-3 + + Update dockernetworks.md + +commit b800a93f5e80936a923a12f2ef66b0728ee7a87a +Author: Jeremiah Peschka +Date: Tue Feb 23 20:38:14 2016 -0800 + + Creating distinct Hyper-V and Administrators role checks + + Signed-off-by: Jeremiah Peschka + +commit deeb5c95e2eaa58d4490cb126839b8bc41e5ba08 +Author: Anil Belur +Date: Wed Mar 9 18:00:56 2016 +0530 + + Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425 + + Removed unnecessary RUN statements and combined some of the RUN statement into a single line. + + The runtime performance is seen as follows: + pre-change: + PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups + 63.074s + + post-change: + PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups + 49.698s + + Signed-off-by: Anil Belur + +commit f446771f0b20330523d014656427a95000540735 +Author: Zhang Wei +Date: Wed Mar 9 15:52:44 2016 +0800 + + Vendor docker/engine-api + + Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439 + + Signed-off-by: Zhang Wei + +commit 3d09842713b98dc59a0833c0fc110c14c5778d70 +Merge: 0771230daa 799a6b94ee +Author: Antonio Murdaca +Date: Wed Mar 9 07:22:08 2016 +0100 + + Merge pull request #21033 from estesp/workdir-perms-userns + + Ensure WORKDIR is created with remapped root ownership + +commit 5a654089416762da484ca9929fcd216076b591ab +Author: Alessandro Boch +Date: Tue Mar 8 18:47:02 2016 -0800 + + Vendoring libnetwork v0.7.0-dev.5 + + Signed-off-by: Alessandro Boch + +commit 7fd1db93125c2880699a8cb609bf84bbdc4b9773 +Author: Brian Bland +Date: Tue Mar 8 15:57:12 2016 -0800 + + Updates Swift driver to support new storagedriver.FileWriter interface + + Signed-off-by: Brian Bland + +commit a9bf7a2aaec88cfeb69a92de8c7d5f212cf30c4d +Author: Li Yi +Date: Sun Feb 21 08:54:32 2016 +0800 + + Support FileWriter interface for OSS storage driver + + Change-Id: Ie5533ad85f944800499ca1040fd67bf1378815e0 + Signed-off-by: Li Yi + +commit 307504713f5f6a8846cdc762898446ac87310119 +Author: Arthur Baars +Date: Sun Feb 14 18:15:15 2016 +0000 + + Storagedriver: GCS: add chunksize parameter + + Signed-off-by: Arthur Baars + +commit 7162cb19c6c28faf4c5da9671f7839619ba66ea6 +Author: Arthur Baars +Date: Fri Feb 12 13:30:57 2016 +0000 + + Storagedriver: GCS: implement resumable uploads + + Signed-off-by: Arthur Baars + +commit 666273d9f6f02d394d4202cb9d2bf2b1d642974c +Author: Arthur Baars +Date: Fri Feb 12 17:49:37 2016 +0000 + + StorageDriver: Testsuite: call Close before getting Size + + Signed-off-by: Arthur Baars + +commit ff03381d4906d9d90dd92b1ad1050a63147464c7 +Author: Brian Bland +Date: Mon Feb 8 14:29:21 2016 -0800 + + Adds new storagedriver.FileWriter interface + + Updates registry storage code to use this for better resumable writes. + Implements this interface for the following drivers: + + Inmemory + + Filesystem + + S3 + + Azure + + Signed-off-by: Brian Bland + +commit 0771230daac8aa2d66edddecd935d2c182850077 +Merge: 6b0119aefb 7d80d64ca5 +Author: Tianon Gravi +Date: Tue Mar 8 16:11:42 2016 -0800 + + Merge pull request #20342 from vijaykilari/fix_20325 + + #20325 : arm64: Use gccgo as bootstrap for compiling golang + +commit 6b0119aefbc4b839d702cdc374c7d4d5cf988c37 +Merge: dd32445ecc ed231d4095 +Author: Sebastiaan van Stijn +Date: Wed Mar 9 00:59:43 2016 +0100 + + Merge pull request #20940 from HackToday/fixsave + + Refine error message when save non-exist image + +commit 46b2c3fadf295e399ae0c7558f00b3676cd4302e +Merge: b61928652c 87e34bd307 +Author: Olivier Gambier +Date: Tue Mar 8 15:25:09 2016 -0800 + + Merge pull request #1517 from aaronlehmann/fix-2-misspellings + + Fix two misspellings in source code comments + +commit 87e34bd307ad4c5686fed6f6352e12309e4ced7f +Author: Aaron Lehmann +Date: Tue Mar 8 15:13:24 2016 -0800 + + Fix two misspellings in source code comments + + Signed-off-by: Aaron Lehmann + +commit 684278fe068f27aeec31be98030a0eb8efeb712f +Author: Alexandre Vazquez +Date: Tue Mar 8 23:53:34 2016 +0100 + + Changes to the Gruntfile to allow to create a release version on Windows. + + P.S. Avoid the execution of shell:sign and shell:zip because on Windows there is no way to execute the sign process to Mac Applications. + + Signed-off-by: Alexandre Vazquez + +commit 9390d5f335d94954fef5d8acc4e62008aec271bc +Merge: 51f49d78f5 453304c795 +Author: Victor Vieux +Date: Tue Mar 8 15:09:27 2016 -0800 + + Merge pull request #1880 from nishanttotla/engine-api-trial + + Introducing engine-api client into Swarm + +commit 7de9b08ca5d14c5d0a2eaeb78f0427a15180818b +Merge: a6649b308e d2b065e615 +Author: Daniel Nephin +Date: Tue Mar 8 15:04:59 2016 -0800 + + Merge pull request #3066 from shin-/3062-dont-log-noop-volume-create + + Don't call create on existing volumes + +commit be91b3342c60340e8a5587552ce551dcdde1eaf6 +Author: Ying Li +Date: Tue Mar 8 11:40:32 2016 -0800 + + Fix Makefile to exclude the vendor directory from linting/vetting + + Signed-off-by: Ying Li + +commit a9f2006f105340890787799a5686b9760ab6be42 +Author: David Calavera +Date: Mon Mar 7 19:02:35 2016 -0500 + + Compare event nanoseconds properly to filter since a specific date. + + Signed-off-by: David Calavera + +commit dd32445ecc6b706e8681dcc9d80c42c9b6cbf6cd +Merge: 76a5ab3b43 69cf03700f +Author: David Calavera +Date: Tue Mar 8 14:03:36 2016 -0800 + + Merge pull request #18697 from jfrazelle/pids-cgroup + + Add PIDs cgroup support to Docker + +commit 76a5ab3b43c93352e46c6a5c236f85d3281380fe +Merge: 95bc1f1ccd 8dd8ec137e +Author: David Calavera +Date: Tue Mar 8 13:02:01 2016 -0800 + + Merge pull request #21035 from LK4D4/exec_ids + + make TestExecInspectIDs less racy + +commit 95bc1f1ccdf7c1172481d7ed663bfe5d71b10352 +Merge: 6d6919ed79 cdd8d3999f +Author: Sebastiaan van Stijn +Date: Tue Mar 8 21:50:44 2016 +0100 + + Merge pull request #21032 from trishnaguha/docker-group + + Creates docker group for non-root access + +commit 0a091055d24bec9501e918353fe1c5009f88dc0c +Author: Daniel Nephin +Date: Tue Mar 8 15:39:11 2016 -0500 + + Improve handling of connection errors and error messages. + + Signed-off-by: Daniel Nephin + +commit 6d6919ed79083b3339889911853589a6502afc5c +Merge: 471e434400 c7a340e2be +Author: Brian Goff +Date: Tue Mar 8 15:35:00 2016 -0500 + + Merge pull request #20995 from wenchma/ping_timeout + + Update ping command timeout to 4 sec + +commit 845dce846528f1ab7f6dc43b760b32aee666d9ac +Author: John Starks +Date: Sun Mar 6 03:20:49 2016 +0000 + + Windows: Revendor github.com/Microsoft/go-winio + + This fixes docker save when the daemon was launched from a remote + PowerShell session. + + Signed-off-by: John Starks + +commit 471e434400620f60e434bee4f6040783449c7e5e +Merge: dc702b6c6b 0ab5805c08 +Author: Tibor Vass +Date: Tue Mar 8 15:11:49 2016 -0500 + + Merge pull request #21036 from jfrazelle/fix-release-generation + + only add the suites that exist we dont need the script for this + +commit 886328640f5665c337bb9dd1f065cc0e350364f0 +Author: Daniel Nephin +Date: Tue Mar 8 14:42:51 2016 -0500 + + Convert some cli tests to pytest. + + Signed-off-by: Daniel Nephin + +commit 00c667a5b1bf5971fcb33e897d6d2a8d7a24a8d4 +Author: Ying Li +Date: Tue Mar 8 11:38:39 2016 -0800 + + Update dockerfiles to be go 1.6 and to no longer set the GOPATH + + Signed-off-by: Ying Li + +commit 9f9dcc098a8f5df7168e8c9574ab2aebe8bf808a +Author: Daniel Nephin +Date: Tue Mar 8 14:35:54 2016 -0500 + + Make TopLevelCommand use the project field. + + Signed-off-by: Daniel Nephin + +commit 51dc1747e4ab5738039fc21f8a082cba5a6e4f78 +Author: Ying Li +Date: Tue Mar 8 11:28:04 2016 -0800 + + Move the godeps workspace to the vendor directory to be compliant with Go 1.6 + + Signed-off-by: Ying Li + +commit dc702b6c6bda5cd2d530e86804627c1a5a155e3c +Merge: 38e1cd1dc1 74bb1ce9e9 +Author: Brian Goff +Date: Tue Mar 8 14:26:15 2016 -0500 + + Merge pull request #20727 from mrunalp/no_new_priv + + Add support for NoNewPrivileges in docker + +commit 53bea8a72040ad4b96777e9d020029ce363f9ee7 +Author: Daniel Nephin +Date: Mon Feb 29 14:35:23 2016 -0800 + + Refactor command dispatch to improve unit testing and support better error messages. + + Signed-off-by: Daniel Nephin + +commit a6649b308e05a7a0bc65b607930e2aac5265c3fc +Merge: 9e242cdc75 e700d7ca6a +Author: Daniel Nephin +Date: Tue Mar 8 11:18:45 2016 -0800 + + Merge pull request #3094 from aanand/fix-version-in-docs-example + + Fix version in aliases example + +commit 38e1cd1dc17918c9ac8ff5d50cbfb44aa9a84830 +Merge: 9e2c4de0de fe8fa85074 +Author: David Calavera +Date: Tue Mar 8 11:17:12 2016 -0800 + + Merge pull request #20975 from runcom/secretservice-creds-store + + cliconfig: credentials: set default for unix + +commit dc377b3ceb4caaf35b8276972f211751574f9522 +Author: Ying Li +Date: Tue Mar 8 11:16:57 2016 -0800 + + Bump go-connections and canonical go dependencies to the latest version + + Logging bugfix for github.com/docker/go-connections + github.com/docker/go rebased to go 1.6 + + Signed-off-by: Ying Li + +commit 0ab5805c0850d055c92f29fbadd4b7a90fc4f76a +Author: Jessica Frazelle +Date: Tue Mar 8 11:08:00 2016 -0800 + + only add the suites that exist we dont need the script for this + + Signed-off-by: Jessica Frazelle + +commit 8dd8ec137eb02519091d9361af566d7f9cd9a11f +Author: Alexander Morozov +Date: Tue Mar 8 09:51:39 2016 -0800 + + make TestExecInspectIDs less racy + + Signed-off-by: Alexander Morozov + +commit e700d7ca6ad4d38cff6ecb5b855c703a98d163e3 +Author: Aanand Prasad +Date: Tue Mar 8 18:15:18 2016 +0100 + + Fix version in docs example + + Signed-off-by: Aanand Prasad + +commit 799a6b94ee661022d66f88a009ff58f08eb5a2c3 +Author: Phil Estes +Date: Tue Mar 8 10:40:30 2016 -0500 + + Ensure WORKDIR is created with remapped root ownership + + Correct creation of a non-existing WORKDIR during docker build to use + remapped root uid/gid on mkdir + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 69cf03700fed7bf5eb7fe00c9214737e21478e49 +Author: Jessica Frazelle +Date: Tue Dec 15 11:15:43 2015 -0800 + + pids limit support + + update bash commpletion for pids limit + + update check config for kernel + + add docs for pids limit + + add pids stats + + add stats to docker client + + Signed-off-by: Jessica Frazelle + +commit cdd8d3999ffd9f7eeb764f52e21577e0900d7b5c +Author: trishnaguha +Date: Tue Mar 8 21:03:14 2016 +0530 + + Creates docker group for non-root access + + Signed-off-by: trishnaguha + +commit 000eaee16ab19608ee4d96f2ceb48cf24a763d76 +Author: wenchma +Date: Tue Mar 8 17:09:28 2016 +0800 + + Update image format for service conf reference + + Signed-off-by: Wen Cheng Ma + +commit fe8fa85074a62241640e5c2d9d2501c354517efc +Author: Antonio Murdaca +Date: Sat Mar 5 15:38:50 2016 +0100 + + cliconfig: credentials: set default for unix + + Signed-off-by: Antonio Murdaca + +commit c7a340e2be351e24c3be7aba8fa2032fa6f01e52 +Author: Wen Cheng Ma +Date: Mon Mar 7 17:19:51 2016 +0800 + + Update ping command timeout to 4 sec + + Signed-off-by: Wen Cheng Ma + +commit 5a270c975123e00bd42a385ccd36501c20f7a3d7 +Merge: 475053cd7f b8b1eb6e9f +Author: David Gageot +Date: Tue Mar 8 06:27:09 2016 +0100 + + Merge pull request #3160 from zembutsu/patch-1 + + fix typo + +commit b8b1eb6e9fbcede63e54d4f2cbd9d7413003d61e +Author: Masahito Zembutsu +Date: Tue Mar 8 12:18:16 2016 +0900 + + fix typo + + Signed-off-by: Masahito Zembutsu + +commit 88a719b4b685be62a4bcc354a07f9ecd42e1282f +Author: Louis Tiao +Date: Tue Mar 8 15:48:42 2016 +1100 + + Fixed indentation level in example. + + Signed-off-by: Louis Tiao + +commit ed95f3baab4b44a7aca70599fab7ad3d474d5604 +Author: Ahmet Alp Balkan +Date: Wed Jan 27 19:30:01 2016 -0800 + + New Microsoft Azure docker-machine driver + + The new driver uses Azure Resource Manager APIs and offers a lot + more functionality compared to the old Azure driver. It is also + easier to authenticate and does not require user to create and place + certificate files. It only has a single required argument. + + This is a breaking change: The new driver cannot work with machines + created with the older Azure driver and vice versa (as the APIs are + entirely different and resources are not shared between old/new azure + APIs). + + The new driver addresses many issues about the azure driver reported + so far. + + This resolves #2742, resolves #1368, resolves #1142, resolves #2236, + resolves #2408, resolves #1126, resolves #774. + + Signed-off-by: Ahmet Alp Balkan + +commit 9e2c4de0dea695411f8df2efd116594eaf4602aa +Merge: 5ded3a212b ad7398e664 +Author: Brian Goff +Date: Mon Mar 7 22:05:58 2016 -0500 + + Merge pull request #20961 from Microsoft/FlakeyTestFix + + Reenabled TestPsListContainers* tests and increased sleep time + +commit 021a12ef1b96ebee852173212d9de6b0a6285f92 +Author: Qiang Huang +Date: Tue Mar 8 10:54:18 2016 +0800 + + Revert hack in TestExecTTY + + It'll weaken this test case, and the flaky test is resolved + by another commit in this PR. + + Signed-off-by: Qiang Huang + +commit a444b5f60c75bdac82c9a7126738c210e2ccf941 +Author: Qiang Huang +Date: Tue Mar 8 10:45:17 2016 +0800 + + Fix race condition when exec with tty + + I can reproduce this easily on one of my servers, + `docker exec -ti my_cont ls` will not print anything, + without `-t` it acts normally. + + Signed-off-by: Qiang Huang + +commit d2b065e6156e502f2d3be4e5d0ca620a20ecb3d3 +Author: Joffrey F +Date: Mon Mar 7 18:07:41 2016 -0800 + + Don't raise ConfigurationError for volume driver mismatch + when driver is unspecified + + Add testcase + + Signed-off-by: Joffrey F + +commit 698998c410ba5d8895eafeb5050901e32fe6e4bb +Author: Joffrey F +Date: Wed Mar 2 15:15:50 2016 -0800 + + Don't call create on existing volumes + + Signed-off-by: Joffrey F + +commit 453304c7950ebe2a271d58f0f81e9683a5106d1c +Author: Nishant Totla +Date: Mon Mar 7 15:22:47 2016 -0800 + + Updating version function to use engine-api + + Signed-off-by: Nishant Totla + +commit ed231d409501d1e496fbe2b2e31a279eb2998cf2 +Author: Kai Qiang Wu(Kennan) +Date: Fri Mar 4 10:05:34 2016 +0000 + + Refine error message when save non-exist image + + Fixes: #20709 + As discussed in the issue, we need refine the message to + help user more understood, what happened for non-exist image. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 40a24c3793be1dc0eca727333c5b9a3c3f5aec03 +Merge: d0256e2244 d45b9f86ef +Author: Riyaz Faizullabhoy +Date: Mon Mar 7 17:37:12 2016 -0800 + + Merge pull request #613 from docker/fix-mispell + + Fix mispelling of 'occur' + +commit d45b9f86ef56e1ba20f4097e6f7cb467726299d8 +Author: Ying Li +Date: Mon Mar 7 17:22:41 2016 -0800 + + Fix mispelling of 'occur' + + Signed-off-by: Ying Li + +commit 2c3e9e57949d23b4453b21339da56f0424ecbe42 +Author: Riyaz Faizullabhoy +Date: Mon Mar 7 10:18:18 2016 -0800 + + Update packaging for yubico + + Signed-off-by: Riyaz Faizullabhoy + +commit 475053cd7fd791be8e8d15eac082c7afa268ab64 +Merge: f7d4761390 7452cb2c4f +Author: Nathan LeClaire +Date: Mon Mar 7 17:13:25 2016 -0800 + + Merge pull request #3147 from nathanleclaire/fix_nitpick + + Fix amazonec2 test nitpicks + +commit d0256e22443fd06e64059d562d2d572c22b9c740 +Merge: dfeb51f54f 1bfafa0b77 +Author: David Lawrence +Date: Mon Mar 7 17:04:21 2016 -0800 + + Merge pull request #610 from docker/finish-client-update-tests + + Add test to check that if a key is rotated... + +commit 7452cb2c4f80f094e621b4a475eadf311e666df7 +Author: Nathan LeClaire +Date: Fri Mar 4 12:20:27 2016 -0800 + + Fix amazonec2 test nitpicks + + Signed-off-by: Nathan LeClaire + +commit f7d4761390b35c537f4d66027fd4c19bfa922d9e +Merge: 4d68c92a78 ced43e8a09 +Author: Nathan LeClaire +Date: Mon Mar 7 16:45:19 2016 -0800 + + Merge pull request #3140 from SeerUK/master + + Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050. + +commit b61928652ca04b6860fb719287febbadca6c0148 +Merge: 500fca56a1 302cc39937 +Author: Brian Bland +Date: Mon Mar 7 16:13:26 2016 -0800 + + Merge pull request #1514 from BrianBland/s3awsParameterParsing + + [driver/s3aws] Update s3aws driver parameter parsing to match s3goamz + +commit 526c2fe942107908fe324db2ecceee14b69cb191 +Author: Yong Tang +Date: Fri Mar 4 05:15:41 2016 +0000 + + Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc. + + This fix tries to improve the time to run TestRunUnshareProc + in #19425. + In this fix goroutines are used to run test cases in parallel to + prevent the test from taking a long time to run. + As the majority of the execution time in the tests is from + multiple executions of 'docker run' and each of which takes + several seconds, parallel executions improve the test time. + Since each 'docker run' is independent, the purpose of the + test is not altered in this fix. + + Signed-off-by: Yong Tang + +commit 4d68c92a78163f55804729be7476c3506a7dd842 +Merge: 8a178781f4 1b919459e8 +Author: Nathan LeClaire +Date: Mon Mar 7 15:20:37 2016 -0800 + + Merge pull request #3158 from tyrken/vsphere-port-default + + Default to port 443 for all vsphere actions, not just creation + +commit 8a178781f427d0f39b2a66e2a55289b59eb6c5f8 +Merge: 06f4d6dba5 b53f020c90 +Author: Nathan LeClaire +Date: Mon Mar 7 15:20:01 2016 -0800 + + Merge pull request #3157 from ahmetalpbalkan/azure + + Remove azure driver temporarily + Godeps for new azure driver + +commit 7376fd156b5d3f4c78cfc60419d5474ac94068a7 +Author: Nishant Totla +Date: Tue Feb 23 16:06:30 2016 -0800 + + Updating Godeps (engine-api and go-connections) + + Signed-off-by: Nishant Totla + +commit d4cfba1844f61cc2930d63fa3ce336b259bdbd8b +Author: Nishant Totla +Date: Sat Feb 20 20:10:37 2016 -0800 + + Adding engine-api client + + Signed-off-by: Nishant Totla + +commit 51f49d78f5a598dcb8aa3b2e72c0f525565bb60d +Merge: 1da3c25c06 e0583ea7d7 +Author: Victor Vieux +Date: Mon Mar 7 14:23:03 2016 -0800 + + Merge pull request #1930 from dongluochen/ChannelDoubleClose + + Prevent crash on double calls to Disconnect + +commit 8bd613aa115c36b26ca830f6c45dafadbf4804e4 +Author: Richard Scothern +Date: Fri Feb 26 14:18:09 2016 -0800 + + URL parse auth endpoints to normalize hostname to lowercase. + + It is possible for a middlebox to lowercase the URL at somepoint causing a + lookup in the auth challenges table to fail. Lowercase hostname before + using as keys to challenge map. + + Signed-off-by: Richard Scothern + +commit b53f020c90a99d4b3ee985f3fd246a2e18fe07ce +Author: Ahmet Alp Balkan +Date: Mon Mar 7 13:29:34 2016 -0800 + + Remove azure driver temporarily + + This commit temporarily removes Azure driver and its dependencies + from the source tree and adds dependencies for the new Azure driver + (so that Azure driver PR will not have godeps changes and will be + easier to review). + + Signed-off-by: Ahmet Alp Balkan + +commit 1b919459e87dfac6f4b34c4c5dbc4c83d326b395 +Author: Tristan Keen +Date: Mon Mar 7 21:31:27 2016 +0000 + + Default to port 443 for all vsphere actions, not just creation + + Signed-off-by: Tristan Keen + +commit 2e222f69b3486cf20039525a882ae4153b52f92c +Author: Vivek Goyal +Date: Mon Mar 7 20:27:39 2016 +0000 + + devmapper: Add a new option dm.min_free_space + + Once thin pool gets full, bad things can happen. Especially in case of xfs + it is possible that xfs keeps on retrying IO infinitely (for certain kind + of IO) and container hangs. + + One way to mitigate the problem is that once thin pool is about to get full, + start failing some of the docker operations like pulling new images or + creation of new containers. That way user will get warning ahead of time + and can try to rectify it by creating more free space in thin pool. This + can be done either by deleting existing images/containers or by adding more + free space to thin pool. + + This patch adds a new option dm.min_free_space to devicemapper graph + driver. Say one specifies dm.min_free_space=10%. This means atleast + 10% of data and metadata blocks should be free in pool before new device + creation is allowed, otherwise operation will fail. + + By default min_free_space is 10%. User can change it by specifying + dm.min_free_space=X% on command line. A value of 0% will disable the + check. + + Signed-off-by: Vivek Goyal + +commit 302cc39937e47421834386830f5832ceb816fc80 +Author: Brian Bland +Date: Mon Mar 7 11:50:46 2016 -0800 + + [driver/s3aws] Update s3aws driver parameter parsing to match s3goamz + + Mirrors changes from #1414 into the newer driver + + Signed-off-by: Brian Bland + +commit e0583ea7d7b8ab19f696794cdb22f05a6106ed7b +Author: Dong Chen +Date: Fri Mar 4 16:59:46 2016 -0800 + + Prevent crash on channel double close. + + Signed-off-by: Dong Chen + +commit de744b6f0f813a2b67abf26a499f5574331591fd +Author: Nathan LeClaire +Date: Mon Mar 7 11:45:42 2016 -0800 + + Bump Virtualbox version to 5.0.16 + + Signed-off-by: Nathan LeClaire + +commit 500fca56a1be4dc54c1a5e658c716e06fa5d694d +Merge: 33c4a6522e 85eadae19a +Author: Richard Scothern +Date: Mon Mar 7 11:19:54 2016 -0800 + + Merge pull request #1513 from Windfarer/patch-1 + + command correction in documentation + +commit 5ded3a212b16087f836622e7dbfb584944e6e145 +Merge: dc82c2dda9 0515d9b9c0 +Author: Brian Goff +Date: Mon Mar 7 13:37:12 2016 -0500 + + Merge pull request #20852 from wenchma/net-alias + + Add tests of unsupported network-scoped alias on default networks + +commit dc82c2dda94efaa04abb1356935b918cb51995c6 +Merge: bc730f3d99 086d06dce1 +Author: Sebastiaan van Stijn +Date: Mon Mar 7 19:35:28 2016 +0100 + + Merge pull request #20998 from Ralle/Ralle-fix-json + + Update dockervolumes.md + +commit 37fa75b3447007bb8ea311f02610bb383b0db77f +Author: Riyaz Faizullabhoy +Date: Wed Mar 2 11:44:15 2016 -0800 + + Move pkcs11 out of experimental, into GA + + Signed-off-by: Riyaz Faizullabhoy + +commit 086d06dce1056521d3980e07373fad2070daffb1 +Author: Ralle +Date: Mon Mar 7 13:25:38 2016 +0100 + + Update dockervolumes.md + + Fix JSON highlighting + + Signed-off-by: Rasmus Abrahamsen + +commit 74bb1ce9e9dbfa9dd866e84f891e865fca906d9a +Author: Mrunal Patel +Date: Sun Feb 21 21:31:21 2016 -0800 + + Add support for NoNewPrivileges in docker + + Signed-off-by: Mrunal Patel + + Add tests for no-new-privileges + + Signed-off-by: Mrunal Patel + + Update documentation for no-new-privileges + + Signed-off-by: Mrunal Patel + +commit bc730f3d997ee4b2d53f7362c1d9f40f4074584a +Merge: 64a4a7a191 53b8b8f058 +Author: Brian Goff +Date: Mon Mar 7 11:20:14 2016 -0500 + + Merge pull request #20982 from Microsoft/jstarks/fix_tp5_commit + + Windows: Revendor github.com/Microsoft/hcsshim + +commit 64a4a7a191d82cf40893753fe677c0fe0ef1bff7 +Merge: 86ba0e29f5 526ddd3512 +Author: Vincent Demeester +Date: Mon Mar 7 13:32:10 2016 +0100 + + Merge pull request #20994 from runcom/fix-debugf + + api: server: server: remove redunant debugf + +commit 526ddd351218798199b6221fad67e1c335ad8542 +Author: Antonio Murdaca +Date: Mon Mar 7 08:59:48 2016 +0100 + + api: server: server: remove redunant debugf + + Signed-off-by: Antonio Murdaca + +commit 85eadae19a68a1bb2f53a927ff77f723695f89ec +Author: Eric Yang +Date: Mon Mar 7 10:36:34 2016 +0800 + + command correction in documentation + + the original ```$GOPATH/bin/registry $GOPATH/src/github.com/docker/distribution/cmd/registry/config-example.yml``` leads to the error like + + ``` + Error: unknown command "/Users/EricYang/go/src/github.com/docker/distribution/cmd/registry/config-example.yml" for "registry" + Run 'registry --help' for usage. + ``` + + I think the correct command should be ```registry serve``` + + Signed-off-by: Eric Yang + +commit 62fef18d69be7d8c5338fe5a471966dc1e6d68f7 +Author: Shane da Silva +Date: Mon Mar 7 01:03:28 2016 +0000 + + Fix documentation for creating containers with data volumes + + The documentation for Docker 1.10.2 (API version 1.22) mentions under + the "Create a container"[1] section that `HostConfig.Binds` can be given + a "container path" which will automatically "create a new volume for the + container." + + I interpreted this to mean it that the following two commands should + have the same net result: + + # Create container with data volume via REST API + curl --unix-socket /var/run/docker.sock -XPOST \ + http://localhost/containers/create \ + -H"Content-Type: application/json" \ + -d'{ + "Image": "", + ... + "HostConfig": { + "Binds": [ + "/some/data/volume" + ] + } + }' + + # Create container with data volume via CLI + docker create -v /some/data/volume + + However, this turned out not the be the case, as the former would create + a mount with no source and no corresponding volume: + + ... + "Mounts": [ + { + "Source": "", + "Destination": "/some/data/volume", + "Driver": "local", + "Mode": "", + "RW": true, + "Propagation": "rprivate" + } + ], + ... + "Config": { + ... + "Volumes": null, + ... + } + + ...whereas the latter would create a volume and mount it: + + ... + "Mounts": [ + { + "Name": "9b38af46d6..." + "Source": "/var/lib/docker/volumes/9b38af46d6.../_data", + "Destination": "/some/data/volume", + "Driver": "local", + "Mode": "", + "RW": true, + "Propagation": "" + } + ], + ... + "Config": { + ... + "Volumes": { + "/some/data/volume": {} + }, + ... + } + + However, if you instead specify the data volume via the `Volumes` key, + then it works as expected, e.g. + + curl --unix-socket /var/run/docker.sock -XPOST \ + http://localhost/containers/create \ + -H"Content-Type: application/json" \ + -d'{ + "Image": "...", + ... + "Volumes": {"/some/data/volume": {}} + }' + + ...will create a data volume and mount it. + + Thus the documentation is either incorrect, or this is a bug and the + ability to create a data volume via `HostConfig.Binds` does not + work as advertised for API version 1.22 (and likely others). + + I concluded that the documentation was incorrect. Since I've only + verified this behavior for Docker 1.10.2, I updated the docs for + API versions 1.22 and 1.23, but this may apply to other versions as + well. + + [1] https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/#create-a-container + + Signed-off-by: Shane da Silva + +commit 06f4d6dba50f400b87b711bffbfa09c54021b0de +Merge: 1a0a740e27 40939942a1 +Author: David Gageot +Date: Sun Mar 6 17:20:37 2016 +0100 + + Merge pull request #3154 from menglingwei/add-aliyun + + add Aliyun ECS Docker Machine Driver Plugin + +commit 86ba0e29f508e4a72ada73124c1e019f1de434a1 +Merge: 11b9d7f1ad b2f1f7ee00 +Author: Vincent Demeester +Date: Sun Mar 6 11:50:18 2016 +0100 + + Merge pull request #20866 from suiyuan2009/20801-add-ubuntu-notice + + add ubuntu arch note + +commit 11b9d7f1addde0cbb8199179a8d3f2a4dd17f798 +Merge: 91cafaadac 1a729c3dd8 +Author: Antonio Murdaca +Date: Sun Mar 6 11:37:59 2016 +0100 + + Merge pull request #20967 from calavera/fix_stop_hanging_on_dead_process + + Do not wait for container on stop if the process doesn't exist. + +commit b2f1f7ee00070aa5ae0265296baee2a268aa3cbc +Author: Ziming Dong +Date: Wed Mar 2 23:05:00 2016 +0800 + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + fix ubuntu installation guide url + + Signed-off-by: Ziming Dong + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + fix ubuntu installation guide url + + Signed-off-by: Ziming Dong + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + add ubuntu arch note + + Signed-off-by: Ziming Dong + + add ubuntu installation note + + Signed-off-by: Ziming Dong + + fix ubuntu installation guide url + + Signed-off-by: Ziming Dong + +commit 40939942a1e474b084b76f681f75247208c9bf0b +Author: menglingwei <1741651@qq.com> +Date: Thu Mar 3 11:05:31 2016 +0800 + + add Aliyun ECS Docker Machine Driver Plugin + + Signed-off-by: 治世 + +commit 53b8b8f0581b4ecb04a2aa4a195fd805f81bfa8c +Author: John Starks +Date: Sun Mar 6 03:08:21 2016 +0000 + + Windows: Revendor github.com/Microsoft/hcsshim + + This fixes commit on Windows post-TP4 due to a small change + in behavior in the ExportLayer API. + + Signed-off-by: John Starks + +commit 91cafaadaca29896082b6e8dc5866be0b46b3929 +Merge: beb17c096d 31410a6d79 +Author: Jess Frazelle +Date: Sat Mar 5 15:29:19 2016 -0800 + + Merge pull request #20981 from justincormack/seccomp_ipc + + Add ipc syscall to default seccomp profile + +commit 31410a6d79fc4ea6fa496636015bf9f53c1c8b14 +Author: Justin Cormack +Date: Sat Mar 5 22:10:12 2016 +0000 + + Add ipc syscall to default seccomp profile + + On 32 bit x86 this is a multiplexing syscall for the system V + ipc syscalls such as shmget, and so needs to be allowed for + shared memory access for 32 bit binaries. + + Fixes #20733 + + Signed-off-by: Justin Cormack + +commit beb17c096d3181c65d83961e9d13235d896511c1 +Merge: 160abfbeea 2736f77a94 +Author: Doug Davis +Date: Sat Mar 5 12:41:37 2016 -0500 + + Merge pull request #20978 from allencloud/fix-typo + + fix typos + +commit 2736f77a94f57ddde5de1e5dc66c168290b91da2 +Author: allencloud +Date: Sun Mar 6 00:59:11 2016 +0800 + + fix typos + + Signed-off-by: allencloud + +commit 81b7fba33e55005041699da5a782cf55272f1d66 +Author: Dimitar Bonev +Date: Sun Feb 28 16:54:01 2016 +0200 + + Allowing null for build args + + Signed-off-by: Dimitar Bonev + +commit 160abfbeeaa20314d5d971061d3bad7aaf87e66c +Merge: 44fb8fa588 ea86c30a4a +Author: Brian Goff +Date: Sat Mar 5 08:47:41 2016 -0500 + + Merge pull request #20803 from WeiZhang555/empty-stats-no-stream + + Bug fix: stats --no-stream always print zero values + +commit ea86c30a4acd53ef626d4c53aaf8f91134173948 +Author: Zhang Wei +Date: Tue Mar 1 15:09:48 2016 +0800 + + Bug fix: stats --no-stream always print zero values + + `docker stats --no-stream` always print zero values. + + ``` + $ docker stats --no-stream + CONTAINER CPU % MEM USAGE / LIMIT MEM % + NET I/O BLOCK I/O + 7f4ef234ca8c 0.00% 0 B / 0 B 0.00% + 0 B / 0 B 0 B / 0 B + f05bd18819aa 0.00% 0 B / 0 B 0.00% + 0 B / 0 B 0 B / 0 B + + ``` + + This commit will let docker client wait until it gets correct stat + data before print it on screen. + + Signed-off-by: Zhang Wei + +commit 33c4a6522e9247913fa0a9a2d78ef9a7aa98465f +Merge: 274825f403 a8aa2f78de +Author: Aaron Lehmann +Date: Fri Mar 4 15:29:08 2016 -0800 + + Merge pull request #1511 from dmcgowan/fix-oauth-cross-repo-push + + Fix oauth cross repository push + +commit a8aa2f78deca39a62245ac7edd9a8812bf3e1e8e +Author: Derek McGowan +Date: Fri Mar 4 15:13:27 2016 -0800 + + Fix oauth cross repository push + + Cross repository push tokens were not being cached and could not be used, + now any returned token will be used and the caching is hidden in the getToken function. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 274825f403372a313d8d7336a499f8cd33916f8e +Merge: 5b8592b72c efd7ea4624 +Author: Aaron Lehmann +Date: Fri Mar 4 14:47:48 2016 -0800 + + Merge pull request #1510 from dmcgowan/oauth-offline-access + + Add offline token option + +commit efd7ea462419840640663526f1c425bdccc0fbcf +Author: Derek McGowan +Date: Fri Mar 4 14:32:51 2016 -0800 + + Add offline token option + + Login needs to add an offline token flag to ensure a refresh token is returned by the token endpoint. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 1126e322341b8e2da397b0e1e2caa298d543cfae +Author: Derek McGowan +Date: Fri Mar 4 13:53:06 2016 -0800 + + Add post token implementation + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 44fb8fa588282e2227f2f75841ab6ada1c68da0b +Merge: 45865bc4f5 69004ff67e +Author: Sebastiaan van Stijn +Date: Fri Mar 4 22:37:57 2016 +0100 + + Merge pull request #20946 from thaJeztah/update-registry-links + + Update links to Docker Hub + +commit 45865bc4f5e21b2208859c62985a9c4f85660b42 +Merge: e7cbae9fd6 66e558c16c +Author: Doug Davis +Date: Fri Mar 4 16:27:07 2016 -0500 + + Merge pull request #20963 from tophj-ibm/properly-close-test-file + + Properly close and remove file in daemon test + +commit 1a729c3dd8e84eef0a0b10cab24e88b768557482 +Author: David Calavera +Date: Fri Mar 4 15:41:06 2016 -0500 + + Do not wait for container on stop if the process doesn't exist. + + This fixes an issue that caused the client to hang forever if the + process died before the code arrived to exit the `Kill` function. + + Signed-off-by: David Calavera + +commit 5b8592b72c46ed82347101bf67a597f6198350d5 +Merge: 62d46ef07d 2ef7a872de +Author: Richard Scothern +Date: Fri Mar 4 11:51:53 2016 -0800 + + Merge pull request #1475 from dmcgowan/oauth-registry-client + + Add oauth support to registry client auth + +commit 1a0a740e275af9530f1f77a75ed156cdef959ea3 +Merge: fa986949e0 494ba5f010 +Author: Nathan LeClaire +Date: Fri Mar 4 11:48:49 2016 -0800 + + Merge pull request #3111 from jsirois/jsirois/amazoneec2/multiple_sgs + + Support multiple `--amazonec2-security-group`s. + +commit e7cbae9fd6d6d140902bf68e7c9e4c57bbb9f5ad +Merge: 2af84d8875 6a1ae187d0 +Author: David Calavera +Date: Fri Mar 4 11:44:25 2016 -0800 + + Merge pull request #20959 from Microsoft/jjh/bumptimeout + + Windows CI: Bump timeout for tests + +commit 2ef7a872de6356e06c3bfa1abe5ce0c5f6049666 +Author: Derek McGowan +Date: Fri Mar 4 11:32:48 2016 -0800 + + Add options struct to initialize handler + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 66e558c16c7505750dc4941980521fc382dbe454 +Author: Christopher Jones +Date: Fri Mar 4 14:01:07 2016 -0500 + + Properly close and remove file in daemon test + + Fixes a bug where a file would be created and not deleted in + DockerSuite.TestDaemonDiscoveryBackendConfigReload + + Signed-off-by: Christopher Jones + +commit 2af84d8875045f853210dcdab2548daaad70856f +Merge: ea738c633f ad2fa39459 +Author: David Calavera +Date: Fri Mar 4 11:08:50 2016 -0800 + + Merge pull request #20934 from icecrime/20543_debugging + + Fix race condition on daemon shutdown (#20543) + +commit ea738c633f2da6041f03703ee294a024db21328b +Merge: c08b674d56 312e20bf6c +Author: Vincent Demeester +Date: Fri Mar 4 20:00:35 2016 +0100 + + Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode + + Enhancement of TestDockerNetworkInternalMode + +commit ad7398e664512e2015ea00907d0862dc1b6c73b2 +Author: Darren Stahl +Date: Fri Mar 4 10:46:55 2016 -0800 + + Reenabled TestPsListContainers* tests and increased sleep time + + Signed-off-by: Darren Stahl + +commit 3b74be8ab7d93a70af3e0ac6418627c1de72228b +Author: Lynda O'Leary +Date: Fri Mar 4 18:50:48 2016 +0000 + + Edited content in the Hello World section + + Signed-off-by: Lynda O'Leary + +commit 1da3c25c065c9c5a3804e496b5c5bf3f44c3eb1d +Merge: 313db93c08 c34a45023f +Author: Nishant Totla +Date: Fri Mar 4 10:03:38 2016 -0800 + + Merge pull request #1927 from allencloud/fix-typos-in-test-and-annotation + + fix typos in a test file and a function annotation + +commit 6a1ae187d081a5023493ab20fe41ba8a768d62bf +Author: John Howard +Date: Fri Mar 4 09:32:30 2016 -0800 + + Windows CI: Bump timeout for tests + + Signed-off-by: John Howard + +commit c08b674d56c37782fc26382f4b756e0518e394cf +Merge: 44b56341d9 1a63023450 +Author: Brian Goff +Date: Fri Mar 4 11:59:32 2016 -0500 + + Merge pull request #20843 from calavera/plugin_any_transport + + Call plugins with custom transports. + +commit c34a45023f65d539f1fa42955cc04c9b1fe41a1f +Author: Sun Hongliang +Date: Sat Mar 5 00:39:15 2016 +0800 + + fix typos in a test file and a function annotation + + Signed-off-by: Sun Hongliang + +commit 44b56341d9d40a53ad8d5c2cc87e3c5b2b0f28f3 +Merge: 29bade2cd0 2787072a65 +Author: Antonio Murdaca +Date: Fri Mar 4 16:49:47 2016 +0100 + + Merge pull request #20943 from vdemeester/20942-fix-containerPsContext + + Fix #20942 TestContainerPsContext unit test + +commit 24fcb7e83a2c310a4445686f7c99860fafe9d748 +Author: Erik M. Bray +Date: Thu Mar 3 16:47:26 2016 +0100 + + Remove the DOCKER_TOOLBOX_INSTALL_PATH registry when docker toolbox is uninstalled (it is no longer useful, and confuses programs that might check it for a docker toolbox installation) + + Signed-off-by: Erik M. Bray + +commit 69004ff67eed6525d56a92fdc69466c41606151a +Author: Sebastiaan van Stijn +Date: Fri Mar 4 15:48:52 2016 +0100 + + Update links to Docker Hub + + Updates links to Docker Hub with their new + URLs to prevent redirects. + + Signed-off-by: Sebastiaan van Stijn + +commit 29bade2cd0a09191279f04ebc6aeedaa70c772a0 +Merge: 8142ebb0be 9a9e2bb61d +Author: Sebastiaan van Stijn +Date: Fri Mar 4 15:09:35 2016 +0100 + + Merge pull request #20938 from runcom/split-daemon + + integration-cli: move daemon stuff to its own file + +commit 2787072a65efac3dee0b5299322e4a7cfba51f04 +Author: Vincent Demeester +Date: Fri Mar 4 14:20:41 2016 +0100 + + Try to fix #20942 TestContainerPsContext unit test + + Signed-off-by: Vincent Demeester + +commit 8142ebb0be765e6a1ac718d292bb66f7acb145de +Merge: 5f7941e412 843a119d49 +Author: Antonio Murdaca +Date: Fri Mar 4 13:17:54 2016 +0100 + + Merge pull request #20834 from rhatdan/relabelvolume + + Do not relabel if user did not request it for non local volumes + +commit 7d80d64ca5a185db8b498eecadfed215bdc3bffb +Author: Vijaya Kumar K +Date: Mon Feb 15 15:41:10 2016 +0530 + + arm64: Use gccgo as bootstrap for compiling golang + + The issue is armv6 released binaries are used as a GOROOT_BOOTSTRAP. + This might work on arm64 platforms that support 32-bit mode. + However not all arm64 platforms support 32-bit mode. 32-bit mode + is optional for ARMv8. So use gccgo as bootstrap. + + The build image is bumped to use ubuntu wily. + + Signed-off-by: Vijaya Kumar K + +commit 5f7941e412f36aa6ca7be5b2a3bf18060df051da +Merge: 9bc62e6031 c77bb28dfb +Author: Vincent Demeester +Date: Fri Mar 4 09:47:56 2016 +0100 + + Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs + + Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs. + +commit 9bc62e6031350d1db24e37cfa4983f719ab5e33b +Merge: ea5acb08fa 842b8d8784 +Author: Vincent Demeester +Date: Fri Mar 4 09:45:19 2016 +0100 + + Merge pull request #20872 from duglin/Issue20470 + + Optimize .dockerignore when there are exclusions + +commit c9880e6b051b5f1acec0ef11c085b9b5f35655f1 +Author: Derek McGowan +Date: Fri Mar 4 00:34:17 2016 -0800 + + Fetch token by credentials and refresh token + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 9a9e2bb61d2c0a5bda75ea5679919162f53f3297 +Author: Antonio Murdaca +Date: Fri Mar 4 09:29:24 2016 +0100 + + integration-cli: move daemon stuff to its own file + + Signed-off-by: Antonio Murdaca + +commit fa986949e0998f02638c780ca97510c824a75dc5 +Merge: 698958f61a aa461f079d +Author: David Gageot +Date: Fri Mar 4 07:29:26 2016 +0100 + + Merge pull request #3120 from daehyeok/Driver_env + + DRIVER environment variable + +commit ad2fa3945997905760a4c7ef0444580ffb4b939a +Author: Arnaud Porterie +Date: Thu Mar 3 19:42:54 2016 -0800 + + Fix race in container creation + + Only register a container once it's successfully started. This avoids a + race condition where the daemon is killed while in the process of + calling `libcontainer.Container.Start`, and ends up killing -1. + + There is a time window where the container `initProcess` is not set, and + its PID unknown. This commit fixes the race Engine side. + + Signed-off-by: Arnaud Porterie + +commit ea5acb08fa429b1d1833aa855793e8cbfabe25d8 +Merge: cb6cdb416c e8513675a2 +Author: Alexander Morozov +Date: Thu Mar 3 19:48:32 2016 -0800 + + Merge pull request #20854 from inatatsu/reduce-parsing-mountinfo + + Eliminate redundant parsing of mountinfo + +commit 312e20bf6ce7bb396cbc9d05114a66b41f23e3ab +Author: Wen Cheng Ma +Date: Thu Mar 3 16:54:51 2016 +0800 + + Enhancement of TestDockerNetworkInternalMode + + Signed-off-by: Wen Cheng Ma + +commit e8513675a20e2756e6c2915604605236d1a94d65 +Author: Tatsushi Inagaki +Date: Mon Feb 29 17:42:24 2016 +0900 + + Aufs: reduce redundant parsing of mountinfo + + Check whether or not the file system type of a mountpoint is aufs + by calling statfs() instead of parsing mountinfo. This assumes + that aufs graph driver does not allow aufs as a backing file + system. + + Signed-off-by: Tatsushi Inagaki + +commit 313db93c084935387733396d13bcfb42a891ade9 +Merge: efcc35ba08 c8ad0d9dec +Author: Nishant Totla +Date: Thu Mar 3 18:22:22 2016 -0800 + + Merge pull request #1925 from dongluochen/release-checklist-update + + Update RELEASE-CHECKLIST.md + +commit 66d6eaa83f6ddb51a204f58f5dcbf84d32052c83 +Author: Derek McGowan +Date: Thu Mar 3 17:38:12 2016 -0800 + + Update scope list to use space separator + + The oauth spec defines using a space to separate parts of a scope. + To better comply with future implementations built on oauth use a space to separate the resource scopes. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit d51f76f90379c11c0a6be95a38e53e2f129da4ba +Author: Derek McGowan +Date: Fri Feb 12 16:04:11 2016 -0800 + + Update oauth documentation to include returned scope + + Add post response values + Update password grant type to match oauth spec + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit cb6cdb416c405c59c7365f261446705d8593bdff +Merge: 17156ba98f 889d06178a +Author: Sebastiaan van Stijn +Date: Fri Mar 4 01:55:27 2016 +0100 + + Merge pull request #20927 from Zoltu/patch-1 + + Adds clarification to behavior of missing directories. + +commit 65a381ae32d86c4cfe3ae5157e53d16b97b4d64f +Author: Alan Thompson +Date: Thu Mar 3 16:23:49 2016 -0800 + + Update dockernetworks.md + + Make command line prompts consistent for both host and container shells. + + Signed-off-by: Alan Thompson + +commit 889d06178adef05d9f9d34a2098f0e6023b84bed +Author: Micah Zoltu +Date: Thu Mar 3 23:40:28 2016 +0000 + + Adds clarification to behavior of missing directories. + + Closes #20920 + + Signed-off-by: Micah Zoltu + +commit c77bb28dfb4e248005ed0c447df9d11d1822e133 +Author: Yong Tang +Date: Thu Mar 3 23:16:10 2016 +0000 + + Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs. + + This PR fix the DockerSuite.TestBuildDockerignoringWildDirs test + in #19425. + Instead of having multiple RUN instructions in Dockerfile for every + single directory tested, this PR tries to collapse multiple RUN + instructions into one RUN instruction in Dockerfile. + When a docker image is built, each RUN instruction in Dockerfile + will generate one layer in history. It takes considerable amount of + time to build many layers if there are many RUN instructions within + the Dockerfile. Collapsing into one RUN instruction not only speeds + up the execution significantly, it also conforms to the general + guideline of the Dockerfile reference. + Since the test (DockerSuite.TestBuildDockerignoringWildDirs) is + really about testing the docker build with ignoring wild + directories, the purpose of the test is not altered with this PR + fix. + + Signed-off-by: Yong Tang + +commit c8ad0d9dec67dc025ece6c474263d92601b2a503 +Author: Dong Chen +Date: Thu Mar 3 14:40:47 2016 -0800 + + Update RELEASE-CHECKLIST.md. + + Signed-off-by: Dong Chen + +commit efcc35ba081111ce42a5835b445d2140fc70af7e +Merge: f7495b3801 bac853a417 +Author: Nishant Totla +Date: Thu Mar 3 13:46:24 2016 -0800 + + Merge pull request #1924 from dongluochen/bump-1.1.3 + + Bump version to 1.1.3 + +commit bac853a4179326426e1a39857d8981157f18ebd2 +Author: Dong Chen +Date: Thu Mar 3 13:37:22 2016 -0800 + + Bump version to 1.1.3 + + Signed-off-by: Dong Chen + +commit cd3ea2c61962963b1749e14c3d376e4b658bdc5c +Merge: 6c6cefecfc d1a49abcf6 +Author: French Ben +Date: Thu Mar 3 11:37:43 2016 -0800 + + Merge pull request #1442 from docker/sockets + + Better socket support :deciduous_tree: + +commit 698958f61a629701c89cf19cf22950e0f49bc64a +Merge: 83afe2bec2 17c6578583 +Author: Nathan LeClaire +Date: Thu Mar 3 11:34:15 2016 -0800 + + Merge pull request #3144 from bamarni/do-existing-ssh-key + + [DigitalOcean] Allow to use an existing SSH key (closes #1445) + +commit d1a49abcf6778517602e5f2ff9ea1d4e3836c403 +Author: French Ben +Date: Wed Mar 2 17:36:40 2016 -0800 + + Updated logic and removed pref + + Signed-off-by: French Ben + +commit 62d46ef07d9ca38bba965564f80d71a7f10460fa +Merge: c8dff1bb57 1593c2413f +Author: Richard Scothern +Date: Thu Mar 3 10:20:51 2016 -0800 + + Merge pull request #1388 from aibaars/gcs-simplify-move + + StorageDriver: GCS: remove support for directory Moves + +commit f7495b380167d30c3af485b3d3fee1487b9b4c1e +Merge: a348207f18 4b8ed91226 +Author: moxiegirl +Date: Thu Mar 3 10:19:21 2016 -0800 + + Merge pull request #1923 from moxiegirl/fix-swarm-cap + + Changing swarm to Swarm in body text + +commit a348207f185ae81679f7410882d0d0e2d0e62c91 +Merge: ee28008f0b ba4ad74de3 +Author: Alexandre Beslic +Date: Thu Mar 3 10:12:17 2016 -0800 + + Merge pull request #1835 from jimmyxian/add-support-some-run-option + + Add support some run options + +commit 17156ba98ff8d29048b0f05f600fae9ccbd858a2 +Merge: ec79629a47 f2d481a299 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 19:04:42 2016 +0100 + + Merge pull request #20832 from aaronlehmann/login-endpoint-refactor + + Update login to use token handling code from distribution + +commit 4b8ed91226a9a49c2acb7cb6fb07228b3fe10007 +Author: Mary Anthony +Date: Thu Mar 3 10:04:25 2016 -0800 + + Changing swarm to Swarm in body text + + Signed-off-by: Mary Anthony + +commit ec79629a47e6a7291832733f5bc6d016cbee971b +Merge: 89d950303c 461976d2af +Author: Arnaud Porterie +Date: Thu Mar 3 09:51:58 2016 -0800 + + Merge pull request #20914 from yongtang/19425-DockerHubPullSuite.TestPullNonExistingImage + + Optimize slow bottleneck test of DockerHubPullSuite.TestPullNonExistingImage. + +commit 89d950303c4156a38f0bdb8e054acaa56e02aa47 +Merge: 00f9c2ce59 6c78edaf7f +Author: Sebastiaan van Stijn +Date: Thu Mar 3 18:44:33 2016 +0100 + + Merge pull request #20901 from HackToday/buildimage + + Fix the driver name empty case + +commit 9e242cdc75570a13334f5213c635edf543b154fa +Merge: 4ae71f41dd 53a3d14046 +Author: Aanand Prasad +Date: Thu Mar 3 17:23:22 2016 +0000 + + Merge pull request #3032 from dnephin/multiple_files_from_env_var + + Support multiple files in COMPOSE_FILE env var + +commit 1bfafa0b77a43c928b55b05311f19937782abc64 +Author: Ying Li +Date: Tue Mar 1 22:24:06 2016 -0500 + + Add test to check that if a key is rotated, but the requisite piece of + metadata hasn't been resigned, that an update fails because the + cached version is no longer valid. + + Signed-off-by: Ying Li + +commit 00f9c2ce59c54d07f934bf48f9806b31c1e667bd +Merge: ed4a736acc 16437d6a34 +Author: David Calavera +Date: Thu Mar 3 09:09:56 2016 -0800 + + Merge pull request #20870 from Microsoft/jjh/testupdaterestartpolicy + + Windows CI: TestUpdateRestartPolicy flakiness + +commit ed4a736acccdb678820e04fc798dc6d0ae83e8dd +Merge: c4be28d6a8 928bfd070b +Author: David Calavera +Date: Thu Mar 3 09:08:07 2016 -0800 + + Merge pull request #20906 from runcom/fix-int-tests + + integration-cli: fixups + +commit c4be28d6a81ce480a24fdba04dc78a3a5c8a1f08 +Merge: 0efa5e7366 b05b237075 +Author: David Calavera +Date: Thu Mar 3 09:02:12 2016 -0800 + + Merge pull request #20262 from cpuguy83/implemnt_mount_opts_for_local_driver + + Support mount opts for `local` volume driver + +commit 0efa5e7366c6a3e7387af8497c86d82b176ce572 +Merge: b7bc1ce1a4 ee2183881b +Author: David Calavera +Date: Thu Mar 3 08:59:43 2016 -0800 + + Merge pull request #20913 from estesp/vendor-api-usernsmode + + Update engine-api vendor for UsernsMode + +commit b7bc1ce1a4be4d309395303cdc573922a48bfd72 +Merge: 52d4fff0d7 5b3fc7aab2 +Author: David Calavera +Date: Thu Mar 3 08:48:57 2016 -0800 + + Merge pull request #20730 from clnperez/sysinfo-match-ip-case + + Match case for IP variables in sysinfo pkg + +commit 52d4fff0d7e958e191b1aa9faf2e132c1776c5e4 +Merge: 15e68dc8ee f75622e52a +Author: Arnaud Porterie +Date: Thu Mar 3 08:45:06 2016 -0800 + + Merge pull request #20890 from riyazdf/notary-snapshot-remote + + Rotate snapshot key to server when initializing new notary repos + +commit b05b2370757d7143d761e5e6abb8c0f9b009f737 +Author: Brian Goff +Date: Thu Feb 11 21:48:16 2016 -0500 + + Support mount opts for `local` volume driver + + Allows users to submit options similar to the `mount` command when + creating a volume with the `local` volume driver. + + For example: + + ```go + $ docker volume create -d local --opt type=nfs --opt device=myNfsServer:/data --opt o=noatime,nosuid + ``` + + Signed-off-by: Brian Goff + +commit 461976d2affe3ed4a354608d1dcb266e06f1d2b9 +Author: Yong Tang +Date: Thu Mar 3 14:18:10 2016 +0000 + + Optimize slow bottleneck test of DockerHubPullSuite.TestPullNonExistingImage. + + This PR fix the DockerHubPullSuite.TestPullNonExistingImage test + in #19425. The majority of the execution time in this test is + from multiple executions of 'docker pull', each of which takes + more than one second even though it tries to pull a non-existing + image. + Without changing the behavior of the 'docker pull' itself, this + fix tries to execute the 'docker pull' command in parallel in + order to speed up the execution of the overall test. + Since each 'docker pull' is independent, executions in parallel + should not alter the purpose of the test. + + Signed-off-by: Yong Tang + +commit ee2183881b0273ff1707501e71798a61018f50f0 +Author: Phil Estes +Date: Thu Mar 3 09:11:38 2016 -0500 + + Update engine-api vendor for UsernsMode + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 842b8d8784b132279003580eedd0e9c12b885815 +Author: Doug Davis +Date: Fri Feb 19 11:17:15 2016 -0800 + + Optimize .dockerignore when there are exclusions + + Closes #20470 + + Before this PR we used to scan the entire build context when there were + exclusions in the .dockerignore file (paths that started with !). Now we + only traverse into subdirs when one of the exclusions starts with that dir + path. + + Signed-off-by: Doug Davis + +commit 1593c2413f932157b53663f9c17bdee96689a05a +Author: Arthur Baars +Date: Fri Jan 22 14:40:21 2016 +0000 + + StorageDriver: GCS: remove support for directory Moves + + The Move operation is only used to move uploaded blobs + to their final destination. There is no point in implementing + Move on "folders". Apart from simplifying the code, this also + saves an HTTP request. + + Signed-off-by: Arthur Baars + +commit 15e68dc8eefad6b5b125209438a04d1d443e5b26 +Merge: d83ad2f554 dd850530a9 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 13:14:51 2016 +0100 + + Merge pull request #20863 from thaJeztah/add-kernel-memory-warning + + Add KernelMemory to "info" and show warning + +commit ba4ad74de30fd5fac671af2c65f63a052b4f9dab +Author: Xian Chaobo +Date: Thu Mar 3 19:53:47 2016 +0800 + + add support some run options + + Signed-off-by: Xian Chaobo + +commit d83ad2f554eb3c82b3116de9f8e0f5bce0cb06cc +Merge: b76a55308f dc0397c9a8 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 12:10:54 2016 +0100 + + Merge pull request #20907 from runcom/seccomp-docs + + docs: security: seccomp: mention Docker needs seccomp build and check config + +commit dc0397c9a8ae7b5074dfbbad71ed7dd37b163a48 +Author: Antonio Murdaca +Date: Thu Mar 3 11:58:40 2016 +0100 + + docs: security: seccomp: mention Docker needs seccomp build and check config + + Signed-off-by: Antonio Murdaca + +commit 928bfd070b176fbd14639af3e8b9dd260485d9b2 +Author: Antonio Murdaca +Date: Thu Mar 3 11:51:59 2016 +0100 + + integration-cli: fixups + + Signed-off-by: Antonio Murdaca + +commit b76a55308fffe89d5b2fe5930eaa6118d1d5bd9a +Merge: 1ca5f33b53 5649030e25 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 10:51:35 2016 +0100 + + Merge pull request #20882 from Microsoft/jstarks/new_windows_diff_format + + Write Windows layer diffs to tar in standard format + +commit 1ca5f33b53b8c8cce766bf929fbafd438f0fb845 +Merge: 01dd7ecffe 9af22098af +Author: Vincent Demeester +Date: Thu Mar 3 10:46:30 2016 +0100 + + Merge pull request #20898 from Microsoft/jjh/pslistcontainers + + Windows CI: Temporarily disable TestPsListContainers* + +commit 01dd7ecffe1416c1897cf1b6ecf3b5905008d964 +Merge: 174959e8bf 7ab696f6b0 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 10:46:10 2016 +0100 + + Merge pull request #20889 from jfrazelle/20888-fix-centos-tests + + fix centos when userns not in kernel + +commit 174959e8bfc56d73d1f4b2ee0247412f67c89a63 +Merge: df1941bf0e 5f2ba2b9ba +Author: Sebastiaan van Stijn +Date: Thu Mar 3 10:41:21 2016 +0100 + + Merge pull request #20896 from Microsoft/jjh/unit-pkg-integration + + Windows CI: Turn off failing unit tests pkg\integration + +commit df1941bf0e70dd3f98c2aadcf56e0df5123b8382 +Merge: 2348c6a404 9f5984d93f +Author: Sebastiaan van Stijn +Date: Thu Mar 3 10:40:22 2016 +0100 + + Merge pull request #20894 from Microsoft/jjh/unit-pkg-graphdb + + Windows CI: Turn off failing unit tests pkg\graphdb + +commit 2348c6a4046f8da6ca69501a8006db42525671f0 +Merge: 0eb20be13c 3e78ad7be2 +Author: Sebastiaan van Stijn +Date: Thu Mar 3 10:39:34 2016 +0100 + + Merge pull request #20892 from Microsoft/jjh/unit-pkg-fileutils + + Windows CI: Turn off failing unit test pkg\fileutils + +commit 17c6578583e61b144eb6071a900b589a3a9d26eb +Author: Bilal Amarni +Date: Thu Mar 3 10:35:32 2016 +0100 + + [DigitalOcean] Allow to use an existing SSH key (closes #1445) + + Signed-off-by: Bilal Amarni + +commit 6c78edaf7f22bfe3bd731855f767b9fa3c7d8549 +Author: Kai Qiang Wu(Kennan) +Date: Thu Mar 3 07:23:49 2016 +0000 + + Fix the driver name empty case + + As drivername maybe "" in hostconfig, so we should not + directly print dirvername with var drivername, + instead, we use the real driver name property to print it. + + Fixes: #20900 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 0eb20be13cf61911d030261d98e75cec4723fa88 +Merge: 361a63e5f2 7e884c6cd0 +Author: Vincent Demeester +Date: Thu Mar 3 08:25:51 2016 +0100 + + Merge pull request #20845 from Microsoft/jstarks/default_to_npipe + + Windows: Default to npipe transport + +commit 494ba5f010e8b3dcb1979e5fa7ce6eb9359a7f41 +Author: John Sirois +Date: Wed Feb 24 13:41:12 2016 -0800 + + Support multiple `--amazonec2-security-group`s. + + Maintains support for loading old Driver config.json that use the + singular `SecurityGroupName` field, but also adds a new plural + `SecurityGroupNames` field. + + This change also bumps to latest stretchr/testify, in the course of + adding a dep on stretchr/testify/mock to help test the modified + `configureSecurityGroups` code. + + The unused `deleteSecurityGroup` is dropped as well. + + Signed-off-by: John Sirois + Signed-off-by: Bill Farner + +commit 9af22098af836763e994ac272143ce5717c43fba +Author: John Howard +Date: Wed Mar 2 20:43:16 2016 -0800 + + Windows CI: Temporarily disable TestPsListContainers* + + Signed-off-by: John Howard + +commit 5f2ba2b9ba5d1030dacb6c686d12c6a91c3c0612 +Author: John Howard +Date: Wed Mar 2 19:37:18 2016 -0800 + + Windows CI: Turn off failing unit tests pkg\integration + + Signed-off-by: John Howard + +commit 9f5984d93fc4902d15904809015627b959bf11a1 +Author: John Howard +Date: Wed Mar 2 19:27:41 2016 -0800 + + Windows CI: Turn off failing unit tests pkg\graphdb + + Signed-off-by: John Howard + +commit 3e78ad7be2c702a51c752965ba10d8fa9c6e9738 +Author: John Howard +Date: Wed Mar 2 19:05:33 2016 -0800 + + Windows CI: Turn off failing unit test pkg\fileutils + + Signed-off-by: John Howard + +commit dfdf9e326e853768c5e02b13ae1277a15d645d63 +Author: French Ben +Date: Thu Feb 11 13:03:26 2016 -0800 + + Updated exec call for terminal + + Signed-off-by: French Ben + +commit c64b899259194e7645a4b80653252ab7e09ec690 +Author: French Ben +Date: Thu Feb 4 13:20:36 2016 -0800 + + Updated all unmount calls and better socket revamp + + Signed-off-by: French Ben + +commit 58e77236bffffeb3daf63c058323400e0c7d3552 +Author: French Ben +Date: Thu Dec 3 12:14:25 2015 -0800 + + Cleaner socket support and updated unmount calls + + Signed-off-by: French Ben + +commit 6c6cefecfcae4e9bd4b79d86ac52e2047cf7346d +Merge: 856a989d83 ff6d9323fd +Author: French Ben +Date: Wed Mar 2 17:26:57 2016 -0800 + + Merge pull request #855 from kudos/iterm2point9 + + Add support for launching iTerm 2.9+ + +commit 361a63e5f2b12c62bc3d9d7393129b323b41694a +Merge: f4cb5f4a32 08b65e7dd3 +Author: Brian Goff +Date: Wed Mar 2 20:15:49 2016 -0500 + + Merge pull request #20884 from Microsoft/jjh/integusenpipe + + Windows CI: Allow npipe protocol for sock requests + +commit 83afe2bec2c3f87659f472cec5379ba8e6c379b3 +Merge: 48c9efe622 3aaf16db51 +Author: Nathan LeClaire +Date: Wed Mar 2 17:14:32 2016 -0800 + + Merge pull request #3142 from dgageot/small-improvements-libmachine + + Small improvements libmachine + +commit dfeb51f54f2b0cdf20cb55427b7cc8ea2d1cdd0a +Merge: d7c93d7797 638d2f09c8 +Author: David Lawrence +Date: Wed Mar 2 17:10:46 2016 -0800 + + Merge pull request #606 from docker/doc-fixes + + Documentation fixes + +commit 7ab696f6b0e2d68cda7e28e68679e0f9fa06ef54 +Author: Jessica Frazelle +Date: Wed Mar 2 16:58:49 2016 -0800 + + fix centos when userns not in kernel + + Signed-off-by: Jessica Frazelle + +commit f75622e52acad0213b74c6210c73243d82c8f1be +Author: Riyaz Faizullabhoy +Date: Wed Mar 2 16:51:32 2016 -0800 + + Rotate snapshot key to server when initializing new notary repos + + Signed-off-by: Riyaz Faizullabhoy + +commit aa461f079d4a485573d1d8423d7ded76956e8534 +Author: Daehyeok Mun +Date: Fri Feb 26 10:44:54 2016 -0700 + + DRIVER environment variable + + Signed-off-by: Daehyeok Mun + +commit f4cb5f4a32ecb8e6e860b505337331f213658a99 +Merge: 9e7b77a585 44152144ca +Author: David Calavera +Date: Wed Mar 2 16:37:57 2016 -0800 + + Merge pull request #20824 from runcom/fix-creds-store + + cliconfig: credentials: support getting all auths + +commit 5649030e25bd87b4b0bbd200515b8c7317ae8ce1 +Author: John Starks +Date: Thu Feb 18 18:11:36 2016 -0800 + + Write Windows layer diffs to tar in standard format + + Previously, Windows layer diffs were written using a Windows-internal + format based on the BackupRead/BackupWrite Win32 APIs. This caused + problems with tar-split and tarsum and led to performance problems + in implementing methods such as DiffPath. It also was just an + unnecessary differentiation point between Windows and Linux. + + With this change, Windows layer diffs look much more like their + Linux counterparts. They use AUFS-style whiteout files for files + that have been removed, and they encode all metadata directly in + the tar file. + + This change only affects Windows post-TP4, since changes to the Windows + container storage APIs were necessary to make this possible. + + Signed-off-by: John Starks + +commit 4ae71f41dd19da501ad6c799d20b122a2cfbc28c +Merge: f75408923e 20caf02bf6 +Author: Aanand Prasad +Date: Wed Mar 2 16:10:44 2016 -0800 + + Merge pull request #2832 from aanand/refactor-cli-unit-tests + + Refactor CLI initialization and unit tests + +commit 9e7b77a585e1601e906a435dbf0cdf0394db61e9 +Merge: 508a17baba d609de989f +Author: Arnaud Porterie +Date: Wed Mar 2 16:06:12 2016 -0800 + + Merge pull request #20880 from yongtang/19425-DockerSuite.TestBuildHistory + + Optimize slow bottleneck test of DockerSuite.TestBuildHistory. + +commit 53a3d14046e00b6489ae4aadeb0e3325cb5169b1 +Author: Daniel Nephin +Date: Fri Feb 26 15:55:06 2016 -0800 + + Support multiple files in COMPOSE_FILE env var. + + Signed-off-by: Daniel Nephin + +commit 20caf02bf6a99d316615769af558c7212e25927b +Author: Aanand Prasad +Date: Fri Feb 5 17:09:07 2016 +0000 + + Create real Project objects in CLI unit tests + + Signed-off-by: Aanand Prasad + +commit 4644f2c0f998d7f3a27464cb965265c041a17e2a +Author: Aanand Prasad +Date: Fri Feb 5 13:12:43 2016 +0000 + + Remove environment-overriding unit test for 'run' + + There's already an acceptance test for it + + Signed-off-by: Aanand Prasad + +commit 575b48749d1eb8f8a583a5b1d2336003a6f12383 +Author: Aanand Prasad +Date: Fri Feb 5 17:53:35 2016 +0000 + + Remove unused global_options arg from dispatch() + + Signed-off-by: Aanand Prasad + +commit 2c75a8fdf556329acf1a8442cd9ac5f1e94be8cc +Author: Aanand Prasad +Date: Fri Feb 5 17:03:05 2016 +0000 + + Extract helper methods for building config objects from dicts + + Signed-off-by: Aanand Prasad + +commit f75408923e60ff757be532f0249d2b977f3eec04 +Merge: 3f98c0716e 18510b4024 +Author: Aanand Prasad +Date: Wed Mar 2 15:04:20 2016 -0800 + + Merge pull request #3053 from dnephin/handle_booleans_in_mappings + + Don't allow booleans for mapping types + +commit 3f98c0716ec1782f49180f64625937741e82f3d4 +Merge: f84ebf9b18 b726f508a6 +Author: Aanand Prasad +Date: Wed Mar 2 15:03:36 2016 -0800 + + Merge pull request #3052 from dnephin/merge_v1_logging + + Fix merging of logging options in v1 config + +commit f84ebf9b18f7889b5481afea918d35f99304309a +Merge: 1655be6c5b 04877d47aa +Author: Aanand Prasad +Date: Wed Mar 2 15:02:57 2016 -0800 + + Merge pull request #3048 from dnephin/osx_bin_from_travis + + Build OSX binary on Travis + +commit 1655be6c5bcbc35d2a34bd4c464b8a91981aaa42 +Merge: 3f3c05e465 e1b87d7be0 +Author: Aanand Prasad +Date: Wed Mar 2 15:02:18 2016 -0800 + + Merge pull request #2601 from dnephin/dont_build_on_up + + Only build as part of `up` if `--build` flag is set + +commit 48c9efe622db1c3e9dec8953f7061dd77750af0c +Merge: 251fd57d0f e67c78899d +Author: Nathan LeClaire +Date: Wed Mar 2 14:34:53 2016 -0800 + + Merge pull request #3133 from otherjason/google-internal-ip-only + + Google driver: add `--google-use-internal-ip-only` flag + +commit dd850530a96baef9f109fd2292f8c51a0836eefc +Author: Sebastiaan van Stijn +Date: Wed Mar 2 18:22:45 2016 +0100 + + Vendor engine-api + + Signed-off-by: Sebastiaan van Stijn + +commit 747a486b4aac2ebbbb28bd713b9a4a929f89353b +Author: Sebastiaan van Stijn +Date: Wed Mar 2 14:35:17 2016 +0100 + + Add KernelMemory to "info" and show warning + + This change adds "KernelMemory" to the /info endpoint and + shows a warning if KernelMemory is not supported by the kernel. + + This makes it more consistent with the other memory-limit + options. + + Signed-off-by: Sebastiaan van Stijn + +commit 08b65e7dd3e722da535767ee31ac8ed58c0cb3e2 +Author: John Howard +Date: Wed Mar 2 14:14:14 2016 -0800 + + Windows CI: Allow npipe protocol for sock requests + + Signed-off-by: John Howard + +commit 508a17baba3c39496008fc5b5e3fe890b8a1b31b +Merge: 0e0a8ade61 ca89c329b9 +Author: Vincent Demeester +Date: Wed Mar 2 23:17:27 2016 +0100 + + Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info + + Add CgroupDriver to docker info + +commit 882edc3f0e92483ccf9b7d4b32c5a63f73e12bbe +Author: John Starks +Date: Wed Mar 2 14:17:13 2016 -0800 + + Revendor Microsoft/go-winio and Microsoft/hcsshim + + Signed-off-by: John Starks + +commit 3aaf16db51cdecc44186f8145cd4a198ea9d0b6c +Author: David Gageot +Date: Wed Mar 2 22:35:44 2016 +0100 + + Use a typed error for consumers of libmachine + + Signed-off-by: David Gageot + +commit e3ff59bd9239eccbede0bb52ab0672799184ad71 +Author: David Gageot +Date: Wed Mar 2 22:27:59 2016 +0100 + + Export flags for consumers of libmachine + + Signed-off-by: David Gageot + +commit 0e0a8ade618097db7262d496b611730b3592961d +Merge: 6dcb14ce05 76a4009293 +Author: David Calavera +Date: Wed Mar 2 13:26:39 2016 -0800 + + Merge pull request #20875 from Microsoft/jjh/testlogsapiwithstdout + + Windows CI Reliablity: TestLogsApiWithStdout + +commit d609de989f98760e9fca94438184b815fb905681 +Author: Yong Tang +Date: Wed Mar 2 20:27:00 2016 +0000 + + Optimize slow bottleneck test of DockerSuite.TestBuildHistory. + + This PR fix the DockerSuite.TestBuildHistory test in #19425. + It changes the base image from busybox into 'minimalBaseImage()' + and changes the RUN in Dockerfile into LABEL, which greatly + reduces the executation time. + Since the test (DockerSuite.TestBuildHistory) is really about + testing docker history, not about RUN in Dockerfile, the + purpose of the test is not altered. + + Signed-off-by: Yong Tang + +commit e1b87d7be0aa11f5f87762635a9e24d4e8849e77 +Author: Daniel Nephin +Date: Fri Feb 26 15:03:53 2016 -0800 + + Update reference docs for the new flag. + + Signed-off-by: Daniel Nephin + +commit b7fb3a6d9b2f96df47e4133b1bbf8d8d478b9373 +Author: Daniel Nephin +Date: Thu Feb 25 16:39:58 2016 -0800 + + Add --build flag for up and create + + Also adds a warning when up builds an image without the --build flag + so that users know it wont happen on the next up. + + Signed-off-by: Daniel Nephin + +commit 00497436153cd60c5b43f396659cc697fda770e2 +Author: Harald Albers +Date: Wed Mar 2 21:12:19 2016 +0100 + + add support for multiple compose files to bash completion + + Since 1.6.0, Compose supports multiple compose files specified with `-f`. + These need to be passed to the docker invocations done by the + completion. + + Signed-off-by: Harald Albers + +commit 3f3c05e465ab7b7cc5bda11f42f27eeef70fc2e8 +Merge: 0b3561a7d5 aa7b862f4c +Author: Aanand Prasad +Date: Wed Mar 2 11:59:06 2016 -0800 + + Merge pull request #3049 from aanand/clarify-depends-on + + Clarify depends_on logic + +commit ee28008f0bcc564f7d85575a4c82006f18e167ad +Merge: f9f12ef2dc 0e60c71121 +Author: Dongluo Chen +Date: Wed Mar 2 11:54:23 2016 -0800 + + Merge pull request #1881 from vieux/test_env_reschedule_compose + + use env in compose test + +commit f9f12ef2dc38732aa63e2b5e062f2c77ed5d30fb +Merge: 045bfe93d1 bf5c744a49 +Author: Nishant Totla +Date: Wed Mar 2 11:36:18 2016 -0800 + + Merge pull request #1918 from dongluochen/IPv6Support + + Fix IPv6 address format issue + +commit 045bfe93d199e6920611523d23d1143600c30767 +Merge: 5ce850f0f4 f9aca81b67 +Author: Alexandre Beslic +Date: Wed Mar 2 11:23:04 2016 -0800 + + Merge pull request #1845 from thaJeztah/fix-api-markdown + + Update Swarm API documentation + +commit 6dcb14ce05e168c4942fee2ee44a280fd1316590 +Merge: 34a56d2cae 0eccc3838e +Author: Vincent Demeester +Date: Wed Mar 2 20:17:19 2016 +0100 + + Merge pull request #20860 from runcom/fix-logout-credsStore + + api: client: fix login/logout with creds store + +commit bf5c744a496bbd8c5616d3a75e28dc037fbe1ed7 +Author: Dong Chen +Date: Wed Mar 2 11:01:48 2016 -0800 + + Check port range. Add more unit tests for address format. + + Signed-off-by: Dong Chen + +commit 5ce850f0f4fcfa760331c91c99ba0f51a7d98e34 +Merge: f6131d0331 6e4ad3f093 +Author: Alexandre Beslic +Date: Wed Mar 2 10:34:35 2016 -0800 + + Merge pull request #1903 from wenchma/typo + + Fix some typo error for install-manual.md + +commit aa7b862f4c7f10337fc0b586d70aae5392b51f6c +Author: Aanand Prasad +Date: Mon Feb 29 15:53:04 2016 -0800 + + Clarify depends_on logic + + Signed-off-by: Aanand Prasad + +commit 76a400929343dd9200a2129c561e311c3efaf4cb +Author: John Howard +Date: Wed Mar 2 10:26:15 2016 -0800 + + Windows CI Reliablity: TestLogsApiWithStdout + + Signed-off-by: John Howard + +commit 34a56d2cae6f04a4a759f7055864f7d4615777a7 +Merge: 613d364e23 cf6016c24e +Author: Sebastiaan van Stijn +Date: Wed Mar 2 19:08:56 2016 +0100 + + Merge pull request #20839 from icecrime/failing_ci_label + + Introduce `status/failing-ci` label + +commit 613d364e238ca002c502bcaf6b61760066ef956a +Merge: b65fd8e879 a4dbbe7d89 +Author: Aaron Lehmann +Date: Wed Mar 2 10:05:46 2016 -0800 + + Merge pull request #20868 from LK4D4/unused_ctx + + Remove unused ctx from v1Pusher + +commit bc27cedd8c495382912593d6ee3967e5ffec97a7 +Author: Dong Chen +Date: Wed Mar 2 10:03:08 2016 -0800 + + Godep update github.com/docker/docker/pkg/... + + Signed-off-by: Dong Chen + +commit c73f17fb6eb49f8145c9817ef77f710165a69392 +Author: Dong Chen +Date: Tue Mar 1 16:28:24 2016 -0800 + + Support IPv6 address format. + + Signed-off-by: Dong Chen + +commit 1a630234508bdb12d55425ceebdb0b6523a38578 +Author: David Calavera +Date: Tue Mar 1 20:16:40 2016 -0500 + + Call plugins with custom transports. + + Small refactor to be able to use custom transports + to call remote plugins. + + Signed-off-by: David Calavera + +commit f6131d033124d23524010b61877a7ce8e96174bc +Merge: 7e9c6bd963 03b8481f01 +Author: Victor Vieux +Date: Wed Mar 2 09:44:52 2016 -0800 + + Merge pull request #1917 from friism/patch-1 + + avoid syntax highlighter confusion + +commit b65fd8e879545e8c9b859ea9b6b825ac50c79e46 +Merge: 8f109829e2 068085005e +Author: Vincent Demeester +Date: Wed Mar 2 18:27:00 2016 +0100 + + Merge pull request #20858 from mountkin/validate-log-opts-again + + validate log-opt when creating containers AGAIN (fixing drunkard's code) + +commit 16437d6a34a7fe1bace7211c735689fb63f361bd +Author: John Howard +Date: Wed Mar 2 09:14:16 2016 -0800 + + Windows CI: TestUpdateRestartPolicy flakiness + + Signed-off-by: John Howard + +commit 03b8481f0103eb07934491dacf26f2e65266671b +Author: Michael Friis +Date: Wed Mar 2 09:00:27 2016 -0800 + + avoid syntax highlighter confusion + + Signed-off-by: Michael Friis + +commit 0eccc3838e4aac5318e98dcbfbe2100e253462de +Author: Antonio Murdaca +Date: Wed Mar 2 14:26:29 2016 +0100 + + api: client: fix login/logout with creds store + + Make sure credentials are removed from the store at logout (not only + in the config file). Remove not needed error check and auth erasing + at login (auths aren't stored anywhere at that point). + Add regression test. + + Signed-off-by: Antonio Murdaca + +commit 44152144ca766221e97fdaa5200fec3557a64f58 +Author: Antonio Murdaca +Date: Tue Mar 1 18:04:35 2016 +0100 + + cliconfig: credentials: support getting all auths + + docker build is broken because it sends to the daemon the full + cliconfig file which has only Email(s). This patch retrieves all auth + configs from the credentials store. + + Signed-off-by: Antonio Murdaca + +commit 8f109829e294371cbae1eebfc771eda96d92187f +Merge: 7c64681ce0 58bec40d16 +Author: David Calavera +Date: Wed Mar 2 08:36:36 2016 -0800 + + Merge pull request #20475 from Microsoft/jstarks/filegetter + + graphdriver: Replace DiffPath with DiffGetter + +commit a4dbbe7d898ae6db366076cbe13049a8f88fc731 +Author: Alexander Morozov +Date: Wed Mar 2 07:59:12 2016 -0800 + + Remove unused ctx from v1Pusher + + Signed-off-by: Alexander Morozov + +commit 7c64681ce00f725bad79ee46c501192c961ab376 +Merge: 4eb7a4916f 069da069cb +Author: Antonio Murdaca +Date: Wed Mar 2 16:12:11 2016 +0100 + + Merge pull request #20861 from thaJeztah/docs-improve-userns-note-for-fedora + + docs: improve note for Fedora 22 + +commit ced43e8a09767e99ecd2bf8728ee56cb4324c779 +Author: Elliot Wright +Date: Wed Mar 2 14:36:09 2016 +0000 + + Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050. + + Signed-off-by: Elliot Wright + +commit 069da069cb5386e6a441f34d5813a94fc738de59 +Author: Sebastiaan van Stijn +Date: Wed Mar 2 14:46:18 2016 +0100 + + docs: improve note for Fedora 22 + + Move the note more up, to prevent people from starting + the daemon with --userns-remap before touching the files. + + Also clarify that these steps must be done *before* enabling + userns-remap and starting the daemon. + + Also fixed some minor Markup formatting issues. + + Signed-off-by: Sebastiaan van Stijn + +commit 068085005ef378f6320fdce90a67b104399b796d +Author: Shijiang Wei +Date: Wed Mar 2 20:22:18 2016 +0800 + + validate log-opt when creating containers AGAIN + + Signed-off-by: Shijiang Wei + +commit ca89c329b9f0748da74d08d02a47bc494e7965e2 +Author: Qiang Huang +Date: Thu Feb 18 18:10:31 2016 +0800 + + Add CgroupDriver to docker info + + Fixes: #19539 + + Signed-off-by: Qiang Huang + +commit 05d9995985009b5bfc2a67c95a60ca974362af02 +Author: Eugene Chupriyanov +Date: Wed Feb 24 18:07:15 2016 +0300 + + Proposed fix for https://github.com/docker/swarm/issues/1847 + + * Fix cluster.Volumes.Get() call for volumes with non-local drivers + * Added tests for clusterVolumes.Get() + + Signed-off-by: Eugene Chupriyanov + +commit 4eb7a4916f1355ec450ca35c0cdaec1b9a7d0c7e +Merge: 621a148da3 0d270cadd4 +Author: Vincent Demeester +Date: Wed Mar 2 10:43:27 2016 +0100 + + Merge pull request #20841 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts-2 + + Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts + +commit 0515d9b9c0cbfa9d10b98c58f428f599174e961e +Author: Wen Cheng Ma +Date: Wed Mar 2 16:52:41 2016 +0800 + + Add tests of unsupported network-scoped alias on default networks + + Signed-off-by: Wen Cheng Ma + +commit 621a148da3631dd19eee724fb87cf00762aef4a3 +Merge: b18f9cc29b 5c99eebe81 +Author: Vincent Demeester +Date: Wed Mar 2 09:09:11 2016 +0100 + + Merge pull request #20831 from aaronlehmann/concurrent-upload + + Fix concurrent uploads that share layers + +commit b18f9cc29b8977bc003fd47aa35e8836345c301d +Merge: 266a75ac22 f9cfc4c387 +Author: Vincent Demeester +Date: Wed Mar 2 08:53:11 2016 +0100 + + Merge pull request #20833 from Microsoft/testunit-archive + + Windows CI: Unit Tests stop running failing archive test + +commit 266a75ac2219455d34aa6346596b936f42c20bcd +Merge: 04a3cedf44 7554e882df +Author: David Calavera +Date: Tue Mar 1 21:03:37 2016 -0800 + + Merge pull request #20842 from dongluochen/IPv6Support + + Handle IPv6 entries in discovery + +commit 04a3cedf4471ec9b26ccdb8dd14272b7d78eff89 +Merge: 911bb1b3b5 edeadcd9e1 +Author: David Calavera +Date: Tue Mar 1 21:03:23 2016 -0800 + + Merge pull request #20846 from icecrime/remove_theadactyl + + Remove @theadactyl + +commit edeadcd9e1e41a8b2c87f4e7326e8618c578e8d6 +Author: Arnaud Porterie +Date: Tue Mar 1 20:07:20 2016 -0800 + + Remove @theadactyl + + Signed-off-by: Arnaud Porterie + +commit 911bb1b3b5aa0a85e110ada371a2facbc96e0b4b +Merge: 7f223b72dd 7f6ef09736 +Author: David Calavera +Date: Tue Mar 1 19:48:44 2016 -0800 + + Merge pull request #20838 from Microsoft/testunit-chrootarchive + + Windows CI: Unit Tests stop running failing chrootarchive tests + +commit 7e884c6cd024e31fc510451feb177bb4689c1815 +Author: John Starks +Date: Tue Mar 1 18:25:04 2016 -0800 + + Windows: Default to npipe transport + + This changes the default transport for Windows from unencrypted TCP to + npipe. This is similar to how Linux runs with the unix socket transport by + default. + + Signed-off-by: John Starks + +commit 0b3561a7d5f97dd25b68b29b39b9b68f1359aaea +Merge: af12c78915 038da4eea3 +Author: Aanand Prasad +Date: Tue Mar 1 17:41:31 2016 -0800 + + Merge pull request #2720 from seguins/2227-improvements-logs + + Add flags on logs + +commit 7554e882dfe3a3eb9ec61457e20a42de528db725 +Author: Dong Chen +Date: Tue Mar 1 17:27:30 2016 -0800 + + Use net.JoinHostPort to handle address format. + + Signed-off-by: Dong Chen + +commit 7f223b72dd826c1f925b01d159a97c28983ed07b +Merge: 3c4d093bab 5849a55376 +Author: David Calavera +Date: Tue Mar 1 17:11:37 2016 -0800 + + Merge pull request #20828 from Microsoft/jjh/xenonworkdirfix + + Windows: Don't create working dir for Hyper-V Containers + +commit 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3 +Merge: 22684de872 ed1b9fa07a +Author: Sebastiaan van Stijn +Date: Wed Mar 2 02:09:44 2016 +0100 + + Merge pull request #18766 from mikedanese/gcplogs + + Add logging driver for Google Cloud Logging + +commit 0d270cadd4b65623b1f1ae02c4fe5bcc5f81fcd3 +Author: Aaron Lehmann +Date: Tue Mar 1 17:02:06 2016 -0800 + + Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts + + Retries after v1 fallbacks were added in #20411. The test still appears + to be flaky. There are two potential problems. The initial pull was not + protected against pulling from v1, so it could be giving us a different + hello-world image to compare against. Also, after experiencing a v1 + fallback, we need to restore the original image before doing the next + pull, because otherwise the "Image is up to date for hello-world:latest" + message will not show up as expected. + + See #17214. + + Signed-off-by: Aaron Lehmann + +commit 7e9c6bd963b705ccf94c8b087d54a768ee939e9e +Merge: 47bc7cd93a 8dc09aafe0 +Author: Dongluo Chen +Date: Tue Mar 1 16:56:57 2016 -0800 + + Merge pull request #1916 from vieux/bump_1.1.3-rc2 + + bump to 1.1.3-rc2 + +commit f7c9214e29a81679916b953572173393d5e766e5 +Author: Dong Chen +Date: Tue Mar 1 15:13:08 2016 -0800 + + Handle IPv6 entries. + + Signed-off-by: Dong Chen + +commit 22684de8724a9767c2aee77440a894e1c5aadeb2 +Merge: 793d3b5a3f f5b4e1be6b +Author: Sebastiaan van Stijn +Date: Wed Mar 2 01:47:50 2016 +0100 + + Merge pull request #20826 from LK4D4/fix_keys + + Fix CONFIG_KEYS check in contrib/check-config.sh + +commit 30b65b350493141cfc6a84018ba020e953568be5 +Author: Roland Németh <6uliver@gmail.com> +Date: Wed Mar 2 01:11:35 2016 +0100 + + Pass start.sh first argument as a command for bash + Signed-off-by: Roland Németh <6uliver@gmail.com> + +commit 638d2f09c82e125e9b92c81f0699f2b4e9ce4a72 +Author: Riyaz Faizullabhoy +Date: Tue Mar 1 09:59:23 2016 -0800 + + Replace repository with collection terminology where appropriate + + Signed-off-by: Riyaz Faizullabhoy + +commit 101b80cf195c80982e22ae26737b7853b2c9a7c8 +Author: Riyaz Faizullabhoy +Date: Tue Mar 1 09:42:21 2016 -0800 + + formatting fixes + + Signed-off-by: Riyaz Faizullabhoy + +commit 4a0837b8ab5a26928419d1a4c81daa6696626d9b +Author: Ying Li +Date: Mon Feb 29 23:51:48 2016 -0500 + + Addressing more review comments from client docs + + Signed-off-by: Ying Li + +commit 9e6ead4f57bb3ff89d2a0ca001c5e5fcfef3e27e +Author: Ying Li +Date: Mon Feb 29 23:29:33 2016 -0500 + + Remove extra tables, add links in full server/signer/client configuration files to the relevant sections + + Signed-off-by: Ying Li + +commit 2e331971de42e5a2777ef34c944cd9901ff51a73 +Author: Riyaz Faizullabhoy +Date: Mon Feb 29 20:02:22 2016 -0800 + + fix up docs from review + + Signed-off-by: Riyaz Faizullabhoy + +commit 47bc7cd93a37aa2c2cd0eb80df5459849d3ce388 +Merge: e25da7e9bd f5187e9938 +Author: Nishant Totla +Date: Tue Mar 1 15:38:18 2016 -0800 + + Merge pull request #1909 from dongluochen/FrequentIntegrationTestFailure + + Remove internal retry in discovery_check_swarm_info + +commit 8dc09aafe02cc39aecd15df1633fbc09cc102b97 +Author: Victor Vieux +Date: Tue Mar 1 14:59:23 2016 -0800 + + bump to 1.1.3-rc2 + + Signed-off-by: Victor Vieux + +commit af12c78915c944f873c955e01f83b23997ded5ae +Merge: 7684604830 ed4473c849 +Author: Aanand Prasad +Date: Tue Mar 1 14:56:27 2016 -0800 + + Merge pull request #3056 from dnephin/fix_shutdown_errors + + Fix signal handling with pyinstaller. + +commit cf6016c24ec698f7eacdbc4e7b1dfe6770f29287 +Author: Arnaud Porterie +Date: Tue Mar 1 14:51:15 2016 -0800 + + Introduce `status/failing-ci` label + + Signed-off-by: Arnaud Porterie + +commit 03b4f72ce6cf40bdc8cc6e044d4ba534a571e70c +Author: Todor Minchev +Date: Fri Jan 29 09:59:39 2016 -0800 + + add VirtualBox NDIS5 driver option to the installer + + NDIS6 host network filter driver is known to cause issues on some Windows + versions. VirtualBox installs The NDIS6 driver by default for Windows Vista and later. + For older Windows versions, the installer will automatically select the NDIS5 + driver and this cannot be changed. This commit provides an option for Windows Vista + and later users to install the (legacy) NDIS5 host network filter driver. + + Signed-off-by: Todor Minchev + +commit e25da7e9bdd85ccc190ca6c5abbf54245abc91eb +Merge: 984aab2999 87a03b9157 +Author: Nishant Totla +Date: Tue Mar 1 14:29:41 2016 -0800 + + Merge pull request #1907 from dongluochen/TcpConnectionLeak + + Close TCP connections at disconnect + +commit 7f6ef097369808d1d4eda52ff7bf0d76579741aa +Author: Darren Stahl +Date: Tue Mar 1 14:28:29 2016 -0800 + + Windows CI: Unit Tests stop running failing chrootarchive tests + + Signed-off-by: Darren Stahl + +commit 793d3b5a3f54313e6aaef5144877676795a1bf08 +Merge: 32d1a6cee5 0036e0f8f2 +Author: Sebastiaan van Stijn +Date: Tue Mar 1 23:24:24 2016 +0100 + + Merge pull request #20746 from cpuguy83/use_volume_for_bundles_dir + + Use anonymous volume for bundles dir + +commit 5849a5537607f991898247c75e9298492318c7b1 +Author: John Howard +Date: Tue Mar 1 10:23:43 2016 -0800 + + Windows: Don't create working dir for Hyper-V Containers + + Signed-off-by: John Howard + +commit 843a119d49d2b4ba0a15188843b28763b13e62c6 +Author: Dan Walsh +Date: Tue Feb 2 15:02:37 2016 +0100 + + Do not relabel if user did not request it for non local volumes + + Signed-off-by: Dan Walsh + +commit c8dff1bb5764aa6ea48d261b813ef3b0d2e25989 +Merge: 5cbac00dd4 7761a70389 +Author: Richard Scothern +Date: Tue Mar 1 13:53:49 2016 -0800 + + Merge pull request #1364 from aaronlehmann/content-type-in-api-docs + + Add information about manifest content types to API spec + +commit 87a03b9157bf8cf719d27c26262f5691d1909ec6 +Author: Dong Chen +Date: Mon Feb 29 10:23:37 2016 -0800 + + Close TCP connections at disconnect. + + Signed-off-by: Dong Chen + +commit ed4473c849cc3e9029dc7894ade716d791c918c6 +Author: Daniel Nephin +Date: Tue Mar 1 16:39:43 2016 -0500 + + Fix signal handling with pyinstaller. + + Raise a ShutdownException instead of a KeyboardInterupt when a thread.error + is caught. This thread.error is only raised when run from a pyinstaller + binary (for reasons unknown). + + Signed-off-by: Daniel Nephin + +commit f9cfc4c38779ea8f443c79eeb8cc1b81e8e8a5e1 +Author: Darren Stahl +Date: Tue Mar 1 13:23:29 2016 -0800 + + Windows CI: Unit Tests stop running failing archive test + + Signed-off-by: Darren Stahl + +commit d7c93d7797cb1d50cfb02cb6fa13789d41615c38 +Merge: 82079618b1 c720c56a70 +Author: David Lawrence +Date: Tue Mar 1 13:26:22 2016 -0800 + + Merge pull request #607 from docker/move-sqlite-to-tests + + Move all imports of sqlite3 to tests only + +commit 32d1a6cee544b0609be4ad8b07dc1794f06b431e +Merge: 106793dcbe e80f86bce8 +Author: David Calavera +Date: Tue Mar 1 13:10:44 2016 -0800 + + Merge pull request #20817 from tiborvass/skip-TestStatsAllNewContainersAdded-remote-daemon + + Skip TestStatsAllNewContainersAdded on remote daemons + +commit 106793dcbe49aedd96d74b0c4b0e32a972032d06 +Merge: 36401f20ce 0a352e1a90 +Author: Arnaud Porterie +Date: Tue Mar 1 12:58:35 2016 -0800 + + Merge pull request #20825 from LK4D4/unused + + Remove some unused structs and fields + +commit e67c78899ddfff2b333ad422c0eac8109a21a371 +Author: Jason Roehm +Date: Tue Mar 1 15:57:14 2016 -0500 + + add documentation note about --google-use-internal-ip-only + + Signed-off-by: Jason Roehm + +commit 36401f20ceb8b689fb619df4f6c7219fe76b521c +Merge: 1b6956cbc3 6cdc4ba6cd +Author: Tibor Vass +Date: Tue Mar 1 15:38:03 2016 -0500 + + Merge pull request #20617 from nalind/journald-pkgconfig + + Try to handle changing names for journal packages + +commit b87597f01294503cd451d6a92139c6eebb925b68 +Author: Jason Roehm +Date: Tue Mar 1 15:05:15 2016 -0500 + + update docs for --google-use-internal-ip-only + + Signed-off-by: Jason Roehm + +commit c720c56a70c7770ad77b199d81e09aebf481e808 +Author: Ying Li +Date: Tue Mar 1 14:56:53 2016 -0500 + + Move all imports of sqlite3 to tests only + + Signed-off-by: Ying Li + +commit 251fd57d0fe3d1255865296222f010d612b3c266 +Merge: d87383e8f3 5df137e562 +Author: Nathan LeClaire +Date: Tue Mar 1 11:53:23 2016 -0800 + + Merge pull request #3134 from otherjason/coreos-fix-engine-env + + fix: --engine-env was not effective when provisioning on CoreOS + +commit f2d481a299f7404f5cabbe0f8e6a4ae3c3211c1e +Author: Derek McGowan +Date: Mon Feb 29 23:07:41 2016 -0800 + + Login update and endpoint refactor + + Further differentiate the APIEndpoint used with V2 with the endpoint type which is only used for v1 registry interactions + Rename Endpoint to V1Endpoint and remove version ambiguity + Use distribution token handler for login + + Signed-off-by: Derek McGowan + Signed-off-by: Aaron Lehmann + +commit 038da4eea3add68bb80b78da43d0c5d90715fbe5 +Author: Stéphane Seguin +Date: Sun Feb 28 22:04:16 2016 +0100 + + Logs args of LogPrinter as a dictionary + + Signed-off-by: Stéphane Seguin + +commit 9b36dc5c540f9c88bdf6cb5e5b8e7e7b745d3c8f +Author: Stéphane Seguin +Date: Sun Feb 28 22:00:53 2016 +0100 + + Add --tail flag as option on logs. + Closes #265 + Signed-off-by: Stéphane Seguin + +commit d9b4286f919ee77ffe40d81405f517c1982a7f9d +Author: Stéphane Seguin +Date: Sun Feb 28 22:00:12 2016 +0100 + + Add -t, --timestamps flag as option on logs. + + Signed-off-by: Stéphane Seguin + +commit 82632098a33cb57b7dc8412b13c5f17aacb162a3 +Author: Stéphane Seguin +Date: Thu Jan 21 13:16:04 2016 +0100 + + Add -f, --follow flag as option on logs. + Closes #2187 + Signed-off-by: Stéphane Seguin + +commit 5c99eebe81958a227dfaed1145840374ce50bbbb +Author: Aaron Lehmann +Date: Tue Mar 1 10:56:05 2016 -0800 + + Fix concurrent uploads that share layers + + Concurrent uploads which share layers worked correctly as of #18353, + but unfortunately #18785 caused a regression. This PR removed the logic + that shares digests between different push sessions. This overlooked the + case where one session was waiting for another session to upload a + layer. + + This commit adds back the ability to propagate this digest information, + using the distribution.Descriptor type because this is what is received + from stats and uploads, and also what is ultimately needed for building + the manifest. + + Surprisingly, there was no test covering this case. This commit adds + one. It fails without the fix. + + See recent comments on #9132. + + Signed-off-by: Aaron Lehmann + +commit 768460483089f2f712f32eb859c95d1ba30fdc0e +Merge: fc99c7ee19 5cc420e727 +Author: Aanand Prasad +Date: Tue Mar 1 11:11:55 2016 -0800 + + Merge pull request #3023 from londoncalling/fix-note-3019 + + WIP: updated note format for dockerfile per Aanand's comments on PR #… + +commit 5df137e56252f78e6b55c5688c06b5629050fed8 +Author: Jason Roehm +Date: Tue Mar 1 14:04:00 2016 -0500 + + fix: --engine-env was not effective when provisioning on CoreOS + + Signed-off-by: Jason Roehm + +commit 1b6956cbc3454302b4760b46de1710ff6168d83f +Merge: 637813b13e 734f52d135 +Author: Brian Goff +Date: Tue Mar 1 13:50:00 2016 -0500 + + Merge pull request #20823 from Microsoft/testunit-migratetests + + Windows CI: Unit Test stop running failing migration tests + +commit 637813b13ee0b7b6c92506f55248ce616ff0e3b8 +Merge: 8ae0192943 971c080b67 +Author: David Calavera +Date: Tue Mar 1 10:39:53 2016 -0800 + + Merge pull request #20820 from thaJeztah/remove-registration-docs + + Remove some references to "register" through login + +commit 8ae0192943b5546f753dd43dbe6e6ad3291addae +Merge: 331d2b300f fa362e47e0 +Author: David Calavera +Date: Tue Mar 1 10:36:47 2016 -0800 + + Merge pull request #20822 from Microsoft/jjh/gogit + + Go 1.6 Git 2.7.2 + +commit 331d2b300f87e8c1feb3cee2d12d2abfe779aaa1 +Merge: d883002fac 957792e485 +Author: Brian Goff +Date: Tue Mar 1 13:25:49 2016 -0500 + + Merge pull request #20797 from Microsoft/testunit-daemonunixtests + + Windows CI: Unit Test move Unix specific struct field tests to _unix.go + +commit 58bec40d16265362fd4e41dbd652e6fba903794d +Author: John Starks +Date: Thu Feb 18 17:58:23 2016 -0800 + + graphdriver: Replace DiffPath with DiffGetter + + This allows a graph driver to provide a custom FileGetter for tar-split + to use. Windows will use this to provide a more efficient implementation + in a follow-up change. + + Signed-off-by: John Starks + +commit f5b4e1be6b599c6c6763e32cca25ea23cdaed4e2 +Author: Alexander Morozov +Date: Tue Mar 1 10:01:12 2016 -0800 + + Fix CONFIG_KEYS check in contrib/check-config.sh + + Signed-off-by: Alexander Morozov + +commit 0a352e1a906fbf7592aa95d6327776236d13392a +Author: Alexander Morozov +Date: Tue Mar 1 09:59:29 2016 -0800 + + Remove some unused structs and fields + + Signed-off-by: Alexander Morozov + +commit d883002fac7778e70096584c3eed1693eb7cec17 +Merge: bcc59fc951 7ed569efdc +Author: Brian Goff +Date: Tue Mar 1 12:44:10 2016 -0500 + + Merge pull request #20684 from yongtang/13840-follow-symlink + + Follow symlink for --device argument. + +commit 6789c51b83af67231bfa0f6acb87757c0b3e5206 +Author: Jason Roehm +Date: Tue Mar 1 12:41:19 2016 -0500 + + Google driver: add `--google-use-internal-ip-only` flag + + This addresses previously-closed issue #2876, which points out that + instances created with the `--google-use-internal-ip` command-line flag + are still assigned an external IP address. The new flag (which implies + the presence of `--google-use-internal-ip` if it isn't specified) will + cause the new instance to have no externally-accessible IP address. + + Signed-off-by: Jason Roehm + +commit 0036e0f8f264b6b70952f34db439527f9def8326 +Author: Brian Goff +Date: Sat Feb 27 11:12:12 2016 -0500 + + Use anonymous volume for bundles dir + + This allows the test suite to be able to run without worrying about + the underlying fs used by the container running the daemon (e.g. + aufs-on-aufs), so long as the host running the container is running a + supported fs. + The volume will be cleaned up when the container is removed due to + `--rm`. + + Signed-off-by: Brian Goff + +commit 734f52d1357785de364c8f4be2218805f160f604 +Author: Darren Stahl +Date: Tue Mar 1 09:05:20 2016 -0800 + + Stopped running failing migration tests on Windows + + Signed-off-by: Darren Stahl + +commit fa362e47e03e7b9b50e3642f50a4478d8b8f1243 +Author: John Howard +Date: Tue Mar 1 09:05:12 2016 -0800 + + Go 1.6 Git 2.7.2 + + Signed-off-by: John Howard + +commit 984aab2999a973b9c85fc322f6f8ed0ea33a78c6 +Merge: 0039ed3b5e e94ca74a6a +Author: Nishant Totla +Date: Tue Mar 1 09:03:03 2016 -0800 + + Merge pull request #1910 from JohnKDay/patch-1 + + Syntax error - changed container to constraint + +commit 18510b4024518f41be7afdd114c898a75ac97480 +Author: Daniel Nephin +Date: Tue Mar 1 11:57:35 2016 -0500 + + Don't allow booleans for mapping types. + + Signed-off-by: Daniel Nephin + +commit e80f86bce8f07122734cf4933e32ac82c9994d71 +Author: Tibor Vass +Date: Tue Mar 1 09:50:02 2016 -0500 + + Skip TestStatsAllNewContainersAdded on remote daemons + + This test is often failing on remote daemons. We tried many approaches + to fix it but none worked. In order to make the CI more reliable, this + will skip the test when running against a remote daemon (e.g. win2lin). + + Signed-off-by: Tibor Vass + +commit b726f508a62b58c718b3568a51200224a613eed4 +Author: Daniel Nephin +Date: Tue Mar 1 11:42:19 2016 -0500 + + Fix merging of logging options in v1 config. + + Signed-off-by: Daniel Nephin + +commit bcc59fc95125e21ad59129189ff953b7086ab497 +Merge: 330fb91f7d 67629c8b52 +Author: Tibor Vass +Date: Tue Mar 1 11:37:26 2016 -0500 + + Merge pull request #20587 from MHBauer/termfixes + + do not turn post-processing on for linux-cgo terminals + +commit 5b3fc7aab25be908cab869dab5c0b2cb821d31dc +Author: Christy Perez +Date: Fri Feb 26 12:47:43 2016 -0600 + + Match case for variables in sysinfo pkg + + I noticied an inconsistency when reviewing docker/pull/20692. + + Changing Ip to IP and Nf to NF. + + More info: The golang folks recommend that you keep the initials consistent: + https://github.com/golang/go/wiki/CodeReviewComments#initialisms. + + Signed-off-by: Christy Perez + +commit 330fb91f7d3e89d020fb1f8dca7c1fbbf884ed5d +Merge: 2453262e7b 772f5495b7 +Author: Tibor Vass +Date: Tue Mar 1 11:35:35 2016 -0500 + + Merge pull request #20530 from hsinko/myDev + + Add some comments for daemon/graphdriver/aufs/aufs.go + +commit 04877d47aa35e08544a52d374d7b654954e8e2cc +Author: Daniel Nephin +Date: Mon Feb 29 14:36:21 2016 -0800 + + Build osx binary on travis and upload to bintray. + + This requires a change to the make-branch script, to have it push the bump branch + to the docker remote instead of the user remote. Pushing to the docker remote + triggers the travis build, which builds the binary. + + Signed-off-by: Daniel Nephin + +commit 971c080b67836b5dd62bc9270dfb348abb8536a7 +Author: Sebastiaan van Stijn +Date: Tue Mar 1 17:28:42 2016 +0100 + + Remove some references to "register" through login + + These were left-overs from the now deprecated + and removed functionality to registrer a new account + through "docker login" + + Signed-off-by: Sebastiaan van Stijn + +commit ed1b9fa07a0b34315d2fa624b978d3f8627319c2 +Author: Mike Danese +Date: Fri Dec 18 09:43:32 2015 -0800 + + daemon/logger: Add logging driver for Google Cloud Logging + + Signed-off-by: Mike Danese + +commit 2453262e7ba131fede74dbf31df41da9d2f36c34 +Merge: ec2efb01d2 aee260d4eb +Author: Aaron Lehmann +Date: Tue Mar 1 08:02:16 2016 -0800 + + Merge pull request #20565 from kencochrane/remove_email_on_login + + Remove email address field from login + +commit ec2efb01d206a2bae59386b8fa33ebddb8293a3b +Merge: 79ec9c8460 62a6d3e86c +Author: Vincent Demeester +Date: Tue Mar 1 14:40:41 2016 +0100 + + Merge pull request #20814 from vincentbernat/fix/zsh-completion-update-5 + + zsh: Reword some descriptions + +commit 79ec9c8460ca64e347377f8d67dcfc4877b3aff4 +Merge: 87fb26bc42 3da45ee939 +Author: Sebastiaan van Stijn +Date: Tue Mar 1 14:29:09 2016 +0100 + + Merge pull request #20813 from thaJeztah/update-changelog + + Update changelog with changes from 1.10.1 and .2 + +commit 62a6d3e86c5754aed5d04400a7f84681d0470925 +Author: Vincent Bernat +Date: Tue Mar 1 14:21:34 2016 +0100 + + zsh: Reword some descriptions + + Use of "Set ..." and "Specify ..." are removed in favor of directly + using nouns. + + Also: + + - add description for `run --isolation` + - reduce description of `run --shm-size` + - fix `daemon --bip` argument handling + + Signed-off-by: Vincent Bernat + +commit 87fb26bc42afa4650fce88f8130fb7660ff898db +Merge: 6a20165da7 c7f2079a9b +Author: Vincent Demeester +Date: Tue Mar 1 13:20:23 2016 +0100 + + Merge pull request #20310 from hqhq/hq_cgroup_parent_docs + + Add docs for cgroup-parent of systemd cgroup + +commit 6a20165da78f1d1793b8355a6caa6fe3579f62f2 +Merge: 9c7e1aeeb1 14d5c91d87 +Author: unclejack +Date: Tue Mar 1 13:52:19 2016 +0200 + + Merge pull request #20418 from calavera/go_1_6 + + Upgrade Go to 1.6. + +commit 3da45ee939fc8600e1a9f1e05a28023c8f2a207e +Author: Tibor Vass +Date: Fri Feb 19 20:03:51 2016 -0500 + + Update CHANGELOG for 1.10.2 + + Signed-off-by: Tibor Vass + (cherry picked from commit 7613ee933ccbe58806cce7484bce8e6a55e8bd89) + Signed-off-by: Sebastiaan van Stijn + +commit 8a6ac315ff13d198dc760bd410a2cadc6126d2db +Author: Tibor Vass +Date: Thu Feb 11 13:20:23 2016 -0500 + + Correct 1.10.1 CHANGELOG + + Signed-off-by: Tibor Vass + (cherry picked from commit ce4f13f604d6b080f239365f926246cf03f91c5a) + Signed-off-by: Sebastiaan van Stijn + +commit fce54d772a761e22b61c45cc8881b7b17874d7c7 +Author: Tibor Vass +Date: Wed Feb 10 12:54:14 2016 -0500 + + Update CHANGELOG for 1.10.1 + + Signed-off-by: Tibor Vass + (cherry picked from commit f1cd0cabba47ba05400e7a609dffb571592a61e0) + Signed-off-by: Sebastiaan van Stijn + +commit c7f2079a9b3d8b38a6a933524766aa77a2658393 +Author: Qiang Huang +Date: Tue Mar 1 05:24:27 2016 -0500 + + Add docs for cgroup-parent of systemd cgroup + + Signed-off-by: Qiang Huang + +commit 9c7e1aeeb1b9a14691dda831da4674b76852a24f +Merge: d1e7f38338 056c27d895 +Author: Sebastiaan van Stijn +Date: Tue Mar 1 11:12:14 2016 +0100 + + Merge pull request #20796 from calavera/default_windows_creds_helper + + Set default credentials store in Windows. + +commit d1e7f383380123d9419462165e07ae7cdb7620ce +Merge: dac18985fa 9f8f28684f +Author: Sebastiaan van Stijn +Date: Tue Mar 1 11:00:02 2016 +0100 + + Merge pull request #20810 from wenchma/remove + + Remove the duplication + +commit 9f8f28684f196ff3790ff1c738e81743821fc860 +Author: Wen Cheng Ma +Date: Tue Mar 1 17:53:36 2016 +0800 + + Remove the duplication + + Signed-off-by: Wen Cheng Ma + +commit dac18985fa5265c38a170b733d49a8ad31d2c645 +Merge: 89f6d3b041 eaa1708e70 +Author: Vincent Demeester +Date: Tue Mar 1 08:18:44 2016 +0100 + + Merge pull request #20791 from Microsoft/jjh/testunit-pkgsymlink + + Windows CI: Turning off pkg\symlink unit testing + +commit 7ed569efdc822811cdac3b398a16757a54fbe4c4 +Author: Yong Tang +Date: Thu Feb 25 01:50:39 2016 +0000 + + Follow symlink for --device argument. + + Fixes: #13840 + + Signed-off-by: Yong Tang + +commit b9ef2682b905bf0403fd03d697a6d7a93d91a587 +Author: Wen Cheng Ma +Date: Fri Feb 19 11:02:45 2016 +0800 + + Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand + + * Remvoe integration test of TestDaemonStartWithDaemonCommand + * Rewrite as unit test + + Related issue #19425 + + Signed-off-by: Wen Cheng Ma + +commit 772f5495b7bb03a8fb97f9ae5fb5fa97c98a87b3 +Author: hsinko <21551195@zju.edu.cn> +Date: Mon Feb 29 21:32:30 2016 -0800 + + folders->directories + + Signed-off-by: hsinko <21551195@zju.edu.cn> + +commit 89f6d3b0416fa3055724099d6eaa774403480ada +Merge: 187a2fb403 0b882cc014 +Author: Vincent Demeester +Date: Tue Mar 1 05:30:45 2016 +0100 + + Merge pull request #20754 from lyndaoleary/docker-terminology + + Changed Docker references to Docker Engine in docs + +commit e94ca74a6ac53d3a6d15704df9c8b4fb91c041f4 +Author: John Day +Date: Mon Feb 29 19:52:39 2016 -0800 + + Syntax error - changed container to constraint + + Syntax Error + From: + The `` is either the `affinity` or the `container` keyword. It + identifies the type filter you intend to use. + To: + The `` is either the `affinity` or the `constraint` keyword. It + identifies the type filter you intend to use. + + Signed-off-by: John Day + +commit 0039ed3b5ec4da88caea26dc22a493f22fab24d0 +Merge: b43a2c21c4 4dc645bb8a +Author: Alexandre Beslic +Date: Mon Feb 29 18:31:46 2016 -0800 + + Merge pull request #1908 from duglin/missingDefer + + Add missing 'defer' + +commit 957792e485a58698ad374c5a69157d9afa7879a2 +Author: Darren Stahl +Date: Mon Feb 29 17:50:16 2016 -0800 + + Windows CI: Unit Test move Unix specific struct field tests to _unix.go + + Signed-off-by: Darren Stahl + +commit aee260d4eb3aa0fc86ee5038010b7bbc24512ae5 +Author: Ken Cochrane +Date: Mon Feb 29 17:51:36 2016 -0800 + + Remove email address field from login + + This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server. + + Signed-off-by: Ken Cochrane + +commit 187a2fb40390f52a45e5b77c2ccc2d4609e354a9 +Merge: 67b16c7381 df95474885 +Author: Arnaud Porterie +Date: Mon Feb 29 17:33:37 2016 -0800 + + Merge pull request #20792 from cpuguy83/more_stats_client_cleanup + + Fixes issue with stats on start event + +commit 82079618b1c66fc7c53c6ee30dc74be01e15a4f8 +Merge: d59c97a1f0 79c692a7c6 +Author: David Lawrence +Date: Mon Feb 29 17:00:29 2016 -0800 + + Merge pull request #603 from moxiegirl/carry-293 + + Rewritten Docs. Followup PR to be submitted to fix minor things caught here. + +commit 0b882cc0140bc03dfe79462c5cdf77b972c94067 +Author: Lynda O'Leary +Date: Sun Feb 28 02:30:32 2016 +0000 + + Changed Docker references to Docker Engine in docs + + Signed-off-by: Lynda O'Leary + +commit 67b16c73818726d9818d0229fa6cdda3e5f698b0 +Merge: 6a96006959 7a61b9ae42 +Author: Sebastiaan van Stijn +Date: Tue Mar 1 01:45:38 2016 +0100 + + Merge pull request #20782 from estesp/new-parent-dir-ownership + + Fix ownership of non-existing parent dir + +commit 6a960069596a5d43a50b7675454169aad06972ca +Merge: 29ce086e38 0b82202fbb +Author: Brian Goff +Date: Mon Feb 29 19:08:24 2016 -0500 + + Merge pull request #20710 from Microsoft/sjw/tp4retry_fix + + Fixing retry hack for TP4 to return errors in all failure cases. + +commit fc99c7ee1981a4dc2b125bfd08d4c31cbdb5435a +Merge: 210856179d 39af6b653b +Author: Aanand Prasad +Date: Mon Feb 29 15:37:46 2016 -0800 + + Merge pull request #2584 from mjgpy3/patch-1 + + Update `volumes_from` docs to state default + +commit 210856179df51b2dfd40ebe3027cde7d96c849a8 +Merge: f5ce31d43e 6bfb23baaa +Author: Aanand Prasad +Date: Mon Feb 29 15:17:14 2016 -0800 + + Merge pull request #3036 from JesusTinoco/master + + Display in the log output the name of those containers created using … + +commit 5cbac00dd4cf0a6c924fffa07505c290593e4288 +Merge: 3ae504384c feab4aafbc +Author: Richard Scothern +Date: Mon Feb 29 15:01:48 2016 -0800 + + Merge pull request #1386 from andrewnguyen/garbage_collect_pick_from_1050 + + garbage collection + +commit 056c27d895e6e0c416d8d4253e99f4b211a1fb4f +Author: David Calavera +Date: Mon Feb 29 17:03:52 2016 -0500 + + Set default credentials store in Windows. + + Use the Windows Credentials Manager when the helper + is installed in the path. + + Signed-off-by: David Calavera + +commit feab4aafbcacf540e87b8c098e0fd5685b2a8e97 +Author: Andrew T Nguyen +Date: Tue Jan 19 14:26:15 2016 -0800 + + Implements garbage collection subcommand + + - Includes a change in the command to run the registry. The registry + server itself is now started up as a subcommand. + - Includes changes to the high level interfaces to support enumeration + of various registry objects. + + Signed-off-by: Andrew T Nguyen + +commit 14d5c91d87fac962bbb36c12b05f3b1603aa28a8 +Author: David Calavera +Date: Wed Feb 17 19:05:52 2016 -0500 + + Upgrade Go to 1.6. + + Signed-off-by: David Calavera + +commit f5ce31d43e885777b1290ef4423dfe3a5a032b6c +Merge: 4db1fef58c 5be48ba1ed +Author: Daniel Nephin +Date: Mon Feb 29 14:03:54 2016 -0800 + + Merge pull request #3024 from aanand/update-build-image-docs + + Update docs about using build and image together + +commit 4db1fef58c5f6c1c0b3b96a64e797829f5b00751 +Merge: 8d24af92e0 2cd1b94dd3 +Author: Daniel Nephin +Date: Mon Feb 29 14:03:28 2016 -0800 + + Merge pull request #3022 from aanand/update-build-image-extends-note + + Update note about build + image with extends + +commit 4dc645bb8a13d7d76579ce477711a1266e4a2552 +Author: Doug Davis +Date: Mon Feb 29 13:51:10 2016 -0800 + + Add missing 'defer' + + as it stands now the lock at this spot in the code is pretty useless. + All it does it block us but since we release the lock before we check + e.state its a roadblock with no real purpose. + One could argue that a lock isn't needed at all but I think having it + there for consistency with the other funcs would be good. + + Signed-off-by: Doug Davis + +commit f5187e99382e174764189b87801693148ddcdd98 +Author: Dong Chen +Date: Mon Feb 29 13:48:59 2016 -0800 + + Remove internal retry in discovery_check_swarm_info because caller retries are already in place. + + Signed-off-by: Dong Chen + +commit df95474885aeaaa77eeea4c4b31a92b58fc2a67c +Author: Brian Goff +Date: Mon Feb 29 14:24:51 2016 -0500 + + Fixes issue with stats on start event + + In situations where a client is called like `docker stats` with no + arguments or flags, if a container which was already created but not + started yet is then subsequently started it will not be added to the + stats list as expected. + + Also splits some of the stats helpers to a separate file from the stats + CLI which is already quite long. + + Signed-off-by: Brian Goff + +commit 29ce086e38384c54f6f2d8f09578a75c4c9d9593 +Merge: 79258eca9b cf721c23e7 +Author: Sebastiaan van Stijn +Date: Mon Feb 29 22:31:34 2016 +0100 + + Merge pull request #20107 from calavera/client_auth_store + + Client credentials store. + +commit 79258eca9bdc6e6bd0feb20a81c03973142ea16c +Merge: 3938ee413d 0e9769ab62 +Author: Alexander Morozov +Date: Mon Feb 29 13:11:12 2016 -0800 + + Merge pull request #20785 from runcom/clean-cont + + container: container_unix: remove unused func + +commit eaa1708e703427a47f28eb198942f18b9d7237d8 +Author: John Howard +Date: Mon Feb 29 09:03:16 2016 -0800 + + Windows CI: Turning off pkg\symlink unit testing + + Signed-off-by: John Howard + +commit 3938ee413d0fab1b78879352c7defccfb78f8d43 +Merge: ea6d2708e2 de6939817d +Author: David Calavera +Date: Mon Feb 29 13:09:48 2016 -0800 + + Merge pull request #20790 from Microsoft/jjh/testunit-voltestremove + + Windows CI: Unit Test turn off TestRemove + +commit 8d24af92e04d140d268bd1f85a22553857a6433f +Merge: 97c9c12660 6b947ee478 +Author: Daniel Nephin +Date: Mon Feb 29 13:01:32 2016 -0800 + + Merge pull request #3030 from aanand/document-startup-order-workarounds + + Document ways to make services wait for dependencies + +commit 79c692a7c6d29f17dfc61ee06b999f52741f69c6 +Author: Diogo Monica +Date: Sun Nov 15 10:34:27 2015 +0100 + + Cary and close #293 + + Signed-off-by: Mary Anthony + +commit 97c9c1266018f9140fc00264f78b4918442b9943 +Merge: 1502c5a14d d28c5dda92 +Author: Aanand Prasad +Date: Mon Feb 29 12:21:41 2016 -0800 + + Merge pull request #2023 from TomasTomecek/593-implement-exec + + implement exec + +commit ea6d2708e2f115b9637ee11521f5f570b2819808 +Merge: d878f512fd 79843b727f +Author: Brian Goff +Date: Mon Feb 29 15:16:27 2016 -0500 + + Merge pull request #20692 from coolljt0725/add_brnf_test_request + + Add bridgeNfIptables and bridgeNfIp6tables test request + +commit d878f512fd70928b28ca13629eb58befc14700f5 +Merge: 9eb4575f8c 439433099e +Author: Vincent Demeester +Date: Mon Feb 29 21:14:28 2016 +0100 + + Merge pull request #20492 from WeiZhang555/export-no-privilege + + Clean redundant error message for export + +commit 9eb4575f8cdb8f9afb0d53d6fd4a34b077cc08da +Merge: a5d98b82ea bc72883fe1 +Author: Vincent Demeester +Date: Mon Feb 29 20:57:43 2016 +0100 + + Merge pull request #20480 from wenchma/20431-filter_since_before + + Enhancement of docker ps before and since filters + +commit d59c97a1f07db7e6faadd2a9ca420df068f27d1b +Merge: 17a5689f0f 08c0da745f +Author: Riyaz Faizullabhoy +Date: Mon Feb 29 11:52:16 2016 -0800 + + Merge pull request #594 from HuKeping/fix-bug + + Bugfix: the actions should not always be pull and push + +commit a5d98b82ea641349640d07b2f62a047b94592a5e +Merge: 1ba0358a10 565712014f +Author: David Calavera +Date: Mon Feb 29 11:48:24 2016 -0800 + + Merge pull request #20780 from runcom/revert-sudo-user + + Revert sudo user + +commit 17a5689f0fef748490e444b124c0bc3a719f783b +Merge: 2d8ff5fb36 1a668bb34d +Author: Riyaz Faizullabhoy +Date: Mon Feb 29 11:30:34 2016 -0800 + + Merge pull request #584 from docker/0.2-changelog + + notary 0.2 changelog + +commit 6b947ee478458927e119b6b2d9129f3ef62ab883 +Author: Aanand Prasad +Date: Fri Feb 26 11:22:41 2016 -0800 + + Document ways to make services wait for dependencies + + Signed-off-by: Aanand Prasad + +commit 6bfb23baaa45b1ab4bd8c4b1cbce2b49753643d1 +Author: Jesus +Date: Sat Feb 27 18:25:54 2016 +0100 + + Display containers name when scale a container + + Display in the log output the name of those containers created using the scale command and + change the test_scale_with_api_error test to support the containers name when scale + + Signed-off-by: Jesus Rodriguez Tinoco + +commit 1ba0358a10e6ad61832a47ac2f99dda7a7d57429 +Merge: ba5a282a83 1a68662736 +Author: David Calavera +Date: Mon Feb 29 11:12:09 2016 -0800 + + Merge pull request #20307 from HuKeping/trust + + Refactor trust push + +commit 0b82202fbbbeaad5d7ba404fb586cb4b3f37980e +Author: Stefan J. Wernli +Date: Thu Feb 25 17:54:13 2016 -0800 + + Fixing retry hack for TP4 to return errors in all failure cases. + + Signed-off-by: Stefan J. Wernli + +commit ba5a282a83a603c3bb61cd40642af54d2088f747 +Merge: 2391794d26 d7af031114 +Author: David Calavera +Date: Mon Feb 29 10:47:46 2016 -0800 + + Merge pull request #20605 from mountkin/optimize-json-log-writer + + make the json log writer much faster + +commit 2391794d2695079f2dd19b10cd51aea6922b3ec9 +Merge: 29b2b0c22b 7285c9a53a +Author: Brian Goff +Date: Mon Feb 29 13:47:25 2016 -0500 + + Merge pull request #20749 from mountkin/validate-log-opts + + validate log-opt when creating containers + +commit 29b2b0c22ba4a9c81002cd70e464ef0cfc577413 +Merge: b1955a66f5 799ae78b7e +Author: David Calavera +Date: Mon Feb 29 10:44:36 2016 -0800 + + Merge pull request #20686 from clintonskitson/bugfix/plugin_desc_leak + + Fix plugin file descriptor leaks + +commit 3ae504384c06b750b2ddb12e955e51036d7f6c52 +Merge: a5bd3e6144 21a0878665 +Author: Brian Bland +Date: Mon Feb 29 10:26:45 2016 -0800 + + Merge pull request #1473 from miminar/pass-blob-size + + Commit uploaded blob with size + +commit 2d8ff5fb36c4d9e8acb44a822d590dc51eb28fb8 +Merge: c1c2ca1d6d 8455f9fb5a +Author: Ying Li +Date: Mon Feb 29 13:11:26 2016 -0500 + + Merge pull request #602 from HuKeping/cleanup + + Kind of cleanup + +commit cf721c23e715e545eccf8484e145c2d18d6a6a23 +Author: David Calavera +Date: Sun Feb 7 19:55:17 2016 -0500 + + Client credentials store. + + This change implements communication with an external credentials store, + ala git-credential-helper. The client falls back the plain text store, + what we're currently using, if there is no remote store configured. + + It shells out to helper program when a credential store is + configured. Those programs can be implemented with any language as long as they + follow the convention to pass arguments and information. + + There is an implementation for the OS X keychain in https://github.com/calavera/docker-credential-helpers. + That package also provides basic structure to create other helpers. + + Signed-off-by: David Calavera + +commit b1955a66f536dfb8fe15d00059ae527f49c35ba9 +Merge: b211e57f23 244e5fc516 +Author: David Calavera +Date: Mon Feb 29 09:54:48 2016 -0800 + + Merge pull request #20787 from itsthenetwork/Fix-Seccomp-Readme + + Update seccomp.md + +commit b211e57f23848bd1990db84d2ccce0ce529e735a +Merge: c0c10daebf 53b0d62683 +Author: Sebastiaan van Stijn +Date: Mon Feb 29 18:48:55 2016 +0100 + + Merge pull request #20774 from hqhq/hq_vender_engine_api + + Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c + +commit de6939817d20f5c2a370efc9eb207e3e8c897520 +Author: John Howard +Date: Mon Feb 29 08:57:30 2016 -0800 + + Windows CI: Unit Test turn off TestRemove + + Signed-off-by: John Howard + +commit 244e5fc51653b47a974ad111022ea923ddebaf05 +Author: Steven Iveson +Date: Mon Feb 29 16:03:31 2016 +0000 + + Update seccomp.md + + Corrected titles to use title case. Added link to default.json and some numerical detail. Changed example JSON to a portion of the actual default file, with the correct defaultAction. + + Signed-off-by: Steven Iveson + +commit c0c10daebf2372fdc2ca46c6535e1daac628ab48 +Merge: 0573b814a1 3ef1325828 +Author: Vincent Demeester +Date: Mon Feb 29 17:31:06 2016 +0100 + + Merge pull request #20777 from Anonymooseable/document-plugin-types + + Document interfaces a plugin can implement + +commit 0573b814a1e78cf0e6fefc8ecd3913a95e849506 +Merge: 6c01d2a0cf adac575dd3 +Author: Tibor Vass +Date: Mon Feb 29 11:17:13 2016 -0500 + + Merge pull request #20737 from mikedougherty/install-sh-multiple-keyservers + + Use multiple keyservers in install script + +commit 3ef13258289ef01102c0ae01a8d9af49d36441fb +Author: Linus Heckemann +Date: Mon Feb 29 15:59:54 2016 +0000 + + Remove experimental GraphDriver plugin type + + Signed-off-by: Linus Heckemann + +commit 6c01d2a0cf4feb24bddf6830fd1683060c0ff309 +Merge: eb22fcc229 b6fdcd3a34 +Author: Vincent Demeester +Date: Mon Feb 29 16:59:43 2016 +0100 + + Merge pull request #20629 from wallnerryan/intro-volumes + + Intro volume drivers in dockervolumes.md + +commit b6fdcd3a342dc882955253e0a39711ed4ac078fc +Author: Ryan Wallner +Date: Tue Feb 23 14:43:37 2016 -0500 + + intro volume plugins in userguide volumes + + NOTE should be lowercase + + Signed-off-by: Ryan Wallner + + add link to list of plugins + + Signed-off-by: Ryan Wallner + + address changres + + Signed-off-by: Ryan Wallner + +commit eb22fcc229b364dd4429823c96b8f2e585e73217 +Merge: 8ffec1fca5 e17cb9b721 +Author: Tibor Vass +Date: Mon Feb 29 10:46:32 2016 -0500 + + Merge pull request #20773 from Microsoft/jjh/testunitdockerlayer + + Windows CI Unit Test: Docker layer turn off failing tests + +commit 8ffec1fca5d851e9f8e33e3dfab5c6ebc9562284 +Merge: abbb16d7ab dd2ff281bf +Author: Tibor Vass +Date: Mon Feb 29 10:45:57 2016 -0500 + + Merge pull request #20772 from Microsoft/jjh/testunitdistribution-xfer + + Windows CI Unit Test: Distribution\xfer turn off failing tests + +commit abbb16d7abd7150a9226252f2544326930ea2baf +Merge: 7cea7c698d ca5c2abecf +Author: Brian Goff +Date: Mon Feb 29 10:43:02 2016 -0500 + + Merge pull request #20602 from twistlock/20508_authz_plugin_corrupt_body + + Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body + +commit 0e9769ab62ec15d56541dfbbe72316630a98b6e2 +Author: Antonio Murdaca +Date: Mon Feb 29 16:12:02 2016 +0100 + + container: container_unix: remove unused func + + Signed-off-by: Antonio Murdaca + +commit 7cea7c698d39adb9757ee59beed59f114c88f132 +Merge: 79c24a0820 e44689139d +Author: Brian Goff +Date: Mon Feb 29 09:47:49 2016 -0500 + + Merge pull request #20756 from runcom/no-dash-d-tests + + integration-cli: remove not necessary -d again + +commit 7a61b9ae425e5c100da2bb32b929031c6302b3fb +Author: Phil Estes +Date: Fri Feb 26 21:50:50 2016 -0500 + + Fix ownership of non-existing parent dir + + During "COPY" or other tar unpack operations, a target/destination + parent dir might not exist and should be created with ownership of the + root in the right context (including remapped root when user namespaces + are enabled) + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 79c24a082004251bd899b8bd549da43e3abca10d +Merge: da4f2ce629 2bd365ae2f +Author: Vincent Demeester +Date: Mon Feb 29 15:06:20 2016 +0100 + + Merge pull request #20736 from elchris82/master + + Changed the Example request in Remote API reference to connect a container to a network + +commit 565712014f3dfe01b0b5012ab46a7e26217538f2 +Author: Antonio Murdaca +Date: Mon Feb 29 13:43:57 2016 +0100 + + cliconfig: use a const for ".docker" string + + Signed-off-by: Antonio Murdaca + +commit 863b5716173db320ddc03847a639964f495a7953 +Author: Antonio Murdaca +Date: Mon Feb 29 13:40:45 2016 +0100 + + Revert "resolve the config file from the sudo user" + + This reverts commit afde6450ee7bd4a43765fdc0a9799b411276d9e4. + + Signed-off-by: Antonio Murdaca + +commit da4f2ce6294f9333a7b9011f80d7b64815cc2059 +Merge: ffd8a0e0fb 621a1b9aca +Author: Sebastiaan van Stijn +Date: Mon Feb 29 12:56:10 2016 +0100 + + Merge pull request #20771 from Microsoft/jjh/disableunittestsdistribution + + Windows CI Unit Test: Distribution turn off failing tests + +commit 53b0d62683ee798198c553353dc2106623a9259b +Author: Qiang Huang +Date: Mon Feb 29 19:28:37 2016 +0800 + + Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c + + Signed-off-by: Qiang Huang + +commit 8455f9fb5a02add5b0ed0b00b1df16c23e06cae5 +Author: HuKeping +Date: Mon Feb 29 19:24:31 2016 +0800 + + Kind of cleanup + + Signed-off-by: Hu Keping + +commit d28c5dda9294d1f6824207aba7ac210e1e3fc3f8 +Author: Tomas Tomecek +Date: Thu Sep 10 13:17:55 2015 +0200 + + implement exec + + Resolves #593 + + Signed-off-by: Tomas Tomecek + +commit dd729efe028667b2180922e2c7e649a5b8ec52e9 +Author: Linus Heckemann +Date: Mon Feb 29 09:43:44 2016 +0000 + + Document interfaces a plugin can implement + + Signed-off-by: Linus Heckemann + +commit ffd8a0e0fbaaf4f8dbaea66c3e06a8dc24dc22ca +Merge: 5ef74c6595 adda1060aa +Author: Vincent Demeester +Date: Mon Feb 29 10:38:06 2016 +0100 + + Merge pull request #20776 from terryding77/doc_changes + + change container word spell in docs + +commit adda1060aa3c7a41fddc4cdeaac92f946c40e2d8 +Author: terryding77 <550147740@qq.com> +Date: Mon Feb 29 16:59:53 2016 +0800 + + change container word spell in docs + + Signed-off-by: terryding77 <550147740@qq.com> + +commit 5ef74c65956eaf59bc1c4537f5244f56b37ef531 +Merge: 20a038eca6 3041aa53ef +Author: Antonio Murdaca +Date: Mon Feb 29 08:20:17 2016 +0100 + + Merge pull request #20753 from icecrime/debugging_win2lin + + Fix client-side race in `docker stats` + +commit 20a038eca68e4188e1cd812293aea8cb220cf08f +Merge: 67a77934a4 b9366c9609 +Author: Vincent Demeester +Date: Mon Feb 29 07:14:15 2016 +0100 + + Merge pull request #20604 from coolljt0725/fix_reload + + Fix configuration reloading + +commit e17cb9b721ec10d5be36f380c23ee2d448bd135a +Author: John Howard +Date: Sun Feb 28 20:16:10 2016 -0800 + + Windows CI Unit Test: Docker layer turn off failing tests + + Signed-off-by: John Howard + +commit dd2ff281bf62037948a9da18dd2223b977056a4e +Author: John Howard +Date: Sun Feb 28 20:08:34 2016 -0800 + + Windows CI Unit Test: Distribution\xfer turn off failing tests + + Signed-off-by: John Howard + +commit 621a1b9aca7f0ad2ac6b83f990644c3dc983d659 +Author: John Howard +Date: Sun Feb 28 20:02:51 2016 -0800 + + Windows CI Unit Test: Distribution turn off failing tests + + Signed-off-by: John Howard + +commit 6e4ad3f093f2e5e0037ebd3994aece0cd3a8cbc7 +Author: Wen Cheng Ma +Date: Mon Feb 29 11:42:40 2016 +0800 + + Fix some typo error for install-manual.md + + Signed-off-by: Wen Cheng Ma + +commit 3041aa53efbbfddbc10a66027d973bd353e3b525 +Author: Arnaud Porterie +Date: Sat Feb 27 18:30:31 2016 -0800 + + Fix client-side race in `docker stats` + + Subscribe to events and monitor for new containers before the initial + listing of currently running containers. + + This fixes a race where a new container could appear between the first + list call but before the client was subscribed to events, leading to a + container never appearing in the output of `docker stats`. + + Signed-off-by: Arnaud Porterie + +commit 67a77934a436e9995a5322178db7cea56a9458dc +Merge: ab18b5977a d3fd0974d5 +Author: Sebastiaan van Stijn +Date: Mon Feb 29 00:19:06 2016 +0100 + + Merge pull request #20760 from vdemeester/fix-cliconfig + + Fixing cliconfig getDefaultConfigDir + +commit ab18b5977a2e12a425bfe4961f58784e450fd0d0 +Merge: 0866d63278 30c2770a73 +Author: Sebastiaan van Stijn +Date: Sun Feb 28 23:55:03 2016 +0100 + + Merge pull request #20757 from spacediver/patch-1 + + fixed formatting; added handy -y to apt-get install + +commit 0866d63278b250cd19d560aa748941be24246a45 +Merge: 38439733d2 e3e18584b0 +Author: Sebastiaan van Stijn +Date: Sun Feb 28 19:17:00 2016 +0100 + + Merge pull request #20759 from toogley/master + + add google group subscribtion method using only emails + +commit 30c2770a736e6c731f4046431f0f4275dadbd536 +Author: Pavel Sutyrin +Date: Sun Feb 28 15:59:30 2016 +0300 + + fixed formatting; added handy -y to apt-get install + + Signed-off-by: Pavel Sutyrin + +commit d3fd0974d558aa994f9f5da7ff84dceb2c7e1c90 +Author: Vincent Demeester +Date: Sun Feb 28 16:04:48 2016 +0100 + + Fixing getDefaultConfigDir + + It seems it's not really checking the right folder. + + Signed-off-by: Vincent Demeester + +commit e3e18584b0552159324d93cb394b04594057adbc +Author: toogley +Date: Sun Feb 28 15:31:15 2016 +0100 + + add google group subscribtion method using only emails + + * users don't have to create an google account for using the google groups. They + can simply email to e.g. "docker-user+subscribe@googlegroups.com" to + subscribe. + + * since this behavior is not mentioned on the google group website, i think its + a good idea to explain this method here. + + Signed-off-by: toogley + +commit e44689139d2ffd08c147ffe940a15a8e8616786a +Author: Antonio Murdaca +Date: Sun Feb 28 11:47:37 2016 +0100 + + integration-cli: remove not necessary -d again + + Signed-off-by: Antonio Murdaca + +commit 38439733d2415f2d12290bf5bf8b7c1133557f79 +Merge: ec268be52e faf4604dac +Author: Brian Goff +Date: Sat Feb 27 21:58:15 2016 -0500 + + Merge pull request #20748 from runcom/remove-dash-d + + integration-cli: remove not necessary -d + +commit ec268be52ee3a2fab5c792ecf836f109595712ae +Merge: 15bdca6add 443a5c2021 +Author: Brian Goff +Date: Sat Feb 27 21:14:09 2016 -0500 + + Merge pull request #20706 from calavera/remove_concurrent_access_to_stdtypes + + Make stdcopy.StdWriter thread safe. + +commit 15bdca6addef2cc3918a3c56685cc6cd81cfbab5 +Merge: c7d6f0c30c 2140650b56 +Author: Arnaud Porterie +Date: Sat Feb 27 17:43:43 2016 -0800 + + Merge pull request #20752 from icecrime/fix_experimental_cross + + Pin tpoechtrager/osxcross commit + +commit 2140650b56342898f7efb700bf4a681073b64ee5 +Author: Arnaud Porterie +Date: Sat Feb 27 12:00:12 2016 -0800 + + Pin tpoechtrager/osxcross commit + + Signed-off-by: Arnaud Porterie + +commit 7285c9a53a6a661e7ded4637d937f9d20dcf46c0 +Author: Shijiang Wei +Date: Sun Feb 28 01:38:26 2016 +0800 + + validate log-opt when creating containers + + Signed-off-by: Shijiang Wei + +commit faf4604dac41b4fdb88b3e6552d24d5ea5e3f16c +Author: Antonio Murdaca +Date: Sat Feb 27 18:07:39 2016 +0100 + + integration-cli: remove not necessary -d + + Signed-off-by: Antonio Murdaca + +commit b43a2c21c4017726cd9cb17ef9b16f2eef6d1159 +Merge: 7f6f9e518c ec8ceae209 +Author: moxiegirl +Date: Sat Feb 27 09:10:49 2016 -0800 + + Merge pull request #1817 from moxiegirl/test-swarm-at-scale + + Fixing problems with the instructions + +commit ec8ceae209c54091065c8f9e50439bd76255b022 +Author: Mary Anthony +Date: Sat Feb 13 22:42:32 2016 -0800 + + Fixing problems with the instructions + Updating the application after test + Removing the sudo as it caused issues + Adding new screen shots + Breaking into several files/sections + Adding in the alias from the old single page version + Moving to old path to avoid an alias + Adding in Dong's comments + Updating with latest fixes + Fixing nits and more + + Signed-off-by: Mary Anthony + +commit c7d6f0c30c824e27f3bf4dd846a68b04544d5a15 +Merge: c24d4e8ab4 e386dfc33f +Author: Arnaud Porterie +Date: Sat Feb 27 08:53:04 2016 -0800 + + Merge pull request #20742 from cpuguy83/revert_aufs_fine_locks + + Revert aufs fine locks + +commit 7f6f9e518c7bc069866d423d429927819c0cdf60 +Merge: 82e5aecc05 482830b296 +Author: moxiegirl +Date: Sat Feb 27 08:35:37 2016 -0800 + + Merge pull request #1901 from moxiegirl/carry-close-1886 + + Reformat to make it look more graceful + +commit 482830b296d96723919ab09ea8be9f8eb1a301e1 +Author: wenchma +Date: Thu Feb 25 17:44:44 2016 +0800 + + Reformat to make it look more graceful + + Signed-off-by: Wen Cheng Ma + + Fixing formatting carry and close #1886 + + Signed-off-by: Mary Anthony + +commit c24d4e8ab4a477eaaa90716e87a076bc6fc6f49c +Merge: 3f4e49aa61 efd281d6eb +Author: Arnaud Porterie +Date: Sat Feb 27 07:52:18 2016 -0800 + + Merge pull request #20734 from cpuguy83/fix_flakey_test + + Fix flakey TestStatsAllNewContainersAdded + +commit e386dfc33fc1fd5ed06496bd19f01a37c3c46341 +Author: Brian Goff +Date: Sat Feb 27 07:55:20 2016 -0500 + + fix double-lock + + Signed-off-by: Brian Goff + +commit 3f4e49aa618800396da87784211e4e02c5509551 +Merge: df2b74188e c1996c9245 +Author: Vincent Demeester +Date: Sat Feb 27 14:33:54 2016 +0100 + + Merge pull request #20739 from LK4D4/keys_config + + Add CONFIG_KEYS to check-config.sh + +commit c2f7777603039b0e9b7e8fcdf517b1486dc14781 +Author: Brian Goff +Date: Sat Feb 27 07:54:17 2016 -0500 + + Revert "Add finer-grained locking for aufs" + + This reverts commit f31014197cbe9438cc956ed12c47093a0324c82d. + + Signed-off-by: Brian Goff + +commit 1a6866273697361f33ec908f51cf0e071a36b69d +Author: HuKeping +Date: Wed Feb 24 12:06:40 2016 +0800 + + Messaging both succeed and failure about the signing + + It would be good to add a clearer failure or succeed message. + + Signed-off-by: Hu Keping + +commit 5dddf7e98e3296ddec07e104ea829bebdb15d98d +Author: HuKeping +Date: Fri Feb 5 10:56:43 2016 +0800 + + Refactor trust push + + Unlike the untrusted push without an explicit tag will push all + tags for that repo, the trusted push would expect an explicit tag. + + So that the code that attempts to do smart logic around signing multiple + tags should be removed. + + Signed-off-by: Hu Keping + +commit c1996c92455718e65a6211183e244a1e0ff803fe +Author: Alexander Morozov +Date: Fri Feb 26 23:40:35 2016 -0800 + + Add CONFIG_KEYS to check-config.sh + + We need this after opencontainers/runc#488 + + Signed-off-by: Alexander Morozov + +commit a5bd3e61441873ba6cb40480bda58176733fedb9 +Merge: 770b6728db 4d15bf071c +Author: Aaron Lehmann +Date: Fri Feb 26 23:28:37 2016 -0800 + + Merge pull request #1474 from miminar/respect-errors + + Respect errors returned from middleware code + +commit 770b6728dbffab909e96b1df292a0011d88a938c +Merge: e430d77342 7230e9def7 +Author: Aaron Lehmann +Date: Fri Feb 26 23:26:40 2016 -0800 + + Merge pull request #1481 from stevvooe/remove-AUTHORS-from-default-make-target + + Makefile: remove AUTHORS from default target + +commit 799ae78b7efa9ffb8e142a0a211325cca59987be +Author: Clinton Kitson +Date: Fri Feb 26 08:57:44 2016 -0800 + + Fixes plugin file descriptor leak on plugin discovery + + Signed-off-by: Clinton Kitson + +commit 08c0da745fa40b3fac5a6dbf9847e71e2201347f +Author: HuKeping +Date: Sat Feb 27 10:02:08 2016 +0800 + + Drop the actions + + All the other code would not have to know about the exact auth mechanism. + + Use "readOnly", we can just include "pull" when readonly is true, + and "push", "pull" when readonly is false. + + Signed-off-by: Hu Keping + +commit adac575dd33c48b19539c0f0660c5c3f344c7b75 +Author: Mike Dougherty +Date: Fri Feb 26 16:38:08 2016 -0800 + + Use multiple keyservers in install script + + This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command + + Signed-off-by: Mike Dougherty + +commit 79843b727fca8502d5463851a1238708240622d8 +Author: Lei Jitang +Date: Fri Feb 26 19:53:35 2016 -0500 + + Add bridgeNfIptables and bridgeNfIp6tables test request + + Signed-off-by: Lei Jitang + +commit 2bd365ae2f9c80aa03db30c817ced6ee1d80aa45 +Author: Christian Böhme +Date: Sat Feb 27 01:31:03 2016 +0100 + + Changed the Remote API reference to connect a container to a network in v1.22 + and v1.23 + + Signed-off-by: Christian Böhme + +commit df2b74188ec51422e84ec1dbdc58abf08c215019 +Merge: f666d918fc a793564b25 +Author: David Calavera +Date: Fri Feb 26 16:30:12 2016 -0800 + + Merge pull request #20699 from calavera/remove_static_error_declarations + + Remove static errors from errors package. + +commit 82e5aecc05f1bdf129d47fd4c62b117a477fb19b +Merge: ef99401539 d731f16279 +Author: Victor Vieux +Date: Fri Feb 26 15:28:26 2016 -0800 + + Merge pull request #1898 from vieux/more_check_test + + add even more tests on rescheduling + +commit 62fb6b99ebd508497766dcc763ae3b0c5d26fdf8 +Author: Aanand Prasad +Date: Fri Feb 26 11:26:56 2016 -0800 + + Update FAQ regarding long stop times + + - It happens on recreate, not just stop + + - We now support `stop_signal`, which can help in some cases + + Signed-off-by: Aanand Prasad + +commit f666d918fca8ad82423443b0f01528b94990b0bc +Merge: 5bfaab984c 39b799ac53 +Author: David Calavera +Date: Fri Feb 26 14:27:23 2016 -0800 + + Merge pull request #20672 from justincormack/personality + + Add some uses of personality syscall to default seccomp filter + +commit de267d701f94035549ea03e68047d85534286f85 +Author: Jeffrey Morgan +Date: Fri Feb 26 14:12:19 2016 -0800 + + Update binary plugins for upgrade + + Signed-off-by: Jeffrey Morgan + +commit 5bfaab984c94665ff6be80aefc434efc50c07667 +Merge: 2f797bb1d9 204c7808f9 +Author: Tianon Gravi +Date: Fri Feb 26 14:12:06 2016 -0800 + + Merge pull request #20636 from anusha-ragunathan/apt-ftparchive + + Always create apt-ftparchive.conf. + +commit efd281d6ebfe4e6a493d00382f3891ee0e90b02e +Author: Brian Goff +Date: Fri Feb 26 16:50:50 2016 -0500 + + Fix flakey TestStatsAllNewContainersAdded + + Signed-off-by: Brian Goff + +commit 443a5c20216b5331b1bb57796140c0178ca44b7d +Author: David Calavera +Date: Thu Feb 25 18:22:19 2016 -0500 + + Make stdcopy.stdWriter goroutine safe. + + Stop using global variables as prefixes to inject the writer header. + That can cause issues when two writers set the length of the buffer in + the same header concurrently. + + Stop Writing to the internal buffer twice for each write. This could + mess up with the ordering information is written. + + Signed-off-by: David Calavera + +commit 2f797bb1d9826f1aba242965b611b71b81fd152e +Merge: 51302c29ed f31014197c +Author: Alexander Morozov +Date: Fri Feb 26 13:33:34 2016 -0800 + + Merge pull request #20275 from cpuguy83/finer_graph_locks + + Finer graph locks + +commit d87383e8f31a0c21ec3e2d4903eef94d36be7400 +Merge: 27e8cf175c a8f00e8ba0 +Author: Nathan LeClaire +Date: Fri Feb 26 13:33:03 2016 -0800 + + Merge pull request #3121 from nathanleclaire/revert_rax_net_switches + + Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches." + +commit 51302c29edf256276ba4ba9a20076866db522f66 +Merge: b2a15a2226 995386735c +Author: Alexander Morozov +Date: Fri Feb 26 13:33:02 2016 -0800 + + Merge pull request #20729 from estesp/pipework + + Add synchronization and closure to IO pipes in userns path + +commit 27e8cf175c7bb31bc1f1ea92ff964a4dc1742782 +Merge: 6ef9524dd7 0bdc0c61ce +Author: Nathan LeClaire +Date: Fri Feb 26 13:32:56 2016 -0800 + + Merge pull request #3122 from pyrotechnick/patch-1 + + Fix typo in DigitalOcean driver + +commit 1a668bb34d60302db736d6cae18c00c35e108ca4 +Author: Riyaz Faizullabhoy +Date: Tue Feb 23 10:10:42 2016 -0800 + + add links to release tags, merge copy + + Signed-off-by: Riyaz Faizullabhoy + +commit a793564b2591035aec5412fbcbcccf220c773a4c +Author: David Calavera +Date: Thu Feb 25 10:53:35 2016 -0500 + + Remove static errors from errors package. + + Moving all strings to the errors package wasn't a good idea after all. + + Our custom implementation of Go errors predates everything that's nice + and good about working with errors in Go. Take as an example what we + have to do to get an error message: + + ```go + func GetErrorMessage(err error) string { + switch err.(type) { + case errcode.Error: + e, _ := err.(errcode.Error) + return e.Message + + case errcode.ErrorCode: + ec, _ := err.(errcode.ErrorCode) + return ec.Message() + + default: + return err.Error() + } + } + ``` + + This goes against every good practice for Go development. The language already provides a simple, intuitive and standard way to get error messages, that is calling the `Error()` method from an error. Reinventing the error interface is a mistake. + + Our custom implementation also makes very hard to reason about errors, another nice thing about Go. I found several (>10) error declarations that we don't use anywhere. This is a clear sign about how little we know about the errors we return. I also found several error usages where the number of arguments was different than the parameters declared in the error, another clear example of how difficult is to reason about errors. + + Moreover, our custom implementation didn't really make easier for people to return custom HTTP status code depending on the errors. Again, it's hard to reason about when to set custom codes and how. Take an example what we have to do to extract the message and status code from an error before returning a response from the API: + + ```go + switch err.(type) { + case errcode.ErrorCode: + daError, _ := err.(errcode.ErrorCode) + statusCode = daError.Descriptor().HTTPStatusCode + errMsg = daError.Message() + + case errcode.Error: + // For reference, if you're looking for a particular error + // then you can do something like : + // import ( derr "github.com/docker/docker/errors" ) + // if daError.ErrorCode() == derr.ErrorCodeNoSuchContainer { ... } + + daError, _ := err.(errcode.Error) + statusCode = daError.ErrorCode().Descriptor().HTTPStatusCode + errMsg = daError.Message + + default: + // This part of will be removed once we've + // converted everything over to use the errcode package + + // FIXME: this is brittle and should not be necessary. + // If we need to differentiate between different possible error types, + // we should create appropriate error types with clearly defined meaning + errStr := strings.ToLower(err.Error()) + for keyword, status := range map[string]int{ + "not found": http.StatusNotFound, + "no such": http.StatusNotFound, + "bad parameter": http.StatusBadRequest, + "conflict": http.StatusConflict, + "impossible": http.StatusNotAcceptable, + "wrong login/password": http.StatusUnauthorized, + "hasn't been activated": http.StatusForbidden, + } { + if strings.Contains(errStr, keyword) { + statusCode = status + break + } + } + } + ``` + + You can notice two things in that code: + + 1. We have to explain how errors work, because our implementation goes against how easy to use Go errors are. + 2. At no moment we arrived to remove that `switch` statement that was the original reason to use our custom implementation. + + This change removes all our status errors from the errors package and puts them back in their specific contexts. + IT puts the messages back with their contexts. That way, we know right away when errors used and how to generate their messages. + It uses custom interfaces to reason about errors. Errors that need to response with a custom status code MUST implementent this simple interface: + + ```go + type errorWithStatus interface { + HTTPErrorStatusCode() int + } + ``` + + This interface is very straightforward to implement. It also preserves Go errors real behavior, getting the message is as simple as using the `Error()` method. + + I included helper functions to generate errors that use custom status code in `errors/errors.go`. + + By doing this, we remove the hard dependency we have eeverywhere to our custom errors package. Yes, you can use it as a helper to generate error, but it's still very easy to generate errors without it. + + Please, read this fantastic blog post about errors in Go: http://dave.cheney.net/2014/12/24/inspecting-errors + + Signed-off-by: David Calavera + +commit b2a15a222626be8b70820a37c910614387b43575 +Merge: e330d0749c bf04d68db2 +Author: Vincent Demeester +Date: Fri Feb 26 21:28:08 2016 +0100 + + Merge pull request #20725 from runcom/fix-subid-files-parsing + + pkg: idtools: fix subid files parsing + +commit 0bdc0c61ce3db560a7d9422c602af95d47c81346 +Author: Nicholas Kinsey +Date: Sat Feb 27 06:04:37 2016 +1000 + + Fix typo in DigitalOcean driver + + "defaultSSHUSer" -> "defaultSSHUser" + + Signed-off-by: Nicholas Kinsey + +commit ef994015392b761519189e34541c4c418885cb45 +Merge: 4619c85bc0 ddce40187c +Author: Victor Vieux +Date: Fri Feb 26 11:37:40 2016 -0800 + + Merge pull request #1896 from gradywang/issue-typos + + Find some typos when browse the code, fix them in this patch. + +commit a8f00e8ba03ac82cb605ce273233ca7d4a61ad4c +Author: Nathan LeClaire +Date: Fri Feb 26 11:09:34 2016 -0800 + + Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches." + + This reverts commit 07cadc68a53c818bf83806e854bbe6ac1ddeda66. + + Signed-off-by: Nathan LeClaire + +commit 995386735c2fe47ebb144f95adbc8eb1341ac48b +Author: Phil Estes +Date: Fri Feb 26 12:59:48 2016 -0500 + + Add synchronization and closure to IO pipes in userns path + + The execdriver pipes setup uses OS pipes with fds so that they can be + chown'ed to the remapped root user for proper access. Recent flakiness + in certain short-lived tests (usually via the "exec" path) reveals that + the copy routines are not completing before exit/tear-down. + + This fix adds synchronization and proper closure such that these + routines exit successfully. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 1502c5a14d68251311b3bd3e89caa1f899fc19ca +Merge: adb8de367e c72e9b3843 +Author: Aanand Prasad +Date: Fri Feb 26 10:36:26 2016 -0800 + + Merge pull request #3025 from aanand/release-notes-1.6.2 + + Add release notes for 1.6.2 + +commit 39b799ac53e2ba397edc3063432d01478416dbc8 +Author: Justin Cormack +Date: Wed Feb 24 19:47:50 2016 +0000 + + Add some uses of personality syscall to default seccomp filter + + We generally want to filter the personality(2) syscall, as it + allows disabling ASLR, and turning on some poorly supported + emulations that have been the target of CVEs. However the use + cases for reading the current value, setting the default + PER_LINUX personality, and setting PER_LINUX32 for 32 bit + emulation are fine. + + See issue #20634 + + Signed-off-by: Justin Cormack + +commit e330d0749ce2d137249f290a4d20b0997279dbec +Merge: c47674efda 0bb1acee37 +Author: David Calavera +Date: Fri Feb 26 08:53:07 2016 -0800 + + Merge pull request #20703 from riyazdf/notary-v0.2.0-vendor + + Vendor in notary v0.2.0 + +commit c47674efda39226e7323e5668ee279927997fb4f +Merge: 9792308b84 11435b674b +Author: Brian Goff +Date: Fri Feb 26 10:28:23 2016 -0500 + + Merge pull request #20428 from jfrazelle/generate-conversion + + generate seccomp profile convert type + +commit bf04d68db2b808a40fa24ac2bfa86c8af22d5f11 +Author: Antonio Murdaca +Date: Fri Feb 26 14:49:43 2016 +0100 + + pkg: idtools: fix subid files parsing + + Since Docker is already skipping newlines in /etc/sub{uid,gid}, + this patch skips commented out lines - otherwise Docker fails to start. + Add unit test also. + + Signed-off-by: Antonio Murdaca + +commit 9792308b840c017f5772cee026f9537b2efe33f1 +Merge: d622494c3b c1e53ad1aa +Author: Sebastiaan van Stijn +Date: Fri Feb 26 14:02:46 2016 +0100 + + Merge pull request #20515 from raesene/patch-1 + + Update security.md with basic User Namespace info. + +commit d622494c3b5a9c1fffa1a9018104d20cea52644b +Merge: 6748cc10ac 1ca064cb62 +Author: Sebastiaan van Stijn +Date: Fri Feb 26 13:59:36 2016 +0100 + + Merge pull request #20722 from thaJeztah/remove-vivid-reference + + remove leftover Ubuntu 15.04 from install docs + +commit ddce40187c7f86a5f492492122016bd62ade274f +Author: Yongqiao Wang +Date: Fri Feb 26 20:16:39 2016 +0800 + + Find some typos when browse the code, fix them in this patch. + + Signed-off-by: Yongqiao Wang + +commit 1ca064cb62a88366bc13af67a112aff8992b6b68 +Author: Sebastiaan van Stijn +Date: Fri Feb 26 13:00:27 2016 +0100 + + remove leftover Ubuntu 15.04 from install docs + + Signed-off-by: Sebastiaan van Stijn + +commit d731f16279e7584b6ef7f9171f67d8c2376c74e8 +Author: Victor Vieux +Date: Thu Feb 25 23:40:20 2016 -0800 + + add even more tests on rescheduling + + Signed-off-by: Victor Vieux + +commit 4619c85bc0ed20ef6b1ecfd850d514971c23b1b1 +Merge: 063b63e76a a718e90662 +Author: Nishant Totla +Date: Thu Feb 25 23:38:42 2016 -0800 + + Merge pull request #1894 from allencloud/add-CORS-allow-method-HEAD + + Add method HEAD in options response headers + +commit 0bb1acee3778009d775b81525f64796d9ea62a21 +Author: Riyaz Faizullabhoy +Date: Thu Feb 25 16:30:36 2016 -0800 + + bumping miekg/pkcs11 dependency for go1.6 + + Signed-off-by: Riyaz Faizullabhoy + +commit 3cd7fe8de0e39c163d79e0f016732a8e4d18af5a +Author: Jeffrey Morgan +Date: Thu Feb 25 21:18:27 2016 -0800 + + Tweak toolbox-installer image + + Signed-off-by: Jeffrey Morgan + +commit 6748cc10ac280950103d88a249f7d443715cf833 +Merge: 6c35350bab fa3b197157 +Author: Brian Goff +Date: Thu Feb 25 22:28:53 2016 -0500 + + Merge pull request #20655 from hqhq/hq_fix_update_memoryswap + + Fix problems when update swap memory + +commit a718e90662b94a34c6a167a10d7f69dd3a8bfed6 +Author: Sun Hongliang +Date: Fri Feb 26 11:02:18 2016 +0800 + + Add method HEAD in options response headers + + Signed-off-by: Sun Hongliang + +commit af5ee13d8ab6b08bf64bc57f17a4130d6271707b +Author: HuKeping +Date: Thu Feb 25 21:24:12 2016 +0800 + + Bugfix: the actions should not always be pull and push + + The similiar fix in docker daemon: + - https://github.com/docker/docker/pull/20382 + + Signed-off-by: Hu Keping + +commit c72e9b3843c2a286e6478dde445fe3de99d88239 +Author: Aanand Prasad +Date: Tue Feb 23 15:50:59 2016 -0800 + + Add release notes for 1.6.2 + + Signed-off-by: Aanand Prasad + +commit 6c35350baba816f99bd8236b4b463bbb8d61e25d +Merge: dd53ab14e4 b368a9f9b7 +Author: David Calavera +Date: Thu Feb 25 17:35:32 2016 -0800 + + Merge pull request #20263 from Microsoft/jjh/testunit-fileutils + + Windows CI: Fixes panic in test-unit for FileUtils + +commit 5be48ba1eddd6c61a54b72ae5e8b88009c02770f +Author: Aanand Prasad +Date: Thu Feb 25 17:19:58 2016 -0800 + + Update docs about using build and image together + + Signed-off-by: Aanand Prasad + +commit adb8de367ec550e073b8821a6bb57a931d4151c1 +Merge: 42f4d814d7 57fc85b457 +Author: Aanand Prasad +Date: Thu Feb 25 16:52:33 2016 -0800 + + Merge pull request #2388 from dnephin/fix_long_lines + + Wrap long lines + +commit 42f4d814d7dd6ad4799ad71ddc738ada954143f6 +Merge: c2c8c41ef2 dc3a5ce624 +Author: Aanand Prasad +Date: Thu Feb 25 16:51:56 2016 -0800 + + Merge pull request #2880 from dnephin/merge_jsonschemas + + Merge jsonschemas to a single schema file per version + +commit 5cc420e72739a576f18703966ebef4c160e2064c +Author: Victoria Bialas +Date: Thu Feb 25 16:47:46 2016 -0800 + + WIP: updated note format for dockerfile per Aanand's comments on PR #3019 + + Signed-off-by: Victoria Bialas + +commit c2c8c41ef255261fba913ed124517242d50e8391 +Merge: 5111d0862c 43ecf8793a +Author: Aanand Prasad +Date: Thu Feb 25 16:41:49 2016 -0800 + + Merge pull request #2608 from dnephin/more_cyclomatic_reduction + + More cyclomatic complexity reduction + +commit dd53ab14e4adb3d54fbd102dcce6bc476e5b3310 +Merge: d8b6e62f50 3c69d340eb +Author: David Calavera +Date: Thu Feb 25 16:38:53 2016 -0800 + + Merge pull request #20481 from HackToday/addcheckfd + + Add check for non-systemd fd use case + +commit d8b6e62f50c1ca40903b89a789b0a1806013a5b8 +Merge: 5cb4693300 1d3480f9ba +Author: David Calavera +Date: Thu Feb 25 16:37:04 2016 -0800 + + Merge pull request #20580 from BrianBland/crossRepoPushRetry + + Improve auth fallback behavior for cross-repository push + +commit 6ef9524dd7b185184d5a7fa0768be1c2c21d7f1c +Merge: 499cd9f201 5896ecff40 +Author: Nathan LeClaire +Date: Thu Feb 25 16:28:04 2016 -0800 + + Merge pull request #3110 from jsirois/jsirois/Godep/update + + Update Godeps. + +commit 063b63e76aa686ea1d07408431e4ad005a2adbb7 +Merge: 5fc06f746c aa6ff494e4 +Author: Nishant Totla +Date: Thu Feb 25 16:22:27 2016 -0800 + + Merge pull request #1874 from allencloud/validate-label's-format + + Fix #1873 force to validate engine's label format + +commit 499cd9f201545b55e4563d63b616ddbf3d37d930 +Merge: aab419057f 07cadc68a5 +Author: Nathan LeClaire +Date: Thu Feb 25 16:20:07 2016 -0800 + + Merge pull request #2974 from robertjustjones/rackspace-net-switches + + Rackspace/Openstack - Add/enhance --*-net-* create switches. + +commit aab419057f9afc590f905179e4cc5c673f4bdfe3 +Merge: 8046e13683 b57c4c203f +Author: Nathan LeClaire +Date: Thu Feb 25 16:16:11 2016 -0800 + + Merge pull request #3112 from thieman/tnt-host-only-ip + + Determine host-only interface dynamically, stop assuming eth1 + +commit 5cb4693300114436ac62697b0dff35c0f5bce9aa +Merge: 6fa5576e30 03e2ff322b +Author: Sebastiaan van Stijn +Date: Fri Feb 26 01:11:51 2016 +0100 + + Merge pull request #20673 from Microsoft/jjh/testkill + + Windows CI: Port TestKill* + +commit 2cd1b94dd3a16688e8be2442c35ac1f03d62cacb +Author: Aanand Prasad +Date: Thu Feb 25 15:15:18 2016 -0800 + + Update note about build + image with extends + + Signed-off-by: Aanand Prasad + +commit f31014197cbe9438cc956ed12c47093a0324c82d +Author: Brian Goff +Date: Fri Feb 12 11:01:45 2016 -0500 + + Add finer-grained locking for aufs + + ``` + benchmark old ns/op new ns/op delta + BenchmarkConcurrentAccess-8 10269529748 26834747 -99.74% + + benchmark old allocs new allocs delta + BenchmarkConcurrentAccess-8 309948 7232 -97.67% + + benchmark old bytes new bytes delta + BenchmarkConcurrentAccess-8 23943576 1578441 -93.41% + ``` + + Signed-off-by: Brian Goff + +commit 0081c9a50d9ac1426ee925e05b22242cd2311b6a +Merge: e93886b871 e389b00642 +Author: Jeffrey Morgan +Date: Thu Feb 25 14:59:50 2016 -0800 + + Merge pull request #431 from docker/simple-upgrade + + Simple VM upgrades via postinstall script + +commit 5fc06f746ce0ea04b9862589fadddcb7206b0d90 +Merge: da37fb5c7b c39194cc4c +Author: Morgan Bauer +Date: Thu Feb 25 14:11:31 2016 -0800 + + Merge pull request #1869 from allencloud/fix-cors-bugs + + Fix CORS bug #1868 + +commit 5111d0862c27dd255df862ba5cc4d3167797a266 +Merge: 38dd342b7b 11dc720752 +Author: Aanand Prasad +Date: Thu Feb 25 14:09:03 2016 -0800 + + Merge pull request #2672 from dnephin/organize_scripts + + Organize scripts into directories + +commit 84dc2d9e70f1ad4422732421e2d6b91274f4dfae +Author: Riyaz Faizullabhoy +Date: Thu Feb 25 13:40:00 2016 -0800 + + Vendor in notary v0.2.0 + + Signed-off-by: Riyaz Faizullabhoy + +commit 6fa5576e308d4c99e9a818f924483536a773afba +Merge: 2b819b76df f4a1e3db99 +Author: Tibor Vass +Date: Thu Feb 25 16:16:40 2016 -0500 + + Merge pull request #20697 from tiborvass/tls-remote-daemon-tests + + Support TLS remote test daemon + +commit e389b00642c716deb81ada72330fb42ec6466a49 +Author: Jeffrey Morgan +Date: Wed Feb 24 22:39:06 2016 -0800 + + Simple upgrades via postinstall script + + Signed-off-by: Jeffrey Morgan + +commit 2b819b76df64375c711279827e61c1f0a06d08c6 +Merge: 6582013207 1ba44a832f +Author: Tibor Vass +Date: Thu Feb 25 15:01:07 2016 -0500 + + Merge pull request #20663 from calavera/standalone_middlewares + + Make server middleware standalone functions. + +commit e93886b8716c7b2fbf7db63bdb9606237a7935e9 +Merge: 13bf5f5a47 f9defab9c7 +Author: Jeffrey Morgan +Date: Thu Feb 25 11:46:31 2016 -0800 + + Merge pull request #432 from docker/osx-better-start-errors + + Split Docker Machine and VirtualBox validation messages on OS X + +commit 55c91f2ab9bcd48cfa248a4e842bb78257c14134 +Author: Brian Goff +Date: Fri Feb 12 10:20:16 2016 -0500 + + Fix some issues with concurrency in aufs. + Adds a benchmark to measure performance under concurrent actions. + + Signed-off-by: Brian Goff + +commit c1c2ca1d6d82a4e88036886508ddc0fb68352f80 +Merge: 3a89320e5d f9681e6287 +Author: Riyaz Faizullabhoy +Date: Thu Feb 25 11:14:02 2016 -0800 + + Merge pull request #595 from HuKeping/cleanup + + Cleanup: remove the unused function + +commit f4a1e3db998816e5fcb0df56c29519c488890464 +Author: Tibor Vass +Date: Wed Feb 24 17:59:11 2016 -0500 + + Support TLS remote test daemon + + This will allow us to have a windows-to-linux CI, where the linux host + can be anywhere, connecting with TLS. + + Signed-off-by: Tibor Vass + +commit 6582013207fd7eb7f31b26ecb2516eafb27479a1 +Merge: 60e2d5e0b0 d16737f971 +Author: Michael Crosby +Date: Thu Feb 25 10:47:46 2016 -0800 + + Merge pull request #20633 from crosbymichael/unit-file + + Add "Delegate=yes" to docker's service file + +commit d16737f971092767c1b9d28302a3f5aedbe2f576 +Author: Michael Crosby +Date: Tue Feb 23 14:21:29 2016 -0800 + + Add "Delegate=yes" to docker's service file + + We need to add delegate yes to docker's service file so that it can + manage the cgroups of the processes that it launches without systemd + interfering with them and moving the processes after it is reloaded. + + ``` + Delegate= + Turns on delegation of further resource control partitioning to + processes of the unit. For unprivileged services (i.e. those + using the User= setting), this allows processes to create a + subhierarchy beneath its control group path. For privileged + services and scopes, this ensures the processes will have all + control group controllers enabled. + ``` + + This is the proper fix for issue #20152 + + Signed-off-by: Michael Crosby + +commit 60e2d5e0b03e5f15cf8f6249ba47e824678e54d8 +Merge: 61d24e769d 5a264f2806 +Author: Alexander Morozov +Date: Thu Feb 25 09:18:28 2016 -0800 + + Merge pull request #20681 from icecrime/aaronl_maintainer + + Add @aaronlehmann to maintainers + +commit b57c4c203f73fe66a0efa6ab4dfd3b0ac06039cc +Author: Travis Thieman +Date: Thu Feb 25 12:02:26 2016 -0500 + + Determine host-only interface dynamically, stop assuming eth1 + + Signed-off-by: Travis Thieman + +commit 61d24e769d9f7a075f6881ba8b4523d5db9dcd6d +Merge: e4a6a889be afde6450ee +Author: Vincent Demeester +Date: Thu Feb 25 16:05:25 2016 +0100 + + Merge pull request #20572 from runcom/sudo-user + + resolve the config file from the sudo user + +commit e4a6a889be70c1b5d92b5e4f9e7cbcf3f0941e4e +Merge: 41f2a674b8 21c8511123 +Author: Antonio Murdaca +Date: Thu Feb 25 16:04:23 2016 +0100 + + Merge pull request #20695 from vdemeester/fix-windowsTP4-check + + Fix TestExecApiStartWithDetach on WindowsTP4 + +commit f9681e62871c7211aaf80fba0faeaca9da25fc62 +Author: HuKeping +Date: Thu Feb 25 21:48:32 2016 +0800 + + Cleanup: remove the unused function + + Signed-off-by: Hu Keping + +commit 21c85111231caeb6d2d342f13999d706cc33ff6a +Author: Vincent Demeester +Date: Thu Feb 25 14:27:22 2016 +0100 + + Fix TestExecApiStartWithDetach on WindowsTP4 + + Signed-off-by: Vincent Demeester + +commit 41f2a674b8829365ba76a1e2aa403a7474fc9345 +Merge: 7cf03700f8 db5ded0dfc +Author: Vincent Demeester +Date: Thu Feb 25 13:31:13 2016 +0100 + + Merge pull request #20691 from vincentbernat/doc/simplify-overlay + + docs: simplify some steps of the overlay network guide + +commit db5ded0dfc28c71276acf8500fabe3c64c15fbe1 +Author: Vincent Bernat +Date: Thu Feb 25 11:46:27 2016 +0100 + + docs: simplify some steps of the overlay network guide + + Instead of using a process expansion to feed the right arguments to + docker to run on "mh-keystore", just moves up the next step which makes + "mh-keystore" the default target. This makes the guide a bit shorter and + easier to understand. + + Signed-off-by: Vincent Bernat + +commit 7cf03700f891f0863f11ee57c2d3f8d68350d91b +Merge: 13b6733ee8 281c1ced6d +Author: Sebastiaan van Stijn +Date: Thu Feb 25 10:17:25 2016 +0100 + + Merge pull request #20679 from Microsoft/jjh/testrestart + + Windows CI: Port docker_cli_restart_test.go + +commit 13b6733ee82f1e3f8749dccf345a0874382b0d8e +Merge: 4c014296a1 9a554e8c37 +Author: Vincent Demeester +Date: Thu Feb 25 10:01:13 2016 +0100 + + Merge pull request #20685 from estesp/userns-dev-fuse-fix + + Filter auto-created device list if user namespaces enabled + +commit bc72883fe13b5cc39235b4996064bea7a5528ebf +Author: Wen Cheng Ma +Date: Fri Feb 19 14:07:16 2016 +0800 + + Enhancement of docker ps before and since filters + + This enhancement is to fix the wrong list results on + `docker ps` before and since filters specifying the non-running container. + + Fixes issue #20431 + + Signed-off-by: Wen Cheng Ma + +commit 4c014296a16d030674175f407df8a39e9aa3ae29 +Merge: ca7ce05e81 cc085be7cc +Author: Vincent Demeester +Date: Thu Feb 25 09:39:07 2016 +0100 + + Merge pull request #20687 from CWSpear/patch-1 + + Add the Local Persist plugin to docs + +commit ca7ce05e819959def59f8e3c07fdf03cbdcc0770 +Merge: 0ad04242b4 10bd587d77 +Author: Sebastiaan van Stijn +Date: Thu Feb 25 09:38:23 2016 +0100 + + Merge pull request #20677 from Microsoft/jjh/testclilogs + + Windows CI: Port docker_cli_logs_test.go + +commit 0ad04242b4a7f98b691573f9095330ba9e74ae3b +Merge: 9f1ad7850c 96c79a1934 +Author: Vincent Demeester +Date: Thu Feb 25 09:32:54 2016 +0100 + + Merge pull request #20682 from cpuguy83/fix_volplugin_panics + + Fix panic when plugin responds with null volume + +commit 9f1ad7850c03f75f9e69a8f3f76290533363ea7a +Merge: a13945dd16 00f65ae810 +Author: Vincent Demeester +Date: Thu Feb 25 09:11:15 2016 +0100 + + Merge pull request #20674 from Microsoft/jjh/testlogsapi + + Windows CI: Port TestLogsAPI* + +commit a13945dd169b8ec83a3f17103a47ce124c024c03 +Merge: abfc480f4b 93ad9c31fc +Author: Vincent Demeester +Date: Thu Feb 25 09:10:17 2016 +0100 + + Merge pull request #20680 from cpuguy83/close_plugin_req_body_on_error + + Close resp body on plugin call error + +commit abfc480f4be9a62c16e6af26160de8b80c805e51 +Merge: 3f7c078aab 6a931c3590 +Author: Vincent Demeester +Date: Thu Feb 25 09:09:37 2016 +0100 + + Merge pull request #20664 from Microsoft/jjh/busyboxtop + + Windows CI: Integrity check for busybox top + +commit 3f7c078aab164e708888f5292cb72754551ecd75 +Merge: 46c0c5e86b 877e6d76a4 +Author: Vincent Demeester +Date: Thu Feb 25 09:01:32 2016 +0100 + + Merge pull request #20683 from zhangjianfnst/fix-flaws-in-man + + Fix some flaws in man. + +commit 46c0c5e86b125556563709c5597ff97a966e7b4f +Merge: cee4ff1c4a 0f35bb92fe +Author: Vincent Demeester +Date: Thu Feb 25 08:40:00 2016 +0100 + + Merge pull request #20671 from nakulpathak3/readme-extension + + Add .md extension to readme for markdown rendering + +commit cc085be7cc19d2d1aed39c243b6990a7d04ee639 +Author: Cameron Spear +Date: Wed Feb 24 23:03:44 2016 -0800 + + Add the Local Persist plugin + + I wasn't 100% sure if it was appropriate to add plugin here, but @thaJeztah invited me to do so, so here it is! + + (see https://github.com/CWSpear/local-persist/issues/17#issuecomment-188523784) + + Signed-off-by: Cameron Spear + +commit f9defab9c77d3476d952fbe0ffec7d035ec7c10c +Author: Jeffrey Morgan +Date: Wed Feb 24 23:08:04 2016 -0800 + + Better start.sh errors on Mac OS X + + Signed-off-by: Jeffrey Morgan + +commit ca5c2abecfd12ad22b75c69e0debde7b625c2735 +Author: Liron Levin +Date: Tue Feb 23 12:04:16 2016 +0200 + + Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body + + Based on the discussion, we have changed the following: + + 1. Send body only if content-type is application/json (based on the + Docker official daemon REST specification, this is the provided for all + APIs that requires authorization. + + 2. Correctly verify that the msg body is smaller than max cap (this was + the actual bug). Fix includes UT. + + 3. Minor: Check content length > 0 (it was -1 for load, altough an + attacker can still modify this) + + Signed-off-by: Liron Levin + +commit 9a554e8c37d522ed791b3bb55f9ba9f21e2ac76a +Author: Phil Estes +Date: Thu Feb 25 00:11:36 2016 -0500 + + Filter auto-created device list if user namespaces enabled + + Because devices will be bind-mounted instead of using `mknod`, we need + to make sure the source exists and filter the list by only those whose + source is a valid path/current device entry. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit aa6ff494e45e2f157e240411b52c6866649c9771 +Author: Sun Hongliang +Date: Wed Feb 24 23:36:01 2016 +0800 + + Fix #1873 + force to validate whether engine's label is like format "key=value" + + Signed-off-by: Sun Hongliang + +commit 10bd587d77eff327cfb0dff2add4688a183c41a3 +Author: John Howard +Date: Wed Feb 24 14:26:08 2016 -0800 + + Windows CI: Port docker_cli_logs_test.go + + Signed-off-by: John Howard + +commit cee4ff1c4ac0bb47ed847f3bb725fd6233613937 +Merge: 0f01b21702 fb0ac1afd9 +Author: David Calavera +Date: Wed Feb 24 20:17:15 2016 -0800 + + Merge pull request #20647 from coolljt0725/fix_20638 + + Fix exec start api with detach and AttachStdin at same time. fixes #2… + +commit 1d3480f9ba3525309030497d5c8a3dd5725ed15a +Author: Brian Bland +Date: Mon Feb 22 11:27:17 2016 -0800 + + Improve fallback behavior for cross-repository push + + Attempt layer mounts from up to 3 source repositories, possibly + falling back to a standard blob upload for cross repository pushes. + Addresses compatiblity issues with token servers which do not grant + multiple repository scopes, resulting in an authentication failure for + layer mounts, which would otherwise cause the push to terminate with an + error. + + Signed-off-by: Brian Bland + +commit c39194cc4ce47501567f703df0c8e985294ee648 +Author: allencloud +Date: Wed Feb 24 17:47:44 2016 +0800 + + Fixes #1868 + 1.Fixes cors bug + 2.Add cors test + + Signed-off-by: Sun Hongliang + +commit b9366c9609166d41e987608041b5a2079726aa5f +Author: Lei Jitang +Date: Wed Feb 24 03:13:44 2016 -0500 + + Fix configuration reloading + + There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts' + and 'cluster-advertise' that can be reconfigured, configure any of these + options should not affect other options which may have configured in flags. + But this is not true, for example, I start a daemon with -D to enable the + debugging, and after a while, I want reconfigure the 'label', so I add a file + '/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon + to reconfigure the daemon, it work, but the debugging of the daemon is also diabled. + I don't think this is a expeted behaviour. + This patch also have some minor refactor of reconfiguration of cluster-advertiser. + Enable user to reconfigure cluster-advertiser without cluster-store in config file + since cluster-store could also be already set in flag, and we only want to reconfigure + the cluster-advertiser. + + Signed-off-by: Lei Jitang + +commit a9869dcb0e9a4c4b44cacf66522bf1526a226cb7 +Author: Dong Chen +Date: Wed Feb 24 18:10:58 2016 -0800 + + Docker issue affects nodemanagement tests in Docker 1.9. + + Signed-off-by: Dong Chen + +commit fb0ac1afd97e6e3bf3c13dcda5821f36b56cc62b +Author: Lei Jitang +Date: Wed Feb 24 21:04:44 2016 -0500 + + Fix exec start api with detach and AttachStdin at same time. fixes #20638 + + Signed-off-by: Lei Jitang + +commit 877e6d76a4f16a1825a1e98cbfa9f5fef7a60c59 +Author: Jian Zhang +Date: Thu Feb 25 09:48:21 2016 +0800 + + Fix some flaws in man. + + Signed-off-by: Jian Zhang + +commit 96c79a1934dd52d2a6f648e519b5d4ac60ac8ca1 +Author: Brian Goff +Date: Wed Feb 24 20:45:38 2016 -0500 + + Fix panic when plugin responds with null volume + + In cases where the a plugin responds with both a null or empty volume + and a null or empty Err, the daemon would panic. + This is because we assumed the idiom if `err` is nil, then `v` must not + be but in reality the plugin may return whatever it wants and we want to + make sure it doesn't harm the daemon. + + Signed-off-by: Brian Goff + +commit 5a264f280623bfe9744a08666eb06b080140c63b +Author: Arnaud Porterie +Date: Wed Feb 24 17:31:12 2016 -0800 + + Add @aaronlehmann to maintainers + + Signed-off-by: Arnaud Porterie + +commit 93ad9c31fce375b29606ea347df28c1205e7cb41 +Author: Brian Goff +Date: Wed Feb 24 20:09:51 2016 -0500 + + Close resp body on plugin call error + + Signed-off-by: Brian Goff + +commit 0e60c711216f374027a4515c6a77a00bf46da067 +Author: Victor Vieux +Date: Wed Feb 24 17:01:54 2016 -0800 + + use env in compose test + + Signed-off-by: Victor Vieux + +commit 3a89320e5d4117a0a4e869e6afd02bfdc13d63c5 +Merge: 4904c8882e cb2dd07edc +Author: David Lawrence +Date: Wed Feb 24 16:40:56 2016 -0800 + + Merge pull request #588 from endophage/fix_snapshot_expiry + + Fix server signed snapshot expiry/regeneration + +commit 11dc7207520be98f70ac38e000c8a90975908e39 +Author: Daniel Nephin +Date: Fri Jan 15 16:35:26 2016 -0500 + + Move test scripts to script/test. + + Signed-off-by: Daniel Nephin + +commit ec6bb1660dde7e6700e894edb2235bdcf08a3a35 +Author: Daniel Nephin +Date: Fri Jan 15 16:31:30 2016 -0500 + + Move run scripts to script/run + + Signed-off-by: Daniel Nephin + +commit a87d482a3bad04e211103c484b54580e243a9b4c +Author: Daniel Nephin +Date: Fri Jan 15 16:27:43 2016 -0500 + + Move all build scripts to script/build + + Signed-off-by: Daniel Nephin + +commit 4904c8882ede9e883a4ae4304a17f22979fa2c5c +Merge: e692e5d69e d69d0188a4 +Author: Riyaz Faizullabhoy +Date: Wed Feb 24 16:20:47 2016 -0800 + + Merge pull request #590 from docker/yubi-import-check + + Move yubikey import role check to avoid excessive passphrase prompting + +commit dc3a5ce624fb0a0bf2d0c701aaa34df63b6fc5bd +Author: Daniel Nephin +Date: Wed Feb 10 16:05:15 2016 -0500 + + Refactor config validation to support constraints in the same jsonschema + + Reworked the two schema validation functions to read from the same schema but + use different parts of it. Error handling is now split as well by the + schema that is being used to validate. + + Signed-off-by: Daniel Nephin + +commit 43ecf8793af1b1979c400634b31207684aa0ce8d +Author: Daniel Nephin +Date: Tue Jan 19 16:06:32 2016 -0500 + + Address old TODO, and small refactor of container name logic in service. + + Signed-off-by: Daniel Nephin + +commit cdda616d6b21cd99bb2283009bfb066ee0b68767 +Author: Daniel Nephin +Date: Fri Nov 27 13:26:15 2015 -0500 + + Reduce complexity of sort_service_dicts. + + Signed-off-by: Daniel Nephin + +commit 84a1822e407959bc4c75d4ed3b65c0444e8db885 +Author: Daniel Nephin +Date: Fri Nov 27 13:19:27 2015 -0500 + + Reduce complexity of _get_container_create_options + + Signed-off-by: Daniel Nephin + +commit da37fb5c7b56841b88f59ef51ba6711a6fc97935 +Merge: 9617bdb860 90fa1d3ee5 +Author: Victor Vieux +Date: Wed Feb 24 16:02:08 2016 -0800 + + Merge pull request #1877 from vieux/bump_1.1.3 + + bump to 1.1.3 + +commit be554c3a74c137e835209b7a1f27b76bd64aa54f +Author: Daniel Nephin +Date: Fri Feb 5 20:21:58 2016 -0500 + + Merge v1 config jsonschemas into a single file. + + Signed-off-by: Daniel Nephin + +commit adb64ef8d5406c26834b2bd0a4dfab1de47ff9ca +Author: Daniel Nephin +Date: Fri Feb 5 20:07:04 2016 -0500 + + Merge v2 config jsonschemas into a single file. + + Signed-off-by: Daniel Nephin + +commit cb2dd07edcd6e9b7a8c50bb084e65b4264c79cd2 +Author: David Lawrence +Date: Wed Feb 24 11:13:37 2016 -0800 + + the server was not setting the longer snapshot expiry time. When generating a timestamp it was also retriving the snapshot directly from the database and only validating the checksum still matched what was in the timestamp. Due to the addition of consistent downloads, this mean a new snapshot never got generated. It is necessary for GetOrCreateTimestamp to call GetOrCreateSnapshot to ensure a new snapshot is generated as and when required + Signed-off-by: David Lawrence (github: endophage) + +commit 281c1ced6d6901ffb7faee209c243d0734abc792 +Author: John Howard +Date: Wed Feb 24 15:21:56 2016 -0800 + + Windows CI: Port docker_cli_restart_test.go + + Signed-off-by: John Howard + +commit 0f01b21702db8eb677e0a75d1a7b2fbb201b7b4c +Merge: a7fefcf16c 1ed84770c5 +Author: Sebastiaan van Stijn +Date: Thu Feb 25 00:19:30 2016 +0100 + + Merge pull request #20630 from tkopczynski/10084-cmd-entrypoint + + Docs: add note about CMD and ENTRYPOINT commands + +commit 90fa1d3ee5557f1792c4278c956e57a666769589 +Author: Victor Vieux +Date: Wed Feb 24 14:48:34 2016 -0800 + + bump to 1.1.3 + + Signed-off-by: Victor Vieux + +commit d69d0188a4fe8e71f037eabaab9ed8e4d441b560 +Author: Riyaz Faizullabhoy +Date: Wed Feb 24 14:29:40 2016 -0800 + + Move yubikey import role check to avoid excessive passphrase prompting + + Signed-off-by: Riyaz Faizullabhoy + +commit 1ed84770c52b0abd026fe9c1acc51f19d94fad12 +Author: Tomasz Kopczynski +Date: Tue Feb 23 22:03:45 2016 +0100 + + Docs: add note about CMD and ENTRYPOINT commands + + Signed-off-by: Tomasz Kopczynski + +commit 00f65ae810679d587cb52466f52988ae9267e91d +Author: John Howard +Date: Wed Feb 24 13:43:52 2016 -0800 + + Windows CI: Port TestLogsAPI* + + Signed-off-by: John Howard + +commit e692e5d69e39ea0cfacdfbbde03b44b39cc10326 +Merge: 6d76ce10ba 596a362a36 +Author: David Lawrence +Date: Wed Feb 24 13:38:13 2016 -0800 + + Merge pull request #589 from docker/del-add-print + + print IDs instead of key itself + +commit 03e2ff322b064504f5c22bd5fbe863ae1c4bf0fc +Author: John Howard +Date: Wed Feb 24 13:33:25 2016 -0800 + + Windows CI: Port TestKill* + + Signed-off-by: John Howard + +commit 5896ecff40c0092c1ae91eb2ef6c880ba2527653 +Author: John Sirois +Date: Wed Feb 24 13:13:01 2016 -0800 + + Update Godeps. + + This was a mechanical change: + ``` + make dep-restore + godep update -goversion + make dep-save + ``` + + Signed-off-by: John Sirois + +commit c1e53ad1aa9d82568efc045444a5df76b1471905 +Author: Rory McCune +Date: Fri Feb 19 19:52:57 2016 +0000 + + Update security.md with basic User Namespace info. + + Just some suggested wording to update this page to take account of User Namespaces being available as of 1.10. + + Signed-off-by: Rory McCune + +commit 0f35bb92fe8bbcf6d6136c5f780c16c2e0ea638f +Author: Nakul Pathak +Date: Wed Feb 24 20:37:21 2016 +0000 + + Add .md extension to readme for markdown rendering + + Signed-off-by: Nakul Pathak + +commit 1ba44a832f6aae811dfc6235287dd5b99e8aa94c +Author: David Calavera +Date: Wed Feb 24 13:17:43 2016 -0500 + + Make server middleware standalone functions. + + Removing direct dependencies from the server configuration. + + Signed-off-by: David Calavera + +commit 596a362a362428ec7b29cb91b96c03cef23c73b7 +Author: Riyaz Faizullabhoy +Date: Wed Feb 24 11:18:33 2016 -0800 + + print IDs instead of key itself + + Signed-off-by: Riyaz Faizullabhoy + +commit 6a931c3590f5a2f274f9ab4c43452939d101a1b5 +Author: John Howard +Date: Wed Feb 24 10:17:25 2016 -0800 + + Windows CI: Integrity check for busybox top + + Signed-off-by: John Howard + +commit 123f22004bf30006be9a00be99da09b4cdf5134b +Author: Mike Danese +Date: Fri Dec 18 09:43:27 2015 -0800 + + vendor: add dependencies of gcplogs driver + + The added dependencies are: + * golang.org/x/oauth2 + * google.golang.org/api + * google.golang.org/cloud + + Signed-off-by: Mike Danese + +commit a7fefcf16cda4f91b9526b4db6d06ef12652f419 +Merge: 467c8b1a6a f9524a4d24 +Author: Alexander Morozov +Date: Wed Feb 24 10:10:03 2016 -0800 + + Merge pull request #20641 from cpuguy83/revert_inotify_changes + + Revert fsnotify changes + +commit 9617bdb86057815de67374483e01f443229b9fea +Merge: 638709a2d7 b9f7b8a91a +Author: moxiegirl +Date: Wed Feb 24 09:28:03 2016 -0800 + + Merge pull request #1875 from moxiegirl/carry-close-1852 + + Fixed typos and formatting issues. + +commit 638709a2d771823a5660c43024007d53ef95b124 +Merge: a839ebdd06 e8fad3d657 +Author: moxiegirl +Date: Wed Feb 24 09:21:07 2016 -0800 + + Merge pull request #1876 from moxiegirl/carry-and-close-1836 + + Add commands reference to the Swarm documentation + +commit b9f7b8a91a0cbd04f91bac4a7b5172443476d205 +Author: Rolfe Dlugy-Hegwer +Date: Sat Feb 20 22:58:20 2016 -0500 + + Fixed typos and formatting issues. + + Signed-off-by: Rolfe Dlugy-Hegwer + Adding in comments + + Signed-off-by: Mary Anthony + +commit 467c8b1a6a866081081a90ea9cec94640638781a +Merge: efb915800a ef9f13af3d +Author: Arnaud Porterie +Date: Wed Feb 24 08:46:00 2016 -0800 + + Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers + + Windows CI: Fix TestStartAttachMultipleContainers + +commit e8fad3d657f23aea08b3d03eab422ae89cfa3442 +Author: Rolfe Dlugy-Hegwer +Date: Wed Feb 17 22:05:30 2016 -0500 + + command reference and docker file 22:05 + fix bad links + + Signed-off-by: Rolfe Dlugy-Hegwer + +commit f9524a4d24d6135ae1777738390e1f6a590a7a1c +Author: Brian Goff +Date: Tue Feb 23 21:36:04 2016 -0500 + + add file poller panic fix from 1.10.2 + + Signed-off-by: Brian Goff + +commit efb915800aa6595e24f39ed58d95d5ab5db02f7a +Merge: 5fdfb2985b eb902ef257 +Author: Sebastiaan van Stijn +Date: Wed Feb 24 16:04:02 2016 +0100 + + Merge pull request #20649 from runcom/fedora-update-userns + + docs: reference: commandline: daemon: fedora 23+ has mapping files + +commit b994cdd1f74b0aeb0b51fda1249a0c4c8efbf0d0 +Merge: cd06890ff0 5434b1723a +Author: Sebastiaan van Stijn +Date: Wed Feb 24 15:56:46 2016 +0100 + + Merge pull request #58 from thaJeztah/update-libnetwork-maintainers + + Update libnetwork maintainers + +commit 5434b1723af8f4f6cec759d08a6ff8c510082519 +Author: Sebastiaan van Stijn +Date: Wed Feb 24 15:43:57 2016 +0100 + + Update libnetwork maintainers + + Chun Chen was added as a maintainer + + Signed-off-by: Sebastiaan van Stijn + +commit eb902ef25773ca670eee126351547e77f384ad9d +Author: Antonio Murdaca +Date: Wed Feb 24 12:56:31 2016 +0100 + + docs: reference: commandline: daemon: fedora 23+ has mapping files + + Signed-off-by: Antonio Murdaca + +commit afde6450ee7bd4a43765fdc0a9799b411276d9e4 +Author: Antonio Murdaca +Date: Mon Feb 22 14:48:25 2016 +0100 + + resolve the config file from the sudo user + + Signed-off-by: Antonio Murdaca + +commit 5fdfb2985b209660a1a540222f614b73a0dc2e63 +Merge: 2cc54a2e57 800c9e81ea +Author: Sebastiaan van Stijn +Date: Wed Feb 24 13:48:27 2016 +0100 + + Merge pull request #20619 from Microsoft/jjh/useraccounts + + Windows: Updates for virtual user account + +commit 2cc54a2e5735aa052884fce2e6674285c3853473 +Merge: 034a1a8dfd 2355151556 +Author: Sebastiaan van Stijn +Date: Wed Feb 24 11:42:26 2016 +0100 + + Merge pull request #20643 from estesp/userns-chkconfig-redhat + + Add check for RHEL7/CentOS7 experimental userns disabled + +commit 034a1a8dfd17d89123bf0405f898e880575ed775 +Merge: 2d0c3d1328 bd4fb00fb6 +Author: Sebastiaan van Stijn +Date: Wed Feb 24 11:08:21 2016 +0100 + + Merge pull request #20017 from calavera/expose_volumes_in_ps + + Add mounts to docker ps. + +commit fa3b1971578b3e270417df0215eeacaa03e881cf +Author: Qiang Huang +Date: Wed Feb 24 14:23:48 2016 +0800 + + Restore container configs when update failed + + Signed-off-by: Qiang Huang + +commit 8ae6f6ac28c1e9e28c1503b8118691580b66d885 +Author: Qiang Huang +Date: Wed Feb 24 13:36:47 2016 +0800 + + Support update swap memory only + + We should support update swap memory without memory. + + Signed-off-by: Qiang Huang + +commit 23551515564b54128e882dda5eae659883947d39 +Author: Phil Estes +Date: Tue Feb 23 23:28:24 2016 -0600 + + Add check for RHEL7/CentOS7 experimental userns disabled + + Add a check in `check-config.sh` to see if we are running on a RHEL7 or + CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but + user namespaces still won't work because of the experimental feature + flag added by Redhat. + + This will add a warning if it is actually disabled and notes what has to + be added to the grub/boot command line to enable it. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit a839ebdd0686fabe122e36e561e70f10eb2a8712 +Merge: a904eec54f 8910c586f8 +Author: Alexandre Beslic +Date: Tue Feb 23 21:14:11 2016 -0800 + + Merge pull request #1864 from vieux/check_rm_resh + + make sure all the rescheduled containers were removed + +commit 8046e13683f6c40cfa55ae106bba5f4f4d87f7ea +Merge: 0acadcb35f b1999a7820 +Author: Nathan LeClaire +Date: Tue Feb 23 19:22:07 2016 -0800 + + Merge pull request #1553 from jasisk/fix-conffile-error + + Fix apt-get error on conf file conflict + +commit 91fdfdd53722179b21b80b9dfbe8bc2e09d0a7b1 +Author: Brian Goff +Date: Tue Feb 23 21:07:38 2016 -0500 + + Revert "use pubsub instead of filenotify to follow json logs" + + This reverts commit b1594c59f5e0d1ac898eacde8d91b1ba33c2b626. + + Signed-off-by: Brian Goff + +commit f78091897a9926399224886788c373b4ff9d14bf +Author: Brian Goff +Date: Tue Feb 23 21:05:16 2016 -0500 + + Revert "pkg: remove unused filenotify" + + This reverts commit ee99b5f2e96aafa982487aadbb78478898ae0c71. + + Signed-off-by: Brian Goff + +commit d3bffa1639655b9d0f96b8ef4b1842663e7d2741 +Author: Brian Goff +Date: Tue Feb 23 21:05:07 2016 -0500 + + Revert "vendor: remove fsnotify" + + This reverts commit bc195e1558d3091dccb209f1bb35115248886c7a. + + Signed-off-by: Brian Goff + +commit b1999a7820f56f31bea8b6b1dd8d2e4fb386b6ac +Author: Jean-Charles Sisk +Date: Mon Jul 20 14:22:22 2015 -0400 + + fix apt-get error on conf file conflict + + Signed-off-by: Jean-Charles Sisk + +commit 8910c586f81aa57fec88f4a6a19b7cc366b932db +Author: Victor Vieux +Date: Tue Feb 23 18:28:21 2016 -0800 + + make sure all the rescheduled containers were removed + + Signed-off-by: Victor Vieux + +commit a904eec54f8468a1d4347d63aa89d6b1d3793c8b +Merge: 02296dc1f2 a7a942192f +Author: Alexandre Beslic +Date: Tue Feb 23 17:42:26 2016 -0800 + + Merge pull request #1863 from vieux/update_compose + + update compose to 1.6.2 + +commit 9eb1204958c8d378baeadb9c634df35a965662c3 +Merge: c1b7d6c6ad 4d720279a0 +Author: Aanand Prasad +Date: Tue Feb 23 17:02:34 2016 -0800 + + Merge pull request #3010 from aanand/bump-1.6.2 + + Bump 1.6.2 + +commit 13bf5f5a478c0ed69733a8a274a3998228e0c374 +Author: Nathan LeClaire +Date: Tue Feb 23 16:42:22 2016 -0800 + + Bump Toolbox for new Compose version + + Signed-off-by: Nathan LeClaire + +commit a7a942192fe6736a80b34327b26bda5b2824f960 +Author: Victor Vieux +Date: Tue Feb 23 16:41:58 2016 -0800 + + update compose to 1.6.2 + + Signed-off-by: Victor Vieux + +commit 2d0c3d1328cf1f10a4f4db7015e4ff1c9f7779ae +Merge: a9e6274224 4fc5bd295e +Author: Arnaud Porterie +Date: Tue Feb 23 16:24:46 2016 -0800 + + Merge pull request #20631 from LK4D4/update_libcontainer + + Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf + +commit ef9f13af3d9293458a03223a030028381da4ae09 +Author: John Howard +Date: Tue Feb 23 16:24:35 2016 -0800 + + Windows CI: Fix TestStartAttachMultipleContainers + + Signed-off-by: John Howard + +commit 204c7808f94259a32f1e89c229116977876cbb88 +Author: Anusha Ragunathan +Date: Tue Feb 23 15:22:03 2016 -0800 + + Always create apt-ftparchive.conf. + + The Releases file(s) and other bits for EOL-ed distros such as Ubuntu + Vivid should remain untouched when we are releasing debs. + + However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/ + were being updated for the docker 1.10 release including the Release files. + This is due to apt-ftparchive generating index files for vivid as well, + due to the stale apt-ftparchive.conf + + This change always creates config using suites in contrib/reprepro/suites.sh. + + Signed-off-by: Anusha Ragunathan + +commit 38dd342b7bd199ac5387ba4a0a7a3f891e691274 +Merge: f48d321b5b 49ef8a271d +Author: Daniel Nephin +Date: Tue Feb 23 16:02:18 2016 -0800 + + Merge pull request #3009 from dnephin/update_release_notes + + Add release notes for 1.6.1 + +commit 4d720279a0a1152af70dee720a67c395392aaff3 +Author: Aanand Prasad +Date: Tue Feb 23 15:50:59 2016 -0800 + + Bump 1.6.2 + + Signed-off-by: Aanand Prasad + +commit 796dc91eb149f2a592f9f69ca1fa3fcc057f4af2 +Author: Joffrey F +Date: Tue Feb 23 14:55:06 2016 -0800 + + Update docker-py version in requirements to 1.7.2 + + Signed-off-by: Joffrey F + +commit a7da06d920e8ac5e5b320ba4b873ccba02d642b6 +Merge: a75c16cb1b c1b7d6c6ad +Author: Aanand Prasad +Date: Tue Feb 23 15:49:21 2016 -0800 + + Merge remote-tracking branch 'release/release' into bump-1.6.2 + +commit f48d321b5b7e655afc33debb3454f465146bec7f +Merge: 0467bc3dcf 97bbee19b7 +Author: Joffrey F +Date: Tue Feb 23 15:41:11 2016 -0800 + + Merge pull request #3008 from shin-/update_dockerpy_version + + Update docker-py version in requirements to 1.7.2 + +commit a9e627422458a530a9af8fd01d7838eec51b03ab +Merge: 2ed1806b2c 3abf2a7741 +Author: Arnaud Porterie +Date: Tue Feb 23 15:37:32 2016 -0800 + + Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests + + Fix flaky OOM tests + +commit 49ef8a271d89212fe1e778188b301c6da67b9566 +Author: Daniel Nephin +Date: Tue Feb 23 11:31:22 2016 -0800 + + Add release notes for 1.6.1 + + Signed-off-by: Daniel Nephin + +commit 0467bc3dcf3bd6d0a720e0dc95c79c80747e7177 +Merge: f2ccbeff76 e6797e1166 +Author: Daniel Nephin +Date: Tue Feb 23 15:10:11 2016 -0800 + + Merge pull request #2998 from londoncalling/docs-wordpress-example + + updated Wordpress example to be easier to follow, added/updated images + +commit 97bbee19b7f16055c42d819bf005853159740b19 +Author: Joffrey F +Date: Tue Feb 23 14:55:06 2016 -0800 + + Update docker-py version in requirements to 1.7.2 + + Signed-off-by: Joffrey F + +commit 02296dc1f2352e93a1d4e48de7403ebe22554ab7 +Merge: 633a2ba065 22fedf0db0 +Author: Victor Vieux +Date: Tue Feb 23 14:22:49 2016 -0800 + + Merge pull request #1855 from vieux/net_node_run + + support docker run --net / + +commit 67629c8b52f95218c2ef4ff781b6dfdcd8e88ba9 +Author: Morgan Bauer +Date: Thu Jan 28 07:48:22 2016 -0800 + + do not turn post-processing on for linux-cgo term + + - fixes #15373 + - remove set OPOST output flag for termios + - remove latent os.Exit call + + Signed-off-by: Morgan Bauer + +commit e430d773428ba6b167ea6ef75a3d7cf6b47b8cd4 +Merge: 7571572305 615c6dfced +Author: Brian Bland +Date: Tue Feb 23 14:08:21 2016 -0800 + + Merge pull request #1482 from stweil/master + + Fix some typos in comments and strings + +commit 2ed1806b2c563e2276d81066cc492aaf7bcb145b +Merge: 9ec015edff d14cef441d +Author: David Calavera +Date: Tue Feb 23 13:45:29 2016 -0800 + + Merge pull request #20610 from justechn/fix_docs + + Fix docs + +commit 4fc5bd295eedbefe1b429d98be52f794f1461f2f +Author: Alexander Morozov +Date: Tue Feb 23 13:37:20 2016 -0800 + + Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf + + It includes fix for parsing systemd cgroup names + + Signed-off-by: Alexander Morozov + +commit 615c6dfcedba2d4fcb45bf534811646711138530 +Author: Stefan Weil +Date: Tue Feb 23 22:33:38 2016 +0100 + + Fix some typos in comments and strings + + All of them were found and fixed by codespell. + + Signed-off-by: Stefan Weil + +commit b368a9f9b792ff75cbc5ee5a357b342b99a11e04 +Author: John Howard +Date: Thu Feb 11 19:12:01 2016 -0800 + + Windows CI: Fixes panic in test-unit for FileUtils + + Signed-off-by: John Howard + +commit 6d76ce10bab288555ef51383317a5027f9f41afe +Merge: 9e9802bdd0 bde878cdb6 +Author: Riyaz Faizullabhoy +Date: Tue Feb 23 13:19:54 2016 -0800 + + Merge pull request #577 from docker/walker-template + + WalkTargets on tuf repo for targets and delegations + +commit 22fedf0db0c0cc4b111e975efe41d17fbc35437d +Author: Victor Vieux +Date: Thu Feb 18 16:05:28 2016 -0800 + + support docker run --net / + + Signed-off-by: Victor Vieux + +commit c1b7d6c6ade5d86038ea95353ac011ee2a5cfead +Merge: 9503aa2b5f a75c16cb1b +Author: Daniel Nephin +Date: Tue Feb 23 12:37:12 2016 -0800 + + Merge pull request #3006 from dnephin/bump-1.6.1 + + WIP: Bump 1.6.1 + +commit 3abf2a77414195d5b0c15f7fc88b7fd9aa4edaa8 +Author: Christopher Jones +Date: Tue Feb 23 15:17:26 2016 -0500 + + Fix flaky OOM tests + + If cgroup swap memory limit isn't enabled, then + the -m flag doesn't work and the container that is created for + both of these tests is very large. Because we are trying to run the + containers out of memory, this takes a very long time and causes the + tests to fail most of the time. + + Follow-up to #17913 + + Signed-off-by: Christopher Jones + +commit a75c16cb1be80f2c8e94120b7a79e3ddbd901419 +Author: Daniel Nephin +Date: Tue Feb 23 11:31:22 2016 -0800 + + Bump 1.6.1 + + Signed-off-by: Daniel Nephin + +commit e08409f18d0d72f4e3201cfe664bbfa55dd7bc31 +Author: Mary Anthony +Date: Wed Feb 10 20:47:15 2016 -0800 + + Updating Dockerfile + + Signed-off-by: Mary Anthony + +commit e6797e116648fb566305b39040d5fade83aacffc +Author: Victoria Bialas +Date: Mon Feb 22 18:50:09 2016 -0800 + + updated Wordpress example to be easier to follow, added/updated images + + docs update per Mary's comments on the PR + + Signed-off-by: Victoria Bialas + +commit f2ccbeff76c0a71b0e8493b699d76a939c721e59 +Merge: 1d67e6f0f0 d451578152 +Author: Daniel Nephin +Date: Tue Feb 23 11:58:30 2016 -0800 + + Merge pull request #2997 from dnephin/fix_env_var_without_value + + Fix env var without value + +commit 9d7dbe3857ef0c5c79229747e26caa68b4f0d228 +Author: Daniel Nephin +Date: Mon Feb 22 17:47:51 2016 -0800 + + Make environment variables without a value the same as docker-cli. + + Signed-off-by: Daniel Nephin + +commit bcd5286cd38a51336e151ff0640a3312095f4818 +Author: Daniel Nephin +Date: Mon Feb 22 17:30:42 2016 -0800 + + Revert "Change special case from '_', None to ()" + + This reverts commit 677c50650c86b4b6fabbc21e18165f2117022bbe. + + Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior" + + This reverts commit 001903771260069c475738efbbcb830dd9cf8227. + + Revert "Mangle the tests. They pass for better or worse!" + + This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d. + + Revert "If an env var is passthrough but not defined on the host don't set it." + + This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004. + + Signed-off-by: Daniel Nephin + +commit bde878cdb6ced88789f17dcd86081e73a9cd9928 +Author: Riyaz Faizullabhoy +Date: Tue Feb 23 11:50:16 2016 -0800 + + changing API for updating delegations + + Signed-off-by: Riyaz Faizullabhoy + +commit 729bb88537118ab07af180817379f78ea7bdaa05 +Author: Riyaz Faizullabhoy +Date: Mon Feb 22 11:26:32 2016 -0800 + + addressing review comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 06e34e825ad2c3191bfd2fab00410e221974c532 +Author: Riyaz Faizullabhoy +Date: Fri Feb 19 18:23:09 2016 -0800 + + walk for updating/creating delegations, validate changes to paths + + Signed-off-by: Riyaz Faizullabhoy + +commit fe1c8ea1d8452ed8237a70a4a72e4fd180976bc9 +Author: Riyaz Faizullabhoy +Date: Fri Feb 19 12:01:11 2016 -0800 + + More robust errors for visitor and walker, improve comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 22c220d4d2a90e4f02e211d8b9f675a181b55447 +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 18:14:47 2016 -0800 + + RemoveTargets with walker + + Signed-off-by: Riyaz Faizullabhoy + +commit 456e5054a88e5a3a7b40c214e29a465315d491a1 +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 17:40:37 2016 -0800 + + Currently always validate role names and restrict paths while walking + + Signed-off-by: Riyaz Faizullabhoy + +commit 5398bcf4fd1423f655958e7f9615998b768f29d4 +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 16:33:56 2016 -0800 + + AddTargets uses walk and visitor + + Signed-off-by: Riyaz Faizullabhoy + +commit e279c99daf08dc96aaa147e4271c8350abe0b45a +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 14:19:24 2016 -0800 + + use walker for GetDelegationRole + + Signed-off-by: Riyaz Faizullabhoy + +commit a7153aeccb4b87f32d538d767f1ffb4c7768a130 +Author: Riyaz Faizullabhoy +Date: Wed Feb 17 22:05:13 2016 -0800 + + WalkTargets on tuf repo, use in getting targets/roles + + Signed-off-by: Riyaz Faizullabhoy + +commit daebf74d6cd888473868d98815b68f92739a7e53 +Author: Daniel Nephin +Date: Mon Feb 22 16:46:09 2016 -0800 + + Stop other containers if the flag is set. + + Signed-off-by: Daniel Nephin + +commit 155d813606a5f1a9492a630807b12c999ef9b709 +Author: Richard Bann +Date: Thu Feb 18 12:13:16 2016 +0100 + + Add failing test for --abort-on-container-exit + + Handle --abort-on-container-exit. Fixes #2940 + + Signed-off-by: Richard Bann + +commit 73c2f8ee37bf5c7cf5d9277b8c99dcfda0105621 +Author: Daniel Nephin +Date: Mon Feb 22 14:48:56 2016 -0800 + + Fix warning about boolean values. + + Signed-off-by: Daniel Nephin + +commit 4aae2c3b7b009d97b200c40fabf980342e62481b +Author: Joffrey F +Date: Mon Feb 22 12:56:54 2016 -0800 + + Use docker-py 1.7.1 + + Signed-off-by: Joffrey F + +commit b79ad5f9663178eb3019ca53b54a818914c3039e +Author: Daniel Nephin +Date: Fri Feb 19 14:22:55 2016 -0500 + + Fix validation message when there are multiple ested oneOf validations. + + Signed-off-by: Daniel Nephin + +commit f8e3c46fbb6134d694fb98f1c3bc899a2f13f357 +Author: Victoria Bialas +Date: Thu Feb 18 18:05:30 2016 -0800 + + copyedit to make show as file format + + Signed-off-by: Victoria Bialas + +commit f7c923062d24e4eae5559b173af8c244d0ee9657 +Author: Victoria Bialas +Date: Thu Feb 18 17:49:28 2016 -0800 + + corrected description of network aliases, added real-world example per #2907 + + Signed-off-by: Victoria Bialas + +commit 61906ac2ff6d8f90b59e33b28b95fe50c67c254d +Author: Joffrey F +Date: Thu Feb 18 17:17:20 2016 -0800 + + Update documentation for volume_driver option. + + Signed-off-by: Joffrey F + +commit ea8032c115ad85637edf3043d2c69edb5399368f +Author: Daniel Nephin +Date: Fri Feb 19 12:35:05 2016 -0500 + + Make config validation error messages more consistent. + + Signed-off-by: Daniel Nephin + +commit 7d22809ef4bbfa26dabdb92c06331f95fccf69b9 +Author: Daniel Nephin +Date: Tue Feb 16 17:30:23 2016 -0500 + + Validate that each section of the config is a mapping before running interpolation. + + Signed-off-by: Daniel Nephin + +commit cfda9d844ef7d09ed4ad8b55fadc7d652694412f +Author: Anthon van der Neut +Date: Wed Feb 17 09:56:49 2016 +0100 + + for 1.6.0 the version value needs to be a string + + After conversion a file would immediately not load in docker-compose 1.6.0 with the message: + + ERROR: Version in "./converted.yml" is invalid - it should be a string. + + Signed-off-by: Anthon van der Neut anthon@mnt.org + Signed-off-by: Anthon van der Neut + +commit 1e29ad9fc7d7e096ce15ba0c5f07ffbee9d3a651 +Author: Joffrey F +Date: Thu Feb 18 10:53:40 2016 -0800 + + Apply driver_opts processing to network configs + + Signed-off-by: Joffrey F + +commit fcf78fe3dea7df1dd20189dc2c168ab2a0ff62ac +Author: Joffrey F +Date: Tue Feb 16 16:48:04 2016 -0800 + + Constraint build argument types. Numbers are cast into strings + + Numerical driver_opts are also valid and typecast into strings. + Additional config tests. + + Signed-off-by: Joffrey F + +commit 8d7b1e9047fc62897560541800ce7bf76b937547 +Author: Daniel Nephin +Date: Tue Feb 16 16:38:31 2016 -0500 + + Update guides to use v2 config format. + + Signed-off-by: Daniel Nephin + +commit 6d2aa80435282890af79ff73a78854c1a904bba6 +Author: Daniel Nephin +Date: Tue Feb 16 16:34:31 2016 -0500 + + Update link to docker volume create docs. + + Signed-off-by: Daniel Nephin + +commit 13ec3d0217939e375fca87ea1899d766a1b30021 +Author: Daniel Nephin +Date: Tue Feb 16 14:24:17 2016 -0500 + + Fix copying of volumes by using the name of the volume instead of the host path. + + Signed-off-by: Daniel Nephin + +commit f59fef09a6d0a50a62cb0562fc7d941fb9ee93ed +Author: Anthon van der Neut +Date: Tue Feb 16 14:46:47 2016 +0100 + + reset colors after warning + + If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`. + Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal. + + Signed-off-by: Anthon van der Neut + +commit f0a8c65b0599a3a9c55fe570d28e40339d40b102 +Author: Chia-liang Kao +Date: Sun Feb 14 01:57:04 2016 +0800 + + Quote argv as they are + + Signed-off-by: Chia-liang Kao + +commit 674e541cf73b999f49b33e0e8430c18600352561 +Author: Chia-liang Kao +Date: Sun Feb 14 01:43:06 2016 +0800 + + Detect -t and -i separately + + Signed-off-by: Chia-liang Kao + +commit ed5fedf516effbb0b819887d84af7bc267c5998b +Author: Chia-liang Kao +Date: Sun Feb 14 01:42:51 2016 +0800 + + Don't mount pwd if it is / + + Signed-off-by: Chia-liang Kao + +commit 654b3710f7833ad6034a1306e5ad5d6b95c8cf0d +Author: Joffrey F +Date: Thu Feb 18 15:28:12 2016 -0800 + + Use modern set notation in _get_aliases + + Signed-off-by: Joffrey F + +commit f4a22b94eddbe610acf214861c8b2c1690d32dfd +Author: Joffrey F +Date: Thu Feb 18 14:52:52 2016 -0800 + + Handle mismatched network formats in config files + + Signed-off-by: Joffrey F + +commit e5689afe4cd0343e848f0974d7bb4109cb7c5785 +Author: Joffrey F +Date: Thu Feb 18 12:04:07 2016 -0800 + + Network aliases are now part of the network dictionary + + Signed-off-by: Joffrey F + +commit 42cb719b528f258bd343053c5b67ea660506e393 +Author: Joffrey F +Date: Fri Feb 12 17:48:42 2016 -0800 + + Add v2_only decorator to network aliases test + + Signed-off-by: Joffrey F + +commit 6ac6860dda78503ffe105a77bffaa042ebfbc1d1 +Author: Joffrey F +Date: Fri Feb 12 17:20:18 2016 -0800 + + Fix network list serialization in py3 + + Signed-off-by: Joffrey F + +commit 353da73eaba566e78857cc7d8965eb6e68218c4b +Author: Joffrey F +Date: Fri Feb 12 17:17:31 2016 -0800 + + Document network_aliases config + + Signed-off-by: Joffrey F + +commit c686be8fd3f5b709cd244072f6d854de7056926e +Author: Joffrey F +Date: Fri Feb 12 16:58:29 2016 -0800 + + Test network_aliases feature + + Signed-off-by: Joffrey F + +commit 2f7a77e954a38cc227beaa829c32982d5b1dcc61 +Author: Joffrey F +Date: Fri Feb 12 16:10:36 2016 -0800 + + Allow user to specify custom network aliases + + Signed-off-by: Joffrey F + +commit d78ea85301deff1305bbff4c3d1a6e5de0341d6c +Author: Joffrey F +Date: Fri Feb 12 10:41:27 2016 -0800 + + driver_opts can only be of type string + + Signed-off-by: Joffrey F + +commit 7c95c733a9a6060dc538ad1fc2a3e78c718bfb62 +Author: Daniel Nephin +Date: Thu Feb 11 19:53:28 2016 -0500 + + Only set a container affinity if there are volumes to copy over. + + Signed-off-by: Daniel Nephin + +commit dd9a8d6eee7bee298a0ea540c254420ddbf4b074 +Author: Joffrey F +Date: Thu Feb 11 16:31:08 2016 -0800 + + Bring up all dependencies when running a single service. + + Added test for running a depends_on service + + Signed-off-by: Joffrey F + +commit 4f7c950ca81a4d2428463f3aa9cacead458b5167 +Author: Daniel Nephin +Date: Thu Feb 11 13:10:29 2016 -0500 + + Upgrade pyinstaller. + + Signed-off-by: Daniel Nephin + +commit a1d6e3b9e3ba5d9724dca434c05f0c7503f23d18 +Author: Joffrey F +Date: Wed Feb 10 16:49:50 2016 -0800 + + Add logging when initializing a volume. + + Signed-off-by: Joffrey F + +commit 3eac70a9d31edf5c326ec4fc4603ff23c1df8781 +Author: Joffrey F +Date: Wed Feb 10 16:35:27 2016 -0800 + + Detailed error message when daemon version is too old. + + Signed-off-by: Joffrey F + +commit c7687592ff638517a49f2972988ce22bac9825b3 +Author: Manuel Kaufmann +Date: Wed Feb 10 18:58:01 2016 -0500 + + Typo fixed + + Signed-off-by: Manuel Kaufmann + +commit 155efd28fabfddd1871f8266caff613e5e1742ad +Author: Daniel Nephin +Date: Wed Feb 10 13:54:40 2016 -0500 + + Merge build.args when merging services. + + Signed-off-by: Daniel Nephin + +commit 2ced83e3d9dd0036bc540a2dfd456abd3a305870 +Author: Daniel Nephin +Date: Wed Feb 10 13:32:04 2016 -0500 + + Fix build section without context. + + Signed-off-by: Daniel Nephin + +commit cea7911f56979485d44186f17ca68aa7a950c106 +Author: Yohan Graterol +Date: Tue Feb 9 18:40:44 2016 -0500 + + Typo into the doc with `networks` in yaml + + Signed-off-by: Yohan Graterol + +commit db12794b1cf004f3d338764a75ac1eebf658ef2f +Author: Daniel Nephin +Date: Mon Feb 8 18:15:21 2016 -0500 + + Fix upgrading url. + + Signed-off-by: Daniel Nephin + +commit deeca57a0d7df41a2bac9e6277421179a2fbaece +Author: Daniel Nephin +Date: Mon Feb 8 12:18:48 2016 -0500 + + Use 12 characters for the short id to match docker and fix backwards compatibility. + + Signed-off-by: Daniel Nephin + +commit edcbe2eb4d30d2b2c7bcbe03d1c83ed69af5b714 +Author: cr7pt0gr4ph7 +Date: Mon Feb 8 21:57:15 2016 +0100 + + Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. + + Signed-off-by: cr7pt0gr4ph7 + +commit ad00f3dd219cec792a2089025917daea461145d3 +Author: Lukas Waslowski +Date: Mon Feb 8 15:33:26 2016 +0100 + + Handle the 'network_mode' key when merging multiple compose files. + + Fixes docker/compose#2840. + + Signed-off-by: Lukas Waslowski + +commit c77a8cfe3bf09d5cccd8fe77f3b7696cac2be400 +Author: Lukas Waslowski +Date: Mon Feb 8 15:17:21 2016 +0100 + + Correctly merge the 'services//networks' key in the case of multiple compose files. + + Fixes docker/compose#2839. + + Signed-off-by: Lukas Waslowski + +commit 8548b75582c8f87113c17b2b5996bcf1ea516e27 +Author: Lukas Waslowski +Date: Mon Feb 8 14:29:03 2016 +0100 + + Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. + + Signed-off-by: Lukas Waslowski + +commit c1be49ad53efa5c9ab79d6675a20abc737ecfafc +Author: Michael Käufl +Date: Sat Feb 6 22:10:22 2016 +0100 + + Used absolute links in readme + + This prevents links being broken on pypi + (e.g. https://pypi.python.org/pypi/docs/index.md#features) + + Signed-off-by: Michael Käufl + +commit a716bdc4828edcb1ea140a401396624c2e3be5d1 +Author: Aanand Prasad +Date: Tue Feb 2 17:55:21 2016 +0000 + + Update Swarm integration guide and make it an official part of the docs + + Signed-off-by: Aanand Prasad + +commit abec6f58910f5d670493ce23e2de14de286ba248 +Author: jrabbit +Date: Sat Feb 6 02:54:06 2016 -0500 + + Change special case from '_', None to () + + Signed-off-by: jrabbit + +commit c1959152631cffda875a9dfe99a5fa0900d18bf4 +Author: jrabbit +Date: Sun Jan 24 15:25:06 2016 -0500 + + Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior + + Signed-off-by: jrabbit + +commit 34d8f9b55af621ee9f60732d973cae5d95c1525e +Author: jrabbit +Date: Sat Jan 23 16:19:17 2016 -0500 + + Mangle the tests. They pass for better or worse! + + Signed-off-by: jrabbit + +commit f5533c1ed835a2578ab11afbf45570cc7e080c8d +Author: jrabbit +Date: Sat Jan 23 15:58:06 2016 -0500 + + If an env var is passthrough but not defined on the host don't set it. This doesn't change too much code and keeps the generators. + + Signed-off-by: jrabbit + +commit 633a2ba0657573976ef673722f3ecf70dd238387 +Merge: 4f3c23cbee d97c06207d +Author: Nishant Totla +Date: Tue Feb 23 11:40:57 2016 -0800 + + Merge pull request #1856 from vieux/add_reschedule_compose_test + + add a reschedule test with compose + +commit 4f3c23cbeee26b100d6aca86038c7fc8c5b29c3c +Merge: bc440060f1 744a811206 +Author: Nishant Totla +Date: Tue Feb 23 11:19:58 2016 -0800 + + Merge pull request #1858 from skohar/remove_redundant_space + + Remove redundant spaces + +commit 722e3a2fc768d8ff463538759d564857025caab5 +Merge: d99cad60e7 9503aa2b5f +Author: Daniel Nephin +Date: Tue Feb 23 11:15:34 2016 -0800 + + Merge remote-tracking branch 'docker/release' into bump-1.6.1 + +commit d4515781525f57e0cf92e115379191cd1f3a1e9a +Author: Daniel Nephin +Date: Mon Feb 22 17:47:51 2016 -0800 + + Make environment variables without a value the same as docker-cli. + + Signed-off-by: Daniel Nephin + +commit 4b04280db83b5d8c4b259586df8ae568eee5f3a0 +Author: Daniel Nephin +Date: Mon Feb 22 17:30:42 2016 -0800 + + Revert "Change special case from '_', None to ()" + + This reverts commit 677c50650c86b4b6fabbc21e18165f2117022bbe. + + Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior" + + This reverts commit 001903771260069c475738efbbcb830dd9cf8227. + + Revert "Mangle the tests. They pass for better or worse!" + + This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d. + + Revert "If an env var is passthrough but not defined on the host don't set it." + + This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004. + + Signed-off-by: Daniel Nephin + +commit 1d67e6f0f095e59e5d261f64ed8e5a4aafea8bde +Merge: ba799d2e86 0a06d827fa +Author: Daniel Nephin +Date: Tue Feb 23 11:11:54 2016 -0800 + + Merge pull request #2995 from dnephin/fix_warning_about_bools + + Fix warning about boolean values + +commit 75715723059637ac241a1e31e95d570c1f9df95f +Merge: ce05116517 7144936612 +Author: Aaron Lehmann +Date: Tue Feb 23 11:08:46 2016 -0800 + + Merge pull request #1471 from RichardScothern/tag-headers + + Enable proxying registries to downgrade fetched manifests to Schema 1. + +commit ba799d2e86c4ec6d733a514152ad8ede07b8c22f +Merge: a7fd578b14 15b2094bad +Author: Daniel Nephin +Date: Tue Feb 23 10:52:12 2016 -0800 + + Merge pull request #2996 from dnephin/fix_abort_on_container_exit + + Fix abort on container exit + +commit 9ec015edff663d16625d18cf0d52644d94f5cec7 +Merge: 0f18fa939c 0a7755ab4e +Author: Tibor Vass +Date: Tue Feb 23 13:44:04 2016 -0500 + + Merge pull request #20618 from icecrime/fix_TestExec + + Fix flaky TestExec + +commit d14cef441d05f01e8f253c67ff11f954aa24a142 +Author: Ryan McLaughlin +Date: Tue Feb 23 08:19:38 2016 -0700 + + fixing the path of the key pair + + Signed-off-by: Ryan McLaughlin + + Fixed a bit of grammar + + Signed-off-by: Ryan McLaughlin + +commit 9e9802bdd0cc8912f9eaa1257675feda63f42fb5 +Merge: 926964df29 be3520c011 +Author: David Lawrence +Date: Tue Feb 23 10:17:02 2016 -0800 + + Merge pull request #573 from docker/validate-meta-on-parse + + Adds extra validation when calling `XFromSigned` functions + +commit d6d788c31b5bd3c061f6b713eabdcfd2b347f69b +Author: Riyaz Faizullabhoy +Date: Tue Feb 23 10:10:42 2016 -0800 + + add links to release tags, 0.2 will exist soon + + Signed-off-by: Riyaz Faizullabhoy + +commit 926964df293ddc110af7085289614106d5cbbb98 +Merge: da91edcb6e 1e99830716 +Author: David Lawrence +Date: Tue Feb 23 10:08:20 2016 -0800 + + Merge pull request #585 from endophage/download_valid_children + + check validity of children during download + +commit 0a7755ab4e2fc8df1992813d5364fe0f201ab913 +Author: Arnaud Porterie +Date: Tue Feb 23 09:46:13 2016 -0800 + + Fix flaky TestExec + + The container started with `-d` as part of the test requires a `waitRun` + to ensure it is actually running before attempting any other operation. + + Signed-off-by: Arnaud Porterie + +commit 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f +Author: John Howard +Date: Tue Feb 23 09:47:52 2016 -0800 + + Windows: Updates for virtual user account + + Signed-off-by: John Howard + +commit 6cdc4ba6cd5178037466c50ebe03a7eb111c43b1 +Author: Nalin Dahyabhai +Date: Wed Feb 17 15:10:51 2016 -0500 + + Try to handle changing names for journal packages + + When checking if we have the development files for libsystemd's journal + APIs, check for either 'libsystemd >= 209' and 'libsystemd-journal'. If + we find 'libsystemd', define the 'journald' tag, which defaults to using + the 'libsystemd.pc' file. If we find the older 'libsystemd-journal', + define both the 'journald' and 'journald_compat' tags, which causes the + 'libsystemd-journal.pc' file to be consulted instead. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit bc6b260eaa679649e8f44e76d2d08191c4382d9d +Author: Riyaz Faizullabhoy +Date: Mon Feb 22 09:47:23 2016 -0800 + + Add changelog for release tracking + + Signed-off-by: Riyaz Faizullabhoy + +commit bd4fb00fb6241d35537b460a2d9f48256111ae7a +Author: David Calavera +Date: Wed Feb 3 17:46:01 2016 -0500 + + Add mounts to docker ps. + + - Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`. + - Show their names in the list with the custom format `{{ .Mounts }}`. + + Signed-off-by: David Calavera + +commit 0f18fa939c18da5fd7385d25f10666fe486704b1 +Merge: 20fc13b56d a499ad8e4e +Author: Brian Goff +Date: Tue Feb 23 11:59:37 2016 -0500 + + Merge pull request #20591 from nerdalert/logrus_dbg_msg + + Fixed logrus client/server mismatch debug msg + +commit 20fc13b56deb4fc28cbd40ae3c67e5ca2dd9592a +Merge: 9d882cbb44 82d486848d +Author: Vincent Demeester +Date: Tue Feb 23 17:57:58 2016 +0100 + + Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup + + Update docs for enableipv6 + +commit 9d882cbb442138cb5c9026f1ec8eb4499ad71442 +Merge: 1e02a0810e 2eee613326 +Author: David Calavera +Date: Tue Feb 23 08:20:53 2016 -0800 + + Merge pull request #20581 from stweil/master + + Fix some typos in comments and strings + +commit 1e02a0810ee51ec7fa572f9e35ba36cd32d7a083 +Merge: 98d6dedde3 4d4d1e7f82 +Author: David Calavera +Date: Tue Feb 23 08:20:03 2016 -0800 + + Merge pull request #20590 from HackToday/fixdoc + + Fix doc format issue + +commit 82d486848dd2e7a0189375a62e8e38171ba9a2b1 +Author: Aidan Hobson Sayers +Date: Tue Feb 23 16:08:09 2016 +0000 + + Update docs for enableipv6 + + Signed-off-by: Aidan Hobson Sayers + +commit 98d6dedde39902e15def644ca70be8fecef9758d +Merge: f3b5fdc23d 2aa4280d93 +Author: Sebastiaan van Stijn +Date: Tue Feb 23 16:15:46 2016 +0100 + + Merge pull request #20597 from zhuguihua/fix_markdown_style_error_in_man_page + + Fix markdown style error in man page + +commit f3b5fdc23db46abaf6ec7aa731d639cbc15f0921 +Merge: 783d6c64cf 9cac2716f7 +Author: Sebastiaan van Stijn +Date: Tue Feb 23 15:27:52 2016 +0100 + + Merge pull request #20514 from calavera/github_templates + + Add tempates for new issues and pull requests. + +commit 783d6c64cfd1a413cd8ce500611d0aa23ded8cb1 +Merge: dbec35ffd3 220a188ae8 +Author: Vincent Demeester +Date: Tue Feb 23 14:54:01 2016 +0100 + + Merge pull request #20500 from ZJUshuaizhou/master + + Update docker_remote_api_v1.22.md + +commit dbec35ffd37bc00e8438f752841b43ab41cdf3d5 +Merge: 0d808683a1 8474bbff45 +Author: Doug Davis +Date: Tue Feb 23 07:28:50 2016 -0500 + + Merge pull request #20598 from wenchma/typo + + Fix typo + +commit d7af03111495cadd71abd3a8b5805066ea688e9b +Author: Shijiang Wei +Date: Tue Feb 23 19:28:04 2016 +0800 + + make the json log writer much faster + + Signed-off-by: Shijiang Wei + +commit 8474bbff4594f382dbac5ad59767d18b2d8f2689 +Author: Wen Cheng Ma +Date: Tue Feb 23 17:27:55 2016 +0800 + + Fix typo + + Signed-off-by: Wen Cheng Ma + +commit 2aa4280d936b6680dedbe3a3ebf34f8640626306 +Author: Zhu Guihua +Date: Tue Feb 23 16:09:44 2016 +0800 + + Fix markdown style error in man page + + Signed-off-by: Zhu Guihua + +commit 21a08786651b4c0ef73862dadda7729ebef6938f +Author: Michal Minar +Date: Thu Feb 18 19:20:53 2016 +0100 + + Commit blob with known size + + Signed-off-by: Michal Minar + +commit 220a188ae820fac1198c54b7f0358525457a8609 +Author: ZJUshuaizhou <21551191@zju.edu.cn> +Date: Tue Feb 23 00:14:00 2016 +0800 + + update all the versions from v1.19 to v1.23 + update v1.22 + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + + update all the versions docs + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + + revert v1,20 + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + + update v1,20 + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + + revert v1,20 + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + + update v1,20 + + Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn> + +commit 1e998307167e9ca6b8aac098f6a973deac84b155 +Author: David Lawrence +Date: Mon Feb 22 15:44:13 2016 -0800 + + check validity of children during download and don't overwrite already loaded children + Signed-off-by: David Lawrence (github: endophage) + +commit a499ad8e4e596d21167347437a2ca3098cbadc45 +Author: Brent Salisbury +Date: Mon Feb 22 23:36:33 2016 -0500 + + Fixed logrus client/server mismatch debug msg + + Signed-off-by: Brent Salisbury + +commit be3520c011b4cf9e1ad7a8a35d350cf2c31e3cc8 +Author: Ying Li +Date: Mon Feb 22 19:52:18 2016 -0800 + + Update the integration tests after rebase + + Signed-off-by: Ying Li + +commit 4d4d1e7f82592c4996650b92b01d9f4633e8878b +Author: Kai Qiang Wu(Kennan) +Date: Tue Feb 23 03:42:10 2016 +0000 + + Fix doc format issue + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 8ca8f073fa4b0c7dd1d3de508c83e3fd5bd6d7bb +Author: Ying Li +Date: Mon Feb 22 17:10:12 2016 -0800 + + Have isValidRootRoleStructure take both role names in order to construct an ErrInvalidMetadata + + Signed-off-by: Ying Li + +commit 191307fc0703018186e5edcba05a45b0f27fcb80 +Author: Ying Li +Date: Thu Feb 18 19:30:25 2016 -0800 + + specifying other non-base roles on the root metadata is not invalid + + Signed-off-by: Ying Li + +commit 61dad28b1ef0544716a5e3e3b8322f1e859ada66 +Author: Ying Li +Date: Wed Feb 17 19:17:07 2016 -0800 + + Validate that snapshot and timestamp have required sha256 checksums + + Signed-off-by: Ying Li + +commit 4b13e7d358c2e103238431478d61e1466b9ea499 +Author: Ying Li +Date: Wed Feb 17 16:33:24 2016 -0800 + + Refactor RootRole verification into a helper function used by root and targets validation + + Signed-off-by: Ying Li + +commit d8938f76e78cf63aec8a77aaefbaf2743cb79878 +Author: Ying Li +Date: Tue Feb 16 11:44:40 2016 -0800 + + When downloading snapshot, return ErrNotLoaded if timestamp hasn't been loaded. Similarly for targets. + + Signed-off-by: Ying Li + +commit 57e28e4f090dc8d733e091adebda16e9a18d6b5d +Author: Ying Li +Date: Tue Feb 16 11:32:15 2016 -0800 + + Rename the validation functions and add more tests + + Signed-off-by: Ying Li + +commit 314cfb9a17a22ff5c70648e4c5499182eed51d3f +Author: Ying Li +Date: Mon Feb 15 21:20:03 2016 -0800 + + Add targets metadata validation to the targets data structure + + Signed-off-by: Ying Li + +commit 4cae84bb2935bb84f1864a2020231e4b57589032 +Author: Ying Li +Date: Mon Feb 15 20:43:26 2016 -0800 + + Add snapshot metadata validation to the snapshot data structure + + Signed-off-by: Ying Li + +commit 8335d194ce67724e85b0555c2442aa1928ee63a6 +Author: Ying Li +Date: Mon Feb 15 20:17:13 2016 -0800 + + Add timestamp metadata validation to the timestamp data structure + + Signed-off-by: Ying Li + +commit 36ea1f690162c07e421df9ac8ed9693dff7830d5 +Author: Ying Li +Date: Mon Feb 15 20:16:58 2016 -0800 + + Add root metadata validation to the root data structure + + Signed-off-by: Ying Li + +commit da91edcb6e85c1f15634f641d71a41a4ba91a0af +Merge: 332fc35dc5 9db2ae3ed6 +Author: Diogo Mónica +Date: Mon Feb 22 18:53:53 2016 -0800 + + Merge pull request #587 from endophage/update_pkcs11 + + updating miekg/pkcs11 for go 1.6 + +commit 744a8112068fbe4ebc155e6a1fef6fb17c1d8dca +Author: skohar +Date: Mon Feb 22 17:22:30 2016 +0900 + + Remove redundant spaces + + Signed-off-by: skohar + +commit 0d808683a1e1a7c9971d2b943028d0a621d2eb21 +Merge: 921c744bc3 2264bd95b6 +Author: Brian Goff +Date: Mon Feb 22 21:30:01 2016 -0500 + + Merge pull request #20588 from WeiZhang555/typo + + Fix typo + +commit 2264bd95b681d1336b167c8ecd9b2ce65b963071 +Author: Zhang Wei +Date: Tue Feb 23 10:25:24 2016 +0800 + + Fix typo + + Signed-off-by: Zhang Wei + +commit 7144936612ad3e5064920fc817469fe3b1c4f4a1 +Author: Richard Scothern +Date: Wed Feb 17 16:32:23 2016 -0800 + + Enable proxying registries to downgrade fetched manifests to Schema 1. + + Ensure Accept headers are sent with TagService.Get (which hits manifest + endpoints). Add support for remote Get and Put for the proxied blobstore. + + Signed-off-by: Richard Scothern + +commit 9db2ae3ed687b4d71d01fd1fde3da7f7e489ef1c +Author: David Lawrence +Date: Mon Feb 22 17:53:24 2016 -0800 + + updating miekg/pkcs11 for go 1.6 + Signed-off-by: David Lawrence (github: endophage) + +commit a7fd578b1432749b00dd12238481b2f92f5f5964 +Merge: 7e3d756a18 176b966486 +Author: Joffrey F +Date: Mon Feb 22 17:23:07 2016 -0800 + + Merge pull request #2962 from shin-/2960-volume-driver + + Update docs for volume_driver option + +commit 9b841d4ce2b4c65b4ba5a24a8db0e3b2007fd19f +Author: Nathan LeClaire +Date: Mon Feb 22 17:01:36 2016 -0800 + + Properly version Toolbox release + + Signed-off-by: Nathan LeClaire + +commit d97c06207d50fe0f930b8fe772b51575a1333805 +Author: Victor Vieux +Date: Mon Feb 22 16:57:19 2016 -0800 + + add a reschedule test with compose + + Signed-off-by: Victor Vieux + +commit bc440060f15db9c79d566d178fa245567a9fe4ca +Merge: c363c31608 acf09695f7 +Author: Victor Vieux +Date: Mon Feb 22 16:53:26 2016 -0800 + + Merge pull request #1843 from dongluochen/ConnectionLeak-fix + + Do not recycle connections. Let net/http handles connections. + +commit 176b9664863144aac7199fbd293cfa5c720a68ac +Author: Joffrey F +Date: Thu Feb 18 17:17:20 2016 -0800 + + Update documentation for volume_driver option. + + Signed-off-by: Joffrey F + +commit 7e3d756a18aa9e8c67cc12acde136853ed91c476 +Merge: d5514965d5 ba39d4cc77 +Author: Daniel Nephin +Date: Mon Feb 22 16:50:36 2016 -0800 + + Merge pull request #2992 from shin-/update_dockerpy_version + + Use docker-py 1.7.1 + +commit 15b2094bad405e6524be7c365f7db055976fe93e +Author: Daniel Nephin +Date: Mon Feb 22 16:46:09 2016 -0800 + + Stop other containers if the flag is set. + + Signed-off-by: Daniel Nephin + +commit bf2bf21720c88b08ccb273c46c943bb72a8dccf8 +Author: Richard Bann +Date: Thu Feb 18 12:13:16 2016 +0100 + + Add failing test for --abort-on-container-exit + + Handle --abort-on-container-exit. Fixes #2940 + + Signed-off-by: Richard Bann + +commit 332fc35dc52b08c1b5216e66264ec9d20aa382bb +Merge: c625402ef7 e270795768 +Author: David Lawrence +Date: Mon Feb 22 16:35:48 2016 -0800 + + Merge pull request #578 from endophage/go1.6 + + updates and bugfixes for go 1.6 + +commit c625402ef7295ef9c0219b77bf85caaedbe3627a +Merge: 4c6c6d99ff 1e48fd35ff +Author: Ying Li +Date: Mon Feb 22 16:34:33 2016 -0800 + + Merge pull request #572 from docker/per-metadata-type-mutation + + Per metadata type mutation tests + +commit ce2a40afdb3b92ec31daa82989a177503482ba37 +Merge: f619118063 563efc2287 +Author: moxiegirl +Date: Mon Feb 22 16:26:35 2016 -0800 + + Merge pull request #1371 from carolfh/dtr143 + + files ready for dtr 143 review + +commit f619118063cf5e8c82e38b7d7010cbf54cb27f3a +Author: Mary Anthony +Date: Mon Feb 22 16:15:40 2016 -0800 + + Closes #1301 + + Signed-off-by: Mary Anthony + +commit d19f401f43462d13c54765ae629a5bc32a4797fe +Author: Nathan LeClaire +Date: Mon Feb 22 15:54:17 2016 -0800 + + Fix faulty arch section in download URL + + Signed-off-by: Nathan LeClaire + +commit 2865b2a481dca7fb8f93cbf9b4cabb198366ebde +Author: Nathan LeClaire +Date: Mon Feb 22 15:51:55 2016 -0800 + + Bump Toolbox to Docker 1.10.2 + + Signed-off-by: Nathan LeClaire + +commit e8181394b7a278c50e081de13b44a9fab4ee062e +Author: Carol Fager-Higgins +Date: Tue Jan 19 03:08:51 2016 -0800 + + new file for DTR storage options + making small edits for storage doc + + adding a directory and editing the conf storage file + need to save here, so i can fix image files + renamed assets to images + changing names in files from to point from assets to images. + moving graphic files + more graphic fixes + applied current standards to screenshots + fixing 404's pertaining to pointers to config file + adding config files + adding config files2 + adding config-overview.md so it shows in left menu + adding creating admin steps and screenshot + fixing order in menu + splitting out config files, this might get messy + found lost gc graphics + added to gitignore + added directory to gitignore + more edits + fixed links + + added AWS policy info to config-storage.md + adding new screenshots + edits for release + revised based on comments and added section on YAML since UI is not clear + added SUSE support to install-dtr.md + added two parameters and user set section + added diagram for scope one level + tightened language in storage doc + + removed placeholder + + edits based on feedback + Signed-off-by: Carol Fager-Higgins + +commit 1e48fd35ffbcfedd8e4bec1263f9bace963d3b3c +Author: Ying Li +Date: Mon Feb 22 15:27:53 2016 -0800 + + Use ToSigned in the swizzler + + Signed-off-by: Ying Li + +commit 921c744bc3b3ed2ae22cf460422604730dc5ae22 +Merge: 40397d8059 9021506502 +Author: David Calavera +Date: Mon Feb 22 15:20:48 2016 -0800 + + Merge pull request #20579 from MHBauer/cleanup + + consistent variable names in api/server/router + +commit 86cf56a9179985f4a1ec1821cbb93745e5ad5722 +Author: Carol Fager-Higgins +Date: Wed Dec 2 13:41:03 2015 -0800 + + tiny edits + rewrite of accts + + Signed-off-by: Carol Fager-Higgins + + edits to accounts, added section on long tags + + Signed-off-by: Carol Fager-Higgins + +commit 563efc2287ff6f947774773a729d1e8e3655317b +Author: Carol Fager-Higgins +Date: Wed Jan 6 16:43:52 2016 -0800 + + moved these files to a new branch + added diagrams to illustrate process of GC + + added arrow back after talking to Jon + + wip on engine upgrade docs + updating CS Engine docs for 1.10 release + moved these files to a new branch + added diagrams to illustrate process of GC + added arrow back after talking to Jon + wip on engine upgrade docs + updating CS Engine docs for 1.10 release + removing gc2.png + edits + edits to CSengine upgrade and install based on feedback from Mike and Brandon + multiple docs for dtr143 release + edited CS engine release notes and added correct version + added edits per andrey + added to RNs + added to RNs + generalized vers + + final edits ready to merge + + final tweaks for 143 release + Signed-off-by: Carol Fager-Higgins + +commit 0a06d827faa554f07ce515106fcc3e42af340e7a +Author: Daniel Nephin +Date: Mon Feb 22 14:48:56 2016 -0800 + + Fix warning about boolean values. + + Signed-off-by: Daniel Nephin + +commit c363c31608fe2cd2c5396dc9305319d71940e956 +Merge: bb9f0d2861 854cad3c14 +Author: Alexandre Beslic +Date: Mon Feb 22 14:46:11 2016 -0800 + + Merge pull request #1850 from vieux/dont_erase_hostconfig + + don't erase hostconfig on refresh + +commit 0acadcb35f1cbbc91f59d89f71c7157ed65b0848 +Merge: 7cc7fbadcc d7e97d0443 +Author: Nathan LeClaire +Date: Mon Feb 22 14:38:22 2016 -0800 + + Merge pull request #3091 from ozlerhakan/doc + + update command line references + +commit 3bd96d2ae4b92cb2eab735a2af57e9b6117bbea3 +Author: Carol Fager-Higgins +Date: Wed Jan 6 16:43:52 2016 -0800 + + moved these files to a new branch + added diagrams to illustrate process of GC + + added arrow back after talking to Jon + wip on engine upgrade docs + updating CS Engine docs for 1.10 release + moved these files to a new branch + added diagrams to illustrate process of GC + added arrow back after talking to Jon + wip on engine upgrade docs + updating CS Engine docs for 1.10 release + removing gc2.png + edits + edits to CSengine upgrade and install based on feedback from Mike and Brandon + added SUSE 12 CS Engine steps + adding edits + final edits for upgrade/install of csengine + + fixed menu title to Docker Trusted Registry + + Signed-off-by: Carol Fager-Higgins + +commit ba39d4cc77f5d9ffccff68ae738e741278f60ace +Author: Joffrey F +Date: Mon Feb 22 12:56:54 2016 -0800 + + Use docker-py 1.7.1 + + Signed-off-by: Joffrey F + +commit 7230e9def796c63a4033211dc5107742d689fc1e +Author: Stephen J Day +Date: Mon Feb 22 12:56:23 2016 -0800 + + Makefile: remove AUTHORS from default target + + While it is generally good practice to look before jumping, many + developers enjoy running `make` without reading the Makefile and + indiscriminately use `git add -A`. This behavior, coupled with + generating AUTHORS in the default target result in garbage in various + PRs and extra round trips to remove said garbage. + + Signed-off-by: Stephen J Day + +commit 4d15bf071c8f5355bafe7148f78e9973c0ce2fc5 +Author: Michal Minar +Date: Thu Feb 18 19:37:03 2016 +0100 + + Defined ErrAccessDenied error + + Middleware code may perform additional checks on blobs written. Allow it + to return access denied errors that will result in 403 Forbidden. + + Signed-off-by: Michal Minar + +commit 9cac2716f7196fc915c4cac3b2c34aa2183182d9 +Author: David Calavera +Date: Fri Feb 19 14:35:43 2016 -0500 + + Add tempates for new issues and pull requests. + + Signed-off-by: David Calavera + +commit 2eee613326fb59fd168849618d14a9054a40f9f5 +Author: Stefan Weil +Date: Mon Feb 22 20:22:20 2016 +0100 + + Fix some typos in comments and strings + + Most of them were found and fixed by codespell. + + Signed-off-by: Stefan Weil + +commit 90215065024aea1001e42e7a427248630b4a1115 +Author: Morgan Bauer +Date: Mon Feb 22 10:53:47 2016 -0800 + + consistent variable names in api/server/router + + - banish 'daemon' + + Signed-off-by: Morgan Bauer + +commit 4c6c6d99ffb237b524d75723a8963382800e0cd6 +Merge: 8a5c8c0495 3a5fbf0033 +Author: David Lawrence +Date: Mon Feb 22 10:32:37 2016 -0800 + + Merge pull request #579 from docker/remove-more-path-hex + + remove path hash prefix from TargetsDelegations + +commit ce05116517875b7a59f1dce56200ef4a8e4da8a6 +Merge: ad1b181291 d58188c4d7 +Author: Richard Scothern +Date: Mon Feb 22 10:13:16 2016 -0800 + + Merge pull request #1477 from xiekeyang/unit-test + + compare error output in tagstore unit test + +commit 40397d8059594ac58250f66f93f4c28455433242 +Merge: 4a087e4e6b c7089b4b46 +Author: Brian Goff +Date: Mon Feb 22 13:11:23 2016 -0500 + + Merge pull request #20552 from Microsoft/jjh/dockerfilereliability + + Windows CI: Making dockerfile WAAAAAY faster + +commit 4a087e4e6b348e96e20699bf11af8058d04b2ae3 +Merge: 5d33ff7e9d 5642cdeac5 +Author: Vincent Demeester +Date: Mon Feb 22 14:43:50 2016 +0100 + + Merge pull request #20557 from hsinko/fix_api_docs + + Fix tiny error. And Previous PR missed to update docker_remote_api v1.22 and v1.23 + +commit 5642cdeac5df08414744203235462a6b99261239 +Author: hsinko <21551195@zju.edu.cn> +Date: Sun Feb 21 21:25:41 2016 +0800 + + Update docker_remote_api_v1.22.md and v1.23 to complete the docs + + Signed-off-by: hsinko <21551195@zju.edu.cn> + + id in example request should be a exact value + + Signed-off-by: hsinko <21551195@zju.edu.cn> + + revert v1.22 doc + + Signed-off-by: hsinko <21551195@zju.edu.cn> + + fix tiny errors + + Signed-off-by: hsinko <21551195@zju.edu.cn> + +commit 5d33ff7e9d6703df9ac658d8aa6f253a6bb1ae32 +Merge: 0542f66823 dd4aa7f0e9 +Author: Vincent Demeester +Date: Mon Feb 22 13:44:31 2016 +0100 + + Merge pull request #20562 from albers/completion-update--restart + + Add bash completion for `docker update --restart` + +commit 0542f66823d1f8043f3ba352e8b71957032f92e6 +Merge: 074442df7a 1cd6b545ec +Author: Vincent Demeester +Date: Mon Feb 22 13:42:46 2016 +0100 + + Merge pull request #20561 from albers/completion-etwlogs + + Add bash completion for etwlogs logging driver + +commit 074442df7a542f8604d28e38139488cae196f7d4 +Merge: 675617bc85 13deb4a245 +Author: Vincent Demeester +Date: Mon Feb 22 10:40:52 2016 +0100 + + Merge pull request #20482 from zhuguihua/fix_storage_driver_options_in_man_page + + fix storage driver options in man page + +commit d58188c4d733bc482671e49ac08419ba05ff4726 +Author: xiekeyang +Date: Mon Feb 22 15:24:49 2016 +0800 + + compare error output in tagstore unit test + + Signed-off-by: xiekeyang + +commit 13deb4a245ce508c8eb6bbe065d0f560472c68e2 +Author: Zhu Guihua +Date: Fri Feb 19 14:13:52 2016 +0800 + + fix storage driver options in man page + + Signed-off-by: Zhu Guihua + +commit 3c69d340ebe35dc3adb56cd2345cbac3c1dd5fb8 +Author: Kai Qiang Wu(Kennan) +Date: Fri Feb 19 06:16:35 2016 +0000 + + Add check for non-systemd fd use case + + We make the check more user-friendly, and users can learn + start docker with wrong fd used. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit dd4aa7f0e97f1bcd4e851cefdf16bc9067b7e42a +Author: Harald Albers +Date: Sun Feb 21 10:21:28 2016 -0800 + + bash completion for `docker update --restart` + + Signed-off-by: Harald Albers + +commit 1cd6b545ec137b225c821783c63ce57c5a27486a +Author: Harald Albers +Date: Sun Feb 21 09:58:42 2016 -0800 + + bash completion for etwlogs logging driver + + Signed-off-by: Harald Albers + +commit 07cadc68a53c818bf83806e854bbe6ac1ddeda66 +Author: Robert Jones +Date: Sun Jul 5 17:08:39 2015 +0000 + + Rackspace/Openstack - Add/enhance --*-net-* create switches. + + Signed-off-by: Robert Jones + +commit 675617bc857910fd3f512f21a7c6ff160d99cd1d +Merge: 1b811a8930 4781d5c4fb +Author: Vincent Demeester +Date: Sun Feb 21 09:32:28 2016 +0100 + + Merge pull request #20549 from estesp/unskip-authz-events + + Unskip authz events test after fixes + +commit 1b811a8930d32e9fe984031918b397b6538f5f74 +Merge: 3646b14ecd cc2ff8c921 +Author: Vincent Demeester +Date: Sun Feb 21 09:27:50 2016 +0100 + + Merge pull request #20541 from tracylihui/20536-fix + + Update docker_remote_api_v1.21.md to complete the docs + +commit c7089b4b469e0a536a260c136ef71bc95591fa51 +Author: John Howard +Date: Sat Jan 30 20:50:11 2016 -0800 + + Windows CI: Making dockerfile WAAAAAY faster + + Signed-off-by: John Howard + +commit cc2ff8c9215e445d2504b0e4916233f72a257ee6 +Author: tracylihui <793912329@qq.com> +Date: Sun Feb 21 10:28:07 2016 +0800 + + Update docs/reference/api to complete the docs + + Signed-off-by: tracylihui <793912329@qq.com> + +commit 4781d5c4fb06d4617189f2e8a9475abcc5c5c8f3 +Author: Phil Estes +Date: Sat Feb 20 20:19:54 2016 -0600 + + Unskip authz events test after fixes + + Now that the various fixes are all committed, let's see if this gets + less flaky now. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 3646b14ecd9c07d9d4113b5a36958d3f92484806 +Merge: 41a2bac7cf 549fa67dae +Author: Vincent Demeester +Date: Sat Feb 20 23:25:51 2016 +0100 + + Merge pull request #20528 from cloojure/patch-3 + + Update dockernetworks.md + +commit 41a2bac7cfce743b1acdd415213bd12cede6fd29 +Merge: d006e32a91 47e3ea7dd1 +Author: Vincent Demeester +Date: Sat Feb 20 19:18:28 2016 +0100 + + Merge pull request #20542 from longliqiang88/master2.201 + + Update doc docker_remote_api_v1.20.md + +commit d006e32a91a178ae16b28177d6f4bf1462f76545 +Merge: 076b3558fc b25b9b5709 +Author: Sebastiaan van Stijn +Date: Sat Feb 20 19:17:11 2016 +0100 + + Merge pull request #20519 from lblackstone/update-packager-readme + + Update Packagers readme with seccomp info + +commit d7e97d04436601da26d24b199532652abe78770e +Author: Hakan Ozler +Date: Sat Feb 20 18:53:33 2016 +0200 + + update command line references + + Signed-off-by: Hakan Ozler + +commit bb9f0d28613c0f1aa5d9802032a679cd9a3b3ca3 +Merge: f947993ec0 0adeae325e +Author: Sven Dowideit +Date: Sat Feb 20 03:49:28 2016 -0800 + + Merge pull request #1844 from thaJeztah/remove-tutorials + + Remove tutorials from Dockerfile + +commit 47e3ea7dd1a08abc86d1ef0e32b71248a0eac95e +Author: longliqiang88 <394564827@qq.com> +Date: Sat Feb 20 19:32:20 2016 +0800 + + Update doc docker_remote_api_v1.20.md + + Update doc docker_remote_api_v1.20.md + Signed-off-by: longliqiang88 <394564827@qq.com> + +commit df3ede95ebdc708ea6fb954c8799cf14203916c2 +Author: tracylihui <793912329@qq.com> +Date: Sat Feb 20 19:17:19 2016 +0800 + + Update docker_remote_api_v1.21.md to complete the docs + + Signed-off-by: tracylihui <793912329@qq.com> + +commit 076b3558fcf4cc77694fe53f4aae65137ed3ef1b +Merge: dc0a69cbcd fe015c5ce0 +Author: Antonio Murdaca +Date: Sat Feb 20 12:10:29 2016 +0100 + + Merge pull request #20509 from estesp/cleanup-authz-test + + Clean up authz integration-cli test + +commit dc0a69cbcdd2b782ee660a72e9eac989371872de +Merge: fe275414fe 0b64280195 +Author: Sebastiaan van Stijn +Date: Sat Feb 20 11:57:29 2016 +0100 + + Merge pull request #20535 from hsinko/dev + + A wrong word + +commit fe275414fe540f7fe687ee034583f95d6a585bf3 +Merge: 6668326aa8 ff3ea4c90f +Author: Vincent Demeester +Date: Sat Feb 20 11:39:31 2016 +0100 + + Merge pull request #19116 from WeiZhang555/19025-update-restart + + Update RestartPolicy of container + +commit ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c +Author: Zhang Wei +Date: Mon Jan 4 23:58:20 2016 +0800 + + Update RestartPolicy of container + + Add `--restart` flag for `update` command, so we can change restart + policy for a container no matter it's running or stopped. + + Signed-off-by: Zhang Wei + +commit acf09695f74f8d6e7c068a9d5fede3cb4b0b3e51 +Author: Dong Chen +Date: Fri Feb 19 22:33:39 2016 -0800 + + Skip one test in Docker 1.9 for runC bug. + + Signed-off-by: Dong Chen + +commit 0b64280195d59643ddf529235e646d741db26455 +Author: hsinko +Date: Sat Feb 20 11:51:59 2016 +0800 + + Update configure-dns.md + + Modify word error + Signed-off-by: hsinko <21551195@zju.edu.cn> + +commit 06ef4a99e6429ed0688c98a98e4f32d1f7e1fc22 +Author: Dong Chen +Date: Fri Feb 19 18:29:49 2016 -0800 + + Test connection count between swarm manager and nodes. + + Signed-off-by: Dong Chen + +commit 6668326aa8cbb8af32bb49b4a843be2cae762cb3 +Merge: 3d65e7126c 31cb96dcfa +Author: Tibor Vass +Date: Fri Feb 19 21:00:37 2016 -0500 + + Merge pull request #20471 from calavera/userland_proxy_config_fix + + Avoid setting default truthy values from flags that are not set. + +commit 8a5c8c04955ba32f7e1fcd66571c6a8988e251b0 +Merge: 0d10758c32 c07cb37f20 +Author: Riyaz Faizullabhoy +Date: Fri Feb 19 17:04:55 2016 -0800 + + Merge pull request #582 from docker/dockertest-fixes + + Update dockertest file + +commit 549fa67dae346e8f9fe5590f914a97b1a18e46d6 +Author: Alan Thompson +Date: Fri Feb 19 16:53:53 2016 -0800 + + Update dockernetworks.md + + Fix truncated sentence + + Signed-off-by: Alan Thompson + +commit 7cc7fbadcc4ba65dd2fde38d5fb6b301c6ce469b +Merge: 568e1b6a6e a1aeae46ec +Author: Nathan LeClaire +Date: Fri Feb 19 16:52:47 2016 -0800 + + Merge pull request #3090 from mishak87/patch-1 + + Typo docker-machine -f is shortcut for --format + +commit 3d65e7126c60ef23a7f0e255cd2e4b5938859413 +Merge: 64785ff146 40be5dba47 +Author: Tibor Vass +Date: Fri Feb 19 19:45:44 2016 -0500 + + Merge pull request #20446 from estesp/fix-userns-cp + + Fix copy chown settings to not default to real root + +commit fe015c5ce0a260a8b5bc346a297507ac91f0ccb4 +Author: Phil Estes +Date: Thu Feb 18 22:00:45 2016 -0800 + + Allow post-start load of busybox to remove restarts + + The restarts in the authz plugin test suite seems to be causing + flakiness in CI, and can be avoided by separating the daemon start and + busybox image load. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit c07cb37f204b3c1f19d5988917c88a155ec3dd3c +Author: Ying Li +Date: Fri Feb 19 16:23:56 2016 -0800 + + Update with new docker version, and be more precise in what failures are allowed. + + Also, rather than use the regular docker configuration dir, create a temporary one + so we don't break existing real repo info. + + Signed-off-by: Ying Li + +commit 64785ff146536cd9c86e8093fc951f22964f615e +Merge: b9195cd6d4 1c2db56d2f +Author: David Calavera +Date: Fri Feb 19 15:41:17 2016 -0800 + + Merge pull request #20521 from estesp/vendor-engine-api-fix + + Update engine-api vendoring to latest commit + +commit b9195cd6d416280a021eaa630bd333453f71e270 +Merge: e51457eea8 abbf2aa6dd +Author: Arnaud Porterie +Date: Fri Feb 19 15:39:27 2016 -0800 + + Merge pull request #20464 from cpuguy83/fix_events_flakiness + + Fix events test flakiness. + +commit 31cb96dcfaaebe3f807e7c7bf82a48b5995c743b +Author: David Calavera +Date: Thu Feb 18 16:55:03 2016 -0500 + + Avoid setting default truthy values from flags that are not set. + + When the value for a configuration option in the file is `false`, + and the default value for a flag is `true`, we should not + take the value from the later as final value for the option, + because the user explicitly set `false`. + + This change overrides the default value in the flagSet with + the value in the configuration file so we get the correct + result when we merge the two configurations together. + + Signed-off-by: David Calavera + +commit a1aeae46ec9c31d469f380b50e987bd938628c7b +Author: Michal Gebauer +Date: Sat Feb 20 00:30:20 2016 +0100 + + Fixed rouge paren + + Signed-off-by: Michal Gebauer + +commit ad1b181291e8c27114ef222d6bbc68f104ec20ab +Merge: 6344c99848 4ce15476bd +Author: Richard Scothern +Date: Fri Feb 19 15:06:35 2016 -0800 + + Merge pull request #1466 from RichardScothern/proxy-lazy-auth + + Lazily evaluate auth challenges + +commit e51566d25596b43525d4f64225d53d2f5cb18cd0 +Author: Dong Chen +Date: Fri Feb 19 14:45:15 2016 -0800 + + Remove closeIdleConnections function. + + Signed-off-by: Dong Chen + +commit 9ace6eabc3605a220f5aecc1dda2670e64fa689c +Merge: 3d55714683 3973a10bc8 +Author: Jeffrey Morgan +Date: Fri Feb 19 14:35:44 2016 -0800 + + Merge pull request #414 from embray/innosetup-warnings + + Removed unused variables and deprecated setup directive + +commit 3d557146835d7831cc234388cd5e965d9b7bc0a0 +Merge: 0271c40359 173f61f81b +Author: Jeffrey Morgan +Date: Fri Feb 19 14:35:00 2016 -0800 + + Merge pull request #411 from johncmckim/issue-357 + + Split Docker Machine and VirtualBox validation message #357 + +commit 1c2db56d2f69f74e2859da251b6b8565d72bcb02 +Author: Phil Estes +Date: Fri Feb 19 16:20:27 2016 -0600 + + Update engine-api vendoring to latest commit + + This picks up the change for `Content-Type` which will help solve issues + with authz plugins. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 0271c40359556c30bccd53720daf7bc7c9994f4f +Merge: 6674e8cd9e 58913ce8ae +Author: Jeffrey Morgan +Date: Fri Feb 19 13:38:47 2016 -0800 + + Merge pull request #423 from tdeheurles/master + + Fix issue `docker run image bash -c "multiple parameters"` + +commit b25b9b5709cc277263237375be4a212257479407 +Author: Levi Blackstone +Date: Fri Feb 19 15:32:46 2016 -0600 + + Update Packagers readme with seccomp info + + Signed-off-by: Levi Blackstone + +commit 11435b674b8ed580f8cf401c7cee7d24f59d7a43 +Author: Antonio Murdaca +Date: Fri Feb 19 09:22:36 2016 +0100 + + add seccomp default profile fix tests + + Signed-off-by: Antonio Murdaca + Signed-off-by: Jessica Frazelle + +commit ad600239bca1ac89d9684a98d6f7f260959e81d2 +Author: Jessica Frazelle +Date: Thu Feb 18 00:06:07 2016 -0500 + + generate seccomp profile convert type + + Signed-off-by: Jessica Frazelle + +commit e51457eea87a52a24ad1cececbf1ca7191f2ca02 +Merge: a657cfd68b 64530c8e47 +Author: David Calavera +Date: Fri Feb 19 13:25:26 2016 -0800 + + Merge pull request #20513 from tonistiigi/retake-ref + + Fix releasing reference on deletion error + +commit a657cfd68bb869602ee0bf0578e13d737855f390 +Merge: 3b62a610ec 24152a4231 +Author: Jess Frazelle +Date: Fri Feb 19 13:58:18 2016 -0700 + + Merge pull request #20417 from redbaron/fix-deferred-removal-detection + + Fix libdevmapper deferred removal detection + +commit d5514965d5ab5aeaf52c73278368ef6103d5187f +Merge: c7ceacfeae 02535f0cf1 +Author: Daniel Nephin +Date: Fri Feb 19 15:53:26 2016 -0500 + + Merge pull request #2975 from dnephin/fix_crash_on_none_in_config + + Fix validation message when there are multiple nested oneOf validations. + +commit 3b62a610ec81996ec3b1aa5422c62fa926ef4f04 +Merge: 0e72550c5b f27b5dda4a +Author: Jess Frazelle +Date: Fri Feb 19 13:51:30 2016 -0700 + + Merge pull request #20288 from tiborvass/debian-jessie + + Switch Dockerfile to debian:jessie ... AGAIN + +commit 0e72550c5b27704ac1ec043302fe2aaebe3b1956 +Merge: 48701888c2 838ed1866b +Author: Brian Goff +Date: Fri Feb 19 15:42:48 2016 -0500 + + Merge pull request #20383 from HackToday/addsort + + Make network ls output order + +commit 48701888c216868379ee430e041f7a9568970117 +Merge: 9d70aef2c7 60ffd6c880 +Author: Brian Goff +Date: Fri Feb 19 15:41:34 2016 -0500 + + Merge pull request #20389 from HackToday/addvolumesupport + + Make volume ls output order + +commit 02535f0cf159b74fef8123a17e29c660e1891565 +Author: Daniel Nephin +Date: Fri Feb 19 14:22:55 2016 -0500 + + Fix validation message when there are multiple ested oneOf validations. + + Signed-off-by: Daniel Nephin + +commit 9d70aef2c7a1a83cd2d38abf2737cdda90dff42f +Merge: aa1fdf42da 6e0f873f05 +Author: Arnaud Porterie +Date: Fri Feb 19 10:57:30 2016 -0800 + + Merge pull request #20511 from icecrime/skip_flaky_test + + Temporarily skip TestAuthZPluginAllowEventStream + +commit 64530c8e47ec663827cceb28fc64b12da5e56147 +Author: Tonis Tiigi +Date: Fri Feb 19 10:42:29 2016 -0800 + + Fix releasing reference on deletion error + + Signed-off-by: Tonis Tiigi + +commit c7ceacfeaea5e8c3bd0e91cb04ac1e139446ce75 +Merge: bed0cfeb32 0d218c34c7 +Author: Daniel Nephin +Date: Fri Feb 19 13:41:50 2016 -0500 + + Merge pull request #2948 from dnephin/validate_top_level + + Validate that each section of the config is a mapping + +commit 6e0f873f053f5ae54901177cd5272f6fef7d49a0 +Author: Arnaud Porterie +Date: Fri Feb 19 10:32:05 2016 -0800 + + Temporarily skip TestAuthZPluginAllowEventStream + + Signed-off-by: Arnaud Porterie + +commit bed0cfeb32f0769e2fd78be5a48e6ab2db60bf13 +Merge: 1f2c2942d7 520c695bf4 +Author: Aanand Prasad +Date: Fri Feb 19 10:25:28 2016 -0800 + + Merge pull request #2807 from aanand/swarm-doc + + Update Swarm integration guide and make it an official part of the docs + +commit aa1fdf42da8536d69c40322856aeaae197698fcd +Merge: 06af9471f8 79db131a35 +Author: Tibor Vass +Date: Fri Feb 19 13:16:53 2016 -0500 + + Merge pull request #20253 from aaronlehmann/smarter-tls-fallback + + Smarter push/pull fallback from TLS to plaintext + +commit 0d218c34c7b58144188085f748be031efd316d1c +Author: Daniel Nephin +Date: Fri Feb 19 12:35:05 2016 -0500 + + Make config validation error messages more consistent. + + Signed-off-by: Daniel Nephin + +commit 074561b0ecc1e1b2e476c5aa06a8e6ea858239c1 +Author: Phil Estes +Date: Fri Feb 19 10:12:39 2016 -0800 + + Clean up authz integration-cli test + + - Order the flow of the handlers more cleanly--read req, do actions, + write response. + - Add "always allowed" endpoints to handle `/_ping` and `/info` usage + from the test framework/daemon start/restart management + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 4b2a66623199ad4c281b688957d1cf7ec282abbd +Author: Daniel Nephin +Date: Tue Feb 16 17:30:23 2016 -0500 + + Validate that each section of the config is a mapping before running interpolation. + + Signed-off-by: Daniel Nephin + +commit 520c695bf4f4fa7c41a0febb00234f21be776d43 +Author: Aanand Prasad +Date: Tue Feb 2 17:55:21 2016 +0000 + + Update Swarm integration guide and make it an official part of the docs + + Signed-off-by: Aanand Prasad + +commit 1f2c2942d7acab16bf45006f024054a7f2a8b6a1 +Merge: 5fc0df4be2 753c953870 +Author: Aanand Prasad +Date: Fri Feb 19 09:26:40 2016 -0800 + + Merge pull request #2963 from londoncalling/docs-alias-repr2829 + + corrected description of network aliases, added real-world example pe… + +commit 06af9471f869cd1f46da814e21c21bc815fd665e +Merge: d6576ad9f0 cdc7f26715 +Author: Vincent Demeester +Date: Fri Feb 19 17:07:50 2016 +0100 + + Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs + + Fix some flaws in docs + +commit d6576ad9f0e7b0ae9ed374ddd2f095a3121cf056 +Merge: 787fe507bf 22d22eb9e1 +Author: Sebastiaan van Stijn +Date: Fri Feb 19 16:34:23 2016 +0100 + + Merge pull request #20504 from fuzzbomb/20503-document-names-format-placeholder-docker-ps-man-page + + Document .Names format placeholder in docker-ps man page, fixes #20503. + +commit 22d22eb9e17c500fa19c4bd8d56f3faad1df4440 +Author: Andrew Macpherson +Date: Fri Feb 19 15:13:34 2016 +0000 + + Document .Names format placeholder in docker-ps man page, fixes #20503. + + Signed-off-by: Andrew Macpherson + +commit 787fe507bf4e119a00f35975d5d483355a1276f8 +Merge: 33997ba69c b96bbf26db +Author: Sebastiaan van Stijn +Date: Fri Feb 19 15:55:33 2016 +0100 + + Merge pull request #20479 from qunhu/master + + fix docs + +commit 568e1b6a6eb0c7678c09bddcc61c73ab12f7d765 +Merge: e28bfc55e0 71bf6ed6cf +Author: Jean-Laurent de Morlhon +Date: Fri Feb 19 15:32:34 2016 +0100 + + Merge pull request #3088 from jmelis/master + + Add OpenNebula Driver Plugin + +commit b9302b3043cc9d638a536ce0928f4dd3c0825be9 +Author: Michal Gebauer +Date: Fri Feb 19 15:24:23 2016 +0100 + + Typo docker-machine -f is shortcut for --format + + Signed-off-by: Michal Gebauer + +commit 33997ba69ca3d3bce26ee6cfe34d591cc32e40ea +Merge: 117a982d2e f03050cc4c +Author: Sebastiaan van Stijn +Date: Fri Feb 19 15:24:59 2016 +0100 + + Merge pull request #20487 from wenchma/typo-error + + Fix typo error of dockernetworks.md + +commit 71bf6ed6cf3a3a3bdf896958d57a88a33c572a48 +Author: Jaime Melis +Date: Fri Feb 19 10:20:08 2016 +0100 + + Add OpenNebula Driver Plugin + + Signed-off-by: Jaime Melis + +commit 0adeae325e072f22cdd8bc3e1ae4fa748dd56abf +Author: Sebastiaan van Stijn +Date: Fri Feb 19 13:02:06 2016 +0100 + + Remove tutorials from Dockerfile + + The "docker/tutorials" repository is now + private, causing building the docs to fail. + + Signed-off-by: Sebastiaan van Stijn + +commit f9aca81b6723f70ab31859ecc3888a5f9cef63eb +Author: Sebastiaan van Stijn +Date: Fri Feb 19 12:59:28 2016 +0100 + + Update Swarm API documentation + + This updates the Swarm API documentation; + + - Fix heading levels (changed H1 -> H2) + - Replace the "Endpoints which behave differently" with a table + - Fix Markdown markup in "Registry Authentication" section + - Changed the "Registry Authentication" examples from a bullet-list + to sub-sections and promoted "token-based authentication" as the preferred + authentication method (adding notes that password-based authentication + stores credentials unencrypted) + + Signed-off-by: Sebastiaan van Stijn + +commit 439433099e261d504561d834839fcb936fb7ea95 +Author: Zhang Wei +Date: Fri Feb 19 18:50:11 2016 +0800 + + Clean redundant error message for export + + When execute `docker export -o path xxx` and path is a directory docker + has no privilege to write to, daemon will print lots of error logs that + most of them are duplicated and redundant. + + This will remove unnecessary error logs and print only once. + + Signed-off-by: Zhang Wei + +commit 58913ce8ae80e80d59e7ce262b5afccfda954132 +Author: thibault deheurles +Date: Fri Feb 19 11:29:39 2016 +0100 + + Fix issue 368 + + Signed-off-by: Thibault Deheurles + +commit f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0 +Author: Wen Cheng Ma +Date: Fri Feb 19 17:18:52 2016 +0800 + + Fix typo error of dockernetworks.md + + Signed-off-by: Wen Cheng Ma + +commit e28bfc55e02c9c0663fb58fcc994b649b96516e1 +Merge: 2a95370032 c40f9f7a21 +Author: Jean-Laurent de Morlhon +Date: Fri Feb 19 09:36:17 2016 +0100 + + Merge pull request #3017 from hypriot/set-longmode-on + + Add option --longmode on to support Windows 32bit hosts + +commit c40f9f7a215dd2cbc1bc31b0ace861a0e22b82f4 +Author: Stefan Scherer +Date: Mon Feb 8 14:54:37 2016 +0100 + + Add option --longmode on to support Windows 32bit hosts + + Signed-off-by: Stefan Scherer + +commit 2a9537003276a6eb9ee9670b4d9014f46dd83c98 +Merge: 0c9adcb01e 742c87ee3f +Author: Jean-Laurent de Morlhon +Date: Fri Feb 19 08:32:29 2016 +0100 + + Merge pull request #3085 from dgageot/improve-doc-generic + + Improve Generic driver doc + +commit 742c87ee3f1af146b6c3e18fe4a4f6c2da976170 +Author: David Gageot +Date: Thu Feb 18 21:45:55 2016 +0100 + + Improve Generic driver doc + + Signed-off-by: David Gageot + +commit b96bbf26dbce9ca60e54e4bb734b8574642e3026 +Author: huqun +Date: Fri Feb 19 13:51:14 2016 +0800 + + fix docs + + Signed-off-by: huqun + +commit 6674e8cd9e56fb051d665cbddec07b2296970534 +Merge: ff26246768 01c4f0d54e +Author: Jeffrey Morgan +Date: Thu Feb 18 20:44:56 2016 -0800 + + Merge pull request #422 from SvenDowideit/fix-overview-link + + Fix link to overview topic + +commit b8866877b0ed9705d40996f71451d9066e6f8094 +Author: Ying Li +Date: Thu Feb 18 18:59:14 2016 -0800 + + Clarify test comment + + Signed-off-by: Ying Li + +commit 753c953870c2c4358e6f6ffd8f24cbd9dfd83780 +Merge: eb4a98c0d1 630a50295b +Author: Victoria Bialas +Date: Thu Feb 18 18:07:38 2016 -0800 + + Merge branch 'docs-alias-repr2829' of github.com:londoncalling/compose into docs-alias-repr2829 + + Fixed file format of one word, legacy, adding signature to that commit. + + Signed-off-by: Victoria Bialas + +commit 856a989d834f7fcbcb9bba687539fb159228f6b8 +Merge: 902fb2ec66 5a2baa1369 +Author: French Ben +Date: Thu Feb 18 18:21:05 2016 -0800 + + Merge pull request #1477 from dongjoon-hyun/fix_typos + + Fix typos in comments of src/utils. + +commit eb4a98c0d141063c2d112c4de879e226a3c96c5e +Author: Victoria Bialas +Date: Thu Feb 18 17:49:28 2016 -0800 + + corrected description of network aliases, added real-world example per #2907 + + copyedit to make show as file format + + Signed-off-by: Victoria Bialas + +commit 630a50295b30a4d30e233326a2f13d1d4b0d725d +Author: Victoria Bialas +Date: Thu Feb 18 18:05:30 2016 -0800 + + copyedit to make show as file format + + Signed-off-by: Victoria Bialas + +commit 69535f167a1ff1e7c8e0b2c85b0931b3cf12035e +Author: Dong Chen +Date: Thu Feb 18 18:02:10 2016 -0800 + + Do not recycle connections. Let net/http handles connections. + + Signed-off-by: Dong Chen + +commit 068a56eb97f7b8a0522f94eec7b66a95fff80a1d +Author: Victoria Bialas +Date: Thu Feb 18 17:49:28 2016 -0800 + + corrected description of network aliases, added real-world example per #2907 + + Signed-off-by: Victoria Bialas + +commit 3a5fbf0033b7f15cc869578c6298fcb1cb9dcada +Author: Riyaz Faizullabhoy +Date: Thu Feb 18 15:43:57 2016 -0800 + + remove path hash prefix from TargetsDelegations + + Signed-off-by: Riyaz Faizullabhoy + +commit 117a982d2e805d3279ff75fcec071635e5191ef6 +Merge: c96564a76c c9bec2be2a +Author: Arnaud Porterie +Date: Thu Feb 18 17:39:46 2016 -0800 + + Merge pull request #20419 from aboch/cr + + Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring + +commit cdc7f26715fbf0779a5283354048caf9faa1ec4a +Author: Jian Zhang +Date: Wed Feb 17 11:54:45 2016 +0800 + + Fix some flaws in docs + + Signed-off-by: Jian Zhang + +commit c96564a76c8d9d3ba2c4d316deae55ab3f5e0b3f +Merge: 7068722678 d266142230 +Author: David Calavera +Date: Thu Feb 18 17:08:01 2016 -0800 + + Merge pull request #20433 from runcom/fixies + + runconfig: opts: parse: lowercase errors + +commit 70687226781545499c45414286a5b864bfc4eecd +Merge: 6a8342d63d 1c05c65f6f +Author: Arnaud Porterie +Date: Thu Feb 18 16:48:50 2016 -0800 + + Merge pull request #20458 from aaronlehmann/migration-close-gzip-writer + + Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration + +commit e2707957682b32b862ddb31cc565e513abe4d902 +Author: David Lawrence +Date: Thu Feb 18 11:02:04 2016 -0800 + + updates and bugfixes for go 1.6 + Signed-off-by: David Lawrence (github: endophage) + +commit 01c4f0d54ed1a67fdfcf65d54c691aa27672d1b8 +Author: Sven Dowideit +Date: Thu Feb 18 16:20:29 2016 -0800 + + Fix link to overview topic + + Signed-off-by: Sven Dowideit + +commit 5fc0df4be2283a3cf096c2e583f8817ff6163b33 +Merge: d3a95c2892 0cb8ba3775 +Author: Joffrey F +Date: Thu Feb 18 16:01:30 2016 -0800 + + Merge pull request #2907 from shin-/2829-net-alias + + Allow user to specify custom network aliases + +commit 6a8342d63d3c649b280fdd9a2090067c2a9af14c +Merge: 319bbff799 d86f0d9b6d +Author: Arnaud Porterie +Date: Thu Feb 18 15:58:24 2016 -0800 + + Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts + + Check in latest Win2Lin Jenkins scripts + +commit 0cb8ba37757d8e075be9630d96b08475aff8986a +Author: Joffrey F +Date: Thu Feb 18 15:28:12 2016 -0800 + + Use modern set notation in _get_aliases + + Signed-off-by: Joffrey F + +commit 7152f7ea7662633415de0750b6cb6b3f6742c847 +Author: Joffrey F +Date: Thu Feb 18 14:52:52 2016 -0800 + + Handle mismatched network formats in config files + + Signed-off-by: Joffrey F + +commit 825a0941f04523a6c68e47bb3392a720744f7b7a +Author: Joffrey F +Date: Thu Feb 18 12:04:07 2016 -0800 + + Network aliases are now part of the network dictionary + + Signed-off-by: Joffrey F + +commit 4b99b32ffb346d0cb4b488a69565ea991acbb38f +Author: Joffrey F +Date: Fri Feb 12 17:48:42 2016 -0800 + + Add v2_only decorator to network aliases test + + Signed-off-by: Joffrey F + +commit 41e399be9880583954c6de6559886465e3f8db85 +Author: Joffrey F +Date: Fri Feb 12 17:20:18 2016 -0800 + + Fix network list serialization in py3 + + Signed-off-by: Joffrey F + +commit 7801cfc5d1ac9f481ebc991ef8bd6fab7a94575c +Author: Joffrey F +Date: Fri Feb 12 17:17:31 2016 -0800 + + Document network_aliases config + + Signed-off-by: Joffrey F + +commit 633e349ab97af63849fc739eb9596be6f6f24362 +Author: Joffrey F +Date: Fri Feb 12 16:58:29 2016 -0800 + + Test network_aliases feature + + Signed-off-by: Joffrey F + +commit 2b5d3f51cb7e8501c1b5481ce45d139b7e49171e +Author: Joffrey F +Date: Fri Feb 12 16:10:36 2016 -0800 + + Allow user to specify custom network aliases + + Signed-off-by: Joffrey F + +commit d3a95c289255d20f657b4ad8c9535ff2d5eb2c0b +Merge: 85ba08bb13 93a02e497d +Author: Joffrey F +Date: Thu Feb 18 15:07:09 2016 -0800 + + Merge pull request #2938 from shin-/2927-buildargs-types + + Constraint build argument types. Numbers are cast into strings. + +commit 40be5dba473aa57a388fe26bb79ac38a66653f31 +Author: Phil Estes +Date: Wed Feb 17 23:57:42 2016 -0800 + + Fix copy chown settings to not default to real root + + This corrects `docker cp` behavior when user namespaces are enabled. + Instead of chown'ing copied-in files to real root (0,0), the code + queries for the remapped root uid & gid and sets the chown option + properly. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 319bbff799d637ad76edfe348fedb4adc1a531f3 +Merge: 22ff08e5b2 0fe31306d1 +Author: David Calavera +Date: Thu Feb 18 13:51:10 2016 -0800 + + Merge pull request #20381 from cpuguy83/20378_fix_multiple_deref + + Fix issue with multiple volume refs with same name + +commit 22ff08e5b2a200d896437b1a1faa6b90197ee157 +Merge: b52cd79cf4 3b65dda2ed +Author: David Calavera +Date: Thu Feb 18 13:50:27 2016 -0800 + + Merge pull request #20452 from icecrime/roadmap_update + + Update ROADMAP.md + +commit b52cd79cf4ae2896062fb0dfeb712696bec2fa33 +Merge: 038c3b8287 910ea8adf6 +Author: Sebastiaan van Stijn +Date: Thu Feb 18 22:40:52 2016 +0100 + + Merge pull request #20459 from ozlerhakan/master + + add a new sub-section to each volume page + +commit abbf2aa6ddbf8159a5fceb4df25d7f85aeffe70e +Author: Brian Goff +Date: Thu Feb 18 16:10:29 2016 -0500 + + Fix events test flakiness. + + Since channel is getting a send instead of a close now, this can cause + random issues ranging through the list of channels if the channel is + unbuffered since the send may be blocked. + + Signed-off-by: Brian Goff + +commit c9bec2be2af62571e49b4992d5a2fd8806049a07 +Author: Madhu Venugopal +Date: Thu Feb 18 11:00:26 2016 -0800 + + Config-reload IT + Signed-off-by: Madhu Venugopal + +commit e5293f97f240c194eba1a46e5883514c9ccb4586 +Author: Santhosh Manohar +Date: Wed Feb 17 21:56:28 2016 -0800 + + IT case for sending invalid query to embedded DNS server + Signed-off-by: Santhosh Manohar + +commit ed364b69df0432d0143e7661c4c0695377ceef7b +Author: Alessandro Boch +Date: Wed Feb 17 17:08:11 2016 -0800 + + Invoke ReloadConfiguration on network controller + + - It reverts fa163f5619bb01cabca1c21 plus a small change + in order to allow passing the global scope datastore + to libnetwork after damon boot. + + Signed-off-by: Alessandro Boch + +commit d86f0d9b6d3b8d1077d6fb23b8f94e072ef1ba28 +Author: John Howard +Date: Thu Feb 18 11:58:56 2016 -0800 + + Check in latest Win2Lin Jenkins scripts + + Signed-off-by: John Howard + +commit 910ea8adf6c2c94fdb3748893e5b1e51a6b8c431 +Author: ozlerhakan +Date: Thu Feb 18 21:52:15 2016 +0200 + + add a section to each volume page + + Signed-off-by: ozlerhakan + +commit 0c9adcb01eb40e3de555b0de194c596735fe3359 +Merge: 7070fe863b e7c58ea7ae +Author: Nathan LeClaire +Date: Thu Feb 18 11:31:39 2016 -0800 + + Merge pull request #3082 from patrikerdes/3015_active_timeout_error_message + + Fix #3015 + +commit 038c3b82870646cefd8f631c891cd99120cc4109 +Merge: 2e6c841b82 0109510830 +Author: Arnaud Porterie +Date: Thu Feb 18 11:13:30 2016 -0800 + + Merge pull request #20426 from calavera/remove_channel_close + + Remove channel close. + +commit f947993ec0bc52378afee388bda8d63196ee4bbd +Merge: 8debc534ce d4f9ae3d95 +Author: Victor Vieux +Date: Thu Feb 18 11:04:29 2016 -0800 + + Merge pull request #1842 from vieux/bump-1.1.2 + + bump 1.1.2 + +commit 1c05c65f6fbb5ea35608da259dfe4a6d211dbf82 +Author: Aaron Lehmann +Date: Thu Feb 18 10:55:38 2016 -0800 + + Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration + + There is a missing call to Close on the gzip.Writer that is used to + compress newly created tar-split files during layer migration. This can + result in corrupt tar-split files that later cause docker push and + docker save to fail. The Close call is necessary to flush buffered data + to the stream. + + Fixes: #20104 + + Signed-off-by: Aaron Lehmann + +commit 8debc534cea4d77e2334d67bc797bcb783e8a4b4 +Merge: 39ca8e97eb 358ac5729a +Author: Victor Vieux +Date: Thu Feb 18 10:54:49 2016 -0800 + + Merge pull request #1833 from vieux/test_p_compose + + revert startconfig breaking change + +commit 93a02e497dd19c055235936ec4cfe3d14f99d263 +Author: Joffrey F +Date: Thu Feb 18 10:53:40 2016 -0800 + + Apply driver_opts processing to network configs + + Signed-off-by: Joffrey F + +commit 2e6c841b826cc73332c44d5a04a5996fc65af724 +Merge: 84d2d6acdd d736a9d2c3 +Author: David Calavera +Date: Thu Feb 18 10:35:04 2016 -0800 + + Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge + + Expose bridge IPv6 setting to `docker network inspect` + +commit 84d2d6acddb853fa8e2071d5d43e5364200f9b32 +Merge: 2f283f3cd8 883b0567f2 +Author: Sebastiaan van Stijn +Date: Thu Feb 18 19:17:59 2016 +0100 + + Merge pull request #20438 from YeZhenan/nodejs_web_app-update + + update the dockfile of dockerizing a Node.js app. + +commit 2f283f3cd8204f8e1e1eb9d571e79a263f202e9d +Merge: aae454cb52 8e0e9e0f24 +Author: David Calavera +Date: Thu Feb 18 10:10:26 2016 -0800 + + Merge pull request #20447 from cpuguy83/fix_netnone + + Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError + +commit 6344c99848636cceff38e8defb98f8538dfa1d5e +Merge: 5806f275bf b035d372e6 +Author: Richard Scothern +Date: Thu Feb 18 10:06:43 2016 -0800 + + Merge pull request #1472 from tanksuzuki/deadlink-to-license-file + + Fix deadlink to license file + +commit 854cad3c1404c410687729642e35493cfd0bedd3 +Author: Victor Vieux +Date: Thu Feb 18 10:01:26 2016 -0800 + + don't erase hostconfig on refresh + + Signed-off-by: Victor Vieux + +commit 3b65dda2edb6dc6c16dae4da3b866fd0251d0f36 +Author: Arnaud Porterie +Date: Wed Feb 17 12:55:20 2016 -0800 + + Update ROADMAP.md + + Signed-off-by: Arnaud Porterie + +commit 85ba08bb13b0c964586f266f45c1479dc053d33d +Merge: 50dc27aed7 69d0154718 +Author: Aanand Prasad +Date: Thu Feb 18 09:25:02 2016 -0800 + + Merge pull request #2932 from AvdN/patch-1 + + reset colors after warning + +commit 50dc27aed75d88faff4d0830af814fac59feeda5 +Merge: bd72670947 2204b642ef +Author: Aanand Prasad +Date: Thu Feb 18 09:24:10 2016 -0800 + + Merge pull request #2913 from clkao/container-install-fixes + + A few fixes to the container-based install, which is broken on: + +commit aae454cb520cb36e5b4b36f7d71a6297c6ffc3c2 +Merge: e7b2523751 d6b7819185 +Author: Brian Goff +Date: Thu Feb 18 12:12:09 2016 -0500 + + Merge pull request #20292 from Microsoft/jjh/testunit-pkgarchivestep2 + + Windows CI: test-unit on pkg\archive part 2 + +commit e7b25237514917d16b2422404777ec364200917a +Merge: 1fb144cb23 4cf9b725f2 +Author: Brian Goff +Date: Thu Feb 18 12:07:20 2016 -0500 + + Merge pull request #20442 from cpuguy83/fix_flakey_TestAuthZPluginAllowEventStream + + Fix flakey TestAuthZPluginAllowEventStream + +commit 1fb144cb230fb5e26a19263bd0a159f3c9bd700b +Merge: fb00fe5ea3 e8f569b324 +Author: Brian Goff +Date: Thu Feb 18 12:06:23 2016 -0500 + + Merge pull request #20365 from calavera/remove_debug_from_server + + Remove all docker debugging knowledge from the server. + +commit 7070fe863b942ba087ce59c15ea07b80ef4ee81a +Merge: 20ec62b05f e790d9f47a +Author: David Gageot +Date: Thu Feb 18 17:57:18 2016 +0100 + + Merge pull request #3075 from synfinatic/adt-enable-fusion-timesync + + Enable syncing time for VMWare Fusion guests + +commit 20ec62b05fe3ab8a4fb7c8cecc5862c2f52bf51d +Merge: cf7885163c 1331811dca +Author: David Gageot +Date: Thu Feb 18 17:57:07 2016 +0100 + + Merge pull request #3081 from thaJeztah/no-more-lxc + + docs: remove reference to lxc-docker + +commit bd72670947e6bb0b8821581a6ee70e05bba07475 +Merge: 706062ad16 4f7530c480 +Author: Aanand Prasad +Date: Thu Feb 18 08:46:29 2016 -0800 + + Merge pull request #2894 from dnephin/only_set_constraint_with_volumes + + Only set a container affinity if there are volumes to copy over + +commit 8e0e9e0f24e5802709508b7c7fe61cb5171ec414 +Author: Brian Goff +Date: Thu Feb 18 11:34:34 2016 -0500 + + Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError + + Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f + + Signed-off-by: Brian Goff + +commit fb00fe5ea3e6d1a2aba2dc639aff30d4687f346c +Merge: be5939f407 7f0ca59ec2 +Author: Tianon Gravi +Date: Thu Feb 18 08:33:38 2016 -0800 + + Merge pull request #20434 from cmehay/power8 + + Update to Golang 1.6 in Power8 Dockerfile + +commit be5939f40778d8056edff621153391e322f149d5 +Merge: 1f97f2232d adb2e3fedc +Author: Brian Goff +Date: Thu Feb 18 11:02:17 2016 -0500 + + Merge pull request #20333 from rhatdan/mqueue + + /dev/mqueue should never be mounted readonly + +commit 4cf9b725f2117581ac4ba3e6f1db23da090e1732 +Author: Brian Goff +Date: Thu Feb 18 10:19:19 2016 -0500 + + Fix flakey TestAuthZPluginAllowEventStream + + Signed-off-by: Brian Goff + +commit 1f97f2232db75a9e1e2afd63894c98266a87b7d7 +Merge: a9c73b1a7e 13839a6d32 +Author: Sebastiaan van Stijn +Date: Thu Feb 18 15:18:36 2016 +0100 + + Merge pull request #20415 from thaJeztah/improve-seccomp-warning + + Be more explicit on seccomp availability + +commit 883b0567f2c96cb5cbcc31e5b02938bcc6d5877f +Author: Zhenan Ye <21551168@zju.edu.cn> +Date: Thu Feb 18 04:18:24 2016 -0800 + + update the file of dockerizing a Node.js app. + + Signed-off-by: Zhenan Ye <21551168@zju.edu.cn> + +commit 13839a6d328692c672394811ee3afd9a168fc328 +Author: Sebastiaan van Stijn +Date: Wed Feb 17 23:45:18 2016 +0100 + + Be more explicit on seccomp availability + + Seccomp is only *compiled* in binaries built for + distros that ship with seccomp 2.2.1 or higher, + and in the static binaries. + + The static binaries are not really useful for + RHEL and CentOS, because devicemapper does + not work properly with the static binaries, + so static binaries is only an option for Ubuntu + and Debian. + + Signed-off-by: Sebastiaan van Stijn + +commit a9c73b1a7ebe4ccd6893f37d2515be94000d081a +Merge: 3406903fa2 0b4e0ce7cd +Author: Sebastiaan van Stijn +Date: Thu Feb 18 14:49:15 2016 +0100 + + Merge pull request #20425 from HackToday/fixindex + + Fix wrong index marking + +commit 7f0ca59ec2696c960b7c7d2fa9e24f7ded694881 +Author: Christophe Mehay +Date: Thu Feb 18 11:57:43 2016 +0100 + + Update to Golang 1.6 in Power8 Dockerfile + + Signed-off-by: Christophe Mehay + +commit e7c58ea7aecbc9dd78d08aac76566b9c0d370d34 +Author: Patrik Erdes +Date: Thu Feb 18 08:51:34 2016 +0100 + + Fix #3015 + + Signed-off-by: Patrik Erdes + +commit 1331811dca44b95216dcdd011f2de3551d1dd8e9 +Author: Sebastiaan van Stijn +Date: Thu Feb 18 12:20:26 2016 +0100 + + docs: remove reference to lxc-docker + + The package on apt.dockerproject.org is now called + 'docker-engine'. + + Also replaced 'dev' with 'default', because that's + the default name for machines. + + Signed-off-by: Sebastiaan van Stijn + +commit d266142230bd041c8299eef329cf79a17f8f7478 +Author: Antonio Murdaca +Date: Thu Feb 18 09:26:47 2016 +0100 + + runconfig: opts: parse: lowercase errors + + also fix wrong function comment + + Signed-off-by: Antonio Murdaca + +commit 3973a10bc8a7a98f49bc080cb14a63ea032fa7cc +Author: Erik M. Bray +Date: Fri Feb 12 12:58:10 2016 +0100 + + Removed unused variables and deprecated setup directive + + Signed-off-by: Erik M. Bray + +commit 3406903fa294b2d0f0742e7754278d6bb6b58232 +Merge: 776c5ee299 f7fe2f0992 +Author: Sebastiaan van Stijn +Date: Thu Feb 18 10:00:43 2016 +0100 + + Merge pull request #20423 from HackToday/fixdoc + + Add sudo for related command + +commit cf7885163cd806409232a5c70ea507ece29eaa48 +Merge: bf12d191e3 a8625397bc +Author: Jean-Laurent de Morlhon +Date: Thu Feb 18 09:56:34 2016 +0100 + + Merge pull request #2932 from sipicsg/master + + added hyperv static mac address and vlan option for machine creation + +commit bf12d191e3598e269f21976efe978677eda32eb7 +Merge: 95644775c4 78efd68886 +Author: Jean-Laurent de Morlhon +Date: Thu Feb 18 09:54:54 2016 +0100 + + Merge pull request #3018 from hypriot/improve-no-vtx-check + + Improve --virtualbox-no-vtx-check option to allow starting the VM + +commit 95644775c4e7c3277cffc9ebe9ff584e77f21d70 +Merge: 5918c13d22 27e572113f +Author: Jean-Laurent de Morlhon +Date: Thu Feb 18 09:53:05 2016 +0100 + + Merge pull request #3053 from dgageot/3052-go-1.6rc2 + + Use golang 1.6 + +commit d4f9ae3d95a5db30a76e38316c6867ed2bb764a8 +Author: Victor Vieux +Date: Thu Feb 18 00:18:03 2016 -0800 + + bump 1.1.2 + + Signed-off-by: Victor Vieux + +commit b035d372e6a14f277797f23f08745342dabefc20 +Author: Asuka Suzuki +Date: Thu Feb 18 17:12:51 2016 +0900 + + Fix deadlink to license file + + Signed-off-by: Asuka Suzuki + +commit 27e572113fb5460ea7ad934b3d24ddfba1def925 +Author: David Gageot +Date: Sat Feb 13 01:19:13 2016 +0100 + + FIX #3051 Use golang 1.6 + + Signed-off-by: David Gageot + +commit 5918c13d2208a95557079ac3993e069f348a5433 +Merge: 7ec902189d ffb9cbed7a +Author: David Gageot +Date: Thu Feb 18 08:41:43 2016 +0100 + + Merge pull request #3067 from dgageot/3056-ls-timeout + + FIX #3056 ls timeout when instance is stopped + +commit 010951083060e1267e4dd726f5322d7309a8fd62 +Author: David Calavera +Date: Wed Feb 17 22:52:06 2016 -0500 + + Remove channel close. + + Send a message instead, discarding duplicated messages. + + Signed-off-by: David Calavera + +commit 14edbe33e11533cc8a93727f6c32c4328d7ae3de +Author: Riyaz Faizullabhoy +Date: Wed Feb 17 10:44:09 2016 -0800 + + add snapshot meta check in download root, update tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 9dfaee1add667f36bf53a1f3426c3c0898355ba8 +Author: Ying Li +Date: Tue Feb 16 15:53:32 2016 -0800 + + Refactor and add to per-metadata-type mutation tests + + Signed-off-by: Ying Li + +commit 4f7530c480213d4cf526353aa3b68979ef605bd6 +Author: Daniel Nephin +Date: Thu Feb 11 19:53:28 2016 -0500 + + Only set a container affinity if there are volumes to copy over. + + Signed-off-by: Daniel Nephin + +commit edb70b5474ff357683ff467109a4b8cf8ef3713a +Author: Ying Li +Date: Tue Feb 16 14:34:39 2016 -0800 + + Fix test bug where root role mutations weren't being tested + + Signed-off-by: Ying Li + +commit 401690d621c82111b3ae9f75eefc24acf943d515 +Author: Ying Li +Date: Mon Feb 15 17:03:42 2016 -0800 + + Include client update tests to test updating non-root metadata that are missing pieces + + Signed-off-by: Ying Li + +commit 95325cd19b23a4197ad492157aabb43b1da457ff +Author: Ying Li +Date: Mon Feb 15 16:04:15 2016 -0800 + + Include client update tests to test updating roots that are missing roles + + Signed-off-by: Ying Li + +commit f0ddda1602a578fec810d51d5828db4156357d74 +Author: Ying Li +Date: Mon Feb 15 16:03:48 2016 -0800 + + Add methods for mutating per-metadata data to swizzler + + Signed-off-by: Ying Li + +commit 0b4e0ce7cda357904342d41ea139519b8bbf755b +Author: Kai Qiang Wu(Kennan) +Date: Thu Feb 18 03:08:15 2016 +0000 + + Fix wrong index marking + + The index was wrong set in docs, so let's fix it + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit f7fe2f0992126d45802a376b6da760d4e2b8607c +Author: Kai Qiang Wu(Kennan) +Date: Thu Feb 18 02:58:21 2016 +0000 + + Add sudo for related command + + The du need sudo to perform to get correct results. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 0d10758c32f83490e7724095422a74071979cedd +Merge: b31f4e977a d1ac37fd33 +Author: Riyaz Faizullabhoy +Date: Wed Feb 17 18:17:34 2016 -0800 + + Merge pull request #566 from docker/role-types-getters + + Role types with keys, remove keyDB + +commit 79db131a358f15d4bdef37e251daf27429d116b3 +Author: Aaron Lehmann +Date: Wed Feb 17 16:53:25 2016 -0800 + + Change APIEndpoint to contain the URL in a parsed format + + This allows easier URL handling in code that uses APIEndpoint. + If we continued to store the URL unparsed, it would require redundant + parsing whenver we want to extract information from it. Also, parsing + the URL earlier should give improve validation. + + Signed-off-by: Aaron Lehmann + +commit 196b27211b77562cd6d5d620d4dd5bfe473383ed +Author: Alessandro Boch +Date: Wed Feb 17 17:07:33 2016 -0800 + + Vendoring libnetwork v0.7.0-dev.3 + + Signed-off-by: Alessandro Boch + +commit d1ac37fd332c49115297c649d87a6d81b6d4348b +Author: David Lawrence +Date: Wed Feb 17 09:58:59 2016 -0800 + + addressing review comments + Signed-off-by: David Lawrence (github: endophage) + +commit 358ac5729ad6421d43519752432e01290ee7450a +Author: Victor Vieux +Date: Wed Feb 17 16:09:35 2016 -0800 + + remove debug + + Signed-off-by: Victor Vieux + +commit 24152a4231d56886928265339d15884e1cfe1038 +Author: Maxim Ivanov +Date: Wed Feb 17 23:34:21 2016 +0000 + + Fix libdevmapper deferred removal detection + + When linking, position of `-l` flags is important since + they muse come _after_ any object files which uses symbols + from a specified library, that is due to --as-needed binutils + ld flag enabled by default + + Signed-off-by: Maxim Ivanov + +commit f3a1d58fe3e9a2efd0d5f4505d3ba5645393eb4a +Author: Victor Vieux +Date: Wed Feb 17 15:46:51 2016 -0800 + + Revert "Testcase start container with hostconfig" + + This reverts commit 3dff7aa96a2ede92631828a54aae0f26a71f9efc. + + Signed-off-by: Victor Vieux + +commit c42142e40883774b34d8407224983ca807af6769 +Author: Victor Vieux +Date: Wed Feb 17 15:45:49 2016 -0800 + + Revert "Passing HostConfig for /start endpoint" + + This reverts commit 6ff0d29c9d10afbe0fd2ebab7f954c4c74e261e4. + + Signed-off-by: Victor Vieux + +commit d49db6afaf126b96d7590ced45c16c14a32e57fd +Author: Victor Vieux +Date: Wed Feb 17 15:45:45 2016 -0800 + + add test + + Signed-off-by: Victor Vieux + +commit ff262467686c5216798aa881d6371dd479ef80b6 +Author: Jeffrey Morgan +Date: Wed Feb 17 15:24:59 2016 -0800 + + Bump version to 1.10.1a + + Signed-off-by: Jeffrey Morgan + +commit 776c5ee299b614360cdbcc392a36dd8d15f385a0 +Merge: e9234d8aaf 6b8a2a0fe4 +Author: David Calavera +Date: Wed Feb 17 15:20:26 2016 -0800 + + Merge pull request #20382 from HuKeping/fixbug + + Bugfix: the actions when pull from notary should not contains `push` + +commit e9234d8aaf9061beeb9e138efe3d39a86d0ddea7 +Merge: 61aa025faf 8842011153 +Author: David Calavera +Date: Wed Feb 17 15:08:20 2016 -0800 + + Merge pull request #20411 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts + + Improve resilience of TestPullFromCentralRegistryImplicitRefParts + +commit 61aa025faf4f606606430d5cc821325504683e9b +Merge: 9a81f206b3 056013f97b +Author: David Calavera +Date: Wed Feb 17 15:03:42 2016 -0800 + + Merge pull request #20372 from tonistiigi/fix-empty-diffid + + Fix migration diffid atomic write + +commit 9a81f206b3f951e9e19e642b070fcab393fa3318 +Merge: 929f62e64d 58d98f8288 +Author: David Calavera +Date: Wed Feb 17 14:46:13 2016 -0800 + + Merge pull request #20408 from cpuguy83/use_pool_for_pubsub_wg + + Use pool for pubsub `Publish`'s waitgroups + +commit 39ca8e97ebe6b2d90ee4b2ef5c342cf7256b337f +Merge: 13ffd7de16 ccad86bb86 +Author: Victor Vieux +Date: Wed Feb 17 14:45:56 2016 -0800 + + Merge pull request #1832 from vieux/bump-1.1.1 + + bump 1.1.1 + +commit ccad86bb8646fbbd669dbe5d3cfc66c91b569409 +Author: Victor Vieux +Date: Wed Feb 17 14:08:19 2016 -0800 + + bump 1.1.1 + + Signed-off-by: Victor Vieux + +commit 13ffd7de1667c1dd8c990f2573ff4efca08f9a72 +Merge: d44bef5911 6ff0d29c9d +Author: Dongluo Chen +Date: Wed Feb 17 14:00:43 2016 -0800 + + Merge pull request #1829 from nishanttotla/1781-pass-host-config + + Passing HostConfig for /start endpoint + +commit 929f62e64d8760033ff6db4607c21a6431c46e4d +Merge: 647d3266ea 093dd39686 +Author: Alexander Morozov +Date: Wed Feb 17 13:59:00 2016 -0800 + + Merge pull request #20187 from cyphar/vendor-runc + + [carry 19752] vendor: update runc/libcontainer to v0.0.8 + +commit 647d3266eab1bf184f6c880c972a75c1b80a32cc +Merge: b26c21f704 eaf41b7410 +Author: David Calavera +Date: Wed Feb 17 13:50:17 2016 -0800 + + Merge pull request #20260 from Microsoft/jjh/testunit-pkggitutils + + Windows CI: Unit tests - port pkg\gitutils + +commit b26c21f7040c89b055d4fe135e45b3ab0b881ddb +Merge: 6b70964fea 55080fc03b +Author: David Calavera +Date: Wed Feb 17 13:45:43 2016 -0800 + + Merge pull request #20407 from tiborvass/backmerge-1.10.1 + + Backmerge 1.10.1 fixes to master + +commit 7ec902189d2a79876d949994f56b250fbb870d00 +Merge: 7c6316d146 3e6c3c05ce +Author: Nathan LeClaire +Date: Wed Feb 17 13:35:55 2016 -0800 + + Merge pull request #3069 from dgageot/3068-dns-proxy-mode + + VirtualBox: use dns proxy mode + +commit 884201115315abb0c7815e44e6728e590476aeb8 +Author: Aaron Lehmann +Date: Wed Feb 17 13:05:47 2016 -0800 + + Improve resilience of TestPullFromCentralRegistryImplicitRefParts + + Sometimes transient network issues will cause + TestPullFromCentralRegistryImplicitRefParts to end up pulling with the + v1 protocol. This violates the assumptions behind the test. To make the + test more robust, allow a few retries if any pull ends up using the v1 + protocol. + + Fixes #17214 + + Signed-off-by: Aaron Lehmann + +commit 4ce15476bd44b37d5a84ffebc8cde16a4ff2f798 +Author: Richard Scothern +Date: Wed Feb 17 10:42:34 2016 -0800 + + Extend authChallenger interface to remove type cast. + + Signed-off-by: Richard Scothern + +commit 6b70964fea1e2b7182ed8aef2577a8a74d8accd3 +Merge: 0cc9720c2a 7acd3987d3 +Author: Sebastiaan van Stijn +Date: Wed Feb 17 21:36:02 2016 +0100 + + Merge pull request #20375 from tiborvass/fix-yum-index-output + + Fix index generator for apt/yum packages + +commit 7c6316d1467a40548ba8a1dfca11dc476fbde65e +Merge: 256b711344 3ca3a4bf21 +Author: Nathan LeClaire +Date: Wed Feb 17 12:02:10 2016 -0800 + + Merge pull request #3073 from miqui/master + + add my name to driver contributor list + +commit 256b711344d4cc25fec4f1891844108d85f660d0 +Merge: 16440a89f9 c0d03b928e +Author: Nathan LeClaire +Date: Wed Feb 17 12:01:25 2016 -0800 + + Merge pull request #3072 from jloisel/patch-1 + + Fix: missing AMI for ap-northeast-2 + +commit 16440a89f95998363078dc554d6a2f1c1de8088e +Merge: dc5f1e9bdb 736ce7b6ab +Author: Nathan LeClaire +Date: Wed Feb 17 12:01:07 2016 -0800 + + Merge pull request #3074 from kojiromike/patch-1 + + Specify correct name for virtio net nic device + +commit 1952b5239205c82c278896ade6eb7041eb9de7eb +Author: Joffrey F +Date: Tue Feb 16 16:48:04 2016 -0800 + + Constraint build argument types. Numbers are cast into strings + + Numerical driver_opts are also valid and typecast into strings. + Additional config tests. + + Signed-off-by: Joffrey F + +commit 706062ad162f16e29eb70cd307ac477a49acc590 +Merge: d4f2f54cf8 4a09da43ea +Author: Joffrey F +Date: Wed Feb 17 11:52:18 2016 -0800 + + Merge pull request #2934 from dnephin/fix_volume_copy + + Fix copying of volumes by using the name of the volume + +commit 58d98f82888345a49f2e7660a0a5b35a5da891f5 +Author: Brian Goff +Date: Wed Feb 17 14:28:59 2016 -0500 + + Use pool for pubsub `Publish`'s waitgroups + + benchmark old ns/op new ns/op delta + BenchmarkPubSub-8 1036494796 1032443513 -0.39% + + benchmark old allocs new allocs delta + BenchmarkPubSub-8 2467 1441 -41.59% + + benchmark old bytes new bytes delta + BenchmarkPubSub-8 212216 187792 -11.51% + + Signed-off-by: Brian Goff + +commit 0cc9720c2a5ad97d5261d3754d4f6788d7276c33 +Merge: 11257dc729 2210b15e08 +Author: Alexander Morozov +Date: Wed Feb 17 11:28:42 2016 -0800 + + Merge pull request #20406 from aaronlehmann/integration-test-format-string + + Fix format string in TestExecApiCreateContainerPaused + +commit 55080fc03bed4dba85d5c5760363b92851ff728f +Author: Tonis Tiigi +Date: Tue Feb 9 09:44:33 2016 -0800 + + Don’t stop daemon on migration hard failure + + Also changes missing storage layer for container + RWLayer to a soft failure. + + Fixes #20147 + + Signed-off-by: Tonis Tiigi + (cherry picked from commit 2798d7a6a681aee8995e87c9b68128e54876d2b5) + +commit 50a498ea1c49cc3caa81bb9fb1417de387117e89 +Author: Tonis Tiigi +Date: Tue Feb 9 11:38:37 2016 -0800 + + Verify layer tarstream + + This adds verification for getting layer data out + of layerstore. These failures should only be possible + if layer metadata files have been manually changed + of if something is wrong with tar-split algorithm. + + Failing early makes sure we don’t upload invalid data + to the registries where it would fail after someone + tries to pull it. + + Signed-off-by: Tonis Tiigi + (cherry picked from commit e29e580f7fe628e936925681a4885d0b655bb151) + +commit 11257dc729546a61618c03009d510d8940afd897 +Merge: 7eed9a642e 337ee2aa63 +Author: Alexander Morozov +Date: Wed Feb 17 11:17:26 2016 -0800 + + Merge pull request #20403 from runcom/use-test-req + + integration-cli: use Devicemapper test requirement instead of checkin… + +commit 6ff0d29c9d10afbe0fd2ebab7f954c4c74e261e4 +Author: Nishant Totla +Date: Wed Feb 17 01:27:33 2016 -0800 + + Passing HostConfig for /start endpoint + + Signed-off-by: Nishant Totla + +commit 2210b15e08b8a81bb7c22b34036a5d0336fa04ef +Author: Aaron Lehmann +Date: Wed Feb 17 11:05:51 2016 -0800 + + Fix format string in TestExecApiCreateContainerPaused + + It was s% instead of %s. + + Signed-off-by: Aaron Lehmann + +commit 0c949dd3df573f7223b84843b54397c1bbd0fa55 +Author: Jeffrey Morgan +Date: Wed Feb 17 10:53:09 2016 -0800 + + Download a fixed version of innosetup in the Windows Dockerfile + + Signed-off-by: Jeffrey Morgan + +commit 5806f275bf3c5457240909f723645529e1b90e4c +Merge: 59a27406cd a048a4c8d5 +Author: Brian Bland +Date: Wed Feb 17 10:46:11 2016 -0800 + + Merge pull request #1469 from noxiouz/fix_storage_interface_desc + + Fix description of StorageDriver.WriteStream + +commit d4f2f54cf8bc8eea266b056a52d6b677fc0faeac +Merge: 89108f2a0f 471264239f +Author: Daniel Nephin +Date: Wed Feb 17 13:34:39 2016 -0500 + + Merge pull request #2936 from dnephin/update_docs_for_161 + + Update docs, fix broken link, use v2 compose file format + +commit 4a09da43eaf6a9a202b6b803a3824263d491746c +Author: Daniel Nephin +Date: Tue Feb 16 14:24:17 2016 -0500 + + Fix copying of volumes by using the name of the volume instead of the host path. + + Signed-off-by: Daniel Nephin + +commit 540b46e10f13bc6d1f154392fa5fa0943750deed +Merge: c760bcfb37 6a8bdd65ff +Author: Jeffrey Morgan +Date: Wed Feb 17 10:21:54 2016 -0800 + + Merge pull request #419 from embray/welcome-page + + Re-enable welcome page + +commit c760bcfb379c9b691e981545f799874af2b5bff0 +Merge: fc7b6f7e39 643b6a531b +Author: Jeffrey Morgan +Date: Wed Feb 17 10:13:27 2016 -0800 + + Merge pull request #417 from embray/whitespace-cleanup + + Whitespace cleanup: Replace all tabs with two spaces + +commit 59a27406cd5d5a75d46994a1c500533993baa3a4 +Merge: 5a1863b76e 5408d4e0a5 +Author: Aaron Lehmann +Date: Wed Feb 17 10:00:02 2016 -0800 + + Merge pull request #1468 from HuKeping/master + + Cleanup: remove unused log + +commit b31f4e977a4551ab9f656820785ea4bf85d38b81 +Merge: 90d774005b 31e32ec102 +Author: Riyaz Faizullabhoy +Date: Wed Feb 17 09:53:52 2016 -0800 + + Merge pull request #576 from HuKeping/typo + + Minor typo + +commit e790d9f47a56c64e1d78ba25975b89cc31e51e0a +Author: Aaron Turner +Date: Wed Feb 17 09:39:27 2016 -0800 + + Enable syncing time for VMWare Fusion guests + + By default, VMWare Fusion does not sync the guest OS's time to the host + and when running Fusion+docker-machine on a laptop the guest clock will + drift and not resync which can create a variety of problems (such as + authentication issues with AWS, etc) + + Signed-off-by: Aaron Turner + +commit 89108f2a0f831fe29ef5eab53e52d6a714b862bf +Merge: ec3af7d491 1512793b30 +Author: Joffrey F +Date: Wed Feb 17 09:42:41 2016 -0800 + + Merge pull request #2939 from AvdN/patch-2 + + for 1.6.0 the version value needs to be a string + +commit 337ee2aa63d54392321e2603c0f4e4f2f711dbc5 +Author: Antonio Murdaca +Date: Wed Feb 17 18:18:18 2016 +0100 + + integration-cli: use Devicemapper test requirement instead of checking strings + + Signed-off-by: Antonio Murdaca + +commit ffb9cbed7a74211a5a6f3ce8f6e284f0d0ffc696 +Author: David Gageot +Date: Wed Feb 17 14:05:25 2016 +0100 + + FIX #3056 ls timeout when instance is stopped + + Signed-off-by: David Gageot + +commit 736ce7b6ab6a13f2e6561b5d274edb4a176a433b +Author: Michael A. Smith +Date: Wed Feb 17 11:27:06 2016 -0500 + + Specify correct name for virtio net nic device + + With VirtualBox 5.0.14r105127, 'virtio-net' is not a valid name for the option. The correct option appears to be 'virtio'. + + Signed-off-by: Michael A. Smith + +commit 3ca3a4bf219deb3f90ff11ae662c9554b0ae0ba3 +Author: Miguel Quintero +Date: Wed Feb 17 11:15:55 2016 -0500 + + add my name + + Signed-off-by: Miguel Quintero + +commit 6a8bdd65ff894d486823acb167fe7bda97167d56 +Author: Erik M. Bray +Date: Wed Feb 17 17:00:07 2016 +0100 + + Re-enable welcome page, which was not displaying unless this setup directive is explicitly set + + Signed-off-by: Erik M. Bray + +commit c0d03b928eea4fb6cc5110753d5744e5a635fd6d +Author: Jerome Loisel +Date: Wed Feb 17 16:54:14 2016 +0100 + + Fix: missing AMI for ap-northeast-2 + + Ubuntu Server 14.04 LTS (HVM), EBS General Purpose (SSD) Volume Type. Support available from Canonical (http://www.ubuntu.com/cloud/services ). + + Signed-off-by: jloisel + +commit dc5f1e9bdba88d780b9af11127d8f46aafa16631 +Merge: 1eaf5a464f 4c9879dcd5 +Author: Jean-Laurent de Morlhon +Date: Wed Feb 17 16:43:43 2016 +0100 + + Merge pull request #3066 from dgageot/3065-improve-vtx-check + + FIX #3065 Improve VT-X check + +commit 093dd39686d5e7c562dfdf337bc7545f51d5abf4 +Author: Aleksa Sarai +Date: Tue Jan 26 18:05:13 2016 -0500 + + vendor: update runc/libcontainer + + This includes all of v0.0.8 as well as a few bug fixes that popped up + during vendoring. + + Signed-off-by: Aleksa Sarai + +commit 7eed9a642ee584dff2faae0a4dc1e4ba04f3c3be +Merge: 2a9e6ace70 bc195e1558 +Author: Brian Goff +Date: Wed Feb 17 09:41:31 2016 -0500 + + Merge pull request #20396 from cyphar/remove-fsnotify + + remove fsnotify + +commit 3e6c3c05ced0e8e798b5e61a5af193f63fa4e947 +Author: David Gageot +Date: Wed Feb 17 14:30:45 2016 +0100 + + FIX #3068 DNS Proxy mode + + Signed-off-by: David Gageot + +commit 643b6a531bc98e92fac06fcf475c3348d039fd9a +Author: Erik M. Bray +Date: Wed Feb 17 14:54:28 2016 +0100 + + whitespace cleanup: Replace all tabs with two spaces + + Signed-off-by: Erik M. Bray + +commit bc195e1558d3091dccb209f1bb35115248886c7a +Author: Aleksa Sarai +Date: Thu Feb 18 00:12:53 2016 +1100 + + vendor: remove fsnotify + + It is not longer used by us, so hack/vendor.sh complains because it + removes unused files (but also complains about removing an entire + vendored project). + + Signed-off-by: Aleksa Sarai + +commit ee99b5f2e96aafa982487aadbb78478898ae0c71 +Author: Aleksa Sarai +Date: Thu Feb 18 00:11:43 2016 +1100 + + pkg: remove unused filenotify + + pkg/filenotify isn't used anymore and it causes problems with + hack/vendor.sh (nothing uses it, so hack/vendor.sh will remove the + vendored code). + + Signed-off-by: Aleksa Sarai + +commit 4c9879dcd590eae78cca7afc0c2e31a4c33b176d +Author: David Gageot +Date: Wed Feb 17 13:35:47 2016 +0100 + + FIX #3065 Improve VT-X check + + Signed-off-by: David Gageot + +commit a048a4c8d5fbdf0aaf33374192e8915a0ad3350e +Author: Anton Tiurin +Date: Wed Feb 17 13:53:43 2016 +0300 + + Fix description of StorageDriver.WriteStream + + Offset can be more than CurrentSize as long as this case is checked + by DriverSuite.testContinueStreamAppend. + + Signed-off-by: Anton Tiurin + +commit 3dff7aa96a2ede92631828a54aae0f26a71f9efc +Author: Sverre Boschman +Date: Wed Feb 17 08:52:38 2016 +0100 + + Testcase start container with hostconfig + + Signed-off-by: Sverre Boschman + +commit 60ffd6c880024c5ab3ad96dc79b01dccd23dd766 +Author: Kai Qiang Wu(Kennan) +Date: Wed Feb 17 08:59:53 2016 +0000 + + Make volume ls output order + + Fixes: #20384 + Add order support for volume ls to make it easy + to external users to consume. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 1512793b30de1c84bff319070c4c4d7f65fd49db +Author: Anthon van der Neut +Date: Wed Feb 17 09:56:49 2016 +0100 + + for 1.6.0 the version value needs to be a string + + After conversion a file would immediately not load in docker-compose 1.6.0 with the message: + + ERROR: Version in "./converted.yml" is invalid - it should be a string. + + Signed-off-by: Anthon van der Neut anthon@mnt.org + Signed-off-by: Anthon van der Neut + +commit 2a9e6ace706999be3c0d36f1f94ce20cc3ad33b5 +Merge: 5c78515430 899335022f +Author: Vincent Demeester +Date: Wed Feb 17 08:55:02 2016 +0100 + + Merge pull request #20385 from WeiZhang555/fix-docs + + Fix docs + +commit 31e32ec10204dacc40253a408ee62b0645910d33 +Author: HuKeping +Date: Wed Feb 17 15:13:00 2016 +0800 + + Minor typo + + Signed-off-by: Hu Keping + +commit d44bef59119b582d75577a15c6eda9ff38238017 +Merge: 204a51c805 c318a6f48a +Author: Nishant Totla +Date: Tue Feb 16 22:37:33 2016 -0800 + + Merge pull request #1825 from abronan/add_report + + doc: add go report badge on README.md + +commit 5c78515430860ad822e016cc5cd5d5ff3dd6a21c +Merge: bebad9e5c1 05002c2501 +Author: Phil Estes +Date: Tue Feb 16 22:29:49 2016 -0800 + + Merge pull request #20366 from LK4D4/socks_proxy + + Add support for forwarding Docker client through SOCKS proxy + +commit 5408d4e0a5e411aa41feb0190d7b2eca5f83e9b7 +Author: HuKeping +Date: Wed Feb 17 14:11:20 2016 +0800 + + Cleanup: remove unused log + + Signed-off-by: Hu Keping + +commit c318a6f48a84f6e04e274d79f94a538c7cc2e732 +Author: Alexandre Beslic +Date: Tue Feb 16 21:45:11 2016 -0800 + + doc: add go report badge on README.md + + Signed-off-by: Alexandre Beslic + +commit 1db128778d9e9c45c0eea566af29e513736188b4 +Author: David Lawrence +Date: Tue Feb 16 20:44:48 2016 -0800 + + completely removing KeyDB + Signed-off-by: David Lawrence (github: endophage) + +commit 838ed1866bf285759efdc01a97ae837f0f1c326a +Author: Kai Qiang Wu(Kennan) +Date: Wed Feb 17 03:11:37 2016 +0000 + + Make network ls output order + + Fixes: #20328 + We sort network ls output with incresing order, + it may make output more easy to consume for users. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 899335022f08710996b43077c736421e06c583e9 +Author: Zhang Wei +Date: Wed Feb 17 11:55:56 2016 +0800 + + Fix docs + + Fix wrong descriptions in docs + + Signed-off-by: Zhang Wei + +commit bebad9e5c1f91bfbeea5a38211968e2f12ea1e43 +Merge: eae59c4226 46e41dc2f8 +Author: Arnaud Porterie +Date: Tue Feb 16 19:26:13 2016 -0800 + + Merge pull request #20379 from crosbymichael/exec-test + + Require linux for TestExecAfterContainerRestart + +commit 7acd3987d3d55e950ada47b41bb89ccb12b539cb +Author: Tibor Vass +Date: Tue Feb 16 17:51:55 2016 -0500 + + Fix index generator for apt/yum packages + + Some @_@ characters could become visible if filename is longer than 44 + characters. + + Signed-off-by: Tibor Vass + +commit 0fe31306d1c1c93c4ef33654f7a37932296cf8a6 +Author: Brian Goff +Date: Tue Feb 16 21:10:45 2016 -0500 + + Fix issue with multiple volume refs with same name + + Signed-off-by: Brian Goff + +commit 6b8a2a0fe47b218aaba3050c1f376941e4773313 +Author: HuKeping +Date: Wed Feb 17 10:36:09 2016 +0800 + + Bugfix: the actions when pull from notary should not contains `push` + + Signed-off-by: Hu Keping + +commit 5a1863b76e853ec1fa8d621f95900b69911b3cf5 +Merge: b9907c4853 c770f28f04 +Author: Brian Bland +Date: Tue Feb 16 18:14:34 2016 -0800 + + Merge pull request #1467 from BrianBland/s3awsFixTest + + [driver/s3aws] Fix TestStorageClass + +commit c770f28f046f176b0cc0415202235b420bcf960f +Author: Brian Bland +Date: Tue Feb 16 17:48:07 2016 -0800 + + [driver/s3aws] Fix TestStorageClass + + Fixes bug in TestStorageClass for s3aws driver where the "standard" file + was checked for reduced-redundnancy storage. + + Signed-off-by: Brian Bland + +commit 46e41dc2f86e27ef502c2b1a679ab95d0426c8c3 +Author: Michael Crosby +Date: Tue Feb 16 17:50:50 2016 -0800 + + Require linux for TestExecAfterContainerRestart + + All the other exec tests require linux except this one and it is + causing failures in the TP4 test runs. + + ref: + https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1076/console + + Signed-off-by: Michael Crosby + +commit 90d774005b81ee76247b58b4e8297ed2383f87de +Merge: 071976b47d 36c33e6732 +Author: Diogo Mónica +Date: Tue Feb 16 17:45:45 2016 -0800 + + Merge pull request #575 from docker/yubikey-test-fix + + Update integration test to exclude yubikeys from importing/exporting non-root keys + +commit 071976b47d378b3323b6b8c1ecfccfb1851926f1 +Merge: 9010989a20 4044a37613 +Author: Diogo Mónica +Date: Tue Feb 16 17:45:10 2016 -0800 + + Merge pull request #574 from docker/misspell + + Misspell in Makefile and circleci + +commit 36c33e67327282cd8b261263de68c6726e65eddf +Author: Riyaz Faizullabhoy +Date: Tue Feb 16 17:10:28 2016 -0800 + + Update integration test to exclude yubikeys from importing/exporting non-root + + Signed-off-by: Riyaz Faizullabhoy + +commit eae59c4226bb94027ed0e51c1899479c44a4cc97 +Merge: c795d0bab9 4928121992 +Author: Alexander Morozov +Date: Tue Feb 16 15:23:19 2016 -0800 + + Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow + + Fix flaky TestLogsSinceFutureFollow + +commit c795d0bab9057fbf16ca70349bcc37e244be33b9 +Merge: c66d9f5627 3fe60bbf95 +Author: David Calavera +Date: Tue Feb 16 15:01:17 2016 -0800 + + Merge pull request #19689 from cednation/etwlogs + + Windows: Add ETW logging driver plug-in + +commit bbd728af162651557196e8552cb86e55b6e60e8c +Author: Carol Fager-Higgins +Date: Fri Feb 12 11:49:10 2016 -0800 + + removed tutorial repo + + Signed-off-by: Carol Fager-Higgins + +commit 4044a3761300e83b01f3c8021ab09be3a3298975 +Author: Riyaz Faizullabhoy +Date: Tue Feb 16 14:36:57 2016 -0800 + + ignore git files in misspell + + Signed-off-by: Riyaz Faizullabhoy + +commit c66d9f56279237bc0ff9d8fb84896de4193247f8 +Merge: 0f5624d374 f982f08c50 +Author: Sebastiaan van Stijn +Date: Tue Feb 16 23:10:47 2016 +0100 + + Merge pull request #20373 from bastiaanb/fix/docs-trailing-slash-in-dockerfile-copy-example + + add missing trailing slash in ADD and COPY /absoluteDir examples. + +commit 0f5624d37433cd93eb6a19f8d8e513ad399d6d47 +Merge: 8545fdc6dd e1c2eb0d35 +Author: Alexander Morozov +Date: Tue Feb 16 14:09:46 2016 -0800 + + Merge pull request #20367 from tonistiigi/fix-import-gzip + + Fix docker import on compressed data + +commit 8545fdc6ddd7010a4134062cf99444e586c3c99e +Merge: 80187df257 1e0f1ec525 +Author: Alexander Morozov +Date: Tue Feb 16 13:55:48 2016 -0800 + + Merge pull request #19498 from mountkin/refactor-jsonfilelog-reader + + use pubsub instead of filenotify to follow json logs + +commit 4258ebeb3414bf36664242fe422e65580ac94ca6 +Author: Riyaz Faizullabhoy +Date: Tue Feb 16 13:55:14 2016 -0800 + + add to circle ci + + Signed-off-by: Riyaz Faizullabhoy + +commit f982f08c5097e25b901152289faf960d557c130e +Author: Bastiaan Bakker +Date: Tue Feb 16 22:36:51 2016 +0100 + + add missing trailing slash in ADD and COPY /absoluteDir examples. According to the specs they are mandatory. + + Signed-off-by: Bastiaan Bakker + +commit a0cd58655fba00ef6c2bb5cce171697277b7e722 +Author: Riyaz Faizullabhoy +Date: Tue Feb 16 13:50:20 2016 -0800 + + add misspell target to makefile + + Signed-off-by: Riyaz Faizullabhoy + +commit 4928121992cbf3f40ec86909526534d90eb6482e +Author: Arnaud Porterie +Date: Tue Feb 16 13:49:44 2016 -0800 + + Fix flaky TestLogsSinceFutureFollow + + Signed-off-by: Arnaud Porterie + +commit 471264239f4c9e6b80f8db06dae36303bea032fc +Author: Daniel Nephin +Date: Tue Feb 16 16:38:31 2016 -0500 + + Update guides to use v2 config format. + + Signed-off-by: Daniel Nephin + +commit 4de12ad7a1408323d14271c3c39b238b36666494 +Author: Daniel Nephin +Date: Tue Feb 16 16:34:31 2016 -0500 + + Update link to docker volume create docs. + + Signed-off-by: Daniel Nephin + +commit 5931f93134da4e28e1a7506e8ca243ddd3834c9c +Author: Riyaz Faizullabhoy +Date: Tue Feb 16 13:36:57 2016 -0800 + + fix current typos + + Signed-off-by: Riyaz Faizullabhoy + +commit 3fe60bbf95b60f1a1e847a48e1c9b9730e570dff +Author: Cedric Davies +Date: Mon Jan 25 14:49:52 2016 -0800 + + Windows: Add ETW logging driver plug-in + + Signed-off-by: Cedric Davies + +commit 80187df25708782db20846e63aef7ddb0419c7cf +Merge: d445eb4808 6a3176d4fe +Author: David Calavera +Date: Tue Feb 16 12:57:57 2016 -0800 + + Merge pull request #19986 from vishh/expose-root-dir + + Expose docker's root directory by default as part of `docker info`. + +commit d445eb480899db81ff07c1936ae5762cc71d8b77 +Merge: 15d7fa77e1 443ada574d +Author: Jess Frazelle +Date: Tue Feb 16 12:15:20 2016 -0800 + + Merge pull request #20353 from rhatdan/selinux + + Only relabel /var/lib/docker on initial install + +commit 56af60ad24302a721582e1a2731d55561464d0b9 +Author: Richard Scothern +Date: Wed Feb 10 18:07:28 2016 -0800 + + To avoid any network use unless necessary, delay establishing authorization + challenges with the upstream until any proxied data is found not to be local. + + Implement auth challenges behind an interface and add to unit tests. Also, + remove a non-sensical unit test. + + Signed-off-by: Richard Scothern + +commit 056013f97b504979c1fe3fa36aff1ef66d42ad42 +Author: Tonis Tiigi +Date: Tue Feb 16 11:43:23 2016 -0800 + + Fix migration diffid atomic write + + Fixes #20267 + + Signed-off-by: Tonis Tiigi + +commit ec3af7d49121500dca16ece8da23e1b62591c370 +Merge: b8c35e1298 8af0a0f85b +Author: Joffrey F +Date: Tue Feb 16 11:51:14 2016 -0800 + + Merge pull request #2920 from londoncalling/docs-examples + + update to description of files generated from examples, which are no … + +commit 8af0a0f85bb278691cc25c6d4c8f28cf7bc34784 +Author: Victoria Bialas +Date: Sun Feb 14 19:52:27 2016 -0800 + + update to description of files generated from examples, which are no longer owned by root w/new release + + updated descriptions of changing file ownership and images per Seb's comments + + fixed line wraps + + fixed line breaks per Joffrey's comments + + Signed-off-by: Victoria Bialas + +commit e1c2eb0d35460c2de9cbf4a70439afa63b9d2be1 +Author: Tonis Tiigi +Date: Tue Feb 16 11:19:23 2016 -0800 + + Fix docker import on compressed data + + Fixes #20296 + + Signed-off-by: Tonis Tiigi + +commit b9907c4853bc7cb46b7dd30077f59a8bf3e41a80 +Merge: d126752d97 1319be2cae +Author: Brian Bland +Date: Tue Feb 16 11:19:15 2016 -0800 + + Merge pull request #1385 from BrianBland/s3UseAWSLibrary + + [driver/s3] Use aws/aws-sdk-go instead of goamz for s3 driver and cloudfront + +commit e8f569b3246b3ce4e765b0aafe53b6d70d12a2d6 +Author: David Calavera +Date: Tue Feb 16 13:58:24 2016 -0500 + + Remove all docker debugging knowledge from the server. + + It should be explicitly told whether to enable the profiler or not. + + Signed-off-by: David Calavera + +commit 05002c2501ac549b3cf677ab04d0f571cc456360 +Author: Alexander Morozov +Date: Tue Feb 16 10:05:05 2016 -0800 + + Add support for forwarding Docker client through SOCKS proxy + + Signed-off-by: Alexander Morozov + +commit d126752d975cf3dfe6adfd5d42f0fffa7fd1ea5e +Merge: bf991fec01 0758653b42 +Author: Richard Scothern +Date: Tue Feb 16 10:49:18 2016 -0800 + + Merge pull request #1462 from liuchang23/master + + enhance log message of oss driver + +commit 6a3176d4fee3e747ecb6b2d27ab2eb68471f3f8f +Author: Vishnu kannan +Date: Wed Feb 3 18:10:48 2016 -0800 + + Expose docker's root directory by default as part of `docker info`. + + Signed-off-by: Vishnu kannan + +commit 98620458e31a676325f4d21a28410b0d3a69653a +Author: Derek McGowan +Date: Fri Feb 12 17:15:19 2016 -0800 + + Add credential authenticator interface + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 15d7fa77e1145d52bd9ed5cfe934c1924a9994b2 +Merge: 556b1369de 284d9d451e +Author: Jess Frazelle +Date: Tue Feb 16 10:11:08 2016 -0800 + + Merge pull request #20305 from cyphar/fix-apparmor-version-checks + + Fix apparmor version checks + +commit b46391ee8f2f331656a3aecfad4954b23d58a233 +Author: Riyaz Faizullabhoy +Date: Fri Feb 12 13:51:07 2016 -0800 + + Remove RoleWithKeys + + Signed-off-by: Riyaz Faizullabhoy + +commit 16effc66c028a7800096ed92174ca4bceba229ad +Author: Alexander Morozov +Date: Tue Feb 16 10:05:01 2016 -0800 + + Vendor new engine-api and go-connections + + There is SOCKS5 proxy support in new versions. + + Signed-off-by: Alexander Morozov + +commit 556b1369de0a776918cb38a0177d219888005705 +Merge: 48d4e2d953 05b05a358f +Author: David Calavera +Date: Tue Feb 16 09:55:23 2016 -0800 + + Merge pull request #20308 from mountkin/fix-20069 + + request a new token before downloading each layer + +commit cd06890ff0ff773ed516c0f958558f78f1985ee8 +Merge: 9c7f0f826a 4a3d4c3a03 +Author: Sebastiaan van Stijn +Date: Tue Feb 16 18:32:25 2016 +0100 + + Merge pull request #57 from thaJeztah/add-leadership + + Add docker/leadership repo + +commit 4a3d4c3a036fc105b0112c2ddf7ab14d5a2a37cb +Author: Sebastiaan van Stijn +Date: Tue Feb 16 17:14:43 2016 +0100 + + Add docker/leadership repo + + Signed-off-by: Sebastiaan van Stijn + +commit 204a51c805aae59e8f50c25f007f412229e3aa2f +Merge: ad232fcec6 b50c9036dd +Author: Nishant Totla +Date: Tue Feb 16 08:45:37 2016 -0800 + + Merge pull request #1822 from thaJeztah/fix-maintainers-file + + Fix MAINTAINERS file + +commit b8c35e1298712c328c43deb298311c335ec4321e +Merge: 74dc1b1411 643166ae98 +Author: moxiegirl +Date: Tue Feb 16 08:09:49 2016 -0800 + + Merge pull request #2884 from moxiegirl/remove-tutorials + + Updating Dockerfile + +commit b50c9036dd63cbecb4108cc590bf40b82dee54a6 +Author: Sebastiaan van Stijn +Date: Tue Feb 16 17:04:10 2016 +0100 + + Fix MAINTAINERS file + + Signed-off-by: Sebastiaan van Stijn + +commit 69d015471853fe3cdf15f57267d3f0a7cf72114f +Author: Anthon van der Neut +Date: Tue Feb 16 14:46:47 2016 +0100 + + reset colors after warning + + If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`. + Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal. + + Signed-off-by: Anthon van der Neut + +commit 443ada574da41f20cdd3708e2dee3091dd363afb +Author: Dan Walsh +Date: Tue Feb 16 08:27:59 2016 -0500 + + Only relabel /var/lib/docker on initial install + + Signed-off-by: Dan Walsh + +commit 48d4e2d953fbf5bbdc46cfdb1405ec7c099d016d +Merge: 3004c61865 5b62b71093 +Author: Sebastiaan van Stijn +Date: Tue Feb 16 12:52:30 2016 +0100 + + Merge pull request #20352 from glensc/x-bit + + add execute bit to contrib/report-issue.sh + +commit 5b62b71093283e6e7903870cc4bd4293d45e9630 +Author: Elan Ruusamäe +Date: Tue Feb 16 12:53:40 2016 +0200 + + add execute bit to contrib/report-issue.sh + + Signed-off-by: Elan Ruusamäe + +commit 3004c618650c44a5832e24ee1cf8508fbeb48950 +Merge: 957bdd9df9 765880a46a +Author: Sebastiaan van Stijn +Date: Tue Feb 16 11:16:29 2016 +0100 + + Merge pull request #20341 from MichaelCurrie/patch-1 + + Fix typo + +commit 957bdd9df901ea3de9f7fdf28b0bdc74a040fadd +Merge: b16536aeb5 c33cdf9ee3 +Author: Sebastiaan van Stijn +Date: Tue Feb 16 11:14:57 2016 +0100 + + Merge pull request #20343 from HackToday/fixpara + + Fix the typo + +commit 9ad51afdb513b57d4cee10f625e59a9b4527c333 +Merge: 24330408e9 902fb2ec66 +Author: Alexandre Vázquez +Date: Tue Feb 16 09:56:47 2016 +0100 + + Merge branch 'master' into issue-1369 + + # Conflicts: + # src/browser.js + +commit c33cdf9ee3ece0358f828c7ac8f6367c3414e67a +Author: Kai Qiang Wu(Kennan) +Date: Tue Feb 16 06:59:56 2016 +0000 + + Fix the typo + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit c3c24be66bda44f970abcdad10af2ed82c92f002 +Author: Riyaz Faizullabhoy +Date: Fri Feb 12 11:39:40 2016 -0800 + + remove path restriction from getting delegations, use in future visitor + + Signed-off-by: Riyaz Faizullabhoy + +commit 10865d23109229843e9e77919aadbe7efcfc39b0 +Author: Riyaz Faizullabhoy +Date: Fri Feb 12 11:10:17 2016 -0800 + + addressing review comments + + Signed-off-by: Riyaz Faizullabhoy + +commit 1d9e37568095b902cfb7e1743480154d560aa88d +Author: Riyaz Faizullabhoy +Date: Thu Feb 11 13:47:35 2016 -0800 + + add delegation role methods, more tests + + Signed-off-by: Riyaz Faizullabhoy + +commit affd18f3d5b9b3f9f52376d77b166f111a9178f6 +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 20:32:34 2016 -0800 + + limit role methods + + Signed-off-by: Riyaz Faizullabhoy + +commit dcbdc258c1f5948232f31716c37ee28c6cbe40f7 +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 18:23:51 2016 -0800 + + update the path validation + + Signed-off-by: Riyaz Faizullabhoy + +commit d379f9918c9f45f37dc0b6ae584a5c8ff624d904 +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 15:13:32 2016 -0800 + + add GetBaseRole and GetDelegationRole with path validation + + Signed-off-by: Riyaz Faizullabhoy + +commit a754574b85b0dc669ee8e1e8d4688fba1f806cda +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 14:17:32 2016 -0800 + + add stronger role types for internal use + + Signed-off-by: Riyaz Faizullabhoy + +commit 5a2baa13698cc9fb9c942c325cb2a2457bd08b59 +Author: Dongjoon Hyun +Date: Mon Feb 15 16:04:35 2016 -0800 + + Fix typos in comments of src/utils. + + Signed-off-by: Dongjoon Hyun + +commit 0758653b4259d0250dc950ab7219d386676d0a03 +Author: liuchang0812 +Date: Tue Feb 16 11:42:09 2016 +0800 + + fix gofmt + + Signed-off-by: liuchang0812 + +commit dbba9cf299cedc464ad6e0cd13a439feed7e6f6e +Author: liuchang0812 +Date: Tue Feb 16 11:17:09 2016 +0800 + + closes #1461, enhance log message of oss driver + + Signed-off-by: liuchang0812 + +commit 765880a46a560552bb5a1b5d600199a064d7cee8 +Author: Michael Currie +Date: Mon Feb 15 19:15:59 2016 -0700 + + Fix typo + + Signed-off-by: MichaelCurrie + +commit b16536aeb519e8d449a8231606b49520a160e44a +Merge: e5a79c5d99 8779a4ca62 +Author: Vincent Demeester +Date: Mon Feb 15 22:32:31 2016 +0100 + + Merge pull request #20336 from robert-wallis/docs-run-typo + + Fixing mismatched network name. + +commit 8779a4ca62db8b64c5016be20456d5b2e5a407e9 +Author: Robert Wallis +Date: Mon Feb 15 13:17:05 2016 -0800 + + Fixing mismatched network name. + Using `my-net` to be consistent with: + https://docs.docker.com/engine/reference/run/ + + Signed-off-by: Robert Wallis + +commit adb2e3fedc76fbaecce0d75a29aa0d419be5c4c2 +Author: Dan Walsh +Date: Mon Feb 15 14:52:10 2016 -0500 + + /dev/mqueue should never be mounted readonly + + If user specifies --read-only flag it should not effect /dev/mqueue. + This is causing SELinux issues in docker-1.10. --read-only blows up + on SELinux enabled machines. Mounting /dev/mqueue read/only would also + blow up any tool that was going to use /dev/mqueue. + + Signed-off-by: Dan Walsh + +commit e5a79c5d996f3b5f55ef3b52cdce0fb80463cae8 +Merge: 46a61b7240 7da5784b10 +Author: Vincent Demeester +Date: Mon Feb 15 16:58:49 2016 +0100 + + Merge pull request #20330 from thaJeztah/docs-typos + + Fix documentation typos + +commit 7da5784b10a9f085af98984e6e69e733e55ddbf5 +Author: Sebastiaan van Stijn +Date: Mon Feb 15 15:46:56 2016 +0100 + + Fix documentation typos + + Signed-off-by: Sebastiaan van Stijn + +commit 1e0f1ec52543bc83099fb91cd34dca4d38100e6f +Author: Shijiang Wei +Date: Fri Jan 29 13:08:20 2016 +0800 + + optimize pubsub.Publish function + + Signed-off-by: Shijiang Wei + +commit b1594c59f5e0d1ac898eacde8d91b1ba33c2b626 +Author: Shijiang Wei +Date: Thu Jan 21 00:28:10 2016 +0800 + + use pubsub instead of filenotify to follow json logs + + inotify event is trigged immediately there's data written to disk. + But at the time that the inotify event is received, the json line might + not fully saved to disk. If the json decoder tries to decode in such + case, an io.UnexpectedEOF will be trigged. + We used to retry for several times to mitigate the io.UnexpectedEOF error. + But there are still flaky tests caused by the partial log entries. + + The daemon knows exactly when there are new log entries emitted. We can + use the pubsub package to notify all the log readers instead of inotify. + + Signed-off-by: Shijiang Wei + + try to fix broken test. will squash once tests pass + + Signed-off-by: Shijiang Wei + +commit 284d9d451e93baff311b501018cae2097f76b134 +Author: Aleksa Sarai +Date: Sun Feb 14 18:06:31 2016 +1100 + + apparmor: use correct version for ptrace denial suppression + + Ubuntu ships apparmor_parser 2.9 erroniously as "2.8.95". Fix the + incorrect version check for >=2.8, when in fact 2.8 deosn't support the + required feature. + + Signed-off-by: Aleksa Sarai + +commit 4bf7a84c969b9309b0534a61af55b8bb824acc0a +Author: Aleksa Sarai +Date: Sun Feb 14 18:04:16 2016 +1100 + + apparmor: fix version checks to work properly + + Using {{if major}}{{if minor}} doesn't work as expected when the major + version changes. In addition, this didn't support patch levels (which is + necessary in some cases when distributions ship apparmor weirdly). + + Signed-off-by: Aleksa Sarai + +commit 46a61b72402e0c8766efce1b66036af15cbb6f99 +Merge: 389a38e1e5 5fc0de2688 +Author: Vincent Demeester +Date: Sun Feb 14 10:35:27 2016 +0100 + + Merge pull request #20257 from Microsoft/10662-TestBuildCI6 + + Sixth set of TestBuild CI Enabling for Windows + +commit 05b05a358f80b49901a4714b98c2cdb1348c5874 +Author: Shijiang Wei +Date: Sun Feb 14 16:55:46 2016 +0800 + + request a new token before downloading each layer + + Fixes #20069 + + Signed-off-by: Shijiang Wei + +commit 5fc0de2688da4fbe010980a832d8f73bff4be444 +Author: Darren Stahl +Date: Thu Feb 11 16:20:27 2016 -0800 + + Sixth set of TestBuild CI Enabling for Windows + + Signed-off-by: Darren Stahl + +commit 1eaf5a464f44066e57628218995c8b7d80c825cd +Merge: a517ef0c42 7e201c4005 +Author: Jean-Laurent de Morlhon +Date: Sat Feb 13 14:10:44 2016 -0800 + + Merge pull request #3020 from mssola/swarm-experimental + + Added a flag to enable experimental Swarm features + +commit 389a38e1e5145e89dd0f36cc232d5d7c269aed3b +Merge: 7d9532552b 2541a23c3a +Author: Brian Goff +Date: Sat Feb 13 15:41:52 2016 -0500 + + Merge pull request #20281 from FrederikNS/master + + Fish tab completion lists all containers on "docker rm -f" + +commit 2204b642ef2ef6d666f970a971bd4f1ed6080715 +Author: Chia-liang Kao +Date: Sun Feb 14 01:57:04 2016 +0800 + + Quote argv as they are + + Signed-off-by: Chia-liang Kao + +commit e6a675f338a895d93208d1f291d1cee901bf0e32 +Author: Chia-liang Kao +Date: Sun Feb 14 01:43:06 2016 +0800 + + Detect -t and -i separately + + Signed-off-by: Chia-liang Kao + +commit dd55415d4f1738fb2a9b76ffb9a9d333ae0d3332 +Author: Chia-liang Kao +Date: Sun Feb 14 01:42:51 2016 +0800 + + Don't mount pwd if it is / + + Signed-off-by: Chia-liang Kao + +commit 7d9532552b433581253898052849524500a21ff5 +Merge: 5a9a435d40 c80b36c938 +Author: Vincent Demeester +Date: Sat Feb 13 14:21:27 2016 +0100 + + Merge pull request #20280 from rhuss/patch-2 + + Add network mode `none` to list of possible values + +commit 7e201c4005d171e8ecae03d6bb5f9559f56e725d +Author: Miquel Sabaté Solà +Date: Sat Feb 13 12:21:20 2016 +0100 + + Added a flag to enable experimental Swarm features + + The `create` command now has the `--swarm-experimental` boolean flag, that + tells the Swarm provisioner to enable experimental features in Swarm. + + Fixes #2861 + + Signed-off-by: Miquel Sabaté Solà + +commit c80b36c938306ef9cc9ad6865cfc251a694f59aa +Author: Roland Huß +Date: Fri Feb 12 18:23:46 2016 +0100 + + Extended explanation of NetworkMode's value + + * Add network mode `none` to list of possible values for API version 1.15 - 1.23 + * For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name + + Signed-off-by: Roland Huß + +commit 5a9a435d40fb238b627c9e31858b6e31ae38ec53 +Merge: b384fd6b1b a252516ec1 +Author: Antonio Murdaca +Date: Sat Feb 13 09:26:11 2016 +0100 + + Merge pull request #20290 from calavera/fix_stop_signal_merge + + Inherit StopSignal from Dockerfile. + +commit f27b5dda4afc0b0a278eb5379d17dfc3533c5397 +Author: Tibor Vass +Date: Fri Feb 12 11:56:11 2016 -0500 + + Switch Dockerfile to debian:jessie + + Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q + flag and redirecting to /dev/null instead. + + Add net-tools for ifconfig, because some tests rely on ifconfig. + + Harmonize all Dockerfiles in this direction. + + Signed-off-by: Tibor Vass + +commit b384fd6b1b2a379d857b4dc9971e441fe8aa5f37 +Merge: beade8276a b8a9812b92 +Author: Jess Frazelle +Date: Fri Feb 12 20:36:57 2016 -0500 + + Merge pull request #20141 from cmehay/power8 + + Build golang 1.6 in power8 Dockerfile + +commit a517ef0c42f43218dfd453d28ce964a8be3f503f +Merge: 87a659efb3 7e7c6b5ee4 +Author: Nathan LeClaire +Date: Fri Feb 12 17:36:22 2016 -0800 + + Merge pull request #3054 from londoncalling/carry-pr-3047 + + Start local machines on startup (fixes #2857) + +commit 7e7c6b5ee4194cc5a859437aa7b35fe90c6b36c8 +Author: Caio Fernando Bertoldi Paes de Andrade +Date: Fri Feb 12 08:38:58 2016 -0200 + + Start local machines on startup (fixes #2857) + + Signed-off-by: Caio Fernando Bertoldi Paes de Andrade + + Carries and closes #3047 + + modified per Nathan's comments, missed it first time round + + modified wording per Seb's comments + + Signed-off-by: Victoria Bialas + +commit beade8276a661f64775dca9aaeee061d1702edfb +Merge: 79edcc5172 477e1fc989 +Author: Tianon Gravi +Date: Fri Feb 12 16:30:00 2016 -0800 + + Merge pull request #20293 from jfrazelle/fix-release-script + + dont clean the db + +commit ad232fcec6f18960b6b199b4384dbe46c421a384 +Merge: 1fab0aed5a bfc556613b +Author: Victor Vieux +Date: Fri Feb 12 16:26:00 2016 -0800 + + Merge pull request #1813 from dongluochen/enginePanic + + Lock engine to prevent read/write conflict on engine `containers` map + +commit 3fc4e4cdc860d47baf24facf0e2d3751d2de6b26 +Author: Derek McGowan +Date: Fri Feb 12 14:35:38 2016 -0800 + + Add resource scope list definition + + Allow providing multiple scopes in a single scope string + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 1319be2cae0ef8d8040dbc55dd186a8b70fb638a +Author: Brian Bland +Date: Thu Jan 21 18:17:53 2016 -0800 + + Adds new s3 driver using aws-sdk-go instead of goamz + + Keeps old s3 driver, renames to s3goamz, registers new s3 driver as both + "s3" and "s3aws" + + Changes cloudfront middleware to use aws-sdk-go + + Signed-off-by: Brian Bland + +commit 79edcc517231e46d1fa9e03081488527143eefae +Merge: 64a4605892 3403a01b07 +Author: Jess Frazelle +Date: Fri Feb 12 18:41:48 2016 -0500 + + Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create + + Check drivers before vol create + +commit d6b7819185b003a1e61f9b80cc6123e30143f9c8 +Author: John Howard +Date: Fri Feb 12 13:58:57 2016 -0800 + + Windows CI: test-unit on pkg\archive part 2 + + Signed-off-by: John Howard + +commit 64a4605892d8bcc43c73948349bcfede14eb8c3a +Merge: 4fea2be134 6fed46aeb9 +Author: Jess Frazelle +Date: Fri Feb 12 18:37:49 2016 -0500 + + Merge pull request #20278 from aaronlehmann/build-authconfig + + Pass authentication credentials through to build + +commit 4fea2be134a3785d79c4efd5c09b2a4afe4c6ecf +Merge: bda194491e 1a714e76a2 +Author: Sebastiaan van Stijn +Date: Sat Feb 13 00:37:17 2016 +0100 + + Merge pull request #20284 from Microsoft/jjh/testunit-pkgarchivestep1 + + Windows CI: test-unit pkg\archive step 1 + +commit bfc556613b981c0be7bc2be35814da4aeddcc686 +Author: Dong Chen +Date: Fri Feb 12 15:34:15 2016 -0800 + + Lock engine to prevent simultaneous change on `containers` map. + + Signed-off-by: Dong Chen + +commit bda194491e825013abc38f18a024108e25a7551c +Merge: b734d0e8cc 059ad5d0a9 +Author: David Calavera +Date: Fri Feb 12 15:34:02 2016 -0800 + + Merge pull request #20287 from duglin/DebugVerCheck + + Lower warning about old client to a debug + +commit a252516ec19c9c83055a882da894712f2e812ecc +Author: David Calavera +Date: Fri Feb 12 17:56:40 2016 -0500 + + Inherit StopSignal from Dockerfile. + + Make sure the image configuration is not overriden by the default + value in the `create` flag. + + Signed-off-by: David Calavera + +commit 5e8af46fda3f4e17e06726237fc6b9ab6957e3ea +Author: Aaron Lehmann +Date: Thu Feb 11 15:45:29 2016 -0800 + + Smarter push/pull TLS fallback + + With the --insecure-registry daemon option (or talking to a registry on + a local IP), the daemon will first try TLS, and then try plaintext if + something goes wrong with the push or pull. It doesn't make sense to try + plaintext if a HTTP request went through while using TLS. This commit + changes the logic to keep track of host/port combinations where a TLS + attempt managed to do at least one HTTP request (whether the response + code indicated success or not). If the host/port responded to a HTTP + using TLS, we won't try to make plaintext HTTP requests to it. + + This will result in better error messages, which sometimes ended up + showing the result of the plaintext attempt, like this: + + Error response from daemon: Get + http://myregistrydomain.com:5000/v2/: malformed HTTP response + "\x15\x03\x01\x00\x02\x02" + + Signed-off-by: Aaron Lehmann + +commit fc7b6f7e39fef9dc86af0984214c0142c2dec3e3 +Merge: e74a6ec4fb 665aa3bcb2 +Author: Jeffrey Morgan +Date: Fri Feb 12 13:45:40 2016 -0800 + + Merge pull request #413 from moxiegirl/remove-tutorials + + Removing tutorials + +commit 74dc1b14112335798ca7ea3a56016d955b5ed3e1 +Merge: 16200b0bce 367fabdbfa +Author: Daniel Nephin +Date: Fri Feb 12 16:33:01 2016 -0500 + + Merge pull request #2893 from shin-/2833-run-dependencies + + Bring up all dependencies when running a single service. + +commit 1fab0aed5a7d46bd63061148bbcc41fee410dc10 +Merge: 185a50ff17 ee39394741 +Author: moxiegirl +Date: Fri Feb 12 13:23:56 2016 -0800 + + Merge pull request #1797 from nishanttotla/improve-swarm-machine + + Removing hard-coded ips from swarm w/ machine doc + +commit 477e1fc989dd9a58d7bee78d6bf13e5a24ebd4d6 +Author: Jessica Frazelle +Date: Fri Feb 12 13:13:50 2016 -0800 + + dont clean the db + + Signed-off-by: Jessica Frazelle + +commit 16200b0bcee12fc13a79635af1201ba4d2a1c6c7 +Merge: e1d67ad68a a8fda480e3 +Author: Daniel Nephin +Date: Fri Feb 12 14:41:05 2016 -0500 + + Merge pull request #2903 from shin-/2899-invalid-driver-opts + + driver_opts can only be of type string + +commit b734d0e8cc69eadaff86884c200d1ce21b37cdb3 +Merge: 94b0a6b2d9 bf76b1d686 +Author: David Calavera +Date: Fri Feb 12 11:07:03 2016 -0800 + + Merge pull request #20285 from moxiegirl/fix-user-guide + + Update the userguide to fix user feedback + +commit 94b0a6b2d99bcd277cba4d54ad0893393065ea81 +Merge: 3a3c953806 91cdadf37e +Author: Jess Frazelle +Date: Fri Feb 12 13:56:11 2016 -0500 + + Merge pull request #20277 from tiborvass/pgp-mit-fallback + + Add pgp.mit.edu fallback in Dockerfile + +commit 059ad5d0a975ab4970fe0be45a79ffa0ef35e366 +Author: Doug Davis +Date: Fri Feb 12 10:47:37 2016 -0800 + + Lower warning about old client to a debug + + Ideally I would love to just remove this check entirely because its + seems pretty useless. An old client talking to a new server isn't + an error condition, nor is it something to even worry about - its a normal + part of life. Flooding my screen (and logs) with a warning that isn't + something I (as an admin) need to be concerned about is silly and a + distraction when I need to look for real issues. If anything this should + be printed on the cli not the daemon since its the cli that needs to be + concerned, not the daemon. + + However, since when you debug an issue it might be interesting to know the + client is old I decided to pull back a little and just change it from + a Warning to a Debug logrus call instead. + + If others want it removed I still do that though :-) + + Signed-off-by: Doug Davis + +commit a8fda480e3b414983fd2d077ed5bcfef5d9247b7 +Author: Joffrey F +Date: Fri Feb 12 10:41:27 2016 -0800 + + driver_opts can only be of type string + + Signed-off-by: Joffrey F + +commit 6fed46aeb97943315aed12f2dc62565f7bcc53dc +Author: Aaron Lehmann +Date: Fri Feb 12 09:08:45 2016 -0800 + + Pass authentication credentials through to build + + In Docker 1.10 and earlier, "docker build" can do a build FROM a private + repository that hasn't yet been pulled. This doesn't work on master. I + bisected this to https://github.com/docker/docker/pull/19414. + AuthConfigs is deserialized from the HTTP request, but not included in + the builder options. + + Signed-off-by: Aaron Lehmann + +commit 185a50ff17a213aa673510ea89f7aa599fa30e16 +Merge: fc8341bc39 87c38f4641 +Author: Alexandre Beslic +Date: Fri Feb 12 10:26:36 2016 -0800 + + Merge pull request #1804 from dongluochen/nodeManagementTest + + Add nodemanagement tests to test pipeline + +commit fc8341bc393fb1761ba6620a6bfb8cbf83783c93 +Merge: abb38d9a11 494e0655dd +Author: Alexandre Beslic +Date: Fri Feb 12 10:17:39 2016 -0800 + + Merge pull request #1800 from vieux/do_no_lower + + do not lower keys + +commit 2541a23c3aa44fed115a22b36ca7f1770255bbc2 +Author: Frederik Nordahl Jul Sabroe +Date: Fri Feb 12 18:39:12 2016 +0100 + + Fish completion lists all containers on "docker rm -f" + + Signed-off-by: Frederik Nordahl Jul Sabroe + +commit 1a714e76a2cb9008cd19609059e9988ff1660b78 +Author: John Howard +Date: Fri Feb 12 10:13:44 2016 -0800 + + Windows CI: test-unit pkg\archive step 1 + + Signed-off-by: John Howard + +commit bf76b1d686018cebd043aa99152d68fbbe6bb977 +Author: Mary Anthony +Date: Fri Feb 12 10:08:59 2016 -0800 + + Update the userguide to fix user feedback + + Signed-off-by: Mary Anthony + +commit 87c38f4641fa1d0f66c46b0240b37293170cd37f +Author: Dong Chen +Date: Thu Feb 11 16:59:27 2016 -0800 + + Include nodemanagement tests. + + Signed-off-by: Dong Chen + +commit 3a3c9538060ebe300cc2272ad28178450b5fdd53 +Merge: c312eab74e 8c93958fcb +Author: David Calavera +Date: Fri Feb 12 09:58:48 2016 -0800 + + Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options + + Fix an erratum; s/two/three/ + +commit abb38d9a11eee3e587619486a2a19e55d821121f +Merge: fce3620235 ab087aacef +Author: Victor Vieux +Date: Fri Feb 12 09:48:57 2016 -0800 + + Merge pull request #1807 from vieux/remove_coverage_completly + + remove coverage testing for good + +commit 367fabdbfa3db8324560bc16baf6202f68b7fffb +Author: Joffrey F +Date: Thu Feb 11 16:31:08 2016 -0800 + + Bring up all dependencies when running a single service. + + Added test for running a depends_on service + + Signed-off-by: Joffrey F + +commit 91cdadf37eb99610378a5808b8438f0c4be463c8 +Author: Tibor Vass +Date: Fri Feb 12 11:48:42 2016 -0500 + + Add pgp.mit.edu fallback in Dockerfile + + Signed-off-by: Tibor Vass + +commit c312eab74e2200d443dd5422d1aa5e240b8db473 +Merge: fffff202fc 03b25e024e +Author: Vincent Demeester +Date: Fri Feb 12 17:23:17 2016 +0100 + + Merge pull request #20265 from rhuss/patch-1 + + Fix some formatting + +commit fffff202fcc3dc63f72ce883d728eb5149e9f1ce +Merge: bd758053b5 ce1059973a +Author: Morgan Bauer +Date: Fri Feb 12 07:52:51 2016 -0800 + + Merge pull request #20261 from tophj-ibm/change-test-to-use-variable + + Change integration test to use declared variable + +commit 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb +Author: Yi EungJun +Date: Fri Feb 12 18:48:51 2016 +0900 + + Fix an erratum; s/two/three/ + + There are three options because the new one was added at 6f863cf. + + Signed-off-by: Yi EungJun + +commit bd758053b573977ee8693d62c95dbc8ca664149f +Merge: e17afedfe0 f609fb4d83 +Author: Tibor Vass +Date: Fri Feb 12 10:07:45 2016 -0500 + + Merge pull request #20264 from qunhu/master + + fix grammar error + +commit fce362023522478567552da0acc3b9ea5c5f765c +Merge: d5033258a6 b03bf75557 +Author: Chanwit Kaewkasi +Date: Fri Feb 12 19:58:08 2016 +0700 + + Merge pull request #1794 from dongluochen/refreshBackoffOnFailure + + Implement engine refresh backoff strategy for failing nodes + +commit e17afedfe061ce2f02451c213b7c8b7aae01ba2f +Merge: 27ab98e846 8f26fe4f59 +Author: Vincent Demeester +Date: Fri Feb 12 11:57:25 2016 +0100 + + Merge pull request #20247 from aaronlehmann/distribution-errors + + Push/pull errors improvement and cleanup + +commit 03b25e024e46a3254012268cda8919a8702b4cbc +Author: Roland Huß +Date: Fri Feb 12 10:30:43 2016 +0100 + + Fix some formatting + + * Codified example container names + * Emphasised 'link' vs 'legacy link' (instead of using code markup) + * Add a missing ``` for a code example + + Signed-off-by: Roland Huß + +commit f609fb4d83566ebf1bac442622bbdb62ca2269d2 +Author: huqun +Date: Fri Feb 12 16:11:31 2016 +0800 + + fix grammar error + + it is not very important,but I think the modification makes the coders read more conviently！ + + Signed-off-by: huqun + +commit 27ab98e846b7737598686a6f80f01e29677bdb81 +Merge: 991cb36d76 57faef5c71 +Author: Vincent Demeester +Date: Fri Feb 12 08:33:20 2016 +0100 + + Merge pull request #20258 from Microsoft/jjh/testunit-authz + + Windows CI: test-unit turn off pkg\authorisation + +commit 991cb36d76b96b6f705e82e59953048704152498 +Merge: 659bf08281 28ee6fe7ca +Author: Vincent Demeester +Date: Fri Feb 12 08:32:43 2016 +0100 + + Merge pull request #20259 from Microsoft/jjh/testunit-pkgfilenotify + + Windows CI: test-unit for pkg\filenotify + +commit 659bf082811e6803a8be450cbfbe3b4801afe305 +Merge: 9511856e16 41d3bb43f4 +Author: Vincent Demeester +Date: Fri Feb 12 08:32:03 2016 +0100 + + Merge pull request #20249 from Microsoft/jjh/testunit-pkgintegration + + Windows CI: Fix test-unit for pkg\integration + +commit ab087aacef7096b29451ae9e7a4a3a06cd77e44e +Author: Victor Vieux +Date: Thu Feb 11 19:15:14 2016 -0800 + + remove coverage testing for good + + Signed-off-by: Victor Vieux + +commit 9511856e16a621211f95ece6a8925aad840045ec +Merge: 3723013a1f f3b2233d12 +Author: Arnaud Porterie +Date: Thu Feb 11 19:02:25 2016 -0800 + + Merge pull request #20202 from anusha-ragunathan/arm-dummy-interface + + Add "dummy" network module for arm images. + +commit 3723013a1fd5b747b4a059b86fa9e006d35af007 +Merge: 5ca6d3bafd 0d02f2a011 +Author: Brian Goff +Date: Thu Feb 11 22:01:13 2016 -0500 + + Merge pull request #20256 from jfrazelle/make-tests-faster + + make tests faster no apt-key + +commit ce1059973a4a46acc272a8c0fea521c96e628ba7 +Author: Christopher Jones +Date: Thu Feb 11 21:11:51 2016 -0500 + + Change integration test to use variable + + Followup to #20246, changes the test to use already declared variable + + Signed-off-by: Christopher Jones + +commit eaf41b74107d4cd5b2d498abd622a492aa6b2d62 +Author: John Howard +Date: Thu Feb 11 18:19:17 2016 -0800 + + Windows CI: Unit tests - port pkg\gitutils + + Signed-off-by: John Howard + +commit 28ee6fe7ca57e8e85ca7e0b6d2cb05c563d95e82 +Author: John Howard +Date: Thu Feb 11 17:47:26 2016 -0800 + + Windows CI: test-unit for pkg\filenotify + + Signed-off-by: John Howard + +commit d736a9d2c3758fcc4eac0b62e9c7b128388021c1 +Author: Aidan Hobson Sayers +Date: Fri Feb 12 01:42:15 2016 +0000 + + Add docs for --ipv6 option, also add --internal as appropriate + + Signed-off-by: Aidan Hobson Sayers + +commit 57faef5c71b90874f66f1e6b5d2e23591b205e28 +Author: John Howard +Date: Thu Feb 11 17:42:12 2016 -0800 + + Windows CI: test-unit turn off pkg\authorisation + + Signed-off-by: John Howard + +commit 9010989a208abd414e0ab01e5a772045937a6098 +Merge: 35013dc925 27c8737bdc +Author: Diogo Mónica +Date: Thu Feb 11 17:39:10 2016 -0800 + + Merge pull request #536 from docker/nonroot-import + + Non-root key import and export CLI + +commit 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7 +Merge: 2a16099f57 99a396902f +Author: David Calavera +Date: Thu Feb 11 17:22:06 2016 -0800 + + Merge pull request #20250 from vieux/fix_misspell + + fix common misspells + +commit 8f26fe4f59ce515c68440da1443ace4c96e89d4a +Author: Aaron Lehmann +Date: Thu Feb 11 14:08:49 2016 -0800 + + Push/pull errors improvement and cleanup + + Several improvements to error handling: + + - Introduce ImageConfigPullError type, wrapping errors related to + downloading the image configuration blob in schema2. This allows for a + more descriptive error message to be seen by the end user. + + - Change some logrus.Debugf calls that display errors to logrus.Errorf. + Add log lines in the push/pull fallback cases to make sure the errors + leading to the fallback are shown. + + - Move error-related types and functions which are only used by the + distribution package out of the registry package. + + Signed-off-by: Aaron Lehmann + +commit d5033258a6f32c98b7e8aa0e23f1656ed6a67a1f +Merge: 3c044d045c eb725973a2 +Author: Dongluo Chen +Date: Thu Feb 11 16:28:09 2016 -0800 + + Merge pull request #1803 from skohar/fix_typo + + Fix typo + +commit 0d02f2a0118f7647876e1ce5c19874ea0dd06bd8 +Author: Jessica Frazelle +Date: Thu Feb 11 16:28:00 2016 -0800 + + make tests faster no apt-key + + Signed-off-by: Jessica Frazelle + +commit eb725973a21b9845f818f57fbf55eb69c048c928 +Author: skohar +Date: Fri Feb 12 09:17:25 2016 +0900 + + Fix typo + + Signed-off-by: skohar + +commit 2a16099f5792d360be5e08d05c5742190eec03e3 +Merge: 46ec01bd12 7b81bc147c +Author: David Calavera +Date: Thu Feb 11 16:18:26 2016 -0800 + + Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials + + Fall back to V1 when there are no basic auth credentials + +commit e74a6ec4fb2caababf20b27de9235daa83c2f321 +Author: David Gageot +Date: Thu Feb 11 16:08:18 2016 -0800 + + Bump docker to 1.10.1 + + Signed-off-by: David Gageot + +commit e1d67ad68a48e50c8a159ee975586537b56269f8 +Merge: b6812b8600 79f993f52c +Author: Joffrey F +Date: Thu Feb 11 16:03:20 2016 -0800 + + Merge pull request #2882 from shin-/2715-old-server-error + + Detailed error message when daemon version is too old. + +commit b6812b860006cf0b5449ba2660bf2742206c0675 +Merge: 77cf67ba8a 532dffd688 +Author: Daniel Nephin +Date: Thu Feb 11 18:53:23 2016 -0500 + + Merge pull request #2877 from dnephin/fix_merging_build + + Fix build section without context + +commit 46ec01bd125319635b9700c67032ec097e9a25b8 +Merge: 2a64d400b3 045aee2002 +Author: David Calavera +Date: Thu Feb 11 15:50:40 2016 -0800 + + Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test + + Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart + +commit 99a396902f0ea9d81ef87a683489b2435408f415 +Author: Victor Vieux +Date: Thu Feb 11 15:21:52 2016 -0800 + + fix common misspell + + Signed-off-by: Victor Vieux + +commit 3c044d045c121f9fa3a233bfc1b761f5c7f53343 +Merge: a3d1f9fdc5 cd3b1d5bd1 +Author: Alexandre Beslic +Date: Thu Feb 11 15:47:44 2016 -0800 + + Merge pull request #1777 from vieux/remove_refresh_networks + + remove refresh networks from cluster to improve perfs + +commit b03bf7555782b5b01ae4b931728a82a31ee49d0b +Author: Dong Chen +Date: Wed Feb 10 17:13:33 2016 -0800 + + Implement engine refresh backoff strategy for failing nodes. Use a backoff factor so the backoff speed is relative to user setting. + + Signed-off-by: Dong Chen + +commit a3d1f9fdc53f571b6c8072bc084c57054ebd500d +Merge: d9914ffa59 64b9c50b69 +Author: Alexandre Beslic +Date: Thu Feb 11 15:29:21 2016 -0800 + + Merge pull request #1791 from vieux/use_same_client + + use same HTTP client as dockerengine + +commit 79f993f52c9c2a358c48a9d0aea46fe832e7b167 +Author: Joffrey F +Date: Wed Feb 10 16:35:27 2016 -0800 + + Detailed error message when daemon version is too old. + + Signed-off-by: Joffrey F + +commit 35013dc9253926b1e72458a2760d1952498e67eb +Merge: b673a15a49 5867409a46 +Author: Diogo Mónica +Date: Thu Feb 11 15:14:20 2016 -0800 + + Merge pull request #567 from moxiegirl/remove-tutorials + + Updating Dockefile + +commit 41d3bb43f463a92b3611b0939e9ce51d523c62bb +Author: John Howard +Date: Thu Feb 11 15:06:22 2016 -0800 + + Windows CI: Fix test-unit for pkg\integration + + Signed-off-by: John Howard + +commit 64b9c50b693a558eb6a77b4411bd398d2b14bd8c +Author: Victor Vieux +Date: Wed Feb 10 00:02:34 2016 -0800 + + use same HTTP client as dockerengine + + Signed-off-by: Victor Vieux + +commit 2a64d400b34e53f38b210a4ca23ea202c9246a7f +Merge: 73ee139d7a 26da52d4a5 +Author: Jess Frazelle +Date: Thu Feb 11 17:28:23 2016 -0500 + + Merge pull request #20114 from jfrazelle/fix-release-script + + get os arch for release script + +commit ee39394741c8027ce1b2a0d5fef54c7ebf02fd9b +Author: Nishant Totla +Date: Wed Feb 10 23:52:36 2016 -0800 + + Removing hard-coded ip from swarm w/ machine doc + + Signed-off-by: Nishant Totla + +commit 87a659efb379654db259bdc9cb5e4c5cc6562a74 +Merge: 5178043d02 7a6ca308c4 +Author: David Gageot +Date: Thu Feb 11 14:15:18 2016 -0800 + + Merge pull request #3042 from dgageot/3016-add-timeout-to-active-command + + Add timeout to active command + +commit dfb00652aa801ecd7fcc3bf492434bd140d9d1ea +Author: Aidan Hobson Sayers +Date: Thu Dec 10 14:02:50 2015 +0000 + + Expose bridge IPv6 setting to `docker network inspect` + + Signed-off-by: Aidan Hobson Sayers + +commit 6d6c37c06a052e41ec3d65ae1615de95d9dd0a3b +Author: Derek McGowan +Date: Thu Feb 11 13:13:06 2016 -0800 + + Update client section + + Use client_id as defined in oauth rfc instead of custom client field + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 32931689d59270867ad82673f87f6133799a7079 +Author: Derek McGowan +Date: Wed Feb 3 11:19:37 2016 -0800 + + Add scope documentation + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit d8b59ab637434caa818ca4cc9f86625dc300e179 +Author: Derek McGowan +Date: Thu Feb 11 13:55:23 2016 -0800 + + Add specification for using oauth with the token server + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 7a6ca308c487862e8ded7252fa0e173b0b7889be +Author: David Gageot +Date: Thu Feb 11 13:52:32 2016 -0800 + + FIX #3016 Add timeout to active command + + Signed-off-by: David Gageot + +commit 5178043d025ad7f64282c46ce176323b632b2b72 +Merge: 4262a8fde5 8345672b18 +Author: David Gageot +Date: Thu Feb 11 13:55:04 2016 -0800 + + Merge pull request #3041 from dgageot/3040-fix-slow-test + + FIX #3040 Slow test + +commit 73ee139d7ae5bb1099744d3ac23eb70b418a4e6f +Merge: 4cdd0403cd 1e92e5fdaa +Author: Sebastiaan van Stijn +Date: Thu Feb 11 22:52:26 2016 +0100 + + Merge pull request #20245 from jfrazelle/20082-cap-add-docs-updates + + update cap-add docs for seccomp + +commit 4cdd0403cdaac7e500f3fa6740c43792a6e066a4 +Merge: 02a37a281c a943c40150 +Author: Vincent Demeester +Date: Thu Feb 11 22:51:20 2016 +0100 + + Merge pull request #20218 from icecrime/fix_remote_integration-cli + + Improve remote integration-cli tests + +commit 02a37a281cb1200747e10bef7409ac1e65bc24f4 +Merge: 931e78df1b 34c29277c2 +Author: Alexander Morozov +Date: Thu Feb 11 13:50:48 2016 -0800 + + Merge pull request #20239 from calavera/remove_server_port_allocation + + Move listeners and port allocation outside the server. + +commit 045aee2002e76cbfc9999472fe6e8fc54e0c0085 +Author: Christopher Jones +Date: Thu Feb 11 16:30:35 2016 -0500 + + Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart + + Fixes #19368 by waiting until all container statuses are running + before killing the daemon + + Signed-off-by: Christopher Jones + +commit 1e92e5fdaab833000d6d3a4f6756cb677cb7899e +Author: Jessica Frazelle +Date: Thu Feb 11 13:44:00 2016 -0800 + + update cap-add docs for seccomp + + Signed-off-by: Jessica Frazelle + +commit 931e78df1b50e83837bff4966bb62458675e3c32 +Merge: 944e4cab2e 312f5e435b +Author: David Calavera +Date: Thu Feb 11 13:38:57 2016 -0800 + + Merge pull request #20231 from vdemeester/move-getcontext-away + + Move getContext… function to builder package + +commit d9914ffa59ee509667177775c646e871245d9cd2 +Merge: 7952727bb7 513490feb5 +Author: Nishant Totla +Date: Thu Feb 11 13:33:50 2016 -0800 + + Merge pull request #1801 from dongluochen/rescheduleTest + + Fix race condition in rescheduling test + +commit 8345672b18cb04106003841d02888123c79903e9 +Author: David Gageot +Date: Thu Feb 11 13:31:36 2016 -0800 + + FIX #3040 Slow test + + Signed-off-by: David Gageot + +commit 77cf67ba8abcf6681861ac07c33d4fabee955b4b +Merge: 5eb45a31e6 1e7dd2e740 +Author: Joffrey F +Date: Thu Feb 11 12:11:57 2016 -0800 + + Merge pull request #2888 from dnephin/upgrade_pyinstaller + + Upgrade pyinstaller. + +commit 5eb45a31e68a0c8d2dc6c3a881b5869602d20bbe +Merge: 830a9fc118 e225f12551 +Author: Joffrey F +Date: Thu Feb 11 12:11:28 2016 -0800 + + Merge pull request #2883 from shin-/2849-log-volume-creation + + Add logging when initializing a volume. + +commit 513490feb572739d14da985886e44e0933bd5c6c +Author: Dong Chen +Date: Thu Feb 11 12:02:54 2016 -0800 + + Fix race condition in rescheduling test. + + Signed-off-by: Dong Chen + +commit 312f5e435bed2ca45477dc9e4713d35aabe37075 +Author: Vincent Demeester +Date: Thu Feb 11 20:59:59 2016 +0100 + + Move getContext… function to builder package + + Signed-off-by: Vincent Demeester + +commit 34c29277c2c1fd1d1adc4409dc7075685f681de4 +Author: David Calavera +Date: Thu Feb 11 13:30:23 2016 -0500 + + Move listeners and port allocation outside the server. + + Signed-off-by: David Calavera + +commit e225f12551fd056da6c8d96fcef8c8b7a891d386 +Author: Joffrey F +Date: Wed Feb 10 16:49:50 2016 -0800 + + Add logging when initializing a volume. + + Signed-off-by: Joffrey F + +commit b673a15a4925afba27df9b3d45dd15072459ce07 +Merge: 3229592f0c ac265186ee +Author: Ying Li +Date: Thu Feb 11 11:36:15 2016 -0800 + + Merge pull request #555 from docker/remove-kdb-from-verify + + Remove keyDB from signed.Verify + +commit 830a9fc118ce22ef0536589a6b7f5055f2af2d4a +Merge: 7bae4cdbb2 740329a131 +Author: Joffrey F +Date: Thu Feb 11 11:18:45 2016 -0800 + + Merge pull request #2889 from dnephin/fix_test_broken_on_master + + Shm_size requires docker 1.10 + +commit 494e0655dd618d9a9dfa0cc70be329a42ff5128f +Author: Victor Vieux +Date: Thu Feb 11 11:12:39 2016 -0800 + + do not lower keys + + Signed-off-by: Victor Vieux + +commit 532dffd68807de1c50e99afe2feaff78c7a00391 +Author: Daniel Nephin +Date: Wed Feb 10 13:32:04 2016 -0500 + + Fix build section without context. + + Signed-off-by: Daniel Nephin + +commit 4262a8fde50c8804236a8f972a965cee15784107 +Merge: eae3a747b7 090c575c0d +Author: Olivier Gambier +Date: Thu Feb 11 11:05:34 2016 -0800 + + Merge pull request #3034 from davemkirk/3025-registry-env-var + + Add ENGINE_REGISTRY_MIRROR env var support. + +commit cd3b1d5bd1cc079b68f7303ec7df741e9859c031 +Author: Victor Vieux +Date: Thu Feb 11 11:00:15 2016 -0800 + + improve addNetwork + + Signed-off-by: Victor Vieux + +commit 902fb2ec6618f387bac45729d4c422756e11f8d2 +Merge: d45a012cbe 9e65afb02b +Author: Jeffrey Morgan +Date: Thu Feb 11 10:59:30 2016 -0800 + + Merge pull request #1462 from moxiegirl/remove-tutorials + + Updating Dockerfile + +commit f3b2233d126aec8ab15fa589f5a9360eec280f01 +Author: Anusha Ragunathan +Date: Wed Feb 10 11:01:22 2016 -0800 + + Add "dummy" network module for arm images. + + A few libnetwork integration tests require that the kernel be configured + with the "dummy" network interface and has the module loaded. However, + the dummy module is not available by default on arm images. This ensures + that it is built and loaded. + + Signed-off-by: Anusha Ragunathan + +commit 1e7dd2e7400114c76d9d438d2b4a2f403a816573 +Author: Daniel Nephin +Date: Thu Feb 11 13:10:29 2016 -0500 + + Upgrade pyinstaller. + + Signed-off-by: Daniel Nephin + +commit 740329a131fb74d45a3821303c4c1818f2bcd171 +Author: Daniel Nephin +Date: Thu Feb 11 13:50:23 2016 -0500 + + Shm_size requires docker 1.10. + + Signed-off-by: Daniel Nephin + +commit 7b81bc147cf75cb32697e8fdf88e05ae879cb879 +Author: Aaron Lehmann +Date: Thu Feb 11 10:30:56 2016 -0800 + + Fall back to V1 when there are no basic auth credentials + + This makes the behavior consistent with having incorrect credentials. + + Signed-off-by: Aaron Lehmann + +commit bf991fec01662fc14610365882d8bc142a6cbdd6 +Merge: 7b66c50bb7 846328977e +Author: Olivier Gambier +Date: Thu Feb 11 10:40:22 2016 -0800 + + Merge pull request #1455 from RichardScothern/grammar-correct + + Reference name rather than repository in reference grammar + +commit 4436f07ef42d367a801695c9bfac521e85072033 +Author: Aaron Lehmann +Date: Thu Feb 11 10:28:18 2016 -0800 + + Update vendored docker/distribution + + The registry/client/auth package now provides ErrNoBasicAuthCredentials. + + Signed-off-by: Aaron Lehmann + +commit 846328977e1b0d1872cab0cd5fb2494e369e6478 +Author: Richard Scothern +Date: Thu Feb 11 10:26:05 2016 -0800 + + Reference name rather than repository in reference grammar + + Signed-off-by: Richard Scothern + +commit 7b66c50bb7e0e4b3b83f8fd134a9f6ea4be08b57 +Merge: d438e75dcf b046861e40 +Author: Olivier Gambier +Date: Thu Feb 11 10:09:22 2016 -0800 + + Merge pull request #1452 from aaronlehmann/export-no-credentials-error + + Export "no basic auth credentials" as an error value + +commit eae3a747b774956582911d70776431cf8befab43 +Merge: ebed0f14ae f6cb147f0d +Author: David Gageot +Date: Thu Feb 11 09:52:03 2016 -0800 + + Merge pull request #3038 from jeanlaurent/doc-lint-ref + + Markdown linting in docs/reference directory + +commit 944e4cab2ed8370f088416ccb3cad890f3aa5102 +Merge: d4d0b8a42b d11a2c758a +Author: Brian Goff +Date: Thu Feb 11 12:51:35 2016 -0500 + + Merge pull request #20124 from calavera/fix_vendor_codec_cleanup + + Do not purge github.com/ugorji/go/codec from vendor. + +commit ac265186ee911575e52dd3aa8fa8c2f61f51f413 +Author: Ying Li +Date: Thu Feb 11 09:51:08 2016 -0800 + + Rename repo.GetRole to repo.GetRoleWithNames and use the Keys data structure more. + + Signed-off-by: Ying Li + +commit 7bae4cdbb25650274ec91a3598eb73e074fd3a9f +Merge: 23ab2c7e44 ab6e07da7d +Author: Daniel Nephin +Date: Thu Feb 11 12:43:51 2016 -0500 + + Merge pull request #2875 from aanand/fix-version-in-install-guide + + Fix version in install guide + +commit 23ab2c7e440729159285c331645f4f194c47fa2b +Merge: b8f7bbb84e 37564a73c3 +Author: Aanand Prasad +Date: Thu Feb 11 17:41:41 2016 +0000 + + Merge pull request #2878 from dnephin/merge_build_args + + Merge build.args when merging services + +commit b8f7bbb84e9c0d92dee2660824b12373d43e296a +Merge: a5d95612e0 ab40d389d0 +Author: Aanand Prasad +Date: Thu Feb 11 17:34:44 2016 +0000 + + Merge pull request #2830 from nubs/master + + Add support for shm_size. Fixes #2823. + +commit f6cb147f0dd4cc16624bbd607d7c5743445a850e +Author: Jean-Laurent de Morlhon +Date: Thu Feb 11 09:29:14 2016 -0800 + + Markdown linting in docs/reference directory + + Signed-off-by: Jean-Laurent de Morlhon + +commit a5d95612e0855f98eadfd2acc974f699ee0d78fe +Merge: 7b5bad6050 ac14642d94 +Author: Joffrey F +Date: Thu Feb 11 09:28:08 2016 -0800 + + Merge pull request #2881 from humitos/patch-1 + + Typo fixed + +commit d4d0b8a42bcf5e5e1df3565101277dc10843735a +Merge: 6672d7de20 bc3e02b9ec +Author: Sebastiaan van Stijn +Date: Thu Feb 11 18:18:26 2016 +0100 + + Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details + + Improve usage details on overriding USER command in Docker run refere… + +commit 6672d7de200d938f6a6c4e372c31712318e54dc2 +Merge: f6523a44cc b2e609176d +Author: Phil Estes +Date: Thu Feb 11 12:12:58 2016 -0500 + + Merge pull request #20214 from mavenugo/vin0.7.0-dev.1 + + Vendor libnetwork v0.7.0-dev.2 + +commit f6523a44ccae5a69aba41a769a3b1b054e1f22ad +Merge: 803e3d4d1e b1e5c773b2 +Author: Brian Goff +Date: Thu Feb 11 11:43:28 2016 -0500 + + Merge pull request #20233 from tianon/busybox-dbus + + Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore) + +commit 803e3d4d1e7b9f029bbe31a80197403bf4d27252 +Merge: acd8baccff 922986b76e +Author: David Calavera +Date: Thu Feb 11 08:27:26 2016 -0800 + + Merge pull request #20230 from estesp/zfs-ref-counting + + Add proper refcounting to zfs graphdriver + +commit d11a2c758a497500bba08495f218b8f242fafad3 +Author: David Calavera +Date: Mon Feb 8 18:00:34 2016 -0500 + + Do not purge github.com/ugorji/go/codec from vendor. + + Signed-off-by: David Calavera + +commit b1e5c773b28d27a67d20c0aa0182d40005cfdb50 +Author: Tianon Gravi +Date: Thu Feb 11 08:00:41 2016 -0800 + + Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore) + + Signed-off-by: Andrew "Tianon" Page + +commit bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202 +Author: Sian Lerk Lau +Date: Fri Feb 12 00:05:32 2016 +0800 + + Improve usage details on overriding USER command in Docker run reference page + + Signed-off-by: Sian Lerk Lau + +commit acd8baccff10642e1d44a342414cd196b81a4605 +Merge: f923e5a5a4 e2afab9c4a +Author: Brian Goff +Date: Thu Feb 11 10:50:05 2016 -0500 + + Merge pull request #20209 from aaronlehmann/upper-case-hostnames + + Allow uppercase characters in image reference hostname + +commit f923e5a5a441ab3f7fc70816f339f06718ea13bb +Merge: 2edd5f698c 2c60a9cba2 +Author: Sebastiaan van Stijn +Date: Thu Feb 11 16:40:59 2016 +0100 + + Merge pull request #19720 from vdemeester/carry-pr-18912 + + Carry #18912 : Docker Remote API documentation update + +commit 2edd5f698ce28659154b8404034250bbfeb2ac52 +Merge: e7cd3b0897 056bf9f25e +Author: Brian Goff +Date: Thu Feb 11 10:32:17 2016 -0500 + + Merge pull request #19840 from aaronlehmann/resumable-downloads + + Add support for resuming downloads on transfer failure + +commit a943c401509e7994ae5c574a4b7e23354e44a105 +Author: Arnaud Porterie +Date: Wed Feb 10 19:27:02 2016 -0800 + + Improve remote integration-cli tests + + Progress toward being able to run integration-cli campaign using a + client hitting a remote host. + + Most of these fixes imply flagging tests that assume they are running on + the same host than the Daemon. Also fixes the `contrib/httpserver` image + that couldn't run because of a dynamically linked Go binary inside the + busybox image. + + Signed-off-by: Arnaud Porterie + +commit 2c60a9cba2e0920c9f1e8a193dcf0b6ddad71c5a +Author: Anonmily +Date: Thu Feb 11 16:28:11 2016 +0100 + + Docker Remote API documentation update + + I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired. + + Signed-off-by: Michelle Liu + +commit e7cd3b0897a8c6009eb099eae416b4c0eebb706d +Merge: 2cca097ea8 9ee8f0ad9d +Author: Brian Goff +Date: Thu Feb 11 10:23:10 2016 -0500 + + Merge pull request #20222 from vdemeester/update-shakers-vendor-licence + + Update shakers vendoring to include the LICENSE 😇 + +commit b2e609176d1233eb845785dfdd72b4b747171178 +Author: Madhu Venugopal +Date: Wed Feb 10 18:09:33 2016 -0800 + + Vendor libnetwork v0.7.0-dev.2 + + - Expose EnableIPV6 option + - discoverapi refactoring + - Fixed a few typos & docs update + - Fixes https://github.com/docker/docker/issues/20140 + + Signed-off-by: Madhu Venugopal + +commit 2cca097ea83aeffb2d2f64ef322bad9a7a79299b +Merge: 89f94ec03b 3024604054 +Author: Vincent Demeester +Date: Thu Feb 11 15:41:54 2016 +0100 + + Merge pull request #20052 from aditirajagopal/19301-overlay-network-unique-hostname + + Overlay Network needs Unique Hostname + +commit 89f94ec03b73cb26963215b81e231f3cc433a38c +Merge: 5627e400fe 27fc78abdd +Author: Sebastiaan van Stijn +Date: Thu Feb 11 15:32:50 2016 +0100 + + Merge pull request #20161 from tkopczynski/docs-before-since-filters + + docker ps before and since filters documentation + +commit 5627e400fe666da8159dd7555853e4ca8fbd5933 +Merge: d18c0d88f4 4b3001e85a +Author: Vincent Demeester +Date: Thu Feb 11 12:39:08 2016 +0100 + + Merge pull request #20216 from Microsoft/jjh/testunit-pkgplugins-v2 + + Windows CI: test-unit on pkg\plugins + +commit d18c0d88f4504f258d3b3ce31f22b4205717d39c +Merge: 8c0b1218c0 d509e61540 +Author: Sebastiaan van Stijn +Date: Thu Feb 11 12:27:38 2016 +0100 + + Merge pull request #20213 from Microsoft/jjh/testunit-pkgmount + + Windows CI: Unit Test - pkg/mount is Unix specific + +commit 8c0b1218c012d8d482ad171b1183092f56d9a5d3 +Merge: e2a0618fb1 8d673d9471 +Author: Sebastiaan van Stijn +Date: Thu Feb 11 12:15:53 2016 +0100 + + Merge pull request #20219 from moxiegirl/remove-tutorial-build + + Update Dockerfile + +commit 9ee8f0ad9d0128788440b245457e6447e52b97b4 +Author: Vincent Demeester +Date: Thu Feb 11 08:38:09 2016 +0100 + + Update shakers vendoring to include the LICENSE 😇 + + Signed-off-by: Vincent Demeester + +commit ebed0f14ae6aa7a4e2465af829ad1e74ef7690ce +Merge: 86d002a202 785e183466 +Author: Jean-Laurent de Morlhon +Date: Wed Feb 10 23:37:05 2016 -0800 + + Merge pull request #3035 from moxiegirl/remove-tutorials + + Updating Dockerfile + +commit d438e75dcf902c35e183e75d88492b02bb0f9ea8 +Merge: 3c80f6fb5e 78aa1d2bb1 +Author: Olivier Gambier +Date: Wed Feb 10 22:32:49 2016 -0800 + + Merge pull request #1453 from moxiegirl/remove-tutorials + + Updating Dockerfile + +commit 922986b76e2ac596faed6a724cebcf7082174980 +Author: Phil Estes +Date: Thu Feb 11 01:00:54 2016 -0500 + + Add proper refcounting to zfs graphdriver + + Fixes issues with layer remounting (e.g. a running container which then + has `docker cp` used to copy files in or out) by applying the same + refcounting implementation that exists in other graphdrivers like + overlay and aufs. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 5867409a460e778030d0f33ec63eba115f8588c8 +Author: Mary Anthony +Date: Wed Feb 10 21:15:44 2016 -0800 + + Updating Dockefile + + Signed-off-by: Mary Anthony + +commit 78aa1d2bb1a9801c4eee2c98ebd5be69dcc8c3f5 +Author: Mary Anthony +Date: Wed Feb 10 21:12:45 2016 -0800 + + Updating Dockerfile + + Signed-off-by: Mary Anthony + +commit 9e65afb02bcb6c330ee9a0fd2d4b28a2daf7a3b7 +Author: Mary Anthony +Date: Wed Feb 10 21:07:10 2016 -0800 + + Updating Dockerfile + + Signed-off-by: Mary Anthony + +commit 665aa3bcb271fa372bd587ed798514ae88f8e986 +Author: Mary Anthony +Date: Wed Feb 10 21:03:14 2016 -0800 + + Removing tutorials + + Signed-off-by: Mary Anthony + +commit 785e183466b26b9b0526cbc34bbaab24b9e73b44 +Author: Mary Anthony +Date: Wed Feb 10 20:52:47 2016 -0800 + + Updating Dockerfile + + Signed-off-by: Mary Anthony + +commit 643166ae98764e1bfe8b2dad8de349e2c23c7f33 +Author: Mary Anthony +Date: Wed Feb 10 20:47:15 2016 -0800 + + Updating Dockerfile + + Signed-off-by: Mary Anthony + +commit 8d673d9471d80bc8032f3280001bcd46f015a84a +Author: Mary Anthony +Date: Wed Feb 10 20:40:30 2016 -0800 + + Update Dockerfile + + Signed-off-by: Mary Anthony + +commit 4b3001e85aff2c51a69eec205023e32384bebbdf +Author: John Howard +Date: Wed Feb 10 18:32:27 2016 -0800 + + Windows CI: test-unit on pkg\plugins + + Signed-off-by: John Howard + +commit 090c575c0d5b41b6debe9f6446ea8c7bc0341196 +Author: David Kirk +Date: Wed Feb 10 21:25:28 2016 -0600 + + Add env var support. + + Signed-off-by: David Kirk + +commit e2a0618fb1f32572f2b5b11f97278634be4ea31c +Merge: dfebb6074f 5e0b8b99d1 +Author: Arnaud Porterie +Date: Wed Feb 10 19:08:49 2016 -0800 + + Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script + + Adding backup key server in install script + +commit d509e615404d8e6f568cf30b6ad37311d4698ece +Author: John Howard +Date: Wed Feb 10 18:09:15 2016 -0800 + + Windows CI: Unit Test - pkg/mount is Unix specific + + Signed-off-by: John Howard + +commit 173f61f81bd297740344b135f06eec362a1b7856 +Author: John McKim +Date: Wed Feb 10 16:40:14 2016 +1000 + + Split Docker Machine and VirtualBox validation message #357 + + Signed-off-by: John McKim + +commit 3403a01b07a73defe9f15c30e16ec8dfcab50439 +Author: Brian Goff +Date: Wed Feb 10 12:19:32 2016 -0500 + + Remove back-compat hacks from for volume plugins. + + Hacks were added as interim support for 1.10 but should not be needed + for 1.11. + + Signed-off-by: Brian Goff + +commit 00ec6102d993a752bd8dfb4ee393a4e58e59a4fe +Author: Brian Goff +Date: Wed Feb 10 12:02:52 2016 -0500 + + Probe all drivers if volume driver not specified + + This fixes an issue where `docker run -v foo:/bar --volume-driver + ` -> daemon restart -> `docker run -v foo:/bar` would + make a `local` volume after the restart instead of using the existing + volume from the remote driver. + + Signed-off-by: Brian Goff + +commit 7952727bb70f4e1b2bbf249fec59f2dcd3e1f03e +Merge: 36e7dc8509 220604d6ef +Author: Dongluo Chen +Date: Wed Feb 10 17:27:58 2016 -0800 + + Merge pull request #1793 from vieux/flacky_before_test + + fix flacky before tests + +commit dfebb6074f62891368cb3c668380c186f3bebb33 +Merge: ae8551c144 54263a9393 +Author: David Calavera +Date: Wed Feb 10 17:20:14 2016 -0800 + + Merge pull request #20210 from Microsoft/jjh/hcswin32-v2 + + Windows: Revendor HCS to use revised error scheme + +commit 3c80f6fb5eabb8ece6632e20b719c59037d3711e +Merge: d6a9b20971 aa80478b64 +Author: Olivier Gambier +Date: Wed Feb 10 17:12:00 2016 -0800 + + Merge pull request #1451 from aaronlehmann/typo-fixes + + Typo fixes in comments + +commit b046861e4058070a98343e97855aeeb99f5b4b6c +Author: Aaron Lehmann +Date: Wed Feb 10 16:34:50 2016 -0800 + + Export "no basic auth credentials" as an error value + + Making this an exported error value will allow users of the + registry/client/auth module to have consistent behavior between + authentication failures and cases where no credentials are provided. + + Signed-off-by: Aaron Lehmann + +commit ae8551c14482be085a6872f9541e3aa8c59a8ba3 +Merge: 9be87be582 4e9e95fe8d +Author: Sebastiaan van Stijn +Date: Thu Feb 11 01:33:26 2016 +0100 + + Merge pull request #19903 from londoncalling/cloud-installs-rel-a + + added better what's next topics to point to new machine docs related … + +commit 36e7dc8509e159763785d8cf00368328846f91cf +Merge: 97b879495a 5974a4a509 +Author: Victor Vieux +Date: Wed Feb 10 16:28:09 2016 -0800 + + Merge pull request #1773 from dongluochen/rescheduleTest + + Verify rescheduled containers are started properly + +commit d6a9b209719e78c1b026567a5c4acbd3e1f6ff4b +Merge: a3213ff331 350234898a +Author: Aaron Lehmann +Date: Wed Feb 10 16:27:18 2016 -0800 + + Merge pull request #1445 from dmcgowan/fix-manifest-digest-header + + Fix schema1 manifest etag and docker content digest header + +commit aa80478b64b7d7cb725caf336fca57df4310f50a +Author: Aaron Lehmann +Date: Wed Feb 10 16:26:29 2016 -0800 + + Typo fixes in comments + + Correct spelling of words in source code comments. + + Signed-off-by: Aaron Lehmann + +commit a3213ff3315da2d377c8681fa316f81bbb5d2a36 +Merge: 87ae10b867 e8eca4db17 +Author: Aaron Lehmann +Date: Wed Feb 10 16:15:59 2016 -0800 + + Merge pull request #1420 from dmcgowan/configurable-trust-key + + Add option to disable signatures + +commit 97b879495a3b5ebcda1c9284d7967c37859b7858 +Merge: 6fba0987ba 4d1b023ec2 +Author: Victor Vieux +Date: Wed Feb 10 16:09:20 2016 -0800 + + Merge pull request #1792 from vieux/remove_cover_readme + + remove coverage from the README since we don't use it anymore + +commit 9be87be582f1c4539e84385c1ac917418c015cdd +Merge: f1bf015ed8 0adcce10a1 +Author: David Calavera +Date: Wed Feb 10 16:02:26 2016 -0800 + + Merge pull request #20170 from Microsoft/10662-TestBuildCI5 + + Fifth set of TestBuild CI enables for Windows + +commit ac14642d94718aa3a5d30eea17a41b36056c3488 +Author: Manuel Kaufmann +Date: Wed Feb 10 18:58:01 2016 -0500 + + Typo fixed + + Signed-off-by: Manuel Kaufmann + +commit 86d002a20251e52d1c5c551561ec92137f3d19c4 +Merge: d00e4943b7 8c186370b7 +Author: moxiegirl +Date: Wed Feb 10 15:48:04 2016 -0800 + + Merge pull request #3033 from londoncalling/docs-machine-d-ami + + machine docs: removed references to AMI per @nathanleclaire comments + +commit 3229592f0c8ccee024c4c3da1bf6cf587a44e65e +Merge: f62a8b3078 f52535762f +Author: Riyaz Faizullabhoy +Date: Wed Feb 10 15:45:57 2016 -0800 + + Merge pull request #565 from endophage/readme_coverage + + adding codecov badge to readme + +commit 8c186370b73b97348fcb06ebbdbefede87e888ba +Author: Victoria Bialas +Date: Wed Feb 10 14:59:19 2016 -0800 + + machine docs: removed references to AMI per @nathanleclaire comments + + fixed grammatical error re: AMI + + Signed-off-by: Victoria Bialas + +commit f1bf015ed805aa37b700ebe5d920a00f7f604ec8 +Merge: 95d827cda2 298d280143 +Author: Alexander Morozov +Date: Wed Feb 10 15:30:14 2016 -0800 + + Merge pull request #20208 from Microsoft/jjh/testunit-layer + + Windows CI UnitTest TestLayerSize-->Unix + +commit 95d827cda21c690fabf1d577ea0c489ac26c805a +Merge: 2658341b5f dfdce6e35c +Author: Alexander Morozov +Date: Wed Feb 10 15:29:39 2016 -0800 + + Merge pull request #20207 from Microsoft/jjh/fix18077-v2 + + Windows: Fix Isolation + +commit c88461d48511bab47b464410bb8d787e35728812 +Author: Ying Li +Date: Tue Feb 9 20:56:19 2016 -0800 + + Change the client to pass the RoleWithKeys to signed.Verify instead of a KeyDB. + + Signed-off-by: Ying Li + +commit 3b3cc3f152c3591a6cc6d3917550205bf692ed51 +Author: Ying Li +Date: Wed Feb 10 14:51:06 2016 -0800 + + Update server handlers to pass the RoleWithKeys to signed.Verify instead of KeyDB. + + Signed-off-by: Ying Li + +commit e8eca4db17e9d751c339e8347bd734db17d1ef76 +Author: Derek McGowan +Date: Wed Feb 10 15:20:55 2016 -0800 + + Add documentation for compatibility configuration + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit b7eea5f6110c17a15a42d82d515b76d705f22ba7 +Author: Ying Li +Date: Tue Feb 9 19:29:54 2016 -0800 + + Refactor signed.Verify to no longer take a KeyDB, but a RoleWithKeys object. + + Also removes several uncovered and unused functions (Unmarshal and UnmarshalTrusted) + of signed/verify.go. + + Signed-off-by: Ying Li + +commit b34e571bff1d1787e3961a3cd067a321c352bad5 +Author: Derek McGowan +Date: Wed Feb 10 15:20:39 2016 -0800 + + Add option to disable signatures + + Add option for specifying trust key for signing schema1 manifests. + Since schema1 signature key identifiers are not verified anywhere and deprecated, storing signatures is no longer a requirement. + Furthermore in schema2 there is no signature, requiring the registry to already add signatures to generated schema1 manifests. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 54263a93933a4a53f44ddea58ac16b2526e136e3 +Author: John Howard +Date: Wed Feb 3 13:04:41 2016 -0800 + + Windows: Use new error code mechanism from HCS + + Signed-off-by: John Howard + +commit 87ae10b867eedce9bc54f42cb9ca2b1d11fb9ddd +Merge: 77534e7340 9259bd7133 +Author: Brian Bland +Date: Wed Feb 10 14:44:09 2016 -0800 + + Merge pull request #1446 from BrianBland/updateGoamz + + [driver/s3] Adds support for ap-northeast-2 region + +commit 4e9e95fe8d9ba177ec77727b6fca558a0ba8f01f +Author: Victoria Bialas +Date: Mon Feb 1 15:15:37 2016 -0800 + + added better what's next topics to point to new machine docs related to Issue #18282 + + updated cloud install example per Olivier's comments, added better command examples + + updates per @thaJeztah comments + + fixed links per @theJeztah comments, renamed cloud.md to overview.md for better URL name + + updates per @moxiegirl comments, added alias for renamed file, modified links, changed a title + + fixed link errors + + Signed-off-by: Victoria Bialas + +commit fadbbd335cfb6d32566267385e820b36c356c14e +Author: John Howard +Date: Wed Feb 3 12:11:21 2016 -0800 + + Windows: Revendor HCSShim@43858ef3 + + Signed-off-by: John Howard + +commit e2afab9c4a8be800dffee9b60b2197350987543c +Author: Aaron Lehmann +Date: Mon Feb 8 11:07:57 2016 -0800 + + Allow uppercase characters in image reference hostname + + This PR makes restores the pre-Docker 1.10 behavior of allowing + uppercase characters in registry hostnames. + + Note that this only applies to hostnames, not remote image names. + Previous versions also prohibited uppercase letters after the hostname, + but Docker 1.10 extended this to the hostname itself. + + - Vendor updated docker/distribution. + + - Add a check to "normalize" that rejects remote names with uppercase + letters. + + - Add test cases to TestTagValidPrefixedRepo and + TestTagInvalidUnprefixedRepo + + Fixes: #20056 + + Signed-off-by: Aaron Lehmann + +commit 298d28014323a02b49614d2b91cd2adf0baa6ae1 +Author: John Howard +Date: Wed Feb 10 13:57:26 2016 -0800 + + Windows CI UnitTest TestLayerSize-->Unix + + Signed-off-by: John Howard + +commit f52535762f4a910668f4772a84b5e76234ca87b3 +Author: David Lawrence +Date: Wed Feb 10 13:48:28 2016 -0800 + + adding codecov badge to readme + Signed-off-by: David Lawrence (github: endophage) + +commit 6fba0987ba34398179241295d7c7ccb44f93dfa8 +Merge: 6a250898f4 9a43172135 +Author: Victor Vieux +Date: Wed Feb 10 13:42:22 2016 -0800 + + Merge pull request #1789 from vieux/severversion_info + + add Server Version to docker info + +commit d00e4943b741a049486f613012b55c0a2d7d7382 +Merge: 1c07446f5e 0eb405f1d7 +Author: Jean-Laurent de Morlhon +Date: Wed Feb 10 13:33:01 2016 -0800 + + Merge pull request #2998 from londoncalling/docs-machine-c + + AWS example added to Machine docs cloud provisioning topic + +commit 6a250898f4c14cda89fd05d6e768c17febb8e4f4 +Merge: bb443b30b3 208ce7d414 +Author: Nishant Totla +Date: Wed Feb 10 13:32:23 2016 -0800 + + Merge pull request #1790 from vieux/fix_typos + + fix 2 typos + +commit dfdce6e35ce67c8cb8b321588a577adbb02caca5 +Author: John Howard +Date: Wed Feb 10 13:21:11 2016 -0800 + + Revendor engine-api @ ddfd776c + + Signed-off-by: John Howard + +commit ab40d389d05f5f2e08dbea4c43ebb8a467172bf9 +Author: Spencer Rinehart +Date: Fri Feb 5 11:46:15 2016 -0600 + + Fix sorting of DOCKER_START_KEYS. + + Make sure it's sorted! + + Signed-off-by: Spencer Rinehart + +commit 5e6dc3521c2b9bb3cac3553987f173c48ec17579 +Author: Spencer Rinehart +Date: Fri Feb 5 10:47:14 2016 -0600 + + Add support for shm_size. Fixes #2823. + + shm_size controls the size of /dev/shm in the container and requires + Docker 1.10 or newer (API version 1.22). This requires docker-py 1.8.0 + (docker/docker-py#923). + + Similar to fields like `mem_limit`, `shm_size` may be specified as + either an integer or a string (e.g., `64M`). + + Updating docker-py to the master branch in order to get the unreleased + dependency on `shm_size` there in place. + + Signed-off-by: Spencer Rinehart + +commit d4b0732499feac87cf7c433b9490a4e21e94fb45 +Author: John Howard +Date: Wed Feb 3 12:07:00 2016 -0800 + + Windows: Fix 'isolation' + + Signed-off-by: John Howard + +commit 2658341b5fe9dec5c4839f0721219111fb08b43f +Merge: ab0102d671 1af76ef597 +Author: Alexander Morozov +Date: Wed Feb 10 13:13:53 2016 -0800 + + Merge pull request #20205 from calavera/remove_last_daemon_references + + Remove daemon dependency from api/server. + +commit 0eb405f1d7ea3ad4c3595fb2c97d856d3e2d9c5c +Author: Victoria Bialas +Date: Thu Feb 4 16:12:07 2016 -0800 + + AWS example added to Machine docs cloud provisioning topic, reorganized/streamlined topics, tested against updated driver, and documented per new/easier use of it per Jean-Laurent's fixes + + split examples out into separate files (aws, digital ocean) + + fixes issue #3028:links to Swarm in overview, cloud topics, cloud examples + + fixed links and mis-spelling + + Signed-off-by: Victoria Bialas + +commit ab0102d671d9d531f99e176858ec5b2506bc77e3 +Merge: d2d66e9d55 4603a7259e +Author: Vincent Demeester +Date: Wed Feb 10 21:49:39 2016 +0100 + + Merge pull request #19814 from Microsoft/10662-TestBuildCI3 + + Third set of TestBuild* CI enabling for Windows + +commit 0adcce10a1b9373c0926eaee1269f50765a49f02 +Author: Darren Stahl +Date: Mon Feb 8 18:12:04 2016 -0800 + + Fifth set of TestBuild CI enables for Windows + + Signed-off-by: Darren Stahl + +commit d2d66e9d551c59650dc14644cca70214d3274899 +Merge: e18eb6ef39 7853193edb +Author: Brian Goff +Date: Wed Feb 10 15:29:42 2016 -0500 + + Merge pull request #20201 from Microsoft/jjh/objectidentifier + + Windows CI: Another reliability fix + +commit 1af76ef5970202bdbc7024d825c0fcfcc4ec6ede +Author: David Calavera +Date: Wed Feb 10 15:16:59 2016 -0500 + + Remove daemon dependency from api/server. + + Signed-off-by: David Calavera + +commit 7853193edbd55ea5596c4df54895132ee88dc8fe +Author: John Howard +Date: Wed Feb 10 11:07:29 2016 -0800 + + Windows CI: Another reliability fix + + Signed-off-by: John Howard + +commit 37564a73c3844aa8563a4a929a07868f2c09ec6c +Author: Daniel Nephin +Date: Wed Feb 10 13:54:40 2016 -0500 + + Merge build.args when merging services. + + Signed-off-by: Daniel Nephin + +commit 77534e734063a203981df7024fe8ca9228b86930 +Merge: db34a8ba9c a940a07fa9 +Author: Richard Scothern +Date: Wed Feb 10 10:05:49 2016 -0800 + + Merge pull request #1443 from igayoso/patch-1 + + Change certificate hypothetic path + +commit 7b5bad6050e337ca41d8f1a0e80b44787534e92f +Merge: c43b25b0cf 582de19a5a +Author: Aanand Prasad +Date: Wed Feb 10 17:51:01 2016 +0000 + + Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging + + Fix merge behavior for 'networks' and 'network_mode'. + +commit e18eb6ef394522fa44bce7a3b9bb244d45ce9b56 +Merge: 7e44d0ca58 fc6122a947 +Author: David Calavera +Date: Wed Feb 10 08:35:25 2016 -0800 + + Merge pull request #20165 from vdemeester/move-validatecontextdirectory-to-builder + + Move validateContextDirectory to builder package. + +commit c43b25b0cf570114309ed15904867e60f52ea27c +Merge: ab9d82b400 b635647105 +Author: Aanand Prasad +Date: Wed Feb 10 15:58:54 2016 +0000 + + Merge pull request #2827 from loic/patch-1 + + Fixed typo in compose-file.md + +commit ab9d82b400a3ac1dd4f1060b058bd542130da351 +Merge: 88b11afde2 481caa8e48 +Author: Aanand Prasad +Date: Wed Feb 10 15:58:39 2016 +0000 + + Merge pull request #2842 from michael-k/links + + Fixed broken links on pypi + +commit 88b11afde2ffa25e922f6b774db7eba19cfaedad +Merge: 28689a57a7 63870fbccd +Author: Aanand Prasad +Date: Wed Feb 10 15:58:02 2016 +0000 + + Merge pull request #2858 from dnephin/fix_upgrading_url_in_changelog + + Fix upgrading url in changelog + +commit 28689a57a7586f33ba029edea4872b49d28e97d6 +Merge: 6f06b3bd30 59a2920758 +Author: Aanand Prasad +Date: Wed Feb 10 15:57:45 2016 +0000 + + Merge pull request #2871 from yograterol/patch-1 + + Typo into the doc with `networks` in yaml + +commit ab6e07da7d7d1ab9f2b8b0880edf836988227df4 +Author: Aanand Prasad +Date: Wed Feb 10 15:56:50 2016 +0000 + + Fix version in install guide + + Signed-off-by: Aanand Prasad + +commit 7e44d0ca5872290a9b56c0a381bc370a3ffbc603 +Merge: c2ebdb3e57 36a974a1a6 +Author: Phil Estes +Date: Wed Feb 10 09:42:35 2016 -0500 + + Merge pull request #20183 from hypriot/fix-20002-for-multiarch + + Fix TestAuthZPluginAllowEventStream for multiarch + +commit c2ebdb3e573cbbb053eb4644119f3c99a6111bdc +Merge: f9abd42b98 7a948f6a96 +Author: Antonio Murdaca +Date: Wed Feb 10 15:32:51 2016 +0100 + + Merge pull request #19835 from ncdc/resize-after-attach + + Move resize after attaching + +commit f9abd42b98ec1b56cfa5d7d27562e8178136f1ac +Merge: cfa806378e 84705f15d9 +Author: Brian Goff +Date: Wed Feb 10 09:25:55 2016 -0500 + + Merge pull request #20181 from mavenugo/v0.6.1-rc2 + + Vendor libnetwork v0.6.1-rc2 + +commit cfa806378eafd159fce4b1158b215564419680d0 +Merge: e54ac9b3a1 736e93a468 +Author: Brian Goff +Date: Wed Feb 10 09:07:47 2016 -0500 + + Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests + + PPC64LE: Remove testing logrus output from ppc64le + +commit dc8259f0ac094e28c8aae93435951fc336cd1d7b +Author: Dan Walsh +Date: Wed Feb 10 09:03:20 2016 -0500 + + Add a parent man page for docker volumes command + + It is difficult to gather information about docker volumes command + without a parent man page. + + This man page attempts to explain docker volumes and then references + the command man pages. + + Signed-off-by: Dan Walsh + +commit bb443b30b3c79f6ce038be6999a749c8ce4836d6 +Merge: af74afabbc a08742eb72 +Author: Chanwit Kaewkasi +Date: Wed Feb 10 20:58:44 2016 +0700 + + Merge pull request #1787 from arthurbarr/patch-1 + + Fix typo + +commit e54ac9b3a1354daf7dd28f9bfd6fc411a25c4531 +Merge: 61efb4d084 d579490b2b +Author: Sebastiaan van Stijn +Date: Wed Feb 10 13:22:29 2016 +0000 + + Merge pull request #20173 from duglin/FixEnvDoc + + Make it clear that env vars must be simple + +commit a08742eb7225372cd014ef8952844d32f1eeedd8 +Author: Arthur Barr +Date: Wed Feb 10 11:56:09 2016 +0000 + + Fix typo + + Signed-off-by: Arthur Barr + +commit 220604d6ef72aa96e99030a336bbe50cf51d2f1d +Author: Victor Vieux +Date: Wed Feb 10 01:52:29 2016 -0800 + + fix flacky before tests + + Signed-off-by: Victor Vieux + +commit b8a9812b92bdaf51ce6d59da82d9dbb089ab2d4d +Author: Christophe Mehay +Date: Tue Feb 9 11:24:38 2016 +0100 + + Build golang 1.6 in power8 Dockerfile + + Signed-off-by: Christophe Mehay + +commit 3747ec9b9f6a94596be9d2dcc99659d9662cd9a4 +Author: Victor Vieux +Date: Tue Feb 9 21:34:40 2016 -0800 + + change refresh logic with new events + + Signed-off-by: Victor Vieux + +commit 4d1b023ec2b47891cbad14d43870ca3d9a11ffcb +Author: Victor Vieux +Date: Wed Feb 10 00:34:24 2016 -0800 + + remove coverage from the README since we don't use it anymore + + Signed-off-by: Victor Vieux + +commit 5974a4a509f66fe310b5f38be1d0a44694a388ed +Author: Victor Vieux +Date: Wed Feb 10 00:27:05 2016 -0800 + + replace sleep with retry + + Signed-off-by: Victor Vieux + +commit cf2d7b12b117d336ad3d2840b89e3050509c5d00 +Author: Dong Chen +Date: Wed Feb 10 14:02:46 2016 -0800 + + Test reschedule back and forth. + + Signed-off-by: Dong Chen + +commit 5e0b8b99d115bc6b12d930e80aca69fecc7dda78 +Author: Frederick F. Kautz IV +Date: Tue Feb 9 23:26:31 2016 -0800 + + Adding backup key server in install script + + Signed-off-by: Frederick F. Kautz IV + +commit 208ce7d4149cc4d97535fdd971e48d2319b145f8 +Author: Victor Vieux +Date: Tue Feb 9 22:50:29 2016 -0800 + + fix 2 typos + + Signed-off-by: Victor Vieux + +commit 9a431721352d54831b5a8b506ef3362588292a4c +Author: Victor Vieux +Date: Tue Feb 9 22:39:53 2016 -0800 + + add Server Version to docker info + + Signed-off-by: Victor Vieux + +commit 36a974a1a6267828b773de19ed298947c66c4945 +Author: Stefan Scherer +Date: Wed Feb 10 07:28:50 2016 +0100 + + Fix TestAuthZPluginAllowEventStream for multiarch + + Signed-off-by: Stefan Scherer + +commit 1c07446f5ed9241f5c3f0cd1927bdea7e1a02fea +Merge: 15b5a1d10d 3998add3b2 +Author: Nathan LeClaire +Date: Tue Feb 9 21:54:41 2016 -0800 + + Merge pull request #3026 from isp0000/patch-1 + + Missing info when connecting to single esxi host + +commit 84705f15d9b0226fa005cada11cad2ad5aad5179 +Author: Madhu Venugopal +Date: Tue Feb 9 21:46:50 2016 -0800 + + Vendor libnetwork v0.6.1-rc2 + + - Fixes #20132 #20140 #20019 + + Signed-off-by: Madhu Venugopal + +commit 5492f4ab825a1fd972714829f1457042ad48ca67 +Author: Victor Vieux +Date: Sat Feb 6 11:49:56 2016 -0800 + + remove refresh networks + + Signed-off-by: Victor Vieux + +commit 9259bd7133293ae9ce8696a00519ab2d597c5dfb +Author: Brian Bland +Date: Tue Feb 9 19:41:13 2016 -0800 + + [driver/s3] Adds support for ap-northeast-2 region + + Updates docker/goamz dependency + + Signed-off-by: Brian Bland + +commit 3998add3b224d5dc0cfeb76ac3dc451e10cb2d6d +Author: Dalibor Petras +Date: Wed Feb 10 13:40:44 2016 +1100 + + Added backticks to the value ha-datacenter. + + Signed-off-by: Dalibor Petras + +commit 350234898a0b6f15ac38b19e178839ca7c6ba16f +Author: Derek McGowan +Date: Tue Feb 9 18:28:43 2016 -0800 + + Fix schema1 manifest etag and docker content digest header + + When schema2 manifests are rewritten as schema1 currently the etag and docker content digest header keep the value for the schema2 manifest. + + Fixes #1444 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 61efb4d08487623474d6c21d68b0b34a2117da67 +Merge: 321f291324 b41dba58a0 +Author: Tibor Vass +Date: Tue Feb 9 21:13:00 2016 -0500 + + Merge pull request #20135 from vdemeester/20087-fix-since-before-filters + + Fix the since and before filter behavior + +commit db34a8ba9cdd1cb78fb08791025198e65b55046a +Merge: 3f97c258a6 52b4a328dd +Author: Richard Scothern +Date: Tue Feb 9 18:10:03 2016 -0800 + + Merge pull request #1414 from BrianBland/s3ImproveConfigParsing + + Improves flexibility of configuration handling for S3 driver + +commit 15b5a1d10df275a0d1acd179ee1f2c0985ea5a97 +Merge: 5a883fd302 0a2b5ab4d3 +Author: David Gageot +Date: Tue Feb 9 17:36:25 2016 -0800 + + Merge pull request #2838 from mssola/export-session + + libmachine/ssh: export the NativeClient.Session function + +commit 321f2913241145061088769ab887ec7c27a87c70 +Merge: 0b4a7fb06d 07184599f7 +Author: David Calavera +Date: Tue Feb 9 17:30:48 2016 -0800 + + Merge pull request #19661 from shishir-a412ed/tests_rootfs_pr + + Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart + +commit 52b4a328dd73599aff1f588120a9124cab6dd76f +Author: Brian Bland +Date: Tue Feb 2 19:30:48 2016 -0800 + + Improves flexibility of configuration handling for S3 driver + + Treats nil parameters the same as unprovided parameters (fixes issues + where certain parameters are printed to ""). + Accepts "true" and "false" string values for boolean parameters. + + Signed-off-by: Brian Bland + +commit 5a883fd302a21230738e4a4bfb2071f2364751fd +Merge: db1aa13ef2 e4ef6d4098 +Author: Nathan LeClaire +Date: Tue Feb 9 17:23:57 2016 -0800 + + Merge pull request #3027 from jeanlaurent/vwsitch-hint + + Fix #2995 + +commit db1aa13ef254716c379c65f24ade2429c9de2719 +Merge: b692d1e374 c568bb8805 +Author: Nathan LeClaire +Date: Tue Feb 9 17:23:37 2016 -0800 + + Merge pull request #3021 from dhiltgen/harden_aws_mark2 + + Add retry support to AWS driver + +commit 59dc2aba5f8a68dee5b9405c22e7f20773a0f77b +Author: Dalibor Petras +Date: Wed Feb 10 11:54:07 2016 +1100 + + Missing info when connecting to single esxi host + + When connecting to single ESXi host (opposed to vCenter) --vmwarevsphere-datacenter has to be set to "ha-datacenter" + + Signed-off-by: Dalibor Petras + +commit e4ef6d4098d70a92de756eb325be95a7b61d3d05 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 9 16:56:28 2016 -0800 + + Fix #2995 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 0b4a7fb06d4b77265831cee1508aad9fbeddb7a2 +Merge: d6870238e3 dba5a7f243 +Author: Tibor Vass +Date: Tue Feb 9 19:55:57 2016 -0500 + + Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue + + Prevent mqueue from implicitely becoming a bind mount with --ipc=host + +commit a940a07fa9673a4241a73d74800e4187ffde356c +Author: igayoso +Date: Wed Feb 10 01:00:27 2016 +0100 + + Change certificate hypothetic path + + Signed-off-by: igayoso + +commit 59a2920758ca763175093e0f2917d5ead1a117a7 +Author: Yohan Graterol +Date: Tue Feb 9 18:40:44 2016 -0500 + + Typo into the doc with `networks` in yaml + + Signed-off-by: Yohan Graterol + +commit af74afabbc315d37627c71142e4607c09d28c580 +Merge: 4864b775cb f7f7f7a99b +Author: Alexandre Beslic +Date: Tue Feb 9 15:33:42 2016 -0800 + + Merge pull request #1786 from vieux/fix_missing_event_rescheduling + + fix missing event on rescheduling + +commit 4603a7259e133f5fdcb9e7856ca857338b26dd38 +Author: Darren Stahl +Date: Thu Jan 28 12:40:52 2016 -0800 + + Third set of TestBuild* CI enabling for Windows + + Signed-off-by: Darren Stahl + +commit d6870238e329e43d2df291a5f82d27929f9a192d +Merge: b3cb0d196d 6791230320 +Author: David Calavera +Date: Tue Feb 9 15:18:49 2016 -0800 + + Merge pull request #19985 from Microsoft/CombineSetupWorkingDir + + Combine SetupWorkingDirectory for Linux and Windows + +commit b3cb0d196d17aa04ca98292536b1f66e4490bbc5 +Merge: 08d0a8384f a77b7dd227 +Author: David Calavera +Date: Tue Feb 9 15:16:03 2016 -0800 + + Merge pull request #18943 from cpuguy83/fix_write_flusher + + Remove Exists from backend + +commit c568bb8805ab49de7009f699d4da8f2bfac54725 +Author: Daniel Hiltgen +Date: Fri Jan 15 12:46:21 2016 -0800 + + Add retry support to AWS driver + + Some AWS API failures are retryable, so we should give the option to attempt + retries in these cases. One particular example is the API rate limiting that + kicks in if you try to create many machines in parallel. Without this change, + I can only create ~3 machines in parallel, but with this change I can easily + create 10 or more machines in parallel. + + While this change helps `ls`, given the current fan-out model for plugins, once + you get a large number of AWS machines, you'll still wind up seeing + "RequestLimitExceeded: Request limit exceeded." errors. + + Signed-off-by: Daniel Hiltgen + +commit 736e93a468fe8b8530ec5d00b9be7bbd53e306fc +Author: Christopher Jones +Date: Tue Feb 9 18:02:18 2016 -0500 + + Remove testing logrus output from ppc64le + + This removes two tests on ppc64le. + + There is an old bug with a syscall on power #8653, that causes + logrus to default to using logfmt. These two tests look for + logrus format specific strings, and fail if they don't see it. + + Signed-off-by: Christopher Jones + +commit f7f7f7a99b7e60157dae5146b18d900102584198 +Author: Victor Vieux +Date: Tue Feb 9 14:57:20 2016 -0800 + + fix missing event on rescheduling + + Signed-off-by: Victor Vieux + +commit 08d0a8384fdacf3fbb9230194efa18e91e382d56 +Merge: cb4a22b1a9 eed648ac5a +Author: Vincent Demeester +Date: Tue Feb 9 23:19:28 2016 +0100 + + Merge pull request #20059 from Microsoft/10662-TestBuildCI4 + + Fourth set of enabling Builder CI tests for Windows + +commit cb4a22b1a94e77f294e653d2ac07019d7ddf5edd +Merge: fa860c86ff 6241250824 +Author: David Calavera +Date: Tue Feb 9 14:18:51 2016 -0800 + + Merge pull request #20167 from jfrazelle/butts + + remove tasksmax, people on newer kernels can add it themselves + +commit dba5a7f243e6c251176585571419b595172e9402 +Author: Kenfe-Mickael Laventure +Date: Tue Feb 9 11:19:19 2016 -0800 + + Disable TestRunMountshmmqueuefromhost when using userns + + Since we now automatically mount the mqueue device inside the + container (instead of bind mounting the one from the host), when + trying to start a container with --ipc=host, the mount will fail with + EPERM. + + Signed-off-by: Kenfe-Mickael Laventure + +commit f7d4abdc00d521509995da1070215c808fe0fd9c +Author: Kenfe-Mickael Laventure +Date: Mon Feb 8 16:51:45 2016 -0800 + + Prevent mqueue from implicitely becoming a bind mount with --ipc=host + + Currently, when running a container with --ipc=host, if /dev/mqueue is + a standard directory on the hos the daemon will bind mount it allowing + the container to create/modify files on the host. + + This commit forces /dev/mqueue to always be of type mqueue except when + the user explicitely requested something to be bind mounted to + /dev/mqueue. + + Signed-off-by: Kenfe-Mickael Laventure + +commit 056bf9f25ec95a927eb150bef3adea630ce71414 +Author: Aaron Lehmann +Date: Tue Jan 26 11:19:18 2016 -0800 + + Attempt to resume downloads after certain errors + + Signed-off-by: Aaron Lehmann + +commit f425529e7e0a6b15c8cc43f0c1dbb7a42572e30d +Author: Aaron Lehmann +Date: Mon Jan 25 18:20:18 2016 -0800 + + Move temporary download file to download descriptor scope + + This will allow it to be reused between download attempts in a + subsequent commit. + + Signed-off-by: Aaron Lehmann + +commit 624125082414d5ba4a987657a44a8506920da611 +Author: Jessica Frazelle +Date: Tue Feb 9 14:07:23 2016 -0800 + + remove tasksmax, people on newer kernels can add it themselves + + Signed-off-by: Jessica Frazelle + +commit fc6122a947f9eb9fc2f54fb8ba3b9da4531a6b99 +Author: Vincent Demeester +Date: Tue Feb 9 22:19:09 2016 +0100 + + Move validateContextDirectory to builder package. + + This feels like it's where it belongs and it makes it exported + again (which is needed for libcompose that was using it before 1.10). + + Signed-off-by: Vincent Demeester + +commit fa860c86ff0a368e686535c2689d1099fa9ea7a2 +Merge: 10226ac845 7c9e9afeb7 +Author: Brian Goff +Date: Tue Feb 9 14:58:37 2016 -0500 + + Merge pull request #20158 from cpuguy83/carry_19504 + + Dockerfile,contrib,hack: remove buildpack-deps + +commit 6f06b3bd303cea668722ffc4f1c80ba824c1dddc +Merge: 859cc2348c 421981e7d2 +Author: Daniel Nephin +Date: Tue Feb 9 14:56:24 2016 -0500 + + Merge pull request #2853 from dnephin/fix_short_id_alias + + Use 12 characters for the short id + +commit 27fc78abdd2a603479eceded12964356ba971310 +Author: Tomasz Kopczynski +Date: Tue Feb 9 20:37:33 2016 +0100 + + Before and since filters documentation + + Signed-off-by: Tomasz Kopczynski + +commit a77b7dd2278106b9081d0ef2260fbeea790a91ef +Author: Brian Goff +Date: Tue Jan 5 16:23:24 2016 -0500 + + cleanup attach api calls + + Signed-off-by: Brian Goff + +commit 3434860d54d547167d08fdcf3aefaaab06aff2c0 +Author: Brian Goff +Date: Tue Dec 29 23:29:31 2015 -0500 + + Fix horribly broken TestGetContainerStatsNoStream + + Signed-off-by: Brian Goff + +commit ae4ee974e80c5d650fdcbc0a6f5ab3245a7f1689 +Author: Brian Goff +Date: Sat Dec 19 09:43:10 2015 -0500 + + Move stream flushes to backend + + Signed-off-by: Brian Goff + +commit 96f1a1a10b63ac446f0d9da8521cd871212a1063 +Author: Brian Goff +Date: Fri Dec 18 16:06:28 2015 -0500 + + Cleanup WriteFlusher + + Signed-off-by: Brian Goff + +commit 10226ac845e5a13350c5c4e5667cc2602c196112 +Merge: a03c2a005a c3985bdf79 +Author: David Calavera +Date: Tue Feb 9 10:47:30 2016 -0800 + + Merge pull request #19983 from srust/volume_get_compat_hack + + [1.10] Fix volume driver API compatibility mode (a little) + +commit 4864b775cb77fbbf0f611163288cb4cdf8782742 +Merge: 3f9a8b6bbe 95e97d6151 +Author: Victor Vieux +Date: Tue Feb 9 10:38:01 2016 -0800 + + Merge pull request #1784 from nishanttotla/install-machine-typo + + Fixing typo in install w machine doc + +commit a03c2a005a0928e7e847be26c8fefd4f30a8d816 +Merge: 9f2f52de8e 1435c9ea21 +Author: Sebastiaan van Stijn +Date: Tue Feb 9 18:14:30 2016 +0000 + + Merge pull request #20157 from chadswen/fix-typo-toolbox-upgrade + + Fix typo in Docker Toolbox upgrade section + +commit 7c9e9afeb78ad3265c2ec5d4c6969c0d6182af2b +Author: Brian Goff +Date: Tue Feb 9 13:13:38 2016 -0500 + + use debian:jessie for ensure-syscall-test + + Signed-off-by: Brian Goff + +commit 9f2f52de8e6412738457b7b6846d2d9037bef6a1 +Merge: d2a2f5bedc 7e31a96d22 +Author: Sebastiaan van Stijn +Date: Tue Feb 9 17:39:35 2016 +0000 + + Merge pull request #20090 from albers/completion-map-values + + Improve key specific bash subcompletions + +commit 1435c9ea21d6c76a923c2501abb840e899b5ed1e +Author: Chad Swenson +Date: Tue Feb 9 11:36:45 2016 -0600 + + Fix typo in Docker Toolbox upgrade section + + Signed-off-by: Chad Swenson + +commit d2a2f5bedc1c3bfca6423b647c0186f65cd31012 +Merge: 01a1925792 df636ef45a +Author: Alexander Morozov +Date: Tue Feb 9 09:10:44 2016 -0800 + + Merge pull request #20117 from twistlock/userns_tests + + Move userns cli test to a separate file, remove experimental flag + +commit 95e97d6151b1550fd5b8c7159ff156f5c2580fec +Author: Nishant Totla +Date: Tue Feb 9 08:54:49 2016 -0800 + + Fixing typo in install w machine doc + + Signed-off-by: Nishant Totla + +commit 01a19257923af7fc02bb24113148818a0facb441 +Merge: f5ed72c931 041a9510c6 +Author: David Calavera +Date: Tue Feb 9 07:47:58 2016 -0800 + + Merge pull request #20130 from Microsoft/sjw/windows_save_fix + + Fixing 'docker save' on Windows. + +commit 07184599f71af0ef5b29d025bf1eae6432ae37f3 +Author: Shishir Mahajan +Date: Thu Feb 4 10:05:41 2016 -0500 + + Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart + + Signed-off-by: Shishir Mahajan + +commit 481caa8e480aa044e1a00f707c4b9af76677b457 +Author: Michael Käufl +Date: Sat Feb 6 22:10:22 2016 +0100 + + Used absolute links in readme + + This prevents links being broken on pypi + (e.g. https://pypi.python.org/pypi/docs/index.md#features) + + Signed-off-by: Michael Käufl + +commit f5ed72c931d373bd56069d44ba3b7370acd1f475 +Merge: ac9d1b7b47 58427fd8a6 +Author: Sebastiaan van Stijn +Date: Tue Feb 9 09:59:26 2016 +0000 + + Merge pull request #20116 from muthu-r/master + + Add Horcrux volume plugin to plugins.md + +commit b41dba58a01855e0d222bd6c14af9874c298c154 +Author: Vincent Demeester +Date: Tue Feb 9 09:06:29 2016 +0100 + + Fix the since and before filter behavior + + Filters should not include stopped container if `-a` is not specified. + Right now, before and since filter are acting as --before and --since + deprecated flags. This commit is fixing that. + + Signed-off-by: Vincent Demeester + +commit df636ef45addcb6ff2555e3da2bc61fc25cc5603 +Author: Liron Levin +Date: Mon Feb 8 22:07:04 2016 +0200 + + Move userns cli test to a separate file, remove experimental flag + + Signed-off-by: Liron Levin + +commit c3985bdf797a4526eac5fb0bd92047ac0f8513d9 +Author: Stephen Rust +Date: Tue Feb 2 11:35:05 2016 -0500 + + Fix volume driver API compatibility mode (a little) + + Signed-off-by: Stephen Rust + +commit 3f9a8b6bbeb8d0f86d9c88fbe0140d13cf5e12d1 +Merge: c31ce7475d 3f7a035855 +Author: Dongluo Chen +Date: Mon Feb 8 19:54:29 2016 -0800 + + Merge pull request #1774 from abronan/extract_leadership + + Extract leadership package and update Godeps + +commit c31ce7475d9917e0546047091d475ca6e9566613 +Merge: 62c86799ea c7eb7ee52f +Author: moxiegirl +Date: Mon Feb 8 18:19:03 2016 -0800 + + Merge pull request #1764 from dongluochen/tlsDoc + + Update configure-tls.md + +commit 62c86799eab2f5cb70ec099fc5b6d0564e3d4376 +Merge: 17908da2fd 27d9fde0af +Author: moxiegirl +Date: Mon Feb 8 18:13:00 2016 -0800 + + Merge pull request #1775 from nishanttotla/fix-swarm-machine + + Fixing Swarm Install with Machine doc + +commit 17908da2fd143dda55eab737fad1fa45843ac01a +Merge: 7447576786 367acee2b7 +Author: Nishant Totla +Date: Mon Feb 8 18:11:08 2016 -0800 + + Merge pull request #1776 from vieux/update_travis_1.5.3 + + update travis to go 1.5.3 + +commit 041a9510c671ecf4724bf15388fdb9de549b04ed +Author: Stefan J. Wernli +Date: Mon Feb 8 15:40:12 2016 -0800 + + Fixing 'docker save' on Windows. + + Save was failing file integrity checksums due to bugs in both + Windows and Docker. This commit includes fixes to file time handling + in tarexport and system.chtimes that are necessary along with + the Windows platform fixes to correctly support save. With this + change, sysfile_backups for windowsfilter driver are no longer + needed, so that code is removed. + + Signed-off-by: Stefan J. Wernli + +commit 27d9fde0afa1975198b55fb7ba0bdce60af39099 +Author: Nishant Totla +Date: Mon Feb 8 16:46:09 2016 -0800 + + Fixing Swarm Install with Machine doc + + Signed-off-by: Nishant Totla + +commit d579490b2bd2396c74a48c5c6f41ffc94cd4febd +Author: Doug Davis +Date: Mon Feb 8 17:50:59 2016 -0800 + + Make it clear that env vars must be simple + + Closes #20169 + + Signed-off-by: Doug Davis + +commit 7447576786bc40892ce5bacd4c4688a2eb736069 +Merge: 31a3b07b08 9a45eaedbd +Author: Victor Vieux +Date: Mon Feb 8 17:39:22 2016 -0800 + + Merge pull request #1746 from vieux/use_alpine_golang + + use golang:1.5.3-alpine in Dockerfile + +commit 3f7a0358552380f3d950f7c117d82a06f953f20c +Author: Alexandre Beslic +Date: Mon Feb 8 16:55:32 2016 -0800 + + extract leadership package in its own repository and update Godeps + + Signed-off-by: Alexandre Beslic + +commit b692d1e374ff88389ff9bd7e23feeeb1fd427b13 +Merge: 51417fe8a8 7dcd2c7b25 +Author: Nathan LeClaire +Date: Mon Feb 8 16:35:54 2016 -0800 + + Merge pull request #3019 from pdalpra/warn-no-upgrade-explicit-b2d-url + + Warn that Boot2Docker ISO won't be auto upgraded if its URL is explicitly set + +commit f62a8b3078b7837dafbae89e39ccbcdc2b38fab4 +Merge: 3b3026c121 7a751e5f78 +Author: Diogo Mónica +Date: Mon Feb 8 16:16:10 2016 -0800 + + Merge pull request #535 from endophage/official_mysql_image + + Use official mariadb image + +commit 7dcd2c7b2532d937264fcc69f08343cca3038551 +Author: Pierre DAL-PRA +Date: Tue Feb 9 00:32:29 2016 +0100 + + Warn that Boot2Docker ISO won't be auto upgraded if its URL is explicitly set + + Signed-off-by: Pierre DAL-PRA + +commit 30633d10a01c9877e2c0ede5eac84b6083f9eff0 +Author: Dong Chen +Date: Mon Feb 8 15:18:09 2016 -0800 + + Verify rescheduled containers are started properly. + + Signed-off-by: Dong Chen + +commit 58427fd8a684f0e4b999d99d6a123b40112d2094 +Author: Muthukumar R +Date: Mon Feb 8 12:01:11 2016 -0800 + + Add Horcrux volume plugin to plugins.md + + Signed-off-by: Muthukumar R + +commit 63870fbccd45678917f3b0889d4935440dc8f7f8 +Author: Daniel Nephin +Date: Mon Feb 8 18:15:21 2016 -0500 + + Fix upgrading url. + + Signed-off-by: Daniel Nephin + +commit ac9d1b7b47c8fb429f7f84477a042dd9d58e858f +Merge: 8c6887c54d 47dbb59e5b +Author: David Calavera +Date: Mon Feb 8 15:06:53 2016 -0800 + + Merge pull request #20118 from aditirajagopal/20110-update-client-lib-projects + + Update List of Client Library Projects + +commit 3f97c258a69baf6e36448878223d42b89c765b17 +Merge: ee3b7ff76f f37b2ee16e +Author: Richard Scothern +Date: Mon Feb 8 14:57:04 2016 -0800 + + Merge pull request #1404 from RichardScothern/delete-events + + Send manifest and blob delete events to the notifications subsystem. + +commit 8c6887c54d033107d66ca70f0c84736fe4b90775 +Merge: 3846951fce 06d8f504f7 +Author: Tibor Vass +Date: Mon Feb 8 17:54:49 2016 -0500 + + Merge pull request #19772 from calavera/decouple-server-routers + + [Carry 19133] Decouple server routers from the daemon package. + +commit 3846951fce14d7e66a9e51fefcaadece47bd5ab4 +Merge: 54b67fe12f 9bc771af9d +Author: David Calavera +Date: Mon Feb 8 14:48:34 2016 -0800 + + Merge pull request #20106 from jfrazelle/go-generate-json-default-profile + + add default seccomp profile as json + +commit 7a751e5f78759626589df85ff008997ca8f49379 +Author: David Lawrence +Date: Mon Feb 8 14:18:07 2016 -0800 + + lots of final minor improvements to setup. + Signed-off-by: David Lawrence (github: endophage) + +commit 47dbb59e5b5d3472f9391e965131015d83d614a4 +Author: Aditi Rajagopal +Date: Mon Feb 8 14:13:14 2016 -0600 + + Update List of Client Library Projects + + Resolves: #20110 + Signed-off-by: Aditi Rajagopal + +commit 31a3b07b089229a2828a460160bddffea2faa658 +Merge: 8f697912fe 6f58c870a4 +Author: Alexandre Beslic +Date: Mon Feb 8 14:16:23 2016 -0800 + + Merge pull request #1772 from vieux/update-compose + + update compose in tests to 1.6.0 + +commit 27c8737bdc93e4d33b1e43528afe94c25a74e417 +Author: Riyaz Faizullabhoy +Date: Fri Feb 5 10:49:10 2016 -0800 + + refactor ImportRoleKey, simplify integration test code, update constants + + Signed-off-by: Riyaz Faizullabhoy + +commit 0fdb2d189119709576f82508281f30fbc940a81e +Author: Riyaz Faizullabhoy +Date: Wed Feb 3 22:34:12 2016 -0800 + + update positive tests + + Signed-off-by: Riyaz Faizullabhoy + +commit c66584989eee940f3075592397d63408ec9d002e +Author: Riyaz Faizullabhoy +Date: Wed Feb 3 17:34:22 2016 -0800 + + add checks to CLI command for role and gun + + Signed-off-by: Riyaz Faizullabhoy + +commit caa9581bccf0d1067f3e17d5baa3a0cc74f60dc2 +Author: Riyaz Faizullabhoy +Date: Tue Feb 2 15:35:36 2016 -0800 + + add tests, consts and fixup + + Signed-off-by: Riyaz Faizullabhoy + +commit 690fcb96da204e146701a03eeb31aa370ab0606d +Author: Riyaz Faizullabhoy +Date: Tue Feb 2 14:40:18 2016 -0800 + + rework import key + + Signed-off-by: Riyaz Faizullabhoy + +commit 12fd5aa2460dcfae5cc09a30740cb0623ae086be +Author: Riyaz Faizullabhoy +Date: Tue Feb 2 14:21:19 2016 -0800 + + rework export key + + Signed-off-by: Riyaz Faizullabhoy + +commit f37b2ee16edacb923d1110e657f6e5004a8331dc +Author: Richard Scothern +Date: Thu Jan 28 09:56:37 2016 -0800 + + Send manifest and blob delete events to the notifications subsystem. + + Signed-off-by: Richard Scothern + +commit fd7ccc0bdfbbde47dd8dc6356c96a6ee43232229 +Author: Richard Scothern +Date: Mon Feb 1 11:34:30 2016 -0800 + + Add documentation about what is sent for delete events + Signed-off-by: Richard Scothern + +commit 54b67fe12fb20bdd920d0335f70720ca3e60f505 +Merge: 14c63189a1 af614a19dc +Author: Tibor Vass +Date: Mon Feb 8 16:21:50 2016 -0500 + + Merge pull request #19711 from coolljt0725/fix_19679 + + Clean up container rootf mounts on daemon start, fixes #19679 + +commit 3024604054a588f213b671c7f1ec5eed2c99b78a +Author: Aditi Rajagopal +Date: Fri Feb 5 16:45:02 2016 -0600 + + Overlay Network needs Unique Hostname + + Resolves: #19301 + Signed-off-by: Aditi Rajagopal + +commit 9bc771af9d09026111916191394eb2896608eb59 +Author: Jessica Frazelle +Date: Mon Feb 8 10:52:53 2016 -0800 + + add validation for generating default secccomp profile + + Signed-off-by: Jessica Frazelle + +commit 582de19a5a2402d492e67339da46d8c8e2c70d53 +Author: cr7pt0gr4ph7 +Date: Mon Feb 8 21:57:15 2016 +0100 + + Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. + + Signed-off-by: cr7pt0gr4ph7 + +commit 78efd68886846fa50cc4211288efd3359d777885 +Author: Stefan Scherer +Date: Mon Feb 8 21:39:10 2016 +0100 + + Add NoVTXCheck while starting VM + + Signed-off-by: Stefan Scherer + +commit 14c63189a1dec205b9e2d64482cff30a1af6b5ac +Merge: 4c807379cb 878a0dc85c +Author: David Calavera +Date: Mon Feb 8 11:22:33 2016 -0800 + + Merge pull request #20109 from thaJeztah/add_tcp_tls_proto + + Fix 'tcp+tls' protocol not being accepted + +commit 4c807379cbd7e18a7072e458c4b1692cfaa873c3 +Merge: efdbe2ba5a 1cc950b52e +Author: Jess Frazelle +Date: Mon Feb 8 14:19:42 2016 -0500 + + Merge pull request #20112 from endophage/notary_go15 + + adding note about go version 1.5 requirement for hardware signing + +commit 859cc2348c821f5985a59697dead7253575875cc +Merge: fdf4a2e89e 8acb5e17e8 +Author: Daniel Nephin +Date: Mon Feb 8 14:19:40 2016 -0500 + + Merge pull request #2744 from aanand/pytest-ini + + Add pytest.ini + +commit fdf4a2e89e6a2e5619b1e466b70ed742cd7c62fb +Merge: 28e652daec 677c50650c +Author: Joffrey F +Date: Mon Feb 8 11:17:54 2016 -0800 + + Merge pull request #2734 from jrabbit/empty-env-var-2359 + + Empty env var #2359 + +commit 26da52d4a5ae101c638ea5b093f7262a744251f0 +Author: Jessica Frazelle +Date: Mon Feb 8 10:57:04 2016 -0800 + + get os arch for release script + + Signed-off-by: Jessica Frazelle + +commit ee3b7ff76fd58540abcdeade486de767c9e99fe1 +Merge: 55fbf54da0 950d34d210 +Author: Stephen Day +Date: Mon Feb 8 10:53:18 2016 -0800 + + Merge pull request #1434 from aaronlehmann/uppercase-in-hostname + + Allow uppercase characters in hostnames + +commit 1cc950b52ecd990016275f7df3bb21685284c79a +Author: David Lawrence +Date: Mon Feb 8 10:25:02 2016 -0800 + + adding note about go version 1.5 requirement for hardware signing + Signed-off-by: David Lawrence (github: endophage) + +commit 3b3026c121c3d2aa9893c6e32b72e2440356e10a +Merge: 8d2029bc89 1c4d02455b +Author: Diogo Mónica +Date: Mon Feb 8 10:21:38 2016 -0800 + + Merge pull request #542 from docker/passwd-nonroot + + add non-root passwd functionality + +commit efdbe2ba5a3b73b61d19393c87c5da0807f5f2a9 +Merge: 862f073694 a3c290536a +Author: David Calavera +Date: Mon Feb 8 09:54:23 2016 -0800 + + Merge pull request #20068 from ilkka/patch-1 + + Tweak VM volume mapping paragraph + +commit 06d8f504f7b1883f490b5deda5a30ef9acd99f95 +Author: David Calavera +Date: Wed Jan 27 17:09:42 2016 -0500 + + Move backend types to their own package. + + - Remove duplicated structs that we already have in engine-api. + + Signed-off-by: David Calavera + +commit 878a0dc85cacfcf0005d3d2487f6d3266c31552d +Author: Sebastiaan van Stijn +Date: Mon Feb 8 17:29:01 2016 +0000 + + Fix 'tcp+tls' protocol not being accepted + + Signed-off-by: Sebastiaan van Stijn + +commit 421981e7d26bd5a5558d1bfdc8079749b15bb7bf +Author: Daniel Nephin +Date: Mon Feb 8 12:18:48 2016 -0500 + + Use 12 characters for the short id to match docker and fix backwards compatibility. + + Signed-off-by: Daniel Nephin + +commit 862f073694e3b60b89e099cdf12cfb8ec1a6a9e8 +Merge: e6573a5d18 5ffc810df2 +Author: Alexander Morozov +Date: Mon Feb 8 09:10:39 2016 -0800 + + Merge pull request #20002 from twistlock/19575_authz_plugin_support_events + + Fix 19575: Docker events doesn't work with authorization plugin + +commit dd93571c69cc5284f695a21d5504fb57b1a4891a +Author: Lukas Waslowski +Date: Wed Dec 30 18:20:41 2015 +0100 + + Decouple the "container" router from the actual daemon implementation. + + This is done by moving the following types to api/types/config.go: + - ContainersConfig + - ContainerAttachWithLogsConfig + - ContainerWsAttachWithLogsConfig + - ContainerLogsConfig + - ContainerStatsConfig + + Remove dependency on "version" package from types.ContainerStatsConfig. + Decouple the "container" router from the "daemon/exec" implementation. + + * This is done by making daemon.ContainerExecInspect() return an interface{} + value. The same trick is already used by daemon.ContainerInspect(). + + Improve documentation for router packages. + Extract localRoute and router into separate files. + Move local.router to image.imageRouter. + + Changes: + - Move local/image.go to image/image_routes.go. + - Move local/local.go to image/image.go + - Rename router to imageRouter. + - Simplify imports for image/image.go (remove alias for router package). + + Merge router/local package into router package. + Decouple the "image" router from the actual daemon implementation. + Add Daemon.GetNetworkByID and Daemon.GetNetworkByName. + Decouple the "network" router from the actual daemon implementation. + + This is done by replacing the daemon.NetworkByName constant with + an explicit GetNetworkByName method. + + Remove the unused Daemon.GetNetwork method and the associated constants NetworkByID and NetworkByName. + + Signed-off-by: Lukas Waslowski + Signed-off-by: David Calavera + +commit d57816de0293e18ecfa68ac6e8c288a888912e33 +Author: Jessica Frazelle +Date: Mon Feb 8 08:19:21 2016 -0800 + + add default seccomp profile as json + + profile is created by go generate + + Signed-off-by: Jessica Frazelle + +commit e6573a5d18c3045fb021668f3c7539ffa52696fe +Merge: c30a8f42cb ba38d58659 +Author: Jess Frazelle +Date: Mon Feb 8 10:57:15 2016 -0500 + + Merge pull request #19876 from rhatdan/mqueue + + Make mqueue container specific + +commit 5bd88f634fc35becf3644d0ffadd6ebc39be93ea +Author: Lukas Waslowski +Date: Mon Feb 8 15:33:26 2016 +0100 + + Handle the 'network_mode' key when merging multiple compose files. + + Fixes docker/compose#2840. + + Signed-off-by: Lukas Waslowski + +commit 5a3a10d43bba5882f2e41824d2040ed6ad9e1874 +Author: Lukas Waslowski +Date: Mon Feb 8 15:17:21 2016 +0100 + + Correctly merge the 'services//networks' key in the case of multiple compose files. + + Fixes docker/compose#2839. + + Signed-off-by: Lukas Waslowski + +commit e929086c49225c9dcbd723eab80861059a5c7271 +Author: Lukas Waslowski +Date: Mon Feb 8 14:29:03 2016 +0100 + + Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. + + Signed-off-by: Lukas Waslowski + +commit 8f697912fe915a6739dbf45e4e10aac95a091b9b +Merge: c9ee9af4d3 c48aa79979 +Author: Victor Vieux +Date: Sun Feb 7 20:01:34 2016 -0800 + + Merge pull request #1768 from moxiegirl/fix-link-stuff + + Fixing links after move of repo + +commit c48aa79979ef9f60b8e7e5d086e21a4cd3b28333 +Author: Mary Anthony +Date: Sun Feb 7 19:52:22 2016 -0800 + + Fixing links after move of repo + + Signed-off-by: Mary Anthony + +commit c30a8f42cb11b0db07ae1c4eadcd6bf453f6f7dd +Merge: 415dd86886 2da61086ea +Author: David Calavera +Date: Sun Feb 7 19:06:49 2016 -0800 + + Merge pull request #20060 from mavenugo/cos + + Vendor libnetwork v0.6.1-rc1 + +commit 7e31a96d220fe53e101c35332f5772ff42bcd092 +Author: Harald Albers +Date: Sun Feb 7 10:05:43 2016 -0800 + + Improve key specific bash subcompletions + + The obscure `case "${words[$cword-2]}$prev=" in` idiom is no + longer used for key specific completions in options with map values. + + The `__docker_map_key_of_current_option()` function does a much + better job. + + Signed-off-by: Harald Albers + +commit 6f9bd6c1b87ca876617b349e00f5e51cc3ef716c +Author: Harald Albers +Date: Sun Feb 7 10:02:30 2016 -0800 + + Check key specific bash subcompletions first + + This is a refactoring in preparation of cleaning up the handling + of key specific subcompletions. + + The new `__docker_map_key_of_current_option()` function will be used + instead of the `__docker_map_key_of_current_option()` idiom in the + following commit. + As this function is very specific, checks using it should be executed + before those checking for `$prev`. + + This commit just moves the checks without any modification. + + Signed-off-by: Harald Albers + +commit 415dd8688618ac2b3872c6a5b5af3afcef2c3e10 +Merge: 534bad6010 e9ab596238 +Author: Alexander Morozov +Date: Sun Feb 7 08:59:36 2016 -0800 + + Merge pull request #20078 from cpuguy83/carry_17329 + + Carry 17329 + +commit 534bad6010fffd66ed07a84eaf96d8b63cd51ecf +Merge: 78f2b8d87d 78ba5d58e6 +Author: Sebastiaan van Stijn +Date: Sun Feb 7 16:34:12 2016 +0000 + + Merge pull request #20075 from eallrich/20074-fix-docker-inspect-command + + Adding --format= flag + +commit 367acee2b714a28b4dfe6df781a7b8b3bca04639 +Author: Victor Vieux +Date: Sat Feb 6 11:32:37 2016 -0800 + + update travis to go 1.5.3 + + Signed-off-by: Victor Vieux + +commit c7eb7ee52f73cb8249ec7eba73c0c05dcbbd720d +Author: Victor Vieux +Date: Sat Feb 6 10:57:13 2016 -0800 + + remove build step + + Signed-off-by: Victor Vieux + +commit e9ab5962384f743cb880add60ff27407a1098869 +Author: Brian Goff +Date: Sat Feb 6 13:46:21 2016 -0500 + + carry 17329 + + Signed-off-by: Brian Goff + +commit 78ba5d58e6280f879fa45dd4c73f8284dd4ec031 +Author: Evan Allrich +Date: Sat Feb 6 09:39:20 2016 -0600 + + Adding --format= flag + + Signed-off-by: Evan Allrich + +commit 6f58c870a40e4262a67d074a26d95a6df0c4f626 +Author: Victor Vieux +Date: Sat Feb 6 05:42:50 2016 -0800 + + update compose in tests to 1.6.0 + + Signed-off-by: Victor Vieux + +commit a3c290536a844fd57326a2c2776adbfdc84cc984 +Author: Ilkka Laukkanen +Date: Sat Feb 6 13:27:20 2016 +0200 + + Tweak VM volume mapping paragraph + + The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear. + + Signed-off-by: Ilkka Laukkanen + +commit 78f2b8d87d0fb952d7998d38d48c35ccf4233c0f +Merge: a70d9957c3 4852932494 +Author: Antonio Murdaca +Date: Sat Feb 6 10:38:35 2016 +0100 + + Merge pull request #20058 from tonistiigi/fix-parent-reset + + Clear old parent reference on resetting image parent + +commit 677c50650c86b4b6fabbc21e18165f2117022bbe +Author: jrabbit +Date: Sat Feb 6 02:54:06 2016 -0500 + + Change special case from '_', None to () + + Signed-off-by: jrabbit + +commit 2da61086ea0f7d06108f1ec4ba082f74d2c1c671 +Author: Madhu Venugopal +Date: Fri Feb 5 18:20:22 2016 -0800 + + Vendor libnetwork v0.6.1-rc1 + + - Fixes #20026. Programming iptables in container use native API. + + Signed-off-by: Madhu Venugopal + +commit 950d34d21087350a2d97a835c23abaaa8d7b7978 +Author: Aaron Lehmann +Date: Fri Feb 5 16:00:12 2016 -0800 + + Allow uppercase characters in hostnames + + This allows hostnames to contain uppercase characters, matching behavior + in Docker versions before 1.10. It does not attempt to canonicalize + hostnames into a lowercase format before parsing, since this could lead + to corner cases (for example, making Hostname.Domain.Com/ref ambiguous + on a daemon which contains references for both hostname.domain.com/ref + and Hostname.Domain.Com/ref). + + Fixes: #1433 + + Signed-off-by: Aaron Lehmann + +commit a70d9957c360bf137d20ff4e65b84465362e0686 +Merge: b3bacb42af 1cceb854a7 +Author: Brian Goff +Date: Fri Feb 5 20:52:07 2016 -0500 + + Merge pull request #20049 from kesarion/patch-1 + + added dockerizer library + +commit eed648ac5ac50a17a5202bd7a0b00738727f9e0f +Author: Darren Stahl +Date: Fri Feb 5 17:46:06 2016 -0800 + + Fourth set of enabling Builder CI tests for Windows + + Signed-off-by: Darren Stahl + +commit 3cf000a852d4c5dff4557adee4e7efbb41269618 +Author: David Lawrence +Date: Fri Feb 5 17:40:23 2016 -0800 + + use named volume and fix env service names + Signed-off-by: David Lawrence (github: endophage) + +commit 4852932494b6e13b669937c0e27f0434513f5ad5 +Author: Tonis Tiigi +Date: Fri Feb 5 17:04:44 2016 -0800 + + Clear old parent reference on resetting image parent + + On migration 2 different images can end up with same + content addressable ID, meaning `SetParent` will be called + multiple times. Previous version did not clear the old + in-memory reference. + + Signed-off-by: Tonis Tiigi + +commit b3bacb42afeb66f7de594ef5b0433a23697f6753 +Merge: a93cb2b856 f5afe02b69 +Author: Jess Frazelle +Date: Fri Feb 5 15:40:27 2016 -0800 + + Merge pull request #20054 from jfrazelle/fix-generation + + fix deb generate + +commit a93cb2b856381dcedbada4fc5b3d3855cfa32fb9 +Merge: fa8f4aa539 aef0995b02 +Author: David Calavera +Date: Fri Feb 5 15:32:43 2016 -0800 + + Merge pull request #20045 from estesp/zfs-userns-permissions-fix + + Fix ZFS permissions bug with user namespaces + +commit f5afe02b695c7c286f035087cb645efcf69ffcd3 +Author: Jessica Frazelle +Date: Fri Feb 5 15:31:12 2016 -0800 + + fix deb generate + + Signed-off-by: Jessica Frazelle + +commit 55fbf54da00e98865f233bff65c4c57112101405 +Merge: dd58349b35 bf1398e514 +Author: Richard Scothern +Date: Fri Feb 5 15:25:28 2016 -0800 + + Merge pull request #1432 from docker/ceph-build-fix + + Attempt to unblock the ceph build process + +commit e96c22272276f51e458c0e60b31fb3afc1b1869a +Author: Dong Chen +Date: Fri Feb 5 14:09:22 2016 -0800 + + Update configure-tls.md. + + Signed-off-by: Dong Chen + +commit fa8f4aa5395349fafc9e20e579e4973ededb2d9e +Merge: 25941b5020 7f275315ed +Author: David Calavera +Date: Fri Feb 5 14:08:20 2016 -0800 + + Merge pull request #20050 from tomxtobin/fix-at-sign-docs + + Fix mention of at sign in docs + +commit 8d2029bc898536a6351cf3e458e3e8e5f8b49c8a +Merge: d4971ddb0c 77cc1a0028 +Author: Diogo Mónica +Date: Fri Feb 5 14:02:41 2016 -0800 + + Merge pull request #545 from docker/use-go-connections + + Use go-connections, and TLS flags for notary client + +commit bf1398e514af4854e75da86c650121bb4f42707b +Author: Richard Scothern +Date: Fri Feb 5 12:54:51 2016 -0800 + + Attempt to unblock the ceph build process + + Signed-off-by: Richard Scothern + +commit 1cceb854a7526eeb5b91be72cedf571af01bc009 +Author: Alexandru Sfirlogea +Date: Fri Feb 5 23:32:11 2016 +0200 + + added dockerizer library + + Signed-off-by: Kesarion + Signed-off-by: Alexandru Sfirlogea + +commit 7f275315edc73027b3d144da439b00fa6565baec +Author: Tom X. Tobin +Date: Fri Feb 5 16:47:57 2016 -0500 + + Fix mention of at sign in docs + + The at sign (`@`) was being referred to in the documentation as an + ampersand (`&`). + + Signed-off-by: Tom X. Tobin + +commit e6badec15549bd91da70783e8f8c07d5f06ea9c5 +Author: Alexandre Vazquez +Date: Fri Feb 5 22:40:35 2016 +0100 + + Fixes #1206 . In this PR we allow to add new ports using the Ports tab inside the Settings section. It also allows to remove them using the same form. + + We include a button with an icon to remove and add ports as needed and the GUI follows the same approach that the one to add environment variables. + + Signed-off-by: Alexandre Vázquez alexandre.vazquez@gmail.com + +commit c9ee9af4d3d83c1e7bde51c35514ecf308535a93 +Merge: ba03f68b74 d8ef7046a7 +Author: Victor Vieux +Date: Fri Feb 5 13:39:31 2016 -0800 + + Merge pull request #1743 from vieux/new_maintainers + + add amitshukla, moxiegirl and nishanttotla to the MAINTAINERS file + +commit 25941b50206db3311f83a532ecfa8725b0b8ffab +Merge: f7f1730316 b2e27fee53 +Author: Brian Goff +Date: Fri Feb 5 16:35:12 2016 -0500 + + Merge pull request #20003 from liubogithub/btrfs + + Graphdriver/btrfs: Avoid using single d.Get() + +commit f7f1730316d97d7077e3d311e54278f46e440d95 +Merge: 9f0095f14a b3d66ff010 +Author: David Calavera +Date: Fri Feb 5 13:31:30 2016 -0800 + + Merge pull request #20038 from doertedev/master + + Grep for installed AND held packages. + +commit 9f0095f14a007950a17b000f268bb29ac5a5fa5c +Merge: 66af3cad7a 4d437a29d2 +Author: Alexander Morozov +Date: Fri Feb 5 12:58:53 2016 -0800 + + Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads + + Vendor updated distribution for resumable downloads + +commit 66af3cad7a291219595b88935c76225cdeefe520 +Merge: 1573960dca 6ab52f9f00 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 21:36:35 2016 +0100 + + Merge pull request #20035 from thaJeztah/add-seccomp-compatibility-note + + Add note that seccomp 2.2.1 or higher is required + +commit 5ffc810df22c3779b4df8ce28d94e4bf89d34e2f +Author: Liron Levin +Date: Thu Feb 4 17:41:41 2016 +0200 + + Fix 19575: Docker events doesn't work with authorization plugin + + To support the requirement of blocking the request after the daemon + responded the authorization plugin use a `response recorder` that replay + the response after the flow ends. + + This commit adds support for commands that hijack the connection and + flushes data via the http.Flusher interface. This resolves the error + with the event endpoint. + + Signed-off-by: Liron Levin + +commit 6ab52f9f00968e15e8dcae145dbaea04da394d83 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 16:53:45 2016 +0100 + + Add note that seccomp 2.2.1 or higher is required + + Signed-off-by: Sebastiaan van Stijn + +commit dd58349b355f346a020a08b2fd9306549293c4ef +Merge: 5e4ea38a2f 4354f0a107 +Author: Richard Scothern +Date: Fri Feb 5 12:14:01 2016 -0800 + + Merge pull request #1419 from aaronlehmann/safer-header-copying + + On redirect, only copy headers when they don't already exist in the redirected request + +commit aef0995b02a5a90ad74e6d91901d7bc8a9713796 +Author: Phil Estes +Date: Fri Feb 5 14:37:33 2016 -0500 + + Fix ZFS permissions bug with user namespaces + + Fix root directory of the mountpoint being owned by real root. This is + unique to ZFS because of the way file mountpoints are created using the + ZFS tooling, and the remapping that happens at layer unpack doesn't + impact this root (already created) holding directory for the layer. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 7761a70389cc3a6a2296856a1e1e7d46aca27bee +Author: Aaron Lehmann +Date: Mon Jan 18 10:19:36 2016 -0800 + + Add information about manifest content types to API spec + + Bring the spec up to date for schema2 changes. + + Signed-off-by: Aaron Lehmann + +commit 6791230320fa9f8ae9df3e90d5c52d85621828a0 +Author: Darren Stahl +Date: Wed Jan 27 13:03:09 2016 -0800 + + Combine SetupWorkingDirectory for Linux and Windows + + Signed-off-by: Darren Stahl + +commit b3d66ff010268e1f63f5555508833dcf3604f0b6 +Author: Stefan Staudenmeyer +Date: Fri Feb 5 18:55:39 2016 +0100 + + Use grep -qE instead of egrep which is deprecated. + + Signed-off-by: Stefan Staudenmeyer + +commit 1573960dca09e789be7cd18cfeaaf024a1e03bd5 +Merge: e59922a557 4aac8a60b2 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 18:35:01 2016 +0100 + + Merge pull request #20041 from calavera/missing_debug_client_info_doc + + Add missing debug client mode info in docs. + +commit 4aac8a60b2c969639a96a1c245a18e457d5db4dd +Author: David Calavera +Date: Fri Feb 5 12:29:54 2016 -0500 + + Add missing debug client mode info in docs. + + Signed-off-by: David Calavera + +commit 996ca75413f4072c03cca9229dc5901bd690c4f8 +Author: Stefan Staudenmeyer +Date: Fri Feb 5 17:37:12 2016 +0100 + + Grep for installed AND held packages. + + Signed-off-by: Stefan Staudenmeyer + +commit e59922a55745894fd2c9a7c3babd923de5c5ca2f +Merge: 039a155ffa 50dba63845 +Author: moxiegirl +Date: Fri Feb 5 08:26:15 2016 -0800 + + Merge pull request #20032 from thaJeztah/fix-systemd-404 + + Fix incorrect alias for systemd docs + +commit ba38d58659cc155aebf89a2ea4cfc3cd7ba04a64 +Author: Dan Walsh +Date: Mon Feb 1 09:25:25 2016 +0100 + + Make mqueue container specific + + mqueue can not be mounted on the host os and then shared into the container. + There is only one mqueue per mount namespace, so current code ends up leaking + the /dev/mqueue from the host into ALL containers. Since SELinux changes the + label of the mqueue, only the last container is able to use the mqueue, all + other containers will get a permission denied. If you don't have SELinux protections + sharing of the /dev/mqueue allows one container to interact in potentially hostile + ways with other containers. + + Signed-off-by: Dan Walsh + +commit 039a155ffaf4f92dc209f41ca24068bc6aabccf8 +Merge: d13e8d8446 4688efc3ed +Author: Sebastiaan van Stijn +Date: Fri Feb 5 16:25:21 2016 +0100 + + Merge pull request #20031 from hypriot/fix-typo-chocolatey + + Fix typo in Chocolatey + +commit 50dba638455954161215bd2b30c924cf61446eee +Author: Sebastiaan van Stijn +Date: Fri Feb 5 16:18:26 2016 +0100 + + Fix incorrect alias for systemd docs + + Signed-off-by: Sebastiaan van Stijn + +commit 4688efc3eddf5aead4bd59ec13e2ca419ef96b28 +Author: Stefan Scherer +Date: Fri Feb 5 16:15:20 2016 +0100 + + Fix typo in Chocolatey + + Signed-off-by: Stefan Scherer + +commit d13e8d84463025a82a59caaf8da1f25d2ab06bd6 +Merge: 98aa1d24a3 c75581c855 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 15:56:06 2016 +0100 + + Merge pull request #20028 from tomxtobin/fix-man-typo + + Fix typo in config-json man page + +commit c75581c8552745f989d0ff6ed7dff86e26e55767 +Author: Tom X. Tobin +Date: Fri Feb 5 09:41:35 2016 -0500 + + Fix typo in config-json man page + + In the NAME section: "confg.json" -> "config.json" + + Signed-off-by: Tom X. Tobin + +commit 8acb5e17e8caf26f73d4e0a600650140f713eb43 +Author: Aanand Prasad +Date: Mon Jan 25 14:32:43 2016 +0000 + + Add pytest section to tox.ini + + Signed-off-by: Aanand Prasad + +commit fae09e25698006a190d14fe64f1576f68431fabf +Author: Lei Jitang +Date: Wed Feb 3 21:31:47 2016 -0500 + + Add progress bar to docker load + + Signed-off-by: Lei Jitang + +commit 51417fe8a89c9819cb2b41b17baa9f1710d7e0bf +Merge: 7a7dfd7444 b6b7458ccb +Author: Nathan LeClaire +Date: Thu Feb 4 19:22:57 2016 -0800 + + Merge pull request #2993 from nathanleclaire/bump_0.7.0-dev + + Bump version to 0.7.0-dev + +commit b6356471054f5115c57109cc2035fca6a6bb5189 +Author: Loïc Bistuer +Date: Fri Feb 5 09:42:59 2016 +0700 + + Fixed typo in compose-file.md + + Signed-off-by: Loïc Bistuer + +commit 98aa1d24a3d7274a8056e57f385945e9829bd612 +Merge: d4c8d0519d 354dabf3ca +Author: David Calavera +Date: Thu Feb 4 18:07:06 2016 -0800 + + Merge pull request #20010 from thaJeztah/update-release-checklist + + Release checklist - bump versions earlier + +commit d4c8d0519d2e521fd8b364d7231973455963e0ba +Merge: 675fe313ee 96c5221626 +Author: David Calavera +Date: Thu Feb 4 18:06:30 2016 -0800 + + Merge pull request #20011 from Microsoft/MinimalBaseImage + + Move base image selection to a utility function + +commit e891420d53ca439a6ca1d4852450f0f48c0f1f56 +Author: David Lawrence +Date: Wed Feb 3 16:00:08 2016 -0800 + + make better use of the repo already copied into the containers + Signed-off-by: David Lawrence (github: endophage) + +commit 5e4ea38a2f9ca5740438894bac69c5d9a32c0a62 +Merge: ab9b433fca 4a1d36c22d +Author: Aaron Lehmann +Date: Thu Feb 4 17:47:03 2016 -0800 + + Merge pull request #1425 from RichardScothern/fix-build + + Correct type for repo reference + +commit d4971ddb0cbe5e333264364772679e29066f0d22 +Merge: a9164e66ec aaef008706 +Author: Diogo Mónica +Date: Thu Feb 4 17:44:20 2016 -0800 + + Merge pull request #546 from docker/notary0.1-fixture-fix + + Notary0.1 fixture fix - delay metadata and certificate expiry to occur far far in the future + +commit 4d437a29d28ec2d47ff7cf0868390b921ededa03 +Author: Aaron Lehmann +Date: Tue Jan 26 11:20:14 2016 -0800 + + Vendor updated distribution for resumable downloads + + Signed-off-by: Aaron Lehmann + +commit 4a1d36c22d5d1875197ffb4c5615a79c889c564f +Author: Richard Scothern +Date: Thu Feb 4 17:32:55 2016 -0800 + + Correct type for repo reference + Signed-off-by: Richard Scothern + +commit ba03f68b74354c3d7abaf0f1144af59da673bb2b +Merge: e83b619650 aa474f59b5 +Author: Dongluo Chen +Date: Thu Feb 4 17:26:55 2016 -0800 + + Merge pull request #1762 from thaJeztah/fix-api-link + + Fix broken links in README + +commit 77cc1a0028b93b9d90bba60c3da245154317cb28 +Author: Ying Li +Date: Thu Feb 4 11:42:21 2016 -0800 + + Add tests for the TLS command line flags in notary. + + Signed-off-by: Ying Li + +commit aaef0087061e080f3608e7dd543f7263126d2e12 +Author: Ying Li +Date: Thu Feb 4 17:14:00 2016 -0800 + + Add test function to ensure that fixture expiry dates are all far far in the future. + + Signed-off-by: Ying Li + +commit 85c2fbea6a39bb5cdf314080e3b1a94b7cada834 +Author: Ying Li +Date: Thu Feb 4 17:07:48 2016 -0800 + + Change the fixture to have all the metadata and certs expire 100 years in the future. + + Signed-off-by: Ying Li + + Conflicts: + fixtures/compatibility/notary0.1/tuf/docker.com/notary0.1/samplerepo/metadata/root.json + fixtures/compatibility/notary0.1/tuf/docker.com/notary0.1/samplerepo/metadata/snapshot.json + fixtures/compatibility/notary0.1/tuf/docker.com/notary0.1/samplerepo/metadata/targets.json + fixtures/compatibility/notary0.1/tuf/docker.com/notary0.1/samplerepo/metadata/timestamp.json + +commit aa474f59b56a1ed56314424b137cc3a3e9f8a958 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 00:48:18 2016 +0100 + + Fix broken links in README + + Signed-off-by: Sebastiaan van Stijn + +commit 675fe313ee89bba42965edbed2b10b62d432b8e0 +Merge: 2da5ad3bb0 691555fc8b +Author: Brian Goff +Date: Thu Feb 4 19:58:20 2016 -0500 + + Merge pull request #20009 from anusha-ragunathan/to-slash + + Fix ReadAll to run on Windows. + +commit ab9b433fcaf7c8319562a8b80f2720f5faca712f +Merge: 2ad849704b f5823ff0be +Author: Derek McGowan +Date: Thu Feb 4 16:57:08 2016 -0800 + + Merge pull request #1417 from RichardScothern/token-print + + Print the correct token expiration time + +commit 2ad849704b5363214275458fb20bfcbaa5f5efeb +Merge: 579981b979 ee4e6e3691 +Author: Richard Scothern +Date: Thu Feb 4 16:50:15 2016 -0800 + + Merge pull request #1413 from BrianBland/updateGoamz + + Updates docker/goamz dependency to support AWS profile env + +commit 579981b979d19e1c43898d450a43f6bd350442d1 +Merge: 2cc6ccbded 3d67dae525 +Author: Richard Scothern +Date: Thu Feb 4 16:47:52 2016 -0800 + + Merge pull request #1350 from aibaars/storage-filewriter-pointer + + Storage: remove bufferedFileWriter (dead code) + +commit 2cc6ccbded99e1b6bb199e82b5d4644bd1aabdf3 +Merge: b737de4856 695bac7b0f +Author: Richard Scothern +Date: Thu Feb 4 16:44:13 2016 -0800 + + Merge pull request #1401 from BrianBland/s3StorageClass + + Adds "storageclass" configuration parameter for S3 driver. + +commit b737de48568d6d6c69aa1eb12632770da4fb1a6a +Merge: 7f46e7dce1 b0989446eb +Author: Richard Scothern +Date: Thu Feb 4 16:43:35 2016 -0800 + + Merge pull request #1408 from aaronlehmann/repository-interface + + Rename Name method of Repository to Named + +commit 7f46e7dce1e9600ea90b26d7af3337b4a6513afd +Merge: 11a71c5b88 44c0b9ae87 +Author: Richard Scothern +Date: Thu Feb 4 16:36:30 2016 -0800 + + Merge pull request #1421 from hopkings2008/master + + read the actual number of bytes according to the initial size. + +commit 2da5ad3bb0fb553112751a683ac861ab8fd5b8e2 +Merge: 3f869bfe78 4a2122e020 +Author: Jess Frazelle +Date: Thu Feb 4 16:07:42 2016 -0800 + + Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries + + Windows CI: Up timeout TestRunRestartMaxRetries + +commit 57fc85b457f31f17a9ce40d2b4546b1bc6a072d0 +Author: Daniel Nephin +Date: Tue Nov 10 15:26:04 2015 -0500 + + Wrap long lines and restrict lines to 105 characters. + + Signed-off-by: Daniel Nephin + +commit 28e652daec11aca600c1e26251c42565fe9f5fa2 +Merge: 422ff623b4 869e815213 +Author: Daniel Nephin +Date: Thu Feb 4 18:56:27 2016 -0500 + + Merge pull request #2826 from aanand/bump-1.7.0dev + + Bump 1.7.0dev + +commit 3f869bfe785428d3bfc9d73952b25fec79dc9753 +Merge: 18204ea616 0a6e0c43d9 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 00:51:13 2016 +0100 + + Merge pull request #20013 from thaJeztah/fix-migration-header + + Fix Header on migration page + +commit 869e815213569cec8592c6d0529104489ba557f2 +Author: Aanand Prasad +Date: Thu Feb 4 23:46:41 2016 +0000 + + Bump 1.7.0dev + + Signed-off-by: Aanand Prasad + +commit 0a6e0c43d9442926691cd7a842dcf55fc555c505 +Author: Sebastiaan van Stijn +Date: Fri Feb 5 00:35:49 2016 +0100 + + Fix Header on migration page + + Signed-off-by: Sebastiaan van Stijn + +commit e83b619650de6326ea0b8fc99451bf436c5bd768 +Merge: a0fd82b909 c22d7fd78b +Author: Alexandre Beslic +Date: Thu Feb 4 15:35:19 2016 -0800 + + Merge pull request #1761 from nishanttotla/label_affinity_parallel + + Fix integration test - label affinity in parallel + +commit c22d7fd78bdc76529599d0f42966f22c725a5072 +Author: Nishant Totla +Date: Thu Feb 4 15:14:46 2016 -0800 + + Fix integration test - label affinity in parallel + + Signed-off-by: Nishant Totla + +commit 96c522162634ff4d5e55ddf2ff841921a99b7b09 +Author: Darren Stahl +Date: Thu Feb 4 13:06:12 2016 -0800 + + Move base image selection to a utility function + + Signed-off-by: Darren Stahl + +commit 354dabf3cafa89634057f42d1490fb1b1e3f8963 +Author: Sebastiaan van Stijn +Date: Thu Feb 4 23:42:56 2016 +0100 + + Release checklist - bump versions earlier + + Bump both API and VERSION directly after the release + branch is created. All changes to master after that + are (by default) for the *next* release. + + Signed-off-by: Sebastiaan van Stijn + +commit 465637166b78b8c3d2947da3970c3d4da10e8b44 +Author: Jean-Laurent de Morlhon +Date: Thu Feb 4 14:27:11 2016 -0800 + + Fixing kitematic version for windows + +commit 1084c26e684f64da1f24314f1cdb076a0e2ffc57 +Author: Jean-Laurent de Morlhon +Date: Thu Feb 4 14:13:30 2016 -0800 + + Bumping versions for 1.10 release + +commit b6b7458ccbe523742d6864e261ee75a6756cae83 +Author: Nathan LeClaire +Date: Thu Feb 4 14:06:38 2016 -0800 + + Bump version to 0.7.0-dev + + Signed-off-by: Nathan LeClaire + +commit 60ee270a2bcf632942b3e1e47f23fc46a535a4c9 +Author: Ying Li +Date: Tue Feb 2 20:35:56 2016 -0800 + + Use docker/go-connections/tlsconfig to set up TLS for notary client/server/signer + + This adds some command line flags and configuration for the notary client: + --tlscacert + --tlscert + --tlskey + + This enables the notary client to do mutual authentication with the notary server. + + Signed-off-by: Ying Li + +commit 691555fc8b070a40d3e35922fda681394bdfa173 +Author: Anusha Ragunathan +Date: Thu Feb 4 13:52:31 2016 -0800 + + Fix ReadAll to run on Windows. + + filepath.Clean converts filenames to filenames with native path + separators. Use ToSlash to normalize. + + Signed-off-by: Anusha Ragunathan + +commit c8cdc86c8c9f186e7439b2f9c74323c8d2f0c6da +Merge: f9bebbc050 43a0f6e6e8 +Author: Sven Dowideit +Date: Thu Feb 4 13:56:59 2016 -0800 + + Merge pull request #405 from londoncalling/toolbox-overview + + toolbox overview added, along with new content for the index.md file + +commit a9164e66ecb390649df03d4eb11c0a42d16c9ed4 +Merge: e2d127393f 00203f7785 +Author: Ying Li +Date: Thu Feb 4 13:55:44 2016 -0800 + + Merge pull request #540 from docker/downloads-backwards-compatible-metadata + + Downloads backwards compatible metadata + +commit 43a0f6e6e8b44dffac70d01c458f96bb0adb5efb +Author: Victoria Bialas +Date: Thu Feb 4 11:49:10 2016 -0800 + + toolbox overview added, along with new content for the index.md file + + renamed toolbox.md to overview.md, removed targets from all external links + + Signed-off-by: Victoria Bialas + +commit 7a7dfd74440a607ca9b6bc0e002884529e7d445d +Merge: 7660fedf4b 5ced31397e +Author: Nathan LeClaire +Date: Thu Feb 4 13:44:30 2016 -0800 + + Merge pull request #2990 from nathanleclaire/wait_for_ssh_start + + Wait for SSH before daemon detection + +commit 18204ea61690797930efcf2d0a638961664ba0df +Merge: da58ee42bb c199506b59 +Author: Brian Goff +Date: Thu Feb 4 16:31:12 2016 -0500 + + Merge pull request #19357 from chenchun/internal + + Display `internal` flag on `network inspect` + +commit 5ced31397e42541367a910ef60dc25378d7a79cb +Author: Nathan LeClaire +Date: Thu Feb 4 10:56:31 2016 -0800 + + Wait for SSH before daemon detection + + Signed-off-by: Nathan LeClaire + +commit da58ee42bb1d4e17c5b525d161f29ad8efc0569e +Merge: 9a9bbacae5 fe53be4e17 +Author: Tibor Vass +Date: Thu Feb 4 16:20:06 2016 -0500 + + Merge pull request #19984 from calavera/vendor_engine_api_master + + Vendor engine-api with client context changes. + +commit e2d127393f0b13167942a05e33d9cda7820c7dc1 +Merge: 008c923b58 18ab95c65f +Author: Ying Li +Date: Thu Feb 4 13:03:58 2016 -0800 + + Merge pull request #530 from endophage/static_build + + adding additional 'make static' command + +commit 008c923b5821748b1c1ac1823e21ef6466a79c30 +Merge: 70c7a8a16d 1074e11881 +Author: Ying Li +Date: Thu Feb 4 12:59:06 2016 -0800 + + Merge pull request #544 from docker/upgrade-cobra + + Bump the cobra requirement, since they have some nice usage printing fixes + +commit 9a9bbacae56d55b45c39751148d967e7d5dfcdfc +Merge: 8038e32237 91028ad8f4 +Author: Jess Frazelle +Date: Thu Feb 4 12:48:10 2016 -0800 + + Merge pull request #20006 from tiborvass/merge_release_v1.10.0 + + Merge release v1.10.0 + +commit 91028ad8f4aa72945b766ca4c952b8c3d8521c9f +Author: Tibor Vass +Date: Thu Feb 4 15:44:35 2016 -0500 + + Change version to 1.11.0-dev + + Signed-off-by: Tibor Vass + +commit 05adb0bdbbb4a4f6c1520dd625bd4e91b7744bae +Author: Tibor Vass +Date: Fri Jan 15 00:55:58 2016 -0500 + + Bump version to v1.10.0 + + Signed-off-by: Tibor Vass + +commit 9503aa2b5f57264d56ec37714439b41c77cec60a +Merge: 8f48fa4747 d99cad60e7 +Author: Aanand Prasad +Date: Thu Feb 4 20:20:58 2016 +0000 + + Merge pull request #2821 from aanand/bump-1.6.0 + + Bump 1.6.0 + +commit 4a2122e020f2f4637b2a32e1ba2bfa3511988f8f +Author: John Howard +Date: Thu Feb 4 11:59:13 2016 -0800 + + Windows CI: Up timeout TestRunRestartMaxRetries + + Signed-off-by: John Howard + +commit abca5369b6af5ed85b8bf3b18ae15232c7e7d47e +Merge: 81f594f4a0 ead23224c8 +Author: Viktor Stanchev +Date: Thu Feb 4 11:58:49 2016 -0800 + + Merge pull request #1297 from carolfh/dtr15-ambassador + + DO NOT MERGE YET. added new ambassador path for DTR 1.5 + +commit 18ab95c65f577173dbdeaf9bac0824d8d2e99c8b +Author: David Lawrence +Date: Wed Feb 3 17:55:04 2016 -0800 + + add check for darwin (doesn't support static builds) + Signed-off-by: David Lawrence (github: endophage) + +commit 00203f7785345c51ff6046bf5c5f69af4945e0d6 +Author: Ying Li +Date: Wed Feb 3 16:02:51 2016 -0800 + + Update the previous backwards compatibility test, and add a new test for downloading. + + Signed-off-by: Ying Li + +commit 81f594f4a08b51187ab3b3e86fc45db1b9aeb7f3 +Merge: fe084ab45b 15a0366fee +Author: Andrew Nguyen +Date: Thu Feb 4 11:43:48 2016 -0800 + + Merge pull request #1311 from carolfh/gc + + Added diagrams for GC + +commit d99cad60e73ad81be3f621b6e9dfef9c9d9facb5 +Author: Aanand Prasad +Date: Wed Jan 27 13:30:41 2016 +0000 + + Bump 1.6.0 + + Signed-off-by: Aanand Prasad + +commit 8199c4a6e1bb1d332e5c4d305e7dd19c9235c5fa +Author: Ben Firshman +Date: Wed Feb 3 17:42:57 2016 -0800 + + Improve names in Compose file 2 example + + Just makes it a bit clearer what's going on. + + Signed-off-by: Ben Firshman + +commit 1074e11881b33c4ff66293f8ccfc16371cbb0a2e +Author: Ying Li +Date: Thu Feb 4 11:43:19 2016 -0800 + + Bump the cobra requirement, since they have some nice usage printing fixes. + + Signed-off-by: Ying Li + +commit 422ff623b4039b0da04b98fdb47a5d418f9a7ac4 +Merge: c2db1a24bf bdddbe3a73 +Author: Aanand Prasad +Date: Thu Feb 4 19:42:22 2016 +0000 + + Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example + + Improve names in Compose file 2 example + +commit 19ae76a442078803e326a37abbbe3a991833123b +Author: Aanand Prasad +Date: Thu Feb 4 16:01:11 2016 +0000 + + Update docker-py and dockerpty + + Signed-off-by: Aanand Prasad + +commit c2db1a24bf4931d891af6a0ac831a489138f2599 +Merge: 93426cec4c be236d8801 +Author: Aanand Prasad +Date: Thu Feb 4 19:40:41 2016 +0000 + + Merge pull request #2822 from aanand/update-docker-py-and-dockerpty + + Update docker-py and dockerpty + +commit 8038e32237e2afbb20233218efb179b61eda759a +Merge: 61464701fa 3c0a91d227 +Author: Jess Frazelle +Date: Thu Feb 4 11:36:32 2016 -0800 + + Merge pull request #19918 from WeiZhang555/restarting + + Fix error for restarting container + +commit 1c4d02455bbbbb1de77eb0dafe9081173faab377 +Author: Riyaz Faizullabhoy +Date: Wed Feb 3 16:11:09 2016 -0800 + + add non-root passwd functionality + + Signed-off-by: Riyaz Faizullabhoy + +commit be236d88013b26d21a91f11afb1ceff748a24a89 +Author: Aanand Prasad +Date: Thu Feb 4 16:01:11 2016 +0000 + + Update docker-py and dockerpty + + Signed-off-by: Aanand Prasad + +commit 70c7a8a16d565f0facbdba2d1725257c1d3f87e0 +Merge: 78dda3d16d 261d358c79 +Author: Ying Li +Date: Thu Feb 4 11:12:43 2016 -0800 + + Merge pull request #543 from moxiegirl/add-docker-to-title + + Change Notary to show Docker Notary in menu + +commit 11a71c5b88f026877d6b58dc90f81dfaf9f5aaba +Merge: 0d9cb4f4f2 9a0f037436 +Author: Richard Scothern +Date: Thu Feb 4 11:10:52 2016 -0800 + + Merge pull request #1423 from RichardScothern/credit + + Update maintainers and authors + +commit 0d9cb4f4f242a0ebd932a95d22966b7b76293280 +Merge: 5596e787b6 7ba21d8b1d +Author: Olivier Gambier +Date: Thu Feb 4 11:03:55 2016 -0800 + + Merge pull request #1424 from RichardScothern/version-file + + Update version file + +commit fe53be4e1785ab4d8cadf246e5f2de419f337adc +Author: David Calavera +Date: Wed Feb 3 18:41:26 2016 -0500 + + Apply context changes to the client. + + Signed-off-by: David Calavera + +commit d8355ead9ee301718563faa947fac8b62d11b9e9 +Author: David Calavera +Date: Wed Feb 3 17:50:59 2016 -0500 + + Vendor engine-api, go-connections and go-winio. + + Signed-off-by: David Calavera + +commit 7ba21d8b1d705209a0af15b2779de6468cd5606e +Author: Richard Scothern +Date: Thu Feb 4 10:58:06 2016 -0800 + + update version file + Signed-off-by: Richard Scothern + +commit a0fd82b90932741bda54245e990df433a9ee06a7 +Merge: 573dd33995 0e34e8d736 +Author: Victor Vieux +Date: Thu Feb 4 10:56:56 2016 -0800 + + Merge pull request #1759 from vieux/update_changelog + + update date in changelog + +commit 0e34e8d7362b1ed6f5bc3d471c229d4a4c4919a7 +Author: Victor Vieux +Date: Thu Feb 4 10:54:46 2016 -0800 + + update date in changelog + + Signed-off-by: Victor Vieux + +commit d45a012cbe73184fd567d79bace24e3530198c48 +Merge: be1cea9eef 23875cb539 +Author: Jeffrey Morgan +Date: Thu Feb 4 10:52:05 2016 -0800 + + Merge pull request #1441 from londoncalling/revert-1437-add-toolbox-overview + + Revert "added toolbox overview" + +commit 573dd33995fe11cdaca52f209bbba524724b2ad3 +Merge: 6ca3f2fdd2 a1e183c4bd +Author: Victor Vieux +Date: Thu Feb 4 10:50:56 2016 -0800 + + Merge pull request #1757 from moxiegirl/fix-format + + Fix format for command + +commit 23875cb539cec19ca698e3c0ca6731d5b9a2927b +Author: Victoria +Date: Thu Feb 4 10:48:38 2016 -0800 + + Revert "added toolbox overview" + +commit 9a0f03743657cdc1b5c95f654ac4b0d194e9efc9 +Author: Richard Scothern +Date: Thu Feb 4 10:36:15 2016 -0800 + + Update maintainers and authors + Signed-off-by: Richard Scothern + +commit 3cf25b9bbbf2998adfec39525019e41e6123328c +Author: David Lawrence +Date: Wed Feb 3 11:25:38 2016 -0800 + + automigrate when using compose file + Signed-off-by: David Lawrence (github: endophage) + +commit 644264071872f73d11e580b56c86565330997fc8 +Author: David Lawrence +Date: Tue Feb 2 14:46:08 2016 -0800 + + switching over to offical mariadb image + Signed-off-by: David Lawrence (github: endophage) + +commit 5596e787b69c20ebf139008154febbe56b0358ae +Merge: 97fbaaa5e2 bd8b81a686 +Author: Olivier Gambier +Date: Thu Feb 4 10:32:39 2016 -0800 + + Merge pull request #1409 from RichardScothern/recipe-menu + + Move 'Recipes' into the Registry menu + +commit b2e27fee53c269f9659bdab66852eaba4ffbe9c7 +Author: Liu Bo +Date: Thu Feb 4 10:25:24 2016 -0800 + + Graphdriver/btrfs: Avoid using single d.Get() + + For btrfs driver, in d.Create(), Get() of parentDir is called but not followed + by Put(). + + If we apply SElinux mount label, we need to mount btrfs subvolumes in d.Get(), + without a Put() would end up with a later Remove() failure on + "Device resourse is busy". + + This calls the subvolume helper function directly in d.Create(). + + Signed-off-by: Liu Bo + +commit be1cea9eefdf3d1567b50b9be438c2b87c46a46b +Merge: 33a3f4982d 26b8b63dcc +Author: Jeffrey Morgan +Date: Thu Feb 4 10:25:24 2016 -0800 + + Merge branch 'master' of github.com:docker/kitematic + +commit 33a3f4982d1708095158d155866cee11ab9a7d9e +Author: Jeffrey Morgan +Date: Thu Feb 4 10:25:06 2016 -0800 + + Bump version + + Signed-off-by: Jeffrey Morgan + +commit 49a45d80f26ceb963a00428522ff485fd9f9afdc +Author: unclejack +Date: Wed Jan 20 20:05:37 2016 +0200 + + Dockerfile,contrib,hack: remove buildpack-deps + + Signed-off-by: Cristian Staretu + +commit 26b8b63dccd3fe62be480a6c4d27530a078476a7 +Merge: 45afe72962 2bdfb8f211 +Author: Jeffrey Morgan +Date: Thu Feb 4 10:16:49 2016 -0800 + + Merge pull request #1437 from londoncalling/add-toolbox-overview + + added toolbox overview + +commit 6ca3f2fdd24355831360e71d026066b89a65ab6c +Merge: d5a3ff10af e121dd0986 +Author: Alexandre Beslic +Date: Thu Feb 4 10:13:59 2016 -0800 + + Merge pull request #1758 from runseb/patch-1 + + Update networking.md + +commit 45afe729626da241f936f3ce943f9e225e01d05f +Author: Jeffrey Morgan +Date: Thu Feb 4 10:13:25 2016 -0800 + + Fix window size file loading on windows + + Signed-off-by: Jeffrey Morgan + +commit 97fbaaa5e294545af267ba679eed3c6dc05b919d +Merge: c149d45cc8 8fdd7f5dfe +Author: Richard Scothern +Date: Thu Feb 4 10:10:03 2016 -0800 + + Merge pull request #1422 from moxiegirl/add-docker-to-title + + Update title of Registry to Docker Registry + +commit 61464701fabb6b013506ad555daaab84723663b4 +Merge: 60821c6dfd 620b8250e8 +Author: Tianon Gravi +Date: Thu Feb 4 10:09:47 2016 -0800 + + Merge pull request #19727 from pandrew/improve_test-deb-install + + improve test-deb-install + +commit b0989446eb9904add0fb2ce3071022854e6e38de +Author: Aaron Lehmann +Date: Mon Feb 1 13:47:34 2016 -0800 + + Rename Name method of Repository to Named + + This makes code that gets the name as a string read like + repo.Named().Name() instead of repo.Name().Name(). + + Requested in + https://github.com/docker/docker/pull/19887#discussion_r51479753 + + Signed-off-by: Aaron Lehmann + +commit a55210413c63f173b996bb85273ce7951b8683af +Author: Daniel Nephin +Date: Thu Feb 4 12:17:20 2016 -0500 + + Update docs for version being a string. + + Signed-off-by: Daniel Nephin + +commit 93426cec4c7a53bbcf8ca2406cf1730eb11a5de0 +Merge: 386974f831 a7c2987991 +Author: Aanand Prasad +Date: Thu Feb 4 17:20:32 2016 +0000 + + Merge pull request #2824 from dnephin/docs_version_is_a_string + + Update docs for version being a string + +commit a7c298799130a8eb07844bd4ecbb7b7dc461b7f7 +Author: Daniel Nephin +Date: Thu Feb 4 12:17:20 2016 -0500 + + Update docs for version being a string. + + Signed-off-by: Daniel Nephin + +commit 620b8250e85abbe284eb8d34799df1bb73d82d6a +Author: Paul Liljenberg +Date: Tue Jan 26 16:28:18 2016 +0100 + + improve test-deb-install + + This PR adds support for using the DOCKER_BUILD_PKGS env var to + better help defining what packege to build. It also adds support + for the integration-daemon so we can run it as a bundle. + + Signed-off-by: Paul Liljenberg + + add directory test + + Adds missing directory test. This helps verifying that + DOCKER_BUILD_PKGS is a directory and exists before continueing. + + Signed-off-by: Paul Liljenberg + + fix indent + + Signed-off-by: Paul Liljenberg + +commit 261d358c79cb59bee8d1ae9cf44a7d8180414e38 +Author: Mary Anthony +Date: Thu Feb 4 08:50:44 2016 -0800 + + Change Notary to show Docker Notary in menu + + Signed-off-by: Mary Anthony + +commit 8fdd7f5dfe348c3fe130d55ba451963b60443646 +Author: Mary Anthony +Date: Thu Feb 4 08:37:45 2016 -0800 + + Update title of Registry to Docker Registry + + Signed-off-by: Mary Anthony + +commit 60821c6dfd13d170cce6308f10287cf2f0c0b072 +Merge: 3329c94e25 d23778168d +Author: Jess Frazelle +Date: Thu Feb 4 08:37:12 2016 -0800 + + Merge pull request #19997 from boucher/patch-2 + + Pass KEEPBUNDLE in Docker build environment. + +commit 3329c94e256d7816ec20edb215d5c3614504e403 +Merge: e2bfedbc40 fe6b88e3fa +Author: David Calavera +Date: Thu Feb 4 08:33:07 2016 -0800 + + Merge pull request #19994 from runcom/fix-test-for-19936 + + integration-cli: fix minimum and default api version test + +commit e2bfedbc40245dcf39ab5e0cb5756784e4f508c7 +Merge: a1b07a8010 77590d4dae +Author: David Calavera +Date: Thu Feb 4 08:29:11 2016 -0800 + + Merge pull request #19998 from estesp/remove-stray-printf + + Remove stray printf + +commit 6caa188730e66dfc328ecb0186c60c72ec1f0f1c +Author: Spencer Rinehart +Date: Wed Feb 3 14:34:36 2016 -0600 + + Fix example formatting for depends_on. + + Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block. + + I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works. + + Signed-off-by: Spencer Rinehart + +commit 386974f831a43a84b0ad05219dec6f917bca0aff +Merge: 80d02e84e2 f612bc98d9 +Author: Aanand Prasad +Date: Thu Feb 4 15:56:27 2016 +0000 + + Merge pull request #2814 from nubs/patch-1 + + Fix example formatting for depends_on. + +commit a1b07a8010d23dbb1edcb88cbe2e38081ff93a3a +Merge: 38e774d32c 6c2b014d5e +Author: Jess Frazelle +Date: Thu Feb 4 07:44:42 2016 -0800 + + Merge pull request #19999 from thaJeztah/carry-19668-wheezy-journald + + (carry 19668) don't try to install journald driver on wheezy + +commit 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede +Author: Sebastiaan van Stijn +Date: Thu Feb 4 16:22:23 2016 +0100 + + dont try to install journald driver on wheezy + + Signed-off-by: Sebastiaan van Stijn + Signed-off-by: Jessica Frazelle + +commit 77590d4dae9223ccd8edf9b153c669f631747f24 +Author: Phil Estes +Date: Thu Feb 4 10:13:31 2016 -0500 + + Remove stray printf + + This came in with the Windows CI work and I assume was meant for local + debug, but adds a bare printf line to the test output. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 413a55aa715b85b5e8f5cbbdf4f240ff377df930 +Author: Aanand Prasad +Date: Tue Feb 2 19:31:49 2016 +0000 + + Connect container to networks before starting it + + Signed-off-by: Aanand Prasad + +commit d23778168d158e0813420ffc2d10fdddba6a12b6 +Author: Ross Boucher +Date: Thu Feb 4 09:41:48 2016 -0500 + + Pass KEEPBUNDLE in Docker build environment. + + This is an alternate solution to the problem described in #19969. + + Signed-off-by: Ross Boucher + +commit e121dd0986a1563d971f51a8ea67e9f26580e8cb +Author: runseb +Date: Thu Feb 4 14:42:41 2016 +0100 + + Update networking.md + + Small typo in bridge driver when creating bridge network. + + Signed-off-by: Sebastien Goasguen + +commit a1e183c4bd9658f91b2d435ebba5a61a82cebd0e +Author: Mary Anthony +Date: Thu Feb 4 05:13:19 2016 -0800 + + Fix format for command + + Signed-off-by: Mary Anthony + +commit fe6b88e3fa12810b2eaad45c613742c1eeb7290e +Author: Antonio Murdaca +Date: Thu Feb 4 13:47:15 2016 +0100 + + integration-cli: fix minimum and default api version test + + Signed-off-by: Antonio Murdaca + +commit 3c0a91d227a04e146d24e35d2f71d8c5343cfc77 +Author: Zhang Wei +Date: Tue Feb 2 20:36:13 2016 +0800 + + Fix error for restarting container + + Fix error message for `--net container:b` and `--ipc container:b`, + container `b` is a restarting container. + + Signed-off-by: Zhang Wei + +commit 38e774d32caf29155d27aad4fad964b082246a73 +Merge: 66a4e557f9 4080ce35e0 +Author: Antonio Murdaca +Date: Thu Feb 4 10:11:32 2016 +0100 + + Merge pull request #19949 from Microsoft/jjh/testapiresize + + Windows CI: Port docker_api_resize_test.go + +commit d5a3ff10afc72ca1505e6ac6c28c695850a7220a +Merge: 46b57a3cbe 45ab44d142 +Author: Dongluo Chen +Date: Thu Feb 4 00:50:33 2016 -0800 + + Merge pull request #1756 from vieux/remove_goveralls + + remove goveralls + +commit 44c0b9ae87648bc403382e2242a221b8d21ce09a +Author: yuzou +Date: Thu Feb 4 16:14:35 2016 +0800 + + read the actual number of bytes according to the initial size. + + Signed-off-by: yuzou + +commit 2bdfb8f2117c2873dd6334aeef1df522e350fe65 +Author: Victoria Bialas +Date: Wed Feb 3 23:07:10 2016 -0800 + + added toolbox overview + + added keywords and weight to the metadata for menu placement + + Signed-off-by: Victoria Bialas + +commit c199506b59f60ac456cb0448ddd86e6dec92bc0a +Author: Chun Chen +Date: Fri Jan 15 15:31:12 2016 +0800 + + Display `internal` flag on `network inspect` + + Also adds internal network tests for bridge network + + Signed-off-by: Chun Chen + +commit 80d02e84e22cf5360d99c740c1f31d5d3f9d23c4 +Merge: 89c5b800e6 2651c00f0c +Author: Daniel Nephin +Date: Wed Feb 3 23:49:56 2016 -0500 + + Merge pull request #2808 from aanand/connect-before-start + + Connect container to networks before starting it + +commit 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe +Author: John Howard +Date: Tue Feb 2 18:51:42 2016 -0800 + + Windows CI: Port docker_api_resize_test.go + + Signed-off-by: John Howard + +commit 66a4e557f955713adea5c97e42202fdbc0f5c06c +Merge: a03e85b448 f3df50d115 +Author: Tibor Vass +Date: Wed Feb 3 21:57:32 2016 -0500 + + Merge pull request #19702 from tiborvass/host-specific-passthru-token + + Add test to make sure the new registry pass-thru token is only sent to the intended hosts + +commit a03e85b4482ab741000159f3e911c8729b387cd8 +Merge: d47812dd1d feab8b179e +Author: Sebastiaan van Stijn +Date: Thu Feb 4 03:07:15 2016 +0100 + + Merge pull request #19877 from HackToday/fixdoc + + Add support details for storage driver + +commit af614a19dc4ddc9ec4b16438fd5e974dff7a52f7 +Author: Lei Jitang +Date: Wed Feb 3 20:52:32 2016 -0500 + + Clean up container rootf mounts on daemon start fixes #19679 + + When the daemon shutdown ungracefully, it will left the running + containers' rootfs still be mounted. This will cause some error + when trying to remove the containers. + + Signed-off-by: Lei Jitang + +commit 46b57a3cbeeabff76c871dca4f95868bb93fc7a0 +Merge: b8f2fd969e b88cb64358 +Author: Victor Vieux +Date: Wed Feb 3 17:47:00 2016 -0800 + + Merge pull request #1753 from SvenDowideit/rolfes-second-doc-branch-carry + + new content for install-on-aws and images for other topics + +commit bdddbe3a73266dd42d2f2baaa2c008aebc3b089e +Author: Ben Firshman +Date: Wed Feb 3 17:42:57 2016 -0800 + + Improve names in Compose file 2 example + + Just makes it a bit clearer what's going on. + + Signed-off-by: Ben Firshman + +commit d47812dd1d1de206e29a644e125a0a0f28655c6c +Merge: dcde68b955 9f401254bd +Author: Jess Frazelle +Date: Wed Feb 3 17:38:52 2016 -0800 + + Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix + + Wait to fire start event until socket is created + +commit 7660fedf4b26177033142a9626c2a08e0ab3c4ee +Merge: 6cffd5a99b 63f8f1fb48 +Author: Nathan LeClaire +Date: Wed Feb 3 17:37:12 2016 -0800 + + Merge pull request #2957 from londoncalling/docs-machine-b + + Improve intro to machine docs + +commit 6cffd5a99bc166c5401ca7933609f35612350994 +Merge: 279fd7ca3f fba9db1dee +Author: Nathan LeClaire +Date: Wed Feb 3 17:37:01 2016 -0800 + + Merge pull request #2986 from SvenDowideit/retitle-as-docker-machine + + Retitle as Docker Machine + +commit 45ab44d1428575dba696d6fed1000894d1c430b9 +Author: Victor Vieux +Date: Wed Feb 3 17:36:48 2016 -0800 + + remove goveralls + + Signed-off-by: Victor Vieux + +commit dcde68b955a8f75119573ec6011cb1b1a9457f60 +Merge: f0a58947ab 2c63ac3a97 +Author: Jess Frazelle +Date: Wed Feb 3 17:34:19 2016 -0800 + + Merge pull request #19952 from WeiZhang555/fix-err-restarting-1 + + Fix error message for pause a restarting container + +commit f0a58947abceb524044d7aa88aeae61523c0bc9b +Merge: e74c07b947 76a765140e +Author: Tibor Vass +Date: Wed Feb 3 20:33:52 2016 -0500 + + Merge pull request #19979 from mavenugo/gccgoci + + Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart + +commit e74c07b947adf2d6d804068e4a647265e6e419f2 +Merge: ea4086ea91 b9a395c85d +Author: Jess Frazelle +Date: Wed Feb 3 17:32:14 2016 -0800 + + Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir + + Remove case sensitive duplicate dir in vendor + +commit b88cb64358908b8e0c3fddd402d23088ed633ef9 +Author: Rolfe Dlugy-Hegwer +Date: Mon Feb 1 23:57:30 2016 -0500 + + new content for install-on-aws and images for other topics + + Issues #1606 #1605 + + Signed-off-by: Rolfe Dlugy-Hegwer + +commit 78dda3d16dab94a21e694ce12bcc8bddd405b935 +Merge: 9de2486488 f654216b06 +Author: Diogo Mónica +Date: Wed Feb 3 17:11:11 2016 -0800 + + Merge pull request #514 from docker/delg-empty-path + + Ensure empty string path is properly handled, add --all-paths flag + +commit fba9db1deef9a6c117a203d167b21301c7a44450 +Author: Sven Dowideit +Date: Wed Feb 3 17:01:54 2016 -0800 + + Retitle as Docker Machine + + Signed-off-by: Sven Dowideit + +commit b8f2fd969e5a3e7c99fd0c81ebfa5cb700528bb8 +Merge: 1bb8ad2dfd 6ab88246cf +Author: Victor Vieux +Date: Wed Feb 3 16:56:26 2016 -0800 + + Merge pull request #1755 from air/patch-1 + + fix bullet list in last paragraph + +commit f9bebbc05088e87c83dd3af58297fb923ec1c735 +Author: Nathan LeClaire +Date: Wed Feb 3 16:51:32 2016 -0800 + + Bump versions for 1.10-rc4 + + Signed-off-by: Nathan LeClaire + +commit feab8b179e20833dd0a65e58934cf24938da6d84 +Author: Kai Qiang Wu(Kennan) +Date: Mon Feb 1 08:39:05 2016 +0000 + + Add support details for storage driver + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit f654216b066c9a372f740f80e989138e482c4e5d +Author: Riyaz Faizullabhoy +Date: Wed Feb 3 16:45:13 2016 -0800 + + sort paths, more tests with all paths + + Signed-off-by: Riyaz Faizullabhoy + +commit 7d2b174098abc9c2535a7f1f50eec9c286c6c206 +Author: Riyaz Faizullabhoy +Date: Wed Feb 3 15:23:14 2016 -0800 + + adding more complex paths to test + + Signed-off-by: Riyaz Faizullabhoy + +commit 6ab88246cf5207f96e64fd325240d120381727a8 +Author: Aaron Bell +Date: Wed Feb 3 16:20:52 2016 -0800 + + fix bullet list in last paragraph + + Signed-off-by: Aaron Bell + +commit 1bb8ad2dfde811942020dafe97c0e2ec88653847 +Merge: 8a1fe8ff75 be31e00c09 +Author: Victor Vieux +Date: Wed Feb 3 16:16:54 2016 -0800 + + Merge pull request #1754 from SvenDowideit/update-menu-and-add-toolbox + + Move the get-swarm doc into the new DockerSwarm menu + +commit ea4086ea91798d8b860d90eaf32ef216b05f4e7c +Merge: 1ae6da75c8 75aa7dbe4f +Author: Jess Frazelle +Date: Wed Feb 3 16:15:12 2016 -0800 + + Merge pull request #19982 from tianon/seccomp-completion + + Add some basic bash completion for seccomp values + +commit be31e00c09bbff3cbcc0b108082882dc0dde0d3c +Author: Sven Dowideit +Date: Wed Feb 3 16:14:44 2016 -0800 + + Move the get-swarm doc into the new DockerSwarm menu + + Signed-off-by: Sven Dowideit + +commit 63f8f1fb482bb4f99007b2763e3893fa4eababa5 +Author: Victoria Bialas +Date: Thu Jan 28 13:05:21 2016 -0800 + + WIP: improve intro to machine docs + WIP: rewrite of Machine overview for clarity, add diagrams + + rewrite/re-organize Machine topics; incl. get started on local VM, menu order, titles + + replaced Swarm info in cloud doc to reference new Swarm provisioning topic per @moxigirl, incorporated review comments per Chanwit into Concepts topic + + added mention of Swarm clusters to Overview, and links to Swarm topics in What's next for Overview and Concepts + + updates to concepts per @bfirsh comments + + updated cloud provisioning topic to illustrated, step-by-step version added for cloud installs per issue #18282 + + cleanup of links, copy-edits + + update to concepts, added link to boot2docker repo and re-worded per Nathan's comments + + updates to concepts and cloud example per @dmp42 comments + + updated for links and improved intro content for cloud topic + + Signed-off-by: Victoria Bialas + +commit d2bc1634d4c8cd0ee85f40734a3be1368ad07fbb +Author: Ying Li +Date: Wed Feb 3 15:33:10 2016 -0800 + + Re-check in a notary0.1 file, because we *do* want the timestamp file to test downloads. + + This also has a target in the targets file, and also has a changelist object. + + Signed-off-by: Ying Li + +commit f6c703e44d002b2f99d3c2dfd9e93e782fdebaf3 +Author: Riyaz Faizullabhoy +Date: Fri Jan 29 11:47:09 2016 -0800 + + Rename to ClearAllPaths, add comment for delegationAdd + + Signed-off-by: Riyaz Faizullabhoy + +commit bac2d78b9ddd34226fc88b64cd23ef9136f808b6 +Author: Riyaz Faizullabhoy +Date: Thu Jan 28 18:06:33 2016 -0800 + + Adds --all-paths flag (requires new TUF delegation key for removes), also print in addition to "" on CLI + + Signed-off-by: Riyaz Faizullabhoy + +commit 6ffde51d897210e0e2c53f2b97ef804f6f9fcdc1 +Author: Riyaz Faizullabhoy +Date: Wed Jan 27 17:01:23 2016 -0800 + + Ensure empty string path is properly handled, make default for adding delegation + + Signed-off-by: Riyaz Faizullabhoy + +commit 9de248648885f16bfac7c1b6b0415e728bb776cb +Merge: dac785d0b5 718002acea +Author: Diogo Mónica +Date: Wed Feb 3 15:19:52 2016 -0800 + + Merge pull request #537 from docker/refactor-notary-cli + + Refactor the notary command line to not use global mutable state + +commit 76a765140e831bdd5b7139b86db001ec6872023a +Author: Madhu Venugopal +Date: Wed Feb 3 13:03:32 2016 -0800 + + Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart + + Signed-off-by: Madhu Venugopal + +commit 8a1fe8ff7562c8225f8edaa8a7dc88465be4d485 +Merge: 658280c5d7 da1e5bcb24 +Author: Victor Vieux +Date: Wed Feb 3 14:12:06 2016 -0800 + + Merge pull request #1751 from jimenez/known_issues + + Adding Known issues and Fucntionality to README + +commit 1ae6da75c8f0c51dc13a632d76f7769a70db36b1 +Merge: fdcce4ac03 9afdd436cd +Author: Jess Frazelle +Date: Wed Feb 3 13:50:34 2016 -0800 + + Merge pull request #19858 from felixge/vboxfs-sendfile-warning + + docs: point out known issue with nginx/vboxfs + +commit 75aa7dbe4f24cd8ac293f304f0d556c90200eea0 +Author: Tianon Gravi +Date: Wed Feb 3 13:48:34 2016 -0800 + + Add some basic bash completion for seccomp values + + Signed-off-by: Andrew "Tianon" Page + +commit da1e5bcb2490474a6f1261d2962fdfb2b4cae133 +Author: Isabel Jimenez +Date: Wed Feb 3 14:39:57 2016 -0500 + + Adding Known issues and Fucntionality to README + + Signed-off-by: Isabel Jimenez + +commit fdcce4ac0302729be91ff9de670fdb5be1c50b58 +Merge: 7ecba9c668 7a20a270bc +Author: Jess Frazelle +Date: Wed Feb 3 13:31:11 2016 -0800 + + Merge pull request #19942 from LK4D4/fix_vet_errors + + Fix minor vet warnings + +commit 7ecba9c6687ee922b1c77add0c92ad11858de558 +Merge: 57025bd588 243d0d6bbe +Author: Tibor Vass +Date: Wed Feb 3 16:26:43 2016 -0500 + + Merge pull request #19973 from icecrime/cross_platforms_logout + + Remove unnecessary call to `/info` endpoint + +commit 718002acea3d1eb5dc42dcfa9448b1cd6fd0cf8d +Author: Ying Li +Date: Wed Feb 3 11:09:38 2016 -0800 + + Add some more tests for notary CLI + + Signed-off-by: Ying Li + +commit 57025bd58821a6972185fb4c0a5559289d769ef6 +Merge: 7e236e623b 1cbd772629 +Author: Alexander Morozov +Date: Wed Feb 3 13:19:51 2016 -0800 + + Merge pull request #19972 from jfrazelle/fix-opensuse + + fix opensuse rpm + +commit 4354f0a107b0a5c38a91fa26f10f571f7018e237 +Author: Aaron Lehmann +Date: Wed Feb 3 13:19:44 2016 -0800 + + On redirect, only copy headers when they don't already exist in the redirected request + + A changeset under consideration for Go 1.7 would automatically copy + headers on redirect. This change future-proofs our code so we won't make + duplicate copies of the headers if net/http does it automatically in the + future. + + Signed-off-by: Aaron Lehmann + +commit 658280c5d78b14a4df47dd869f74d593efa81584 +Merge: 5557849a2c 2dd1f47c5b +Author: Victor Vieux +Date: Wed Feb 3 13:13:19 2016 -0800 + + Merge pull request #1694 from moxiegirl/securing-swarm + + High-level docs for Swarm + +commit a8625397bc0b3526a3177303a1e39dac25e68850 +Author: Sipics Gergely +Date: Tue Jan 26 18:01:28 2016 +0100 + + added hyperv static mac address and vlan option for machine creation (with doc\drivers update) + + Signed-off-by: Gergely Sipics + +commit 243d0d6bbe0376fb43a2718710f31bb068d22168 +Author: Arnaud Porterie +Date: Wed Feb 3 10:30:17 2016 -0800 + + Remove unnecessary call to /info + + Avoid using the `/info` endpoint in the `login` and `logout` workflows + when the Registry endpoint is overriden by the user through the command + line. + + Signed-off-by: Arnaud Porterie + +commit b9a395c85de3f4ea10810c8df789fc67e5b4b604 +Author: Tonis Tiigi +Date: Wed Feb 3 12:56:01 2016 -0800 + + Remove case sensitive duplicate dir in vendor + + Signed-off-by: Tonis Tiigi + +commit 7e236e623b234616ca8536a0d2e3f96103aa061b +Merge: 3fa0d09e74 ff17cd0bf0 +Author: Tibor Vass +Date: Wed Feb 3 15:57:29 2016 -0500 + + Merge pull request #19975 from aaronlehmann/resolve-auth-config + + Introduce a client-side version of resolveAuthConfig + +commit 2dd1f47c5be427aab8b73b1f33ed35d2134bfb37 +Author: Mary Anthony +Date: Wed Feb 3 12:45:25 2016 -0800 + + Updating with Dong's fine + + Signed-off-by: Mary Anthony + +commit 5557849a2c58645659794681ce26872572d39d69 +Merge: 342611313e c1b5c9c49c +Author: Victor Vieux +Date: Wed Feb 3 12:42:58 2016 -0800 + + Merge pull request #1718 from moxiegirl/swarm-1.10-docs + + How to get Swarm and Machine provisioning + +commit f612bc98d9da19e5b1b75a8239dd138c9d146c27 +Author: Spencer Rinehart +Date: Wed Feb 3 14:34:36 2016 -0600 + + Fix example formatting for depends_on. + + Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block. + + I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works. + + Signed-off-by: Spencer Rinehart + +commit 3fa0d09e74131f4a4dca43a1a28eb014028be62d +Merge: e17f2e7f04 cbda80aaff +Author: Tibor Vass +Date: Wed Feb 3 15:33:29 2016 -0500 + + Merge pull request #19971 from aaronlehmann/revert-19743 + + Revert "Set idle timeouts for HTTP reads and writes in communications with the registry" + +commit e17f2e7f048153b0d4f3779f9534f9dcee4b04de +Merge: 9123a24cc8 4904210d9c +Author: Vincent Demeester +Date: Wed Feb 3 21:13:48 2016 +0100 + + Merge pull request #19976 from mbanikazemi/docs-kuryr + + Add Kuryr Network Plugin to the docs + +commit dac785d0b5487cfc8d571ed7813c68289dc15c35 +Merge: 6acb6a1802 9c2940ae2b +Author: Diogo Mónica +Date: Wed Feb 3 12:05:43 2016 -0800 + + Merge pull request #539 from docker/update-go-connections + + Bump go-connections version. Looks like I had previously vendored a … + +commit 279fd7ca3fcecdabd472e4fdbf4d8a756270601c +Author: David Gageot +Date: Wed Feb 3 12:03:45 2016 -0800 + + Bumping version to 0.6.0-dev + + Signed-off-by: David Gageot + +commit de118ed9a7ce24a355f67b8a417f48d04e361c68 +Author: David Gageot +Date: Wed Feb 3 12:02:21 2016 -0800 + + Update changelog for v0.6.0.0-rc4 + + Signed-off-by: David Gageot + +commit d67a7e128c4ca9fa4660d6bc0a157b84340a0bdc +Author: Ying Li +Date: Wed Feb 3 04:57:42 2016 -0800 + + Refactor the notary command line to not use global mutable state, and to not exit on error. + + This way we can test the command more easily (we want to test the error, as opposed to + just killing the test). + + Signed-off-by: Ying Li + +commit 6acb6a180296ac202ef00ccbe77408279739ed29 +Merge: f744660f49 0369344a78 +Author: Diogo Mónica +Date: Wed Feb 3 11:53:57 2016 -0800 + + Merge pull request #528 from docker/delegation-api + + Break down client API for delegations + +commit a71048c8b40b4e64fb5d9642d6edcb37fd12a3b2 +Author: David Gageot +Date: Wed Feb 3 11:48:33 2016 -0800 + + Bump version to 0.6.0-rc4 + + Signed-off-by: David Gageot + +commit 9123a24cc8218e5222c2c4f4c9153d6971f3d128 +Merge: 3b80b1947c f0df677913 +Author: Vincent Demeester +Date: Wed Feb 3 20:43:52 2016 +0100 + + Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix + + Fix formatting in breaking changes doc + +commit 9c2940ae2bf43db217e4b27678491a2a2b21fc38 +Author: Ying Li +Date: Wed Feb 3 11:43:01 2016 -0800 + + Bump go-connections version. Looks like I had previously vendored a merged branch, + so this just makes the version number correct. + + Signed-off-by: Ying Li + +commit 4904210d9cd4381363a28ed40ee5cb525948c5f7 +Author: Mohammad Banikazemi +Date: Wed Feb 3 14:21:54 2016 -0500 + + Add Kuryr Network Plugin to the docs + + Signed-off-by: Mohammad Banikazemi + +commit f744660f4948ad51fbef294cf9bc89d4406367f9 +Merge: 2fac65df71 c495410402 +Author: Diogo Mónica +Date: Wed Feb 3 11:17:59 2016 -0800 + + Merge pull request #538 from docker/add-docker-go-connections + + Add the github.com/docker/go-connections/tlsconfig dependency to godeps + +commit 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e +Merge: bce70cdc2c 9b63e4e7f5 +Author: Alexander Morozov +Date: Wed Feb 3 11:06:35 2016 -0800 + + Merge pull request #19943 from aboch/ec + + Store endpoint config on network connect to a stopped container + +commit bce70cdc2c4f80e75ca7435e2f3016b904b5c3f2 +Merge: ea28ca4350 fde2329eaa +Author: Alexander Morozov +Date: Wed Feb 3 11:01:45 2016 -0800 + + Merge pull request #18680 from aaronlehmann/duplicate-pull-complete-message + + Avoid outputting last progress item twice + +commit ff17cd0bf07fb8fbd811b3a1bf472d701405b1d1 +Author: Aaron Lehmann +Date: Wed Feb 3 10:55:33 2016 -0800 + + Introduce a client-side version of resolveAuthConfig + + This is similar to the version in the registry package, but uses the + daemon's default index (as opposed to the default for the client's + platform) if using the "official index". + + Signed-off-by: Aaron Lehmann + +commit ea28ca435074f2f756cfd553b172df27a8121e29 +Merge: 28a7577a02 d8d47f428d +Author: Jess Frazelle +Date: Wed Feb 3 10:57:36 2016 -0800 + + Merge pull request #19870 from hqhq/hq_sync_Dockerfile + + Sync with Dockerfile + +commit 28a7577a029780e4533faf3d057ec9f6c7a10948 +Merge: b2c162a0b3 894266c1bb +Author: Alexander Morozov +Date: Wed Feb 3 10:56:19 2016 -0800 + + Merge pull request #19959 from WeiZhang555/fix-cli-print-err + + Remove redundant error message + +commit 7a20a270bc7ce34c9a6f7cc9eebb38c0bb332b7f +Author: Alexander Morozov +Date: Tue Feb 2 17:26:46 2016 -0800 + + Fix minor vet warnings + + Also use Asserts where it's possible. + + Signed-off-by: Alexander Morozov + +commit f5823ff0be6ad0f1fdf9ee9a3f60c899075fb401 +Author: Richard Scothern +Date: Wed Feb 3 10:42:32 2016 -0800 + + Print the correct token expiration time + Signed-off-by: Richard Scothern + +commit f93d787e3b343ce63b457fc322ae98df3f0f7b8a +Author: Mary Anthony +Date: Wed Jan 27 13:17:35 2016 -0800 + + WIP: TLS Docs for Swarm + Struct edit pass thru conceptual material + Updating with comments from Mike + Tweaking menu layout + Updating for Nigel + Updating with local images, formatting fixes + Updating with the comments from review + + Signed-off-by: Mary Anthony + +commit 1cbd77262987d821a675f51da1213c7bf171e05b +Author: Jessica Frazelle +Date: Fri Jan 15 15:46:56 2016 -0800 + + fix opensuse rpm + + Signed-off-by: Jessica Frazelle + +commit 8ee7ad2209502f43496ff65e32fbcd7573b13c26 +Author: Arnaud Porterie +Date: Wed Feb 3 10:30:17 2016 -0800 + + Enable cross-platforms logout from Registry + + Signed-off-by: Arnaud Porterie + +commit c149d45cc8cc9cd285a73fea097cb43f9317574d +Merge: 586111b11e 5438838be4 +Author: Olivier Gambier +Date: Wed Feb 3 10:31:23 2016 -0800 + + Merge pull request #1415 from omercnet/patch-1 + + Update configuration.md + +commit f0df677913ce9bc6da5253dcca62690917923a3c +Author: Florian Maier +Date: Wed Feb 3 13:02:22 2016 +0100 + + Fix formatting in breaking changes doc + + Signed-off-by: Florian Maier + +commit 64336615cfc4b5cf690f426e313c1a2c0c6e7b0c +Author: Dimitar Bonev +Date: Fri Jan 29 14:15:38 2016 +0200 + + Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty + + Signed-off-by: Dimitar Bonev + +commit a59982eb1116df1e08ad0a1e807180719f2eb08c +Author: Mary Anthony +Date: Tue Feb 2 12:04:13 2016 -0800 + + Fixing duplicate identifiers + + Signed-off-by: Mary Anthony + +commit 46f33f12b022fb9970e41029e3173e557b86f97c +Author: Daniel Nephin +Date: Mon Feb 1 14:04:53 2016 -0500 + + Update merge docs with depends_on, and correction about how links and volumes_from are merged. + + Signed-off-by: Daniel Nephin + +commit dc718eae65dda425cf04e8efc8cba74e494d5509 +Author: Daniel Nephin +Date: Mon Feb 1 13:47:13 2016 -0500 + + Make links unique-by-alias when merging + + Factor out MergeDict from merge_service_dicts to reduce complexity below limit. + + Signed-off-by: Daniel Nephin + +commit aa5ff0546301c608e96e7eb73ef2aa081f5c1d93 +Author: Daniel Nephin +Date: Fri Jan 29 13:36:51 2016 -0500 + + Fix merging of lists with multiple files. + + Signed-off-by: Daniel Nephin + +commit 3b7471ae848fd6405b0272448a854df94699c0cf +Author: Ryan Taylor Long +Date: Thu Jan 28 06:19:03 2016 +0000 + + Add depends_on to ALLOWED_KEYS + + This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`. + + Signed-off-by: Ryan Taylor Long + +commit 7f009aeeb959b7962542d5674819c57c5130fd1d +Author: Daniel Nephin +Date: Mon Feb 1 12:10:21 2016 -0500 + + Move command reference to overview. + + Signed-off-by: Daniel Nephin + +commit 44c7d080bd5f6c3a0132034c90a11839466b4595 +Author: Daniel Nephin +Date: Fri Jan 29 13:00:43 2016 -0500 + + Rename the old environment variable page to link environment variables. + + Signed-off-by: Daniel Nephin + +commit 32bd76052630b964082e1060dd576c0c69269e2a +Author: Daniel Nephin +Date: Thu Jan 28 19:17:18 2016 -0500 + + Cleanup command-line reference docs by renaming overview to envvars. + + Signed-off-by: Daniel Nephin + +commit 009dbbe97116d6534c91c70e92eb2645c1b85f81 +Author: Daniel Nephin +Date: Thu Jan 28 18:53:40 2016 -0500 + + Use the same capitalization for all menu items in the docs. + + Signed-off-by: Daniel Nephin + +commit 6b59ba0c31cf5e9a5adff5d4770064159c10c6dc +Author: Daniel Nephin +Date: Thu Jan 28 18:50:05 2016 -0500 + + Re-order compose docs so that quickstart guides come before other documentation. + + Signed-off-by: Daniel Nephin + +commit 61d00ebee4229dc1ead4721c5d4501eb1a86a297 +Author: Daniel Nephin +Date: Fri Jan 29 17:31:27 2016 -0500 + + Extract volume init and removal from project. + + Signed-off-by: Daniel Nephin + +commit 3b1276bd4481247c5b6ce379bd6c8255a952b146 +Author: Daniel Nephin +Date: Fri Jan 29 16:30:24 2016 -0500 + + Include networks in the config_hash. + + Signed-off-by: Daniel Nephin + +commit 3e8a4a5dc3000cfb4b64950e1f26248508b48e95 +Author: Daniel Nephin +Date: Fri Jan 29 16:00:50 2016 -0500 + + Don't initialize networks that aren't used by any services. + + Signed-off-by: Daniel Nephin + +commit 0c87e0b18fa354ddfe1543f5a2391db375fe80be +Author: Daniel Nephin +Date: Fri Jan 29 14:41:18 2016 -0500 + + Refactor project network initlization. + + Signed-off-by: Daniel Nephin + +commit 8024f2f09e2969d6e359d62d2dc6488f25a8e248 +Author: Aanand Prasad +Date: Fri Jan 29 16:38:23 2016 +0000 + + Tweak and test warning shown when version is a dict + + Signed-off-by: Aanand Prasad + +commit f081376067b6fc1cb3e8fc52f52ff9148cab919a +Author: Aanand Prasad +Date: Fri Jan 29 16:15:16 2016 +0000 + + Improve error messages for invalid versions + + Signed-off-by: Aanand Prasad + +commit ce0d469c18c4495d8420e47f81a7fd31a1a24795 +Author: Aanand Prasad +Date: Fri Jan 29 15:58:38 2016 +0000 + + Make 'version' a string + + Signed-off-by: Aanand Prasad + +commit b2ee08f439bc2fb1bf699eb9ca5356e2485ba743 +Author: Aanand Prasad +Date: Thu Jan 28 16:26:25 2016 +0000 + + Remove redundant check - self.config should never be None + + Signed-off-by: Aanand Prasad + +commit e9ba06ed4b1cb4f51da7bd2ec4ee1c93b417bfe0 +Author: Aanand Prasad +Date: Thu Jan 28 15:20:46 2016 +0000 + + Normalise/fix config field designators in validation messages + + - Instead of "Service 'web' configuration key 'image'", just say + "web.image" + + - Fix the "Service 'services'" bug in the v2 file format + + Signed-off-by: Aanand Prasad + +commit 9e9b36460ce90d8fc99badfd79096dc789d4267b +Author: Aanand Prasad +Date: Thu Jan 28 14:44:51 2016 +0000 + + Convert validation error tests to pytest style + + Signed-off-by: Aanand Prasad + +commit c4954104020ae8ac474ba4bb20dbe7129ee9e134 +Author: Ying Li +Date: Wed Feb 3 10:00:29 2016 -0800 + + Add the github.com/docker/go-connections/tlsconfig dependency to godeps + + Signed-off-by: Ying Li + +commit cbda80aaff026329a13bb2d0943a4c428251e207 +Author: Aaron Lehmann +Date: Wed Feb 3 09:55:16 2016 -0800 + + Revert "Set idle timeouts for HTTP reads and writes in communications with the registry" + + This reverts commit 84b2162c1a15256ac09396ad0d75686ea468f40c. + + The intent of this commit was to set an idle timeout on a HTTP + connection. If a read took more than 60 seconds to complete, or a write + took more than 60 seconds to complete, the connection would be + considered dead. + + This doesn't work properly, because the HTTP internals apparently read + from the connection concurrently while writing. An upload that doesn't + complete in 60 seconds leads to a timeout. + + Fixes #19967 + + Signed-off-by: Aaron Lehmann + +commit b2c162a0b34ac0c5caaa1f30b1a3a7d6844b83a9 +Merge: e3f96b093a 858f852da4 +Author: Phil Estes +Date: Wed Feb 3 12:51:51 2016 -0500 + + Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error + + user namespaces: duplicate dot in user namespaces error message + +commit 7bb4f44fcb2edcb889ca1759bfa72e393ffb1186 +Merge: 7f6d67c030 834b9b4161 +Author: Nathan LeClaire +Date: Wed Feb 3 09:42:46 2016 -0800 + + Merge pull request #2984 from dgageot/2982-fix-auto-detection + + FIX #2982 Fix shell auto detection + +commit 7f6d67c03031a42e041be12c406254d01076a160 +Merge: 985ca0de70 7a56ddb054 +Author: Nathan LeClaire +Date: Wed Feb 3 09:42:35 2016 -0800 + + Merge pull request #2981 from exoscale/fix/exoscale-endpoint + + drivers/exoscale: fix configuration of exoscale endpoint + +commit 834b9b4161c8ceef2779c9b096ce99a32e6d5ce9 +Author: David Gageot +Date: Wed Feb 3 08:23:12 2016 -0800 + + FIX #2982 Fix auto detection + + Signed-off-by: David Gageot + +commit e3f96b093a3a19044d2a0d096571f22c1317c8e3 +Merge: 98c4f0bbc3 382c96ee7b +Author: Phil Estes +Date: Wed Feb 3 11:16:29 2016 -0500 + + Merge pull request #19964 from vdemeester/factor-prefix-and-slash-platform + + Add a getPrefixAndSlashFromDaemonPlatform … + +commit 5438838be4941e7824b970dce9d7e4f678406597 +Author: Omer Cohen +Date: Wed Feb 3 17:59:49 2016 +0200 + + fix yml indent + + Signed-off-by: Omer Cohen + +commit 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc +Merge: bc08203314 2ed72a5d93 +Author: Vincent Demeester +Date: Wed Feb 3 16:41:45 2016 +0100 + + Merge pull request #18966 from mariusGundersen/machine-readable-state + + Expose the machine readable state of a container when listing containers + +commit 7a56ddb054a2a1b44bffab162e20eeacb72fe23f +Author: Vincent Bernat +Date: Wed Feb 3 16:25:28 2016 +0100 + + drivers/exoscale: fix configuration of exoscale endpoint + + The environment variable was `EXOSCALE_ENDPOINT` but the flag was + `--exoscale-url`. When configuring from flags, the wrong name was + used. Therefore, a user was unable to use an alternate endpoint. + + Signed-off-by: Vincent Bernat + +commit 858f852da48a7d075cbc5139356a36ac975bf10f +Author: Liron Levin +Date: Wed Feb 3 16:56:34 2016 +0200 + + user namespaces: duplicate dot in user namespaces error message + + duplicate dot in user namespaces error message: + + $ docker run -ti --net=host ubuntu /bin/bash + docker: Error response from daemon: Cannot share the host or a + container's network namespace when user namespaces are enabled.. + + Signed-off-by: Liron Levin + +commit 382c96ee7b02f393e7515e4cc4882738398b86a6 +Author: Vincent Demeester +Date: Wed Feb 3 15:16:00 2016 +0100 + + Add a getPrefixAndSlashFromDaemonPlatform … + + … to limit code duplication in integration tests :P + + Signed-off-by: Vincent Demeester + +commit bc082033147418c9d2b45dad104f84e8a6d29ae9 +Merge: f37e10aee3 07fd173225 +Author: Vincent Demeester +Date: Wed Feb 3 15:05:21 2016 +0100 + + Merge pull request #19948 from Microsoft/jjh/testclirm + + Windows CI: Port docker_cli_rm_test.go + +commit 9afdd436cdb0d13eff8f34026a7f7e4d40cfda53 +Author: Felix Geisendörfer +Date: Sun Jan 31 06:08:25 2016 +0100 + + docs: point out known issue with nginx/vboxfs + + see https://github.com/docker/docker/issues/18666 + + Signed-off-by: Felix Geisendörfer + +commit c1b5c9c49c964197ca18ca3cbcb45ec226b39492 +Author: Mary Anthony +Date: Sat Jan 30 18:24:08 2016 -0800 + + Adding get-swarm and fix for #1580 + Fixing duplicate PR + Updating get-swarm + Removing the fix for fix for #1580 + Update with MB comments + Fixing note + + Signed-off-by: Mary Anthony + +commit d842645de94b510b2ed1ade14ab73587460112b9 +Author: Omer Cohen +Date: Wed Feb 3 15:51:36 2016 +0200 + + Update configuration.md + + fixed broken links + + Signed-off-by: Omer Cohen + +commit f37e10aee3e23f60bc3d964dd9004c371d8f1371 +Merge: 0736dba624 09a33b5f60 +Author: Sebastiaan van Stijn +Date: Wed Feb 3 14:52:18 2016 +0100 + + Merge pull request #19961 from coolljt0725/check_nil + + 1.10.0-rc3: Check nil before set resource.OomKillDisable + +commit 2c63ac3a974a7ab56ffeddece76cc29710ef2996 +Author: Zhang Wei +Date: Wed Feb 3 11:08:27 2016 +0800 + + Fix error message for pause a restarting container + + Signed-off-by: Zhang Wei + +commit 0736dba624e616d8b8af26f03ea1a438535e8dc1 +Merge: b75d0929b1 b47749102d +Author: Sebastiaan van Stijn +Date: Wed Feb 3 13:40:55 2016 +0100 + + Merge pull request #19947 from Microsoft/jjh/testclistart + + Windows CI: Port docker_cli_start_test.go + +commit d8d47f428d3a37dd758e3bd714024f6be4df3707 +Author: Qiang Huang +Date: Wed Feb 3 12:09:52 2016 +0000 + + Sync with Dockerfile + + Add support for seccomp and buildpack-deps, and + updated some commit numbers. + + Signed-off-by: Qiang Huang + +commit b75d0929b1df1481a928531102531a38f143ad49 +Merge: 4ef06e9ef1 5566ccb7aa +Author: Sebastiaan van Stijn +Date: Wed Feb 3 11:28:10 2016 +0100 + + Merge pull request #19914 from coolljt0725/fix_top_restart + + Fix docker top a restarting container + +commit 09a33b5f60557ee3846baa48f5628bc6b8a70a9b +Author: Lei Jitang +Date: Wed Feb 3 04:31:00 2016 -0500 + + Check nil before set resource.OomKillDisable + + Signed-off-by: Lei Jitang + +commit 4ef06e9ef18e7538c71818175d3228ba65c00b64 +Merge: 052e5f222e 55268f4e91 +Author: Vincent Demeester +Date: Wed Feb 3 09:28:25 2016 +0100 + + Merge pull request #19946 from Microsoft/jjh/stats + + Windows: Turn off stats + +commit 052e5f222e5c422b31160255b499a298b9b89898 +Merge: f3263201ab c8f263c73d +Author: Vincent Demeester +Date: Wed Feb 3 08:52:17 2016 +0100 + + Merge pull request #19940 from bfirsh/add-1.10-migration-docs + + Add 1.10 migration docs + +commit f3263201ab923335c729d17d1aebb66fbbc628aa +Merge: d2bc2f081f 2fd35de274 +Author: Sebastiaan van Stijn +Date: Wed Feb 3 08:51:54 2016 +0100 + + Merge pull request #19951 from icecrime/18546_carry + + Carry #18546 + +commit 894266c1bbdfeb53bf278f3cb762945bac69e592 +Author: Zhang Wei +Date: Wed Feb 3 14:29:15 2016 +0800 + + Remove redundant error message + + Currently some commands including `kill`, `pause`, `restart`, `rm`, + `rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error + message on client side, with a lot of redundant messages, this commit is + trying to remove the unuseful and redundant information for user. + + Signed-off-by: Zhang Wei + +commit 9a45eaedbdf540f8253cfcbb9ab4d5f8f74674e4 +Author: Victor Vieux +Date: Tue Feb 2 23:41:03 2016 -0800 + + use golang:1.5.3-alpine in Dockerfile + + Signed-off-by: Victor Vieux + +commit 342611313e41255e8f3a349baf9c46e2e3780edd +Merge: cbfdb37fde 88e5a792be +Author: Victor Vieux +Date: Tue Feb 2 22:29:51 2016 -0800 + + Merge pull request #1745 from vieux/bump-1.1.0-rc3 + + Bump version to 1.1.0-rc3 + +commit d2bc2f081f12f2f5549a059133c9bf86c02ea486 +Merge: fa160753c1 408092e56b +Author: David Calavera +Date: Tue Feb 2 21:10:30 2016 -0800 + + Merge pull request #19945 from amitkris/master + + bump logrus to v0.9.0 + +commit 88e5a792beddb4358b16f1072669e03279e50df0 +Author: Victor Vieux +Date: Tue Feb 2 19:14:19 2016 -0800 + + Bump version to 1.1.0-rc3 + + Signed-off-by: Victor Vieux + +commit fa160753c176e18bd0c1610317d62b888f1d234c +Merge: 6f88a3d7d3 6b8341a2d5 +Author: Arnaud Porterie +Date: Tue Feb 2 20:09:16 2016 -0800 + + Merge pull request #19954 from Microsoft/jjh/disableclientsetstls + + Disable flakey TestClientSetsTLSServerName + +commit 6b8341a2d529ff6489e77ef6d496a2054af31cd5 +Author: John Howard +Date: Tue Feb 2 19:56:31 2016 -0800 + + Disable flakey TestClientSetsTLSServerName + + Signed-off-by: John Howard + +commit 2fd35de274fa25d5031756eb5fdf3f3240bc4d9d +Author: Arnaud Porterie +Date: Tue Feb 2 19:07:58 2016 -0800 + + Fix typo + + Signed-off-by: Arnaud Porterie + +commit 0e147547660c830e5ea33a0b9a0281e64256efab +Author: Troy Denton +Date: Wed Dec 9 13:07:31 2015 -0600 + + Update networkingcontainers.md + + updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead. + + Signed-off-by: Troy Denton + +commit cbfdb37fded2b0efd9d374ae8082f844c7e32d1c +Merge: 011b6c9c49 a67d3ef125 +Author: Victor Vieux +Date: Tue Feb 2 19:01:26 2016 -0800 + + Merge pull request #1744 from nishanttotla/UpdateAPIVersion + + Bump API version + +commit 07fd173225408342de76f749c2a5bccadec32d3a +Author: John Howard +Date: Tue Feb 2 18:39:24 2016 -0800 + + Windows CI: Port docker_cli_rm_test.go + + Signed-off-by: John Howard + +commit e480483d411a0cce8a8ad1f8f3b93ec7f0460d76 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 18:40:57 2016 -0800 + + Properly applying the name convention this time + + Signed-off-by: Jean-Laurent de Morlhon + +commit a67d3ef12503fa46863ed180f05ffcd9a8f8bd3d +Author: Nishant Totla +Date: Tue Feb 2 18:40:03 2016 -0800 + + Bump API version + + Signed-off-by: Nishant Totla + +commit 327af3a0525d45117685136d6bf7fbaeffa6a149 +Merge: 3db74c8162 f6dc25a3b2 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 18:30:55 2016 -0800 + + Merge branch 'rc' + +commit b47749102d8bfde1ec6f87b2cd291b8f45146b67 +Author: John Howard +Date: Tue Feb 2 18:23:29 2016 -0800 + + Windows CI: Port docker_cli_start_test.go + + Signed-off-by: John Howard + +commit 011b6c9c497e478482c292e061fd79a5de5473db +Merge: 89c4b2b4a5 77b4f98b3b +Author: Victor Vieux +Date: Tue Feb 2 18:21:00 2016 -0800 + + Merge pull request #1742 from dongluochen/internalNetwork + + Update dockerclient to support network create `--internal` flag + +commit d8ef7046a7376dc8a19e39506dabe1ab1222b250 +Author: Victor Vieux +Date: Tue Feb 2 18:18:42 2016 -0800 + + add amitshukla, moxiegirl and nishanttotla to the MAINTAINERS file + + Signed-off-by: Victor Vieux + +commit 3db74c8162d8018ed1d5d1532477720f2a26a9ca +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 18:17:39 2016 -0800 + + Changing url pattern to match new machine release name + + Signed-off-by: Jean-Laurent de Morlhon + +commit ee4e6e36911e61364ce487d5634e6dab076f25a8 +Author: Brian Bland +Date: Tue Feb 2 18:10:03 2016 -0800 + + Updates docker/goamz dependency to support AWS profile env + + Signed-off-by: Brian Bland + +commit f6dc25a3b2fbc64b3fa1219c027fdbe75f82b611 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 17:56:20 2016 -0800 + + Bumping docker to 1.10.0-rc3 + + Signed-off-by: Jean-Laurent de Morlhon + +commit a1c1f697831d62362b4623e50781d0d1237aaf7d +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 17:33:16 2016 -0800 + + Bump docker-machine version to 0.6.0-rc3 + + Signed-off-by: Jean-Laurent de Morlhon + +commit dcc7734a67ef939f47cf454239106d9b24eef34a +Author: Jeffrey Morgan +Date: Wed Jan 27 19:11:00 2016 -0800 + + Bump versions + + Signed-off-by: Jeffrey Morgan + +commit 0d78d5b33ae3f874a13f78d206727e07b311da66 +Author: Jeffrey Morgan +Date: Mon Jan 18 16:50:36 2016 -0800 + + 1.10.0-rc1 + + Signed-off-by: Jeffrey Morgan + +commit 5566ccb7aa0747005573f6f4f04f46552b75a394 +Author: Lei Jitang +Date: Tue Feb 2 21:05:01 2016 -0500 + + Fix docker top a restarting container + + Signed-off-by: Lei Jitang + +commit 89c4b2b4a58a003de6e45b9f785d538bc7419d33 +Merge: 8aff2084b7 5347098def +Author: Alexandre Beslic +Date: Tue Feb 2 18:00:00 2016 -0800 + + Merge pull request #1740 from vieux/fix_disconnect_and_random_-f + + support disconnect -f and use random engine + +commit 55268f4e9158738631f04e7e4becf39c9043b60a +Author: John Howard +Date: Tue Feb 2 17:59:11 2016 -0800 + + Windows: Turn off stats + + Signed-off-by: John Howard + +commit 77b4f98b3b5c7692d468ec9ffc4e841a7d667dbb +Author: Dong Chen +Date: Tue Feb 2 17:55:15 2016 -0800 + + Update dockerclient to support network create `--internal` flag. + + Signed-off-by: Dong Chen + +commit c8f263c73d0f3efd1834427346b3c5b170fcdab5 +Author: Ben Firshman +Date: Tue Feb 2 15:55:54 2016 -0800 + + Add 1.10 migration docs + + Originally from https://blog.docker.com/2016/01/docker-1-10-rc/ + + Signed-off-by: Ben Firshman + +commit 408092e56b7859d54138e82575a33bcfcb5fcaad +Author: Amit Krishnan +Date: Tue Feb 2 17:42:19 2016 -0800 + + bump logrus to v0.9.0 + Signed-off-by: Amit Krishnan + +commit 6f88a3d7d3f51c643667f437539ed75ad569688c +Merge: c2bf90eb59 5e3fdd3c20 +Author: Arnaud Porterie +Date: Tue Feb 2 17:48:43 2016 -0800 + + Merge pull request #19939 from Microsoft/jjh/testcreate + + Windows CI: TestCreate* porting + +commit 89c5b800e64dba79f287b20932df9e3b70e561b0 +Merge: bd1c8973ab 34ccb90d7e +Author: Daniel Nephin +Date: Tue Feb 2 20:37:38 2016 -0500 + + Merge pull request #2782 from dbonev/2772-compose-project-name-empty + + Falling back to default project name on empty COMPOSE_PROJECT_NAME + +commit 9b63e4e7f5a02efa89d8bc91e1cb5e4cada60093 +Author: Alessandro Boch +Date: Tue Feb 2 17:25:28 2016 -0800 + + Store endpoint config on network connect to a stopped container + + Signed-off-by: Alessandro Boch + +commit 985ca0de70b9bdeeceecd6725913d717cf88af10 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 17:25:32 2016 -0800 + + Bumping version to 0.6.0-dev + + Signed-off-by: Jean-Laurent de Morlhon + +commit 86272a875230ef9ea892a4ad4fbd3a71a09e8bd4 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 17:19:20 2016 -0800 + + Update changelog for v0.6.0-rc3 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 0369344a785e555438b58458167c9ee010252326 +Author: Riyaz Faizullabhoy +Date: Tue Feb 2 16:55:50 2016 -0800 + + split client.go into delegations.go + + Signed-off-by: Riyaz Faizullabhoy + +commit 9c84547853cfa9e69ef5c2805e6572dd443e688b +Author: Riyaz Faizullabhoy +Date: Mon Feb 1 14:30:01 2016 -0800 + + Add tests against old style changes and clear paths + + Signed-off-by: Riyaz Faizullabhoy + +commit 70ee4f8670ced20166397c07a0d1874a1cae3d5f +Author: Riyaz Faizullabhoy +Date: Fri Jan 29 15:57:14 2016 -0800 + + PoC broken down client api for delegations + + Signed-off-by: Riyaz Faizullabhoy + +commit 246990d5d1403c6d1dcc55c0b07c22145d2283cb +Merge: 111ed736e9 a980a46687 +Author: French Ben +Date: Tue Feb 2 17:01:29 2016 -0800 + + Merge pull request #1430 from nathanleclaire/skip_precreate_fail_metric + + Set 'Setup Halted' event instead of 'Setup Failed' for exit code 3 + +commit d2300ca607ded15d1e3f4abdd621c50ffc3472b5 +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 17:01:21 2016 -0800 + + Bump version to 0.6.0-rc3 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 2fac65df7106155b7bdecd6d1795da494bcd5357 +Merge: 905cbb7852 c07c7b49c2 +Author: Diogo Mónica +Date: Tue Feb 2 16:55:43 2016 -0800 + + Merge pull request #533 from endophage/remove_dead_targets_code + + removing last vestiges of target download code + +commit 092c36c31a46d05dc48494839207230b7997303d +Merge: 6861665646 d27ccb0f6e +Author: Jean-Laurent de Morlhon +Date: Tue Feb 2 16:54:04 2016 -0800 + + Merge pull request #2979 from nathanleclaire/exit_code_3 + + Exit with code 3 if error is during pre-create check + +commit c2bf90eb59d1d9e7565ba381d4c86bd48d9c36d0 +Merge: 1bc4c99372 14c53160d7 +Author: Alexander Morozov +Date: Tue Feb 2 16:49:29 2016 -0800 + + Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack + + Windows CI: One more reliability hack + +commit 5347098defaf4671205c1f2317d83b0f18b39a59 +Author: Victor Vieux +Date: Tue Feb 2 16:46:37 2016 -0800 + + support disconnect -f and use random engine + + Signed-off-by: Victor Vieux + +commit a980a466874ff9569389cf974ba174d34ffb3689 +Author: Nathan LeClaire +Date: Mon Feb 1 17:56:35 2016 -0800 + + Set 'Setup Halted' event instead of 'Setup Failed' for exit code 3 + + Signed-off-by: Nathan LeClaire + +commit 9c7f0f826a016d523dd3b569f02bcadb4b65b1e0 +Merge: 69ff3209fe 4b8b431f68 +Author: moxiegirl +Date: Tue Feb 2 16:33:18 2016 -0800 + + Merge pull request #55 from SvenDowideit/fix-broken-url + + Fix broken URL + +commit 4b8b431f687d07dd2893d98645ff08b9455ab927 +Author: Sven Dowideit +Date: Tue Feb 2 16:31:04 2016 -0800 + + Fix broken URL + + Signed-off-by: Sven Dowideit + +commit 8aff2084b78ab25509bb947e48a7480aa0140a23 +Merge: 5ab32d0705 24fe2c04e5 +Author: Dongluo Chen +Date: Tue Feb 2 16:16:54 2016 -0800 + + Merge pull request #1739 from vieux/support_filter_network_ls + + support docker network ls --filter type=XXX + +commit d27ccb0f6ed85b4d1842913f19705490a25714b2 +Author: Nathan LeClaire +Date: Mon Feb 1 17:59:47 2016 -0800 + + Exit with code 3 if error is during pre-create check + + Signed-off-by: Nathan LeClaire + +commit 1bc4c99372fa458c70eeb411575a1c538912521d +Merge: 83ee24e52b 746f6af9aa +Author: Alexander Morozov +Date: Tue Feb 2 16:08:23 2016 -0800 + + Merge pull request #19761 from HackToday/enhancesortattr + + Sort the attributes for events + +commit 5e3fdd3c20900b5db5895fee85f5ff11744a9bea +Author: John Howard +Date: Tue Feb 2 16:00:39 2016 -0800 + + Windows CI: TestCreate* porting + + Signed-off-by: John Howard + +commit 83ee24e52b04fd8cf1f7366dff04baa43d89ec49 +Merge: 85a32baa3b 0906195fbb +Author: Alexander Morozov +Date: Tue Feb 2 15:59:45 2016 -0800 + + Merge pull request #19911 from Microsoft/jstarks/npipe + + Windows: Add support for named pipe protocol + +commit 24fe2c04e50719166fd8cfc18c428adf5f4f4d29 +Author: Victor Vieux +Date: Tue Feb 2 14:53:34 2016 -0800 + + support docker network ls --filter type=XXX + + Signed-off-by: Victor Vieux + +commit 85a32baa3be8a5f2e9dd5262e03726fe9d4d52b3 +Merge: 5ba3edd486 9f315dd328 +Author: Arnaud Porterie +Date: Tue Feb 2 15:56:55 2016 -0800 + + Merge pull request #19901 from calavera/debug_cli_tests + + Always show debug information in the info output + +commit bd1c8973ab6cbf94b73d5c62a4f54dcc2e6f6a4c +Merge: 4c4e94bc19 a713447e0b +Author: Sven Dowideit +Date: Tue Feb 2 15:43:09 2016 -0800 + + Merge pull request #2809 from moxiegirl/fixing-dup-identifier + + Fixing duplicate identifiers for 1.10 + +commit 5ba3edd4862a3308ff4863d4aef049159b4d31c8 +Merge: 2a35a1a6dc 4f1d876e4c +Author: Arnaud Porterie +Date: Tue Feb 2 15:34:13 2016 -0800 + + Merge pull request #19915 from wenchma/add_net_bind_test + + Add integration test for network host bind option + +commit 5ab32d070557e5c79bed91af7782d824062024b0 +Merge: eb5bcbdaba f26a50a483 +Author: Dongluo Chen +Date: Tue Feb 2 15:33:38 2016 -0800 + + Merge pull request #1735 from vieux/update_dockerclient + + update dockerclient + +commit 2a35a1a6dc3cdb68ac98a2f9fdb53f4889b339d7 +Merge: 01cc315322 0fd9b4067d +Author: Antonio Murdaca +Date: Wed Feb 3 00:21:07 2016 +0100 + + Merge pull request #19936 from vieux/fix_min_version + + fix error message on version too low + +commit 01cc315322597a00b3f82da140d922a6ebc5b7b3 +Merge: 67d6154cc2 695b7e8d11 +Author: Alexander Morozov +Date: Tue Feb 2 14:56:51 2016 -0800 + + Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats + + Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning + +commit 67d6154cc26cceccc554ebb54ae4dcbad44047e4 +Merge: b6a6ed7200 155714c596 +Author: Alexander Morozov +Date: Tue Feb 2 14:55:51 2016 -0800 + + Merge pull request #19917 from WeiZhang555/add-lock + + Lock container when set state to restarting + +commit 686166564630f2e346f3904c8b0a9283b2e5ea00 +Merge: 26b00ce1ec df45c054ce +Author: David Gageot +Date: Tue Feb 2 14:18:12 2016 -0800 + + Merge pull request #2967 from daehyeok/docs_kvm_driver + + Add kvm driver link to docs + +commit 0fd9b4067d5126a8059dc2821b835d3bde26e7eb +Author: Victor Vieux +Date: Tue Feb 2 14:16:15 2016 -0800 + + fix error message on version too low + + Signed-off-by: Victor Vieux + +commit 9f315dd328a33b51133a41067a508a8b59166a39 +Author: David Calavera +Date: Mon Feb 1 18:09:25 2016 -0500 + + Add regression tests for client debug flag. + + - Add client debug info to the `docker info` command. + + Signed-off-by: David Calavera + +commit eb5bcbdabaef3e3e8f07d71a0fde6739e3cc7d03 +Merge: 76d0171319 3ece47ff91 +Author: Alexandre Beslic +Date: Tue Feb 2 13:41:09 2016 -0800 + + Merge pull request #1732 from Uhsac/fix-typo-in-scheduler-docs + + Fix three typo in docs/scheduler/filter.md + +commit 14c53160d7477813839f6996cf340004ebe335c5 +Author: John Howard +Date: Tue Feb 2 13:15:35 2016 -0800 + + Windows CI: One more reliability hack + + Signed-off-by: John Howard + +commit 3ece47ff919fd6242081ef63f35b769597873d1a +Author: Clément Aigreault +Date: Tue Feb 2 14:49:59 2016 +0100 + + Fix three typo in docs/scheduler/filter.md + + dafult -> default + by by -> by + want run -> want to run + + Signed-off-by: Clément Aigreault + Signed-off-by: Uhsac + +commit b6a6ed7200281a2c2d0ca0824e69beb7240e6ddd +Merge: 51620020af b6766e3063 +Author: Tibor Vass +Date: Tue Feb 2 15:36:25 2016 -0500 + + Merge pull request #19932 from calavera/fix_config_validation + + Make sure flat options are not parsed as config structures. + +commit f26a50a483e7c5518f9bf3f8def4f73c47a26c54 +Author: Victor Vieux +Date: Tue Feb 2 12:08:09 2016 -0800 + + update dockerclient + + Signed-off-by: Victor Vieux + +commit a713447e0b746838ebaed192cadd4cbd3caba2af +Author: Mary Anthony +Date: Tue Feb 2 12:04:13 2016 -0800 + + Fixing duplicate identifiers + + Signed-off-by: Mary Anthony + +commit 69ff3209feb2d1843b295242e36b44a61ad82029 +Merge: 9c6e60b98a ec75bcbf05 +Author: moxiegirl +Date: Tue Feb 2 12:00:36 2016 -0800 + + Merge pull request #54 from moxiegirl/fix-dups + + Fixing duplicate ids for 1.10 + +commit 111ed736e9a8872c7f48d7ca4e90db95c9dd49cf +Merge: 1d52da8705 2762a02777 +Author: Jeffrey Morgan +Date: Tue Feb 2 11:56:02 2016 -0800 + + Merge pull request #1432 from SvenDowideit/move-kitematic-into-toolbox-menu + + Move Kitematic into the Docker Toolbox menu + +commit b6766e3063dccfc58c0ab1cfc9687cfa2947be6a +Author: David Calavera +Date: Tue Feb 2 14:33:41 2016 -0500 + + Make sure flat options are not parsed as config structures. + + Signed-off-by: David Calavera + +commit 2762a0277700afa772803bd922e393e6acabdd33 +Author: Sven Dowideit +Date: Tue Feb 2 11:41:37 2016 -0800 + + Move Kitematic into the Docker Toolbox menu + + Signed-off-by: Sven Dowideit + +commit c07c7b49c20e6f5160681b5dd7559400a8b7709a +Author: David Lawrence +Date: Tue Feb 2 11:39:17 2016 -0800 + + removing last vestiges of target download code + Signed-off-by: David Lawrence (github: endophage) + +commit 51620020aff6f31447a71a5a66af0066c524649a +Merge: 6b7a3f0c82 9b8d328666 +Author: Brian Goff +Date: Tue Feb 2 14:37:43 2016 -0500 + + Merge pull request #19927 from jfrazelle/update-comment + + update comment + +commit 8f4184ab84376cab9339433530611c63ad6fd284 +Merge: 58fb377f0f e28be9d306 +Author: Jeffrey Morgan +Date: Tue Feb 2 11:37:32 2016 -0800 + + Merge pull request #402 from SvenDowideit/start-toolbox-docs + + Start by creating a Docker Toolbox menu item + +commit 2651c00f0c6255798c7e39a0407cd2357cd37b25 +Author: Aanand Prasad +Date: Tue Feb 2 19:31:49 2016 +0000 + + Connect container to networks before starting it + + Signed-off-by: Aanand Prasad + +commit e28be9d306fb280249013aa4397c4bb1b2fcf6be +Author: Sven Dowideit +Date: Tue Feb 2 11:27:44 2016 -0800 + + Start by creating a Docker Toolbox menu item + + Signed-off-by: Sven Dowideit + +commit ec75bcbf05aadbbb6a5b53a0afacf3d934e18b5f +Author: Mary Anthony +Date: Tue Feb 2 11:20:57 2016 -0800 + + Fixing duplicate ids + + Signed-off-by: Mary Anthony + +commit 6b7a3f0c827163df13cff78a8ee45337b56003e1 +Merge: f830cec78a 6f0831930f +Author: Arnaud Porterie +Date: Tue Feb 2 11:02:08 2016 -0800 + + Merge pull request #19926 from Microsoft/jjh/refixcihack + + Windows CI: Re-do TP4 CI reliability hack + +commit f830cec78a03ab7e6dba48afff261c2e8ed0788d +Merge: 6bde64ab2d 7ed10d4a4c +Author: Sebastiaan van Stijn +Date: Tue Feb 2 19:58:29 2016 +0100 + + Merge pull request #19868 from HackToday/fixwindows + + Fix windows CI test + +commit 6bde64ab2d320cececa09bc8e9f8258fc59a7e4a +Merge: b6168e6845 3b35a5b604 +Author: Tibor Vass +Date: Tue Feb 2 13:50:45 2016 -0500 + + Merge pull request #19894 from samneirinck/powershell-support + + Add powershell completion support + +commit b6168e68450e7da2a4d0a32acc2addf7622a2dd1 +Merge: 7abc7b383c e516b5651b +Author: Tibor Vass +Date: Tue Feb 2 13:41:44 2016 -0500 + + Merge pull request #19929 from icecrime/delegation_exp + + Delegation is not experimental + +commit 4c4e94bc19dd8bf185c3d810d3f5e123797ea754 +Merge: 1cb67b781c 3ec87adccc +Author: Daniel Nephin +Date: Tue Feb 2 13:36:46 2016 -0500 + + Merge pull request #2785 from dnephin/depends_on_with_extends + + Fix list options when used with extends and multiple files + +commit 905cbb78528ff84d64b8e8bf29c28e1f17e38ce5 +Merge: 0202055694 f26a5c3c57 +Author: David Lawrence +Date: Tue Feb 2 10:33:40 2016 -0800 + + Merge pull request #531 from endophage/metrics_url + + update metrics endpoint + +commit e516b5651bf5de3281a37d3e737a8c154f896189 +Author: Arnaud Porterie +Date: Tue Feb 2 10:32:14 2016 -0800 + + Delegation is not experimental + + Change wording that described user delegation as an experimental + feature. + + Signed-off-by: Arnaud Porterie + +commit bd8b81a6868ad101fc01d10676034928e053e490 +Author: Richard Scothern +Date: Tue Feb 2 10:18:35 2016 -0800 + + Make 'Recipes' the last item in the list + Signed-off-by: Richard Scothern + +commit 76d017131915aabf37516e5f0346943f9aa96cd3 +Merge: 58baa9ea29 388b8fd50f +Author: Alexandre Beslic +Date: Tue Feb 2 10:16:59 2016 -0800 + + Merge pull request #1729 from dongluochen/errHandlingCompatibility + + Ignore 404 error from old engine versions + +commit 7abc7b383c8f37812db85fd9e4020c2ce6f30f32 +Merge: 63ad7df2aa 4ba168b4cb +Author: Arnaud Porterie +Date: Tue Feb 2 10:12:44 2016 -0800 + + Merge pull request #18605 from fgimenez/9969-add-sni-support + + Added cli SNI integration test + +commit 9b8d328666a6cd5313208cdf5f116825f06dccdc +Author: Jessica Frazelle +Date: Tue Feb 2 09:56:29 2016 -0800 + + update comment + + Signed-off-by: Jessica Frazelle + +commit f26a5c3c57ab55d6687ea72dea178053a0cfd8dc +Author: David Lawrence +Date: Mon Feb 1 17:26:20 2016 -0800 + + update metrics endpoint + Signed-off-by: David Lawrence (github: endophage) + +commit 63ad7df2aa935a56c7ef0ac4d43d48a5e8315499 +Merge: 202cccc3d3 a605d641d7 +Author: Tianon Gravi +Date: Tue Feb 2 09:52:35 2016 -0800 + + Merge pull request #19851 from hqhq/hq_remove_libseccompa + + Cleanup libseccomp.a hack since dockerinit is gone + +commit 020205569495129741a057602bcdb678ef38ad66 +Merge: 9f67e93381 5e088ee4dc +Author: Ying Li +Date: Tue Feb 2 09:46:47 2016 -0800 + + Merge pull request #532 from HuKeping/db + + Stop logging out critical info of database + +commit 586111b11e4c16c116e0c920cfdb5b67cc2cf620 +Merge: 830bef975d 4f7b32bc23 +Author: Richard Scothern +Date: Tue Feb 2 09:44:27 2016 -0800 + + Merge pull request #1407 from RichardScothern/docs + + Add compatibility notes about pull by digest across Docker and Registry versions. + +commit 6f0831930fbccfbb2b7552b64a4b54698b4b861c +Author: John Howard +Date: Tue Feb 2 09:36:18 2016 -0800 + + Windows CI: Re-do TP4 CI reliability hack + + Signed-off-by: John Howard + +commit 202cccc3d3d889c4671e9836d48076ba1e83f665 +Merge: 6144d24b03 c49b6ce4e1 +Author: Sebastiaan van Stijn +Date: Tue Feb 2 18:14:37 2016 +0100 + + Merge pull request #19924 from moxiegirl/title-per-scott + + Changing menu label from Engine > Docker Engine + +commit 6144d24b03044e68ed8a062d741be8e37d9e7d7b +Merge: 4d4c284ef4 1cfab85c0e +Author: Sebastiaan van Stijn +Date: Tue Feb 2 18:09:22 2016 +0100 + + Merge pull request #19923 from thaJeztah/update-etc-hosts-docs + + Add note about legacy links + +commit 1cfab85c0ea759fed753dc2c71cdb4b87ad62400 +Author: Sebastiaan van Stijn +Date: Mon Feb 1 16:07:57 2016 +0100 + + Add note about legacy links + + Signed-off-by: Sebastiaan van Stijn + +commit c49b6ce4e16d570432941fc686c05939dc888fc9 +Author: Mary Anthony +Date: Tue Feb 2 09:03:45 2016 -0800 + + Changing menu label from Engine > Docker Engine + + Signed-off-by: Mary Anthony + +commit 4d4c284ef4239ed0f3813816d1036aef32af8b58 +Merge: ef52a53c34 b2d3615337 +Author: Sebastiaan van Stijn +Date: Tue Feb 2 17:43:32 2016 +0100 + + Merge pull request #19817 from icecrime/breaking_changes + + Add doc page for breaking changes + +commit ef52a53c34d9f128d9435d031442509837c25c02 +Merge: 4f37e14e9c 6f863cfa18 +Author: Vincent Demeester +Date: Tue Feb 2 17:36:46 2016 +0100 + + Merge pull request #19865 from mavenugo/ndocs + + Docs cleanup for networking features added in 1.10 + +commit 4f37e14e9c1f57015d4a212bc48601eaef0fc733 +Merge: 2b56501480 140a74347d +Author: Arnaud Porterie +Date: Tue Feb 2 08:36:28 2016 -0800 + + Merge pull request #18362 from runcom/tunable-SetMaxThreads + + daemon_unix: set golang runtime max threads + +commit 1cb67b781c687e40465087808ba617b96c01da22 +Merge: c290e560cb 7b03de7d01 +Author: Daniel Nephin +Date: Tue Feb 2 11:26:26 2016 -0500 + + Merge pull request #2777 from dnephin/reorder_docs + + Re-order docs in menu, fix menu title capitalization, cleanup command reference + +commit c290e560cb2be46b60afdee9422220ec0909c434 +Merge: 7a197e5a69 3d3388d59b +Author: Daniel Nephin +Date: Tue Feb 2 11:19:34 2016 -0500 + + Merge pull request #2786 from dnephin/refactor_project + + Fix a few bugs around networking and project initilization + +commit 7a197e5a69558f1821e4143c5d2890cfdbaf30e3 +Merge: c81cc24e72 6928c24323 +Author: Aanand Prasad +Date: Tue Feb 2 16:13:07 2016 +0000 + + Merge pull request #2802 from dnephin/appveyor_to_bintray_deploy + + Deploying to bintray from appveyor using the new bintray support + +commit c81cc24e72d0b11191613bcc964955292b8e7150 +Merge: 60a5b39f6f e8756905ba +Author: Daniel Nephin +Date: Tue Feb 2 10:56:21 2016 -0500 + + Merge pull request #2806 from aanand/run-tests-with-tty + + Run test containers in TTY mode + +commit 3d3388d59ba94b074b38418fcec8da1ccddd7b58 +Author: Daniel Nephin +Date: Fri Jan 29 17:31:27 2016 -0500 + + Extract volume init and removal from project. + + Signed-off-by: Daniel Nephin + +commit e551988616021b50c8069b5d36a808afee5a8653 +Author: Daniel Nephin +Date: Fri Jan 29 16:30:24 2016 -0500 + + Include networks in the config_hash. + + Signed-off-by: Daniel Nephin + +commit 0810eeba106f71fc374c791283a84cd9f6725e8f +Author: Daniel Nephin +Date: Fri Jan 29 16:00:50 2016 -0500 + + Don't initialize networks that aren't used by any services. + + Signed-off-by: Daniel Nephin + +commit 8e838968fe64ca222c51cd77d2a84f805bada7a9 +Author: Daniel Nephin +Date: Fri Jan 29 14:41:18 2016 -0500 + + Refactor project network initlization. + + Signed-off-by: Daniel Nephin + +commit 3ec87adccc6d248aecf6beffbe5cb5fa9c7755a5 +Author: Daniel Nephin +Date: Mon Feb 1 14:04:53 2016 -0500 + + Update merge docs with depends_on, and correction about how links and volumes_from are merged. + + Signed-off-by: Daniel Nephin + +commit e32863f89ebe0c70143695525e5062ae1c8f375c +Author: Daniel Nephin +Date: Mon Feb 1 13:47:13 2016 -0500 + + Make links unique-by-alias when merging + + Factor out MergeDict from merge_service_dicts to reduce complexity below limit. + + Signed-off-by: Daniel Nephin + +commit bf6a5d3e4956d51f03926577fc759b29388f824f +Author: Daniel Nephin +Date: Fri Jan 29 13:36:51 2016 -0500 + + Fix merging of lists with multiple files. + + Signed-off-by: Daniel Nephin + +commit c70c72f49ac72f864f614f38288a1151dc590553 +Author: Ryan Taylor Long +Date: Thu Jan 28 06:19:03 2016 +0000 + + Add depends_on to ALLOWED_KEYS + + This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`. + + Signed-off-by: Ryan Taylor Long + +commit 7b03de7d01ded900a416187efcbb312c5d8423de +Author: Daniel Nephin +Date: Mon Feb 1 12:10:21 2016 -0500 + + Move command reference to overview. + + Signed-off-by: Daniel Nephin + +commit cf24c36c5549a2a87952da27c6e3d35974687e1c +Author: Daniel Nephin +Date: Fri Jan 29 13:00:43 2016 -0500 + + Rename the old environment variable page to link environment variables. + + Signed-off-by: Daniel Nephin + +commit 2df5593e8ff3ac5bd6670bf7011ef687a69529fa +Author: Daniel Nephin +Date: Thu Jan 28 19:17:18 2016 -0500 + + Cleanup command-line reference docs by renaming overview to envvars. + + Signed-off-by: Daniel Nephin + +commit 5e30f089e3c439c7f4a32e4bdc02e39890532cf9 +Author: Daniel Nephin +Date: Thu Jan 28 18:53:40 2016 -0500 + + Use the same capitalization for all menu items in the docs. + + Signed-off-by: Daniel Nephin + +commit 4f92004d9ae3f36a18ac0246e3771da0a9d5ea4c +Author: Daniel Nephin +Date: Thu Jan 28 18:50:05 2016 -0500 + + Re-order compose docs so that quickstart guides come before other documentation. + + Signed-off-by: Daniel Nephin + +commit 60a5b39f6fe3ace1dacf437d86b9b561a8d3d439 +Merge: 9c6c50c607 1152c5b25b +Author: Aanand Prasad +Date: Tue Feb 2 15:19:50 2016 +0000 + + Merge pull request #2783 from aanand/fix-validation-v2 + + Fix validation and version checking + +commit 2b565014800d7126a5645f9bc3296f183d0f5257 +Merge: 877f88267b 42f2621b0e +Author: Vincent Demeester +Date: Tue Feb 2 16:18:02 2016 +0100 + + Merge pull request #19909 from Microsoft/jjh/testunit-daemon + + Windows CI: Fix test-unit for daemon + +commit 877f88267b60699c3cf685b2f786a4498010cdf6 +Merge: 390077fcdc 1c95b858ac +Author: Sebastiaan van Stijn +Date: Tue Feb 2 15:25:42 2016 +0100 + + Merge pull request #19920 from thaJeztah/fix-memoryswap-docs + + Fix memory-swap description in older API versions + +commit 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8 +Author: Madhu Venugopal +Date: Sun Jan 31 11:13:25 2016 -0800 + + Docs cleanup for networking features added in v1.10 + + Signed-off-by: Madhu Venugopal + +commit 1152c5b25b571c3a2f7ffe4394844b1ebcbad570 +Author: Aanand Prasad +Date: Fri Jan 29 16:38:23 2016 +0000 + + Tweak and test warning shown when version is a dict + + Signed-off-by: Aanand Prasad + +commit ef8db3650aa551959c0979bba939d5747ec74a68 +Author: Aanand Prasad +Date: Fri Jan 29 16:15:16 2016 +0000 + + Improve error messages for invalid versions + + Signed-off-by: Aanand Prasad + +commit aeef61fcd8b9fc23f62238e9839a72d280ac2738 +Author: Aanand Prasad +Date: Fri Jan 29 15:58:38 2016 +0000 + + Make 'version' a string + + Signed-off-by: Aanand Prasad + +commit 1c95b858ac040974d2be73bb31d0d59af9b0b960 +Author: Sebastiaan van Stijn +Date: Tue Feb 2 14:49:14 2016 +0100 + + Fix memory-swap description in older API versions + + A value of -1 disables the *limit* so enables unlimited swap + + Signed-off-by: Sebastiaan van Stijn + +commit a8de582425f0ab3b9ec2a36ef20300dbabc05052 +Author: Aanand Prasad +Date: Thu Jan 28 16:26:25 2016 +0000 + + Remove redundant check - self.config should never be None + + Signed-off-by: Aanand Prasad + +commit 4ac004059a59c0ffb4e80dec8295d507ab54ef2d +Author: Aanand Prasad +Date: Thu Jan 28 15:20:46 2016 +0000 + + Normalise/fix config field designators in validation messages + + - Instead of "Service 'web' configuration key 'image'", just say + "web.image" + + - Fix the "Service 'services'" bug in the v2 file format + + Signed-off-by: Aanand Prasad + +commit d40bc6e4a04f9ba39d8c9d167357b0358ab09469 +Author: Aanand Prasad +Date: Thu Jan 28 14:44:51 2016 +0000 + + Convert validation error tests to pytest style + + Signed-off-by: Aanand Prasad + +commit e8756905ba41b53ad92cd9dea8f64853e1c5ac77 +Author: Aanand Prasad +Date: Tue Feb 2 13:31:28 2016 +0000 + + Run test containers in TTY mode + + Signed-off-by: Aanand Prasad + +commit 390077fcdcdf005bc3dde821596c88e355ef97ad +Merge: 5cdc0dfce3 1ab7d76f30 +Author: Sebastiaan van Stijn +Date: Tue Feb 2 14:06:58 2016 +0100 + + Merge pull request #19912 from HackToday/fiximage + + Correct old virtual size + +commit 1ab7d76f30f3cf693c986eb827ad49a6554d806d +Author: Kai Qiang Wu(Kennan) +Date: Tue Feb 2 05:57:59 2016 +0000 + + Correct old virtual size + + In new content addressable model, image no longer + have virtual size column, it is now 'size'. So we + need to update related docs about them. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 5e088ee4dc4a3cca77f2f98ec2eb74c15dc521ae +Author: HuKeping +Date: Tue Feb 2 20:02:08 2016 +0800 + + Stop logging out critical info of database + + The signer will print out the user name and password of the database + which could cause security problem. + + The server side is OK. + + Signed-off-by: Hu Keping + +commit 155714c59650a7b9b8f890f4d20c83ea9b80206b +Author: Zhang Wei +Date: Tue Feb 2 19:50:06 2016 +0800 + + Lock container when set state to restarting + + After exec driver run, container lock is lost, so we should lock + container when changing its state to `restarting` + + Signed-off-by: Zhang Wei + +commit 4f1d876e4c6907154e0dbb52fcc1ecc2643c6915 +Author: Wen Cheng Ma +Date: Tue Feb 2 18:01:04 2016 +0800 + + Add integration test for network host bind option + + Signed-off-by: Wen Cheng Ma + +commit 5cdc0dfce3b058874566721b1f111baaa19df18b +Merge: a39ad952ec a9379b4af2 +Author: Vincent Demeester +Date: Tue Feb 2 08:32:28 2016 +0100 + + Merge pull request #19822 from Microsoft/jjh/testexeccli + + Windows CI: Initial porting CLI TestExec* + +commit 388b8fd50f7b0a7798d6eaf6d80d9a5babf53f98 +Author: Dong Chen +Date: Mon Feb 1 22:13:11 2016 -0800 + + Only record connection failure error in error message. + + Signed-off-by: Dong Chen + +commit 7ed10d4a4cc724fe6ce3f623051546710a18a3b6 +Author: Kai Qiang Wu(Kennan) +Date: Mon Feb 1 00:30:15 2016 +0000 + + Fix windows CI test + + The windows CI is not clean in some tests, this try address that. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 3a99c4ca85011399ec9486160d02f43805784241 +Author: Dong Chen +Date: Mon Feb 1 20:03:44 2016 -0800 + + Ignore 404 error. Remove trailing white spaces from error, including new lines. + + Signed-off-by: Dong Chen + +commit 42f2621b0e19f263902e9f2eb3df0ef6d27d5fa4 +Author: John Howard +Date: Mon Feb 1 18:26:47 2016 -0800 + + Windows CI: Fix test-unit for daemon + + Signed-off-by: John Howard + +commit 1d52da87054592dbfa33f0f9566b38f2e729ede0 +Merge: c6924a0f8e 16bdc16dd3 +Author: Jeffrey Morgan +Date: Mon Feb 1 20:24:34 2016 -0800 + + Merge pull request #1408 from kelemen/master + + Fix for #1403 + +commit c6924a0f8eab2cf34b97ac1791f3aa2b8f2abb5c +Merge: 65584bdf20 47e0241e0b +Author: Jeffrey Morgan +Date: Mon Feb 1 20:24:22 2016 -0800 + + Merge pull request #1418 from saiberz/master + + Changes repo uri + +commit 0906195fbbd6f379c163b80f23e4c5a60bcfc5f0 +Author: John Starks +Date: Sat Jan 30 18:45:49 2016 -0800 + + Windows: Add support for named pipe protocol + + This adds an npipe protocol option for Windows hosts, akin to unix + sockets for Linux hosts. This should become the default transport + for Windows, but this change does not yet do that. + + It also does not add support for the client side yet since that + code is in engine-api, which will have to be revendored separately. + + Signed-off-by: John Starks + +commit a39ad952ec1efc3b7536d3d8a93e96a22cd1818b +Merge: a034ac66eb 2ebcb48cf1 +Author: Brian Goff +Date: Mon Feb 1 22:30:51 2016 -0500 + + Merge pull request #19889 from Microsoft/jjh/reliabilitytake2 + + Windows CI: TP4 reliability hack + +commit a034ac66eb766891676d1417826756870185de40 +Merge: ec6bfebc0f 7ccc0e2101 +Author: Brian Goff +Date: Mon Feb 1 22:30:08 2016 -0500 + + Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash + + Revendor Microsoft/hcsshim and vendor Microsoft/go-winio + +commit 830bef975d3ec1dd91d4dfe14bae9209871691f7 +Merge: e10efb2ecc e387b63001 +Author: Olivier Gambier +Date: Mon Feb 1 19:20:35 2016 -0800 + + Merge pull request #1410 from aaronlehmann/failured + + Correct ErrAuthenticationFailure message + +commit 58baa9ea29aab03d9d3bac940f2dc0334a1b3472 +Merge: 79f255355d 1be46e7e58 +Author: Dongluo Chen +Date: Mon Feb 1 19:07:26 2016 -0800 + + Merge pull request #1728 from vieux/restart_events_on_EOF + + retry monitor events on EOF + +commit ec6bfebc0f36c15793be7e1a581cab0aafcb31c1 +Merge: 193ef9f0c1 51795c0836 +Author: Tibor Vass +Date: Mon Feb 1 21:57:32 2016 -0500 + + Merge pull request #19907 from tiborvass/tty-debug + + Prevent stdin from hanging + +commit 193ef9f0c150b26f960a4b09ecc3197b6e1965fb +Merge: 3c0c115ec8 5d07d83ee0 +Author: Brian Goff +Date: Mon Feb 1 21:44:39 2016 -0500 + + Merge pull request #19861 from fangyuan930917/19350-remove-Info + + remove the unused Info interface in daemon/execdriver/driver.go + +commit 3c0c115ec89031e0cbd9e739099828342efc872c +Merge: f1e8d2c295 50de9fdff1 +Author: Brian Goff +Date: Mon Feb 1 21:19:42 2016 -0500 + + Merge pull request #19896 from calavera/same_rm_error_message + + Make error message consistent when removing containers fail. + +commit 2ebcb48cf1b4f883260b62f687e2c54926749b68 +Author: John Howard +Date: Mon Feb 1 10:13:54 2016 -0800 + + Windows CI: TP4 reliability hack + + Signed-off-by: John Howard + +commit 9f67e9338113c6bdba5299e0d98af2a641ee6ccb +Merge: 3fcfa2043c 1bf3dd08db +Author: Diogo Mónica +Date: Mon Feb 1 17:47:44 2016 -0800 + + Merge pull request #519 from endophage/consistent_download + + Consistent Download + +commit 51795c083624b106fe7f338213cbc3d3812f31af +Author: Tibor Vass +Date: Mon Feb 1 20:28:40 2016 -0500 + + Skip Close()-ing stdin on Darwin. The Return. + + This was accidentally removed in https://github.com/docker/docker/pull/16289 + Now adding it back. + + Signed-off-by: Tibor Vass + +commit 1bf3dd08db83cd79862545803ed35e68cf5bf20f +Author: David Lawrence +Date: Mon Feb 1 13:03:55 2016 -0800 + + Addressing comments from review + Signed-off-by: David Lawrence (github: endophage) + +commit f1e8d2c2958dc0142f0fb2b1efd349e54a92ef3f +Merge: 19eaa71e85 b80f761b14 +Author: Alexander Morozov +Date: Mon Feb 1 17:10:31 2016 -0800 + + Merge pull request #19899 from aboch/vnd + + Vendoring libnetwork 0.6.0-rc7 + +commit 4f7b32bc236993309d5c8f3ecdb2096bee26780d +Author: Richard Scothern +Date: Mon Feb 1 10:51:38 2016 -0800 + + Add compatibility notes about pull by digest across Docker and Registry versions. + + Signed-off-by: Richard Scothern + +commit 5d07d83ee0802391ff2ed5e10838376a9b817bba +Author: Fangyuan Gao <21551127@zju.edu.cn> +Date: Sun Jan 31 22:02:01 2016 +0800 + + remove the unused Info interface in daemon/execdriver/driver.go and related code + + Signed-off-by: Fangyuan Gao <21551127@zju.edu.cn> + +commit e387b6300102484307474b3e9f913b271f6619a4 +Author: Aaron Lehmann +Date: Mon Feb 1 17:03:41 2016 -0800 + + Correct ErrAuthenticationFailure message + + This was "authentication failured". Change it to "authentication + failure". + + Signed-off-by: Aaron Lehmann + +commit 19eaa71e85f9563e1428347fa9a91c8aa71f1f6d +Merge: 85475f7dea 960710bd81 +Author: Tibor Vass +Date: Mon Feb 1 19:50:54 2016 -0500 + + Merge pull request #19891 from icecrime/windows_login_issue + + Enable cross-platforms login to Registry + +commit 6d091596bc866974a6af5f4683f9699609bf15dd +Author: David Lawrence +Date: Mon Feb 1 16:48:33 2016 -0800 + + adding additional 'make static' command to create static builds of server and signer + Signed-off-by: David Lawrence (github: endophage) + +commit e10efb2ecc897d1d38b4359ccd06682c7bdfbeb6 +Merge: d3fb5c7064 648a1343db +Author: Aaron Lehmann +Date: Mon Feb 1 16:29:07 2016 -0800 + + Merge pull request #1403 from dmcgowan/auth-const-keys + + Update auth context keys to use constant + +commit d3fb5c7064f744f91d53c939a4013c62bf2567dc +Merge: 2fc586d2a4 e28c288444 +Author: Aaron Lehmann +Date: Mon Feb 1 16:27:49 2016 -0800 + + Merge pull request #1390 from dmcgowan/token-server + + Simple integration test token server + +commit 79f255355d67f4a2cf579ecfa00859078997054f +Merge: b450039172 97749f3f2d +Author: Alexandre Beslic +Date: Mon Feb 1 16:08:54 2016 -0800 + + Merge pull request #1726 from vieux/more_network_tests + + add docker run --net-alias, docker network connect --ip and docker network connect --alias tests + +commit 695bac7b0f4891b613b2e4e2cfd2bdd798f89b7d +Author: Brian Bland +Date: Mon Feb 1 15:34:36 2016 -0800 + + Adds test for S3 storage class configuration option + + Signed-off-by: Brian Bland + +commit 4688d1adc2ddbef7dac71450e7a0583655073284 +Author: Brian Bland +Date: Thu Jan 28 15:48:49 2016 -0800 + + Adds "storageclass" configuration parameter for S3 driver. + + Defaults to STANDARD, also supports REDUCED_REDUNDANCY. + + Signed-off-by: Brian Bland + +commit c6f871bcf2756bf0e62eb9d6199d548b422284d4 +Author: Sebastiaan van Stijn +Date: Tue Feb 2 00:52:54 2016 +0100 + + Fix indentation in quick-start + + Signed-off-by: Sebastiaan van Stijn + +commit b450039172e47d4d650646089f1fafb3f9652b78 +Merge: 8ddb324a9e 47609f74f3 +Author: Alexandre Beslic +Date: Mon Feb 1 15:52:29 2016 -0800 + + Merge pull request #1725 from vieux/add_simple_strategy_test + + add simple strategy test + +commit fe084ab45b3943803f08cac2c25249640d1abfb6 +Author: Sven Dowideit +Date: Mon Feb 1 15:15:24 2016 -0800 + + Update the apidocs menu location for the new menu structure + + Signed-off-by: Sven Dowideit + +commit 2fc586d2a4b3949383b0b3ba494beda4e37e9be5 +Merge: f2164294f7 2dc1af12a1 +Author: Aaron Lehmann +Date: Mon Feb 1 15:40:36 2016 -0800 + + Merge pull request #1381 from BrianBland/s3CustomUAString + + Adds custom registry User-Agent header to s3 HTTP requests + +commit 85475f7deabed7d94e98321bdb190f7eb756eaec +Merge: 1734571539 898599171e +Author: David Calavera +Date: Mon Feb 1 15:37:44 2016 -0800 + + Merge pull request #19794 from calavera/14358-disable-colors + + [Carry 18621] Allow disabling of colored Docker logs via daemon flag. + +commit 9710599f99b240fd002fd051fbbc18fce03e9574 +Author: Richard Scothern +Date: Mon Feb 1 15:22:25 2016 -0800 + + Make 'Recipes' into the Registry menu + Signed-off-by: Richard Scothern + +commit 8ddb324a9e71283409905538436963c68c543952 +Merge: 142197258b 5d63e55936 +Author: Isabel Jimenez +Date: Mon Feb 1 15:17:19 2016 -0800 + + Merge pull request #1633 from ezrasilvera/mesosCreateNW + + New network functions for mesos cluster: CreateNetwork(), RemoveNetwork(), and Networks() + +commit 7ccc0e2101a66e0621faf1f043bf7cd5515501d5 +Author: John Starks +Date: Mon Feb 1 23:09:35 2016 +0000 + + Revendor Microsoft/hcsshim and vendor Microsoft/go-winio + + This update changes the way hcsshim invokes Windows DLLs to avoid races + with the garbage collector. It also now uses go-winio to access the + pipes used for communication with processes running in the container; + this reduces the number of threads used by docker.exe, improving + scalability. + + Signed-off-by: John Starks + +commit 1734571539c8d1eb7928873ac03b948149ebafbb +Merge: cf93b0bce1 78b0defcf3 +Author: David Calavera +Date: Mon Feb 1 14:53:37 2016 -0800 + + Merge pull request #19893 from cpuguy83/19890_debugs_for_all + + handle debug mode for clients + +commit b80f761b141cf88c506f40b3e439cbe7a011c5d9 +Author: Alessandro Boch +Date: Mon Feb 1 14:52:18 2016 -0800 + + Vendoring libnetwork 0.6.0-rc7 + + Signed-off-by: Alessandro Boch + +commit cf93b0bce1b24d30c9a1480ddb15a1f83f2b5fd4 +Merge: d95c487213 9928b244e9 +Author: Sebastiaan van Stijn +Date: Mon Feb 1 23:37:11 2016 +0100 + + Merge pull request #19898 from joelwurtz/patch-1 + + Update docker-php link library from stage1 + +commit d95c4872135b0926e7911bf2b0b699e347c41e82 +Merge: 680cf1c8f4 3fd25d98b8 +Author: Sebastiaan van Stijn +Date: Mon Feb 1 23:26:40 2016 +0100 + + Merge pull request #19714 from vdemeester/carry-pr-18787 + + Carry #18787: Update Instructions for Docker Remote API access + +commit 898599171e2f36a1cf36a2eea31d82a226acd802 +Author: David Calavera +Date: Thu Jan 28 13:33:35 2016 -0500 + + Add test to make sure raw logs are properly activated. + + Signed-off-by: David Calavera + +commit 9928b244e9c1eb32eb63fc7a9666a946ca8729d6 +Author: Joel Wurtz +Date: Mon Feb 1 22:45:34 2016 +0100 + + Update docker-php library from stage1 + + Signed-off-by: Joel Wurtz + +commit 6928c24323af38fcce54078e51272be0951ca350 +Author: Daniel Nephin +Date: Mon Feb 1 16:30:39 2016 -0500 + + Deploying to bintray from appveyor using the new bintray support. + + Signed-off-by: Daniel Nephin + +commit 2dc1af12a1df1219fbca30784693cd7db7b5482c +Author: Brian Bland +Date: Wed Jan 20 16:40:58 2016 -0800 + + Adds custom registry User-Agent header to s3 HTTP requests + + Uses docker/goamz instead of AdRoll/goamz + + Adds a registry UA string param to the storage parameters when + constructing the storage driver for the registry App. + This could be used by other storage drivers as well + + Signed-off-by: Brian Bland + +commit 142197258b99be8d2bc195e2f7452814d97b25cb +Merge: f0667cd5bb 16de94b9b1 +Author: Dongluo Chen +Date: Mon Feb 1 13:38:26 2016 -0800 + + Merge pull request #1724 from nishanttotla/1689-UnknownPendingNodes + + Adding default name (unknown) for pending engine + +commit 680cf1c8f4164d7b3e95759a7cc93ce5843e5543 +Merge: 245d6e83a9 9c332b164f +Author: Arnaud Porterie +Date: Mon Feb 1 13:20:00 2016 -0800 + + Merge pull request #19553 from anusha-ragunathan/rm-daemonbuilder + + Remove package daemonbuilder. + +commit 87a450a37f0e934b67c90fbcdbff28459216e332 +Author: Vincent Woo +Date: Sun Dec 13 02:10:41 2015 -0800 + + Allow disabling of colored Docker logs via daemon flag. + + Signed-off-by: Vincent Woo + Signed-off-by: David Calavera + +commit 245d6e83a9e739d0d6ab363bfabf779c9b1697f2 +Merge: a898478a79 1ebeb2c9b4 +Author: David Calavera +Date: Mon Feb 1 13:17:23 2016 -0800 + + Merge pull request #19416 from mlaventure/warn-on-rm-detach + + Print an info message when detaching a container started with --rm + +commit a898478a795f3839b67ff119922bd0ba7d091a7e +Merge: c28bba0460 9a9ce80a0f +Author: Arnaud Porterie +Date: Mon Feb 1 13:15:20 2016 -0800 + + Merge pull request #19570 from WeiZhang555/18679-flaky-test + + Fix flaky test `TestGetContainerStatsRmRunning` + +commit f0667cd5bb80aa732458ebf020d3b07a3a17c259 +Merge: 615158432d 2b155ce8cf +Author: Victor Vieux +Date: Mon Feb 1 13:11:22 2016 -0800 + + Merge pull request #1714 from vieux/soft_fix + + fix soft / resource computation + +commit 615158432db3899fd222cf632d6b4f5babeb5d0b +Merge: 36e1fbdd77 9f9aba623f +Author: Dongluo Chen +Date: Mon Feb 1 13:04:32 2016 -0800 + + Merge pull request #1723 from vieux/test_run_ip + + add test for run --ip + +commit c28bba04601c153af5d8f70dd500e7247157b835 +Merge: 0c620d62c2 2e9bb7870a +Author: Brian Goff +Date: Mon Feb 1 16:01:51 2016 -0500 + + Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile + + Optimize `TestRunSeccompDefaultProfile` + +commit 36e1fbdd770fea262a9e4bec920aae7b1a9d3fcf +Merge: e9cd4ff2a6 967a98d40f +Author: Victor Vieux +Date: Mon Feb 1 13:01:29 2016 -0800 + + Merge pull request #1715 from vieux/1676-fiximageaffinity + + Fix images affinity for local registry and digest + +commit 0c620d62c2a538ae61af7dde33e013f095fe0686 +Merge: c19c08b97a 07d2c31810 +Author: David Calavera +Date: Mon Feb 1 12:59:37 2016 -0800 + + Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress + + Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress + +commit 16de94b9b1179256e61aa2dd5bf84b754c48232e +Author: Nishant Totla +Date: Mon Feb 1 11:47:04 2016 -0800 + + Adding default name (unknown) for pending engine + + Signed-off-by: Nishant Totla + +commit 50de9fdff11065cbc9783be07ad1b78a35b6bbac +Author: David Calavera +Date: Mon Feb 1 15:30:58 2016 -0500 + + Make error message consistent when removing containers fail. + + Signed-off-by: David Calavera + +commit b2d361533794047b5b5c664a3ffa9509f393c24b +Author: Arnaud Porterie +Date: Thu Jan 28 15:25:39 2016 -0800 + + Add doc page for breaking changes + + Signed-off-by: Arnaud Porterie + +commit e9cd4ff2a655d464f7beb117ecc0f4fc496082e0 +Merge: 336a4ff9ae b0653fa473 +Author: moxiegirl +Date: Mon Feb 1 11:51:10 2016 -0800 + + Merge pull request #1382 from xcl3721/patch-2 + + make the command clearly + +commit 78b0defcf344294874202e819dcb3f8a0daedf43 +Author: Brian Goff +Date: Mon Feb 1 14:36:40 2016 -0500 + + handle debug mode for clients + + Signed-off-by: Brian Goff + +commit f2164294f78c8cef849f22dfa0573e87466cb974 +Merge: 74c4a0e3e3 01bb31fc42 +Author: Richard Scothern +Date: Mon Feb 1 11:31:40 2016 -0800 + + Merge pull request #1398 from moxiegirl/new-navigation-1.10 + + New navigation for 1.10 + +commit 960710bd810e70b7c06b77b956c7bf8cdfeb15f8 +Author: Arnaud Porterie +Date: Mon Feb 1 11:13:11 2016 -0800 + + Enable cross-platforms login to Registry + + Use a daemon-defined Registry URL for `docker login`. This allows a + Windows client interacting with a Linux daemon to properly use the + default Registry endpoint instead of the Windows specific one. + + Signed-off-by: Arnaud Porterie + +commit c19c08b97af613928bce1253e438e3c097ade7df +Merge: 69c381c8d1 d800a4e1ba +Author: David Calavera +Date: Mon Feb 1 11:13:39 2016 -0800 + + Merge pull request #19885 from tophj-ibm/fix-integration-cli-suite-requirements + + Fix integration-cli suite setup requirements + +commit 3fcfa2043c12c2e5610e48e0b120324dc3ee2f45 +Merge: c583f993e3 9f19815b08 +Author: Riyaz Faizullabhoy +Date: Mon Feb 1 11:10:32 2016 -0800 + + Merge pull request #522 from HuKeping/log + + Comments: rework some comments + +commit a9379b4af227f1966b71ee255fc8bcf272ffe43c +Author: John Howard +Date: Thu Jan 28 18:22:24 2016 -0800 + + Windows CI: Initial porting CLI TestExec* + + Signed-off-by: John Howard + +commit 9c332b164f1aefa2407706adf59d50495d6e02cb +Author: Anusha Ragunathan +Date: Wed Jan 20 15:32:02 2016 -0800 + + Remove package daemonbuilder. + + Currently, daemonbuilder package (part of daemon) implemented the + builder backend. However, it was a very thin wrapper around daemon + methods and caused an implementation dependency for api/server build + endpoint. api/server buildrouter should only know about the backend + implementing the /build API endpoint. + + Removing daemonbuilder involved moving build specific methods to + respective files in the daemon, where they fit naturally. + + Signed-off-by: Anusha Ragunathan + +commit 336a4ff9aecb4eb1d0164e2818d5db94cfed8533 +Merge: bb0acf7660 3d7678389f +Author: Victor Vieux +Date: Mon Feb 1 09:30:51 2016 -0800 + + Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces + + Removing backspaces in /info output for new API version + +commit bb0acf7660f45238bbfd77777fe1fa0b6bb0c2a2 +Merge: d9c677f50b e85868c70c +Author: Victor Vieux +Date: Mon Feb 1 09:09:40 2016 -0800 + + Merge pull request #1568 from abronan/doc_docker_daemon_background + + docs: add note for the case of the daemon being started through ssh + +commit d9c677f50be480a74e4db404da4dfc89a60f29df +Merge: f7c7ec09f8 c809e6a643 +Author: Alexandre Beslic +Date: Mon Feb 1 09:08:20 2016 -0800 + + Merge pull request #1697 from jimenez/double_start + + Fix double start with Mesos + +commit 9f401254bd8e097ef30a3bc5de5576de08bc979a +Author: Andrew Guenther +Date: Tue Dec 8 18:55:17 2015 -0800 + + Wait to fire start event until socket is created + + Previously, this check only worked if no host was specified and was + hard coded to check for "/var/run/docker.sock" + + This change generalizes that check and captures any specified socket + and waits for it to be created. + + Caveat: This will only check the first socket specified, but it is an + improvement over none at all. + + Fixes #185160 + + Signed-off-by: Andrew Guenther + +commit 69c381c8d1abcea98c7a700b45a4aae28675f7fe +Merge: 967848419a f943fd7d24 +Author: Alexander Morozov +Date: Mon Feb 1 08:32:02 2016 -0800 + + Merge pull request #19857 from aboch/vnd + + Vendoring libnetwork 0.6.0-rc6 + +commit 9c6c50c607f84205a403fc83e32d837b343c2bb5 +Merge: 1816147d57 0b7877d82a +Author: Daniel Nephin +Date: Mon Feb 1 11:24:18 2016 -0500 + + Merge pull request #2796 from mustafau/patch-1 + + Update link to "Common Use Cases" title + +commit 3b35a5b604a56b5505c1e9cf79b4ccf9f2a9ef8f +Author: Sam Neirinck +Date: Mon Feb 1 17:12:15 2016 +0100 + + Add powershell completion support + + Initial version of powershell tab completion. It completes + commands and container names. + + Signed-off-by: Sam Neirinck + +commit 25df0d81472fdfa5c8cd54b7e8d344bdd2a2ec0c +Author: Harald Albers +Date: Mon Jan 25 10:15:14 2016 +0100 + + bash completion for `docker-compose create` + + Signed-off-by: Harald Albers + +commit c98c617c3004a5bb71dabdda1ff357bcfe1773d5 +Author: Steve Durrheimer +Date: Mon Jan 25 10:27:21 2016 +0100 + + Add zsh completion for 'docker-compose create' + + Signed-off-by: Steve Durrheimer + +commit d3cd9213c1e8a47337c8720c1af01466ce314006 +Author: Aanand Prasad +Date: Tue Jan 26 17:41:26 2016 +0000 + + Fix rebase-bump-commit script + + Trim whitespace from wc's output before constructing arguments to `git rebase` + + Signed-off-by: Aanand Prasad + +commit bbaae11a0f53ae7be59bf8f53428fd8b16fb8d19 +Author: Daniel Nephin +Date: Fri Jan 29 12:50:52 2016 -0500 + + Fix race condition with up and setting signal handlers. + + Also print stdout on wait_for_container(). + + Signed-off-by: Daniel Nephin + +commit e925b8272b90aa39a27b104439c4b0abb08f97f4 +Author: Harald Albers +Date: Mon Jan 25 10:34:29 2016 +0100 + + Fix computation of service list in bash completion + + The previous approach assumed that the service list could be extracted + from a single file. It did not follow extends and overrides. + + Signed-off-by: Harald Albers + +commit 110401b6f045dd9c9a7db40204654c06a450d9b7 +Author: Aanand Prasad +Date: Wed Jan 27 13:27:12 2016 +0000 + + Let the user specify any repo as their fork + + Signed-off-by: Aanand Prasad + +commit 8fb90bd73267fe880d7389ebc3b0af6da73df914 +Author: Aanand Prasad +Date: Wed Jan 27 13:26:32 2016 +0000 + + Default to vim if EDITOR is not set + + Signed-off-by: Aanand Prasad + +commit 24e71db345e031af1247fd7bafe9b09cb2f5ad73 +Author: Daniel Nephin +Date: Tue Jan 19 14:41:21 2016 -0500 + + Don't copy over volumes that were previously host volumes, and are now container volumes. + + Signed-off-by: Daniel Nephin + +commit fbe8484377888f305a50ffdd09c9b62381ebc36f +Author: Mary Anthony +Date: Sun Jan 24 12:03:44 2016 -0800 + + New navigation for 1.10 release + Updating with Joffrey's comments + + Signed-off-by: Mary Anthony + +commit 89cca7bcb2acbf994c3936787927e7d315e5b4c9 +Author: Aanand Prasad +Date: Tue Jan 26 16:08:34 2016 +0000 + + Extract helper methods + + Signed-off-by: Aanand Prasad + +commit be66779fe9ef3265e0453dba692f26b08cef2ded +Author: Aanand Prasad +Date: Tue Jan 26 16:01:43 2016 +0000 + + Create declarations for named volumes + + Signed-off-by: Aanand Prasad + +commit 1772909fe2a81adc818ed2e31229566917b48359 +Author: Aanand Prasad +Date: Tue Jan 26 15:54:18 2016 +0000 + + Make sure version line is at the top of the file + + Signed-off-by: Aanand Prasad + +commit 86bdab64abe6cea20d9b1ced97b3326f41f20f74 +Author: Aanand Prasad +Date: Tue Jan 26 15:53:25 2016 +0000 + + Make warnings a bit more readable + + Signed-off-by: Aanand Prasad + +commit 36a10f8dd523cc97fdd66d4e4a48556e68c51eca +Author: Aanand Prasad +Date: Tue Jan 26 15:53:02 2016 +0000 + + Update for links, external_links, network_mode + + Signed-off-by: Aanand Prasad + +commit 9249ec62c2304620433eb3a5ca4ae6a4dd44b5b8 +Author: Aanand Prasad +Date: Tue Jan 26 15:51:09 2016 +0000 + + Add note about named volumes to upgrade guide + + Signed-off-by: Aanand Prasad + +commit 1816147d5783053113e838046c7750b28e7d2e77 +Merge: c1cb75cc4f 7f3a319ecc +Author: Aanand Prasad +Date: Mon Feb 1 15:44:07 2016 +0000 + + Merge pull request #2740 from albers/completion-create + + bash completion for `docker-compose create` + +commit c1cb75cc4f0cdd50c0c07294a9b2155365c50572 +Merge: b912b306f1 381d58bc66 +Author: Aanand Prasad +Date: Mon Feb 1 15:43:47 2016 +0000 + + Merge pull request #2741 from sdurrheimer/zsh-completion-create-command + + Add zsh completion for 'docker-compose create' + +commit 967848419af3e1d07d402a13e5893f4747a87914 +Merge: c2d6831fc4 feda5d7684 +Author: Brian Goff +Date: Mon Feb 1 10:36:59 2016 -0500 + + Merge pull request #19873 from HackToday/refactorfs + + Make btrfs call same interface as others + +commit c2d6831fc498383be0ba9e555e3ab3139b844bb9 +Merge: ec67c8c4b6 2b95f012db +Author: Sebastiaan van Stijn +Date: Mon Feb 1 16:29:52 2016 +0100 + + Merge pull request #19695 from Microsoft/10662-TestBuildCI2 + + Second set of enabling TestBuild CI for Windows + +commit b912b306f104777fa599a7f7ac5bbd338b07c290 +Merge: 40d69675f3 b4868d0259 +Author: Aanand Prasad +Date: Mon Feb 1 15:15:59 2016 +0000 + + Merge pull request #2784 from dnephin/signal_race + + Fix race condition with up and setting signal handlers + +commit 5d63e559369800e10964167a225e6cb61e459d8f +Author: Ezra Silvera +Date: Mon Feb 1 08:32:05 2016 -0500 + + add integration network test + + Signed-off-by: Ezra Silvera + +commit 8232a897c6eea7c3f29e3b10e2574d934465521b +Author: Ezra Silvera +Date: Wed Jan 13 15:28:38 2016 +0200 + + Implement network functions for mesos cluster: CreateNetwork(), + RemoveNetwork(), and Networks() + + Signed-off-by: Ezra Silvera + + Adding error messages + + Signed-off-by: Ezra Silvera + + fix formatting + + Signed-off-by: Ezra Silvera + + fix formatting + + Signed-off-by: Ezra Silvera + +commit ec67c8c4b6c9fd2bd6a0b434de77bc2be8524c58 +Merge: 179cd3e8bc 59f4369f1a +Author: Vincent Demeester +Date: Mon Feb 1 13:50:26 2016 +0100 + + Merge pull request #19867 from Microsoft/jjh/disableunreliabletests + + Windows CI: Turn off unreliable TP4 tests + +commit 179cd3e8bc5e11fad05c18f2d44623d4fb8df7df +Merge: 63335df3d4 b01886a556 +Author: Sebastiaan van Stijn +Date: Mon Feb 1 13:41:19 2016 +0100 + + Merge pull request #19882 from vdemeester/add-ipfs-volume-plugin + + Add docker-volume-ipfs plugin to the list. + +commit b01886a556db9738b226fbcdd2384aff34118413 +Author: Vincent Demeester +Date: Mon Feb 1 13:30:15 2016 +0100 + + Add docker-volume-ipfs plugin to the list. + + Signed-off-by: Vincent Demeester + +commit 63335df3d44d7787ed974bca3e920333ca721083 +Merge: 743978e3ba 518c20787b +Author: Vincent Demeester +Date: Mon Feb 1 13:10:17 2016 +0100 + + Merge pull request #19883 from quofelix/master + + Added link to Quobyte's volume plugin. + +commit 518c20787b5691e41261218b8b4e6671ddc646f3 +Author: Felix Hupfeld +Date: Mon Feb 1 11:56:18 2016 +0100 + + Added link to Quobyte's volume plugin. + + Signed-off-by: Felix Hupfeld + +commit 743978e3ba7c95f6be0d0831179776b07735389e +Merge: 0f124979c2 7d1018545f +Author: Lei Jitang +Date: Mon Feb 1 18:47:14 2016 +0800 + + Merge pull request #19875 from Qiaohai8866/master + + change 'host:port' to `host:port` + +commit 7d1018545f5c38c936ed893145e70f84b8f50976 +Author: qg <1373319223@qq.com> +Date: Mon Feb 1 15:49:25 2016 +0800 + + change 'host:port' to `host:port` + + Signed-off-by: Gang Qiao + +commit 3d7678389f512a95fa205b7a972e6490a6939c00 +Author: Nishant Totla +Date: Thu Jan 28 10:39:14 2016 -0800 + + Removing backspaces in /info output for new API version + + Signed-off-by: Nishant Totla + +commit feda5d768439c6ecb8d3c82cee332724302e7cd2 +Author: Kai Qiang Wu(Kennan) +Date: Mon Feb 1 07:50:16 2016 +0000 + + Make btrfs call same interface as others + + Most storage drivers call graphdriver.GetFSMagic(home), + it is more clean to easy to maintain. So btrfs need to + adopt such change. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 0f124979c2816af92e6c9af8b9315945cf81820c +Merge: 40ce2574b4 a80c404cc6 +Author: Antonio Murdaca +Date: Mon Feb 1 07:11:40 2016 +0100 + + Merge pull request #19872 from ZhuWeiyang/fix-ubuntulinux-upgrade + + Fix upgrade command in ubuntulinux + +commit a80c404cc61344067ae319ff82f78a22b31d4dbf +Author: Weiyang Zhu +Date: Mon Feb 1 12:59:21 2016 +0800 + + Fix upgrade command + + Signed-off-by: Weiyang Zhu + +commit 695b7e8d11036d4a71263b31d15b75d81c35831e +Author: Wen Cheng Ma +Date: Thu Jan 28 15:36:31 2016 +0800 + + Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning + + Signed-off-by: Wen Cheng Ma + +commit 9f19815b0843cf54be19f9369eba71d1f42f1775 +Author: HuKeping +Date: Fri Jan 29 14:44:44 2016 +0800 + + Comments: rework some comments + + Make the error log message different from the following + `subtle.ConstantTimeCompare()` in the same function. + + Signed-off-by: Hu Keping + +commit 746f6af9aa2a48a8910b51ebbfafac511244fd9d +Author: Kai Qiang Wu(Kennan) +Date: Wed Jan 27 02:48:14 2016 +0000 + + Sort the attributes for events + + This is add support for #19559 + We tried sort it in client side, and it sort follow go + sort : sorts a slice of strings in increasing order. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit c809e6a643d917a10c89a14dbdd43cb0431f8956 +Author: Isabel Jimenez +Date: Thu Jan 28 02:53:48 2016 -0500 + + Fix double start + + Signed-off-by: Isabel Jimenez + +commit 59f4369f1a09462ec0a2c6777931051fc1324396 +Author: John Howard +Date: Sun Jan 31 15:51:56 2016 -0800 + + Windows CI: Turn off unreliable TP4 tests + + Signed-off-by: John Howard + +commit 0b7877d82a62fdbddec27dcb030a4af54558850f +Author: Mustafa Ulu +Date: Mon Feb 1 00:09:44 2016 +0200 + + Update link to "Common Use Cases" title + + It is now under overview.md + + Signed-off-by: Mustafa Ulu + +commit 40ce2574b4bc0c50f78c086768a67f7cb24feb70 +Merge: 6f86bcee76 86beb6e27e +Author: Sebastiaan van Stijn +Date: Sun Jan 31 22:58:19 2016 +0100 + + Merge pull request #19864 from pra85/patch-1 + + Fix typo + +commit 86beb6e27e9954e50828993ef0fb44486d2318ab +Author: Prayag Verma +Date: Mon Feb 1 01:25:59 2016 +0530 + + Fix typo + + Signed-off-by: Prayag Verma + +commit 2ed72a5d9368cab3bf9e3dadde95b3d4d50048d1 +Author: Marius Gundersen +Date: Tue Dec 29 15:35:37 2015 +0100 + + Expose the machine readable state of a container when listing containers + + Updated documentation to reflect the new State property in the inspect remote api + + Updated API changes for 1.23 + + Signed-off-by: Marius Gundersen + +commit 6f86bcee76dc7fc0faab7d4dffe4a05801526816 +Merge: 5f5a752bcf 89923c1f32 +Author: Sebastiaan van Stijn +Date: Sun Jan 31 15:52:14 2016 +0100 + + Merge pull request #19856 from moxiegirl/carry-close-19240 + + Updating for CAS changes and new select a driver section + +commit 9a9ce80a0f5214011ddf68f93894b1c046435a8d +Author: Zhang Wei +Date: Sat Jan 30 11:27:27 2016 +0800 + + Fix flaky test `TestGetContainerStatsRmRunning` + + Remove racey code to fix flaky test + + Signed-off-by: Zhang Wei + +commit f943fd7d2427fbf893b9e0795528500fc99081b8 +Author: Alessandro Boch +Date: Sat Jan 30 20:03:03 2016 -0800 + + Vendoring libnetwork 0.6.0-rc6 + + Signed-off-by: Alessandro Boch + +commit f7c7ec09f8ce160b0e348cdb69d75949dcd0178d +Merge: 833471b74c 0857d026bc +Author: moxiegirl +Date: Sat Jan 30 18:13:08 2016 -0800 + + Merge pull request #1645 from mgoelzer/improve-contributing + + Improve CONTRIBUTING.md for beginners + +commit 833471b74cf39c826f349c0355dfca0d244f92c0 +Merge: e98456ea78 460c4ce9a7 +Author: moxiegirl +Date: Sat Jan 30 18:10:37 2016 -0800 + + Merge pull request #1505 from ahaurw01/docs-what-if-hosted-discovery-down + + Add a note to install-w-machine with pointers if hosted discovery is down + +commit 89923c1f32aeff5bf11fbb04723dd0e154559545 +Author: Nigel +Date: Mon Jan 11 17:39:41 2016 +0000 + + Updating for CAS changes and new select a driver section + Adding changes requested by @jamtur01 and wrapping to 80 chars + Adding typo fixes and replacing tabs with 4xspaces + Closes and fixes #19240 + Updating with content addressable storage model changes + + Signed-off-by: Nigel + +commit df45c054cea6e6abf6d0c1d091d5cfbac2e5680d +Author: Daehyeok Mun +Date: Sat Jan 30 18:06:29 2016 -0700 + + Add kvm driver link to docs + + Signed-off-by: Daehyeok Mun + +commit 140a74347d7fde130598aeca028b72af99737239 +Author: Antonio Murdaca +Date: Wed Dec 2 11:26:30 2015 +0100 + + daemon_unix: set golang runtime max threads + + SetMaxThreads from runtime/debug in Golang is called to set max threads + value to 90% of /proc/sys/kernel/threads-max + + Signed-off-by: Antonio Murdaca + +commit c583f993e3296eaf3c9e7b7d57a2544a9790e9bb +Merge: 3eac9a8185 5a067e72ef +Author: Diogo Mónica +Date: Sat Jan 30 11:32:16 2016 -0800 + + Merge pull request #513 from moxiegirl/add-to-ddc + + Notary for 1.10 in docs.docker.com + +commit 5f5a752bcf687aab0120e6c7903922ff01371ec0 +Merge: d069e8e7b7 54320d8d18 +Author: Antonio Murdaca +Date: Sat Jan 30 20:28:21 2016 +0100 + + Merge pull request #19847 from Microsoft/jjh/revert19790 + + Revert PR 19790 (breaks windowsTP4 CI on cache bust) + +commit 5a067e72ef37fac8f088132c9b6ddf753c2fb44c +Author: Mary Anthony +Date: Sat Jan 30 11:09:20 2016 -0800 + + Updating with the finished work + + Signed-off-by: Mary Anthony + +commit d069e8e7b7733fbde5889d3afd97cac21ff474b3 +Merge: d695cf8de7 5f0643b082 +Author: Sebastiaan van Stijn +Date: Sat Jan 30 08:05:55 2016 -0800 + + Merge pull request #19846 from shin-/remote_api_container_update_doc + + Update example request for container update in docs. + +commit 460c4ce9a72e64eaf0783c15e1e7c90e5dbeaaf0 +Author: Aaron Haurwitz +Date: Sat Jan 30 10:20:20 2016 -0500 + + Fix the format of bold note. + + Signed-off-by: Aaron Haurwitz + +commit d695cf8de710ca50f5c2b39727f00bfd4be8e07f +Merge: 80c7258e11 a7d1aeceec +Author: Brian Goff +Date: Sat Jan 30 10:12:38 2016 -0500 + + Merge pull request #19638 from runcom/remove-redunant-function + + cleanup and move stuff where needed + +commit 80c7258e11c6434658ecb1a7d7e96f0d0390eef3 +Merge: 667c2245ad 98f74f8383 +Author: Doug Davis +Date: Sat Jan 30 09:58:47 2016 -0500 + + Merge pull request #19852 from WeiZhang555/warn-info + + Change log level + +commit 4ba168b4cb6da0b97e5421cbcaf8e82cd68bc456 +Author: Federico Gimenez +Date: Fri Dec 11 17:55:41 2015 +0100 + + Added cli SNI integration test + + Signed-off-by: Federico Gimenez + +commit aa50ca6cd62afb1bc581a0b0ec2b1d2438a57a32 +Author: Mary Anthony +Date: Thu Jan 28 04:31:02 2016 -0800 + + Adding Notary to ddc + Making title conform + Updating links to the script/menu label + + Signed-off-by: Mary Anthony + +commit 667c2245ad42de7ef76c0fefc06f77c566cb01eb +Merge: 6b57380173 9642c8170a +Author: Antonio Murdaca +Date: Sat Jan 30 11:50:01 2016 +0100 + + Merge pull request #19820 from Microsoft/jjh/testexecapi + + Windows CI: Port TestExecApi* tests + +commit 6b573801730f7655a1e2ef1edc35df8e32b713f7 +Merge: 98ef10f64e 6c5e8dd4c2 +Author: Vincent Demeester +Date: Sat Jan 30 11:48:01 2016 +0100 + + Merge pull request #19646 from nishanttotla/19277-CustomInfoField + + Display SystemStatus field in docker info + +commit 98ef10f64e81bb4389b42785235e7736d5835924 +Merge: 317c89ce9e bf33742026 +Author: Antonio Murdaca +Date: Sat Jan 30 11:47:44 2016 +0100 + + Merge pull request #19839 from Microsoft/jjh/testevents + + Windows CI: Porting TestEvents* + +commit 98f74f8383241d2f0a5ed8b17f7016e24af899fa +Author: Zhang Wei +Date: Sat Jan 30 18:46:16 2016 +0800 + + Change log level + + Warning should be printed with real `logrus.Warn` + + Signed-off-by: Zhang Wei + +commit a605d641d76609c886ff454219a75578c95e8eb1 +Author: Qiang Huang +Date: Sat Jan 30 16:17:13 2016 +0800 + + Cleanup libseccomp.a hack since dockerinit is gone + + Signed-off-by: Qiang Huang + +commit 34ccb90d7e12965b2a2e531ad633ac0afbdee4f1 +Author: Dimitar Bonev +Date: Fri Jan 29 14:15:38 2016 +0200 + + Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty + + Signed-off-by: Dimitar Bonev + +commit 317c89ce9e2800814e9044aaf65ca6fa5bdbdee5 +Merge: 0c09dda80f 6b09413f6b +Author: Sebastiaan van Stijn +Date: Fri Jan 29 22:33:57 2016 -0800 + + Merge pull request #19838 from brahmaroutu/fix_notary_gccgo_s390x + + Need -lpthread to compile Notary + +commit 54320d8d187d8b33be4fd33cfb3f8e486c6c8d90 +Author: John Howard +Date: Fri Jan 29 20:44:34 2016 -0800 + + Signed-off-by: John Howard + + Revert "Combine SetupWorkingDirectory for Linux and Windows" + + This reverts commit ec31741ca186278ea60faf49f85087c493e78806. + +commit 0c09dda80f2f5b00c84426560208b9e3dd75138a +Merge: 9c3cca23e9 e273445dd4 +Author: Brian Goff +Date: Fri Jan 29 22:15:13 2016 -0500 + + Merge pull request #19841 from aaronlehmann/compress-panic + + Fix panic on network timeout during push + +commit 2e9bb7870a0ea4a2fdc3fdbe6686ed6159f08803 +Author: Zhang Wei +Date: Wed Jan 27 00:05:44 2016 +0800 + + Optimize `TestRunSeccompDefaultProfile` + + Optimize performance of `TestRunSeccompDefaultProfile` + + Signed-off-by: Zhang Wei + +commit 5f0643b082d4fe5a7be9fa0a00088e3e37882824 +Author: Joffrey F +Date: Fri Jan 29 18:27:27 2016 -0800 + + Update example request for container update in docs. + + Signed-off-by: Joffrey F + +commit 9c3cca23e9d8ba62fac2ee29887cf029e42f661b +Merge: c8fb886dba 90b0292b5b +Author: Brian Goff +Date: Fri Jan 29 21:07:51 2016 -0500 + + Merge pull request #19815 from Microsoft/jjh/testruncreatevolumesinsymlinkdir + + Fix TestRunCreateVolumesInSymlinkDir + +commit c8fb886dba44664575880a605308b3334b8a1cfe +Merge: c006c02611 506722bf9f +Author: Brian Goff +Date: Fri Jan 29 21:07:22 2016 -0500 + + Merge pull request #19823 from Microsoft/jjh/maximus5 + + Improvements to ANSI emulation in conemu + +commit dec9a5a95c08e09178a14c25f627c4fbfe0349ec +Author: David Lawrence +Date: Fri Jan 29 10:36:18 2016 -0800 + + cleaning up some dead code and fixing memorystore consistency + Signed-off-by: David Lawrence (github: endophage) + +commit 637a2331d4c9f89af17d56aae2a3998ff64cb10b +Author: David Lawrence +Date: Thu Jan 28 16:20:02 2016 -0800 + + client side of consistent downloads + Signed-off-by: David Lawrence (github: endophage) + +commit 3eac9a81853b1345cda5fcffc5ece10ddc6e59b4 +Merge: 564f8d06d3 a16e6b58b5 +Author: Diogo Mónica +Date: Fri Jan 29 16:43:25 2016 -0800 + + Merge pull request #516 from docker/canonical-key-id + + use only canonical IDs for display on delegation CLI commands, + +commit e98456ea782c4f55163906bbc6a0b7cfc66765e8 +Merge: f86f41ba09 b830f9f269 +Author: Victor Vieux +Date: Fri Jan 29 16:35:50 2016 -0800 + + Merge pull request #1688 from Spritekin/master + + Fixes swarm overloading slaves when using the mesos drivers. + +commit 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a +Author: Nishant Totla +Date: Sun Jan 24 13:30:21 2016 -0800 + + Adding SystemStatus field for /info endpoint + + Signed-off-by: Nishant Totla + +commit 564f8d06d3e98de358e10f9518cd3b384d03abfd +Merge: 90d2017c6e cd7274f1b9 +Author: Diogo Mónica +Date: Fri Jan 29 16:08:29 2016 -0800 + + Merge pull request #515 from docker/roles-for-targets + + Roles for targets via notary CLI + +commit a16e6b58b547a7fc71240917b3322258151fe633 +Author: Riyaz Faizullabhoy +Date: Tue Jan 26 18:16:55 2016 -0800 + + use only canonical IDs for display on delegation CLI commands, translate to TUF key IDs for metadata usage under the hood + + Signed-off-by: Riyaz Faizullabhoy + +commit c006c0261159224675397162aa3a03d9adbb180b +Merge: 46018c3cee ca8a4935aa +Author: Jess Frazelle +Date: Fri Jan 29 15:52:18 2016 -0800 + + Merge pull request #19735 from jfrazelle/add-repo-scripts + + add scripts to clean experimental rpms and debs + +commit 90d2017c6ec69ea566e9f9708ba91abef6013b7b +Merge: e0b507bfc2 5a39366f75 +Author: Diogo Mónica +Date: Fri Jan 29 15:43:45 2016 -0800 + + Merge pull request #496 from docker/update-when-server-meta-corrupt + + Update when server metadata is corrupt + +commit f86f41ba09a484a32916829b96ecd7f53baf88f2 +Merge: 15b7ac023d 2cc980e4ab +Author: Alexandre Beslic +Date: Fri Jan 29 15:38:40 2016 -0800 + + Merge pull request #1712 from vieux/hostdown_ps + + Host Down containers in ps requires -a + +commit 15b7ac023dcecd5934c6b4d18ee6d6e98f24be28 +Merge: 1fa6cd9c55 388b7b132f +Author: Nishant Totla +Date: Fri Jan 29 15:07:47 2016 -0800 + + Merge pull request #1711 from dongluochen/validationDelay + + Allow more retries for node validation + +commit 26b00ce1ec215ca6c7dfc7c7c5b2362d09a5577c +Merge: 25116832c4 240d2fa993 +Author: Nathan LeClaire +Date: Fri Jan 29 14:51:07 2016 -0800 + + Merge pull request #2965 from nathanleclaire/revise_release_template + + Fix non-templated release value + +commit e273445dd407df6803d7b80863b644a6cfa2c1f5 +Author: Aaron Lehmann +Date: Fri Jan 29 14:34:50 2016 -0800 + + Fix panic on network timeout during push + + `Upload` already closes the reader returned by `compress` and the + progressreader passed into it, before returning. But even so, the + io.Copy inside compress' goroutine needs to attempt a read from the + progressreader to notice that it's closed, and this read has a side + effect of outputting a progress message. If this happens after `Upload` + returns, it can result in a write to a closed channel. Change `compress` + to return a channel that allows the caller to wait for its goroutine to + finish before freeing any resources connected to the reader that was + passed to it. + + Signed-off-by: Aaron Lehmann + +commit 46018c3cee3a6fb76373289306f81ede881c9ca6 +Merge: e23f24bbbd 9c09a79ba5 +Author: Arnaud Porterie +Date: Fri Jan 29 14:30:25 2016 -0800 + + Merge pull request #19837 from cpuguy83/carry_19085 + + Carry 19085 -- Improve & cleanup documentation comments + +commit d800a4e1ba7d23864aa541c1919465bcf22dd1a9 +Author: Christopher Jones +Date: Fri Jan 29 16:35:20 2016 -0500 + + Fix integration-cli suite setup requirements + + This PR moves the testRequires check from within setupRegistry + and setupNotary to when the Suite itself starts up. + + This fixes a bug where testRequires() in setupRegistry() would + succeed and start registry, but testRequires() in setupNotary() + would fail. This immediately exits the goroutine with registry + still running. + + Signed-off-by: Christopher Jones + +commit 240d2fa993edff9217e6104690842a1ae35c00ce +Author: Nathan LeClaire +Date: Fri Jan 29 13:34:29 2016 -0800 + + Fix non-templated release value + + Signed-off-by: Nathan LeClaire + +commit 388b7b132fe905bf04f224bea750bde7ed8b6ce7 +Author: Dong Chen +Date: Fri Jan 29 13:26:42 2016 -0800 + + Allow more retries for node validation. + + Signed-off-by: Dong Chen + +commit e23f24bbbd33d90b27475dcf2652c412705dbfa8 +Merge: 35ef3efe9a 7b31ed432e +Author: Jess Frazelle +Date: Fri Jan 29 13:26:20 2016 -0800 + + Merge pull request #18176 from hypriot/17802-build-first-debian-package-for-arm + + add support for building first ARM-based debian package + +commit 1ebeb2c9b4ef22800845f2d97c277f35672f3ba9 +Author: Kenfe-Mickael Laventure +Date: Mon Jan 18 10:17:14 2016 -0800 + + Print an info message when detaching a container started with --rm + + Closes #17516 + + Signed-off-by: Kenfe-Mickael Laventure + +commit 1fa6cd9c5565feb19da395d9e17c104fdc8a91a4 +Merge: f08f47044e 25b61791a5 +Author: Chanwit Kaewkasi +Date: Sat Jan 30 04:02:50 2016 +0700 + + Merge pull request #1707 from vieux/improve_logs_and_lock + + Improve logs and fix lock in engine + +commit 35ef3efe9af64c22c7efbe826f8f63b025639130 +Merge: d38cee5e0d 62a856e912 +Author: David Calavera +Date: Fri Jan 29 12:43:58 2016 -0800 + + Merge pull request #19805 from WeiZhang555/test-inspect + + Make test code consistent + +commit bf337420263c5b977dac474406483494bccfbb77 +Author: John Howard +Date: Tue Jan 26 15:14:58 2016 -0800 + + Windows CI: Porting TestEvents* + + Signed-off-by: John Howard + +commit 9c09a79ba54080873b435842fb2a4aaa3b701a9c +Author: Brian Goff +Date: Fri Jan 29 14:28:30 2016 -0500 + + update doc string + + Signed-off-by: Brian Goff + +commit d38cee5e0d5433173da8e7b1db266630c70908b2 +Merge: cfa547922d 3aa778d6a0 +Author: David Calavera +Date: Fri Jan 29 11:53:42 2016 -0800 + + Merge pull request #19516 from tophj-ibm/update-registry-on-dockerfile-ppc64le + + Update registry version in Dockerfile.ppc64le + +commit 6b09413f6bf309ad8103a0161dc826fc36af2a56 +Author: Srini Brahmaroutu +Date: Fri Jan 29 19:42:28 2016 +0000 + + Need -lpthread to compile Notary + Signed-off-by: Srini Brahmaroutu + +commit f08f47044e233f4c41b33e966478e72847b66ed3 +Merge: 82261a7df4 d86226dfb3 +Author: Victor Vieux +Date: Fri Jan 29 11:42:04 2016 -0800 + + Merge pull request #1706 from jimenez/rename_agent + + Renaming agent in README + +commit d86226dfb3f1fbb85bc2d5e60120b1a68b7ae192 +Author: Isabel Jimenez +Date: Fri Jan 29 14:32:23 2016 -0500 + + Renaming agent in README + + Signed-off-by: Isabel Jimenez + +commit e85868c70c7b4299097332f14a3ebafa743ee320 +Author: Alexandre Beslic +Date: Fri Jan 29 11:28:43 2016 -0800 + + docs: add note for the case of the daemon being started through ssh + + Signed-off-by: Alexandre Beslic + +commit 5a39366f7522779012788d0dd0f7337324a754fe +Author: Ying Li +Date: Mon Jan 25 10:16:58 2016 -0800 + + Clarify comments w.r.t. having an 'extra space' as being corrupted in transit. + + Also, we are not sure if we want to support thresholds, so make sure the comments + reflect that. + + Signed-off-by: Ying Li + +commit 1baf3c781cee7169b933e9e920d0bb890cd6f0f5 +Author: Ying Li +Date: Fri Jan 22 14:41:17 2016 -0800 + + Add test that update fails if the local root is corrupt AND the remote root is corrupt. + + Signed-off-by: Ying Li + + Conflicts: + client/client_update_test.go + +commit 237561a2a9e426ff3e310d2b34c0a7dc8148638f +Author: Ying Li +Date: Fri Jan 22 11:41:06 2016 -0800 + + Fixed timestamp downloading so if verification fails, we fall back to cached. + + Signed-off-by: Ying Li + + Conflicts: + tuf/client/client.go + +commit befd30e9a4e2d3db0fed29f91c396c474ecfd23a +Author: Ying Li +Date: Thu Jan 21 16:51:00 2016 -0800 + + Add tests for updating if server has metadata corruption such that the checksum was valid. + + Signed-off-by: Ying Li + +commit bb5f9cc170bc1467343503570b7a1db215336073 +Author: Ying Li +Date: Thu Jan 21 14:05:31 2016 -0800 + + Update swizzler so that if messing up the root file, we can still get the pub keys and sign. + + Signed-off-by: Ying Li + +commit f8a0e46b6c6cac68497269354ee22a8bee5a5bdd +Author: Ying Li +Date: Thu Jan 21 12:08:28 2016 -0800 + + Add test for when any downloaded metadata has an invalid checksum compared to snapshot or timestamp. + + Signed-off-by: Ying Li + + Conflicts: + client/client_update_test.go + +commit a969db7a133ddaeaf5b0564c96e986d40421201a +Author: Ying Li +Date: Thu Jan 21 09:48:07 2016 -0800 + + Add swizzler method to just change the checksum by adding a space. + + Signed-off-by: Ying Li + +commit cfa547922df1cc64cf6a0a96a30da7f5c86f83d5 +Merge: ca48f7350c d76fba0191 +Author: Sebastiaan van Stijn +Date: Fri Jan 29 10:58:42 2016 -0800 + + Merge pull request #19824 from wenchma/name_to_id_for_stats + + Change container name to id as actual results + +commit ca48f7350c82f48edf1150d735543a1ea6d4eabe +Merge: 7cc012333f 755df347fb +Author: David Calavera +Date: Fri Jan 29 10:34:16 2016 -0800 + + Merge pull request #19806 from liusdu/forbid-null-login + + forbid login of a null-string username + +commit 7cc012333f36669d384d9c3405759bdadb383f63 +Merge: 6c6729ef5b c40f487c5c +Author: David Calavera +Date: Fri Jan 29 10:29:59 2016 -0800 + + Merge pull request #19836 from jfrazelle/update-completions-for-disable-content-trust + + update bash completions for push and pull + +commit c40f487c5c744a1a1c87b41002507a13ccffa918 +Author: Jessica Frazelle +Date: Fri Jan 29 09:25:14 2016 -0800 + + update bash completions for push and pull + + Signed-off-by: Jessica Frazelle + +commit e0b507bfc2f9823e689b3aab4d60845be9c1ad76 +Merge: 54667d1254 4b77c49401 +Author: Diogo Mónica +Date: Fri Jan 29 10:13:18 2016 -0800 + + Merge pull request #501 from HuKeping/work-branch + + Use seperate databases for notary server and signer + +commit b4868d02593925f3d179f6f17c5e6e25fe6d6ef0 +Author: Daniel Nephin +Date: Fri Jan 29 12:50:52 2016 -0500 + + Fix race condition with up and setting signal handlers. + + Also print stdout on wait_for_container(). + + Signed-off-by: Daniel Nephin + +commit 1be46e7e5860760fadbd83ed59f1dfc73b01cffa +Author: Victor Vieux +Date: Fri Jan 29 07:54:33 2016 -0800 + + retry monitor events on EOF + + Signed-off-by: Victor Vieux + +commit 90b0292b5b06c5e71d47e5dee34d3d4744682506 +Author: John Howard +Date: Thu Jan 28 14:52:34 2016 -0800 + + Fix TestRunCreateVolumesInSymlinkDir + + Signed-off-by: John Howard + +commit cef0b554d74f5d972591b0acdf8c1cda5a221145 +Author: Victor Vieux +Date: Fri Jan 29 07:54:16 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit 62a856e9129c9d5cf7db9ea6322c9073d68e3ea4 +Author: Zhang Wei +Date: Thu Jan 28 22:19:25 2016 +0800 + + Assert error in body of function `inspectField*` + + 1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code + cleaner and more consistent + 2. assert the error in function `inspectField*` so we don't need to + assert the return value of it every time, this will make inspect easier. + + Signed-off-by: Zhang Wei + +commit 755df347fbaf6a02e6bdc2d5b7339aade2dbade0 +Author: Liu Hua +Date: Thu Jan 28 22:17:28 2016 +0800 + + forbid login of a null-string username + + With this patch, the client blocks this type login, no sending + useless messages to daemon and registry. This saves lots of time. + + Signed-off-by: Liu Hua + +commit 97749f3f2d6e58eb12ca87fddb93b79d3a4d39a5 +Author: Victor Vieux +Date: Fri Jan 29 06:04:55 2016 -0800 + + add docker run --net-alias, docker network connect --ip and docker network connect --alias tests + + Signed-off-by: Victor Vieux + +commit 47609f74f30f1e1a1472f8d78a254547602739f4 +Author: Victor Vieux +Date: Fri Jan 29 05:50:09 2016 -0800 + + add simple strategy test + + Signed-off-by: Victor Vieux + +commit a7d1aeceec53cfefd72e5b2161c2c57eae20cf55 +Author: Antonio Murdaca +Date: Sun Jan 24 18:02:21 2016 +0100 + + postImagesCreate: move auth config decode when it's needed + + Signed-off-by: Antonio Murdaca + +commit 505a56d6da69825e2ef1ebcf985a0a2e143d2966 +Author: Antonio Murdaca +Date: Sun Jan 24 17:59:24 2016 +0100 + + api: client: remove redunant function to encode auth + + Signed-off-by: Antonio Murdaca + +commit 6c6729ef5b74a54e20eb2a11812bf5f80e03b174 +Merge: 5f63c54192 8ed06af044 +Author: Vincent Demeester +Date: Fri Jan 29 12:39:57 2016 +0100 + + Merge pull request #19793 from calavera/full_login_prompt + + Always prompt for a password when asking for credentials. + +commit 9f9aba623f634504f57c3a113442146563b03b89 +Author: Victor Vieux +Date: Fri Jan 29 02:26:49 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit 9abd727c529c72f5a86c3e77567ae83b8dad68e8 +Author: Victor Vieux +Date: Fri Jan 29 01:16:48 2016 -0800 + + add test for run --ip + + Signed-off-by: Victor Vieux + +commit 5f63c541920ff1ef9d82220f4a18cd7531f3973a +Merge: 7d13f2fb7d ec31741ca1 +Author: Vincent Demeester +Date: Fri Jan 29 08:52:08 2016 +0100 + + Merge pull request #19790 from Microsoft/CombineSetupWorkingDir + + Combine SetupWorkingDirectory for Linux and Windows + +commit d76fba0191fc64759febc1ee22c6bc28ff49b3d6 +Author: Wen Cheng Ma +Date: Fri Jan 29 13:54:28 2016 +0800 + + Change container name to id as actual results + + Signed-off-by: Wen Cheng Ma + +commit 25116832c4871e462991c1897f059091c35e0af1 +Merge: c9a99a37ef bf542964c9 +Author: David Gageot +Date: Fri Jan 29 06:27:45 2016 +0100 + + Merge pull request #2961 from nathanleclaire/revise_sed_line + + Update release script for GNU sed compatibility + +commit 506722bf9ffd017db59f3ae14addb59c9bf227ab +Author: John Howard +Date: Fri Oct 30 11:10:12 2015 +0300 + + Improvements to ANSI emulation in conemu + + Signed-off-by: John Howard + +commit 4b77c49401a145835fd6217d1d9f2135d3113d40 +Author: HuKeping +Date: Fri Jan 29 09:35:47 2016 +0800 + + Tiny rework on mysql start scripts. + + Fix some typo and update some comments. + + Signed-off-by: Hu Keping + +commit c7394285917bf8a879ea3a4eecff58c1462349c0 +Author: HuKeping +Date: Wed Jan 27 18:10:58 2016 +0800 + + [PATCH 4/4] Add docs for notary mysql + + This patch add the recommendation to guide people deploying a more + secure MySQL for notary. + + Signed-off-by: Hu Keping + +commit 91d66f5e7a8d5ef6a79963e0f5231a03cd6c00b5 +Author: HuKeping +Date: Wed Jan 27 12:02:49 2016 +0800 + + [PATHC 3/4] Only create the needed tables + + Make database notaryserver and notarysigner only create the tables they + need. + + The signer only needs the private_keys table, and the server only needs + the timestamp_keys and tuf_files tables. + + Signed-off-by: Hu Keping + +commit 9427c372af2255199ce27c79c1cfb8ff6310c2d5 +Author: HuKeping +Date: Wed Jan 27 10:28:10 2016 +0800 + + [PATCH 2/4] Add check for old database notary + + Check whether the database `notary` exist or not and warn people + to manually migrate those tables if it exist. + + Signed-off-by: Hu Keping + +commit e77db8a308dd94b9ef90303e2ee8f39c19c3b566 +Author: HuKeping +Date: Tue Jan 26 14:25:16 2016 +0800 + + [PATCH 1/4] Use seperate databases for notary server and signer + + For security, server should not be able to access the `private_key` table + and we can go further more, say, use seperate databases for the server + and signer. + + This patch creates two users corresponding to the different databases. + + Signed-off-by: Hu Keping + +commit 54667d1254f1592916f4c01aa9aa733349cef860 +Merge: 96d451e1c5 80fb9f2e12 +Author: Diogo Mónica +Date: Thu Jan 28 17:59:33 2016 -0800 + + Merge pull request #520 from endophage/add_logf_docs + + adding doc for notary-server -logf option + +commit 96d451e1c53bde3c966996d50a08f90cc8c48853 +Merge: 32d9cd7c4a 41643d4a9c +Author: Diogo Mónica +Date: Thu Jan 28 17:36:35 2016 -0800 + + Merge pull request #495 from docker/filestore-getmeta-size + + ensure filestore GetMeta only returns up to size bytes. Add max size constant + +commit 01bb31fc428afff3e64f418b635df721ec611abf +Author: Mary Anthony +Date: Thu Jan 28 04:57:31 2016 -0800 + + New navigation for 1.10 + Capturing Olivier's comments + + Signed-off-by: Mary Anthony + +commit 32d9cd7c4ac2a4918f265249545ad097afa5a575 +Merge: ab389c6849 9c59af1397 +Author: Diogo Mónica +Date: Thu Jan 28 17:35:44 2016 -0800 + + Merge pull request #485 from docker/passphrase-change + + passwd command and tests + +commit ab389c6849d9eab72484e84ef849c72dd6ac6ce3 +Merge: 8f0a3c3975 8c895747c5 +Author: Diogo Mónica +Date: Thu Jan 28 17:34:15 2016 -0800 + + Merge pull request #517 from docker/changelog-doc + + Add a doc about how to upgrade to v0.2. + +commit 80fb9f2e1235d6c1839d7555c9a9148ebaf1f669 +Author: David Lawrence +Date: Thu Jan 28 17:31:05 2016 -0800 + + adding doc for notary-server -logf option + Signed-off-by: David Lawrence (github: endophage) + +commit bf542964c97fee463add29d29396e539dec1a35a +Author: Nathan LeClaire +Date: Thu Jan 28 17:23:11 2016 -0800 + + Update release script for GNU sed compatibility + + Signed-off-by: Nathan LeClaire + +commit c9a99a37efc57ad1854679477574a6e53ed6e663 +Merge: 5ab6f319e9 3d2eb05b4e +Author: Nathan LeClaire +Date: Thu Jan 28 17:15:53 2016 -0800 + + Merge pull request #2960 from nathanleclaire/bump_0.6.0-rc3-dev + + Bump to version 0.6.0-dev + +commit 7d13f2fb7d50e2cf93022a692fe93a59ee65e866 +Merge: 4da9cd5df6 563a4d1b9f +Author: Sebastiaan van Stijn +Date: Thu Jan 28 17:13:45 2016 -0800 + + Merge pull request #19563 from Microsoft/10662-TestBuildCI1 + + First batch of Windows-Windows TestBuild CI enabling + +commit 648a1343dbb4f01da1f36ad795ddcc0c50781b33 +Author: Derek McGowan +Date: Thu Jan 28 17:02:09 2016 -0800 + + Update auth context keys to use constant + + Prevent using strings throughout the code to reference a string key defined in the auth package. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 3d2eb05b4e170e85fbcbc777aac25a96ab4c87d4 +Author: Nathan LeClaire +Date: Thu Jan 28 16:56:45 2016 -0800 + + Bump to version 0.6.0-dev + + Signed-off-by: Nathan LeClaire + +commit 4da9cd5df64dced9df07432e8047ca4c901f7238 +Merge: 17be787dca 404d20861c +Author: Tibor Vass +Date: Thu Jan 28 16:43:57 2016 -0800 + + Merge pull request #19795 from jfrazelle/release-checklist + + some cleanup to release checklist + +commit 17be787dca98ba256ea4ea00a16dd8e5afcf5b3c +Merge: f746cf0440 0e5ea96fa6 +Author: Tibor Vass +Date: Thu Jan 28 16:39:26 2016 -0800 + + Merge pull request #19811 from albers/completion-user + + Improve bash completion for users and groups + +commit f746cf04406105bdd2ff213cd16e62e09c279b69 +Merge: 5ee4ad1d77 87839b345e +Author: Arnaud Porterie +Date: Thu Jan 28 16:34:55 2016 -0800 + + Merge pull request #19796 from Microsoft/10662-RemoveTestBuildHistory + + Temporarily removing TestBuildHistory on Windows for perf reasons + +commit 9642c8170aa979050a81451378aa4c7917e9df28 +Author: John Howard +Date: Thu Jan 28 16:26:06 2016 -0800 + + Windows CI: Port TestExecApi* tests + + Signed-off-by: John Howard + +commit f3df50d115c81c13349835a15f5bad0f2c15dfe4 +Author: Tibor Vass +Date: Tue Jan 26 14:14:13 2016 -0800 + + distribution: add test to ensure pass-thru registry token is host-bound + + Signed-off-by: Tibor Vass + +commit 8c895747c5eb9d9e0caaa4dd08f29f42f2ea5211 +Author: Ying Li +Date: Thu Jan 28 15:36:40 2016 -0800 + + Add a doc about how to upgrade to v0.2. + + Signed-off-by: Ying Li + +commit 5ab6f319e969e981e48c500c898fff2a270e7c14 +Merge: 8a4576b2eb 265dd37594 +Author: Nathan LeClaire +Date: Thu Jan 28 16:14:08 2016 -0800 + + Merge pull request #2958 from nathanleclaire/fix_swarm_port + + Add correct Swarm port bindings + +commit 265dd375942ca6bca9176e207f4fcdfac8ffacb6 +Author: Nathan LeClaire +Date: Thu Jan 28 15:51:41 2016 -0800 + + Add correct Swarm port bindings + + Signed-off-by: Nathan LeClaire + +commit cd7274f1b9f322f72ded801d137be3a25c4c7494 +Author: Riyaz Faizullabhoy +Date: Thu Jan 28 15:49:09 2016 -0800 + + Add additional tests with different delegation key format using role PEM header + + Signed-off-by: Riyaz Faizullabhoy + +commit e28c288444f86321c7ba62d4e517b546efc0d858 +Author: Derek McGowan +Date: Thu Jan 28 15:47:22 2016 -0800 + + Update to address comments + + Add logging to resolve scope + Clarify response logs + Better messaging for tls setup error + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 82261a7df429fce98e57abd2ab3cec101ba4805b +Merge: 4ce93c1997 fbab9d05ba +Author: Alexandre Beslic +Date: Thu Jan 28 15:25:24 2016 -0800 + + Merge pull request #1701 from vieux/reschedule_swarm_only + + remove duplicate container only from swarm + +commit 7b31ed432ee2fa95938d64dc76c982e52cd00330 +Author: Govinda Fichtner +Date: Mon Nov 23 20:00:43 2015 +0100 + + add support for building first ARM debian package + + Signed-off-by: Govinda Fichtner + +commit 74c4a0e3e33b76554195604ba14a5dd5f7ab0c5d +Merge: 70e85dde26 9f72e8442d +Author: Aaron Lehmann +Date: Thu Jan 28 14:41:07 2016 -0800 + + Merge pull request #1393 from RichardScothern/putbydgst + + Add manifest put by digest to the registry client + +commit 8f0a3c397583c6503e3a1d6f5c7fb6b2eed62be0 +Merge: a5df40762d 6b31789fe5 +Author: Riyaz Faizullabhoy +Date: Thu Jan 28 14:20:26 2016 -0800 + + Merge pull request #512 from HuKeping/tiny + + Tiny refactor: to keep code style consistent + +commit 70e85dde26c196dcf315caedb225391537937e26 +Merge: d793822290 8fd84c4a57 +Author: Derek McGowan +Date: Thu Jan 28 13:44:43 2016 -0800 + + Merge pull request #1392 from aaronlehmann/client-range-requests + + Support range requests in the client's httpReadSeeker + +commit 2b95f012db167e15c72bf30c7f3abbd879f77a42 +Author: Darren Stahl +Date: Mon Jan 25 15:58:03 2016 -0800 + + Second set of enabling TestBuild CI for Windows + + Signed-off-by: Darren Stahl + +commit 87839b345ea481702849ccada6fe429c378df85a +Author: Darren Stahl +Date: Wed Jan 27 16:08:07 2016 -0800 + + Temporarily removing TestBuildHistory on Windows for perf reasons + + Signed-off-by: Darren Stahl + +commit 4ce93c1997f9f006ad20abe5dcc14f047427ca45 +Merge: ecb137ebaf 4467298b62 +Author: Victor Vieux +Date: Thu Jan 28 13:33:28 2016 -0800 + + Merge pull request #1696 from nishanttotla/update-apiversion-regex + + Extracting apiversion from HTTP request + +commit 967a98d40fcc37f5db972f913e256590fb8e84e3 +Author: Victor Vieux +Date: Thu Jan 28 13:07:25 2016 -0800 + + fix unit test and add integration test + + Signed-off-by: Victor Vieux + +commit 5ee4ad1d77aecb157ace2fc455e32984e726b97f +Merge: 630a5a23c7 318b4f0b5f +Author: Brian Goff +Date: Thu Jan 28 16:12:06 2016 -0500 + + Merge pull request #19812 from jgeiger/patch-1 + + Fix typos in create.go + +commit 40d69675f36f918e0072a2795036eccd97d971ed +Merge: 517d3a581c 73a0d83075 +Author: Daniel Nephin +Date: Thu Jan 28 16:08:46 2016 -0500 + + Merge pull request #2745 from albers/completion-services + + Fix computation of service lists in bash completion + +commit 318b4f0b5f0639149f5e88aba805cdd454d4d9ee +Author: Joey Geiger +Date: Thu Jan 28 14:05:28 2016 -0700 + + Fix typos in create.go + + There were a few spelling issues that I noticed when reading about shared mounts. + + Signed-off-by: jgeiger + +commit 2b155ce8cf727ba0785062bb572ecd3f8b7c87cd +Author: Victor Vieux +Date: Thu Jan 28 12:43:37 2016 -0800 + + fix soft / resource computation + + Signed-off-by: Victor Vieux + +commit 3c7a454a9de9d9a98c9ee3dae1f4ec2641de2d8d +Author: Victor Vieux +Date: Thu Jan 28 12:42:42 2016 -0800 + + Add test + + Signed-off-by: Victor Vieux + +commit 8a4576b2eba1795b5400f998b9ebbfdaecf0f74c +Merge: b6be1b79bc 0118532393 +Author: Nathan LeClaire +Date: Thu Jan 28 12:35:08 2016 -0800 + + Merge pull request #2956 from nathanleclaire/bash_default_env_shell + + Reset default shell for env to bash + +commit 0118532393bee81288b059e938ec1af17804cf97 +Author: Nathan LeClaire +Date: Thu Jan 28 12:11:22 2016 -0800 + + Reset default shell for env to bash + + Signed-off-by: Nathan LeClaire + +commit 517d3a581cdb1929574225f0d3caf25fd2cc9ae5 +Merge: 883e45626f 634ae7daa5 +Author: Daniel Nephin +Date: Thu Jan 28 15:05:21 2016 -0500 + + Merge pull request #2768 from aanand/fix-make-branch + + Fixes to make-branch script + +commit 883e45626f98704df50d7fe1f92b7e7f12335ff6 +Merge: 12af889e26 c39489f540 +Author: Daniel Nephin +Date: Thu Jan 28 15:02:53 2016 -0500 + + Merge pull request #2706 from dnephin/dont_copy_host_volumes + + Don't copy host volumes on recreate + +commit 2cc980e4abc2752a2a763380821fb0817772544f +Author: Victor Vieux +Date: Thu Jan 28 11:46:31 2016 -0800 + + check the container started successfully after reschedule + + Signed-off-by: Victor Vieux + +commit ecb137ebaf7152e484ade015e9f81d9b5f21f828 +Merge: d1ba0fdf87 80ffd860cb +Author: Alexandre Beslic +Date: Thu Jan 28 11:34:01 2016 -0800 + + Merge pull request #1695 from vieux/update_to_go_1.5.3 + + update_to_go_1.5.3 + +commit aa028f4d092e589f446e1e5b02bc9d00cda94c3e +Author: Victor Vieux +Date: Thu Jan 28 11:28:19 2016 -0800 + + Host Down containers in ps requires -a + + Signed-off-by: Victor Vieux + +commit 4467298b62412bf93035556cfb5175e37002f54b +Author: Nishant Totla +Date: Wed Jan 27 16:20:07 2016 -0800 + + Extracting apiversion from HTTP request + + Signed-off-by: Nishant Totla + +commit 630a5a23c73276faefaedd0b639ce1525c2bdc24 +Merge: 0b7acaf4b9 2d459a1600 +Author: David Calavera +Date: Thu Jan 28 11:06:24 2016 -0800 + + Merge pull request #19766 from anujbahuguna/master + + Adding biologist Christiane Nüsslein Volhard and AI pioneer Marvin Mi… + +commit 0b7acaf4b949ceab3b13d4f91bf7072a1bd76484 +Merge: 725b5b595b 7bca932182 +Author: Brian Goff +Date: Thu Jan 28 13:44:58 2016 -0500 + + Merge pull request #19733 from calavera/auth_error_on_post_create + + Respond with 401 when there is an unauthorized error from the registry. + +commit 9c59af13973aef36d1eb366b5e0a72c8e2b8981c +Author: Riyaz Faizullabhoy +Date: Wed Jan 20 17:30:14 2016 -0800 + + passwd command and tests + + Signed-off-by: Riyaz Faizullabhoy + +commit 2964e8c6f4c92386151f91115f4326e71e5e73d9 +Author: Riyaz Faizullabhoy +Date: Thu Jan 28 10:00:38 2016 -0800 + + add integration test for adding/listing/removing targets from roles + + Signed-off-by: Riyaz Faizullabhoy + +commit 41643d4a9c3db689b6df8fb99d60ccfa7f04fc03 +Author: Riyaz Faizullabhoy +Date: Mon Jan 25 14:40:01 2016 -0800 + + make -1 read up to 100MB of data, use for non-timestamps. Reduce + timestamp to 1MB max + + Signed-off-by: Riyaz Faizullabhoy + +commit 660c4a5f23b903d5579696921232999984bf5d5a +Author: Riyaz Faizullabhoy +Date: Mon Jan 25 11:14:31 2016 -0800 + + Add slow tests for downloading very large snapshot and targets meta files, comment on max size const + + Signed-off-by: Riyaz Faizullabhoy + +commit a6159a45d16b5cc453c5effe4f7ce84296bcffc8 +Author: Riyaz Faizullabhoy +Date: Fri Jan 22 14:54:16 2016 -0800 + + ensure filestore GetMeta only returns up to size bytes. Standardize constant for max size + + Signed-off-by: Riyaz Faizullabhoy + +commit d793822290eed15751744945afa81d2d1e915944 +Merge: 69db5b7440 a8861549cf +Author: Richard Scothern +Date: Thu Jan 28 10:04:09 2016 -0800 + + Merge pull request #1394 from RichardScothern/invalidate-bdc + + Invalidate the blob store descriptor cache + +commit bb9ef929de482b465b8890c4f3cb5cc5a9592534 +Author: Riyaz Faizullabhoy +Date: Thu Jan 28 09:59:04 2016 -0800 + + Add --roles flags to targets commands + + Signed-off-by: Riyaz Faizullabhoy + +commit 0e5ea96fa6241bdd10e174cf553d57daaf96c234 +Author: Harald Albers +Date: Thu Jan 28 09:48:47 2016 -0800 + + Improve bash completion for users and groups + + Signed-off-by: Harald Albers + +commit b6be1b79bcb2bf7ef6f74031ed5da3e72b882b4b +Merge: ccdf3c2a86 8eb22b411b +Author: David Gageot +Date: Thu Jan 28 18:26:01 2016 +0100 + + Merge pull request #2954 from jeanlaurent/engine-url + + Fix #2029 - local drivers dont run with engine-install-url + +commit 8eb22b411bf8e7c363eac5f1253a27cd340e6256 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 28 12:30:48 2016 +0100 + + Fix #2029 - local drivers dont run with engine-install-url + + Signed-off-by: Jean-Laurent de Morlhon + +commit ccdf3c2a863ba7a26908ce1f9fe9451ef927159d +Merge: 810161a42a 6f6266e122 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 28 17:44:11 2016 +0100 + + Merge pull request #2955 from dgageot/2945-vbox-hyperv + + FIX #2945 Show a better error message + +commit 25b61791a55dd9335e26da0dd24371f5a622f11b +Author: Victor Vieux +Date: Thu Jan 28 08:25:28 2016 -0800 + + improve rescheduling logs + + Signed-off-by: Victor Vieux + +commit 188b3fd00d8a486bccad8e11529c1df3d9ac4509 +Author: Victor Vieux +Date: Thu Jan 28 08:25:13 2016 -0800 + + change rlock to lock + + Signed-off-by: Victor Vieux + +commit 6f6266e122c6ed0c0f02c6b33f844c778d4fa620 +Author: David Gageot +Date: Thu Jan 28 16:18:17 2016 +0100 + + FIX #2945 Show a better error message + + There's not much more we can do. + + Signed-off-by: David Gageot + +commit 47e0241e0bf1be57645257c627d0fa3a64975b43 +Author: Fredy Morales +Date: Thu Jan 28 10:05:40 2016 -0500 + + Changes repo uri + + Signed-off-by: Fredy Morales + +commit 2d459a160020f2a8a3482d8c5649996120123633 +Author: Anuj Bahuguna +Date: Tue Jan 26 21:11:06 2016 +0000 + + Adding biologist Christiane Nüsslein Volhard and AI pioneer Marvin Minsky + Signed-off-by: Anuj Bahuguna anujbahuguna.dev@gmail.com + + Signed-off-by: Anuj Bahuguna + +commit 12af889e26f1c8320632f3ced94995f428e93325 +Merge: 8c250e220c 3fc72038c5 +Author: Aanand Prasad +Date: Thu Jan 28 12:38:28 2016 +0000 + + Merge pull request #2737 from moxiegirl/new-navigation + + New navigation for 1.10 release + +commit 810161a42aee5fdcf4c34a986072ca7c8359a772 +Merge: f52d046400 c2d620f881 +Author: David Gageot +Date: Thu Jan 28 13:19:34 2016 +0100 + + Merge pull request #2953 from jeanlaurent/release-update + + Update release script + +commit 6b31789fe5b26d3c14df0758000b0e17f5a7bffa +Author: HuKeping +Date: Thu Jan 28 20:10:48 2016 +0800 + + Tiny refactor: to keep code style consistent + + The other CLI commands about tuf are all begin with cmdTufXXX + which I think `verify` should be the same too. + + Signed-off-by: Hu Keping + +commit a59f3578ee5876463e185cf344ddecb47ce9b0b2 +Author: ChangHai Yan +Date: Thu Jan 28 19:50:09 2016 +0800 + + use ParseRepositoryTag in image + + Signed-off-by: ChangHai Yan + +commit fbab9d05ba94814508dae4745996ae0e525a0e0f +Author: Victor Vieux +Date: Thu Jan 28 03:17:34 2016 -0800 + + reschedule swarm container only + + Signed-off-by: Victor Vieux + +commit f52d0464001a7ccc3c4873a93d57abf606c9de99 +Merge: 35054c5c71 794cf4cf4d +Author: Jean-Laurent de Morlhon +Date: Thu Jan 28 12:06:01 2016 +0100 + + Merge pull request #2952 from dgageot/go-vet + + Make go vet ./... happy + +commit c2d620f881aab92239ee36c7136c46de29e8b95d +Author: Jean-Laurent de Morlhon +Date: Thu Jan 28 11:20:36 2016 +0100 + + Update release script + + Signed-off-by: Jean-Laurent de Morlhon + +commit 794cf4cf4d74b785b9308cb7bbec7ff552c64410 +Author: David Gageot +Date: Thu Jan 28 11:15:12 2016 +0100 + + Make go vet ./... happy + + Signed-off-by: David Gageot + +commit 35054c5c71560e34cbc76fc34cb11024f80ab37e +Merge: 36aed62f39 bde3435c07 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 28 11:03:00 2016 +0100 + + Merge pull request #2951 from dgageot/2949-remove-stopped-vbox-vm + + FIX #2949 Cannot remove stopped vbox VM + +commit bde3435c07931fb7ade5e0b99deb67b8bb75c6f6 +Author: David Gageot +Date: Thu Jan 28 10:38:39 2016 +0100 + + FIX #2949 Cannot remove stopped vbox VM + + Signed-off-by: David Gageot + +commit 725b5b595b50bc73654817aac2b515bcb0c8b5b8 +Merge: 7ee1aaf06d 11fe3edacb +Author: Vincent Demeester +Date: Thu Jan 28 08:58:41 2016 +0100 + + Merge pull request #19801 from albers/completion-journald-opt-tag + + bash completion for journald tag support + +commit 11fe3edacbbba2633bc044ec044377febbd7d759 +Author: Harald Albers +Date: Thu Jan 28 08:41:37 2016 +0100 + + bash completion for journald tag support + + Signed-off-by: Harald Albers + +commit 7ee1aaf06d311856f0e8b4b4c21249458e01fc77 +Merge: adb9fa7362 b02552124b +Author: Vincent Demeester +Date: Thu Jan 28 08:31:45 2016 +0100 + + Merge pull request #19769 from HackToday/fixubuntudoc + + Make install instruction consistent + +commit adb9fa736283bd0c57edccd44819207c63f8be98 +Merge: 36b5e63179 ebd1f70165 +Author: Vincent Demeester +Date: Thu Jan 28 08:30:30 2016 +0100 + + Merge pull request #19401 from wenchma/18410-default_net_driver + + docs: document options for default network driver + +commit 36b5e6317906d949bf5f823a357f4e30d78e6f98 +Merge: 3dd01713d8 6716a3a167 +Author: Vincent Demeester +Date: Thu Jan 28 08:29:42 2016 +0100 + + Merge pull request #19773 from coolljt0725/fix_message + + Correct the info message when stop container + +commit b02552124b5241d4f29d4d69de26e84110cc562c +Author: Kai Qiang Wu(Kennan) +Date: Wed Jan 27 05:08:15 2016 +0000 + + Make install instruction consistent + + Right now in ubuntu section, instruction is not consistent + for sudo, so it is better to keep it style same. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 58fb377f0fb2ca58bbcea6acb686eebce995ef8d +Author: Jeffrey Morgan +Date: Wed Jan 27 21:07:47 2016 -0800 + + Bump Toolbox and Kitematic versions + + Signed-off-by: Jeffrey Morgan + +commit ebd1f70165faf1c19325f930b866365cab8e765b +Author: Wen Cheng Ma +Date: Mon Jan 18 13:02:10 2016 +0800 + + docs: document options for default network driver + + Fixes issue #18410 + + Signed-off-by: Wen Cheng Ma + +commit ec31741ca186278ea60faf49f85087c493e78806 +Author: Darren Stahl +Date: Wed Jan 27 13:03:09 2016 -0800 + + Combine SetupWorkingDirectory for Linux and Windows + + Signed-off-by: Darren Stahl + +commit 8fd84c4a57612c37ddea6617e2f6ce64840f1c83 +Author: Aaron Lehmann +Date: Wed Jan 27 10:57:58 2016 -0800 + + Add a CheckRedirect function to the HTTP client + + Use it to preserve Accept and Range headers that were added to the + original request. + + Signed-off-by: Aaron Lehmann + +commit ccf8154a447bb971c3d7507b02720528bda2fa98 +Author: Aaron Lehmann +Date: Mon Jan 25 17:51:54 2016 -0800 + + Support range requests in the client's httpReadSeeker + + Remove buffering on the reader, because it's not useful. Also remove + artificial io.EOF return. + + Signed-off-by: Aaron Lehmann + +commit a5df40762d21d230534eee635614c61b22118507 +Merge: c4277dd221 6fa388b467 +Author: David Lawrence +Date: Wed Jan 27 16:04:21 2016 -0800 + + Merge pull request #510 from endophage/better_401 + + return a better error message if the HTTP status code was 401 + +commit ca8a4935aa56c0e36b45891d457d78eca194cd14 +Author: Jessica Frazelle +Date: Wed Jan 27 15:57:24 2016 -0800 + + make docs better for scripts as well + + Signed-off-by: Jessica Frazelle + +commit 9ca8386c5720d887f6c22b657324e9fc6ff2487d +Author: Jessica Frazelle +Date: Tue Jan 26 10:59:01 2016 -0800 + + add scripts to clean experimental rpms and debs + + Signed-off-by: Jessica Frazelle + +commit 404d20861c49d6e8ca3095bc54e2d5c78599832c +Author: Jessica Frazelle +Date: Wed Jan 27 14:00:53 2016 -0800 + + some cleanup + + Signed-off-by: Jessica Frazelle + +commit 3dd01713d8d3a84ab603fa865d32bd23ba6684b6 +Merge: 07312af8fa b78c736356 +Author: David Calavera +Date: Wed Jan 27 15:31:29 2016 -0800 + + Merge pull request #17849 from daehyeok/remove_empty_file + + Remove output file when save/export fail + +commit 8ed06af0443f4239f446b3cff202d91a61af350f +Author: David Calavera +Date: Wed Jan 27 18:26:48 2016 -0500 + + Always prompt for a password when asking for credentials. + + There is a weird behavior where we don't ask for a password + when the user you type in the prompt is the same you have configured + in the config file. + + This is the source of many frustrations and also a bug. + If the authentication with a registry fails because the password + is incorrect, we won't ask for the password again with the current logic. + + With this change, we also stop calling `CmdLogin` directly when + authentication fails. We don't need to parse flags from the cli or + setting up input destriptiors again, like the current behavior is doing. + + Signed-off-by: David Calavera + +commit 07312af8fa160c1c87558288e1de9d309b1e9c90 +Merge: e5b1f29ac3 9672afa339 +Author: Jess Frazelle +Date: Wed Jan 27 15:02:38 2016 -0800 + + Merge pull request #19747 from cpuguy83/nogc + + Turn off GC during `make binary` + +commit e5b1f29ac311d98b9f92b0211be2477d040e49e0 +Merge: 7a016578db 71a1caddf0 +Author: Sebastiaan van Stijn +Date: Wed Jan 27 14:35:32 2016 -0800 + + Merge pull request #19788 from cyli/vendor-notary + + Include a new version of notary with less verbose INFO+ logging + +commit 7a016578dbb5c9b8a43b43e1ce96785fa26baf56 +Merge: c1191eb0e8 3cf82ff1ab +Author: David Calavera +Date: Wed Jan 27 14:25:24 2016 -0800 + + Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag + + Added flag to ignore fluentd connect error on container start + +commit c1191eb0e83629a6623ee6119ddb7097538f3fc3 +Merge: 0f5aa19593 a6701790ee +Author: Sebastiaan van Stijn +Date: Wed Jan 27 14:22:54 2016 -0800 + + Merge pull request #19741 from jfrazelle/better-apparmor-docs + + way better apparmor docs + +commit ead23224c8bbf01f81c9168c8f08cbe21687a7d3 +Author: Carol Fager-Higgins +Date: Thu Jan 14 12:19:12 2016 -0800 + + DO NOT MERGE YET. added new ambassador path for 1.5s + added viktor's comment + + changed text to refect upcoming release of 1.4.3 and not 1.5 + Signed-off-by: Carol Fager-Higgins + +commit d1ba0fdf873c9c95d119ba152cfb221b5396a6ca +Merge: 2f5b1a8d4d f3a1027bbe +Author: Victor Vieux +Date: Wed Jan 27 14:09:06 2016 -0800 + + Merge pull request #1684 from vieux/update_info + + Update info + +commit a6701790ee585c625c6a39413d2772dc7ecf80fd +Author: Jessica Frazelle +Date: Tue Jan 26 12:19:15 2016 -0800 + + way better apparmor docs + + Signed-off-by: Jessica Frazelle + +commit 15a0366fee22b5c4139078df68bb9ab7035d1001 +Author: Carol Fager-Higgins +Date: Wed Jan 6 16:43:52 2016 -0800 + + moved these files to a new branch + added diagrams to illustrate process of GC + + added arrow back after talking to Jon + + Signed-off-by: Carol Fager-Higgins + +commit 0f5aa19593dd2258a26adf37e41e00cbbbab8cf1 +Merge: 7beccdc609 777ee34b07 +Author: David Calavera +Date: Wed Jan 27 13:42:56 2016 -0800 + + Merge pull request #19767 from icecrime/factorize_sleeping_container + + Factorize sleeping containers + +commit 7beccdc609667e6ec7517494779bbb2ef61102af +Merge: f4e5eb3f86 caad94d7bb +Author: Vincent Demeester +Date: Wed Jan 27 22:17:06 2016 +0100 + + Merge pull request #19721 from bboreham/doc-ip-failure + + Improve wording about re-assigning IP addresses + +commit f4e5eb3f86a6d8681bbf85d5f46d589c242a3578 +Merge: b9c8fc5ac9 0feeab2e43 +Author: Brian Goff +Date: Wed Jan 27 16:11:12 2016 -0500 + + Merge pull request #19775 from coolljt0725/fix_prepare_mount + + daemon: don't prepare mountpoint for restart container + +commit b9c8fc5ac9938ed9ff55708f6ea8723e70c2b24e +Merge: fff1511c56 83c1fd6f53 +Author: Sebastiaan van Stijn +Date: Wed Jan 27 13:10:41 2016 -0800 + + Merge pull request #19748 from tkopczynski/18884-daemon-not-running-faq + + FAQ: add docker daemon unavailable note + +commit 83c1fd6f53d1b061fd71057210a6e317fcd56359 +Author: Tomasz Kopczynski +Date: Tue Jan 26 21:46:19 2016 +0100 + + FAQ: add docker daemon unavailable note + + Signed-off-by: Tomasz Kopczynski + +commit 3fc72038c56482e63dbb2e1341f8475cf6bb5350 +Author: Mary Anthony +Date: Sun Jan 24 12:03:44 2016 -0800 + + New navigation for 1.10 release + Updating with Joffrey's comments + + Signed-off-by: Mary Anthony + +commit 6fa388b4677030c9a358f63364185f3876aa7acb +Author: David Lawrence +Date: Wed Jan 27 11:16:11 2016 -0800 + + return a better error message if the HTTP status code was 401 + Signed-off-by: David Lawrence (github: endophage) + +commit 2f5b1a8d4dec261d41ec9c704448c90b117a5630 +Merge: 6b451b2d8c 4194778242 +Author: Dongluo Chen +Date: Wed Jan 27 11:35:10 2016 -0800 + + Merge pull request #1687 from vieux/fix_filter_network_global + + fix network filter with global network + +commit 7bca93218291767c5dd8782de0ad630dbcda9995 +Author: David Calavera +Date: Tue Jan 26 13:30:58 2016 -0500 + + Respond with 401 when there is an unauthorized error from the registry. + + Signed-off-by: David Calavera + +commit 9672afa3391119b3b06d87735041168b01b7f1da +Author: Brian Goff +Date: Tue Jan 26 16:17:05 2016 -0500 + + Add `DOCKER_BUILD_GOGC` to tweak GOGC for compile + + Signed-off-by: Brian Goff + +commit 6b451b2d8c3b989b00b5cca7152305a0fc8b27fc +Merge: b3aab8455d 0b6d390d66 +Author: Victor Vieux +Date: Wed Jan 27 10:30:58 2016 -0800 + + Merge pull request #1690 from dongluochen/testValidation + + swarm_manage should confirm nodes pass validation + +commit fff1511c56e35cf5230d05af2282d31d23a31dc0 +Merge: c39c7e6edf 5a3351883b +Author: Vincent Demeester +Date: Wed Jan 27 19:21:23 2016 +0100 + + Merge pull request #19564 from bobrik/journald-tag + + Add tag support to journald logging driver, closes #19556 + +commit 3fd25d98b818c5e381571c9ba6ee7d00984f6bc7 +Author: Aditi Rajagopal +Date: Wed Jan 27 18:49:31 2016 +0100 + + Update Instructions for Docker Remote API access + + Update the location of cert.pem and key.pem to use within the + ~/.docker folder + Resolves: #18778 + + Signed-off-by: Aditi Rajagopal + +commit 71a1caddf0af51cfc79db04f80513b292adb0231 +Author: cyli +Date: Wed Jan 27 09:46:26 2016 -0800 + + Include a new version of notary with less verbose INFO+ logging + + Signed-off-by: cyli + +commit c39c7e6edf7d432730a84fa549b74203954b54c4 +Merge: 6b2c1ed4c0 0617521ba2 +Author: Jess Frazelle +Date: Wed Jan 27 09:36:26 2016 -0800 + + Merge pull request #19760 from cyli/re-vendor-notary + + Re-vendor Notary and docker/go + +commit 6b2c1ed4c0921834311244d2c23e91f670c22084 +Merge: ae14e6cc0a 8544913754 +Author: Jess Frazelle +Date: Wed Jan 27 09:34:29 2016 -0800 + + Merge pull request #19784 from vdemeester/oh-tools-it + + Fix TOOLS.md jenkins plugin link :) + +commit caad94d7bb12f07976141b4e7bc04f94f0380961 +Author: Bryan Boreham +Date: Tue Jan 26 14:43:07 2016 +0000 + + Improve wording about re-assigning IP addresses + + Signed-off-by: Bryan Boreham + +commit c4277dd221d8d4be99d34f31a429318a2660cfa2 +Merge: f4311b3a27 ceca4c233e +Author: Diogo Mónica +Date: Wed Jan 27 08:55:44 2016 -0800 + + Merge pull request #508 from docker/log-level + + move verifier and update logs down to debug level + +commit f4311b3a274f10c25fc4f92b6240126cf28a805d +Merge: c90e1bd8c8 83c5ed255b +Author: Diogo Mónica +Date: Wed Jan 27 08:54:27 2016 -0800 + + Merge pull request #509 from docker/reject-short-keys + + Add check for RSA key len before adding delegation + +commit c90e1bd8c8b70a03d048da9eeee1761b3842e1fb +Merge: 7eb86f7a64 c583063014 +Author: Ying Li +Date: Wed Jan 27 08:53:45 2016 -0800 + + Merge pull request #500 from docker/speed-up-tests + + Don't run all the tests with yubikey + +commit 777ee34b075292e5aee16c4088444508899f8f35 +Author: Arnaud Porterie +Date: Tue Jan 26 20:16:36 2016 -0800 + + Factorize sleeping containers + + Add `runSleepingContainer` and `runSleepingContainerInImage` helper + functions to factor out the way to run system-specific idle containers. + + Define a sleeping container as command `top` in image `busybox` for + Unix and as command `sleep 60` in image `busybox` for Windows. Provide a + single point of code to update those. + + Signed-off-by: Arnaud Porterie + +commit ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44 +Merge: c17d4b4ebb 1445e4db32 +Author: Brian Goff +Date: Wed Jan 27 11:21:01 2016 -0500 + + Merge pull request #19071 from icecrime/incremental_builds + + Enable incremental builds + +commit 40dceb56e75b4c2e45559227a8387c656652fdb8 +Author: Jeffrey Morgan +Date: Wed Jan 27 07:58:42 2016 -0800 + + Bump VirtualBox to 5.0.14 on OS X + + Signed-off-by: Jeffrey Morgan + +commit bb4047a246f6ee25a6249b11169890e1dec59de6 +Merge: 44307aea4e 5450625f81 +Author: Jeffrey Morgan +Date: Wed Jan 27 07:57:13 2016 -0800 + + Merge pull request #379 from SvenDowideit/upgrade-windows-deps + + Upgrade git-for-windows to 2.7.0, and vbox to 5.0.14 + +commit 634ae7daa59a8f2fe3410ff8b538651fcb9a6662 +Author: Aanand Prasad +Date: Wed Jan 27 13:27:12 2016 +0000 + + Let the user specify any repo as their fork + + Signed-off-by: Aanand Prasad + +commit 3547c55523f67b31f8f54936c0ac743f55b22036 +Author: Aanand Prasad +Date: Wed Jan 27 13:26:32 2016 +0000 + + Default to vim if EDITOR is not set + + Signed-off-by: Aanand Prasad + +commit 85449137548f98e2af9b06818183b2b60d51d9f0 +Author: Vincent Demeester +Date: Wed Jan 27 16:33:20 2016 +0100 + + Fix TOOLS.md jenkins plugin link :) + + Signed-off-by: Vincent Demeester + +commit c17d4b4ebb7f15b4fcb32d191ea3306d13f15d06 +Merge: c1b168664f f5310652d3 +Author: Brian Goff +Date: Wed Jan 27 09:28:11 2016 -0500 + + Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock + + fix dead lock in volume store dereference + +commit 8c250e220cf79ef0dc36ac8696d66158ecbfcf83 +Merge: 888f4b43c9 7d403d09cf +Author: Aanand Prasad +Date: Wed Jan 27 13:48:23 2016 +0000 + + Merge pull request #2754 from aanand/upgrading-improvements + + Improvements to upgrade guide and script + +commit 4537ec70cc0823e79c132b59c9767950b3d26a4f +Author: Aanand Prasad +Date: Wed Jan 27 02:34:59 2016 +0000 + + Remove outdated warnings about links from docs + + Signed-off-by: Aanand Prasad + +commit c1b168664f3b0d92164f1a4308ad6c653d38cf40 +Merge: 38424b73d9 3c61f00616 +Author: Antonio Murdaca +Date: Wed Jan 27 14:08:28 2016 +0100 + + Merge pull request #19764 from Microsoft/jjh/testinspectapi + + Windows CI: PortTestInspectApi* + +commit 888f4b43c949292e12aad1ff37ddd336abefa84b +Merge: 3aa545eb8e d3a1cea170 +Author: Aanand Prasad +Date: Wed Jan 27 13:08:15 2016 +0000 + + Merge pull request #2762 from aanand/remove-links-warnings + + Remove outdated warnings about links from docs + +commit 36aed62f39f28b90694f163f3c227a390b5b989c +Merge: 7524af4897 927bff1f80 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 27 13:20:50 2016 +0100 + + Merge pull request #2944 from dgageot/simpler-AppVeyor + + Simplify AppVeyor configuration + +commit 7524af4897dfe99be0faf7a1525d911026f49303 +Merge: 56ea7a2237 a397facd08 +Author: David Gageot +Date: Wed Jan 27 13:20:15 2016 +0100 + + Merge pull request #2946 from jeanlaurent/appveyor-badge + + Add silly appveyor badge + +commit 80ffd860cb0bbdd92c916e7e276adbbdbf35d3f1 +Author: Victor Vieux +Date: Wed Jan 27 03:13:47 2016 -0800 + + update_to_go_1.5.3 + + Signed-off-by: Victor Vieux + +commit 5a3351883b254d3690e9dcc5b89293bcee474493 +Author: Ivan Babrou +Date: Thu Jan 21 21:30:48 2016 +0000 + + Add tag support to journald logging driver, closes #19556 + + Signed-off-by: Ivan Babrou + +commit a397facd0861fcea46997fa9db1195200c27a5ec +Author: Jean-Laurent de Morlhon +Date: Wed Jan 27 10:34:50 2016 +0100 + + Added silly appveyor badge + + Signed-off-by: Jean-Laurent de Morlhon + +commit 56ea7a2237c8119b8a87d00a2e7cef335c6b25aa +Merge: 8f1877e2be 40f5d7ca40 +Author: David Gageot +Date: Wed Jan 27 10:31:24 2016 +0100 + + Merge pull request #2943 from jeanlaurent/coverall-badge + + Fix coverall badge branch + +commit 8f1877e2bed8b37ff26d91cd9e232ddb8badcef6 +Merge: dbcd595858 696051ba75 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 27 10:20:36 2016 +0100 + + Merge pull request #2940 from dgageot/2939-it-ls-headers + + FIX #2939 Integration tests for ls headers + +commit 927bff1f80ce93e04cd6cfea7cd458c9b5219f9d +Author: David Gageot +Date: Wed Jan 27 10:03:19 2016 +0100 + + Simplify AppVeyor configuration + + Signed-off-by: David Gageot + +commit dbcd5958582f4959cb474eab14ed4c046b8a9b21 +Merge: 62db9eb370 1bc6cdd357 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 27 10:08:54 2016 +0100 + + Merge pull request #2942 from dgageot/2941-wait-docker-restart + + FIX #2941 Wait for Docker after a restart + +commit f3a1027bbe3391325f00437d0ace3940f2986cc9 +Author: Victor Vieux +Date: Sun Jan 17 06:59:39 2016 -0800 + + update docker info + add test + + Signed-off-by: Victor Vieux + +commit 5e3affa67795063b7b733046e5ec2415987a03ba +Author: Victor Vieux +Date: Sun Jan 17 07:14:38 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit 40f5d7ca4060d8d2bb639a6c094f9a4e7e331ffd +Author: Jean-Laurent de Morlhon +Date: Wed Jan 27 09:59:24 2016 +0100 + + Fix coverall badge branch + + Signed-off-by: Jean-Laurent de Morlhon + +commit 38424b73d91b8d5774115dee0e083c4d3957623c +Merge: 805a107df4 a381efcf39 +Author: Vincent Demeester +Date: Wed Jan 27 09:54:24 2016 +0100 + + Merge pull request #19778 from albers/completion-volume-ls-dangling + + Improve bash completion for `docker volume ls -f dangling` + +commit 0a2b5ab4d39210508806187ef3441724ec829390 +Author: Miquel Sabaté Solà +Date: Wed Jan 27 09:52:29 2016 +0100 + + libmachine/ssh: added the Start and Wait functions to the Client interface + + The Start function starts an SSH session and executes the given command. The + returned parameters are readers for the stdout and stderr. This way, developers + can further manipulate the output of the remote command. The Wait function is + command to that of the exec.Cmd type. + + The readers returned by the Start function are io.ReadCloser instead of + io.Reader, as one might think. This is done this way to simplify the API so + the ExternalClient doesn't have to provide extra functions to close the + io.ReadCloser's as returned by the cmd.StdoutPipe and cmd.StderrPipe functions. + + Finally, I've also changed the receivers of the functions related to the Native + and the External clients. This is done this way because we need to save the + open session or the command from each client in order to implement the Wait + function. Note that the Wait function is needed in order to properly close the + session that is hidden underneath the Native client. + + Signed-off-by: Miquel Sabaté Solà + +commit 696051ba75792b438da44ecdaa4b172f9dcd4138 +Author: David Gageot +Date: Wed Jan 27 09:20:22 2016 +0100 + + FIX #2939 Integration tests for ls headers + + Signed-off-by: David Gageot + +commit 1bc6cdd3570ec8deef69b36224abcccca31a59ba +Author: David Gageot +Date: Wed Jan 27 09:34:40 2016 +0100 + + FIX #2941 Wait for Docker after a restart + + Signed-off-by: David Gageot + +commit f5310652d30e72fe88a3edc70b2911397c28b7e4 +Author: Pei Su +Date: Wed Jan 27 16:34:10 2016 +0800 + + fix dead lock in volume store dereference + + Signed-off-by: Pei Su + +commit a381efcf39ef7f82b1496a4bbaf42df096d91bc5 +Author: Harald Albers +Date: Wed Jan 27 09:32:14 2016 +0100 + + Improve bash completion for `docker volume ls -f dangling` + + Signed-off-by: Harald Albers + +commit 62db9eb37037fd642507e3ff7272d040314dbde8 +Merge: b496f61640 3757dc5313 +Author: David Gageot +Date: Wed Jan 27 09:27:34 2016 +0100 + + Merge pull request #2936 from nathanleclaire/poll_daemon_start + + Wait for Docker daemon on host start + +commit b496f6164062dabe5c8571c6a94ec3c84eb7c685 +Merge: c406b03142 0a1eb5d79f +Author: David Gageot +Date: Wed Jan 27 09:16:17 2016 +0100 + + Merge pull request #2938 from drish/master + + fix ls command with wrong header values + +commit 805a107df4c43e5fd20dce7d716001290d7b2840 +Merge: ab8da94531 0e1bfdd43e +Author: Vincent Demeester +Date: Wed Jan 27 09:07:47 2016 +0100 + + Merge pull request #19736 from albers/completion-network-rm-custom + + Let bash completion for `docker network rm` only complete custom networks + +commit 6716a3a167fcd0a9abc013ce536117175922af96 +Author: Lei Jitang +Date: Wed Jan 27 03:06:45 2016 -0500 + + Correct the info message when stop container + + Signed-off-by: Lei Jitang + +commit ab8da94531ba77feee1931923be812354fbd2b2c +Merge: 857093fbca 386392f799 +Author: Sebastiaan van Stijn +Date: Wed Jan 27 00:05:38 2016 -0800 + + Merge pull request #19759 from thaJeztah/docs-for-19688 + + Fix docs for tmpfs (pr 19688) + +commit 386392f79987a135fd9168cc92482f92c671713c +Author: Sebastiaan van Stijn +Date: Tue Jan 26 17:39:13 2016 -0800 + + Fix docs for tmpfs (pr 19688) + + Underlying files are no longer copied to the tmpfs. + + Signed-off-by: Sebastiaan van Stijn + +commit 0feeab2e43a75bee3d5709248544b3078df96706 +Author: Lei Jitang +Date: Wed Jan 27 02:43:40 2016 -0500 + + daemon: don't prepare mountpoint for restart container + + The restart container has already prepared the mountpoint, there is + no need to do that again. This can speed up the daemon start if + the restart container has a volume and the volume driver is not + available. + + Signed-off-by: Lei Jitang + +commit 857093fbcaf8929e24bc42689c3fe337d2c34dcf +Merge: 872b927c76 6807582cdc +Author: Sebastiaan van Stijn +Date: Tue Jan 26 23:32:18 2016 -0800 + + Merge pull request #19754 from jfrazelle/revised-release-docs + + updates to release checklist + +commit 872b927c765943be7237b4b6c9c2d6e6850045eb +Merge: 63f8429bf0 d0cb7e599e +Author: Sebastiaan van Stijn +Date: Tue Jan 26 23:30:21 2016 -0800 + + Merge pull request #19753 from jfrazelle/repo-docs + + add docs for package repo maintenance + +commit 83c5ed255b143e42ad8c939ba4d130bf28dc13b2 +Author: Riyaz Faizullabhoy +Date: Tue Jan 26 18:31:06 2016 -0800 + + Add check for RSA key len before adding + + Signed-off-by: Riyaz Faizullabhoy + +commit 3cf82ff1ab14e1ddd2b629524e894ac359168388 +Author: Jussi Nummelin +Date: Tue Nov 17 15:41:56 2015 +0100 + + Added flag to ignore fluentd connect error on container start + + Signed-off-by: Jussi Nummelin + + Changed buffer size to 1M and removed unnecessary fmt call + + Signed-off-by: Jussi Nummelin + + Updated docs for the new fluentd opts + + Signed-off-by: Jussi Nummelin + +commit ceca4c233e6b376e96b4bd31a187dc0e39e16a68 +Author: Riyaz Faizullabhoy +Date: Tue Jan 26 23:02:54 2016 -0800 + + move verifier and update logs down to debug level + + Signed-off-by: Riyaz Faizullabhoy + +commit 63f8429bf0152bf0e8903ab4def18295bd6d4e1d +Merge: d789618ea4 899f1b1870 +Author: David Calavera +Date: Tue Jan 26 21:55:32 2016 -0800 + + Merge pull request #19717 from coolljt0725/fix_load + + Daemon: do GetRWLayer after checking if container support the current graph driver + +commit c406b03142ec03c5a535323a46f2ed821f67f949 +Merge: 7f708edcec 0a1025b263 +Author: David Gageot +Date: Wed Jan 27 06:45:00 2016 +0100 + + Merge pull request #2933 from caglar10ur/govmomi + + [vmwarevsphere] Start using govmomi provided helpers + +commit 1445e4db32e648277470513213473021ca59010a +Author: Arnaud Porterie +Date: Mon Jan 4 18:46:04 2016 -0800 + + Enable incremental builds + + Remove the `-a` build flag and introduce `-i` in order to reuse + previously compiled dependencies. + + Signed-off-by: Arnaud Porterie + +commit b78c736356cb2142e66bd8c8020f6f355c565917 +Author: Daehyeok Mun +Date: Sun Dec 13 18:25:28 2015 -0700 + + Remove output file when save/export fail + + Signed-off-by: Daehyeok Mun + +commit d789618ea4d99d5c9d0183d0375cee22f4fcc9f2 +Merge: 0ae94303b8 916b9db71d +Author: Arnaud Porterie +Date: Tue Jan 26 21:05:34 2016 -0800 + + Merge pull request #19765 from Microsoft/jjh/ibrokewindowsci + + Darn it, I broke CI due to multiple declarations + +commit 3c61f006162f2781651dda764dddcf4af4957846 +Author: John Howard +Date: Tue Jan 26 19:40:56 2016 -0800 + + Windows CI: PortTestInspectApi* + + Signed-off-by: John Howard + +commit 0a1eb5d79fbb58df0f75f6eb11125325636cfb46 +Author: Carlos Derich +Date: Wed Jan 27 01:10:55 2016 -0300 + + fix ls command with wrong header values + + fixes #2937 + + Signed-off-by: Carlos Derich + +commit 916b9db71d6de8db8731a6d881079a7a8e61eb64 +Author: John Howard +Date: Tue Jan 26 19:45:43 2016 -0800 + + Windows CI: Darn it, I broke due to multiple declarations + + Signed-off-by: John Howard + +commit 0ae94303b89a9648f26b599617a9d78ee5284a4c +Merge: 3cf4884787 1d2208fed9 +Author: Lei Jitang +Date: Wed Jan 27 11:43:43 2016 +0800 + + Merge pull request #19722 from WeiZhang555/exec-restarting + + Forbid exec a restarting container + +commit 3cf4884787b6543dd325cd9f66be7338f2b9997e +Merge: 603c04a789 2b0a742237 +Author: Sebastiaan van Stijn +Date: Tue Jan 26 19:14:43 2016 -0800 + + Merge pull request #19612 from Microsoft/jjh/apicontainerstest + + Windows CI: Fixup docker_api_containers_test.go + +commit 603c04a789832652ef141f14bea82f66f974a910 +Merge: 864cca2287 15c32f39a9 +Author: Arnaud Porterie +Date: Tue Jan 26 19:08:33 2016 -0800 + + Merge pull request #19744 from Microsoft/jjh/testhistory + + Windows CI: Enable TestHistory* cli tests + +commit 864cca2287f7605a2b973e9bad7e4c4330f5662e +Merge: 70c5e96cb8 80b0570671 +Author: Arnaud Porterie +Date: Tue Jan 26 19:04:25 2016 -0800 + + Merge pull request #19605 from Microsoft/jjh/docker_api_images_test + + Windows CI: Porting for docker_api_images_test.go + +commit 70c5e96cb8bd6b826006f73102135bf74e2fa877 +Merge: 51d4d8eff2 f21fb2162e +Author: Arnaud Porterie +Date: Tue Jan 26 19:03:31 2016 -0800 + + Merge pull request #19604 from Microsoft/jjh/testrename + + Windows CI: Fix TestRename* + +commit 51d4d8eff214ce1ec97d652f00cc70e822e6aba7 +Merge: 9b82174f93 75d107451a +Author: Arnaud Porterie +Date: Tue Jan 26 19:01:17 2016 -0800 + + Merge pull request #19603 from Microsoft/jjh/testps + + Windows CI: Address simple failures in TestPS* + +commit 0b6d390d66a9840ebc81e28181ec58d736cb14ba +Author: Dong Chen +Date: Tue Jan 26 18:46:08 2016 -0800 + + swarm_manage should confirm nodes pass validation. + + Signed-off-by: Dong Chen + +commit 9b82174f93e90e7b24146df823a07cde6df60891 +Merge: 7992b353c0 94e5fab5ed +Author: Doug Davis +Date: Tue Jan 26 21:46:35 2016 -0500 + + Merge pull request #19742 from Microsoft/jjh/testrmi + + Windows CI: Port TestRmi tests + +commit 3757dc531352011b4ce204e2b0ee31bef9033ebc +Author: Nathan LeClaire +Date: Tue Jan 26 18:42:10 2016 -0800 + + Add code to wait for Docker daemon on start + + Signed-off-by: Nathan LeClaire + +commit d3a1cea1709143feb0f2b490dadcf50090dbffc1 +Author: Aanand Prasad +Date: Wed Jan 27 02:34:59 2016 +0000 + + Remove outdated warnings about links from docs + + Signed-off-by: Aanand Prasad + +commit 3aa545eb8ecbd2e18f78bc323611ca6be9f33630 +Merge: ca81672b82 e40a46349f +Author: Aanand Prasad +Date: Wed Jan 27 02:05:24 2016 +0000 + + Merge pull request #2755 from aanand/fix-rebase-script + + Fix rebase-bump-commit script + +commit 1d2208fed90da9ab72ded3b1c65bb2a71b66ce93 +Author: Zhang Wei +Date: Mon Jan 25 23:38:03 2016 +0800 + + Forbid exec a restarting container + + Currently if we exec a restarting container, client will fail silently, + and daemon will print error that container can't be found which is not a + very meaningful prompt to user. + + This commit will stop user from exec a restarting container and gives + more explicit error message. + + Signed-off-by: Zhang Wei + +commit 0617521ba2ce160899852bb707c15bae7309f18a +Author: cyli +Date: Tue Jan 26 17:52:36 2016 -0800 + + Update integration tests with new error messages, and to use different repos per test. + + This way we won't encounter any problems with one test using cached data from a different + test. + + Signed-off-by: cyli + +commit 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2 +Author: cyli +Date: Tue Jan 26 14:21:07 2016 -0800 + + Re-vendor notary, as well as change jfrazelle/go to docker/go. + + Signed-off-by: cyli + +commit 695c692be6347d47669270958bb0bbe1c383773a +Author: Aanand Prasad +Date: Tue Jan 26 11:09:28 2016 +0000 + + Bump 1.6.0-rc2 + + Signed-off-by: Aanand Prasad + +commit 297d20f085ec6ef6858212cf09eea2d7e51e7a43 +Author: Aanand Prasad +Date: Wed Jan 27 00:42:04 2016 +0000 + + Remove ability to join bridge network + user-defined networks + + Containers connected to the bridge network can't have aliases, so it's + simpler to rule that they can *either* be connected to the bridge + network (via `network_mode: bridge`) *or* be connected to user-defined + networks (via `networks` or the default network). + + Signed-off-by: Aanand Prasad + +commit 16ef3d0eb882cfb96072ff92d13f124d6b5695df +Author: Joffrey F +Date: Tue Jan 26 11:12:35 2016 -0800 + + Bump docker-py version to latest RC + + Signed-off-by: Joffrey F + +commit ca81672b82a0498300a10955e299218a33f5f524 +Merge: d3d09ceb08 650b0cec38 +Author: Aanand Prasad +Date: Wed Jan 27 01:41:07 2016 +0000 + + Merge pull request #2761 from aanand/fix-bridge-plus-host + + Remove ability to join bridge network + user-defined networks + +commit b830f9f269e53c670969fb82a4a9949895d5532e +Author: Guillermo Rodriguez +Date: Wed Jan 27 12:12:36 2016 +1100 + + Fixes swarm overloading slaves when using the mesos drivers. + The problem is described here: + https://github.com/docker/swarm/issues/1588 + + This fix also allows reducing the offer timeout which reduces problems with mesos resource consolidation described here: + https://github.com/docker/swarm/issues/1655 + + Signed-off-by: Guillermo Rodriguez + +commit 899f1b18707d035a1dca73cae0dd7b3bfe65c046 +Author: Lei Jitang +Date: Tue Jan 26 20:20:30 2016 -0500 + + Daemon: do GetRWLayer after checking if container use the current graph driver + + Signed-off-by: Lei Jitang + +commit 7992b353c04b4214c28d5be6195b2703a52defb1 +Merge: 3a70ab3a2c fa163f5619 +Author: Tibor Vass +Date: Tue Jan 26 17:04:46 2016 -0800 + + Merge pull request #19737 from calavera/fix_reload_docs + + Remove cluster storage advertise from reload. + +commit 3a70ab3a2c78ab40a5fdfe55be5745753eb41139 +Merge: 3eaf878999 ae8ec4860e +Author: Arnaud Porterie +Date: Tue Jan 26 17:03:07 2016 -0800 + + Merge pull request #19688 from crosbymichael/tmpfs-tar + + Remove tar copy-up for tmpfs mounts + +commit a8861549cfa42dad854b03cccb5bd98b0224c86f +Author: Richard Scothern +Date: Tue Jan 26 16:42:10 2016 -0800 + + Invalidate the blob store descriptor caches when content is removed from from + the proxy. Also, switch to reference in the scheduler API. + + Signed-off-by: Richard Scothern + +commit 584c9b517cab91fdf9dc10de186c678fa7256f68 +Author: Richard Scothern +Date: Tue Jan 26 14:50:38 2016 -0800 + + Correct test digest lengths and enable all unit tests + + Signed-off-by: Richard Scothern + +commit 3eaf878999553cebc5b77e5f835f017793991b9a +Merge: eb729a0cb0 7b5896702b +Author: Tibor Vass +Date: Tue Jan 26 16:57:49 2016 -0800 + + Merge pull request #19751 from crosbymichael/update-libcontainer-jan26 + + Update libcontainer to 3d8a20bb772defc28c355534d83 + +commit d765a3fb912f174d5b11b0b3f69d9a5caaa50c03 +Author: Aanand Prasad +Date: Tue Jan 26 18:48:43 2016 +0000 + + Add back external links in v2 + + Signed-off-by: Aanand Prasad + +commit 650b0cec384e115c66c9b66e401f4ca37fc10490 +Author: Aanand Prasad +Date: Wed Jan 27 00:42:04 2016 +0000 + + Remove ability to join bridge network + user-defined networks + + Containers connected to the bridge network can't have aliases, so it's + simpler to rule that they can *either* be connected to the bridge + network (via `network_mode: bridge`) *or* be connected to user-defined + networks (via `networks` or the default network). + + Signed-off-by: Aanand Prasad + +commit e69ef1c456e509b3b6e967974360b5ef7a0262a4 +Author: Joffrey F +Date: Tue Jan 26 11:12:35 2016 -0800 + + Bump docker-py version to latest RC + + Signed-off-by: Joffrey F + +commit d3d09ceb08de10f90c8db2f1303ba1d8648dd63b +Merge: cd4cc8b8c6 0ba02b4a18 +Author: Aanand Prasad +Date: Wed Jan 27 00:34:17 2016 +0000 + + Merge pull request #2756 from aanand/external-links-v2 + + Add back external links in v2 + +commit 6807582cdce133afe84e408a5692f8598a3d6685 +Author: Jessica Frazelle +Date: Tue Jan 26 16:20:23 2016 -0800 + + updates to release checklist + + Signed-off-by: Jessica Frazelle + +commit eb729a0cb0be1f2d2ba5c616fcd4e585289f6dfc +Merge: e23ea05e11 e310d070f4 +Author: Sebastiaan van Stijn +Date: Tue Jan 26 16:06:29 2016 -0800 + + Merge pull request #19621 from moxiegirl/new-navigation + + New navigation for 1.10 + +commit d0cb7e599ed63fb6a29080d929ff7e7620a1fc1f +Author: Jessica Frazelle +Date: Tue Jan 26 15:49:32 2016 -0800 + + add docs for package repo maintenance + + Signed-off-by: Jessica Frazelle + +commit e310d070f498a2ac494c6d3fde0ec5d6e4479e14 +Author: Mary Anthony +Date: Sat Jan 23 20:36:40 2016 -0800 + + Creating Engine specific menu + Fixing the links + Updating with Seb's comments + Adding weight + Fixing the engine aliases + Updating after Arun pushed + Removing empty file + + Signed-off-by: Mary Anthony + +commit 7f4a94514bb48b18fdc5dbf1c282d094a097ce36 +Author: Aanand Prasad +Date: Tue Jan 26 23:22:21 2016 +0000 + + Fix trailing whitespace in docker-compose.md + + Signed-off-by: Aanand Prasad + +commit cd4cc8b8c6e6a52dd9426a061d4fae2270518bfc +Merge: bacc2b730e b84da7c78b +Author: Aanand Prasad +Date: Tue Jan 26 23:39:59 2016 +0000 + + Merge pull request #2760 from aanand/fix-docs-whitespace + + Fix trailing whitespace in docker-compose.md + +commit e23ea05e113ea5069f8bea3e75046b9429ca2e75 +Merge: 4bcb6c7fc8 84b2162c1a +Author: Sebastiaan van Stijn +Date: Tue Jan 26 15:39:52 2016 -0800 + + Merge pull request #19743 from aaronlehmann/http-idle-timeouts + + Set idle timeouts for HTTP reads and writes in communications with a registry + +commit 7eb86f7a64cc5d7bc9124b1d2c8e944a8ec47936 +Merge: c1f3550b54 774b66c9fe +Author: Diogo Mónica +Date: Tue Jan 26 15:32:20 2016 -0800 + + Merge pull request #493 from docker/delegation-cli-text + + delegations CLI UX improvements + +commit b84da7c78bacb28b62ec0b1ad34edd3330320e5b +Author: Aanand Prasad +Date: Tue Jan 26 23:22:21 2016 +0000 + + Fix trailing whitespace in docker-compose.md + + Signed-off-by: Aanand Prasad + +commit 4bcb6c7fc8758ad390a634a270cda66a8c98c9f3 +Merge: 03864c1db0 0410023367 +Author: Sebastiaan van Stijn +Date: Tue Jan 26 15:22:14 2016 -0800 + + Merge pull request #19150 from mikedougherty/cs-108-rpm-release + + [CS-108] Adjust version string processing for RPM build + +commit fa163f5619bb01cabca1c214b59e14518a797a7a +Author: David Calavera +Date: Tue Jan 26 15:44:51 2016 -0500 + + Remove cluster storage advertise from reload. + + Because libnetwork won't really send container information to the new + storage anyways. + + Signed-off-by: David Calavera + +commit 7b5896702bd2951541af27925620172edb5d3505 +Author: Michael Crosby +Date: Tue Jan 26 15:00:07 2016 -0800 + + Update libcontainer to 3d8a20bb772defc28c355534d83 + + Fixes #14203 + + This bump fixes the issue of having the container's pipes connection + reset by peer because of using the json.Encoder and having a \n added to + the output. + + Signed-off-by: Michael Crosby + +commit 03864c1db07fff1db08becca1ec4e9bb4b49ecd2 +Merge: 0e4eda1691 8ea5051e78 +Author: Jess Frazelle +Date: Tue Jan 26 14:36:28 2016 -0800 + + Merge pull request #19730 from jfrazelle/update-tools-urls + + update tools urls and remove things we dont use + +commit 0a1025b263c21d1163bf0ad2e8c57f95888da54e +Author: S.Çağlar Onur +Date: Tue Jan 26 14:21:31 2016 -0800 + + [vmwarevsphere] [doc] Update vSphere driver documentation + + Signed-off-by: S.Çağlar Onur + +commit 9f72e8442d4d13d3aa5e8027d9ac4e42329bbd70 +Author: Richard Scothern +Date: Tue Jan 26 14:20:23 2016 -0800 + + Add manifest put by digest to the registry client + Signed-off-by: Richard Scothern + +commit 0e4eda16913eda3d892b6025b00539b72535d274 +Merge: 146e49b039 730a6d2fc2 +Author: Tibor Vass +Date: Tue Jan 26 14:14:39 2016 -0800 + + Merge pull request #19738 from mrjana/mh + + Vendoring libnetwork v0.6.0-rc5 + +commit 146e49b039c59107cc31de734f0bf5d4604c04d9 +Merge: b775efc9bc 9e2b63e0ae +Author: Brian Goff +Date: Tue Jan 26 17:01:20 2016 -0500 + + Merge pull request #19671 from calavera/volume-dangling + + Make volume dangling filter return only used volumes with `dangling=false`. + +commit ae8ec4860e68e945cf6b2c157fa4e243c35c54a5 +Author: Michael Crosby +Date: Mon Jan 25 14:48:23 2016 -0800 + + Move tar copy-up for tmpfs mounts + + We cannot rely on the tar command for this type of operation because tar + versions, flags, and functionality can very from distro to distro. + Since this is in the container execution path it is not safe to have + this as a dependency from dockers POV where the user cannot change the + fact that docker is adding these pre and post mount commands. + + Signed-off-by: Michael Crosby + +commit b775efc9bc5a1dcbcd473150ecec4646af51e272 +Merge: 0b248e88ff 1350e8b7b8 +Author: Brian Goff +Date: Tue Jan 26 16:59:55 2016 -0500 + + Merge pull request #19704 from cpuguy83/speedup_build_cache + + Use imageStore.Children instead of whole the Map + +commit 0b248e88ffa20f6537dff2c4f013c5a33ffe7656 +Merge: d648a100c9 1723c6477f +Author: Antonio Murdaca +Date: Tue Jan 26 22:56:36 2016 +0100 + + Merge pull request #19734 from Microsoft/jjh/testtag + + Windows CI: Port TestTag* cli tests + +commit d648a100c9e84ce6ac3b77b2d65a5ed8a712bd29 +Merge: 4adb0fb310 7d7b2044b7 +Author: Sebastiaan van Stijn +Date: Tue Jan 26 13:51:22 2016 -0800 + + Merge pull request #19745 from cpuguy83/19625_docs_for_mount_prop_with_systemd + + Add note about mount propagation on systemd + +commit 7d7b2044b76a7f3a332f3c9bdb17dd8b4e66ee22 +Author: Brian Goff +Date: Tue Jan 26 15:53:11 2016 -0500 + + Add note about mount propagation on systemd + + Signed-off-by: Brian Goff + +commit 4adb0fb310737061c5a8f7d7264139daa4fb07e1 +Merge: fd5013e4fa 7126ecd0ad +Author: Tibor Vass +Date: Tue Jan 26 13:46:09 2016 -0800 + + Merge pull request #19723 from bboreham/not-preferred + + Stop referring to requested IP address as "preferred" + +commit fd5013e4fa18e895abd33da714189dbeb0cbf576 +Merge: 1584e63b9e ada7920479 +Author: Arnaud Porterie +Date: Tue Jan 26 13:39:51 2016 -0800 + + Merge pull request #19569 from aidanhs/aphs-fix-options-api + + Permit OPTIONS request against any url, fixes #19398 + +commit 1584e63b9e926b963fe88e22b40d4c04107050de +Merge: b5420be597 62f366490b +Author: Tibor Vass +Date: Tue Jan 26 13:14:56 2016 -0800 + + Merge pull request #19731 from albers/completion-daemon--userns-remap + + bash completion for `docker daemon --userns-remap` + +commit 15c32f39a94bb389087389e03ae4e2429dc851a0 +Author: John Howard +Date: Tue Jan 26 12:42:09 2016 -0800 + + Windows CI: Enable TestHistory* cli tests + + Signed-off-by: John Howard + +commit 84b2162c1a15256ac09396ad0d75686ea468f40c +Author: Aaron Lehmann +Date: Tue Jan 26 12:33:10 2016 -0800 + + Set idle timeouts for HTTP reads and writes in communications with the registry + + Otherwise, some operations can get stuck indefinitely when the remote + side is unresponsive. + + Fixes #12823 + + Signed-off-by: Aaron Lehmann + +commit 16bdc16dd396544fabc473cdae1d720c352345d2 +Author: Attila Kelemen +Date: Tue Jan 26 11:50:27 2016 +0100 + + Fixes #1403: PATH is wrong on Windows. + + Signed-off-by: Attila Kelemen + +commit 94e5fab5ed04a6cd47a4aa74024f79c75aadca03 +Author: John Howard +Date: Tue Jan 26 12:22:37 2016 -0800 + + Windows CI: Port TestRmi tests + + Signed-off-by: John Howard + +commit 563a4d1b9f75eed5531565e70a3518cab16fa825 +Author: Darren Stahl +Date: Thu Jan 21 13:13:37 2016 -0800 + + First batch of Windows-Windows TestBuild CI enabling + + Signed-off-by: Darren Stahl + +commit 589c8a879fea758007a36bd0f00d07aa1000d0cb +Author: Sebastiaan van Stijn +Date: Tue Jan 26 11:51:22 2016 -0800 + + Update notary to 1.10-3 in all Dockerfiles + + Signed-off-by: Sebastiaan van Stijn + +commit 04100233679124a2d0b6c622cec81954f3aaf38d +Author: Mike Dougherty +Date: Wed Jan 6 15:44:10 2016 -0800 + + Adjust version string processing for RPM build + + This will only trim off the last '-' separated token to be checked for + RC status. This allows including a 'cs#' token in the version string. + + Signed-off-by: Mike Dougherty + +commit b3aab8455d16c2ece43bb83aeba72461c7f7f3c9 +Merge: be96293bc8 c2ecf7f9f3 +Author: Alexandre Beslic +Date: Tue Jan 26 11:45:20 2016 -0800 + + Merge pull request #1677 from moxiegirl/new-navigation + + Swarm new navigation for 1.10 + +commit 730a6d2fc22f9efdb18a79b39935f1438a5e5f84 +Author: Jana Radhakrishnan +Date: Tue Jan 26 11:44:43 2016 -0800 + + Vendoring libnetwork v0.6.0-rc5 + + - Cleanup stale overlay sandboxes + + Fixes #19694 + + Signed-off-by: Jana Radhakrishnan + +commit 9e2b63e0aeec264a65c9684fe825e857c3e272d6 +Author: David Calavera +Date: Tue Jan 26 14:29:37 2016 -0500 + + Fix bash completion for `docker volume ls --dangling=false`. + + Signed-off-by: David Calavera + +commit 1350e8b7b8025d73056b800963c001fb9619a85c +Author: Brian Goff +Date: Mon Jan 25 23:37:18 2016 -0500 + + Use imageStore.Children instead of whole the Map + + daemon cache was getting the whole image map and then iterating through + it to find children. This information is already stored in the image + store. + + Prior to this change building the docker repo with a full cache took 30 + seconds. + After it takes between 15 seconds or less (As low as 9 seconds). + This is an improvement on docker 1.9.1 which hovered around 17 seconds. + + Signed-off-by: Brian Goff + +commit 4194778242de15a93a07033d869e425013f6f395 +Author: Victor Vieux +Date: Tue Jan 26 11:03:26 2016 -0800 + + fix network filter with global network + + Signed-off-by: Victor Vieux + +commit c0fe5459472b0a1c770cf0704cc58c1a1c4b2271 +Author: Tobias Munk +Date: Mon Jan 25 19:04:03 2016 +0100 + + fixed documentation about traversing yml files + + Signed-off-by: Tobias Munk + +commit 0e1bfdd43eeebe02402e9b1bb4ef995084c13676 +Author: Harald Albers +Date: Tue Jan 26 10:57:38 2016 -0800 + + Let bash completion for `docker network rm` only complete custom networks + + Signed-off-by: Harald Albers + +commit c1f3550b5442929d35d6387fc1e095ce13439b54 +Merge: 87cc809f18 a64db12c04 +Author: Ying Li +Date: Tue Jan 26 10:53:26 2016 -0800 + + Merge pull request #499 from jfrazelle/update-url + + change url from jfrazelle/go to docker/go + +commit 65584bdf2018054d0e85a3d64c46940605fd9674 +Merge: dd569065d8 d72145f618 +Author: Jeffrey Morgan +Date: Tue Jan 26 10:52:03 2016 -0800 + + Merge pull request #1371 from pra85/2016 + + Update year range to 2016 + +commit 0ba02b4a185d75343c0790bfff746f23f4c209a9 +Author: Aanand Prasad +Date: Tue Jan 26 18:48:43 2016 +0000 + + Add back external links in v2 + + Signed-off-by: Aanand Prasad + +commit 1723c6477f93c2cdb57212c188c7121211bba82b +Author: John Howard +Date: Tue Jan 26 10:41:31 2016 -0800 + + Windows CI: Port TestTag* cli tests + + Signed-off-by: John Howard + +commit b5420be597ea9ce6a0ea7f544a141711289cd3da +Merge: c56e309d05 66d24c2b44 +Author: Jess Frazelle +Date: Tue Jan 26 10:33:48 2016 -0800 + + Merge pull request #19013 from hqhq/add_support_docker_aarch64 + + Add support for build and test docker on arm64 + +commit 62f366490b87457e1fb52a09405691cc18787a2e +Author: Harald Albers +Date: Tue Jan 26 10:09:25 2016 -0800 + + bash completion for `docker daemon --userns-remap` + + Signed-off-by: Harald Albers + +commit 0aedfd201df1c6cec6ca88ca499345945ccd3ca9 +Author: S.Çağlar Onur +Date: Tue Jan 26 10:22:20 2016 -0800 + + [vmwarevsphere] Start using govmomi provided helpers + + Also update govmomi to latest revision and call Logout method when needed + + Signed-off-by: S.Çağlar Onur + +commit 8ea5051e78375b9dce7e8cd442d3e263b3b1eb02 +Author: Jessica Frazelle +Date: Tue Jan 26 10:15:47 2016 -0800 + + update tools urls and remove things we dont use + + Signed-off-by: Jessica Frazelle + +commit fde2329eaa1fab2327ae2e775af5aa04e2726ed5 +Author: Aaron Lehmann +Date: Thu Dec 10 16:48:09 2015 -0800 + + Avoid outputting last progress item twice + + A watcher would output the current progress item when it was detached, + in case it missed that item earlier, which would leave the user seeing + some intermediate step of the operation. This commit changes it to only + output it on detach if it didn't already output the same item. + + Signed-off-by: Aaron Lehmann + +commit e40a46349f348efec11bd607f10ace62313a3152 +Author: Aanand Prasad +Date: Tue Jan 26 17:41:26 2016 +0000 + + Fix rebase-bump-commit script + + Trim whitespace from wc's output before constructing arguments to `git rebase` + + Signed-off-by: Aanand Prasad + +commit bacc2b730ef6cc6ac83209e06e4ef815215c32dc +Merge: 4b84d088e0 5fe0b57e5c +Author: Aanand Prasad +Date: Tue Jan 26 17:20:40 2016 +0000 + + Merge pull request #2748 from schmunk42/master + + fixed documentation about traversing yml files + +commit c56e309d05a121a509716f887ebc9df065a8fd18 +Merge: 269a6d7d36 7ac8c77877 +Author: Jess Frazelle +Date: Tue Jan 26 09:18:29 2016 -0800 + + Merge pull request #19712 from runcom/test-requires-apparmor + + integration-cli: require Apparmor + +commit 269a6d7d3656fe7edf7cb630125ee4664dd24c78 +Merge: 7a97e938e2 e38463b277 +Author: Arnaud Porterie +Date: Tue Jan 26 09:16:57 2016 -0800 + + Merge pull request #19705 from mavenugo/18222 + + Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling. + +commit a64db12c043430d56708076ef8241ac76e958cb8 +Author: Jessica Frazelle +Date: Mon Jan 25 16:50:02 2016 -0800 + + change url from jfrazelle/go to docker/go + + Signed-off-by: Jessica Frazelle + +commit 7f708edcec8c07273dc136de4f0cbcd2ac4f2fd9 +Merge: 760d07e9dd b4209ee84b +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 17:33:50 2016 +0100 + + Merge pull request #2931 from dgageot/remove-annoying-log + + Remove spurious log that adds no value and make ITs fail sometimes because of an additional line + +commit 760d07e9dd9a8cd47a7dc4eb9dda3c2eb217977b +Merge: b6462a1969 682689e2d3 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 17:33:15 2016 +0100 + + Merge pull request #2930 from dgageot/add-it-log + + Add debug in case of IT failure + +commit 7a97e938e2229fa7a50b0f6e66c70eddcb9d2dc2 +Merge: fc8e344297 71c63aa72e +Author: Arnaud Porterie +Date: Tue Jan 26 08:27:35 2016 -0800 + + Merge pull request #19490 from cyphar/remove-dockerinit + + Remove dockerinit once and for all + +commit 7d403d09cf27dbca10b6b5cc1bd8f047cc21f1e4 +Author: Aanand Prasad +Date: Tue Jan 26 16:08:34 2016 +0000 + + Extract helper methods + + Signed-off-by: Aanand Prasad + +commit aa4d43af0b40d5c38052ec4f5015aad5d3618e89 +Author: Aanand Prasad +Date: Tue Jan 26 16:01:43 2016 +0000 + + Create declarations for named volumes + + Signed-off-by: Aanand Prasad + +commit b4209ee84b8e5dd7b949aacf7ae5f382c1593381 +Author: David Gageot +Date: Tue Jan 26 17:02:57 2016 +0100 + + Remove spurious log that adds no value and make ITs + sometimes fail because of an additional line. + + Signed-off-by: David Gageot + +commit f86fe118250fbb32ad4167c50965389763f75c01 +Author: Aanand Prasad +Date: Tue Jan 26 15:54:18 2016 +0000 + + Make sure version line is at the top of the file + + Signed-off-by: Aanand Prasad + +commit 47b22e90f95c3aeac56f42083154c327449761c3 +Author: Aanand Prasad +Date: Tue Jan 26 15:53:25 2016 +0000 + + Make warnings a bit more readable + + Signed-off-by: Aanand Prasad + +commit 4736b4409a6b752bb11f5f66611305531328909f +Author: Aanand Prasad +Date: Tue Jan 26 15:53:02 2016 +0000 + + Update for links, external_links, network_mode + + Signed-off-by: Aanand Prasad + +commit c39d5a3f06eb92fbdd5a79de7ec6707683962024 +Author: Aanand Prasad +Date: Tue Jan 26 15:51:09 2016 +0000 + + Add note about named volumes to upgrade guide + + Signed-off-by: Aanand Prasad + +commit 682689e2d39275e95b410b42b34883a9f8e47ca8 +Author: David Gageot +Date: Tue Jan 26 16:37:47 2016 +0100 + + Add debug in case of IT failure + + Signed-off-by: David Gageot + +commit b6462a1969e12925bf6fc397d146b228d2a7031e +Merge: 92faff286f 69bdb61ce6 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 16:26:43 2016 +0100 + + Merge pull request #2929 from dgageot/2705-doc-drivers + + FIX #2705 Add a command line sample for each driver + +commit 7126ecd0ad1f6188540949cbdbca20f4a75d1839 +Author: Bryan Boreham +Date: Tue Jan 26 15:13:26 2016 +0000 + + Stop referring to requested IP address as "preferred", + since it is an error if that address is unavailable. + + Signed-off-by: Bryan Boreham + +commit fc8e3442976c189cfc770ca2dcedbf68cd8a9a1b +Merge: e5b5c0ebe8 e88258ca2e +Author: Doug Davis +Date: Tue Jan 26 10:08:50 2016 -0500 + + Merge pull request #19715 from coolljt0725/fix_test_daemon + + Test utils: fix daemon start utils + +commit 92faff286fdd02df9edc46ad9f40e6a01f3c00e4 +Merge: 8f3d952242 ee9389e98c +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 15:58:45 2016 +0100 + + Merge pull request #2928 from dgageot/simpler-circleci + + Simpler circleci configuration + +commit 69bdb61ce6ea6b606315cd9e827d0ec5d7e8f5c1 +Author: David Gageot +Date: Tue Jan 26 15:41:58 2016 +0100 + + FIX #2470 document creating a bigger vbox disk + + Signed-off-by: David Gageot + +commit 75f138949aa465dd4b3da1df75abba44ff197cdf +Author: David Gageot +Date: Tue Jan 26 15:35:34 2016 +0100 + + FIX #2705 Add a command line sample for each driver + + Signed-off-by: David Gageot + +commit e5b5c0ebe80a3f65f8583ffe31eb692686965fef +Merge: 141a301dca 4f7dda3fb2 +Author: Doug Davis +Date: Tue Jan 26 09:32:52 2016 -0500 + + Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie + + Optimize `TestEventsContainerFailStartDie` + +commit ee9389e98c19375bfaebf6fadb933e7a2a25689e +Author: David Gageot +Date: Tue Jan 26 15:13:10 2016 +0100 + + Remove duplication + + Signed-off-by: David Gageot + +commit 8f009cfe8c94c0b41d96dcd672ed8c634c2022d0 +Author: David Gageot +Date: Tue Jan 26 15:13:02 2016 +0100 + + Remove unused line + + Signed-off-by: David Gageot + +commit 71c63aa72e3788af27fef0de9005cde6c7728a2b +Author: Aleksa Sarai +Date: Tue Jan 26 23:46:22 2016 +1100 + + vendor: update engine-api + + This removes all references to InitPath and InitSha1, as well as pulling + in a few other minor engine-api fixes. + + Signed-off-by: Aleksa Sarai + +commit e88258ca2ef0047973168a29fd9ec27669582c0e +Author: Lei Jitang +Date: Tue Jan 26 08:31:50 2016 -0500 + + Test utils: fix daemon start utils + + User call `Start` could with args, and the args could + contains `--storage-driver`, but in `Start`, it will add + `--storage-driver` even though user has specified `--storage-driver` + in args. + + Signed-off-by: Lei Jitang + +commit e72192be404c9a8489191d43fd6e5c429081d5c8 +Author: Aleksa Sarai +Date: Thu Jan 21 01:27:46 2016 +1100 + + *: remove documentation references to dockerinit + + While the documentation is very patchy on dockerinit, remove all + references in packaging documentation to the now purged dockerinit. + + Signed-off-by: Aleksa Sarai + +commit 4357ed4a7363a1032edf93cf03232953c805184f +Author: Aleksa Sarai +Date: Wed Jan 20 22:53:54 2016 +1100 + + *: purge dockerinit from source code + + dockerinit has been around for a very long time. It was originally used + as a way for us to do configuration for LXC containers once the + container had started. LXC is no longer supported, and /.dockerinit has + been dead code for quite a while. This removes all code and references + in code to dockerinit. + + Signed-off-by: Aleksa Sarai + +commit e38463b2779f455b4173171d5a1fdb115180a7e9 +Author: Madhu Venugopal +Date: Mon Jan 25 19:55:18 2016 -0800 + + Move port-mapping ownership closer to Sandbox (from Endpoint) + + https://github.com/docker/libnetwork/pull/810 provides the more complete + solution for moving the Port-mapping ownership away from endpoint and + into Sandbox. But, this PR makes the best use of existing libnetwork + design and get a step closer to the gaol. + + Signed-off-by: Madhu Venugopal + +commit 52e74ab7ade1dd70c98480d28bc05cd6fccc5ffc +Author: Aanand Prasad +Date: Mon Jan 25 14:27:12 2016 +0000 + + Rename 'net' to 'network mode' in various classes/methods + + Signed-off-by: Aanand Prasad + +commit 2b466858556efb990959dce36fd1301e87534700 +Author: Aanand Prasad +Date: Mon Jan 25 14:26:36 2016 +0000 + + Test that net can be extended + + Signed-off-by: Aanand Prasad + +commit 2b7306967bd0672646002e938c63377e0a833732 +Author: Aanand Prasad +Date: Mon Jan 25 12:45:30 2016 +0000 + + Implement network_mode in v2 + + Signed-off-by: Aanand Prasad + +commit 3f28472ebc136d82731ca5a88c20cabc13864925 +Author: Joffrey F +Date: Fri Jan 22 17:42:24 2016 -0800 + + Move named volumes matching to config validation phase + + Signed-off-by: Joffrey F + +commit 3da25aa463ade5813f32cbca6caedcb329d51b30 +Author: Joffrey F +Date: Fri Jan 22 16:05:21 2016 -0800 + + is_named_volume also tests for home paths ~ + + Fix bug with VolumeSpec not being updated + Fix integration test + + Signed-off-by: Joffrey F + +commit a66bf72199f2b8cb14a9256f17c97c344535e323 +Author: Joffrey F +Date: Thu Jan 21 18:03:58 2016 -0800 + + Match named volumes in service definitions with declared volumes + + Raise ConfigurationError for undeclared named volumes + Test new behavior + + Signed-off-by: Joffrey F + +commit 883227c4d841805c631c650bb96835515d59e0e9 +Author: Aanand Prasad +Date: Mon Jan 25 16:14:21 2016 +0000 + + Alias containers by short id + + Signed-off-by: Aanand Prasad + +commit 5545c55eccac1619bed2618621a2856bb79bc026 +Author: Dimitar Bonev +Date: Fri Jan 22 01:18:15 2016 +0200 + + Network fields schema validation + + Signed-off-by: Dimitar Bonev + +commit 227fa5c0dee51683d34495ac1ca97ab63c94f2e6 +Author: Joffrey F +Date: Thu Jan 21 18:07:14 2016 -0800 + + Use latest docker-py rc + + Signed-off-by: Joffrey F + +commit d399b7893f14a9089720bd882c70c2a98d18c4ed +Author: Aanand Prasad +Date: Thu Jan 21 19:15:15 2016 +0000 + + Add test for logs=False + + Signed-off-by: Aanand Prasad + + Conflicts: + compose/cli/main.py + +commit 833e16117ec942184f145d3388a9843123fa7349 +Author: Alf Lervag +Date: Tue Dec 22 11:43:48 2015 +0100 + + Fixes #2448 + + Signed-off-by: Alf Lervag + + Conflicts: + compose/cli/main.py + requirements.txt + +commit bf068a828743caa7aee49b36ed205d7ffbb5a5d4 +Author: Daniel Nephin +Date: Tue Jan 19 15:03:41 2016 -0500 + + Add stop signal to the docs. + + Signed-off-by: Daniel Nephin + +commit b1ebf5ce17288b95638dc8202c8eefb7d9c8b2cf +Author: Aanand Prasad +Date: Thu Jan 21 18:34:18 2016 +0000 + + Fix interactive run with networking + + Make sure we connect the container to all required networks *after* + starting the container and *before* hijacking the terminal. + + Signed-off-by: Aanand Prasad + +commit 836ec709793c5a417a47063f262dce229f5cd144 +Author: Aanand Prasad +Date: Thu Jan 21 18:04:50 2016 +0000 + + Stop connecting to all networks on container creation + + This relies on an Engine behaviour which is a bug, not an intentional + feature - we have to connect to networks one at a time + + Signed-off-by: Aanand Prasad + +commit 6ca410fd6b993fae0d17b43e9e34e1f149098626 +Author: Aanand Prasad +Date: Thu Jan 21 16:49:50 2016 +0000 + + Fix 'run' behaviour with networks + + - Test that one-off containers join all networks + - Don't set any aliases + + Signed-off-by: Aanand Prasad + +commit 38a6d04852e4056f7ee07fdba343f40875a6ef10 +Author: Joffrey F +Date: Wed Jan 20 11:07:28 2016 -0800 + + Update documentation for `external` param + + Signed-off-by: Joffrey F + + Conflicts: + docs/compose-file.md + +commit 0952c1bb51e85baf2942473c7261a52928f9d5c9 +Author: Aanand Prasad +Date: Thu Jan 21 13:58:01 2016 +0000 + + Add links to networks key references + + Signed-off-by: Aanand Prasad + +commit 18a1829db03aeeeac698e9e5f24ab27e75402a5a +Author: Aanand Prasad +Date: Thu Jan 21 13:55:54 2016 +0000 + + Update documentation for links + + Signed-off-by: Aanand Prasad + +commit e40de088f382d7f88b541084d8829c92cae576db +Author: Aanand Prasad +Date: Thu Jan 21 13:55:40 2016 +0000 + + Document depends_on + + Signed-off-by: Aanand Prasad + +commit 6fe54f5c24adc839683efb449b09580bf4cac299 +Author: Aanand Prasad +Date: Tue Jan 19 13:23:25 2016 +0000 + + Update Compose file documentation for version 2 + + - Explain each version in its own section + - Explain how to upgrade from version 1 to 2 + - Note which keys are restricted to particular versions + - A few corrections to the docs for version-specific keys + + Signed-off-by: Aanand Prasad + +commit 5cfd947f380632461380b1b627facea89a659d95 +Author: Aanand Prasad +Date: Thu Jan 21 15:28:40 2016 +0000 + + Stop and remove containers in parallel when scaling down + + Signed-off-by: Aanand Prasad + +commit 513a6b35cca1ab49c15723c72e8db6a3c8b7155d +Author: Aanand Prasad +Date: Thu Jan 21 15:19:55 2016 +0000 + + Fix scale when containers exit immediately + + Signed-off-by: Aanand Prasad + +commit cbec6f88348783ca49ae66f95aaef2994c5b4866 +Author: Aanand Prasad +Date: Wed Jan 20 17:08:24 2016 +0000 + + Support links in v2 files + + Signed-off-by: Aanand Prasad + +commit 76bc06b7295dd1ba765dfda78ba4cb7333a1397a +Author: Aanand Prasad +Date: Thu Jan 21 11:38:01 2016 +0000 + + Fix Windows build failures when installing dependencies from git + + Signed-off-by: Aanand Prasad + +commit c9ef1fa32f034a7a6bd84821187a2e8014e37c51 +Author: Jure Žvelc +Date: Wed Jan 20 13:01:04 2016 +0100 + + Fix for extending services written in v2 format. + Signed-off-by: Jure Žvelc + +commit c52eed66b7291d4d7a4c70d07d90ea58db9f1c03 +Author: Daniel Nephin +Date: Tue Jan 19 15:52:17 2016 -0500 + + Update tests in sort_services_test.py to use pytest. + + Signed-off-by: Daniel Nephin + +commit 3f65bdcf46556e7e309fbccc8f531cba00115fd1 +Author: Daniel Nephin +Date: Tue Jan 19 15:47:57 2016 -0500 + + Move ulimits validation to validation.py and improve the error message. + + Signed-off-by: Daniel Nephin + +commit 6e5c312768dbcdd7c6432b26e14361117adf22d0 +Author: Daniel Nephin +Date: Tue Jan 19 15:41:45 2016 -0500 + + Implement depends_on to define an order for services in the v2 format. + + Signed-off-by: Daniel Nephin + +commit 33bb7c4e026d46dda184d682c89fad7481ab1a77 +Author: Daniel Nephin +Date: Mon Jan 18 14:02:25 2016 -0500 + + Add migration script. + + Signed-off-by: Daniel Nephin + +commit bb377d3fe600bd6e89dfb720cec4d309332aa626 +Author: Aanand Prasad +Date: Tue Jan 19 11:27:27 2016 +0000 + + Fix "name is reserved" with Engine 1.10 RC1 + + Ensure link aliases are unique (this deduping was previously performed + on the server). + + Signed-off-by: Aanand Prasad + +commit 7442b416e8dcb1083fd6b570adcf340497045eb0 +Author: Aanand Prasad +Date: Tue Jan 19 10:57:12 2016 +0000 + + Test that you can set the default network to be external + + Signed-off-by: Aanand Prasad + +commit fbee4ce4b323a29052ffbb6441c0a1e283a1c2ee +Author: Aanand Prasad +Date: Mon Jan 18 19:22:04 2016 +0000 + + Catch TLSParameterErrors from docker-py + + Signed-off-by: Aanand Prasad + +commit 8398382b65bd88033c28f831e22608d53915a4f6 +Author: Steve Durrheimer +Date: Sat Jan 16 13:22:02 2016 +0100 + + Add zsh completion for 'docker-compose up --abort-on-container-exit' + + Signed-off-by: Steve Durrheimer + +commit 7dd5fd5763e68d607978367775475d47117f30e5 +Author: Steve Durrheimer +Date: Sat Jan 16 13:47:48 2016 +0100 + + Add zsh completion for 'docker-compose down' + + Signed-off-by: Steve Durrheimer + +commit d5f3826ec7374ce5b2bafc592e25268edddd9cce +Author: Steve Durrheimer +Date: Sat Jan 16 13:53:16 2016 +0100 + + Fix zsh completion to ensure we have enough commands to store in the cache + + Signed-off-by: Steve Durrheimer + +commit 20c936a25179cad087522e49e409e0ac3db7f96a +Author: Daniel Nephin +Date: Mon Jan 18 15:55:30 2016 -0500 + + Fix some bugs in release scripts. + + Signed-off-by: Daniel Nephin + +commit 4f7dda3fb29b2ac39731b1a54571ad96435fff83 +Author: Zhang Wei +Date: Tue Jan 26 19:23:18 2016 +0800 + + Optimize `TestEventsContainerFailStartDie` + + Optimize performance of `TestEventsContainerFailStartDie` + + Signed-off-by: Zhang Wei + +commit 8f3d9522424aaf8dc5dc922fb8ca3fe146b016c8 +Merge: a4d3248c88 e9294b4fcf +Author: David Gageot +Date: Tue Jan 26 12:22:53 2016 +0100 + + Merge pull request #2927 from dgageot/extra_ls_info + + Add RESPONSE time to available columns in ls + +commit 7ac8c778779253a5debff36453c9c31900e534e9 +Author: Antonio Murdaca +Date: Tue Jan 26 11:57:14 2016 +0100 + + integration-cli: require Apparmor + + Signed-off-by: Antonio Murdaca + +commit ae5b8ea8fc463ccb120a25fd43e28ba9f8e4d89f +Author: David Gageot +Date: Tue Jan 26 11:53:19 2016 +0100 + + Simplify CircleCI configuration + + Signed-off-by: David Gageot + +commit 141a301dca9ff00259157116f479e1c8405a9c14 +Merge: 613e91f36f 5ce5a8e966 +Author: Vincent Demeester +Date: Tue Jan 26 11:44:31 2016 +0100 + + Merge pull request #19154 from hqhq/hq_verify_cgroupparent + + Verify cgroup-parent name for systemd cgroup + +commit 613e91f36fca59aaa6225ff9a3acd501583e2d85 +Merge: 1f2917602e 77a0f77e7f +Author: Vincent Demeester +Date: Tue Jan 26 11:41:31 2016 +0100 + + Merge pull request #19703 from mountkin/speedup-TestEventsAttach + + optimize DockerSuite.TestEventsAttach + +commit e9294b4fcf6c5a8f18867bd941206b59aa3948c9 +Author: Nathan LeClaire +Date: Wed Jun 10 01:01:23 2015 -0700 + + Add RESPONSE time to available columns in ls + + Signed-off-by: Nathan LeClaire + + Signed-off-by: David Gageot + +commit a4d3248c8896ac4a1b47c86d24d20af1a32ac79e +Merge: 5d7afcad02 bb370d7227 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 11:33:22 2016 +0100 + + Merge pull request #2926 from jeanlaurent/enhancedoc + + Enhance globaly the documentation following #2912 + +commit 5d7afcad02bf7e32a65d34cd6ab8a6db37a8791c +Merge: 2193bd70f4 a77cb28068 +Author: David Gageot +Date: Tue Jan 26 11:31:57 2016 +0100 + + Merge pull request #2925 from jeanlaurent/vsphere-doc + + Fix #2918 and match doc with current code + +commit bb370d7227887001f2daea5c061138eee6c9bbb5 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 11:19:31 2016 +0100 + + markdown linting aws.md + + Signed-off-by: Jean-Laurent de Morlhon + +commit 52b0e19492d1e42cff2433f2a49984bb445f76a6 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 11:19:00 2016 +0100 + + Added lost feedback by @dgageot and myself on overview + + Signed-off-by: Jean-Laurent de Morlhon + +commit 33280206546b44c573bb849a4846ae3d08ccbc05 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 11:18:27 2016 +0100 + + Typo in index + + Signed-off-by: Jean-Laurent de Morlhon + +commit 1f2917602e5319a5d6d26caa52e7c964f120b5e5 +Merge: cca1e5b2eb 1d8ccc6ae7 +Author: Antonio Murdaca +Date: Tue Jan 26 11:01:23 2016 +0100 + + Merge pull request #19103 from vdemeester/events-with-attributes + + Add the possibility to log event with specific attributes + +commit a77cb28068ed0a960f3bd5d9e623a1b48a0340bb +Author: Jean-Laurent de Morlhon +Date: Tue Jan 26 10:57:53 2016 +0100 + + Fix #2918 and match doc with current code + + Signed-off-by: Jean-Laurent de Morlhon + +commit cca1e5b2eb06e879d4a2ba295fa77e8b93c6ff0e +Merge: 4158b671f3 e5e90347d2 +Author: Vincent Demeester +Date: Tue Jan 26 10:57:17 2016 +0100 + + Merge pull request #19706 from pwnall/patch-2 + + Add missing words in selectadriver.md + +commit 4158b671f3c5ac13605892aa31c0a9ed22f2e8fd +Merge: 07e2dedecb 5a363ce60b +Author: Vincent Demeester +Date: Tue Jan 26 10:55:43 2016 +0100 + + Merge pull request #19701 from aaronlehmann/remove-downloads-on-error + + Remove temporary layer download file on error + +commit 07d2c31810feca8d0c9a04e0da71fa9322bce37e +Author: Wen Cheng Ma +Date: Tue Jan 26 14:53:10 2016 +0800 + + Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress + + Signed-off-by: Wen Cheng Ma + +commit 07e2dedecb3a0b7381ebf0f8fb4d08d082754cd0 +Merge: c5380f9118 61a49bb6ba +Author: Tibor Vass +Date: Mon Jan 25 22:45:06 2016 -0800 + + Merge pull request #19057 from dnephin/remove_version_from_registry_pkg + + Remove dockerversion from registry package + +commit c5380f9118e3fede06864346509743b511d91477 +Merge: 5b0183e91c bed0bb7d01 +Author: Arnaud Porterie +Date: Mon Jan 25 22:18:56 2016 -0800 + + Merge pull request #19468 from jfrazelle/refactor-sec-profiles-into-own-pkg + + Refactor sec profiles their own packages + +commit e5e90347d28c11b6000cb5471454d24f3aa8b421 +Author: Victor Costan +Date: Tue Jan 26 01:04:28 2016 -0500 + + Add missing words in selectadriver.md + + Signed-off-by: Victor Costan + +commit c583063014d6ed90ccfc3f254ab697d6aed1c06c +Author: Ying Li +Date: Mon Jan 25 21:07:36 2016 -0800 + + Do not run all the tests when testing yubikey hardware. + + The tests take forever, since it *cannot* be parallelized at all, and there + can only be one build at a time. + + Signed-off-by: Ying Li + +commit 08d1f035f070c9bbeed1610629ef7920a4621e1b +Author: Derek McGowan +Date: Mon Jan 25 20:12:07 2016 -0800 + + Update create token to auth/token types + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit fd17443988ed5f1b32463b78f4847dbc8e8131ac +Author: Derek McGowan +Date: Mon Jan 25 20:11:41 2016 -0800 + + Update token header struct to use json.RawMessage pointer + + Since RawMessage json receivers take a pointer type, the Header structure should use points in order to call the json.RawMessage marshal and unmarshal functions + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 7029d9e6ad766492c2619084c13a8ef88167eddf +Author: Madhu Venugopal +Date: Mon Jan 25 19:51:21 2016 -0800 + + Vendor libnetwork v0.6.0-rc4 + + - Add Endpoints() API to Sandbox interface + - Fixes #19677 + + Signed-off-by: Madhu Venugopal + +commit 5b0183e91c173c06bcbb5d53da03f13519c14c87 +Merge: 58c2488d07 c539be8833 +Author: Sebastiaan van Stijn +Date: Mon Jan 25 18:59:20 2016 -0800 + + Merge pull request #19683 from calavera/network_config_file + + Allow network configuration via daemon config file. + +commit 77a0f77e7f605cfe322ce66cf69b3571293a7aeb +Author: Shijiang Wei +Date: Tue Jan 26 10:45:45 2016 +0800 + + optimize DockerSuite.TestEventsAttach + + Signed-off-by: Shijiang Wei + +commit 4b84d088e0468d2db0d130b8f6091ffc2bea73b7 +Merge: a267d8fe3c ed1b204804 +Author: Joffrey F +Date: Mon Jan 25 18:26:35 2016 -0800 + + Merge pull request #2743 from aanand/network-mode + + Implement network_mode option + +commit 5a363ce60bee3dc26a433c7e2cee6dc76939849e +Author: Aaron Lehmann +Date: Mon Jan 25 18:20:18 2016 -0800 + + Remove temporary layer download file on error + + Currently, the temporary file storing downloaded layer data is only + removed after a successful download or a digest verification error. A + transport-level error does not cause it to be removed. This is a + regression from 1.9 that could cause disk usage to grow until the Docker + daemon is restarted. + + Signed-off-by: Aaron Lehmann + +commit 58c2488d07f4c984c853ca4b4a5c86b55c4c784c +Merge: ced2d37901 dd7d1c8a02 +Author: Tibor Vass +Date: Mon Jan 25 18:13:57 2016 -0800 + + Merge pull request #19568 from cpuguy83/17907_fix_rmv + + On container rm, don't remove named mountpoints + +commit 87cc809f184ae7300d01b940a9fe56a4d2a5e572 +Merge: ffe603a968 12d3eb49ae +Author: Riyaz Faizullabhoy +Date: Mon Jan 25 17:24:32 2016 -0800 + + Merge pull request #491 from docker/tuf-update-logs + + allow for configurable log level, change default for CLI + +commit ced2d37901588f5dc8b94a45bb8686e8fbb943a4 +Merge: 2cb8fdd327 722fac7a73 +Author: Tibor Vass +Date: Mon Jan 25 17:13:49 2016 -0800 + + Merge pull request #19687 from tianon/debian-wheezy + + Change the way we install from backports in the deb builder (to force deps too) + +commit 0857d026bccbb37a6da09a8e1d08735a643aa5ab +Author: Mike Goelzer +Date: Sat Jan 16 10:02:36 2016 -0800 + + Improve CONTRIBUTING.md for beginners + + Signed-off-by: Mike Goelzer + +commit 2cb8fdd3279344b10b0ba651ca42ea38fd88c42f +Merge: d4ccd948e9 733245b2e7 +Author: Tibor Vass +Date: Mon Jan 25 16:50:47 2016 -0800 + + Merge pull request #19673 from aboch/epcs + + Save endpoint config only if endpoint creation succeeds + +commit be96293bc8f61e4a68f6a940691d4b1399371aac +Merge: cc4eea83da abffebf09e +Author: Dongluo Chen +Date: Mon Jan 25 16:50:32 2016 -0800 + + Merge pull request #1683 from dongluochen/invalidEngine + + Provide error when engine version is unsupported + +commit d4ccd948e9db3ed8d27ec53d738133fd11fec454 +Merge: 8d096114f2 0eed34755e +Author: David Calavera +Date: Mon Jan 25 16:44:25 2016 -0800 + + Merge pull request #19676 from cpuguy83/19672_fix_force_rm + + Fix removing mountpoints on container rm fail + +commit 004973b5fa9db5b765d4fce776ed4045f5d7b347 +Author: French Ben +Date: Mon Jan 25 15:45:22 2016 -0800 + + Added view menu refresh option - Should help Fixes #1174 :8ball: + + Signed-off-by: French Ben + +commit 774b66c9fe02d8736c0e1974db8672527403ff97 +Author: Riyaz Faizullabhoy +Date: Thu Jan 21 17:13:49 2016 -0800 + + delegations CLI UX improvements + + Signed-off-by: Riyaz Faizullabhoy + +commit 12d3eb49ae034a5ed328b926b7db53bc2819dd73 +Author: Riyaz Faizullabhoy +Date: Thu Jan 21 16:22:24 2016 -0800 + + Change default log level to fatal, change verbose to error level and add + debug flag for debug level + + Signed-off-by: Riyaz Faizullabhoy + +commit 8d096114f2d30afb1c007da3fb99a04d65f5dbcd +Merge: 2b97c96742 6ac9a2f410 +Author: Sebastiaan van Stijn +Date: Mon Jan 25 16:07:56 2016 -0800 + + Merge pull request #19680 from mavenugo/rc2-vin + + Vendor libnetwork v0.6.0-rc3 + +commit abffebf09e721b6e8a47aa5cb21d455855cf7419 +Author: Dong Chen +Date: Mon Jan 25 15:58:48 2016 -0800 + + Provide error when engine version is unsupported. + + Signed-off-by: Dong Chen + +commit ffe603a968ed4b537f7e885e589a3aca10601383 +Merge: 20648f18e9 a1aa4d7078 +Author: Diogo Mónica +Date: Mon Jan 25 15:56:35 2016 -0800 + + Merge pull request #498 from docker/integration-test-fix + + Root is always on disk unless restored from backup, in which case it may only be on a yubikey + +commit ed1b2048040680ecfde8c5be4c3a66671d5cb068 +Author: Aanand Prasad +Date: Mon Jan 25 14:27:12 2016 +0000 + + Rename 'net' to 'network mode' in various classes/methods + + Signed-off-by: Aanand Prasad + +commit a9c623fdf2e36531d3811c676f41317daf9c7b34 +Author: Aanand Prasad +Date: Mon Jan 25 14:26:36 2016 +0000 + + Test that net can be extended + + Signed-off-by: Aanand Prasad + +commit c539be88332815aeb2d466a973443127c1c676a6 +Author: David Calavera +Date: Mon Jan 25 16:30:33 2016 -0500 + + Allow network configuration via daemon config file. + + Signed-off-by: David Calavera + +commit 2b97c9674258e0dc0b36526176b2f2cea85b40fe +Merge: 31adcc96d0 e25d47db27 +Author: Sebastiaan van Stijn +Date: Mon Jan 25 15:46:56 2016 -0800 + + Merge pull request #19074 from arun-gupta/couchbase + + adding docs for Dockerizing Couchbase service + +commit eaa9da0be33bf7c4d8cd7c1131a5f38ac3af06aa +Author: Derek McGowan +Date: Mon Jan 25 15:42:05 2016 -0800 + + Add simple implementation of token server + + Token server implementation currently functional with existing docker 1.9.x release and latest distribution release. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 31adcc96d0d2fd796d3ec204f0dd827f3e63d64a +Merge: f7abff4f81 3e2b50ccaa +Author: Sebastiaan van Stijn +Date: Mon Jan 25 15:37:47 2016 -0800 + + Merge pull request #19682 from aaronlehmann/transfer-release-race + + Fix watching a released transfer + +commit e566a4dc1c722b997890c2ab83bb5ad1e8b8f852 +Author: Aanand Prasad +Date: Mon Jan 25 12:45:30 2016 +0000 + + Implement network_mode in v2 + + Signed-off-by: Aanand Prasad + +commit a267d8fe3c594977ef00576c36249254053c3d0d +Merge: af6b18cad8 139c7f7830 +Author: Aanand Prasad +Date: Mon Jan 25 23:24:09 2016 +0000 + + Merge pull request #2728 from shin-/2709_service_volumes + + Match named volumes in service definitions with declared volumes + +commit a1aa4d707869e96c3ee504fec5fc5acad59164dc +Author: Ying Li +Date: Mon Jan 25 15:18:24 2016 -0800 + + Attempt to simplify pushing to codecov, since codecov can do merges. + + Signed-off-by: Ying Li + +commit f7abff4f818847694f4a9beeeef63879d28e0e60 +Merge: 0f0c35960f cfa515fd9d +Author: Tibor Vass +Date: Mon Jan 25 14:57:51 2016 -0800 + + Merge pull request #19560 from aboch/mn + + Reject multiple networks on container creation request + +commit 722fac7a730e16c65ccd60ce5d1d7924dd6520bf +Author: Tianon Gravi +Date: Mon Jan 25 14:49:05 2016 -0800 + + Change the way we install from backports in the deb builder (to force deps too) + + Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install). + + Signed-off-by: Andrew "Tianon" Page + +commit 0f0c35960f4c8ce74cdbe2626a6b3d115e9a7c14 +Merge: cf44f17258 8a68315c38 +Author: Antonio Murdaca +Date: Mon Jan 25 23:47:57 2016 +0100 + + Merge pull request #19674 from tonistiigi/19652-fix-create-error-message + + Fix error message in container creation + +commit cf44f17258cab10704ed0eff48f8e129eaa9874b +Merge: 156e2f0e5c 6bf5b3db9a +Author: David Calavera +Date: Mon Jan 25 14:24:46 2016 -0800 + + Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue + + Optimize TestEventsOOMDisableTrue + +commit 156e2f0e5c2190a31caef9d91116ee1008ee27e3 +Merge: 268a20af95 11a51649cf +Author: Sebastiaan van Stijn +Date: Mon Jan 25 14:14:00 2016 -0800 + + Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf + + Update registry version in Dockerfile.armhf + +commit 2193bd70f4e8fa0c0f270a3a32c7c30829d89e60 +Merge: 18509f5ec4 cff41ab15b +Author: Nathan LeClaire +Date: Mon Jan 25 13:59:30 2016 -0800 + + Merge pull request #2919 from ack/patch-1 + + Add CLC to available drivers + +commit 18509f5ec426a78ff4a6bb5c6d6fea61ab317897 +Merge: b9d470f975 5d95524be6 +Author: Nathan LeClaire +Date: Mon Jan 25 13:57:33 2016 -0800 + + Merge pull request #2875 from dgageot/bats-in-go + + Write CLI integration tests with Go + +commit af6b18cad83228e8e9d398bed6bd99282a5d615d +Merge: 3fff286e1a 313c584185 +Author: Joffrey F +Date: Mon Jan 25 13:55:30 2016 -0800 + + Merge pull request #2746 from aanand/alias-containers-by-short-id + + Alias containers by short id + +commit 268a20af952fc47705d4698237d874726db3df8c +Merge: 15cc67b73d f6c20d9b22 +Author: Tibor Vass +Date: Mon Jan 25 13:53:51 2016 -0800 + + Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers + + Add back compat for volume drivers `Get` and `Ls` + +commit 733245b2e7517b88cdfb188f9d8418f29bca6338 +Author: Alessandro Boch +Date: Mon Jan 25 11:14:29 2016 -0800 + + Save endpoint config only if endpoint creation succeeds + + - Currently it is being save upfront... + + Signed-off-by: Alessandro Boch + +commit b51d1e8cf850b469d709c8ef2d95e502cf3a12fb +Author: Ying Li +Date: Mon Jan 25 12:13:02 2016 -0800 + + Root is always on disk unless restored from backup. + (In which case if Yubikey is available, it will only be on the Yubikey and not on disk.) + + Signed-off-by: Ying Li + +commit cff41ab15b93967c59a4a492c2cf5071a3d7855a +Author: albert +Date: Mon Jan 25 13:31:08 2016 -0800 + + Update AVAILABLE_DRIVER_PLUGINS.md + + Signed-off-by: Albert Choi + +commit 3e2b50ccaadb5ecbd70bf27adc287973f0417573 +Author: Aaron Lehmann +Date: Mon Jan 25 11:37:09 2016 -0800 + + Fix watching a released transfer + + Things could go wrong if Watch was called after the last existing + watcher was released. The call to Watch would succeed even though it was + not really adding a watcher, and the corresponding call to Release would + close hasWatchers a second time. + + The fix for this is twofold: + + 1. We allow transfers to gain new watchers after the watcher count has + touched zero. This means that the channel returned by Released should + not be closed until all watchers have been released AND the transfer is + no longer tracked by the transfer manager, meaning it won't be possible + for additional calls to Watch to race with closing the channel returned + by Released. + + The Transfer interface has a new method called Close so the transfer can + know when the transfer manager no longer references it. + + Remove the Cancel method. It's not used and should not be exported. + + 2. Even though (1) makes it possible to add watchers after all the + previous watchers have been released, we want to avoid doing this in + practice. A transfer that has had all its watchers released is in the + process of being cancelled, and attaching to one of these will never be + the correct behavior. Add a check if a watcher is attaching to a + cancelled transfer. In this case, wait for the transfer to be removed + from the map and try again. This will ensure correct behavior when a + watcher tries to attach during the race window. + + Either (1) or (2) should be sufficient to fix the race involved here, + but the combination is the most correct approach. (1) fixes the + low-level plumbing to be resilient to the race condition, and (2) avoids + using it in a racy way. + + Fixes #19606 + + Signed-off-by: Aaron Lehmann + +commit 1431b623a4809ec3992a357387037366ab083548 +Author: David Calavera +Date: Mon Jan 25 14:39:41 2016 -0500 + + Make volume dangling filter return only used volumes with `dangling=false`. + + Signed-off-by: David Calavera + +commit 6ac9a2f410ad506204faf8f22fc502dc780e3986 +Author: Madhu Venugopal +Date: Mon Jan 25 13:22:47 2016 -0800 + + Vendor libnetwork v0.6.0-rc3 + + - Fixes docker/docker#19576 + - Fixed embedded DNS to listen in TCP as well + - Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests + + Signed-off-by: Madhu Venugopal + +commit b9d470f975b2f1cde857071fb23d995132af0f32 +Merge: 323fadd931 24eab71d4c +Author: David Gageot +Date: Mon Jan 25 21:59:06 2016 +0100 + + Merge pull request #2911 from daehyeok/return_vboxlog + + return last vbox log instead of error state code + +commit dd7d1c8a02d8693aa4f381f82c5bbdcad9a5ff58 +Author: Brian Goff +Date: Thu Jan 21 21:57:53 2016 -0500 + + On container rm, don't remove named mountpoints + + This makes it so when calling `docker run --rm`, or `docker rm -v`, only + volumes specified without a name, e.g. `docker run -v /foo` instead of + `docker run -v awesome:/foo` are removed. + + Note that all volumes are named, some are named by the user, some get a + generated name. This is specifically about how the volume was specified + on `run`, assuming that if the user specified it with a name they expect + it to persist after the container is cleaned up. + + Signed-off-by: Brian Goff + +commit cfa515fd9d1530bd84e98c6d6564e641dcb2d0fe +Author: Alessandro Boch +Date: Thu Jan 21 14:24:35 2016 -0800 + + Reject multiple networks on container creation + + Signed-off-by: Alessandro Boch + +commit 0eed34755e3493dbb6204cb378228e72750609e5 +Author: Brian Goff +Date: Mon Jan 25 15:44:59 2016 -0500 + + Fix removing mountpoints on container rm fail + + Ensure that the the container's mountpoints are cleaned up if the + container is force removed. + + Signed-off-by: Brian Goff + +commit 24eab71d4ce685571f5e09c5366769ecec2f6688 +Author: Daehyeok Mun +Date: Sat Jan 23 22:27:28 2016 -0700 + + retutn last vbox log instead of error state code + return last line in the vbox log file instead of error state code when + virtualbox vm start faile + + Signed-off-by: Daehyeok Mun + +commit 323fadd931d25d647881487044430643bd919285 +Merge: 3255a90d0c 8d928c7f20 +Author: Olivier Gambier +Date: Mon Jan 25 11:56:39 2016 -0800 + + Merge pull request #2884 from hypriot/introduce-appveyor + + Add appveyor.yml for native windows tests + +commit 8a68315c38d7e62b140e145766e842de07d0422d +Author: Tonis Tiigi +Date: Mon Jan 25 11:45:20 2016 -0800 + + Fix error message in container creation + + Error message was different if image was specified with the full ID. + + Fixes #19652 + + Signed-off-by: Tonis Tiigi + +commit 15cc67b73d619cf2a624146b4c19855117f1a842 +Merge: 997e61add9 011b4f01f4 +Author: David Calavera +Date: Mon Jan 25 11:12:16 2016 -0800 + + Merge pull request #19615 from runcom/add-registry-with-auth-testsuite + + integration-cli: add suite for testing registries with auth + +commit 997e61add95c26987f56c9b096f6b5ed93641184 +Merge: 7e1b0ea5d7 73849a5c82 +Author: Brian Goff +Date: Mon Jan 25 14:04:54 2016 -0500 + + Merge pull request #19658 from wenchma/19425-daemon_ipv6 + + Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR + +commit 7e1b0ea5d770c8bf0af07f6b512e66daef44d04f +Merge: d02ed72e30 42f6e8d40d +Author: David Calavera +Date: Mon Jan 25 11:02:24 2016 -0800 + + Merge pull request #19629 from thaJeztah/fix-api-order + + Fix remove API order in menu + +commit 5fe0b57e5c078e7ba3c7dd8605e4968559c6fa24 +Author: Tobias Munk +Date: Mon Jan 25 19:04:03 2016 +0100 + + fixed documentation about traversing yml files + + Signed-off-by: Tobias Munk + +commit 20648f18e91da0a32f46c14a51c89b2775d2b109 +Merge: 3c874f3080 3cd3614de6 +Author: Riyaz Faizullabhoy +Date: Mon Jan 25 09:21:06 2016 -0800 + + Merge pull request #497 from HuKeping/work-branch + + Tiny refactor + +commit d02ed72e304140c5c8f645af3f61f38ba2ab4c72 +Merge: 48d7cbea55 0f379fab31 +Author: Brian Goff +Date: Mon Jan 25 12:12:47 2016 -0500 + + Merge pull request #19666 from jfrazelle/19620-fix-url + + add trailing slash + +commit 48d7cbea555f4d7dd7d2834a6a8bf2d49c627dde +Merge: 9211fc36a9 c983996e0b +Author: Brian Goff +Date: Mon Jan 25 12:08:24 2016 -0500 + + Merge pull request #19663 from mountkin/speedup-TestDaemonRestartWithContainerRunning + + speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning + +commit 3255a90d0c97225cd0c7ac4a91eec9d1e2e45e71 +Merge: 9e83c68f1b 338a987699 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 18:04:50 2016 +0100 + + Merge pull request #2912 from moxiegirl/new-navigation + + New navigation for 1.10 Release + +commit 0f379fab3195f70f8e565d1deab6051828254a6e +Author: Jessica Frazelle +Date: Mon Jan 25 09:01:46 2016 -0800 + + add trailing slash + + Signed-off-by: Jessica Frazelle + +commit 338a9876993b6bf9f4eceb5673f58db6fb3865f1 +Author: Mary Anthony +Date: Sun Jan 24 13:09:31 2016 -0800 + + New navigation for 1.10 Release + Removing unneeded processing script + + Signed-off-by: Mary Anthony + +commit 313c584185f3999eb7a9ad0b7792a251b0afcbf8 +Author: Aanand Prasad +Date: Mon Jan 25 16:14:21 2016 +0000 + + Alias containers by short id + + Signed-off-by: Aanand Prasad + +commit 6bf5b3db9a06e07591675957c48de8b91eeb21b8 +Author: Zhang Wei +Date: Sun Jan 24 11:27:39 2016 +0800 + + Optimize slow integration test + + Optimize `TestEventsOOMDisableTrue` performance + + It's part of #19425 issue. + + Signed-off-by: Zhang Wei + +commit c983996e0bdc3becd3c7bf79329ad367b9f1a8b1 +Author: Shijiang Wei +Date: Mon Jan 25 23:45:13 2016 +0800 + + speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning + + Signed-off-by: Shijiang Wei + +commit 73849a5c82ed816348179bd0ea6461ec8941cc04 +Author: Wen Cheng Ma +Date: Mon Jan 25 17:23:21 2016 +0800 + + Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac + + Signed-off-by: Wen Cheng Ma + +commit 9e83c68f1b238a6079a3188cd1ede407d722f369 +Merge: dd3b66e3b6 9de45af808 +Author: David Gageot +Date: Mon Jan 25 16:41:50 2016 +0100 + + Merge pull request #2917 from jeanlaurent/FIX-2860 + + Fix #2860 + +commit 5d95524be6ba4006d4880207909ee4de5f32cbb2 +Author: David Gageot +Date: Tue Jan 19 16:54:03 2016 +0100 + + Write CLI integration tests with Go + + Signed-off-by: David Gageot + +commit 9de45af80836e80d8df89f9dcc1f442688204c78 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 16:11:17 2016 +0100 + + Fix #2860 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 8d928c7f20fc2e429d7b48c1f6f912f4d1c43ba6 +Author: Stefan Scherer +Date: Wed Jan 20 11:56:43 2016 +0100 + + Add appveyor.yml for native windows tests + + Signed-off-by: Stefan Scherer + +commit dd3b66e3b6be61dac17524c0358741ff867d31dc +Merge: 01f4ffd21f b6b99747bf +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 15:52:15 2016 +0100 + + Merge pull request #2916 from dgageot/vbox-logs + + Add more logs, specially for windows users + +commit 73a0d8307596bfe5954729d71672436024c54589 +Author: Harald Albers +Date: Mon Jan 25 10:34:29 2016 +0100 + + Fix computation of service list in bash completion + + The previous approach assumed that the service list could be extracted + from a single file. It did not follow extends and overrides. + + Signed-off-by: Harald Albers + +commit 3fff286e1ab249650b1ac070ee107eeb75a10e47 +Merge: 35788f47ff 3a72edb906 +Author: Aanand Prasad +Date: Mon Jan 25 14:39:54 2016 +0000 + + Merge pull request #2727 from dbonev/2703-strict-validation-of-networks + + Network fields schema validation + +commit 01f4ffd21ff78bca5b531f62d7c0aaff2f170fca +Merge: a9cbd71d94 01bd88f6a5 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 15:39:51 2016 +0100 + + Merge pull request #2752 from dgageot/google-reuse + + Support creating a machine from an existing google VM + +commit a9cbd71d94ad41d328a4f5163fbc7a92f0b51db4 +Merge: e42734f2aa 9f63456a76 +Author: David Gageot +Date: Mon Jan 25 15:36:42 2016 +0100 + + Merge pull request #2915 from jeanlaurent/fix-985 + + FIX #494 - Use same binary filename scheme as other docker-project + +commit 9211fc36a95c0a05a3dffd95b287044394f8ebc0 +Merge: 5719dca1d7 490ea6961c +Author: Brian Goff +Date: Mon Jan 25 09:28:26 2016 -0500 + + Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link + + Add zsh completion for 'docker cp -L --follow-link' + +commit b6b99747bfaaa3d536fb26dc8d9b024c70a6e1f1 +Author: David Gageot +Date: Mon Jan 25 15:01:36 2016 +0100 + + Add more logs, specially for windows users + + Signed-off-by: David Gageot + +commit 9f63456a767e867ca094bb4d62b6af58eabf1d5a +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 12:07:10 2016 +0100 + + Update documentation and release note template + + Signed-off-by: Jean-Laurent de Morlhon + +commit ff18c1b7d071967b869f56a8bc12059596ba02f8 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 12:06:45 2016 +0100 + + Fix #494 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 01bd88f6a534592fb93f6172ab41dcd956e8f7d4 +Author: David Gageot +Date: Wed Jan 6 08:58:55 2016 +0100 + + Support creating a machine on an existing google VM + + Signed-off-by: David Gageot + +commit 381d58bc661e013041a354de70b1464c4eecc79b +Author: Steve Durrheimer +Date: Mon Jan 25 10:27:21 2016 +0100 + + Add zsh completion for 'docker-compose create' + + Signed-off-by: Steve Durrheimer + +commit 5719dca1d7a4aab0abbb8bd7a4d6e09c65c678ea +Merge: 9609cb7344 b3cd453b84 +Author: Sebastiaan van Stijn +Date: Mon Jan 25 01:21:57 2016 -0800 + + Merge pull request #19657 from sdurrheimer/zsh-completion-new-syslog-over-tls-options + + Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cer… + +commit 9609cb73447d3a35b689e5dea04ef40b89ba4115 +Merge: 714587196b 995d1d09ce +Author: Sebastiaan van Stijn +Date: Mon Jan 25 01:21:23 2016 -0800 + + Merge pull request #19656 from sdurrheimer/zsh-completion-daemon-cluster-store-opt + + Add zsh completion for new 'docker daemon --cluster-store-opt discove… + +commit 7f3a319ecc2c110730753bb2799c5151b5731111 +Author: Harald Albers +Date: Mon Jan 25 10:15:14 2016 +0100 + + bash completion for `docker-compose create` + + Signed-off-by: Harald Albers + +commit e42734f2aad5021878d33ddd4ffbc0c652728dc9 +Merge: 8977d29bae c2c561d804 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 25 10:06:55 2016 +0100 + + Merge pull request #2914 from cyphar/fix-dockerfile + + Dockerfile: use COPY + +commit 8977d29bae7985fdc90adfb5593bcf5bb8705064 +Merge: 6588968fb5 5b2c52c409 +Author: David Gageot +Date: Mon Jan 25 10:04:21 2016 +0100 + + Merge pull request #2902 from jeanlaurent/ls-single-line + + Fix #2888 - Multi-line errors in ls mess with tab writing + +commit 5b2c52c40904fcb5e360e90845193837e18ab2bb +Author: Jean-Laurent de Morlhon +Date: Fri Jan 22 13:41:16 2016 +0100 + + Fix #2888 - Multi-line errors in ls mess with tab writing + + Signed-off-by: Jean-Laurent de Morlhon + +commit c2c561d804782c53af8c2c9719417cc4cd0546c2 +Author: Aleksa Sarai +Date: Mon Jan 25 19:40:21 2016 +1100 + + Dockerfile: use COPY + + ADD is far too magical, and we should be steering people away from it, + so using it in an official Docker project sends a mixed message. + + Signed-off-by: Aleksa Sarai + +commit b3cd453b8447d3d30457f3cbe6839e0b85110a02 +Author: Steve Durrheimer +Date: Mon Jan 25 08:21:15 2016 +0100 + + Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify' options + + Signed-off-by: Steve Durrheimer + +commit 995d1d09ce37c4bdf67fa6dbef6e572a23f866f6 +Author: Steve Durrheimer +Date: Mon Jan 25 08:14:46 2016 +0100 + + Add zsh completion for new 'docker daemon --cluster-store-opt discovery.heartbeat discovery.ttl kv.path' options + + Signed-off-by: Steve Durrheimer + +commit 3cd3614de6496ba109ccb0a05804f260883de0b4 +Author: HuKeping +Date: Mon Jan 25 15:14:08 2016 +0800 + + Tiny refactor + + Just to keep consistent with the others. + + Signed-off-by: Hu Keping + +commit 490ea6961ca1288ccd6165503164e3231dbbf947 +Author: Steve Durrheimer +Date: Mon Jan 25 08:09:30 2016 +0100 + + Add zsh completion for 'docker cp -L --follow-link' + + Signed-off-by: Steve Durrheimer + +commit 714587196b4673f1a9522b39de3db975e6cf293e +Merge: 96009914b0 6b28e1bbe2 +Author: Brian Goff +Date: Sun Jan 24 20:58:33 2016 -0500 + + Merge pull request #19643 from albers/completion-nospace + + fix minor bash completion issue on OSX (compopt) + +commit 686f74385638d826b7b80d9f6a02b86f318fa0a3 +Author: 易嘉 +Date: Sun Jan 24 23:46:09 2016 +0800 + + fix images affinity + + Signed-off-by: 易嘉 + +commit f01a776f4dbf65cbbf34e4e119d4326bc058c411 +Author: Mary Anthony +Date: Sun Jan 24 13:29:18 2016 -0800 + + New navigation for the 2/4 release of 1.10 + Fixing the location on the larger menu + + Signed-off-by: Mary Anthony + +commit 96009914b0a4cc6d40f5dc5fc955eace90871004 +Merge: 84e4fb8b0a 5601fc8507 +Author: Vincent Demeester +Date: Sun Jan 24 22:19:23 2016 +0100 + + Merge pull request #19639 from Microsoft/jjh/incontainerlogic + + Windows CI: In container logic flaw + +commit 84e4fb8b0a703e617dc2f50755f704ec71621712 +Merge: 0764706dcc 6723c8aa26 +Author: Vincent Demeester +Date: Sun Jan 24 22:14:54 2016 +0100 + + Merge pull request #19641 from albers/completion-syslog-tls + + bash completion for syslog over TLS log driver + +commit 0764706dcc63b198449a6d912c965ee6f9fb3a9d +Merge: 460f491457 17eb18899e +Author: Antonio Murdaca +Date: Sun Jan 24 22:12:37 2016 +0100 + + Merge pull request #19636 from albers/completion-daemon--cluster-store-opt + + bash completion for new `--cluster-store-opt` values + +commit 460f4914576041c031fd77e9f46a6238d2415563 +Merge: a3cfdb5a31 1bd5424c38 +Author: Vincent Demeester +Date: Sun Jan 24 22:10:23 2016 +0100 + + Merge pull request #19642 from albers/completion-tag-f + + Remove completion for `docker tag -f` + +commit a3cfdb5a31c3475894f9104215c138cf4cb3679e +Merge: 672ca81869 0f654bb5eb +Author: Antonio Murdaca +Date: Sun Jan 24 22:04:56 2016 +0100 + + Merge pull request #19633 from albers/completion-ps-filter-dead + + bash completion for `docker ps --filter status=dead` + +commit 672ca818692a58c7a4f645b8751a4e104f781ed4 +Merge: 65530f8014 7b3058b864 +Author: Antonio Murdaca +Date: Sun Jan 24 22:04:26 2016 +0100 + + Merge pull request #19632 from albers/completion-cp--follow-link + + bash completion for `docker cp --follow-link` + +commit 65530f8014c22883ffb7cf54952013bbfd11fce3 +Merge: 7aafa76662 7f345f2ec4 +Author: Antonio Murdaca +Date: Sun Jan 24 22:04:00 2016 +0100 + + Merge pull request #19634 from albers/completion-images--filter-dangling + + bash completion for `docker images --filter dangling=false` + +commit 001903771260069c475738efbbcb830dd9cf8227 +Author: jrabbit +Date: Sun Jan 24 15:25:06 2016 -0500 + + Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior + + Signed-off-by: jrabbit + +commit 3c874f3080729b3db42fc67b15eb9a3a77841705 +Merge: 341bd335f5 d38d7ceb89 +Author: David Lawrence +Date: Sun Jan 24 11:10:31 2016 -0800 + + Merge pull request #474 from endophage/consistent + + Consistent TUF Files + +commit d38d7ceb8903c1d107399c0da884885f3d630e42 +Author: David Lawrence +Date: Fri Jan 22 14:31:11 2016 -0800 + + moving checksum after role in urls. We're breaking with spec for an easier to manage filename system + Signed-off-by: David Lawrence (github: endophage) + +commit adfbe6938eef31ba19aabdedf740618d1cd11516 +Author: David Lawrence +Date: Thu Jan 21 11:30:41 2016 -0800 + + cleaning up logging + Signed-off-by: David Lawrence (github: endophage) + +commit 27961b010e2f2eedcd58202bac747458ccc773dc +Author: David Lawrence +Date: Wed Jan 20 10:12:09 2016 -0800 + + negative tests for get by checksum + Signed-off-by: David Lawrence (github: endophage) + +commit 473876079471607c202acc239e9f935f351a52e1 +Author: David Lawrence +Date: Mon Jan 18 17:09:05 2016 -0800 + + get by checksum + Signed-off-by: David Lawrence (github: endophage) + +commit 6f7acb6ddf8a64fe8e36b34dc87ce84cb0bd0f8f +Author: David Lawrence +Date: Fri Jan 15 16:23:38 2016 -0800 + + adding server logic for clients to request consistent TUF files + Signed-off-by: David Lawrence (github: endophage) + +commit 6b28e1bbe21b25384c069b99a0b79af3fea17869 +Author: Harald Albers +Date: Sun Jan 24 10:28:36 2016 -0800 + + fix minor bash completion issue on OSX (compopt) + + Signed-off-by: Harald Albers + +commit 1bd5424c388e3039196af94b0f1c417a0959c81c +Author: Harald Albers +Date: Sun Jan 24 10:11:18 2016 -0800 + + remove zsh completion for `docker tag -f` + + Signed-off-by: Harald Albers + +commit 59754c4bd8903d29131e59384067a18dc5b91876 +Author: Harald Albers +Date: Sun Jan 24 10:07:04 2016 -0800 + + remove bash completion for `docker tag -f` + + Signed-off-by: Harald Albers + +commit 6723c8aa26a4265ae3005360cf4e6f37e5442b45 +Author: Harald Albers +Date: Sun Jan 24 08:41:22 2016 -0800 + + bash completion for syslog over TLS log driver + + Signed-off-by: Harald Albers + +commit 5601fc8507d9edb4eb764b7337866ea04f44be54 +Author: John Howard +Date: Sun Jan 24 09:22:50 2016 -0800 + + Windows CI: In container logic flaw + + Signed-off-by: John Howard + +commit c2ecf7f9f30f2ec18b6bbbc921123db42c3b81be +Author: Mary Anthony +Date: Sun Jan 24 08:39:14 2016 -0800 + + Adding new navigation + Moving API to top level + Fixing broken links to api + + Signed-off-by: Mary Anthony + +commit 17eb18899e7a29605c63d71c503ab343af4924b3 +Author: Harald Albers +Date: Sun Jan 24 07:11:27 2016 -0800 + + bash completion for `--cluster-store-opt kv.path discovery.{heartbeat,ttl}` + + Signed-off-by: Harald Albers + +commit 7f345f2ec4400bf0ac582f9a39a840173257e98b +Author: Harald Albers +Date: Sun Jan 24 06:36:04 2016 -0800 + + bash completion for `docker images -f dangling=false` + + Signed-off-by: Harald Albers + +commit 0f654bb5eb4643cb9fa59f6f12d02db2d2520ddb +Author: Harald Albers +Date: Sun Jan 24 05:50:33 2016 -0800 + + bash completion for `docker ps --filter status=dead` + + Signed-off-by: Harald Albers + +commit 7b3058b864b04ee1e51a64e945d0a76dc5b387a6 +Author: Harald Albers +Date: Sun Jan 24 05:39:52 2016 -0800 + + bash completion for `docker cp --follow-link` + + Signed-off-by: Harald Albers + +commit 7aafa76662986c4268f1130447c1534ae5fc1f1a +Merge: 42a0fd7e92 e151ad936a +Author: Brian Goff +Date: Sun Jan 24 07:16:11 2016 -0500 + + Merge pull request #19624 from WeiZhang555/test-case-name-consistent + + Make test case name consistent + +commit 42a0fd7e9234e51bacbb69f7cc70f42dd78fc3d8 +Merge: 037d159981 0c7201ee73 +Author: Vincent Demeester +Date: Sun Jan 24 12:49:47 2016 +0100 + + Merge pull request #19627 from pandrew/fix_warning_on_build + + Fix warning + +commit 42f6e8d40d059c8d53adaada24b400761f42ec5b +Author: Sebastiaan van Stijn +Date: Sun Jan 24 02:48:47 2016 -0800 + + Fix remove API order in menu + + Signed-off-by: Sebastiaan van Stijn + +commit 0c7201ee736f77e63cd1f191dfd6a3cf549b6def +Author: Paul Liljenberg +Date: Sun Jan 24 10:28:18 2016 +0100 + + Fixes #19614 + + Signed-off-by: Paul Liljenberg + +commit 037d159981c8f8d79f8f445df502527e635d525c +Merge: a1c6642c45 ae5fce9fe0 +Author: Sebastiaan van Stijn +Date: Sun Jan 24 00:42:36 2016 -0800 + + Merge pull request #19622 from r4j4h/quick-doc-fix + + Correcting `overlay` -> `bridge` driver in run.md + +commit ae5fce9fe02523e7a43ddd533f645d1a8fb20193 +Author: Jasmine Hegman +Date: Sat Jan 23 23:43:24 2016 -0700 + + Correcting `overlay` -> `bridge` driver in run.md + + Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph. + + Signed-off-by: Jasmine Hegman + +commit e151ad936abecce944e3f7c285fa788c2dc1bba1 +Author: Zhang Wei +Date: Sun Jan 24 16:32:52 2016 +0800 + + Make test case name consistent + + Replace `Tty` with `TTY` in all test case names so that we can run + a bundle of `TTY` related test cases with TESTFLAGS like + `-check.f TestExecTTY*` + + Signed-off-by: Zhang Wei + +commit a1c6642c4547fb3cbdd41b8ada1a8eb8d0f22afc +Merge: 717ced8dd7 ac1eac21c9 +Author: Sebastiaan van Stijn +Date: Sat Jan 23 23:37:03 2016 -0800 + + Merge pull request #19610 from companycy/patch-1 + + docs: image layers' path in aufs-driver.md + +commit 7a948f6a969137c2f8f0b47e75b30cc28ac0a37c +Author: Andy Goldstein +Date: Fri Jan 22 06:35:55 2016 -0500 + + Move resize after attaching + + Resize by +1 when attaching to force redrawing. + + Start monitoring window size after the attach begins instead of before. This way, you see the output + from the container without having to manually resize or hit enter. This makes attach consistent with + run and exec. + + Signed-off-by: Andy Goldstein + +commit 717ced8dd7aa769de1c19ee982a10394e95eb0e1 +Merge: 7be8f72644 4bfc5d4606 +Author: Sebastiaan van Stijn +Date: Sat Jan 23 18:53:28 2016 -0800 + + Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose + + Windows CI: Fix TestRunExitOnStdinClose flakiness + +commit ac1eac21c91c1b8395a0356699f58f1d91d0d173 +Author: companycy +Date: Sat Jan 23 23:49:20 2016 +0800 + + Update aufs-driver.md + + fix typo in file path for image layers + + Signed-off-by: bjcheny + +commit 75d107451a16161e2ff54753814936fbf6ca0d02 +Author: John Howard +Date: Fri Jan 22 20:44:46 2016 -0800 + + Windows CI: Address simple failures in TestPS* + + Signed-off-by: John Howard + +commit 011b4f01f4aca365c88900b196b1c96f7889631d +Author: Antonio Murdaca +Date: Sat Jan 23 19:45:01 2016 +0100 + + integration-cli: add suite for testing registries with auth + + Signed-off-by: Antonio Murdaca + +commit 2b0a742237d223f21717d722b4622458af870526 +Author: John Howard +Date: Sat Jan 23 11:04:57 2016 -0800 + + Windows CI: Fix api_containers_test.go + + Signed-off-by: John Howard + +commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d +Author: jrabbit +Date: Sat Jan 23 16:19:17 2016 -0500 + + Mangle the tests. They pass for better or worse! + + Signed-off-by: jrabbit + +commit 6540efb3d380e7ae50dd94493a43382f31e1e004 +Author: jrabbit +Date: Sat Jan 23 15:58:06 2016 -0500 + + If an env var is passthrough but not defined on the host don't set it. + This doesn't change too much code and keeps the generators. + + Signed-off-by: jrabbit + +commit 11a51649cf1fe677fd54e277c2530020fcfbe84b +Author: Stefan Scherer +Date: Wed Jan 20 23:25:06 2016 +0100 + + Update registry version in Dockerfile.armhf + + Signed-off-by: Stefan Scherer + +commit f21fb2162eaf1497e34a3cbddc9d51deec2929d1 +Author: John Howard +Date: Fri Jan 22 21:02:39 2016 -0800 + + Windows CI: Fix TestRename* + + Signed-off-by: John Howard + +commit 3d67dae52554d5749242815bd3c7882f9859b764 +Author: Arthur Baars +Date: Wed Jan 20 15:15:22 2016 +0000 + + Storage: remove bufferedFileWriter (dead code) + + Signed-off-by: Arthur Baars + +commit 26e7268a866e57a0ba742d9a1eb5e52b4854b944 +Author: Arthur Baars +Date: Thu Jan 21 11:28:02 2016 +0000 + + Storage: blobwriter.Write/Seek test case + + Signed-off-by: Arthur Baars + +commit 80b057067104b08886fbcf16d060ce82c0efb7c9 +Author: John Howard +Date: Fri Jan 22 21:13:38 2016 -0800 + + Windows CI: Porting for docker_api_images_test.go + + Signed-off-by: John Howard + +commit 7be8f7264435db8359ec9fd18362391bad1ca4d7 +Merge: bf85a49509 74fafa5dd2 +Author: Alexander Morozov +Date: Fri Jan 22 20:38:45 2016 -0800 + + Merge pull request #19600 from aaronlehmann/buildenvusage2 + + Slight TestBuildEnvUsage2 speedup + +commit f6c20d9b22ec9913f67b6c2ebdb5ef07c87b8cd7 +Author: Brian Goff +Date: Wed Jan 20 22:31:46 2016 -0500 + + Add back compat for volume drivers `Get` and `Ls` + + Use a back-compat struct to handle listing volumes for volumes we know + about (because, presumably, they are being used by a container) for + volume drivers which don't yet support `List`. + + Adds a fall-back for the volume driver `Get` call, which will use + `Create` when the driver returns a `404` for `Get`. The old behavior was + to always use `Create` to get a volume reference. + + Signed-off-by: Brian Goff + +commit bf85a49509ef67eb68a2251928385a221a85254e +Merge: 67d86d10d8 8d94a85d62 +Author: Sebastiaan van Stijn +Date: Fri Jan 22 18:27:44 2016 -0800 + + Merge pull request #19592 from duglin/Issue15777 + + Add some helper text for magical ADD + +commit 4bfc5d4606da8ed04fbba850da1c9b9e0d1ba3fe +Author: John Howard +Date: Fri Jan 22 18:27:15 2016 -0800 + + Windows CI: Fix TestRunExitOnStdinClose + + Signed-off-by: John Howard + +commit 67d86d10d890023eb6ceebfea2aaa8af937fd750 +Merge: b3af1d5242 bdc8241da9 +Author: Phil Estes +Date: Fri Jan 22 21:27:03 2016 -0500 + + Merge pull request #19216 from scaleoutsean/master + + Add GPFS filesystem IDs + +commit 5ce5a8e966ea41b7f40922dab3fbaf1ac85971bd +Author: Qiang Huang +Date: Sat Jan 23 10:15:09 2016 +0800 + + Verify cgroup-parent name for systemd cgroup + + Fixes: #17126 + + Signed-off-by: Qiang Huang + +commit cc4eea83da48a83d3f6f757b3858c7dde3f5e666 +Merge: 7c41b95b8e f42f5fa3d4 +Author: Victor Vieux +Date: Fri Jan 22 17:43:41 2016 -0800 + + Merge pull request #1669 from dongluochen/dockerUpdateCmd + + Support 'docker update' command + +commit 139c7f7830ede9ea66b0b12750ff7555ab4dca91 +Author: Joffrey F +Date: Fri Jan 22 17:42:24 2016 -0800 + + Move named volumes matching to config validation phase + + Signed-off-by: Joffrey F + +commit b3af1d52427384db5a841678d29935654c904f5f +Merge: 2d30720c1e 9ac671f79e +Author: Sebastiaan van Stijn +Date: Fri Jan 22 17:33:43 2016 -0800 + + Merge pull request #19598 from tianon/pkg-config + + Add pkg-config to our Debian build environment + +commit 2d30720c1e2fedca5534e0cc5b0763162f740501 +Merge: bf28c219c5 081bffc1e1 +Author: Sebastiaan van Stijn +Date: Fri Jan 22 17:27:42 2016 -0800 + + Merge pull request #19596 from Djelibeybi/fix-oracle-install-docs + + Updated Oracle Linux install documentation + +commit bf28c219c5d3e43bff5e55da455bffceea865405 +Merge: 6d1455e74b 4c76c665b7 +Author: Sebastiaan van Stijn +Date: Fri Jan 22 17:20:36 2016 -0800 + + Merge pull request #19511 from moxiegirl/19473-fix-certificate + + Fixing missing certs article; consolidating security material + +commit 081bffc1e1ff869a8215b9b8b439d4cb9f6a144a +Author: Avi Miller +Date: Sat Jan 23 09:58:38 2016 +1100 + + Updated Oracle Linux install documentation to be more accurate. + + Signed-off-by: Avi Miller + +commit 74fafa5dd202f9134989f3880aec17665b652da7 +Author: Aaron Lehmann +Date: Fri Jan 22 16:09:51 2016 -0800 + + Slight TestBuildEnvUsage2 speedup + + TestBuildEnvUsage2 was flagged in https://github.com/docker/docker/issues/19425 + as one of the slowest integration tests. It's slow because it has some + comprehensive builder test cases that end up creating a lot of layers. + Even with a busybox base image, this can be expensive. It's not possible + to build "FROM scratch" because the test cases need the shell to ensure + environment variables are set correctly. + + Some of the ENV and RUN statements can be combined. This causes fewer + layers to get created. Doing this produces a marginal improvement in the + runtime. + + Before: + + PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 43.619s + + After: + + PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 31.286s + + Signed-off-by: Aaron Lehmann + +commit f42f5fa3d47ecb9a187cb17869980582f6da9953 +Author: Dong Chen +Date: Fri Jan 22 00:37:15 2016 -0800 + + Support 'docker update' command. + + Signed-off-by: Dong Chen + +commit 7c41b95b8e5bfb741534a1e1c3ae6bcfe90ae0e2 +Merge: 50ad1548d9 b290a62342 +Author: Victor Vieux +Date: Fri Jan 22 17:03:38 2016 -0800 + + Merge pull request #1672 from jimenez/mesos0.26 + + Upgrading Mesos integration tests to 0.26.0 + +commit 50ad1548d974c42a982e3a79c612130ed9c998aa +Merge: 5978ee4b22 c6de0c3dc6 +Author: Alexandre Beslic +Date: Fri Jan 22 16:46:24 2016 -0800 + + Merge pull request #1666 from vieux/volumes_name + + allow engine/name support in volumes + +commit 6d1455e74b388faeae0f90379b8aa908afed0bf7 +Merge: feca36b379 cc19c7df2a +Author: Sebastiaan van Stijn +Date: Fri Jan 22 16:46:04 2016 -0800 + + Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer + + Hotfix vendor libcontainer + +commit 4c76c665b73dbd0beb0cb465caa921cbeb1cf61f +Author: Mary Anthony +Date: Wed Jan 20 12:46:40 2016 -0800 + + Fixing missing certs article; consolidating security material + Entering comments from reviewers + Updating with Derek's comments + Fixing bad links reported by build + + Signed-off-by: Mary Anthony + +commit feca36b3791f23112d80c330db3e0ceca6cdc3cc +Merge: 789e887c73 27b060492c +Author: Brian Goff +Date: Fri Jan 22 19:43:28 2016 -0500 + + Merge pull request #19519 from calavera/fix_event_channel_closing_race + + Fix channel closing race in event tests. + +commit 789e887c738d1d170bc03c7498f7a638acd5cbd7 +Merge: 422827fa92 7d4f52ec6b +Author: Jess Frazelle +Date: Fri Jan 22 16:39:28 2016 -0800 + + Merge pull request #19599 from nalind/master-deb-pkg-config + + Add pkg-config to our RPM build environment + +commit 6588968fb5502568d8f0e176613977d52dc80594 +Merge: 432eece6ff 1a8ec8c722 +Author: Nathan LeClaire +Date: Fri Jan 22 16:33:38 2016 -0800 + + Merge pull request #2906 from patrikerdes/2905_swarm_active + + Fix #2905, a Swarm host will now show as active by the active command when using the env --swarm option + +commit 341bd335f506853a14548d9e1e68bfd6bac40ad9 +Merge: 08deb7f8ef 25a1e9aed7 +Author: Diogo Mónica +Date: Fri Jan 22 16:31:28 2016 -0800 + + Merge pull request #475 from docker/repo-info-lib + + get all current role information for a repo + +commit ada792047907907fb94c332faf3ad7e1b125e98d +Author: Aidan Hobson Sayers +Date: Fri Jan 22 01:57:04 2016 +0000 + + Permit OPTIONS request against any url, fixes #19398 + + Signed-off-by: Aidan Hobson Sayers + +commit 48377a354f7527a60a8be3efb9ca17ec23816acd +Author: Joffrey F +Date: Fri Jan 22 16:05:21 2016 -0800 + + is_named_volume also tests for home paths ~ + + Fix bug with VolumeSpec not being updated + Fix integration test + + Signed-off-by: Joffrey F + +commit 422827fa92f9fc888271d02874ab950797ab16cb +Merge: 504a8ad295 3b0d36dbc1 +Author: David Calavera +Date: Fri Jan 22 15:54:21 2016 -0800 + + Merge pull request #19527 from aboch/epc + + Move Unsupp Network & IP check to the new updateNetworkConfig() func + +commit 69db5b74405102be10afc3445157389cd488cd4f +Merge: caa2001e1f 2b20b0167a +Author: Richard Scothern +Date: Fri Jan 22 15:54:19 2016 -0800 + + Merge pull request #1333 from aaronlehmann/use-reference-package + + Use reference package + +commit 7d4f52ec6bd8058cc55860cf5ff1a81a3fbe8f9d +Author: Nalin Dahyabhai +Date: Fri Jan 22 18:38:38 2016 -0500 + + Add pkg-config to our RPM build environment + + While hack/make.sh checks for systemd headers using pkg-config, we + forgot to ensure that they were there in the images that we use for + building binaries for RPM-based distributions. Add the right packages + to the generate.sh that we use for them, and update the copies of the + generated files that we carry in the source tree. + + Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in + the "pkgconfig" package, while OpenSUSE calls the package "pkg-config". + The systemd-devel package, like systemd, is not in Oracle Linux 6. + + Signed-off-by: Nalin Dahyabhai + +commit 08deb7f8ef9f2e9f12eea375964579c0c29edca3 +Merge: e579f101e7 499d5a7c0c +Author: Ying Li +Date: Fri Jan 22 15:37:45 2016 -0800 + + Merge pull request #484 from docker/update-when-server-error-tests + + Add tests for when the server 404's or 50X's when updating + +commit 9ac671f79e46ac3e05cc9531739d8f39d8da34c7 +Author: Tianon Gravi +Date: Fri Jan 22 15:18:50 2016 -0800 + + Add pkg-config to our Debian build environment + + This is used in `hack/make.sh` for detecting various dependencies such as `libsystemd-journal` -- without this, our packages don't support pulling logs back out of journald. :cry: + + Signed-off-by: Andrew "Tianon" Page + +commit b290a623424b1b5b6a050d5c0e1752166de423b4 +Author: Isabel Jimenez +Date: Fri Jan 22 14:05:22 2016 -0500 + + Adding mesos 0.26 Dockerfile for tests + + Signed-off-by: Isabel Jimenez + +commit 432eece6ff943550e9560ddcd309b31ecb438796 +Merge: 72d9c4d039 92b9853478 +Author: Nathan LeClaire +Date: Fri Jan 22 14:52:26 2016 -0800 + + Merge pull request #2904 from patrikerdes/2903_swarm_replication + + Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method + +commit 2b20b0167a117b1d0a468e41efc62a15361d360f +Author: Aaron Lehmann +Date: Tue Dec 15 16:43:13 2015 -0800 + + Change URLBuilder methods to use references for tags and digests + + Signed-off-by: Aaron Lehmann + +commit 4441333912d3608634dc0ddf90184f341960f24f +Author: Aaron Lehmann +Date: Tue Dec 15 14:35:23 2015 -0800 + + Use reference package internally + + Most places in the registry were using string types to refer to + repository names. This changes them to use reference.Named, so the type + system can enforce validation of the naming rules. + + Signed-off-by: Aaron Lehmann + +commit 504a8ad2954f8e28dbd556edee5cc136e1f8854c +Merge: 455a505749 845dc1b24c +Author: Antonio Murdaca +Date: Fri Jan 22 21:53:31 2016 +0100 + + Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer + + Windows: TestPsNotShowPortsOfStoppedContainer linux only + +commit 5978ee4b225d8a30850775434b67b1698c478acf +Merge: 5cb6f218dd c9e3b7dda3 +Author: Victor Vieux +Date: Fri Jan 22 12:53:28 2016 -0800 + + Merge pull request #1670 from vieux/cross_compile_travis_again + + enable cross compile in travis again + +commit 455a505749ff5db0d6f997b249234d0f1135fe5a +Merge: 34a83f9f2c 7c70ad058f +Author: Brian Goff +Date: Fri Jan 22 15:53:06 2016 -0500 + + Merge pull request #19190 from srust/volume_driver_parity_again + + Allow external volume drivers to host anonymous volumes again + +commit 72d9c4d0393cf960ed7d3cd306df092baf77a325 +Merge: c341a289e1 6ed2ab0e79 +Author: Nathan LeClaire +Date: Fri Jan 22 12:17:06 2016 -0800 + + Merge pull request #2889 from dgageot/wait-host-only + + Always wait for the host-only adapter to appear + +commit 34a83f9f2c0516b3c5e7024393487eee54309401 +Merge: 2731dbc797 5e80ac0dd1 +Author: Phil Estes +Date: Fri Jan 22 15:01:29 2016 -0500 + + Merge pull request #19517 from calavera/validate_config_keys + + Verify that the configuration keys in the file are valid. + +commit 2731dbc7977dba00405c974c47c4f079d441a2b2 +Merge: ae8f7c69e3 06e9a056ca +Author: Tibor Vass +Date: Fri Jan 22 14:27:47 2016 -0500 + + Merge pull request #19509 from BrianBland/master + + Fixes layer MediaTypes in manifests created from a cross-repository push + +commit 27b060492c483d61b76f18a529c94a71fdfc5312 +Author: David Calavera +Date: Wed Jan 20 17:36:39 2016 -0500 + + Fix channel closing race in event tests. + + Divide event matching into two functions, a matcher and + a processor. That way, the error handling doesn't call + the channel closing logic at all. + + Signed-off-by: David Calavera + +commit 5e80ac0dd183874ab7cd320a8bd0f0378dbd1321 +Author: David Calavera +Date: Fri Jan 22 13:14:48 2016 -0500 + + Make TLSOptions and LogConfig embedded structs. + + That way the configuration file becomes flag, without extra keys. + + Signed-off-by: David Calavera + +commit 8d94a85d62d6945be1217446738d856b3c2e2ddc +Author: Doug Davis +Date: Fri Jan 22 08:52:36 2016 -0800 + + Add some helper text for magical ADD + + Closes: #15777 + + Signed-off-by: Doug Davis + +commit ae8f7c69e3fdbf39b8e0780813d550588e27414e +Merge: 21ec6d3789 54587d861d +Author: David Calavera +Date: Fri Jan 22 09:33:29 2016 -0800 + + Merge pull request #19549 from cpuguy83/bump_plugin_api_version + + Bump plugin API version + +commit 21ec6d3789b93aad5788785cf4be4a2445044375 +Merge: a9fc4939df 51dad1185a +Author: Jess Frazelle +Date: Fri Jan 22 09:25:24 2016 -0800 + + Merge pull request #19146 from mikedougherty/cs-105-download-script + + Create a bundle for the install script to support other domains + +commit a9fc4939dfd864bc2ab2c9bc1dc0211feb03ec65 +Merge: 05b2f342fd da9eadb066 +Author: Tibor Vass +Date: Fri Jan 22 12:07:40 2016 -0500 + + Merge pull request #19573 from sanimej/libn + + Vendor in libnetwork v0.6.0-rc2 + +commit 05b2f342fd73d1624fac3d3107700d05caa0ac18 +Merge: 73ae424ed8 90e33640b8 +Author: Jess Frazelle +Date: Fri Jan 22 08:52:02 2016 -0800 + + Merge pull request #19588 from tianon/docker.default-systemd + + Add a note to /etc/default/docker noting that it does not apply to systemd + +commit 73ae424ed8a8cdd9cfe2d70c3334bcbe27cb9e91 +Merge: cba7ba25f4 33729d3b5a +Author: Vincent Demeester +Date: Fri Jan 22 17:27:47 2016 +0100 + + Merge pull request #19470 from Microsoft/jjh/confans + + Windows: VirtualTerminalInput native console + +commit cba7ba25f4358c86aee4872186d9dfd2fc3dc0fd +Merge: c91045a78b acb42c5fab +Author: Tibor Vass +Date: Fri Jan 22 11:23:19 2016 -0500 + + Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm + + Enable DockerTrustSuite for ARM again + +commit 90e33640b883134be0fc7d526d2ba45aa6eef70f +Author: Tianon Gravi +Date: Fri Jan 22 07:35:02 2016 -0800 + + Add a note to /etc/default/docker noting that it does not apply to systemd + + Signed-off-by: Andrew "Tianon" Page + +commit 3a72edb906e165410d566d37408e9ff569b382a7 +Author: Dimitar Bonev +Date: Fri Jan 22 01:18:15 2016 +0200 + + Network fields schema validation + + Signed-off-by: Dimitar Bonev + +commit 1a8ec8c722072cf151fbda06b3e1124dfd6c0e36 +Author: Patrik Erdes +Date: Fri Jan 22 13:49:36 2016 +0100 + + Fix #2905, a Swarm host will now show as active by the active command when using the env --swarm option + + Signed-off-by: Patrik Erdes + +commit 92b985347816f9d284101389fa246d9dcb7bc2b6 +Author: Patrik Erdes +Date: Fri Jan 22 10:38:10 2016 +0100 + + Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method + + Signed-off-by: Patrik Erdes + +commit bdc8241da93fe13e1d451c37340ac9c9143bebe4 +Author: scaleoutsean +Date: Sun Jan 10 19:31:43 2016 +0800 + + Add GPFS + + Signed-off-by: Sean Lee + +commit 5450625f8193073b3c56195f9bcbe38057147f53 +Author: Sven Dowideit +Date: Fri Jan 22 22:12:06 2016 +1000 + + Upgrade git-for-windows to 2.7.0, and vbox to 5.0.14 + + Signed-off-by: Sven Dowideit + +commit 35788f47ff45a40105e4c60712634c76c3d799fd +Merge: 49c83b16c2 77b435f4fe +Author: Aanand Prasad +Date: Fri Jan 22 11:40:35 2016 +0000 + + Merge pull request #2729 from shin-/bump_docker_py + + Use latest docker-py rc + +commit 49c83b16c217504e3ac183bc17f00ccc65a20cc9 +Merge: 963ec1ceda da2b6329ae +Author: Aanand Prasad +Date: Fri Jan 22 11:37:58 2016 +0000 + + Merge pull request #2726 from aanand/no-logs-on-interactive-run + + Pass logs=False to dockerpty + +commit c91045a78bf138aa32acd215fed4084d3b912bec +Merge: c3a9ecedba 781a33b6e7 +Author: Vincent Demeester +Date: Fri Jan 22 11:18:53 2016 +0100 + + Merge pull request #19558 from LK4D4/reduce_cgroup_parsing + + Refactor sysinfo usage + +commit cc19c7df2acd02d7580c726b11f50e85f253ace8 +Author: Aleksa Sarai +Date: Mon Jan 4 23:29:32 2016 +1100 + + integration-cli: add bad --cgroup-parent tests + + To ensure we don't regress on bad --cgroup-parent paths, add some + integration tests that check that the host hasn't toppled (or suddently + started to create files in the host). + + Signed-off-by: Aleksa Sarai + +commit 40b5eebb0b8f34cb3f6a3e6a83cac1b3a34a1d29 +Author: Aleksa Sarai +Date: Fri Jan 22 20:15:09 2016 +1100 + + vendor: *: update libcontainer + + This fixes a security vulnerability in Docker, which can cause a DoS + under certain circumstances. This is from the hotfix branch, so the + vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in + runc master. + + Signed-off-by: Aleksa Sarai + +commit c341a289e1f7900a57c2edfec3c66163ab194df7 +Merge: 474363d27a 9ea9399fa8 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 22 09:32:55 2016 +0100 + + Merge pull request #2900 from zchee/fix-typo-vb-misc + + Fix typo + +commit c3a9ecedba41eef71e42bed33fc2b462b9ee1c6a +Merge: 6f22d9ec4e b0873c2c50 +Author: Vincent Demeester +Date: Fri Jan 22 09:14:58 2016 +0100 + + Merge pull request #19574 from polonskiy/patch-2 + + fixed typo + +commit b0873c2c5009d4b2f758ea49477b55a2b5600c90 +Author: Anton Polonskiy +Date: Fri Jan 22 09:23:22 2016 +0200 + + fixed typo + + Signed-off-by: Anton Polonskiy + +commit 9ea9399fa8a2edc37a19b2dafe283916fd722e36 +Author: Koichi Shiraishi +Date: Fri Jan 22 14:13:24 2016 +0900 + + Fix typo + + Signed-off-by: Koichi Shiraishi + +commit da9eadb06669b7d2b375424a31991cf97de19900 +Author: Santhosh Manohar +Date: Thu Jan 21 20:49:02 2016 -0800 + + IT for service/network name with '.', corrected libnetwork flag for DNS + + Signed-off-by: Santhosh Manohar + +commit 02c9d48144c0523d59fe4ba1c0b645c17fd05f80 +Author: Santhosh Manohar +Date: Thu Jan 21 20:46:28 2016 -0800 + + Vendor in libnetwork v0.6.0-rc2 + + Signed-off-by: Santhosh Manohar + +commit 51dad1185a8dcf55f2e3473b79748e0e72c6590c +Author: Mike Dougherty +Date: Wed Jan 6 14:25:39 2016 -0800 + + Create a bundle for the install script to support other domains + + For the CS Engine we need to have an install script like OSS does, but + the locations are all different, as is the GPG key used. This is + accomplished here by slightly altering the script itself and adding a + simple 'sed' based bundle for make.sh. + + This install script is used in to change the URLs instead of sed in + release.sh. + + Signed-off-by: Mike Dougherty + +commit d72145f6182f7c7bd8735587294e7f6477187c1b +Author: Prayag Verma +Date: Sun Jan 17 16:53:40 2016 +0530 + + Update copyright years + + Signed-off-by: Prayag Verma + +commit 6f22d9ec4ec86bfc8f99a700fb89814a452c6cbc +Merge: 3233f45609 bcb9adf49e +Author: Doug Davis +Date: Thu Jan 21 22:09:41 2016 -0500 + + Merge pull request #19562 from MHBauer/nospace-checktheoutput + + check the output, not the errcode + +commit 845dc1b24c2b7083ab5b8a8c21f946fed56e61b1 +Author: John Howard +Date: Thu Jan 21 18:48:21 2016 -0800 + + Windows: TestPsNotShowPortsOfStoppedContainer linux only + + Signed-off-by: John Howard + +commit 9e67eae311324fb4f9d307e6b4158caff0b32d3e +Author: Joffrey F +Date: Thu Jan 21 18:03:58 2016 -0800 + + Match named volumes in service definitions with declared volumes + + Raise ConfigurationError for undeclared named volumes + Test new behavior + + Signed-off-by: Joffrey F + +commit 77b435f4fe9a8d02a6aab60d5264274ec59756fd +Author: Joffrey F +Date: Thu Jan 21 18:07:14 2016 -0800 + + Use latest docker-py rc + + Signed-off-by: Joffrey F + +commit e25d47db270e5159528023fee8d7ef14e7ff7c79 +Author: Arun Gupta +Date: Mon Jan 4 17:58:28 2016 -0800 + + adding docs for Dockerizing Couchbase service + + cleaning up instructions, removing redundant output + + Signed-off-by: Arun Gupta + + adding the latest feedback + + Signed-off-by: Arun Gupta + +commit caa2001e1fa738e14be6ba5f89cd9d41aebcd204 +Merge: c301f8ab27 cab284d6b2 +Author: Olivier Gambier +Date: Thu Jan 21 16:57:23 2016 -0800 + + Merge pull request #1341 from moxiegirl/fix-issue-1254 + + Pulling driver specs out of configuruation.md + +commit bed0bb7d017bb4a8400ac2c031dc74cd74240bfb +Author: Jessica Frazelle +Date: Tue Jan 19 14:57:03 2016 -0800 + + move default seccomp profile into package + + Signed-off-by: Jessica Frazelle + +commit 35e50119fc2a2a6d9bcdc95c000df8b66d6cb9d3 +Author: Jessica Frazelle +Date: Tue Jan 19 13:54:42 2016 -0800 + + move default apparmor policy into package + + Signed-off-by: Jessica Frazelle + +commit 3233f4560912fee87857f653a8bb32050dc04927 +Merge: 6e16ec2b9c 446f498eba +Author: Phil Estes +Date: Thu Jan 21 19:40:53 2016 -0500 + + Merge pull request #19263 from jfrazelle/update-aa-parser + + refactor aaparser pkg, add unit tests + +commit 499d5a7c0cd4639a502650f6c47b7def8dd3c8f7 +Author: Ying Li +Date: Thu Jan 21 16:34:53 2016 -0800 + + Add an extra targets/b delegation chain to the tests. + Also, shorten some of the options (do not specify false, since that's default). + + Signed-off-by: Ying Li + +commit 6e16ec2b9c98bef78bd26800e8b1cfb14a6e92e2 +Merge: 9ae51b3e0f eacd2fd4da +Author: Jess Frazelle +Date: Thu Jan 21 15:46:08 2016 -0800 + + Merge pull request #19529 from Microsoft/jjh/dockerfile + + Windows: Update dockerfile for Windows to Windows CI + +commit 963ec1cedaf36abba2cc9bd9d624e78bc7f0228d +Merge: 8662ce8e21 3b1a0e6fc9 +Author: Daniel Nephin +Date: Thu Jan 21 18:41:28 2016 -0500 + + Merge pull request #2707 from dnephin/add_stop_signal_to_docs + + Add stop signal to the docs + +commit bcb9adf49e6726eccc1ee1ed41fbe21789c2367f +Author: Morgan Bauer +Date: Thu Jan 21 13:31:10 2016 -0800 + + check the output, not the errcode + + - errcode of 1 can be returned for cases other than the 'no space left' case + + Signed-off-by: Morgan Bauer + +commit 9ae51b3e0f01111b743c61d8d0811e7061b490df +Merge: 45db4fa70e 3c82fad441 +Author: Brian Goff +Date: Thu Jan 21 17:20:47 2016 -0500 + + Merge pull request #19383 from calavera/container_store + + Extract container store from the daemon. + +commit 5cb6f218dd45ac2afae1feccacaa74ba6527d3c5 +Merge: cd68850690 46a33f70ff +Author: Victor Vieux +Date: Thu Jan 21 14:19:06 2016 -0800 + + Merge pull request #1662 from dongluochen/avoidSimultaneousValidation + + Enforce minimum backoff to avoid simultaneous validation on one engine + +commit 46a33f70ffdbe08ff7ea813b320d6cee17b345e8 +Author: Dong Chen +Date: Thu Jan 21 14:02:34 2016 -0800 + + Use exponential backoff strategy to validate pending engine. + + Signed-off-by: Dong Chen + +commit ed4038676f09d124180d634ec2cb341745f5fc79 +Author: David Calavera +Date: Wed Jan 20 17:16:49 2016 -0500 + + Verify that the configuration keys in the file are valid. + + - Return an error if any of the keys don't match valid flags. + - Fix an issue ignoring merged values as named values. + - Fix tlsverify configuration key. + - Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag. + + Signed-off-by: David Calavera + +commit cd688506905100c2ad940c4d04d4a532cc266fa3 +Merge: 63f1d757a3 f42d697315 +Author: Dongluo Chen +Date: Thu Jan 21 13:53:50 2016 -0800 + + Merge pull request #1665 from vieux/type_changelog + + update year typo in the CHANGELOG + +commit 45db4fa70eb3d33230e38457fd98b1f5403e70d6 +Merge: e287bef453 859262a82a +Author: Sebastiaan van Stijn +Date: Thu Jan 21 13:46:51 2016 -0800 + + Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation + + Carry 19305: Added `dead` to docs for docker ps -f status=... + +commit 859262a82abb482f54577935dc44c74e135dcd05 +Author: Kareem Khazem +Date: Wed Jan 13 16:34:18 2016 +0000 + + Added `dead` to docs for docker ps -f status=... + + It is possible to invoke `docker ps -f status=dead`, but the + documentation for docker-ps does not mention `dead` as a valid option. + This commit fixes that. + + Signed-off-by: Kareem Khazem + +commit e287bef453f2b4419a26e9bfa94987f13aa8376f +Merge: 3ecba7089b 4dbd612d47 +Author: Jess Frazelle +Date: Thu Jan 21 13:44:19 2016 -0800 + + Merge pull request #19316 from Microsoft/jjh/incontainererror + + Windows: In container build check + +commit e579f101e7109fcaf8cea2c6773716125a8e883c +Merge: 60e6d254b3 6389c8cf75 +Author: Diogo Mónica +Date: Thu Jan 21 13:36:49 2016 -0800 + + Merge pull request #486 from endophage/fix_offline + + tokenAuth should also 'succeed' if we get a 401 + +commit e79839b21662b8a05a620906303a2868a623defb +Author: Ying Li +Date: Wed Jan 20 20:32:05 2016 -0800 + + Add better error reporting for update tests. + + Signed-off-by: Ying Li + +commit dde9531b4aa34541277a9838103eed6fd356cb96 +Author: Ying Li +Date: Wed Jan 20 14:40:01 2016 -0800 + + Fix an error where we get a JSON syntax error on server 404 or 50X. + + We were testing to see if the cached metadata was nil, but we actually + set it to an empty data.Signed object, but didn't always set it to nil + if we failed to get local metadata. + + Signed-off-by: Ying Li + +commit 36684a32901fcce30ccfa4f3d543a69304ae4339 +Author: Ying Li +Date: Wed Jan 20 11:51:36 2016 -0800 + + Use cached timestamp if we get a 404 when updating timestamp. + + We use the cached timestamp for all other errors, so this makes the + error consistent. The only special metadata is the root.json, where a 404 + signifies that the repository doesn't exist. Also update the message + when a cached timestamp is used. + + Signed-off-by: Ying Li + +commit 3ecba7089be0fec32ab46f3bf55deb7878562b6d +Merge: 0b7e9ef910 921eae9d6d +Author: Tibor Vass +Date: Thu Jan 21 16:21:59 2016 -0500 + + Merge pull request #19552 from aaronlehmann/vendor-distribution-3 + + Vendor updated distribution package + +commit 4dbd612d474317fdd7bd983f2d1a05654c2ceaad +Author: John Howard +Date: Wed Jan 13 14:53:49 2016 -0800 + + Windows: In container build check + + Signed-off-by: John Howard + +commit eacd2fd4daa03b1161d879e835705f7d35b871e3 +Author: John Howard +Date: Wed Jan 20 18:51:34 2016 -0800 + + Windows: Update dockerfile.windows + + Signed-off-by: John Howard + +commit 0b7e9ef910b91a0a8cb334db852ad143c4660155 +Merge: 26334b7a7d 473a32ba8f +Author: Tibor Vass +Date: Thu Jan 21 15:38:47 2016 -0500 + + Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename + + Windows: Fix TestLinksMultipleWithSameName + +commit 26334b7a7d80fe233f27773bb65ac2d57d3af2a0 +Merge: d2448a0c20 4f13ec5551 +Author: Tibor Vass +Date: Thu Jan 21 15:37:50 2016 -0500 + + Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc + + Don't retry downloads when disk is full + +commit d2448a0c201592f93996a807a416016914efaccd +Merge: 16faf8f1fc 3f5e1c69b3 +Author: Tibor Vass +Date: Thu Jan 21 15:37:12 2016 -0500 + + Merge pull request #19524 from LK4D4/iocopy_writeto + + Use bufio.Reader in io.Copy source for overlay.copyRegular + +commit 16faf8f1fcc936e0776b067b26b4c01ede1af1d1 +Merge: b7a68d0252 e9d5292b0c +Author: Tibor Vass +Date: Thu Jan 21 15:36:41 2016 -0500 + + Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry + + Unwrap URL errors on retry + +commit 6389c8cf75c3794fa75b41dcb7974afb00f6e24c +Author: David Lawrence +Date: Thu Jan 21 11:44:00 2016 -0800 + + tokenAuth should also 'succeed' if we get a 401, which will result in attempting futher authentication later + Signed-off-by: David Lawrence (github: endophage) + +commit da2b6329ae0f1b3c42055b4a25b9fbe03cc1a560 +Author: Aanand Prasad +Date: Thu Jan 21 19:15:15 2016 +0000 + + Add test for logs=False + + Signed-off-by: Aanand Prasad + + Conflicts: + compose/cli/main.py + +commit 6e73fb38ea55ec6280c3ca5478f879770ab9907b +Author: Alf Lervag +Date: Tue Dec 22 11:43:48 2015 +0100 + + Fixes #2448 + + Signed-off-by: Alf Lervag + + Conflicts: + compose/cli/main.py + requirements.txt + +commit 63f1d757a38e98813c6112b75bd6e5ad67a5f73c +Merge: 8f31d014e4 ab113e7750 +Author: Alexandre Beslic +Date: Thu Jan 21 11:08:16 2016 -0800 + + Merge pull request #1657 from vieux/add_spread_tests + + Add more unit tests for spread strategy + +commit 8662ce8e21c9e9bdf9459365bbacac95d63f38eb +Merge: 730c33b28c f3e55568d1 +Author: Aanand Prasad +Date: Thu Jan 21 19:07:53 2016 +0000 + + Merge pull request #2723 from aanand/fix-run-with-networking + + Fix 'run' behaviour with networks + +commit 921eae9d6d028187daff7521740977b07414b631 +Author: Aaron Lehmann +Date: Thu Jan 21 11:01:14 2016 -0800 + + Vendor updated distribution package + + Another day, another revendor. + + This revision of distribution is more tolerant of incorrect Content-Type + headers when fetching manifests. + + Fixes #19526 + + Signed-off-by: Aaron Lehmann + +commit c301f8ab27f4913c968b8d73a38e5dda79b9d3d7 +Merge: 70f4dac7f7 c01fe47231 +Author: Richard Scothern +Date: Thu Jan 21 10:59:19 2016 -0800 + + Merge pull request #1383 from aaronlehmann/default-manifest-type + + If the media type for a manifest is unrecognized, default to schema1 + +commit 70f4dac7f7d24f6c17919de4f4a3f65c4f9fb936 +Merge: 1df70eb1da 93d019658f +Author: Richard Scothern +Date: Thu Jan 21 10:58:53 2016 -0800 + + Merge pull request #1376 from aaronlehmann/use-mime-pkg + + Use mime package to parse media type + +commit 730c33b28c65dadb78a99beb8d37bf0dcb7ed63e +Merge: 1e51b7e88b fec8cc9f80 +Author: Aanand Prasad +Date: Thu Jan 21 18:57:16 2016 +0000 + + Merge pull request #2699 from aanand/update-compose-file-docs + + Update Compose file documentation for version 2 + +commit 3b0d36dbc16d820c08ff1a2793eda2ef7048547d +Author: Alessandro Boch +Date: Wed Jan 20 17:51:41 2016 -0800 + + Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func + + Signed-off-by: Alessandro Boch + +commit fec8cc9f8029534e3efdeed5fe5152c8d5814f18 +Author: Joffrey F +Date: Wed Jan 20 11:07:28 2016 -0800 + + Update documentation for `external` param + + Signed-off-by: Joffrey F + + Conflicts: + docs/compose-file.md + +commit 59493dd7aadc119a2e45bf632a66152931097fd2 +Author: Aanand Prasad +Date: Thu Jan 21 13:58:01 2016 +0000 + + Add links to networks key references + + Signed-off-by: Aanand Prasad + +commit 2f41f3aa7ec1d5cce60b5b0d0a474110bf23e74d +Author: Aanand Prasad +Date: Thu Jan 21 13:55:54 2016 +0000 + + Update documentation for links + + Signed-off-by: Aanand Prasad + +commit 9a3378930f81c71c0c3b4d3cdc112043b558cba5 +Author: Aanand Prasad +Date: Thu Jan 21 13:55:40 2016 +0000 + + Document depends_on + + Signed-off-by: Aanand Prasad + +commit 0554c6e6fd04b670a7ffbc00b5d9f259e80f3482 +Author: Aanand Prasad +Date: Tue Jan 19 13:23:25 2016 +0000 + + Update Compose file documentation for version 2 + + - Explain each version in its own section + - Explain how to upgrade from version 1 to 2 + - Note which keys are restricted to particular versions + - A few corrections to the docs for version-specific keys + + Signed-off-by: Aanand Prasad + +commit f3e55568d1a7c111398876bec84da8ed8b42da7f +Author: Aanand Prasad +Date: Thu Jan 21 18:34:18 2016 +0000 + + Fix interactive run with networking + + Make sure we connect the container to all required networks *after* + starting the container and *before* hijacking the terminal. + + Signed-off-by: Aanand Prasad + +commit cab284d6b2edd01c921ba944480702cfb74ffd80 +Author: Mary Anthony +Date: Tue Jan 12 17:34:02 2016 -0800 + + - Pulling driver specs out of configuruation.md + - Fixing index metadata error + - Entering all the comments + - Updating with the build fixes + - Fix Microsoft link broken + - Fix collocate, colocate, to unambiguous co-locate + + Signed-off-by: Mary Anthony + +commit b7a68d0252d0cfcfdd33612f2267c0da926c8a4c +Merge: eacc9fc2c3 d44e79a366 +Author: Doug Davis +Date: Thu Jan 21 13:06:22 2016 -0500 + + Merge pull request #19548 from WeiZhang555/remove-hard-coded + + Remove hard coded 'docker' string from package + +commit 09dbc7b4cbbd27a36838bd60f62d6ff740da97f6 +Author: Aanand Prasad +Date: Thu Jan 21 18:04:50 2016 +0000 + + Stop connecting to all networks on container creation + + This relies on an Engine behaviour which is a bug, not an intentional + feature - we have to connect to networks one at a time + + Signed-off-by: Aanand Prasad + +commit 4f13ec5551076505395ad5b1c099f47eca06e63e +Author: Aaron Lehmann +Date: Thu Jan 21 10:01:51 2016 -0800 + + Don't retry downloads when disk is full + + There was already a check that prevented protocol-level fallback in this + situation, but retries within a specific protocol will still happen. + This makes it take a long time for the pull to finally error out. + + This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to + take a long time due to the backoff between retry attempts: + + PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError 5.882s + + Signed-off-by: Aaron Lehmann + +commit eacc9fc2c30be835ae31719dbc74a29c2dd26488 +Merge: 5f9375cf39 98d0997894 +Author: Arnaud Porterie +Date: Thu Jan 21 09:56:26 2016 -0800 + + Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks + + Revert "Copy aufs hardlinks to top layer" + +commit 473a32ba8f2d2d97eb0b3b745392f8b567fbaa2d +Author: John Howard +Date: Thu Jan 21 09:51:09 2016 -0800 + + Windows: Fix TestLinksMultipleWithSameName + + Signed-off-by: John Howard + +commit 5f9375cf390b9a0ea04aba8b6bafa83a8879cb65 +Merge: 7aef311269 60d44d8b80 +Author: Tibor Vass +Date: Thu Jan 21 12:51:25 2016 -0500 + + Merge pull request #19349 from jfrazelle/add-link-to-wiki + + add warning if upgrading via script to migrate + +commit 7aef3112692d115ac1fdd60ec06cb501c21ef1fc +Merge: 7d19ca7c40 ab01b6f385 +Author: Vincent Demeester +Date: Thu Jan 21 18:40:54 2016 +0100 + + Merge pull request #19541 from albers/completion-events + + Support new events in bash completion + +commit 1df70eb1da2ff9fdbbffe80f9a583e13a4374682 +Merge: 08650825fe 4f822100f7 +Author: Richard Scothern +Date: Thu Jan 21 09:34:56 2016 -0800 + + Merge pull request #1377 from RichardScothern/correct-event-digest + + Ensure the canonical manifest digest and length are sent to notification endpoints. + +commit c01fe472316f3de38a95b008c93079211c91d63e +Author: Aaron Lehmann +Date: Thu Jan 21 09:34:06 2016 -0800 + + If the media type for a manifest is unrecognized, default to schema1 + + This is needed for compatibility with some third-party registries that + send an inappropriate Content-Type header such as text/html. + + Signed-off-by: Aaron Lehmann + +commit a14906fd35f5c12b33631456bb7bc3dfd0a0be36 +Author: Aanand Prasad +Date: Thu Jan 21 16:49:50 2016 +0000 + + Fix 'run' behaviour with networks + + - Test that one-off containers join all networks + - Don't set any aliases + + Signed-off-by: Aanand Prasad + +commit 7d19ca7c40bc2b5172854ce073a6d11175027d82 +Merge: aed5691644 c4bc9657b9 +Author: Tibor Vass +Date: Thu Jan 21 12:08:50 2016 -0500 + + Merge pull request #19423 from jfrazelle/apparmor-no-install + + disable install of docker-engine for 1.10, try to get ready for 1.11 + +commit 1e51b7e88baa0f7dbd5e5093573d59ff4acc8da3 +Merge: 013c5ea3f9 642e71b4c7 +Author: Aanand Prasad +Date: Thu Jan 21 17:08:15 2016 +0000 + + Merge pull request #2722 from aanand/fix-scale-race-condition + + Fix scale race condition + +commit 013c5ea3f99bfa64ce5f2dd1a67c0c746ef1598b +Merge: 7a4fdfd034 ee63075a34 +Author: Aanand Prasad +Date: Thu Jan 21 17:08:05 2016 +0000 + + Merge pull request #2713 from aanand/links-v2 + + Support links in v2 files + +commit 7a4fdfd03449e16206d719418a8aa582558abd26 +Merge: e35bf47a7f 907c3ce42b +Author: Aanand Prasad +Date: Thu Jan 21 17:06:21 2016 +0000 + + Merge pull request #2712 from jzvelc/fix_v2_service_extend + + Fix `extends` when using v2 config format + +commit 3f5e1c69b345b25d9b1c57f5d492a0e3fd4432a0 +Author: Alexander Morozov +Date: Wed Jan 20 14:44:40 2016 -0800 + + Use pools.Copy instead of io.Copy for overlay.copyRegular + + That function is pretty heavy used on container start. Autoallocating + buffer can be painful. + + Signed-off-by: Alexander Morozov + +commit 54587d861d6664d6d32bc62a46c0c7ea0c7853e6 +Author: Brian Goff +Date: Thu Jan 21 11:41:32 2016 -0500 + + Bump plugin API version + + Signed-off-by: Brian Goff + +commit aed5691644d96a8ae9522a9c8c8d325bbb14c7f3 +Merge: 5e143d5168 d5e2802eae +Author: David Calavera +Date: Thu Jan 21 08:29:25 2016 -0800 + + Merge pull request #19507 from aaronlehmann/certificate-error-message + + Clarify error message when a .cert file is missing a corresponding key + +commit 5e143d51683027e93169a66475cf28944b031daa +Merge: 8c0dd9d182 935849f17a +Author: Vincent Demeester +Date: Thu Jan 21 17:24:29 2016 +0100 + + Merge pull request #19540 from A33a/A33a-patch-1 + + Fixed typo in "/etc/subUid" + +commit 8c0dd9d1821fe99fa720de84a4bf96e6fb50f94b +Merge: 72c425785c a160dd4987 +Author: David Calavera +Date: Thu Jan 21 08:15:41 2016 -0800 + + Merge pull request #19522 from aaronlehmann/vendor-distribution-2 + + Vendor updated distribution + +commit d44e79a3661be67c49899c3a3e5c3773b8c21073 +Author: Zhang Wei +Date: Fri Jan 22 00:14:52 2016 +0800 + + Remove hard coded 'docker' string from package + + Signed-off-by: Zhang Wei + +commit 72c425785c4664a73ff1e7bf883cc06110c9bcbc +Merge: 757d686700 603bc69b2c +Author: David Calavera +Date: Thu Jan 21 08:12:00 2016 -0800 + + Merge pull request #19534 from hqhq/hq_fix_update_swap + + Fix comment about swap limit of docker update + +commit 98d0997894153df8f9cfc0783390cc80f6b0274a +Author: Tonis Tiigi +Date: Thu Jan 21 07:52:37 2016 -0800 + + Revert "Copy aufs hardlinks to top layer" + + This reverts commit ef05b83417e32f269daf798307adcf07fe6ef13f. + + Signed-off-by: Tonis Tiigi + +commit 642e71b4c7b16a7175bd95e4989004ccb9f73d08 +Author: Aanand Prasad +Date: Thu Jan 21 15:28:40 2016 +0000 + + Stop and remove containers in parallel when scaling down + + Signed-off-by: Aanand Prasad + +commit 755c49b5000d7be2990a11a54a16ca05b2dbf5f5 +Author: Aanand Prasad +Date: Thu Jan 21 15:19:55 2016 +0000 + + Fix scale when containers exit immediately + + Signed-off-by: Aanand Prasad + +commit ee63075a347d89ef2afe3ae5c76357cf8ba46e08 +Author: Aanand Prasad +Date: Wed Jan 20 17:08:24 2016 +0000 + + Support links in v2 files + + Signed-off-by: Aanand Prasad + +commit 757d686700b02fa79f7c59edee656b7c35f956f3 +Merge: 476edba011 cfb2c667ad +Author: Tibor Vass +Date: Thu Jan 21 08:57:01 2016 -0500 + + Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins + + Fix loading with containerized plugins + +commit 476edba01104b83f33873833e9386a98f1356383 +Merge: db25ba1486 6025517b68 +Author: Vincent Demeester +Date: Thu Jan 21 14:29:29 2016 +0100 + + Merge pull request #19483 from coolljt0725/fix_19477 + + Fix #19477, clean up the ports when release network + +commit ab01b6f38578a97546a4d7bfaa305ef33ea96e63 +Author: Harald Albers +Date: Mon Jan 18 09:37:12 2016 -0800 + + Refactor handling of key specific subcompletions + + The currently used idiom for handling key specific subcompletions + did not work here: behind `docker event -f type=network `, the completion + of networks triggered. The expected behaviour is not to complete + anything here. + + In order to limit the scope of the corresponding PR, the new idiom is + currently only used in `docker events --filter`. + + Signed-off-by: Harald Albers + +commit fcc035848f7edc395e814af559fe0be42c3552a6 +Author: Harald Albers +Date: Mon Jan 18 08:55:23 2016 -0800 + + Support new events in bash completion + + Signed-off-by: Harald Albers + +commit 935849f17a1aceb2c453e9843322776202cb3092 +Author: Azat Khuyiyakhmetov +Date: Thu Jan 21 12:46:29 2016 +0100 + + Fixed typo in "/etc/subUid" + + Signed-off-by: Azat Khuziyakhmetov + +commit 5a249bd9f52ab28600564ff4753b17163268cbb5 +Author: Aanand Prasad +Date: Thu Jan 21 11:38:01 2016 +0000 + + Fix Windows build failures when installing dependencies from git + + Signed-off-by: Aanand Prasad + +commit db25ba1486d82089e72cf9a6b47e8ac9c26693a5 +Merge: 5537a92e45 2e6b1eb309 +Author: Antonio Murdaca +Date: Thu Jan 21 09:42:36 2016 +0100 + + Merge pull request #19536 from wenchma/fix_typo + + Fixes the typo of docker_cli_network_unix_test.go + +commit 2e6b1eb309fa98035458b993ef83736ed671b77c +Author: Wen Cheng Ma +Date: Thu Jan 21 16:37:17 2016 +0800 + + Fixes the typo of docker_cli_network_unix_test.go + + Signed-off-by: Wen Cheng Ma + +commit 5537a92e450ea56e2002f83ff50bb70fdb2cc25e +Merge: 7db58948bf 0bff2515f7 +Author: Jess Frazelle +Date: Wed Jan 20 23:58:33 2016 -0800 + + Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb + + Cleanup build rpm deb + +commit 6ed2ab0e79d5ab0a45995a6c30794310e9bb9e71 +Author: David Gageot +Date: Thu Jan 21 07:55:28 2016 +0100 + + Always wait for the host-only adapter to appear + + Signed-off-by: David Gageot + +commit 603bc69b2c3c00714c18e6ddc65bf53c2f1a079d +Author: Qiang Huang +Date: Thu Jan 21 13:48:53 2016 +0800 + + Fix comment about swap limit of docker update + + The description "set `-1` to disable swap" is wrong, `build`, + `create` and `run` already fixed, we need to fix `update` as well. + + Signed-off-by: Qiang Huang + +commit 7db58948bf256ae7daf372eed6b996688e4aae40 +Merge: 13dbf52611 9e3c1f2609 +Author: Sebastiaan van Stijn +Date: Wed Jan 20 20:42:24 2016 -0800 + + Merge pull request #19434 from HackToday/fixmntvolume + + Refine the volume mount example + +commit 13dbf52611899060878764427314628296316c3d +Merge: 7bf776f1c3 c2b59b03df +Author: Sebastiaan van Stijn +Date: Wed Jan 20 20:41:35 2016 -0800 + + Merge pull request #19530 from HackToday/fixtiny + + Fix the typo in ps + +commit c2b59b03df364901ce51ee485d60fce7e7aaa955 +Author: Kai Qiang Wu(Kennan) +Date: Thu Jan 21 04:26:40 2016 +0000 + + Fix the typo in ps + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 781a33b6e77a122f2a171a941da3a1798fc73c27 +Author: Alexander Morozov +Date: Wed Jan 20 19:20:59 2016 -0800 + + Reuse subsystems mountpoints between checks + + Signed-off-by: Alexander Morozov + +commit 14bfc52d36f0ba093f3665c4575741610681b38c +Author: Dong Chen +Date: Wed Jan 20 17:49:40 2016 -0800 + + Enforce minimum backoff to avoid simultaneous validation on one engine. + + Signed-off-by: Dong Chen + +commit 20a71f706c6d9745e84531f57f5452a802c86d19 +Merge: 1afe76bc9f 6e3d9bc4f2 +Author: moxiegirl +Date: Wed Jan 20 17:30:07 2016 -0800 + + Merge pull request #1299 from carolfh/jira1753config + + performed the following: closed jira 1753, updated graphics, removed … + +commit 7bf776f1c3b114e4e7528b2ff79c74e8d286fd23 +Merge: bb8d8a645a c38cba3b8c +Author: Brian Goff +Date: Wed Jan 20 20:11:32 2016 -0500 + + Merge pull request #19482 from LK4D4/up_osx_sdk + + Move long compilations before Go install in Dockerfile + +commit 6025517b68301134614985121f99ccbf3f577d42 +Author: Lei Jitang +Date: Wed Jan 20 20:09:11 2016 -0500 + + Fix #19477, clean up the ports when release network + + Signed-off-by: Lei Jitang + +commit 22ebeede3010e30a0b74c58900f7ed08f7489f93 +Author: Alexander Morozov +Date: Wed Jan 20 17:08:10 2016 -0800 + + Reuse *sysinfo.SysInfo instance in verification + + Signed-off-by: Alexander Morozov + +commit bb8d8a645a45b5694b5f450535dc8364213fab88 +Merge: ee001d87a9 d474f7fb86 +Author: Lei Jitang +Date: Thu Jan 21 09:07:00 2016 +0800 + + Merge pull request #19430 from keloyang/StatsNoStreamGetCpu + + remove the check of ContentLength in TestApiStatsNoStreamGetCpu + +commit 25a1e9aed76bf0e42063846f7d75913e56082a3d +Author: Riyaz Faizullabhoy +Date: Wed Jan 20 09:27:32 2016 -0800 + + change to ListRoles, and GetAllLoadedRoles + + Signed-off-by: Riyaz Faizullabhoy + +commit 474363d27a01df04a1fb24af457f96db50037503 +Merge: 1449d69cde 3b4b168051 +Author: Nathan LeClaire +Date: Wed Jan 20 15:55:23 2016 -0800 + + Merge pull request #2821 from hypriot/check-grand-parent-for-windows-shell + + Detect shell from grand parent process name if not directly called from a windows shell + +commit 1449d69cde26e792a1ae1cb106dfafeb3f606e56 +Merge: aeec7b716e 99870c2b5d +Author: Nathan LeClaire +Date: Wed Jan 20 15:53:55 2016 -0800 + + Merge pull request #2885 from exoscale/fix/doc-exoscale + + docs: fix --exoscale-image description in documentation + +commit a160dd4987e2508bb93f37741ab82f0e724d3ed7 +Author: Aaron Lehmann +Date: Wed Jan 20 15:18:47 2016 -0800 + + Vendor updated distribution + + The only changes are https://github.com/docker/distribution/pull/1379 + and https://github.com/docker/distribution/pull/1380. + + Fixes #19476 + + Signed-off-by: Aaron Lehmann + +commit 08650825fef9f21ea819972fb2ed875c0832a255 +Merge: 182bddcf11 acf02bead3 +Author: Stephen Day +Date: Wed Jan 20 15:38:07 2016 -0800 + + Merge pull request #1380 from aaronlehmann/avoid-empty-accept-header + + Avoid empty Accept headers in client requests + +commit 6e3d9bc4f20790bf9264ebfab962cfa1bc7b2901 +Author: Carol Fager-Higgins +Date: Thu Jan 14 16:16:08 2016 -0800 + + performed the following: closed jira 1753, updated graphics, removed incorrect text + fixed misdirected link for admin.md + + restarting tests + + added Don's comments to config file + + Signed-off-by: Carol Fager-Higgins + +commit acf02bead313e256d55da6e425dd912259b4c6f6 +Author: Aaron Lehmann +Date: Wed Jan 20 15:22:38 2016 -0800 + + Avoid empty Accept headers in client requests + + One of the keys in the manifest media type map is an empty string. This + should not be sent as an Accept header. + + Signed-off-by: Aaron Lehmann + +commit ee001d87a93a7da106fc052172cc3959ee457939 +Merge: 4a9523adc9 332d95fd0d +Author: David Calavera +Date: Wed Jan 20 15:21:58 2016 -0800 + + Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name + + Don't error out when link name in use. + +commit 182bddcf116b6bf05a84e5ebe7c7fd8a899ab9d8 +Merge: dd0d5a31f5 ec636bbfd2 +Author: Stephen Day +Date: Wed Jan 20 15:07:47 2016 -0800 + + Merge pull request #1379 from aaronlehmann/token-error + + Handle nonstandard token endpoint errors + +commit 4a9523adc90de8fea1de23b5e33ae184bdd9f25e +Merge: ad87333f79 a1eb6029cc +Author: Alexander Morozov +Date: Wed Jan 20 15:05:14 2016 -0800 + + Merge pull request #19513 from crosbymichael/tty-restore + + Move tty set and restore to caller + +commit ad87333f7968fe8c219288ac8bcb2e0f61c618cb +Merge: 7915077a38 596836e0e4 +Author: Sebastiaan van Stijn +Date: Wed Jan 20 14:54:24 2016 -0800 + + Merge pull request #19452 from mortonfox/patch-1 + + cgroups documentation moved + +commit 7915077a38e30496391a0759f08134b8942f8524 +Merge: 048234fcdb 8f3c0fdff3 +Author: David Calavera +Date: Wed Jan 20 14:53:38 2016 -0800 + + Merge pull request #19485 from HackToday/fixlink + + Fix the ulimit link + +commit 048234fcdbc4f3af7e81048bbd2367940f3718ac +Merge: c21eb2a420 3c8042a0cb +Author: Sebastiaan van Stijn +Date: Wed Jan 20 14:45:59 2016 -0800 + + Merge pull request #19487 from HackToday/fixcommitcli + + Fix commit wrong repository example + +commit ec636bbfd246e822bc20c8b1d5e06de965a9469d +Author: Aaron Lehmann +Date: Wed Jan 20 14:45:08 2016 -0800 + + Handle nonstandard token endpoint errors + + https://github.com/docker/distribution/pull/1249 changed token fetching + to parse HTTP error response bodies as serialized errcodes. However, + Docker Hub's authentication endpoint does not return error bodies in + this format. To work around this, convert its format into + ErrCodeUnauthorized or ErrCodeUnknown. + + Signed-off-by: Aaron Lehmann + +commit 803205d8bf667691ce20a0f4b360d71a60ae8474 +Author: Ying Li +Date: Tue Jan 19 15:12:02 2016 -0800 + + Update and add tests for what happens if the remote repo 404's or 500's on root.json. + + Signed-off-by: Ying Li + +commit e9d5292b0c4a26ed51a66437b8ab0dba03f65b8f +Author: Derek McGowan +Date: Wed Jan 20 14:29:38 2016 -0800 + + Unwrap URL errors on retry + + When authorization errors are returned by the token process the error will be wrapped in url.Error. + In order to check the underlying error for retry this error message should be unwrapped. + Unwrapping this error allows failure to push due to an unauthorized response to keep from retrying, possibly resulting in later 429 responses. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit c21eb2a4209f6339fe59e4a97c3e6479aeb39f94 +Merge: 7bddbdf360 e5bce74592 +Author: Sebastiaan van Stijn +Date: Wed Jan 20 14:29:07 2016 -0800 + + Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles + + Remove validate-vendor from default bundles + +commit 24330408e97d11665a9359208ce1f1697a68c621 +Author: Alexandre Vázquez +Date: Wed Jan 20 23:01:03 2016 +0100 + + Introduce a delay and a two-step close windows procedure to allow to receive and execute the order to close the machine when Kitematic closes on Windows. + +commit 3aa778d6a0744eda32931353144738ae07ae9a75 +Author: Christopher Jones +Date: Wed Jan 20 16:57:18 2016 -0500 + + Update registry in Dockerfile.ppc64le + + This updates the Dockerfile registry version on ppc64le to be + consistent with 63099477189ea14f3122f6aa37fa7c60d33562c7 + + Signed-off-by: Christopher Jones + +commit 332d95fd0dd08c352f96e8755414e40007f6bda2 +Author: Brian Goff +Date: Wed Jan 20 16:24:16 2016 -0500 + + Don't error out when link name in use. + + This preserves old behavior from sqlite links/names. + + Signed-off-by: Brian Goff + +commit a1eb6029cc4e4ccd820b0aac147a6121f1967ba2 +Author: Michael Crosby +Date: Wed Jan 20 13:18:36 2016 -0800 + + Move tty set and restore to caller + + Fixes #19506 + + This fixes the issue of errors on create and the tty not being able to + be restored to its previous state because of a race where it was + in the hijack goroutine. + + Signed-off-by: Michael Crosby + +commit dd0d5a31f54a7cea0850057514a457000badb067 +Merge: fdd2e4d77e eb87f00afd +Author: Richard Scothern +Date: Wed Jan 20 13:09:44 2016 -0800 + + Merge pull request #1378 from stevvooe/update-specification-changelog + + spec/api: add missing entries to changelog + +commit 7bddbdf360f50fed07cd21b21270f5f287222d8c +Merge: 2705fa573b 95695aa38c +Author: Alexander Morozov +Date: Wed Jan 20 12:54:49 2016 -0800 + + Merge pull request #19503 from jfrazelle/update-logrus + + bump logrus + +commit 06e9a056caa4a5fa8608dc94fecd62bafe528265 +Author: Brian Bland +Date: Wed Jan 20 11:39:32 2016 -0800 + + Fixes layer MediaTypes in manifests created from a cross-repository push + + Signed-off-by: Brian Bland + +commit fdd2e4d77ef1da4bbdc535ca011a30faeb7a038c +Merge: 47a064d419 2a4345ca4b +Author: Richard Scothern +Date: Wed Jan 20 12:21:22 2016 -0800 + + Merge pull request #1372 from aibaars/gcs-delete + + StorageDriver GCS: improve test suite clean-up and add retrying to all GCS api calls + +commit eb87f00afd1d74ce94fa76284bd713cdf8cc6ff0 +Author: Stephen J Day +Date: Wed Jan 20 12:19:25 2016 -0800 + + spec/api: add missing entries to changelog + + Signed-off-by: Stephen J Day + +commit a052d9e10502b8e2285a0441f19914060ddbbb5f +Author: Riyaz Faizullabhoy +Date: Mon Jan 18 15:15:53 2016 -0800 + + client library for retrieving keys and signatures for all roles + + Signed-off-by: Riyaz Faizullabhoy + +commit 2705fa573b10890b39295781b41dca6d69013e6b +Merge: bcf155bb7a cd3446972e +Author: Tibor Vass +Date: Wed Jan 20 14:49:32 2016 -0500 + + Merge pull request #19457 from calavera/post_config_verification + + Fix post config verification without flags. + +commit d5e2802eae4815b06ce477d8de54fe0caa3aa812 +Author: Aaron Lehmann +Date: Wed Jan 20 10:53:41 2016 -0800 + + Clarify error message when a .cert file is missing a corresponding key + + The daemon uses two similar filename extensions to identify different + kinds of certificates. ".crt" files are interpreted as CA certificates, + and ".cert" files are interprted as client certificates. If a CA + certificate is accidentally given the extension ".cert", it will lead to + the following error message: + + Missing key ca.key for certificate ca.cert + + To make this slightly less confusing, clarify the error message with a + note that CA certificates should use the extension ".crt". + + Signed-off-by: Aaron Lehmann + +commit bcf155bb7a3cacf8f37e98d41c136eeba3f7775e +Merge: a866e7e2ee 5f73ab8952 +Author: David Calavera +Date: Wed Jan 20 11:31:14 2016 -0800 + + Merge pull request #19469 from crosbymichael/libcontainer-resource-hf + + Update libcontainer to 47e3f834d73e76bc2a6a585b48d + +commit a866e7e2ee39b3008c24ae1a709afa13b17de6b8 +Merge: fd79462af3 f50d0d7fdb +Author: Vincent Demeester +Date: Wed Jan 20 20:26:15 2016 +0100 + + Merge pull request #19496 from dbarboza/19495-doc-grammar + + Fix minor doc grammar issues + +commit 4f822100f7dc30b5fb150b9e1e10261d9bd6c405 +Author: Richard Scothern +Date: Wed Jan 20 11:21:04 2016 -0800 + + Ensure the canonical manifest digest and length are sent to notification endpoints. + + Signed-off-by: Richard Scothern + +commit 60e6d254b381a5d693626313054b4eae987953f7 +Merge: 3c72ef762b df53f51b0b +Author: Diogo Mónica +Date: Wed Jan 20 11:05:34 2016 -0800 + + Merge pull request #477 from docker/swizzler + + Update tests while messing up metadata + +commit cfb2c667ad0bb17d9a1bd49a294d5c38e4cbf040 +Author: Brian Goff +Date: Wed Jan 20 12:12:51 2016 -0500 + + Use fine-grained locks for plugin loading. + + This helps ensure that only one thing is trying to intialize a plugin at + once while also keeping the global lock free during initialization. + + Signed-off-by: Brian Goff + +commit 8f31d014e49cda58f696cd95cf30ea172f140a65 +Merge: 05f9a6a6fb 39dc28a4df +Author: Alexandre Beslic +Date: Wed Jan 20 10:47:34 2016 -0800 + + Merge pull request #1658 from dongluochen/raceValidation + + Fix a race condition in pending engine validation + +commit df53f51b0bb9c87e05823b24bc2ccead11f8ddb0 +Author: Ying Li +Date: Tue Jan 19 17:43:53 2016 -0800 + + Refactor swizzler to not produce a repo itself, but to just take some initial metadata. + + Updated the testutils/repo.go utility to be able to produce a repository with delegations + and to export metadata from said repo instead. + + Signed-off-by: Ying Li + +commit cd3446972e968639684f2b65bfc11c099a25f1b0 +Author: David Calavera +Date: Tue Jan 19 14:16:07 2016 -0500 + + Fix post config verification without flags. + + - Set the daemon log level to what's set in the configuration. + - Enable TLS when TLSVerify is enabled. + + Signed-off-by: David Calavera + +commit 93d019658f9be3f078b7ddca4b1043a21f6d51d3 +Author: Aaron Lehmann +Date: Wed Jan 20 09:59:19 2016 -0800 + + Use mime package to parse media type + + This replaces custom parsing with the standard library's mime package. + This is simpler and more correct. + + Signed-off-by: Aaron Lehmann + +commit fd79462af3ebd5988a948f150bfbdcd2b04ca418 +Merge: b433e1e7fb 66c253cbf7 +Author: David Calavera +Date: Wed Jan 20 09:56:30 2016 -0800 + + Merge pull request #19044 from HackToday/18890-validate-volume + + Fix volume filter validation + +commit 95695aa38caafa6f4cf42f90c2e0fa67c5e36b91 +Author: Jessica Frazelle +Date: Wed Jan 20 09:47:41 2016 -0800 + + bump logrus + + Signed-off-by: Jessica Frazelle + +commit 907c3ce42b6f1033546e1cb6cd17aa801b035463 +Author: Jure Žvelc +Date: Wed Jan 20 13:01:04 2016 +0100 + + Fix for extending services written in v2 format. + Signed-off-by: Jure Žvelc + +commit e35bf47a7f77c3299b8ce4405390f944fc57e8c4 +Merge: fd6b7d1747 5aadf5a187 +Author: Aanand Prasad +Date: Wed Jan 20 17:46:10 2016 +0000 + + Merge pull request #2708 from dnephin/implement_depends_on + + Implement depends_on + +commit fd6b7d17479b1d52cad2406f52028fc66e75fd2a +Merge: c47aea9c12 85619842be +Author: Aanand Prasad +Date: Wed Jan 20 17:45:01 2016 +0000 + + Merge pull request #2693 from dnephin/migrate_v1_to_v2 + + Add a migration script for v1 to v2 compose format + +commit e5bce745925384501422ed61cb69b968187bda0e +Author: Vincent Demeester +Date: Wed Jan 20 18:29:28 2016 +0100 + + Remove validate-vendor from default bundles + + Because it's triggered another way :) + See https://github.com/docker/leeroy/pull/44 + + Signed-off-by: Vincent Demeester + +commit b433e1e7fb84608147825e5669146fd58dbbd07b +Merge: bdcc3ebe41 fe8a6a5b67 +Author: Sebastiaan van Stijn +Date: Wed Jan 20 09:28:04 2016 -0800 + + Merge pull request #19486 from sdurrheimer/zsh-completion-network-links + + Zsh completion for '--alias --net-alias --ip --ip6 --link' + +commit d85b9f858050dbfb2dde3d68517952958b8e38ee +Author: Brian Goff +Date: Wed Jan 20 12:06:03 2016 -0500 + + Fix loading of containerized plugins + + During daemon startup, all containers are registered before any are + started. + During container registration it was calling out to initialize volumes. + If the volume uses a plugin that is running in a container, this will + cause the restart of that container to fail since the plugin is not yet + running. + This also slowed down daemon startup since volume initialization was + happening sequentially, which can be slow (and is flat out slow since + initialization would fail but take 8 seconds for each volume to do it). + + This fix holds off on volume initialization until after containers are + restarted and does the initialization in parallel. + + The containers that are restarted will have thier volumes initialized + because they are being started. If any of these containers are using a + plugin they will just keep retrying to reach the plugin (up to the + timeout, which is 8seconds) until the container with the plugin is up + and running. + + Signed-off-by: Brian Goff + +commit f50d0d7fdb11ce36715adfbf857e4668c0fd8f75 +Author: Dave Barboza +Date: Wed Jan 20 10:47:50 2016 -0500 + + Fix minor doc grammar issues + Signed-off-by: Dave Barboza + +commit acb42c5fabc154609bc2cb6b6b55477371945ac4 +Author: Stefan Scherer +Date: Wed Jan 20 07:30:54 2016 +0100 + + Enable DockerTrustSuite for ARM again + + Signed-off-by: Stefan Scherer + +commit 99870c2b5de28a04df1cfb4a8fec404a3153c250 +Author: Vincent Bernat +Date: Wed Jan 20 14:41:34 2016 +0100 + + docs: fix --exoscale-image description in documentation + + Signed-off-by: Vincent Bernat + +commit 2a4345ca4b7d5d4fa725f04ffeebcd1d368dd2f1 +Author: Arthur Baars +Date: Tue Jan 19 14:40:00 2016 +0000 + + StorageDriver: GCS: retry all api calls + + Signed-off-by: Arthur Baars + +commit 6ee339464cd21d4b40840fd2197a0232e59fb999 +Author: Arthur Baars +Date: Tue Jan 19 14:09:32 2016 +0000 + + StorageDriver: Test suite: improve cleanup + + Verify that the file(s) have been deleted after calling Delete, + and retry if this is not the case. Furthermore, report the error + if a Delete operation fails. + + Signed-off-by: Arthur Baars + +commit bdcc3ebe4168a72a0f12d171e674905f2fb40d01 +Merge: 7646bed1ad e5e62b96ce +Author: Doug Davis +Date: Wed Jan 20 07:46:28 2016 -0500 + + Merge pull request #19447 from sillyousu/19407-fix-exec-store-data-race + + Fix race condition in execCommandGC + +commit 7646bed1adeb9d0b552344647fca2b619d070097 +Merge: e9ac149472 5e450bc5df +Author: Vincent Demeester +Date: Wed Jan 20 13:33:26 2016 +0100 + + Merge pull request #19479 from ywy1ywy/my-branch + + fix a spelling error of 'dnsmasq' + +commit e9ac149472df13f1746d279263b88cb4be9eac94 +Merge: 2ba549407a b15247868c +Author: Antonio Murdaca +Date: Wed Jan 20 13:20:47 2016 +0100 + + Merge pull request #19478 from zchee/add-arg-syntax + + Add `ARG` instruction syntax for vim + +commit 2ba549407a6ef690b403ad937594386889257bd9 +Merge: d45643a865 32bd703926 +Author: Vincent Demeester +Date: Wed Jan 20 11:54:13 2016 +0100 + + Merge pull request #19467 from sdurrheimer/zsh-completion-detach-keys + + Add zsh completion for 'docker {attach,exec,run,start} --detach-keys' + +commit 3c8042a0cb2253be37303e6d646e96d87cefe0fc +Author: Kai Qiang Wu(Kennan) +Date: Wed Jan 20 10:25:33 2016 +0000 + + Fix commit wrong repository example + + The old name is invalid in new repository name spec. + So we need to fix them. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit aeec7b716e69df6e758fb923496e7442a876abf2 +Merge: 96a5d31e83 cda5d00bd8 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 20 10:32:22 2016 +0100 + + Merge pull request #2881 from robbertkl/docs-fix-ips + + Replace public IPs with reserved ones + +commit 96a5d31e83709113f8d8a4b5d9614a5321094d11 +Merge: 62bcc30859 106ce360a5 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 20 10:30:55 2016 +0100 + + Merge pull request #2880 from robbertkl/docs-fix-default + + Add other commands that support default machine + +commit fe8a6a5b679ee75587036c823890b4a39c9db031 +Author: Steve Durrheimer +Date: Tue Jan 19 21:32:38 2016 +0100 + + Add zsh completion for 'docker network connect --link' + + Signed-off-by: Steve Durrheimer + +commit 5284e037ffd301ee9ed6a23cd130f62787a93f86 +Author: Steve Durrheimer +Date: Tue Jan 19 21:28:49 2016 +0100 + + Add zsh completion for 'docker {network connect, create, run} --ip --ip6' + + Signed-off-by: Steve Durrheimer + +commit 898b53fafab4859189e68d1e67780e5c4f1fdb29 +Author: Steve Durrheimer +Date: Tue Jan 19 21:25:21 2016 +0100 + + Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias' + + Signed-off-by: Steve Durrheimer + +commit 8f3c0fdff3846c5d7999c200c69c9d67751acc08 +Author: Kai Qiang Wu(Kennan) +Date: Wed Jan 20 09:18:14 2016 +0000 + + Fix the ulimit link + + The old link not existed, we need fix it the right one. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 32bd703926035c8c8b68be00f65d77eb752f6275 +Author: Steve Durrheimer +Date: Wed Jan 20 00:05:02 2016 +0100 + + Add zsh completion for 'docker {attach,exec,run,start} --detach-keys' + + Signed-off-by: Steve Durrheimer + +commit d45643a8650f4c718c61fbf7ecebc8aabeb9d4d1 +Merge: 87b7ff5267 da26fc26b2 +Author: Sebastiaan van Stijn +Date: Wed Jan 20 00:30:30 2016 -0800 + + Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt + + Add zsh completion for 'docker network create --ipam-opt' + +commit 87b7ff52675119aa0ddfdfa789ad5fbf9fdd99b0 +Merge: cd1ed858d3 8799218d01 +Author: Vincent Demeester +Date: Wed Jan 20 09:02:21 2016 +0100 + + Merge pull request #19465 from mavenugo/sysd + + Vendor libnetwork v0.6.0-rc1 + +commit 3c72ef762bfc6d6c69749904d9b359704aadde3b +Merge: b6b5acb0a1 2ff7bf6375 +Author: Ying Li +Date: Tue Jan 19 23:39:11 2016 -0800 + + Merge pull request #482 from docker/random-lint-fix + + Add some comments about the notary constants, and other lint fixes. + +commit c38cba3b8c769d39a1e42e0b79fa2eeb77fd6f04 +Author: Alexander Morozov +Date: Tue Jan 19 22:42:05 2016 -0800 + + Move long compilations before Go install in Dockerfile + + Now we can avoid long compilations on Go update. + + Signed-off-by: Alexander Morozov + +commit 9e3c1f260989f8302b29d45fef1a947e6072709c +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 19 05:30:33 2016 +0000 + + Refine the volume mount example + + The path here should be absolute, else it would + deem it as volume name. + + Also link to release page to contain static binary, + the old link not work, because it is just used to + install docker in os distro, it can not be used + as static binary directly. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 5e450bc5df9b59ea5b1fcee2b12b30669fb8ceff +Author: Wenyu You <21551128@zju.edu.cn> +Date: Wed Jan 20 06:12:22 2016 +0000 + + fix a spelling error of 'dnsmasq' + + Signed-off-by: Wenyu You <21551128@zju.edu.cn> + +commit b15247868cf736eedb28234875508d9160a1052f +Author: Koichi Shiraishi +Date: Wed Jan 20 15:08:45 2016 +0900 + + Add `ARG` instruction syntax for vim + + Signed-off-by: Koichi Shiraishi + +commit cd1ed858d38af2dede529d9fade88069439fdade +Merge: 7657e233f7 910a5fc234 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 21:58:24 2016 -0800 + + Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout + + Fix DockerTrustSuite SetUpTest + +commit e5e62b96ce0d4eb3934a386b07203830f55e07ce +Author: Pei Su +Date: Tue Jan 19 20:30:48 2016 +0800 + + Fix race condition in execCommandGC + + `daemon.execCommandGC` + The daemon object (grep execCommandGC) iterate over a map + (grep execCommands.Commands) in a goroutine. + Lock can't protect concurrency access in this case. + Exec command storage object should return a copy of commands instead. + + Signed-off-by: Pei Su + +commit 3b1a0e6fc931dcef6147b2370b1b7779fd13d2e4 +Author: Daniel Nephin +Date: Tue Jan 19 15:03:41 2016 -0500 + + Add stop signal to the docs. + + Signed-off-by: Daniel Nephin + +commit cda5d00bd8d898d07d1b41c0a8e8250fd4a34a50 +Author: Robbert Klarenbeek +Date: Wed Jan 20 03:31:14 2016 +0100 + + Replace public IPs with reserved ones + + Signed-off-by: Robbert Klarenbeek + +commit 106ce360a5f021eec2f75cb4e522bcdd9d75797c +Author: Robbert Klarenbeek +Date: Wed Jan 20 03:06:20 2016 +0100 + + Add other commands that support default machine + + Signed-off-by: Robbert Klarenbeek + +commit 7657e233f7dae10d8bacbd76460a1e4ca84a7ac7 +Merge: e11a7f5371 588e27f9a5 +Author: Tibor Vass +Date: Tue Jan 19 21:05:43 2016 -0500 + + Merge pull request #19466 from aaronlehmann/vendor-distribution + + Vendor updated docker/distribution package + +commit 0bff2515f74fc6f0be9f019cc8b0f08b50e36228 +Author: Jessica Frazelle +Date: Fri Jan 15 15:37:46 2016 -0800 + + add a way to only build requested pkgs + + Signed-off-by: Jessica Frazelle + +commit b6b5acb0a1176696d2771f3dcda7b371b1f8096c +Merge: 6f2e851b29 33fee1d356 +Author: Diogo Mónica +Date: Tue Jan 19 17:18:19 2016 -0800 + + Merge pull request #469 from endophage/fixing_468 + + Offline operation when server not reachable + +commit 910a5fc2348b934dcb126c021721305d5316c7c0 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 16:45:47 2016 -0800 + + Fix DockerTrustSuite SetUpTest + + This hopefully makes DockerTrustSuite.SetUpTest + less flaky. + + Increased the number of attempts to check + if Notary is available before giving up. + + Signed-off-by: Sebastiaan van Stijn + +commit 1404aa9dadbbd8a6b4956609a06673484bf399b9 +Author: Ying Li +Date: Tue Jan 19 16:32:34 2016 -0800 + + Remove client update tests for which it seems like the user is actively sabotaging themselves. + + Signed-off-by: Ying Li + +commit edc30ffdb99da0692057a2d754704522abd36533 +Author: Ying Li +Date: Tue Jan 19 09:42:17 2016 -0800 + + Skip the longer client update tests if testing in short mode. + + Signed-off-by: Ying Li + +commit ea0a64eeab27596576d79ac35125e6a78d07fde8 +Author: Ying Li +Date: Mon Jan 18 19:05:06 2016 -0800 + + Add a few tests for updating when the local repo is corrupt. + + Signed-off-by: Ying Li + +commit 4838a906405c499c9a9cce2bfe49312a86927c23 +Author: Ying Li +Date: Tue Jan 12 20:01:21 2016 -0800 + + Refactor metadata changers into a helper fuzzer object in testutils package. + + Signed-off-by: Ying Li + +commit 6f2e851b29c2c32d73c184bf7402f4a7d3e873af +Merge: cf0bb5a9be a3b9a5543f +Author: Ying Li +Date: Tue Jan 19 16:22:41 2016 -0800 + + Merge pull request #479 from docker/remove_to_lower + + Do not lowercase role names when adding a change + +commit 44307aea4ed2275c0d1054bda07a697e293ac89f +Merge: df083d41f7 23876a5bc9 +Author: Jeffrey Morgan +Date: Tue Jan 19 16:21:34 2016 -0800 + + Merge pull request #375 from docker/verify-vm + + Properly verify that VM does not exist before removing machine files + +commit 39dc28a4dff050d741de47073ede16a07a6db31d +Author: Dong Chen +Date: Tue Jan 19 14:10:14 2016 -0800 + + Fix a race condition in pending engine validation, discard parallel validation result. + + Signed-off-by: Dong Chen + +commit 3b4b168051fdf00e06a89505bce97369749a2587 +Author: Stefan Scherer +Date: Wed Jan 13 00:46:11 2016 +0100 + + Check grand parent if not directly called from a windows shell + + Signed-off-by: Stefan Scherer + +commit 33729d3b5a5f0c49bf14a387f87b918d1adedc48 +Author: John Howard +Date: Wed Nov 11 15:04:40 2015 -0800 + + Windows: VirtualTerminalInput native console + + Signed-off-by: John Howard + +commit 2ff7bf63750c6666f432d9d4a679ca22557b65a3 +Author: Ying Li +Date: Tue Jan 19 15:55:47 2016 -0800 + + Add some comments about the notary constants, and other lint fixes. + + It seems that `make vet` sometimes disagrees locally vs on CircleCI. This + just fixes my local `make vet` complaints. + + Signed-off-by: Ying Li + +commit 33fee1d35656a77e6e054bfd9f6b9009691fa99b +Author: David Lawrence +Date: Fri Jan 15 18:08:09 2016 -0800 + + test for returning nil roundtripper from tokenAuth + Signed-off-by: David Lawrence (github: endophage) + +commit 60d44d8b80dd693f5163f54293e6857b4fb3bb6a +Author: Jessica Frazelle +Date: Thu Jan 14 16:22:06 2016 -0800 + + add warning if upgrading via script to migrate + + Signed-off-by: Jessica Frazelle + +commit 5f73ab89523d240c61d8e745bc106232891b46f7 +Author: Michael Crosby +Date: Tue Jan 19 15:34:08 2016 -0800 + + Update libcontainer to 47e3f834d73e76bc2a6a585b48d + + This adds a fix for the resource struct in the cgroups type and seccomp + IsEnabled function + + Signed-off-by: Michael Crosby + +commit 23876a5bc9c3f2bbb3306c380a0ec76083ac91da +Author: Jeffrey Morgan +Date: Tue Jan 19 00:28:47 2016 -0800 + + Properly verify that VM does not exist before removing all files. + + Signed-off-by: Jeffrey Morgan + +commit e11a7f53719cade69ef8553a71d2d6f025acde98 +Merge: 389784abe1 caef48f4e2 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 14:37:23 2016 -0800 + + Merge pull request #19458 from dmcgowan/layerstore-error-handling + + Add more robust error handling on layer store creation + +commit 46682b71eb9a423b130b5bde464be527527328df +Author: David Lawrence +Date: Fri Jan 15 17:28:26 2016 -0800 + + if we can't connect to the server when setting up, return a nil roundtripper. Check roundtripper when initializing HTTPStore and substitute an OfflineStore if it is nil. + Signed-off-by: David Lawrence (github: endophage) + +commit a3b9a5543fc49c13a82bf84d06ba73a3a2161ada +Author: Ying Li +Date: Tue Jan 19 10:23:52 2016 -0800 + + Do not lowercase role names when adding a change + + Signed-off-by: Ying Li + +commit 389784abe1f82a385f363acc328e2ecdbdcc6eb3 +Merge: c18b4943ea d12f4babdd +Author: Jess Frazelle +Date: Tue Jan 19 14:24:28 2016 -0800 + + Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement + + Fix test requirement for ARM + +commit 8799218d01785aa056c2f1f06f3735c3e93496b4 +Author: Madhu Venugopal +Date: Sun Jan 17 19:34:23 2016 -0800 + + IT for remote network driver & ungraceful restart + + Signed-off-by: Madhu Venugopal + +commit 4f8d28ad7f2f4d3b36db3be90dff02a2bc59642d +Author: Ying Li +Date: Thu Jan 7 16:57:44 2016 -0800 + + Add tests for updating replacing corrupted local cache + + Signed-off-by: Ying Li + +commit b4d3ac881dd588ce3a7834258703a4d6e2b0381c +Author: Ying Li +Date: Thu Jan 7 14:12:06 2016 -0800 + + Add a RemoveMeta function to the MetadataStore interface (useful for testing). + + Signed-off-by: Ying Li + +commit cf0bb5a9be3aa082a011e49a3b1001c3aec8a72d +Merge: 732b85008e 138d6cea09 +Author: Ying Li +Date: Tue Jan 19 13:54:56 2016 -0800 + + Merge pull request #440 from docker/diogo-cli-adding-delegations + + delegation command for notary-cli + +commit ee3b42f385cdb41b2996b4b64f4f319adb62ad03 +Author: Madhu Venugopal +Date: Tue Jan 19 13:49:13 2016 -0800 + + Vendor libnetwork v0.6.0-rc1 + + - Fixes docker/docker#19404 + - Fixes ungraceful daemon restart issue in systemd with remote + network plugin (https://github.com/docker/libnetwork/issues/813) + + Signed-off-by: Madhu Venugopal + +commit 732b85008e646578579042ef4b6e389c3e8bffbf +Merge: 8dac9fd0cd ca67f1e71a +Author: Riyaz Faizullabhoy +Date: Tue Jan 19 13:38:45 2016 -0800 + + Merge pull request #454 from docker/delete-repo-data + + client library and cli deletion functionality + +commit 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b +Author: Aaron Lehmann +Date: Tue Jan 19 13:28:51 2016 -0800 + + Vendor updated docker/distribution package + + Fixes #19400 + + Note that this introduces an incompatibility with Docker 1.10-rc1, + because the media type used for schema1 manifests has been corrected in + the upstream distribution code. Docker 1.10-rc1 won't be able to pull + old manifests from Registry 2.3-rc0 and up, but because of this vendor + update, Docker 1.10-rc2 won't have this problem. + + Signed-off-by: Aaron Lehmann + +commit 5aadf5a187b436ddb81772058dbedeaeea804d95 +Author: Daniel Nephin +Date: Tue Jan 19 15:52:17 2016 -0500 + + Update tests in sort_services_test.py to use pytest. + + Signed-off-by: Daniel Nephin + +commit 146587643c32c076b93b1fa67cd531b5b2003227 +Author: Daniel Nephin +Date: Tue Jan 19 15:47:57 2016 -0500 + + Move ulimits validation to validation.py and improve the error message. + + Signed-off-by: Daniel Nephin + +commit 0bce467782c83b9065a9efaadc1405ba8862116a +Author: Daniel Nephin +Date: Tue Jan 19 15:41:45 2016 -0500 + + Implement depends_on to define an order for services in the v2 format. + + Signed-off-by: Daniel Nephin + +commit c18b4943eaeee8900b844aec09b77763696b6c3d +Merge: 4b63689679 3dc8829a83 +Author: Doug Davis +Date: Tue Jan 19 15:29:46 2016 -0500 + + Merge pull request #19460 from LK4D4/remove_comment + + Remove obsolete comment + +commit d12f4babdd08acd3cf64c2ee4a9550c81d534816 +Author: Christopher Jones +Date: Tue Jan 19 15:23:46 2016 -0500 + + Fix test requirement for ARM + + Correctly passes the DOCKER_ENGINE_GOARCH env var + to the testing environment + + Also fixes logic for skipping a test if on ARM. + + Signed-off-by: Christopher Jones + +commit 3dc8829a83d72d3a8e1d9b6a88c9e6ff9ecaf4a0 +Author: Alexander Morozov +Date: Tue Jan 19 12:17:40 2016 -0800 + + Remove obsolete comment + + Signed-off-by: Alexander Morozov + +commit da26fc26b21606c085ae04ad75c1aaa7e79939f4 +Author: Steve Durrheimer +Date: Tue Jan 19 21:16:16 2016 +0100 + + Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability + + Signed-off-by: Steve Durrheimer + +commit 85619842be6a5c1d5a8068aeb28e158ec32c41ca +Author: Daniel Nephin +Date: Mon Jan 18 14:02:25 2016 -0500 + + Add migration script. + + Signed-off-by: Daniel Nephin + +commit c39489f540a0ee3d027768729fc3895dbd7ecae8 +Author: Daniel Nephin +Date: Tue Jan 19 14:41:21 2016 -0500 + + Don't copy over volumes that were previously host volumes, and are now container volumes. + + Signed-off-by: Daniel Nephin + +commit 4b63689679089f7bb2286e7c330d6a7884c0aec3 +Merge: 30e42a2799 167cc42986 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 11:39:05 2016 -0800 + + Merge pull request #19385 from runcom/better-git-error + + api: client: build: do not fall through if git isn't installed + +commit ca67f1e71ae327d58a595d17ed6e865c9b9f4225 +Author: Riyaz Faizullabhoy +Date: Wed Jan 13 10:59:48 2016 -0800 + + client library deletion functionality, and integration into remove cert + CLI + + Signed-off-by: Riyaz Faizullabhoy + +commit caef48f4e25eb56ae9d63aa58bea588891bed944 +Author: Derek McGowan +Date: Tue Jan 19 11:17:08 2016 -0800 + + Add more robust error handling on layer store creation + + Add continue when layer fails on store creation + Trim whitespace from layerstore files to keep trailing space from failing a layer load + + Fixes #19449 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 47a064d4195a9b56133891bbb13620c3ac83a827 +Merge: 3cb403ae5b 8c1a000799 +Author: Richard Scothern +Date: Tue Jan 19 11:00:47 2016 -0800 + + Merge pull request #1367 from aaronlehmann/signed-manifest-content-type + + Fix content type for schema1 signed manifests + +commit 3c82fad44112dc73861f325bbecd68b9922b0ad3 +Author: David Calavera +Date: Fri Jan 15 18:55:46 2016 -0500 + + Extract container store from the daemon. + + - Generalize in an interface. + - Stop abusing of List for everything. + + Signed-off-by: David Calavera + +commit 8dac9fd0cd5b6ae937c8dea363d0a2f892c89351 +Merge: e451f635e8 b044b65f4b +Author: Ying Li +Date: Tue Jan 19 09:46:56 2016 -0800 + + Merge pull request #478 from HuKeping/minor + + Comments: minor typo + +commit 596836e0e406f92cd68c19ee861fd7c0a3b21806 +Author: Morton Fox +Date: Tue Jan 19 11:25:16 2016 -0500 + + cgroups documentation moved + + Signed-off-by: Morton Fox + +commit 62bcc3085942cf44fae31403d61ef04d70fce39c +Merge: 291533a671 e466ee9479 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 19 16:55:55 2016 +0100 + + Merge pull request #2874 from jeanlaurent/rm-infinite-loop + + Fix infinite loop when deleting machine in ultra weird state + +commit 167cc42986c8939c7aacf73570adaf19b8cad0b3 +Author: Antonio Murdaca +Date: Sat Jan 16 11:59:13 2016 +0100 + + api: client: build: do not fall through if git isn't installed + + Signed-off-by: Antonio Murdaca + +commit e466ee9479fc8254289c36ff889cc64aef4aa832 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 19 16:16:45 2016 +0100 + + Fix infinite loop when deleting machine in ultra weird state + + Signed-off-by: Jean-Laurent de Morlhon + +commit 30e42a27991377e4b278dee089436bc57ee04a4d +Merge: e8ce350669 308eff99e8 +Author: Tibor Vass +Date: Tue Jan 19 10:20:01 2016 -0500 + + Merge pull request #19432 from jfrazelle/fix-x32 + + add send, recv, and x32 so we can install i386 pkgs on amd64 + +commit 291533a67146000754f7ae47195992c079053b02 +Merge: b812fc9e2a 872241e1ae +Author: David Gageot +Date: Tue Jan 19 16:16:35 2016 +0100 + + Merge pull request #2872 from jeanlaurent/itbugsnag + + Fix #2863 - write IT test for bugsnag + +commit c47aea9c125bdd298cafd6d2b2b7e701765654f6 +Merge: 1be147f775 2106481c23 +Author: Daniel Nephin +Date: Tue Jan 19 10:15:06 2016 -0500 + + Merge pull request #2698 from aanand/fix-name-is-reserved + + Fix "name is reserved" with Engine 1.10 RC1 + +commit 1be147f77585ea540da2c775541058c5b672721c +Merge: 5b2b4cbb07 746033ed9d +Author: Daniel Nephin +Date: Tue Jan 19 10:09:42 2016 -0500 + + Merge pull request #2696 from aanand/test-external-default + + Test that you can set the default network to be external + +commit e8ce350669b0b8096ef2bb365ecad6fbfa966bfb +Merge: 011ca5f206 87338bf0fa +Author: Tibor Vass +Date: Tue Jan 19 09:51:54 2016 -0500 + + Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors + + Revert reporting of multiple pull errors + +commit 872241e1ae168365544c2c63ca0da0e3d9e59d55 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 19 15:18:59 2016 +0100 + + Fix #2863 - write IT test for bugsnag + + Signed-off-by: Jean-Laurent de Morlhon + +commit b044b65f4b766d03429f67df9e8f7367b621dfb5 +Author: HuKeping +Date: Tue Jan 19 20:33:36 2016 +0800 + + Comments: minor typo + + Signed-off-by: Hu Keping + +commit 2106481c23429eaf59e653b1bd107c8a809c3cec +Author: Aanand Prasad +Date: Tue Jan 19 11:27:27 2016 +0000 + + Fix "name is reserved" with Engine 1.10 RC1 + + Ensure link aliases are unique (this deduping was previously performed + on the server). + + Signed-off-by: Aanand Prasad + +commit 5b2b4cbb07584e0c5f9f89403ee1b9c34135dbb6 +Merge: 413cdbcb81 9ccef1ea91 +Author: Aanand Prasad +Date: Tue Jan 19 11:25:21 2016 +0000 + + Merge pull request #2692 from aanand/fix-tls-paramater-error + + Catch TLSParameterErrors from docker-py + +commit 746033ed9dd631b1bac68d409c32d17c5be8944f +Author: Aanand Prasad +Date: Tue Jan 19 10:57:12 2016 +0000 + + Test that you can set the default network to be external + + Signed-off-by: Aanand Prasad + +commit 413cdbcb8176d22a254d49357ae8745afcf64d5c +Merge: 683c8b0067 e7180982aa +Author: Aanand Prasad +Date: Tue Jan 19 10:41:08 2016 +0000 + + Merge pull request #2675 from sdurrheimer/zsh-completion-up-abort-on-container-exit + + Add zsh completion for 'docker-compose up --abort-on-container-exit' + +commit 683c8b006712375b705f92b807e577dfbdabef4b +Merge: 9d2e1f58d9 f6561f1290 +Author: Aanand Prasad +Date: Tue Jan 19 10:40:29 2016 +0000 + + Merge pull request #2676 from sdurrheimer/zsh-completion-down-command + + Add zsh completion for 'docker-compose down' + +commit 9d2e1f58d9e31190ca688cbefa313b5a7f0036ff +Merge: adedbee41b d54190167a +Author: Aanand Prasad +Date: Tue Jan 19 10:40:03 2016 +0000 + + Merge pull request #2677 from sdurrheimer/zsh-completion-fix-invalid-commands-cache + + Fix zsh completion to ensure we have enough commands to store in the … + +commit adedbee41b3139a9d7dc073c2267f891a3cd48be +Merge: 341fa58b21 66dd9ae9a4 +Author: Aanand Prasad +Date: Tue Jan 19 10:39:06 2016 +0000 + + Merge pull request #2694 from dnephin/release_script_fixes + + Fix some bugs in release scripts + +commit b812fc9e2abed289fa4325e056db4c7362f71f85 +Merge: 81a13c4af9 3b90a2a0a2 +Author: Jean-Laurent de Morlhon +Date: Tue Jan 19 10:33:35 2016 +0100 + + Merge pull request #2869 from dgageot/fix-typo + + vbm.go typo + +commit 011ca5f206ed2ffaf8a7871da4ea44c6d03cafd6 +Merge: 05e36d254f bccf653082 +Author: Vincent Demeester +Date: Tue Jan 19 10:28:33 2016 +0100 + + Merge pull request #19426 from sanimej/restart + + Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7 + +commit 05e36d254f4310a93df7f5818e85721c3e180d91 +Merge: 25f4f71512 98e5a8efcc +Author: Vincent Demeester +Date: Tue Jan 19 10:26:02 2016 +0100 + + Merge pull request #19437 from HackToday/fixulimit + + Fix ulimit command form + +commit 25f4f7151221d6a0ebb9185c03cef812ac24825d +Merge: 0f04f3ba9f 62b525f75d +Author: Vincent Demeester +Date: Tue Jan 19 10:25:08 2016 +0100 + + Merge pull request #19436 from HackToday/fixhostdev + + Fix add host device example + +commit 0f04f3ba9fa81ff10424a7ef93718f8ea1dc7262 +Merge: 6a1100cafc 3cc5550003 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 00:37:30 2016 -0800 + + Merge pull request #19433 from HackToday/fixclidoc + + Fix the privileged example + +commit 9c6e60b98a059d4bdbe4de6d70de22d9e216dd9a +Merge: 27b76f031f 02e4615929 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 00:28:32 2016 -0800 + + Merge pull request #53 from thaJeztah/add-migrator + + Add v1.10-migrator project + +commit 02e461592950860f67bb5a148d6146e212991183 +Author: Sebastiaan van Stijn +Date: Tue Jan 19 00:25:50 2016 -0800 + + Add v1.10-migrator project + + Signed-off-by: Sebastiaan van Stijn + +commit 3b90a2a0a2701e654332cf47850803ace0c95662 +Author: Henrik Nyh +Date: Sun Jan 17 09:52:07 2016 +0100 + + vbm.go typo + + Signed-off-by: David Gageot + +commit 81a13c4af97ebcf4a8d5c758aab84ee564c89cd4 +Merge: 4bd97a106a ac0adbe7f8 +Author: David Gageot +Date: Tue Jan 19 08:51:16 2016 +0100 + + Merge pull request #2864 from nathanleclaire/deprecate_minus_d + + Update CoreOS provisioner to use 'docker daemon' + +commit 4bd97a106a0bfc26d5e32edb2c74965d5f2c7a9b +Merge: 9603e2c2a3 8ea5300b5a +Author: David Gageot +Date: Tue Jan 19 08:50:26 2016 +0100 + + Merge pull request #2865 from nathanleclaire/inspect_test + + Add test for 'docker-machine inspect' + +commit 9603e2c2a371ab68ae34361dd688b4695fd17a48 +Merge: 3ba53a0869 a494033da9 +Author: David Gageot +Date: Tue Jan 19 08:49:52 2016 +0100 + + Merge pull request #2868 from nathanleclaire/bump_dev_version_0.6.0-rc2 + + Bump version to 0.6.0-rc2-dev + +commit 3ba53a086927b7d862ca6ab9725f358107bc8bff +Merge: 174e390d5b 85cb395c3d +Author: David Gageot +Date: Tue Jan 19 08:48:25 2016 +0100 + + Merge pull request #2867 from nathanleclaire/bump_changelog_0.6.0-rc1 + + Bump changelog for 0.6.0-rc1 + +commit 98e5a8efcc390d2b5de18049e3227db7a257c232 +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 19 07:44:48 2016 +0000 + + Fix ulimit command form + + The ulimit is builtin, so we need shell form to execute it. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 6a1100cafcab1bb0775ffcd13125cbc949e3fb06 +Merge: 42ee908b3f 35dbce109b +Author: Antonio Murdaca +Date: Tue Jan 19 08:43:04 2016 +0100 + + Merge pull request #19429 from mavenugo/epv21 + + nil ptr check for endpointsettings when used with older clients + +commit 62b525f75dbdb78f8ae7ee7f6b2cac2d262dc4dd +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 19 07:00:50 2016 +0000 + + Fix add host device example + + The example is not right in parameter, and also + one command is same as first one, it should be typo + before, we should use 'rw' as example for that. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 3cc5550003c0b11db572f64c9fc801cde0c7447a +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 19 03:33:40 2016 +0000 + + Fix the privileged example + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 42ee908b3faa231322052c27d9ec8ffebc1c40eb +Merge: b6be645197 31dae442c8 +Author: Lei Jitang +Date: Tue Jan 19 14:18:20 2016 +0800 + + Merge pull request #19431 from WeiZhang555/19422-default-network + + bugfix: prevent creating network 'default' + +commit 27b76f031fa95d6412eaf5ffbe3c78de652d51c2 +Merge: 3a866d3c11 a9d530f0b1 +Author: Jess Frazelle +Date: Mon Jan 18 20:17:56 2016 -0800 + + Merge pull request #52 from thaJeztah/add-go-plugins-helpers + + Add go-plugins-helpers and update maintainers + +commit d474f7fb86779aa15ea302f269bfc8d00ad379ec +Author: yangshukui +Date: Tue Jan 19 12:06:01 2016 +0800 + + remove the check of ContentLength in TestApiStatsNoStreamGetCpu + + Signed-off-by: yangshukui + +commit dd569065d84dafe4b55d7b70e904f6ed49e148ca +Merge: 48b9be7ebf d122fb9eb6 +Author: Jeffrey Morgan +Date: Mon Jan 18 19:40:44 2016 -0800 + + Merge branch 'master' of github.com:docker/kitematic + +commit 48b9be7ebfe0bbd7eb4bf52bde2142cbb014c034 +Author: Jeffrey Morgan +Date: Mon Jan 18 19:40:38 2016 -0800 + + Bump version to 0.9.6 + + Signed-off-by: Jeffrey Morgan + +commit 308eff99e8468be4e92951de0ac69b27042a833b +Author: Jessica Frazelle +Date: Mon Jan 18 19:24:01 2016 -0800 + + add send, recv, and x32 so we can install i386 pkgs on amd64 + + Signed-off-by: Jessica Frazelle + +commit 31dae442c8a640694209c7451d6e9bf644aa2743 +Author: Zhang Wei +Date: Tue Jan 19 10:12:02 2016 +0800 + + bugfix: prevent creating network 'default' + + Default is predefined network and is reserved, so we should stop user + from creating network with name `default` + + Signed-off-by: Zhang Wei + +commit d122fb9eb6c9480ad885d3139289c5ccd3ef3930 +Merge: 8ddff7740f afda9d49c4 +Author: Jeffrey Morgan +Date: Mon Jan 18 18:18:50 2016 -0800 + + Merge pull request #1381 from docker/verify-vm + + Properly verify that VM exists + +commit afda9d49c4a843f2b21195198424e519dfd57580 +Author: Jeffrey Morgan +Date: Mon Jan 18 18:06:33 2016 -0800 + + Properly verify that VM exists + + Signed-off-by: Jeffrey Morgan + +commit df083d41f7d920635fcc4055277bc8b6863f4a40 +Author: Jeffrey Morgan +Date: Mon Jan 18 17:44:55 2016 -0800 + + Fix circle.yml deployment + + Signed-off-by: Jeffrey Morgan + +commit 116ea7eb47c13a5f0f3defa9c62ce12cf3bc0465 +Author: Jeffrey Morgan +Date: Mon Jan 18 17:38:50 2016 -0800 + + Deploy on tag + + Signed-off-by: Jeffrey Morgan + +commit 35dbce109bc1128e4abb2bd726055c2daa4842af +Author: Madhu Venugopal +Date: Mon Jan 18 16:51:59 2016 -0800 + + nil ptr check for endpointsettings when used with older clients + + Signed-off-by: Madhu Venugopal + +commit 05f9a6a6fb2a9f7f88dcab9cffb8adae898f9554 +Merge: 3a5499040f 180bc90b1b +Author: Victor Vieux +Date: Mon Jan 18 17:13:00 2016 -0800 + + Merge pull request #1654 from dongluochen/darwinbuild + + Mac build fix + +commit b6be6451971afc7798c1aa22ff73d681c4e0019b +Merge: 637f49b5af 2df5dafdaf +Author: Brian Goff +Date: Mon Jan 18 20:08:25 2016 -0500 + + Merge pull request #19420 from clnperez/close-notify-fix + + Move closeNotify to fix panic with newer golang + +commit 180bc90b1b1d9e73c9147916317d46cb55bed0fb +Author: Dong Chen +Date: Mon Jan 18 16:54:22 2016 -0800 + + Mac build fix + + Signed-off-by: Dong Chen + +commit 1afe76bc9f4a367f6d68edb62c00a2c8754c3f0f +Author: Carol Fager-Higgins +Date: Tue Jan 12 14:28:39 2016 -0800 + + new files for cs engine release notes. Split from DTR. + new prior RNs for cs engine + creating separate RNs for cs engine + getting all RN files to display meta data correctly + separated RNs and tweaked headers a bit + + added aliases + + fixed errors in CS Engine RNs metadata and removed aliases + + Signed-off-by: Carol Fager-Higgins + +commit 3a5499040fd0aa3f493a59af393315f369cd13bc +Merge: af89c1e94a 15c9dbaee0 +Author: Victor Vieux +Date: Mon Jan 18 16:29:12 2016 -0800 + + Merge pull request #1642 from dongluochen/tcpUserTimeout + + Tcp user timeout + +commit 138d6cea09200ab10bf328108dea5d34f4134be5 +Author: Riyaz Faizullabhoy +Date: Wed Jan 6 18:06:32 2016 -0800 + + Add, remove, and list delegation command. TUF changelist action change + for deletions (force vs. individual items) + Signed-off-by: Riyaz Faizullabhoy + +commit 8c1a0007991bb8ca9e91988fa12e1c45efc2899d +Author: Aaron Lehmann +Date: Mon Jan 18 10:26:45 2016 -0800 + + Fix content type for schema1 signed manifests + + The Payload function for schema1 currently returns a signed manifest, + but indicates the content type is that of a manifest that isn't signed. + + Note that this breaks compatibility with Registry 2.3 alpha 1 and + Docker 1.10-rc1, because they use the incorrect content type. + + Signed-off-by: Aaron Lehmann + +commit a494033da926647e319c5cfda07e1e0f353feb84 +Author: Nathan LeClaire +Date: Mon Jan 18 16:02:20 2016 -0800 + + Bump version to 0.6.0-rc2-dev + + Signed-off-by: Nathan LeClaire + +commit 85cb395c3d153240123eec0bdf1b73bbc0628480 +Author: Nathan LeClaire +Date: Mon Jan 18 15:58:08 2016 -0800 + + Bump changelog for 0.6.0-rc1 + + Signed-off-by: Nathan LeClaire + +commit 87338bf0fa97c905d2d707393c95f73aea398cad +Author: Aaron Lehmann +Date: Mon Jan 18 14:17:39 2016 -0800 + + Revert reporting of multiple pull errors + + Revert the portions of #17617 that report all errors when a pull + falls back, and go back to just reporting the last error. This was nice + to have, but causes some UX issues because nonexistent images show + additional "unauthorized" errors. + + Keep the part of the PR that handled ENOSPC, as this appears to work + even without tracking multiple errors. + + Fixes #19419 + + Signed-off-by: Aaron Lehmann + +commit 15c9dbaee09876eb54267c5b6a83e9ff0ace2e5a +Author: Dong Chen +Date: Thu Jan 14 15:52:11 2016 -0800 + + Support TCP_USER_TIMEOUT for Linux and its equivalent in Mac + + Signed-off-by: Dong Chen + +commit 637f49b5af6ac61cce6fadc4a3b8264ec14ca29b +Merge: 416de85359 a4b77dc1af +Author: Jess Frazelle +Date: Mon Jan 18 15:22:08 2016 -0800 + + Merge pull request #19196 from Microsoft/jjh/tp4ci + + Windows CI: Setup for testing against Windows + +commit 3cb403ae5b7e7dde77caf41695ff5342f7b9a475 +Merge: fc7ee6d789 5a2664e0b1 +Author: Richard Scothern +Date: Mon Jan 18 15:20:01 2016 -0800 + + Merge pull request #1363 from aaronlehmann/media-type-charset + + Do not require "charset=utf-8" for a schema1 with content type application/json + +commit af89c1e94addcf59548283a409e05f9bafb2e168 +Merge: 68d053113d 04fb48d27a +Author: Dongluo Chen +Date: Mon Jan 18 15:16:04 2016 -0800 + + Merge pull request #1652 from vieux/update_events_1.10 + + Update events 1.10 + +commit 174e390d5b13a3d6d4a3f3e499493f0048fb41d2 +Merge: d6e7d5b966 a845e1a45c +Author: Nathan LeClaire +Date: Mon Jan 18 15:09:11 2016 -0800 + + Merge pull request #2866 from nathanleclaire/bump-0.6.0-rc1 + + Bump version to 0.6.0-rc1 + +commit 416de85359201676f503911459203cd7c07e4eaf +Merge: a495c148a5 4f339570cb +Author: Jess Frazelle +Date: Mon Jan 18 14:40:46 2016 -0800 + + Merge pull request #19412 from hypriot/skip-tests-on-arm + + Skip failing tests on ARM to get red/green feedback from Jenkins + +commit a845e1a45c69414b945a28de5e410aea94dc98ba +Author: Nathan LeClaire +Date: Mon Jan 18 14:35:30 2016 -0800 + + Bump version to 0.6.0-rc1 + + Signed-off-by: Nathan LeClaire + +commit 8ea5300b5af805362778948cdf88cba34b49c115 +Author: Nathan LeClaire +Date: Mon Jan 18 14:30:11 2016 -0800 + + Add test for 'docker-machine inspect' + + Signed-off-by: Nathan LeClaire + +commit ac0adbe7f874d7d5cae263a95b3ed894380b611b +Author: Nathan LeClaire +Date: Mon Jan 18 14:28:42 2016 -0800 + + Update CoreOS provisioner to use 'docker daemon' + + Signed-off-by: Nathan LeClaire + +commit e451f635e8314daf4650c8cfa9213b970ca22cdf +Merge: 560ffd0483 200fefbff8 +Author: Diogo Mónica +Date: Mon Jan 18 14:14:06 2016 -0800 + + Merge pull request #471 from docker/test_repo_root_cert + + Change testutils.EmptyRepo() to use a cert as the root.json root key. + +commit 9ccef1ea916a55d87102f1fba7b3ff5e484882ed +Author: Aanand Prasad +Date: Mon Jan 18 19:22:04 2016 +0000 + + Catch TLSParameterErrors from docker-py + + Signed-off-by: Aanand Prasad + +commit c4bc9657b9e52f12b37aa36da15c1a2eb86519a3 +Author: Jessica Frazelle +Date: Mon Jan 18 13:14:54 2016 -0800 + + disable install of docker-engine for 1.10, try to get ready for 1.11 + + Signed-off-by: Jessica Frazelle + +commit 66dd9ae9a49bb4483601a161adf7f45e73fb5710 +Author: Daniel Nephin +Date: Mon Jan 18 15:55:30 2016 -0500 + + Fix some bugs in release scripts. + + Signed-off-by: Daniel Nephin + +commit a495c148a5948c372c626c6a4643d361f31374d0 +Merge: 3044a08326 14215ed5a1 +Author: Antonio Murdaca +Date: Mon Jan 18 21:46:49 2016 +0100 + + Merge pull request #19414 from anusha-ragunathan/postBuild + + Make daemonbuilder.Docker leaner. + +commit fc7ee6d789a3eb3fb96f560b8968f2a31ffc7092 +Merge: 775c5fbeba cc82b0d48e +Author: Richard Scothern +Date: Mon Jan 18 12:38:26 2016 -0800 + + Merge pull request #1355 from hopkings2008/master + + In testsuites.go, enlarge the size of randomBytes to 128M to fix the … + +commit 2df5dafdaf12296fa2bd92ced62ba80da41af744 +Author: Christy Perez +Date: Mon Jan 18 14:19:41 2016 -0600 + + Move closeNotify to fix panic with newer golang + + This is happening now due to improvements in net/http: + https://github.com/golang/go/commit/99fb19194c03c618c0d8faa87b91ba419ae28ee3 + + To test, change the go version in the Dockerfile: + -ENV GO_VERSION 1.5.3 + +ENV GO_VERSION 1.6beta2 + + More info here: https://github.com/golang/go/issues/14001 + + Signed-off-by: Christy Perez + +commit 775c5fbeba88daea9f8ff53300a9e93a17163691 +Merge: a1af43d2e0 07e68b3b04 +Author: Richard Scothern +Date: Mon Jan 18 11:58:35 2016 -0800 + + Merge pull request #1354 from RichardScothern/Boran-patch2 + + Carry #1329 : Fixes so that nginx will start + +commit d2556a1347a7a93171431b0d17da9f127142f6a0 +Author: Daniel Nephin +Date: Fri Jan 15 17:51:02 2016 -0500 + + Bump 1.6.0-rc1 + + Signed-off-by: Daniel Nephin + +commit 237f134a0096210f43abc1cb9c73ab40c7e8853e +Author: Aanand Prasad +Date: Mon Jan 18 17:08:50 2016 +0000 + + Allow custom ipam config + + Signed-off-by: Aanand Prasad + +commit 07e68b3b045f8efeff60e8cfa8d9e69cd8ef6b3d +Author: Sean Boran +Date: Fri Oct 2 09:36:36 2015 +0200 + + Carry #1329 : Fixes so that nginx will start + + Signed-off-by: Richard Scothern + + Signed-off-by: Sean Boran + +commit 341fa58b21254637c41880b0ca506d650567097d +Merge: b863fe5723 afae365050 +Author: Aanand Prasad +Date: Mon Jan 18 19:44:07 2016 +0000 + + Merge pull request #2690 from aanand/ipam-config + + Allow custom ipam config + +commit 3044a08326de43617a3b1328b86ccc89ffe0641d +Merge: 2cd74f9932 84e14754e1 +Author: Brian Goff +Date: Mon Jan 18 14:38:34 2016 -0500 + + Merge pull request #19372 from cloudflare/fix-log-copier + + only close LogDriver after LogCopier is done + +commit a1af43d2e08df6498d75322c2294e2deeef692ab +Merge: 7378e21678 19d7c9e051 +Author: Richard Scothern +Date: Mon Jan 18 11:29:01 2016 -0800 + + Merge pull request #1357 from aibaars/gcs-test + + StorageDriver GCS test suite: try google.DefaultTokenSource first + +commit d4720f85ef98c5002140527a844284b86a9718d3 +Author: Aanand Prasad +Date: Mon Jan 18 15:04:10 2016 +0000 + + Update networking docs + + Signed-off-by: Aanand Prasad + +commit b863fe57238e4fc027f6c26b1fc14427364d8dca +Merge: da490f5b0a 6b105a6e92 +Author: Aanand Prasad +Date: Mon Jan 18 18:59:33 2016 +0000 + + Merge pull request #2687 from aanand/update-networking-docs + + Update networking docs + +commit afae3650508f8643f77065cdf7fd160119f07d3b +Author: Aanand Prasad +Date: Mon Jan 18 17:08:50 2016 +0000 + + Allow custom ipam config + + Signed-off-by: Aanand Prasad + +commit 200fefbff8e91a37e91407b54a38c05b0e9f8a34 +Author: Ying Li +Date: Mon Jan 18 10:28:06 2016 -0800 + + EmptyRepo needs to take a GUN in order to generate a valid cert. + + Signed-off-by: Ying Li + +commit 6b105a6e9297f6ee8c16f331a9e8fa32c366902a +Author: Aanand Prasad +Date: Mon Jan 18 15:04:10 2016 +0000 + + Update networking docs + + Signed-off-by: Aanand Prasad + +commit 2cd74f99322403ae6de5ee75c05343b3b35a2645 +Merge: afa9b75c7c 105778343a +Author: Brian Goff +Date: Mon Jan 18 13:33:07 2016 -0500 + + Merge pull request #19391 from cdauth/systemd_tasks_max + + Set TasksMax in addition to LimitNPROC in systemd service files + +commit 560ffd04837a91c3fc5e2c06a66d02fbba85d081 +Merge: aaefd545cf ef3932d6b1 +Author: David Lawrence +Date: Mon Jan 18 10:01:32 2016 -0800 + + Merge pull request #472 from HuKeping/timestamp2snapshot + + Fix a wrong function call + +commit 5a2664e0b1e4f638f32687c7a9779f414b449583 +Author: Aaron Lehmann +Date: Mon Jan 18 09:59:50 2016 -0800 + + Do not require "charset=utf-8" for a schema1 with content type application/json + + For compatibility with other registries that don't use this exact + variant of the Content-Type header, we need to be more flexible about + what we accept. Any form of "application/json" should be allowed. The + charset should not be included in the comparison. + + See docker/docker#19400. + + Signed-off-by: Aaron Lehmann + +commit aaefd545cf7230495dc88b88d752e1879b38b686 +Merge: 5b90639f75 fdc0f04268 +Author: Ying Li +Date: Mon Jan 18 09:56:44 2016 -0800 + + Merge pull request #473 from HuKeping/consistent + + Keep a consistent coding style + +commit afa9b75c7c144586b628afec8a2fece70e9b9769 +Merge: a7652ad276 7465a3149f +Author: Jess Frazelle +Date: Mon Jan 18 09:51:02 2016 -0800 + + Merge pull request #19310 from tophj-ibm/add-registry-remove-notary-on-power + + update registry and remove notary on ppc64le + +commit a7652ad2764f56d5a960f87e110f9fb34641a800 +Merge: 8a4b4f5950 06f48a26f8 +Author: Jess Frazelle +Date: Mon Jan 18 09:50:44 2016 -0800 + + Merge pull request #19410 from tophj-ibm/add-gccgo-target-to-makefile + + Add gccgo target to Makefile + +commit 84e14754e1ef3b089442398a31c5c5813fa9a1b6 +Author: Daniel Dao +Date: Fri Jan 15 13:42:23 2016 +0000 + + only close LogDriver after LogCopier is done + + this prevents the copier from sending messages in the buffer to the closed + driver. If the copied took longer than the timeout to drain the buffer, this + aborts the copier read loop and return back so we can cleanup resources + properly. + + Signed-off-by: Daniel Dao + +commit 14215ed5a1900a88a3b17dd7cd566def50bfcbc9 +Author: Anusha Ragunathan +Date: Tue Jan 12 14:38:55 2016 -0800 + + Make daemonbuilder.Docker leaner. + + Currently builder.Backend is implemented by daemonbuilder.Docker{} for + the daemon. This registration happens in the API/server code. However, + this is too implementation specific. Ideally we should be able to specify + that docker daemon (or any other) is implementing the Backend and abstract + the implementation details. So we should remove package daemonbuilder + dependency in build_routes.go + + With this change, daemonbuilder.Docker is nothing more than the daemon. + A follow on change will remove the daemonbuilder package and move relevant + methods under daemon, so that API only knows about the backend. + + Also cleanup code in api/client/build.go. docker cli always performs build + context tar download for remoteURLs and sends an empty remoteContext. So + remove relevant dead code. + + Signed-off-by: Anusha Ragunathan + +commit 64fc2b85cb0e1d6d8910f648f03c4f05f7e6b50a +Author: Aanand Prasad +Date: Mon Jan 18 16:16:24 2016 +0000 + + Allow overriding of config for the default network + + Signed-off-by: Aanand Prasad + +commit a22d2483908889c627fe5cb87f32b6b252111048 +Author: Aanand Prasad +Date: Mon Jan 18 16:15:52 2016 +0000 + + Quote network names in error messages + + Signed-off-by: Aanand Prasad + +commit da490f5b0a5b2cb4f6640cd2a5054de08c4abee1 +Merge: a677a2c1f0 e7673bf920 +Author: Aanand Prasad +Date: Mon Jan 18 17:08:25 2016 +0000 + + Merge pull request #2686 from aanand/fix-custom-default-network + + Allow overriding of config for the default network + +commit 8a4b4f5950dc85dc987dd7363495cbc38bf77972 +Merge: f5299b64aa 67fe772ca6 +Author: Tianon Gravi +Date: Mon Jan 18 08:36:33 2016 -0800 + + Merge pull request #19409 from albers/completion-network-links + + bash completion for container linking and aliasing + +commit f5299b64aaed12e275d67c0d2022717a8d84ca92 +Merge: 82401a4b13 6ae4ffb6e5 +Author: Tianon Gravi +Date: Mon Jan 18 08:34:59 2016 -0800 + + Merge pull request #19411 from albers/completion-network-create--internal + + Update bash completion for `docker network create` + +commit e7673bf920162b63173631c6ede97e0e22cb4508 +Author: Aanand Prasad +Date: Mon Jan 18 16:16:24 2016 +0000 + + Allow overriding of config for the default network + + Signed-off-by: Aanand Prasad + +commit 53d56ea2456813c910a6500fbad5841286c94db1 +Author: Aanand Prasad +Date: Mon Jan 18 16:15:52 2016 +0000 + + Quote network names in error messages + + Signed-off-by: Aanand Prasad + +commit 4f339570cbd3cc57f5410c4ca08c7d7e03e6e56f +Author: Stefan Scherer +Date: Thu Nov 26 00:38:33 2015 +0100 + + Skip failing tests on ARM to get red/green feedback from Jenkins + + Signed-off-by: Stefan Scherer + +commit 6ae4ffb6e5b82ebef504c5dc547ec97d01e0856f +Author: Harald Albers +Date: Mon Jan 18 07:50:26 2016 -0800 + + bash completion for `docker network create --internal, --ipam-opt` + + Signed-off-by: Harald Albers + +commit 06f48a26f880f9bdfd853cbe94e8a8e9cecfee14 +Author: Christopher Jones +Date: Mon Jan 18 10:33:12 2016 -0500 + + Add gccgo target to Makefile + + Adds a gccgo target to the Makefile + + Signed-off-by: Christopher Jones + +commit 67fe772ca627adf1c0e5937de72e30481068820f +Author: Harald Albers +Date: Mon Jan 18 07:11:19 2016 -0800 + + bash completion for container linking and aliasing + + Signed-off-by: Harald Albers + +commit fdc0f042682ae017a2706861a77319ebf3d81b3a +Author: HuKeping +Date: Mon Jan 18 19:58:02 2016 +0800 + + Keep code style consistent + + GetLeafCerts and GetIntermediaCerts are similiar and a consistent + implementation will be more friendly to those people who wants to read + the code. + + Signed-off-by: Hu Keping + +commit d6e7d5b966fa8914f6e7466813a65ac6cf67c80c +Merge: f289123574 a0852829c6 +Author: David Gageot +Date: Mon Jan 18 12:53:40 2016 +0100 + + Merge pull request #2846 from jeanlaurent/aws-doc-update + + Update AWS doc + +commit a0852829c64873f4a29bbfbc72783eaf2f05af38 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 17:48:49 2016 +0100 + + Update AWS doc + + Signed-off-by: Jean-Laurent de Morlhon + +commit f289123574448690a88baab06546fc495c347158 +Merge: 38b6ae3ce4 b5e6e20a8f +Author: Jean-Laurent de Morlhon +Date: Mon Jan 18 12:36:46 2016 +0100 + + Merge pull request #2856 from dgageot/fix-bugsnag + + Fix bugsnag + +commit ef3932d6b1f883be3d7e33b57fb0e61f763ebd05 +Author: HuKeping +Date: Mon Jan 18 19:23:46 2016 +0800 + + Fix a wrong function call + + Signed-off-by: Hu Keping + +commit b5e6e20a8f75abb0e132efabee1e59119758e9c1 +Author: David Gageot +Date: Mon Jan 18 11:56:20 2016 +0100 + + Disable bugsnag report for upgrades for now + + Signed-off-by: David Gageot + +commit d518e171b947999774be59767605375df2ed0cb5 +Author: David Gageot +Date: Mon Jan 18 11:42:21 2016 +0100 + + Fix bugsnag reports for create + + Signed-off-by: David Gageot + +commit 38b6ae3ce4d382729ba6f1bf58dbfd6679fc9336 +Merge: b71873ad2d 19ec3e6d50 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 18 11:15:03 2016 +0100 + + Merge pull request #2855 from dgageot/fix-the-build + + Fix the build + +commit 66c253cbf70f5dcf75d47be9558a18096a39bc58 +Author: Kai Qiang Wu(Kennan) +Date: Mon Jan 4 08:37:01 2016 +0000 + + Fix volume filter validation + + Fixes: #18890 + This fix add same filter validation logic as images. We should + add such check to make sure filters work make sense to end-users + + Right now, we keep old use 1 as filter, but in long term, it should + be have same interface checking as images, it could be improved in + other patches. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 19ec3e6d50d2d047856931856a0656e5fc3b4195 +Author: David Gageot +Date: Mon Jan 18 11:06:03 2016 +0100 + + Fix the build + + Signed-off-by: David Gageot + +commit b71873ad2d00be30bf30a4a2f0a40c57918d6372 +Merge: 501b8666ce 00040796e2 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 18 09:55:22 2016 +0100 + + Merge pull request #2849 from frapposelli/fix-mount-fusion + + Fix shared folder mount on restart + +commit 501b8666ce740bc8399bfa8880fb7d721b40a6e2 +Merge: 51c49091c3 01c7556e3a +Author: David Gageot +Date: Mon Jan 18 08:53:15 2016 +0100 + + Merge pull request #2121 from nathanleclaire/provision_cmd + + Add docker-machine provision command + +commit 51c49091c3d6fcc9e09d610bccdbfaeb6075c751 +Merge: 947adf539c 5000139c8e +Author: David Gageot +Date: Mon Jan 18 08:49:31 2016 +0100 + + Merge pull request #2843 from nathanleclaire/short_form_cmds + + Add ability to imply 'default' VM in commands + +commit 49bbe939f83d67341682545396ad529a0339ecc1 +Author: Jeffrey Morgan +Date: Sun Jan 17 11:52:56 2016 -0800 + + Removing unnecessary circle file + + Signed-off-by: Jeffrey Morgan + +commit bccf653082dababc1827be3aa9976e3100037a80 +Author: Santhosh Manohar +Date: Sun Jan 17 08:17:13 2016 -0800 + + Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7 + + - Fixes the issue of Shutdown() not working, resulting in hung + goroutines + + Signed-off-by: Santhosh Manohar + +commit 1d8ccc6ae7dafde55cf4458e3119f61c83ccbc4a +Author: Vincent Demeester +Date: Thu Jan 7 23:14:05 2016 +0100 + + Add the possibility to log event with specific attributes + + Signed-off-by: Vincent Demeester + +commit c6de0c3dc6537efea2fd05045af4c8dedc45c67f +Author: Victor Vieux +Date: Sat Jan 16 21:08:00 2016 -0800 + + update some comments + + Signed-off-by: Victor Vieux + +commit c9e3b7dda34e590c7d6ebf3bcf9fa1a03b156fd6 +Author: Victor Vieux +Date: Sat Jan 16 20:41:32 2016 -0800 + + enable cross compile in travis again + + Signed-off-by: Victor Vieux + +commit 13d2212a3ad748d7568923017c411e193473a76e +Author: Victor Vieux +Date: Sat Jan 16 20:29:59 2016 -0800 + + rename 2 handlers + + Signed-off-by: Victor Vieux + +commit 292389aec40d3d2e84b558b64e581694b5b7f0b0 +Author: Jeffrey Morgan +Date: Sat Jan 16 17:52:27 2016 -0800 + + Remove test settings + + Signed-off-by: Jeffrey Morgan + +commit 1225eddc79374c1ec1d54475a8874b8c215269a3 +Author: Victor Vieux +Date: Sat Jan 16 13:44:48 2016 -0800 + + allow engine/name support in volumes + + Signed-off-by: Victor Vieux + +commit 217c137247b7548eec607950b798413475a4d69b +Author: Jeffrey Morgan +Date: Sat Jan 16 15:30:00 2016 -0800 + + CircleCI test: make + + Signed-off-by: Jeffrey Morgan + +commit 9927093bcebd694eed08d64efff54d75d691f899 +Author: Jeffrey Morgan +Date: Sat Jan 16 14:30:20 2016 -0800 + + Include circle mac yml + + Signed-off-by: Jeffrey Morgan + +commit 0cc6becdc1d81801ae2a7759c6a2d05ac95cdc14 +Author: Jeffrey Morgan +Date: Sat Jan 16 14:01:30 2016 -0800 + + Fix bug with circleci cp + + Signed-off-by: Jeffrey Morgan + +commit f42d6973154c0cd3acb305048ffc5012b1bcb304 +Author: Victor Vieux +Date: Sat Jan 16 13:45:46 2016 -0800 + + update year typo in the CHANGELOG + + Signed-off-by: Victor Vieux + +commit c938352cab08b03e3c44323f62b274217acb4cc4 +Author: Jeffrey Morgan +Date: Sat Jan 16 13:10:48 2016 -0800 + + Fix deps + + Signed-off-by: Jeffrey Morgan + +commit 37a8809c12ae93f99b5c5358e04ec8d034bd4428 +Author: Jeffrey Morgan +Date: Sat Jan 16 13:02:13 2016 -0800 + + Updated circleci.yml + + Signed-off-by: Jeffrey Morgan + +commit 105778343a2e5d510fae1cbdb1b7ab6879e5a028 +Author: Candid Dauth +Date: Sat Jan 16 18:26:08 2016 +0100 + + Set TasksMax in addition to LimitNPROC in systemd service files + + systemd sets an additional limit on processes and threads that defaults to 512 when run under Linux >= 4.3. + See more information here: http://unix.stackexchange.com/a/255603/59955 + + Signed-off-by: Candid Dauth + +commit fffedfc87b4aa53ee2fecc9ba950309025b8b8be +Author: Daniel Nephin +Date: Fri Jan 15 19:04:01 2016 -0500 + + Test against 1.10rc1. + + Signed-off-by: Daniel Nephin + +commit 82401a4b13c0581908d46dbc3e7b475c7de48334 +Merge: a2b72dc4ba 581a55d54c +Author: Brian Goff +Date: Sat Jan 16 08:04:05 2016 -0500 + + Merge pull request #19386 from sdurrheimer/zsh-completion-network-create-internal + + Add zsh completion for 'docker network create --internal' + +commit a2b72dc4ba1983224bc06acfa69b74b21801f0af +Merge: f1c6cd57fa 0a9508e821 +Author: Brian Goff +Date: Sat Jan 16 07:57:13 2016 -0500 + + Merge pull request #19387 from sdurrheimer/zsh-completion-network-connect-disconnect-stopped-containers + + Modify zsh completion for connecting/disconnecting non-running contai… + +commit d54190167ac665ae2b56a5031a18bc210e40faa0 +Author: Steve Durrheimer +Date: Sat Jan 16 13:53:16 2016 +0100 + + Fix zsh completion to ensure we have enough commands to store in the cache + + Signed-off-by: Steve Durrheimer + +commit f6561f1290b16d4c438683f7bd78a2127529ed79 +Author: Steve Durrheimer +Date: Sat Jan 16 13:47:48 2016 +0100 + + Add zsh completion for 'docker-compose down' + + Signed-off-by: Steve Durrheimer + +commit e7180982aa0555f47c3e8f4a42c6f5d862465e86 +Author: Steve Durrheimer +Date: Sat Jan 16 13:22:02 2016 +0100 + + Add zsh completion for 'docker-compose up --abort-on-container-exit' + + Signed-off-by: Steve Durrheimer + +commit 0a9508e821384b96979d1dd91acdb67ed83f8e7f +Author: Steve Durrheimer +Date: Sat Jan 16 12:59:20 2016 +0100 + + Modify zsh completion for connecting/disconnecting non-running containers to networks + + Signed-off-by: Steve Durrheimer + +commit 581a55d54c135b2e92cfb3d16939bea33a242723 +Author: Steve Durrheimer +Date: Sat Jan 16 12:53:50 2016 +0100 + + Add zsh completion for 'docker network create --internal' + + Signed-off-by: Steve Durrheimer + +commit a9d530f0b1f79fa679480fd8eeda50ed564485f2 +Author: Sebastiaan van Stijn +Date: Sat Jan 16 01:26:32 2016 -0800 + + Add go-plugins-helpers and update maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit f1c6cd57fab751464c174a84b41b511cb400ee55 +Merge: 785493226b 693b5c4298 +Author: Sebastiaan van Stijn +Date: Sat Jan 16 01:04:32 2016 -0800 + + Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver + + Fixing TestInspectApiContainerVolumeDriver + +commit 785493226b50ee844f7026f2f846ebf94ed5a9dc +Merge: d232ed4cea e281f640c6 +Author: Sebastiaan van Stijn +Date: Sat Jan 16 01:00:19 2016 -0800 + + Merge pull request #19379 from thaJeztah/update-windows-dockerfile + + Switch Windows Dockerfile to golang 1.5.3 + +commit ab113e7750c68fc8426ea82af302bbe3e514bce2 +Author: Victor Vieux +Date: Sat Jan 16 00:25:50 2016 -0800 + + Add more unit tests for spread strategy + + Signed-off-by: Victor Vieux + +commit 947adf539c0236a1c779ef8ce48c92067aa01fa8 +Merge: 0bbf6f126d 21e4472920 +Author: Jean-Laurent de Morlhon +Date: Sat Jan 16 08:38:02 2016 +0100 + + Merge pull request #2850 from zchee/fix-provision-redhat + + Fix docker daemon flag on redhat + +commit 21e447292039b8ecee10037531d216c853a1ccd0 +Author: Koichi Shiraishi +Date: Sat Jan 16 12:54:06 2016 +0900 + + Fix docker daemon flag on redhat + + - Same as https://github.com/docker/machine/pull/2844 + + Signed-off-by: Koichi Shiraishi + +commit 04fb48d27af475e17a52c75a5e1f92933536079a +Author: Victor Vieux +Date: Fri Jan 15 18:30:46 2016 -0800 + + support 1.10 events + + Signed-off-by: Victor Vieux + +commit 5b90639f7540a175802709d9f1727fc1d7386dab +Merge: c44de7e37a dd0223f7cf +Author: Diogo Mónica +Date: Fri Jan 15 19:11:26 2016 -0800 + + Merge pull request #465 from docker/test_dropping_keys_in_tufkeys + + Test dropping keys in tuf_keys + +commit 0bbf979cf4a034c6312c97c82270d044dd8ae7c0 +Author: Ying Li +Date: Fri Jan 15 19:03:07 2016 -0800 + + Change testutils.EmptyRepo() to use a cert as the root.json root key. + + This involves making it use ECDSA keys since we can't generate ED25519 certs. + + Signed-off-by: Ying Li + +commit dd0223f7cfd3f13bcf00f291b000dacb248d82b8 +Author: Ying Li +Date: Fri Jan 15 13:40:06 2016 -0800 + + Fix pretty-print keys to not print "." if there is no GUN. + + Signed-off-by: Ying Li + +commit 877d47bb5cd6afe8909c8e149f2160ef9f053908 +Author: Ying Li +Date: Fri Jan 15 13:37:44 2016 -0800 + + Add tests to ensure you can just drop a key in tuf_key and use it for signing. + + This is important for user keys, which do not necessarily need to be under a GUN, + and may have a role other than one of the canonical roles (e.g. "user" role). + + Signed-off-by: Ying Li + +commit d232ed4cea83a9f908b37012eea8627610a3d1ef +Merge: b69243e951 aabe39be01 +Author: Sebastiaan van Stijn +Date: Fri Jan 15 18:51:29 2016 -0800 + + Merge pull request #19382 from Collinux/master + + Fixed typo in experimental/plugins_graphdriver.md + +commit aabe39be01c70318af57159b235a4ddd8781051b +Author: Collin Guarino +Date: Fri Jan 15 21:27:59 2016 -0500 + + Fixed typo in experimental/plugins_graphdriver.md + + Signed-off-by: Collin Guarino + +commit d884fe563be8642ff95130b42d1735478f04ba58 +Author: Victor Vieux +Date: Fri Jan 15 18:30:36 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit a677a2c1f0f79e1539d46c060a61c9c6af5a558c +Merge: cce3b29688 ab927b986f +Author: Joffrey F +Date: Fri Jan 15 17:13:56 2016 -0800 + + Merge pull request #2674 from dnephin/use-1.10-rc1 + + Test against docker 1.10.0-rc1 + +commit 5000139c8e5ffdaccec1a16d254871cfa89d899a +Author: Nathan LeClaire +Date: Thu Jan 14 19:03:46 2016 -0800 + + Add ability to imply 'default' VM in commands + + Signed-off-by: Nathan LeClaire + +commit b69243e951a9845c3bd3e718452865c2753b7a0c +Merge: 4e9ee2a239 c64f9407a4 +Author: Jess Frazelle +Date: Fri Jan 15 16:56:11 2016 -0800 + + Merge pull request #19169 from Djelibeybi/fix-ol6-build + + Restoring the RPM build process for Oracle Linux 6 + +commit ab927b986fc5317a0ceb42de1546afe5326f942a +Author: Daniel Nephin +Date: Fri Jan 15 19:04:01 2016 -0500 + + Test against 1.10rc1. + + Signed-off-by: Daniel Nephin + +commit e281f640c69a11d7c211e167691cbc563ecdeac7 +Author: Sebastiaan van Stijn +Date: Fri Jan 15 15:52:53 2016 -0800 + + Switch Windows Dockerfile to golang 1.5.3 + + Also renamed the env-variable to match what + we use in other locations (for easier finding) + + Signed-off-by: Sebastiaan van Stijn + +commit 4e9ee2a239747fb19e26818cf8ed95d8bbfc3e27 +Merge: b70d615222 08fe0a18f8 +Author: Jess Frazelle +Date: Fri Jan 15 15:42:47 2016 -0800 + + Merge pull request #19373 from Microsoft/jjh/makefile + + Windows: Update makefile + +commit b70d6152225ca341a1432f09320825bf05898dac +Merge: 15e5cd14d6 6c88b8efea +Author: Jess Frazelle +Date: Fri Jan 15 15:42:11 2016 -0800 + + Merge pull request #18348 from hypriot/add-dockerfile-for-windows + + Add initial support building Windows docker in docker + +commit 3466e5c91111c43fb4a9850d3dc1ba417be478a6 +Author: Jessica Frazelle +Date: Fri Jan 15 15:29:43 2016 -0800 + + fix selinux version for contrib/builder generation + + Signed-off-by: Jessica Frazelle + +commit 34fd042dbf0e3de5223f1cc333cf94437d311845 +Author: Daniel Nephin +Date: Fri Jan 15 10:14:55 2016 -0500 + + Increase the timeout for all acceptance tests. + + Signed-off-by: Daniel Nephin + +commit 89e31f7a8d50d743398815d3c2f0bde3c7fd9c01 +Author: Daniel Nephin +Date: Thu Jan 14 22:28:20 2016 -0500 + + Validate that an extended config file has the same version as the base. + + Signed-off-by: Daniel Nephin + +commit cce3b29688a6046c44ce7d391bbf9b294c9f8f7d +Merge: 9e805731e7 0f1a798f28 +Author: Daniel Nephin +Date: Fri Jan 15 18:07:56 2016 -0500 + + Merge pull request #2665 from dnephin/check_extends_use_same_version + + Validate that an extended config file has the same version as the base + +commit 15e5cd14d67d28f3ad843bc792010b72a8e0635d +Merge: 790e648c06 d104ddb564 +Author: David Calavera +Date: Fri Jan 15 14:21:37 2016 -0800 + + Merge pull request #19255 from hqhq/hq_build_args_makefile + + Add DOCKER_BUILD_ARGS support for make build + +commit 790e648c0613e435be56727e1ebbdc0ccf8aeb56 +Merge: c476b2e3b5 6ca5a2c476 +Author: Alexander Morozov +Date: Fri Jan 15 14:10:56 2016 -0800 + + Merge pull request #19340 from Microsoft/jjh/rsrcfix + + Windows: Remove linkmode internal hack + +commit b446c097350f5981cf8ab411f1dba7e8307f6f65 +Merge: 9e805731e7 8f48fa4747 +Author: Daniel Nephin +Date: Fri Jan 15 17:02:06 2016 -0500 + + Merge remote-tracking branch 'docker/release' into bump-1.6.0-rc1 + +commit c476b2e3b5dd480a2b886ec4c20950c0e22fb3e7 +Merge: 402ba93f68 ac627fbb38 +Author: Vincent Demeester +Date: Fri Jan 15 22:44:46 2016 +0100 + + Merge pull request #19041 from Akasurde/11556 + + Updated documentation related to apt-cacher-ng + +commit c44de7e37a3d43787039464d9aded92dd1062358 +Merge: 503a2cfe3c c0fb05584e +Author: David Lawrence +Date: Fri Jan 15 13:40:11 2016 -0800 + + Merge pull request #415 from endophage/cleaning_certs_code + + some cleanup of certs code + +commit 402ba93f68fd969536bfd541663c57d44cc4e8dd +Merge: dd104eb91d 76ebd3dd17 +Author: Alexander Morozov +Date: Fri Jan 15 13:30:23 2016 -0800 + + Merge pull request #19374 from Microsoft/jjh/termdeadcode + + Windows: Remove dead/unused code + +commit 00040796e25025962ac0a243c48419f2863891cb +Author: Fabio Rapposelli +Date: Fri Jan 15 22:21:36 2016 +0100 + + Fix shared folder mount on restart + + Signed-off-by: Fabio Rapposelli + +commit 0bbf6f126d992435dce14907285ea8970941bd9e +Merge: 9ed16a0e4e 84ff3e3549 +Author: Nathan LeClaire +Date: Fri Jan 15 13:20:26 2016 -0800 + + Merge pull request #2789 from robvanmieghem/master + + FIX #2411 On a btrfs system, don't default to aufs + +commit dd104eb91d6e2eeb92467363d75c762ec303ac84 +Merge: bc13e4a99e 9b2aab3fc8 +Author: Phil Estes +Date: Fri Jan 15 16:06:14 2016 -0500 + + Merge pull request #19345 from tianon/fast-syscall-compile + + Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included + +commit 9ed16a0e4e0cecaf4efca5d84027c1dad79db17f +Merge: 53c5b1f481 c3131ec3fa +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 21:49:18 2016 +0100 + + Merge pull request #2847 from jeffellin/UseExistingKeypair + + Fixes #1898. Add parameter to pass private key path to use when creat… + +commit 76ebd3dd179444b4a464db6e970030dd695cf5a1 +Author: John Howard +Date: Fri Jan 15 12:48:40 2016 -0800 + + Windows: Remove dead code + + Signed-off-by: John Howard + +commit 9e805731e7db8f5268ccf98fc228ff0b78eb4dfc +Merge: a104e11191 82b288b25b +Author: Daniel Nephin +Date: Fri Jan 15 15:23:24 2016 -0500 + + Merge pull request #2671 from dnephin/fix_linux_master_build + + Fix linux master build + +commit bc13e4a99e92c1d259d6108bee19ddebc724106d +Merge: b63b43dc4c 1a60a805bf +Author: Phil Estes +Date: Fri Jan 15 15:17:52 2016 -0500 + + Merge pull request #19369 from cpuguy83/19362_fix_exec_panic + + Fix panic on starting exec more than once + +commit 84ff3e3549bddc6802bce835124fd43142aeae3d +Author: Rob Van Mieghem +Date: Fri Jan 15 21:13:29 2016 +0100 + + Improve provisiontest.FakeSSHCommander + + Signed-off-by: Rob Van Mieghem + +commit c3131ec3faa91d66aa5251386f234e2f0f0a1870 +Author: Jeffrey Ellin +Date: Fri Jan 15 15:10:03 2016 -0500 + + Fixes #1898. Add parameter to pass private key path to use when creating a machine. + + It is assumed that the corresponding public certificate will be the same file name + .pub + + Signed-off-by: Jeffrey Ellin + +commit 82b288b25b4306157b3edc3dfc5fca8b8285044a +Author: Daniel Nephin +Date: Fri Jan 15 15:02:19 2016 -0500 + + Fix linux master build. + + Signed-off-by: Daniel Nephin + +commit 08fe0a18f8fbb8e6aaa3760e4e6ffd6032731ca2 +Author: John Howard +Date: Fri Jan 15 11:45:13 2016 -0800 + + Windows: Update makefile + + Signed-off-by: John Howard + +commit c0fb05584e5f79235cb494278c309e47aa3fc40f +Author: David Lawrence +Date: Mon Jan 11 09:53:52 2016 -0800 + + fixing incorrect comments + Signed-off-by: David Lawrence (github: endophage) + +commit 9e80ad8158c1378839938601613e065e51eb0a40 +Author: David Lawrence +Date: Thu Jan 7 18:07:02 2016 -0800 + + remove certs.NewManager function + Signed-off-by: David Lawrence (github: endophage) + +commit a8b21cafe019616a43afadc58865578e4e1039e4 +Author: David Lawrence +Date: Thu Jan 7 17:51:44 2016 -0800 + + CertManager is completely removed + Signed-off-by: David Lawrence (github: endophage) + +commit 78fb3eef7f6bd121cf238472f180eb35f96b46a8 +Author: David Lawrence +Date: Thu Jan 7 17:24:09 2016 -0800 + + trustedCAStore isn't being used anywhere, deleted it + Signed-off-by: David Lawrence (github: endophage) + +commit 48ecd8d2cbf4a900b0200d118c3170f859d2f358 +Author: David Lawrence +Date: Tue Jan 5 16:33:51 2016 -0800 + + some cleanup of certs code + Signed-off-by: David Lawrence (github: endophage) + +commit b63b43dc4c4777a25b722da96a9f1c6e71d98e2a +Merge: 012a3b6e74 55cec657bb +Author: David Calavera +Date: Fri Jan 15 09:44:47 2016 -0800 + + Merge pull request #19219 from runcom/add-log + + integration-cli: log error when starting registry + +commit 61a49bb6ba2c0f17a31a64ee6336b4fc40c37f71 +Author: Daniel Nephin +Date: Mon Jan 4 13:36:01 2016 -0500 + + Remove the use of dockerversion from the registry package + + Signed-off-by: Daniel Nephin + +commit 1a60a805bfabee729dbc833515cd0be439adb95b +Author: Brian Goff +Date: Fri Jan 15 11:57:23 2016 -0500 + + Fix panic on starting exec more than once + + Issue was caused when exec is tarted, exits, then stated again. + In this case, `Close` is called twice, which closes a channel twice. + + Changes execConfig.ExitCode to a pointer so we can test if the it has + been set or not. + This allows us to return early when the exec has already been run. + + Signed-off-by: Brian Goff + +commit 012a3b6e74d753e1b0560d8f9b085b0fa0a80c0f +Merge: 9b63019711 a0fab35fe8 +Author: Tibor Vass +Date: Fri Jan 15 10:48:15 2016 -0500 + + Merge pull request #19365 from tiborvass/bump_apiversion_to_v1.23 + + Bump API Version to v1.23 + +commit 53c5b1f4816837fab43ab8b8450cf527fc9dbc72 +Merge: dd5dd5d178 37c174d25a +Author: David Gageot +Date: Fri Jan 15 16:47:29 2016 +0100 + + Merge pull request #2845 from jeanlaurent/aws-unit-test-are-unit-again + + Fix 2829 : aws unit test are unit again + +commit dd5dd5d178d0adb35e1ae0eaea655b0e92af90c8 +Merge: 438f91c6ba 278cc175a2 +Author: David Gageot +Date: Fri Jan 15 16:46:54 2016 +0100 + + Merge pull request #2790 from daehyeok/vmwarefusion_dhcp + + VMWARE Fusion get IP from multiple leases files + +commit a0fab35fe80f201fc40477a32a992f6cd931cf44 +Author: Tibor Vass +Date: Fri Jan 15 10:38:33 2016 -0500 + + Bump API Version to v1.23 + + Signed-off-by: Tibor Vass + +commit 0f1a798f28b124bd9d1d5b36c3c71bd7a9999edf +Author: Daniel Nephin +Date: Fri Jan 15 10:14:55 2016 -0500 + + Increase the timeout for all acceptance tests. + + Signed-off-by: Daniel Nephin + +commit 66d24c2b44a076a6dda17dabe028da9acaa55deb +Author: Qiang Huang +Date: Fri Jan 15 14:25:03 2016 +0000 + + Add support for build and test docker on arm64 + + Signed-off-by: Qiang Huang + +commit 37c174d25abd293b7978f8f6780f7a05c03ba5b7 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 14:40:12 2016 +0100 + + Add missing test on SecurityGroupPermission + + Signed-off-by: Jean-Laurent de Morlhon + +commit 6023e131691a8a5d69f171370b692f858fe6002f +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 13:38:01 2016 +0100 + + Fix 2829 : aws unit test are unit again + + Signed-off-by: Jean-Laurent de Morlhon + +commit 438f91c6ba9518ad542c443f775352728c118b86 +Merge: 8094d6ce52 bc07ba3006 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 13:01:05 2016 +0100 + + Merge pull request #2839 from jeanlaurent/aws-credentials + + Use ~/.aws/credentials file to login to ec2 + +commit 9b630197111fabedd3e382eb94812ecba0435be7 +Merge: 4c89b1f72c 5063efb8d8 +Author: Vincent Demeester +Date: Fri Jan 15 12:48:42 2016 +0100 + + Merge pull request #19234 from jdoliner/patch-1 + + Remove Pachyderm storage driver. + +commit 19d7c9e051bf55959eefc9969c68acbe3b1ef23d +Author: Arthur Baars +Date: Fri Jan 15 11:47:26 2016 +0000 + + StorageDriver GCS: try google.DefaultTokenSource first + + Signed-off-by: Arthur Baars + +commit bc07ba300634a739cf77da6fe1351c98606bf140 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 09:57:49 2016 +0100 + + Sample Integration Test + + Signed-off-by: Jean-Laurent de Morlhon + +commit 89f3308088382e4eaa9362f0b565e461f78f1971 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 11:05:50 2016 +0100 + + Use ~/.aws/credentials file when no access/secret is given in cli + + Signed-off-by: Jean-Laurent de Morlhon + +commit 8094d6ce52d7a0634f430a6620b02d6114c672d6 +Merge: ee5d3b3174 28b2fe9ce0 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 15 11:10:27 2016 +0100 + + Merge pull request #2844 from zchee/fix-provision-systemd + + Fix docker daemon flag on systemd + +commit 599a84b4694e5a8ce734702ef7e454c96e4e621c +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 15:31:24 2016 +0100 + + Allow stubbing AWS Login + + Signed-off-by: Jean-Laurent de Morlhon + +commit 5063efb8d84aac9f7e11cbfe41ac3dbd264cb1b9 +Author: Joe Doliner +Date: Mon Jan 11 05:34:43 2016 -0800 + + Remove Pachyderm storage driver. + + Signed-off-by: Joe Doliner + +commit cc82b0d48ee65eba02f150978e2c675dd002f34b +Author: yuzou +Date: Fri Jan 15 17:22:43 2016 +0800 + + In testsuites.go, enlarge the size of randomBytes to 128M to fix the crash of running TestConcurrentStreamReads + + Signed-off-by: yuzou + +commit 4c89b1f72c1259858e243ddbfb00d74dbafeff8a +Merge: bca9415b52 dd7436c832 +Author: Jess Frazelle +Date: Fri Jan 15 01:02:35 2016 -0800 + + Merge pull request #19355 from riyazdf/notary-revendor + + notary revendor into docker + +commit bca9415b526d413778fb271be4f5c0208915a027 +Merge: 8ce8813cdc 7481961009 +Author: Antonio Murdaca +Date: Fri Jan 15 09:32:53 2016 +0100 + + Merge pull request #19356 from sanimej/restart + + Vendoring libnetwork v0.5.6 + +commit 8ce8813cdca852b3f0c6ed69fa896023e6fd5bc2 +Merge: c56ed85f3d 5cc672b006 +Author: Vincent Demeester +Date: Fri Jan 15 09:07:18 2016 +0100 + + Merge pull request #18928 from wenchma/18626-add_subnets_info + + Add Subnets info for user-defined network + +commit ee5d3b31743bf47a62830c94d58f7f1767a4c606 +Merge: 7246b2c965 aa54a5f272 +Author: David Gageot +Date: Fri Jan 15 08:44:59 2016 +0100 + + Merge pull request #2493 from nathanleclaire/ssh_help_additional_tests + + Additional SSH tests + +commit dd7436c832a5dd777d0276c3e3b1819062b86ebc +Author: Riyaz Faizullabhoy +Date: Thu Jan 14 12:21:55 2016 -0800 + + revendor notary and wrap friendlier error messages + + Signed-off-by: Riyaz Faizullabhoy + +commit 28b2fe9ce054d482be0174e5493274f1eab08108 +Author: Koichi Shiraishi +Date: Fri Jan 15 11:06:57 2016 +0900 + + Fix docker daemon flag on systemd + + Signed-off-by: Koichi Shiraishi + +commit c56ed85f3d79054391fa7a485ad476571569aa97 +Merge: 954613fb24 8fc36b7f6b +Author: Sebastiaan van Stijn +Date: Thu Jan 14 19:37:33 2016 -0800 + + Merge pull request #19353 from calavera/coolljt0725_is_a_maintainer + + Add Lei Jitang to MAINTAINERS. + +commit a104e11191813838e7d5d14567dfbfddca2cb57b +Merge: 2a2eb81215 de6d6a42d7 +Author: Aanand Prasad +Date: Fri Jan 15 03:30:07 2016 +0000 + + Merge pull request #2659 from aanand/default-network-alias + + Containers join each network aliased to their service's name + +commit dc1104649f1207cfc4bc0402b0aee1243442f6b9 +Author: Daniel Nephin +Date: Thu Jan 14 22:28:20 2016 -0500 + + Validate that an extended config file has the same version as the base. + + Signed-off-by: Daniel Nephin + +commit 8fc36b7f6bc5a0aaa0fbabfd4a828887d5c162eb +Author: David Calavera +Date: Thu Jan 14 21:59:26 2016 -0500 + + Add Lei Jitang to MAINTAINERS. + + Signed-off-by: David Calavera + +commit de6d6a42d7ea112342a5ea419fc93af0fb5ecad6 +Author: Aanand Prasad +Date: Fri Jan 15 01:49:54 2016 +0000 + + Tag some more v2-dependent tests + + Not clear why the config tests are v2-dependent; needs investigating + + Signed-off-by: Aanand Prasad + +commit 4772815491e3fb1ae838f1e834cb160aedc1c19a +Author: Aanand Prasad +Date: Fri Jan 15 00:33:44 2016 +0000 + + Disable tests until Engine 1.10 change has been worked around + + Signed-off-by: Aanand Prasad + +commit fbc275e06b39a9fe02d57cd23aae23d25a5a73c9 +Author: Aanand Prasad +Date: Fri Jan 15 00:33:04 2016 +0000 + + Work around error message change in Engine + + Signed-off-by: Aanand Prasad + +commit cba75627e18adf80f66b6d090800b2204cfa97e0 +Author: Aanand Prasad +Date: Fri Jan 15 00:12:46 2016 +0000 + + Fix error when joining host/bridge network + + Signed-off-by: Aanand Prasad + +commit ab2d18851f9c42153d8460494c4020ea0ca5f079 +Author: Aanand Prasad +Date: Fri Jan 15 00:12:07 2016 +0000 + + Test against a dev build of Engine 1.10 + + Signed-off-by: Aanand Prasad + +commit 503a2cfe3c62c3682458f559020a3ac96fd0140d +Merge: a7804cb280 14b8bc8098 +Author: Diogo Mónica +Date: Thu Jan 14 18:19:45 2016 -0800 + + Merge pull request #460 from docker/fixing-migrations + + Fixing initial.sql syntax + +commit 14b8bc8098a002039d56db8607229bbf29f693e1 +Author: Diogo Monica +Date: Thu Jan 14 18:16:51 2016 -0800 + + Fixing initial.sql syntax + + Signed-off-by: Diogo Monica + +commit 406b6b28f498d814e3517fdf66eecae137bcd985 +Author: Aanand Prasad +Date: Fri Jan 15 00:10:57 2016 +0000 + + Tag v2-only tests + + - Don't run them against Engine < 1.10 + - Set the API version appropriately for the Engine version, so all tests + use API version 1.22 against Engine 1.10 + + Signed-off-by: Aanand Prasad + +commit abd031cb3d0c49ca933d24d2d03a982692cfc6c4 +Author: Aanand Prasad +Date: Thu Jan 14 18:33:35 2016 +0000 + + Containers join each network aliased to their service's name + + Signed-off-by: Aanand Prasad + +commit 5cc672b0061f3df41073cb7b4ff962998a13a09c +Author: Wen Cheng Ma +Date: Mon Dec 28 12:56:57 2015 +0800 + + Add Subnets info for user-defined network + + * If user doesn't specify the subnets to create a network, it will pick + subnets from inside preferred pool. This PR aims to inspect these subnets info + + * Add integration tests for docker inspect the subnets. + + * docker-py project is already synchronized. + + * jenkins checks depend on https://github.com/docker/docker-py/pull/888 + + Fixes issue #18626 + + Signed-off-by: Wen Cheng Ma + +commit 68d053113d346fff2d6e8697969e48c19c278520 +Merge: b63b05aabb 04781ef4c6 +Author: Dongluo Chen +Date: Thu Jan 14 17:38:35 2016 -0800 + + Merge pull request #1641 from nishanttotla/fix-typos-release-checklist + + Fixing typo in RELEASE-CHECKLIST.md + +commit 04781ef4c6ba2ea0b543b040544d33e22f4af907 +Author: Nishant Totla +Date: Thu Jan 14 17:32:55 2016 -0800 + + Fixing typo in RELEASE-CHECKLIST.md + + Signed-off-by: Nishant Totla + +commit aa54a5f272d3c59b29d0e3af83f6120b85bd7097 +Author: Nathan LeClaire +Date: Thu Dec 3 19:45:15 2015 -0800 + + Add additional tests for SSH + + Signed-off-by: Nathan LeClaire + +commit 7246b2c9650c505b6bd3cbeb8b95d0d0f9983f84 +Merge: fa4f5edf9b 30a2e8e068 +Author: Nathan LeClaire +Date: Thu Jan 14 17:11:40 2016 -0800 + + Merge pull request #2833 from kunalkushwaha/multi-master + + Configures swarm-master with failover support + +commit 954613fb248ee31ed1a919f72153eb43268f2c30 +Merge: 6add477c91 c64117cbd7 +Author: Sebastiaan van Stijn +Date: Thu Jan 14 16:53:08 2016 -0800 + + Merge pull request #19122 from ajneu/master + + documentation: debian/ubuntu need apt-transport-https ca-certificates + +commit a7804cb280f12bbf2d1cc7b9e164f70b550b5ac4 +Merge: c6b8456b01 8d0ff6c996 +Author: Diogo Mónica +Date: Thu Jan 14 16:51:11 2016 -0800 + + Merge pull request #441 from docker/expose-old-version-err + + Pass original invalid version storage error details into standardized err + +commit 6add477c9185f09e20c3ca94dd42fff5d6084461 +Merge: e44364eae9 4983e5807e +Author: Arnaud Porterie +Date: Thu Jan 14 16:49:38 2016 -0800 + + Merge pull request #19308 from estesp/better-warning-msg + + Better warning message on OOM kill disable without mem limit + +commit c6b8456b01d43b734e4de57343125407ff209aef +Merge: 94c3c31f36 d4820c5756 +Author: Diogo Mónica +Date: Thu Jan 14 16:48:53 2016 -0800 + + Merge pull request #457 from docker/error-messages-fix + + Translate ErrMetaNotFound when updating, so long as it's on root, to ErrRepositoryNotExist + +commit e44364eae90784b423eee8b2969bda9cd2429746 +Merge: 94b2d56690 677a6b3506 +Author: Sebastiaan van Stijn +Date: Thu Jan 14 16:44:58 2016 -0800 + + Merge pull request #18587 from calavera/daemon_configuration_file + + Allow to set daemon and server configurations in a file. + +commit 2a2eb81215d6c968f01d3f355c42179c1f7cf38e +Merge: 493df49d55 1bfbba36b2 +Author: Daniel Nephin +Date: Thu Jan 14 19:26:39 2016 -0500 + + Merge pull request #2662 from dnephin/fix_config_printing_unicode + + Fix config printing unicode objects + +commit 94b2d5669016be0063abbcb6917026bdfb52478c +Merge: 4bdb440cca 6309947718 +Author: Tibor Vass +Date: Thu Jan 14 18:50:53 2016 -0500 + + Merge pull request #19109 from BrianBland/crossRepositoryPush + + Cross repository push + +commit 7378e216783b03606d69d3bae544c12aa9cd6872 +Merge: 1cdc683358 81dbebc7d3 +Author: Richard Scothern +Date: Thu Jan 14 15:50:09 2016 -0800 + + Merge pull request #1332 from RichardScothern/gcs-params + + Change the parameters to the GCS drivers to allow CircleCI testing. + +commit b63b05aabb4cc8ef0ca43947e67ce6c96b48c81f +Merge: f883a6d508 7b142f5642 +Author: Victor Vieux +Date: Thu Jan 14 15:42:31 2016 -0800 + + Merge pull request #1640 from vieux/bump-v1.1.0-rc1 + + Bump version to 1.1.0-rc1 + +commit 493df49d55a6fa527beab1f2e353a8e891941fd8 +Merge: 796d97e394 b98e2169e6 +Author: Aanand Prasad +Date: Thu Jan 14 23:41:04 2016 +0000 + + Merge pull request #2658 from dnephin/warn_on_caps + + Error when the project name is invalid for the default image name + +commit 1bfbba36b27df69302f3a196834d32d3dc64987e +Author: Daniel Nephin +Date: Thu Jan 14 17:30:48 2016 -0500 + + Ensure that the config output by config command never contains python objects. + + Signed-off-by: Daniel Nephin + +commit 3021ee12fe021092673930bd0ad578783a51dffa +Author: Daniel Nephin +Date: Thu Jan 14 15:09:04 2016 -0500 + + Fix `config` command to print the new sections of the config + + Signed-off-by: Daniel Nephin + +commit 0f234154c24da87d524e39255e659ae340227278 +Author: Daniel Nephin +Date: Thu Jan 14 14:35:02 2016 -0500 + + Remove all non-external networks on down. + + Also moves the shutdown test fixtures to be a more general v2-full fixture. + + Signed-off-by: Daniel Nephin + +commit d4820c575666be57966a64619f0c96ebe72c305b +Author: Ying Li +Date: Thu Jan 14 15:10:09 2016 -0800 + + Translate ErrMetaNotFound when updating, so long as it's on root, to ErrRepositoryNotExist. + + Signed-off-by: Ying Li + +commit b98e2169e6aebd786dab5554e91dce55c248abb9 +Author: Daniel Nephin +Date: Thu Jan 14 13:28:53 2016 -0500 + + Error when the project name is invalid for the image name. + + Signed-off-by: Daniel Nephin + +commit b689c4a21888b751eb566630f6d441128d196cdd +Author: Daniel Nephin +Date: Thu Jan 14 11:39:16 2016 -0500 + + Move service validation to validate_service(). + + Signed-off-by: Daniel Nephin + +commit 6c88b8efead658167b9349a2ed8d04a432f26006 +Author: Stefan Scherer +Date: Tue Dec 1 09:47:19 2015 +0100 + + Add initial support building Windows docker in docker + + Signed-off-by: Stefan Scherer + +commit 796d97e3944dfb7871bf04e27da8aa1b894a24ea +Merge: 842dc14417 ce9f2681a2 +Author: Joffrey F +Date: Thu Jan 14 15:19:12 2016 -0800 + + Merge pull request #2617 from gutweiler/extra-hosts-ipv6 + + Extra hosts ipv6 + +commit 842dc144176603cf1e5fc953c6424dbb35135afe +Merge: 07c5103fe1 a7be0afa5b +Author: Joffrey F +Date: Thu Jan 14 15:17:45 2016 -0800 + + Merge pull request #2660 from albers/completion-down + + bash completion for `docker-compose down` + +commit 07c5103fe189db6cac2c5c3d0d35c549e2a2629c +Merge: 47e53b49c2 fca3e47a75 +Author: Joffrey F +Date: Thu Jan 14 15:17:22 2016 -0800 + + Merge pull request #2661 from albers/completion--abort-on-container-exit + + bash completion for `docker-compose up --abort-on-container-exit` + +commit 47e53b49c2e02d268a637f810138bbcdd61bc28b +Merge: ee7a51c179 1ae57d92d4 +Author: Aanand Prasad +Date: Thu Jan 14 23:13:54 2016 +0000 + + Merge pull request #2653 from shin-/Runscope-build-args + + Support for build arguments + +commit 94c3c31f3639fe6fddae451b41f5ee5b350db525 +Merge: 91bd1bff1d c65fc03ef9 +Author: Ying Li +Date: Thu Jan 14 14:58:50 2016 -0800 + + Merge pull request #453 from docker/fix-resign-root-on-publish + + Ensure that we do not unnecessarily re-sign/serialize a root.json file on publish + +commit 91bd1bff1db7f9472be7369d6a2f21e36374efc8 +Merge: e548503560 72c209083a +Author: Diogo Mónica +Date: Thu Jan 14 14:55:27 2016 -0800 + + Merge pull request #456 from HuKeping/client + + Improve client logging + +commit 4bdb440cca37b63a57826ae32ba8636b78e3dd40 +Merge: 9539c0a402 ae7d7db985 +Author: Jess Frazelle +Date: Thu Jan 14 14:54:12 2016 -0800 + + Merge pull request #19332 from hypriot/update-arm-registry-notary + + Update Dockerfile.armhf to sync changes for registry and notary + +commit 9539c0a4022857f7d317894e24a0694f4b62bbaf +Merge: 33a06a7f05 61553fc2f5 +Author: Sebastiaan van Stijn +Date: Thu Jan 14 14:42:37 2016 -0800 + + Merge pull request #18452 from moxiegirl/carrry-doc-17989 + + Update security docs for seccomp/apparmor + +commit 33a06a7f05ce660ab307f5b392a2abad96748566 +Merge: 9365b301a8 3bf821054e +Author: Arnaud Porterie +Date: Thu Jan 14 14:40:44 2016 -0800 + + Merge pull request #19346 from albers/completion-detach-keys + + Completion and docs update for --detach-keys + +commit 1ae57d92d4081380759fc4f816975d1a3a4d459c +Author: Joffrey F +Date: Thu Jan 14 13:12:39 2016 -0800 + + Remove duplicate functions + + Signed-off-by: Joffrey F + +commit 63099477189ea14f3122f6aa37fa7c60d33562c7 +Author: Brian Bland +Date: Wed Jan 13 19:34:27 2016 -0800 + + Changes cross-repository blob mounting to a blob Create option + + Also renames BlobSumService to V2MetadataService, BlobSum to + V2Metadata + + Signed-off-by: Brian Bland + +commit c65fc03ef92b403434723036089bf46b9725b3e3 +Author: Ying Li +Date: Wed Jan 13 21:17:01 2016 -0800 + + Update test to make x509 keys start a day in the past. + + Signed-off-by: Ying Li + +commit ee7a51c179958b18fc0bef100167dadb8114de35 +Merge: 77b4ebc31f 79df2ebe1b +Author: Aanand Prasad +Date: Thu Jan 14 22:04:46 2016 +0000 + + Merge pull request #2650 from dnephin/interpolate_config_in_volumes + + Interpolate variables in the new sections of the Compose file + +commit 3bf821054e1d7681ae76ec3dbba8ea81f4dc5adf +Author: Harald Albers +Date: Thu Jan 14 13:58:41 2016 -0800 + + Document that detach keys are a list of key bindings + + Signed-off-by: Harald Albers + +commit 61553fc2f538a7fe8f83e6b41a93722b5c61d374 +Author: Jessica Frazelle +Date: Sat Nov 14 18:01:24 2015 -0800 + + WIP: Update security docs for seccomp/apparmor + + Signed-off-by: Mary Anthony + + Updaing and slight re-arrangement of security information + + Signed-off-by: Mary Anthony + + Updating security files + + Signed-off-by: Mary Anthony + + Updating links to the security documentation + + Signed-off-by: Mary Anthony + + removing some extra spaces + + Signed-off-by: Mary Anthony + + Correcting spelling + + Signed-off-by: Mary Anthony + +commit 9365b301a821a95e36589c990a36ea4c619b9ba1 +Merge: 3b6a989d81 f093e1273d +Author: Tibor Vass +Date: Thu Jan 14 16:53:39 2016 -0500 + + Merge pull request #19339 from cpuguy83/19335_revert_18736 + + Revert "Break big lock into some tiny locks" + +commit 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886 +Author: Tianon Gravi +Date: Thu Jan 14 13:51:30 2016 -0800 + + Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included + + This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run). + + Signed-off-by: Andrew "Tianon" Page + +commit 3b6a989d815cc1acc23a0d7b775abda337b464d6 +Merge: e35f5a481a 6a033fa03e +Author: Brian Goff +Date: Thu Jan 14 16:49:20 2016 -0500 + + Merge pull request #19325 from mingqing/fix-pid-convert-error + + fix pidfile, pid is num use '/proc + string(pid)' can't found it + +commit b24ded193f7175e7f63e2bb8432b430a6665bfdf +Author: Harald Albers +Date: Thu Jan 14 12:47:48 2016 -0800 + + bash completion for `--detach-keys` + + Signed-off-by: Harald Albers + +commit 677a6b3506107468ed8c00331991afd9176fa0b9 +Author: David Calavera +Date: Thu Dec 10 18:35:10 2015 -0500 + + Allow to set daemon and server configurations in a file. + + Read configuration after flags making this the priority: + + 1- Apply configuration from file. + 2- Apply configuration from flags. + + Reload configuration when a signal is received, USR2 in Linux: + + - Reload router if the debug configuration changes. + - Reload daemon labels. + - Reload cluster discovery. + + Signed-off-by: David Calavera + +commit e35f5a481ac5c982c4f97be5dc41206e21e19007 +Merge: 0f2ba97a78 662cac08ef +Author: Tibor Vass +Date: Thu Jan 14 16:30:03 2016 -0500 + + Merge pull request #17316 from rmb938/ipam_conf_options + + Add IPAM Config Options to match libnetwork + +commit ce9f2681a2be99ed97915674de9dd26e441298d4 +Author: Clemens Gutweiler +Date: Thu Jan 7 17:59:51 2016 +0100 + + Fixes #1422: ipv6 addr contains colons, so we split only by the first char. + + Signed-off-by: Clemens Gutweiler + +commit 7b142f56424c7e5587d89e7f90203819594e7ecb +Author: Victor Vieux +Date: Thu Jan 14 13:21:48 2016 -0800 + + Bump version to 1.1.0-rc1 + + Signed-off-by: Victor Vieux + +commit 0f2ba97a787950838f0f762ed4d9cc8403862f24 +Merge: d299bbfcc6 6c1382e151 +Author: Arnaud Porterie +Date: Thu Jan 14 13:11:03 2016 -0800 + + Merge pull request #19343 from Microsoft/jjh/dockerfilenote + + Add note in dockerfile about go version + +commit 6ca5a2c476f548b55d68daa4264b4ef9e6c2696d +Author: John Howard +Date: Wed Jan 13 16:27:53 2016 -0800 + + Windows: Remove linkmode internal hack + + Signed-off-by: John Howard + +commit d299bbfcc62e510c7a485672aacc245bcbd2198a +Merge: db2b5e647c d3392a3bde +Author: David Calavera +Date: Thu Jan 14 13:05:47 2016 -0800 + + Merge pull request #19342 from Microsoft/jjh/fix19316 + + Windows: Fix test regression from 19155 + +commit db2b5e647c8cd5a2dd0d853785f8c3a2fc9cbbfc +Merge: 7a44265129 4e4ba9dd3a +Author: David Calavera +Date: Thu Jan 14 13:02:20 2016 -0800 + + Merge pull request #19338 from aboch/vnd + + Vendoring libnetwork v0.5.5 + +commit 7a442651292a32316d5ba0bf018f9cf8444e7717 +Merge: 3ce3fb7417 b916d45132 +Author: Jess Frazelle +Date: Thu Jan 14 12:47:32 2016 -0800 + + Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog + + Remove the changelog auto-generation + +commit 6c1382e151676ada408d89d6e197dbcf47dc4ebd +Author: John Howard +Date: Thu Jan 14 12:20:19 2016 -0800 + + Add note in dockerfile about go version + + Signed-off-by: John Howard + +commit 13063a96cbbc7848a87b1b3137fedbadc8fef188 +Author: Joffrey F +Date: Thu Jan 14 12:10:42 2016 -0800 + + Fix handling of service.dockerfile key + + Made invalid in v2 format + Doesn't break build config anymore + + Signed-off-by: Joffrey F + +commit 9cfa71ceee3cb164119b448edef8ac0bda63f751 +Author: Garrett Heel +Date: Fri Dec 11 15:19:51 2015 -0800 + + Add support for build arguments + + Allows 'build' configuration option to be specified as an + object and adds support for build args. + + Signed-off-by: Garrett Heel + +commit 77b4ebc31f8189dc761d4111f1e32ce17ee3f4cb +Merge: 3750811eed d4e913e42c +Author: Daniel Nephin +Date: Thu Jan 14 15:06:38 2016 -0500 + + Merge pull request #2591 from moxiegirl/remove-todo + + Fixing TODO visible in docs + +commit d3392a3bdecca4b79e1ea942595f05c03fcd5995 +Author: John Howard +Date: Thu Jan 14 11:56:59 2016 -0800 + + Windows: Fix test regression from 19155 + + Signed-off-by: John Howard + +commit 8ddff7740f5827098fef145d802a10f37a0b827e +Merge: ed6b8e9703 70e28a6ea1 +Author: Jeffrey Morgan +Date: Thu Jan 14 11:52:15 2016 -0800 + + Correct asset names on circleci + + Signed-off-by: Jeffrey Morgan + +commit 1366a0c153f40aff501a99fcf9702cc2957ac17b +Author: Jeffrey Morgan +Date: Thu Jan 14 11:46:51 2016 -0800 + + Update Kitematic curl url + + Signed-off-by: Jeffrey Morgan + +commit 457a300e8b3ffb29ad91009438733446e830f7f2 +Merge: fc96c56353 d07f0f9022 +Author: Jeffrey Morgan +Date: Thu Jan 14 11:43:40 2016 -0800 + + Merge branch 'master' of github.com:docker/toolbox + +commit fc96c563539514943f426b69644162f329ff1cfe +Author: Jeffrey Morgan +Date: Thu Jan 14 11:43:35 2016 -0800 + + Fix asset name in circleci + + Signed-off-by: Jeffrey Morgan + +commit 662cac08ef83ee105addb4d29f6e46188468306f +Author: Ryan Belgrave +Date: Fri Oct 23 15:28:39 2015 -0400 + + Add IPAM Config Options to match libnetwork + + Signed-off-by: Ryan Belgrave + +commit 3ce3fb7417a09662fefdd4cee06d9b9009af1b35 +Merge: 7cd6210a88 11801100be +Author: Arnaud Porterie +Date: Thu Jan 14 11:21:32 2016 -0800 + + Merge pull request #19333 from wzyboy/patch-1 + + Update CHANGELOG.md + +commit 1cdc6833584e645e93c02aff7ebccb2c266fb2bf +Merge: cb08de17d7 e5ac03f945 +Author: Richard Scothern +Date: Thu Jan 14 11:17:54 2016 -0800 + + Merge pull request #1352 from tpounds/use-go-1.5.3 + + Use Go 1.5.3 + +commit d07f0f9022d8dd5dfd68f729e14e0db04182c784 +Merge: eedcf7e365 1ff43d08b0 +Author: Jeffrey Morgan +Date: Thu Jan 14 11:17:06 2016 -0800 + + Merge pull request #369 from dgageot/machine-0.5.6 + + Bump Docker Machine 0.5.6 + +commit cb08de17d74bef86ce6c5abe8b240e282f5750be +Merge: df6cdb7bb6 8c5a6c13c0 +Author: Derek McGowan +Date: Thu Jan 14 11:10:54 2016 -0800 + + Merge pull request #1351 from BrianBland/splitBlobCreateOptions + + Splits up blob create options definitions to be package-specific + +commit 79df2ebe1bbe81232acd84eeca7bf66af8e3004b +Author: Daniel Nephin +Date: Wed Jan 13 15:19:02 2016 -0500 + + Support variable interpolation for volumes and networks sections. + + Signed-off-by: Daniel Nephin + +commit 7481961009e023a624d053e50f70ff3eb666dd19 +Author: Madhu Venugopal +Date: Thu Jan 14 21:22:34 2016 -0800 + + IT for restart-policy and DNS based SD in user-defined networks + + Signed-off-by: Madhu Venugopal + +commit f883a6d508552498e65dd13e92ac1a27e8567a74 +Merge: 08839f62fa a99ceeb9c1 +Author: Victor Vieux +Date: Thu Jan 14 11:01:45 2016 -0800 + + Merge pull request #1637 from jimenez/launch_bad_timeout + + Launch bad timeout + +commit 7cd6210a88006da21529aeccadea79c9ce720abb +Merge: 73a5393bf3 5ee69eb470 +Author: Brian Goff +Date: Thu Jan 14 13:59:14 2016 -0500 + + Merge pull request #19326 from HackToday/19153-filter-rethink + + Fix image filter + +commit 73a5393bf3530815a608725fe2546121ccadbfe4 +Merge: 812d95cdfb dda513ef65 +Author: David Calavera +Date: Thu Jan 14 10:58:51 2016 -0800 + + Merge pull request #19242 from mavenugo/nsalias + + Network scoped alias support + +commit f57f2beb0879edc0c9d4d7f1ab73f7ef9b44e82b +Author: Ying Li +Date: Wed Jan 13 21:11:06 2016 -0800 + + Factor marshalling a SignedRoot into JSON into TUF/data/root.go, and + add an injectable serializer (so we can test JSON marshalling/unmarshalling + error propagation). + + Signed-off-by: Ying Li + +commit b74f1835b70aadab110539762bac761274d590d9 +Author: Ying Li +Date: Wed Jan 13 15:52:55 2016 -0800 + + Ensure that we do not unnecessarily re-sign/serialize a root.json file on publish + + Adds additional tests to ensure that keys aren't unnecessarily created on error, + and that only the required keys to sign are used. + + Signed-off-by: Ying Li + +commit 5347f7cd947df3e29d777274c9325c9461a1c051 +Author: Santhosh Manohar +Date: Thu Jan 14 10:48:48 2016 -0800 + + Vendoring libnetwork v0.5.6 + + Signed-off-by: Santhosh Manohar + +commit 8c5a6c13c03a423428d7475004c4a2b7facb8eea +Author: Brian Bland +Date: Thu Jan 14 10:08:52 2016 -0800 + + Splits up blob create options definitions to be package-specific + + Redefines privately in both storage and client packages + + Signed-off-by: Brian Bland + +commit fca3e47a7519844704c79dac4fc55b6ce79e4923 +Author: Harald Albers +Date: Thu Jan 14 10:43:53 2016 -0800 + + bash completion for `docker-compose up --abort-on-container-exit` + + Signed-off-by: Harald Albers + +commit e5ac03f945617c28eea848757a10ff279afe139b +Author: Trevor Pounds +Date: Thu Jan 14 10:37:44 2016 -0800 + + Update to Go 1.5.3. + + Signed-off-by: Trevor Pounds + +commit f093e1273d7d030a24045d97a78fec8637f46bf8 +Author: Brian Goff +Date: Thu Jan 14 13:38:09 2016 -0500 + + Revert "Break big lock into some tiny locks" + + This reverts commit 1326f0cba5f933674e23769de1385d3b0841e758. + + Signed-off-by: Brian Goff + +commit a99ceeb9c17a989c6e98c899b5dbf3258368427c +Author: Isabel Jimenez +Date: Thu Jan 14 04:55:45 2016 -0500 + + Adding suicide logic for tasks so as to prevent false timeout for tasks having a long image pull + + Signed-off-by: Isabel Jimenez + +commit d12ea7ff6d66988e7e0a6ad776a8733dd061d4bd +Author: Isabel Jimenez +Date: Thu Jan 14 04:18:38 2016 -0500 + + Adding test + + Signed-off-by: Isabel Jimenez + +commit 4e4ba9dd3a1d488cf9d808f35904ce59911a55de +Author: Alessandro Boch +Date: Thu Jan 14 10:34:00 2016 -0800 + + Vendoring libnetwork v0.5.5 + + Signed-off-by: Alessandro Boch + +commit 3750811eed43a8d51dfe156267b65e8f63a87c60 +Merge: 8fca4f1628 d98b64f6e7 +Author: Aanand Prasad +Date: Thu Jan 14 18:32:29 2016 +0000 + + Merge pull request #2564 from aanand/2478-networks-in-compose-file + + Declare networks in Compose file + +commit a7be0afa5b3a1b62324e22b0d81c51dc939966d6 +Author: Harald Albers +Date: Thu Jan 14 10:32:06 2016 -0800 + + bash completion for `docker-compose down` + + Signed-off-by: Harald Albers + +commit df6cdb7bb641c1a8057281e58eaddf1610a49e51 +Merge: 2a9849e552 050fcb7dbb +Author: Richard Scothern +Date: Thu Jan 14 10:31:45 2016 -0800 + + Merge pull request #1347 from aaronlehmann/go-153 + + Upgrade CI to go 1.5.3 + +commit 08839f62faef0acf1bdae71883b0a6da4933d82b +Merge: d3e4ddb0f7 b297c1bd41 +Author: Victor Vieux +Date: Thu Jan 14 10:18:09 2016 -0800 + + Merge pull request #1636 from jimenez/checkpoint_failover + + Enabling checkpoint failover in FrameworkInfo + +commit d3e4ddb0f7fd87323e859d39eefb7db70505bcd7 +Merge: 71edffc019 fe8da8fe80 +Author: Victor Vieux +Date: Thu Jan 14 10:18:03 2016 -0800 + + Merge pull request #1635 from jimenez/task_timeout_restructure + + Removing Queue package and regrouping task logic + +commit e548503560ef04156ce715ab52d22c17233c29de +Merge: a60f228189 27278428ec +Author: Diogo Mónica +Date: Thu Jan 14 10:11:20 2016 -0800 + + Merge pull request #455 from docker/fix-yubikey-tests + + Fix bug where the yubikey store was not prioritized over the filestore in a client repo. + +commit d98b64f6e7f75e801973e59a6723b5f75e724988 +Author: Aanand Prasad +Date: Thu Jan 14 18:09:45 2016 +0000 + + Remove duplicated logic from initialize_networks() + + Signed-off-by: Aanand Prasad + +commit 4e61377c6d912a4f5e454b6afcb7bde0416a83b3 +Author: Aanand Prasad +Date: Thu Jan 14 18:01:44 2016 +0000 + + Move get_networks() out of Project class + + Signed-off-by: Aanand Prasad + +commit 87326c00ebc8380729f1999d5f20eddc265164e8 +Author: Aanand Prasad +Date: Thu Jan 14 14:51:42 2016 +0000 + + Python 3 fixes + + Signed-off-by: Aanand Prasad + +commit 73fbd01cfe7c1e8ad7d297d7f7cfb8704aeb501d +Author: Aanand Prasad +Date: Thu Jan 14 13:39:44 2016 +0000 + + Support the 'external' option for networks + + Signed-off-by: Aanand Prasad + +commit ca68c9faa4d4a4e217c948c2dd5abf25f595c8d7 +Author: Aanand Prasad +Date: Thu Jan 14 13:16:02 2016 +0000 + + Services can join 'bridge' or 'host' + + Signed-off-by: Aanand Prasad + +commit e75629392d5274697a668e3f405cbb5e82d99676 +Author: Aanand Prasad +Date: Thu Jan 14 13:01:17 2016 +0000 + + Don't join the bridge network by default in v2 + + Signed-off-by: Aanand Prasad + +commit 9c91cf29674f4e294f9d24a135933d2e7df4e546 +Author: Aanand Prasad +Date: Thu Jan 14 12:18:20 2016 +0000 + + Test discoverability across multiple networks + + Signed-off-by: Aanand Prasad + +commit 3eafdbb01bc9c2e72098aa30eb16f5e29d2228ab +Author: Aanand Prasad +Date: Wed Jan 13 17:00:31 2016 +0000 + + Connect services to networks with the 'networks' key + + Signed-off-by: Aanand Prasad + +commit 3f9038aea9abfde49ee2b8745369d7d8647f3262 +Author: Aanand Prasad +Date: Wed Jan 13 14:15:02 2016 +0000 + + Remove test duplication + + Signed-off-by: Aanand Prasad + +commit 35e347cf92b13a374ff767653aa8629ccdb64a71 +Author: Aanand Prasad +Date: Wed Jan 13 14:05:30 2016 +0000 + + Disable the use of 'net' in v2 + + Signed-off-by: Aanand Prasad + +commit 69ed5f9c48a5fe419ac041239659fe69304fe4a9 +Author: Aanand Prasad +Date: Thu Dec 17 17:49:48 2015 +0000 + + Specify networks in Compose file + + There's not yet a proper way for services to join networks + + Signed-off-by: Aanand Prasad + +commit 812d95cdfb78f4063b967b23911ed3ef152ad533 +Merge: f292e90b8d 9f676ade0a +Author: David Calavera +Date: Thu Jan 14 09:58:24 2016 -0800 + + Merge pull request #19323 from wenchma/19089-add_network_id + + Add network ID to container inspect + +commit 8d0ff6c9967ab3a06fab182847faf432762adac2 +Author: Riyaz Faizullabhoy +Date: Mon Jan 11 13:58:22 2016 -0800 + + Pass original invalid version storage error details into standardized errors + + Signed-off-by: Riyaz Faizullabhoy + +commit 27278428ec3df91c1a92a9e3172ffa51d0296640 +Author: Ying Li +Date: Thu Jan 14 09:56:37 2016 -0800 + + Remove extraneous "fake" from the notary CLI integration tests. + + Signed-off-by: Ying Li + +commit 2a9849e5523e90c18843c17e5cf3643d07f49030 +Merge: 5120357906 3ef917c269 +Author: Brian Bland +Date: Thu Jan 14 09:44:30 2016 -0800 + + Merge pull request #1348 from BrianBland/fixCrossRepoBlobMount + + Fixes cross-repo blob mounting in the BlobUploadHandler + +commit f292e90b8dcca4fabf9d6aa6d889e9fae0eca6ba +Merge: a225e39667 f62d4ceba6 +Author: Tibor Vass +Date: Thu Jan 14 12:24:11 2016 -0500 + + Merge pull request #19226 from coolljt0725/remove_dup_check + + Remove duplication checking for the existence of endpoint to speed up container starting + +commit 8fca4f1628a1583748537e24ec4d818c1ea75362 +Merge: 172b955d79 b76dc1e05e +Author: Aanand Prasad +Date: Thu Jan 14 17:15:27 2016 +0000 + + Merge pull request #2649 from dnephin/make_volumes_from_more_explicit + + Make volumes from more explicit in V2 config format + +commit a225e39667d7ddd2345326bc5cd3b1ce15fd0bad +Merge: 349d9700bd cde0ed67a1 +Author: David Calavera +Date: Thu Jan 14 09:13:44 2016 -0800 + + Merge pull request #19155 from coolljt0725/create_cwd_on_create + + Create the working directory on container creation + +commit 172b955d79714dd4e72e91e4a6a66e098faaed9c +Merge: dbe04a70f0 c64af0a459 +Author: Daniel Nephin +Date: Thu Jan 14 11:59:02 2016 -0500 + + Merge pull request #2646 from dnephin/docker_compose_down + + docker-compose down + +commit 22a81a2c588a7505fd5f900e2093c44cd51ae142 +Author: David Calavera +Date: Wed Jan 6 17:57:02 2016 -0500 + + Add an unsafe memory discovery store for testing. + + Signed-off-by: David Calavera + +commit 1666707cf895e9de63aedaf744ae4923c41f73d2 +Author: David Calavera +Date: Tue Jan 5 18:34:22 2016 -0500 + + Vendor merge structure tool. + + Signed-off-by: David Calavera + +commit b76dc1e05ecfa2ab95ef58ae62072afbf354abda +Author: Daniel Nephin +Date: Wed Jan 13 14:41:34 2016 -0500 + + Require volumes_from a container to be explicit in V2 config. + + Signed-off-by: Daniel Nephin + +commit c3968a439fa5d00ecedeb37963f5e8c0763ef6d1 +Author: Daniel Nephin +Date: Wed Jan 13 13:28:39 2016 -0500 + + Refactor config loading to move version check into ConfigFile. + + Adds the cached_property package. + + Signed-off-by: Daniel Nephin + +commit dda513ef651b42fcb9625e651f664554161c0a6a +Author: Madhu Venugopal +Date: Fri Jan 8 05:45:56 2016 -0800 + + Network scoped alias support + + Signed-off-by: Madhu Venugopal + +commit de949284f5b126d07e42c2322f1c80c62f9c68a5 +Author: Daniel Nephin +Date: Wed Jan 13 12:55:59 2016 -0500 + + Refactor config loading for handling volumes_from in v2. + + Signed-off-by: Daniel Nephin + +commit 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1 +Merge: 59231ea6d8 3d2539d39d +Author: Tibor Vass +Date: Thu Jan 14 11:40:29 2016 -0500 + + Merge pull request #19291 from coolljt0725/fix_19100 + + Fix #19100 and fix a typo + +commit dbe04a70f0d054f2e01a457d4881176350896bf1 +Merge: 18df1e170d e41e6c1241 +Author: Aanand Prasad +Date: Thu Jan 14 16:37:39 2016 +0000 + + Merge pull request #2655 from shin-/updated_volume_definition + + Properly validate volume definition + +commit c64af0a459ed0a96c38547451a0b5da69c3da079 +Author: Daniel Nephin +Date: Tue Jan 12 17:33:17 2016 -0500 + + Add an acceptance test and docs for the down subcommand + + Signed-off-by: Daniel Nephin + +commit c8ed1568063d67595a0a38522d2d9355c637b899 +Author: Daniel Nephin +Date: Fri Nov 27 12:19:43 2015 -0500 + + Adding docker-compose down + + Signed-off-by: Daniel Nephin + +commit 9f676ade0aef66bb66a26171d6bfb27f105fa1df +Author: Wen Cheng Ma +Date: Thu Jan 14 13:46:59 2016 +0800 + + Add network ID to container inspect + + Fixes issue #19089 + + Signed-off-by: Wen Cheng Ma + +commit 59231ea6d8bdff3d32140d7ab28aeb98fb93ebff +Merge: 851c94db1b 93268d845e +Author: Tibor Vass +Date: Thu Jan 14 09:06:02 2016 -0500 + + Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size + + Don't dump request body when too large + +commit 851c94db1bafac593cf193dd9dde26cd3d9e7f23 +Merge: 0ed2e26f51 b464f1d78c +Author: Vincent Demeester +Date: Thu Jan 14 14:21:30 2016 +0100 + + Merge pull request #19317 from mavenugo/epforce + + Forced endpoint cleanup + +commit 18df1e170d41b28e15635e6acfc862d7e36d262d +Merge: 7733600262 9bff308251 +Author: Aanand Prasad +Date: Thu Jan 14 12:48:13 2016 +0000 + + Merge pull request #2625 from kojiromike/allow-list-entrypoints + + Allow Entrypoints to be Lists + +commit 77336002621773377bca13303169f58ce90c1610 +Merge: 1ffd172084 b6618815b9 +Author: Aanand Prasad +Date: Thu Jan 14 12:46:04 2016 +0000 + + Merge pull request #2508 from jstewmon/stop_signal + + add support for stop_signal to compose file + +commit 1ffd1720846e65f974313e149c4ab2f7063e3e54 +Merge: 153185eadb 6877c6ca06 +Author: Aanand Prasad +Date: Thu Jan 14 12:27:46 2016 +0000 + + Merge pull request #2654 from dnephin/fix_multiplex_test + + Fix flaky multiplex test + +commit 11801100be9e6f5c67e13855bac984688d8f7c76 +Author: Zhuoyun Wei +Date: Thu Jan 14 20:16:29 2016 +0800 + + Update CHANGELOG.md + + Fix "smart" dashes. + + Signed-off-by: Zhuoyun Wei + +commit fa4f5edf9b89a059e771b160d800600b0dbb54a3 +Merge: c77ffa387a c4e3480c74 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 12:11:50 2016 +0100 + + Merge pull request #2828 from jeanlaurent/aws-vpc-id + + ec2 Don't force user to use VPC_ID but use the default one when available + +commit c4e3480c74bb5110153a504bf51f8547b2aa8413 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 09:44:14 2016 +0100 + + Extract const for simple errors + + Signed-off-by: Jean-Laurent de Morlhon + +commit 6940dc33ca3636901e5c4ff22833ba637c182627 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 11:34:00 2016 +0100 + + If you got a const, use it. + + Signed-off-by: Jean-Laurent de Morlhon + +commit e298f6849222ee67412b192176acafd32cc1d7ff +Author: Jean-Laurent de Morlhon +Date: Wed Jan 13 19:19:44 2016 +0100 + + Documentation update + + Signed-off-by: Jean-Laurent de Morlhon + +commit 04fd9e7741af51607dad5846a410f6b145c238c6 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 11:07:28 2016 +0100 + + Fetching the default vpc id from account + + Signed-off-by: Jean-Laurent de Morlhon + +commit 0ed2e26f51f6b82c1b476562c3ae4134c38b26e9 +Merge: ec143968de 0ba6a128ee +Author: Vincent Demeester +Date: Thu Jan 14 11:10:37 2016 +0100 + + Merge pull request #19157 from wenchma/update_build_bridges + + Update the doc of build-bridges.md + +commit 0d2bc08d6ee69924dbee098c94a87da40634fb1f +Author: Jean-Laurent de Morlhon +Date: Wed Jan 13 18:51:45 2016 +0100 + + Adding ec2client interface to allow unit testing. + + Signed-off-by: Jean-Laurent de Morlhon + +commit ec143968de233c9767854e4c7ba08b3629070696 +Merge: 63525a6dc5 ee14232647 +Author: Vincent Demeester +Date: Thu Jan 14 11:00:09 2016 +0100 + + Merge pull request #19286 from aboch/ipdocs + + Add missing documentation for static IP options + +commit b297c1bd419ee133530353f03b0412e2a412d3b2 +Author: Isabel Jimenez +Date: Fri Jan 8 18:15:22 2016 -0500 + + Enabling checkpoint failover in FrameworkInfo + + Signed-off-by: Isabel Jimenez + +commit fe8da8fe80a88f404bd36c9b1eaf3edf86eae401 +Author: Isabel Jimenez +Date: Tue Jan 12 16:40:26 2016 -0500 + + Removing Queue package and regrouping task logic + + Signed-off-by: Isabel Jimenez + +commit 5ee69eb470316eead3af20725de54d3c47a47a62 +Author: Kai Qiang Wu(Kennan) +Date: Thu Jan 14 06:58:31 2016 +0000 + + Fix image filter + + This is related image fix for Propose #19153 + for volume related change, would use another patch + to fix that. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 63525a6dc5f7be370736ec2905d40a8c8fdf1162 +Merge: d62466bd33 6a04ecf813 +Author: Vincent Demeester +Date: Thu Jan 14 09:15:13 2016 +0100 + + Merge pull request #19252 from HackToday/fix-vol-resp-doc + + Update response content for volume mounts + +commit c77ffa387a353eef1970db08d9b2762d127ec1fe +Merge: 26d0187834 ea9bbcb367 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 09:14:28 2016 +0100 + + Merge pull request #2806 from dgageot/unit-test-vb + + Test VirtualBox VM creation + +commit 26d01878342e32b9d1c2d15f2427754a1447ac11 +Merge: 4f6fb6dc7e 86f95753c4 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 14 09:12:33 2016 +0100 + + Merge pull request #2835 from dgageot/go-1.5.3 + + Upgrade to go 1.5.3 + +commit 6a033fa03e341f8578721045a91dcbf8015982f6 +Author: mingqing +Date: Thu Jan 14 15:43:40 2016 +0800 + + fix pidfile, pid is num use '/proc + string(pid)' can't found it + + Signed-off-by: mingqing + +commit b916d451325fc20d754f47702af34304e983a77b +Author: Avi Miller +Date: Thu Jan 14 18:50:55 2016 +1100 + + Remove the changelog auto-generation because its hardcoded in the .spec file now. + + Signed-off-by: Avi Miller + +commit d62466bd33d4abdbe43640aec9ed931a6d3ed630 +Merge: 742a7d53f2 0e8d41272c +Author: Sebastiaan van Stijn +Date: Wed Jan 13 23:45:43 2016 -0800 + + Merge pull request #19322 from HackToday/fixlxc + + Remove wrong lxc support + +commit 0e8d41272c7e5979d8a3f8676c94320f6c2ff691 +Author: Kai Qiang Wu(Kennan) +Date: Thu Jan 14 07:22:55 2016 +0000 + + Remove wrong lxc support + + Docker master branch not support lxc, so it seems not proper to + say that anymore. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b +Author: Lei Jitang +Date: Thu Jan 14 14:58:54 2016 +0800 + + Fix #19100 and fix a typo + + Signed-off-by: Lei Jitang + +commit 72c209083a888fc4fe97ac409f3c370c1d2a9a4d +Author: HuKeping +Date: Thu Jan 14 11:30:21 2016 +0800 + + Improve client logging + + Signed-off-by: Hu Keping + +commit 86f95753c4bc2b13741efba1622d7ed677bbafb7 +Author: David Gageot +Date: Thu Jan 14 07:10:47 2016 +0100 + + Upgrade to go 1.5.3 + + Signed-off-by: David Gageot + +commit ea9bbcb36773ac33437a090b1fe550fd3e3695d5 +Author: David Gageot +Date: Mon Jan 11 11:42:58 2016 +0100 + + Test VirtualBox VM creation + + Signed-off-by: David Gageot + +commit b464f1d78cdfa2a4124e083b8f7b0f2353f12de3 +Author: Madhu Venugopal +Date: Tue Jan 12 20:56:36 2016 -0800 + + Forced endpoint cleanup + + docker's network disconnect api now supports `Force` option which can be + used to force cleanup an endpoint from any host in the cluster. + + Signed-off-by: Madhu Venugopal + +commit 693b5c429820785d572b8a32bf0818c909a2090f +Author: André Martins +Date: Thu Jan 14 03:21:48 2016 +0000 + + Fixing TestInspectApiContainerVolumeDriver + + Currently the TestInspectApiContainerVolumeDriver is testing the + existence of a volume driver without specifing any volume driver. + This commit fixes that. + + Signed-off-by: André Martins + +commit 3ef917c269120f7eabb6000fcce9eeb72c3d3c8f +Author: Brian Bland +Date: Wed Jan 13 19:20:02 2016 -0800 + + Fixes cross-repo blob mounting in the BlobUploadHandler + + Accidentally checked for err != nil instead of err == nil :/ + Also now ensures that only a non-nil option is appended to the create + options slice + + Signed-off-by: Brian Bland + +commit 742a7d53f2961565f0baf43d6423383101be84c3 +Merge: 3720fbfb35 db1d5f7ea3 +Author: Brian Goff +Date: Wed Jan 13 21:44:11 2016 -0500 + + Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking + + Fix response hijacking with TLS enabled. + +commit 7777e085ea4a10f758a03b0f166040cd025ec659 +Author: Ying Li +Date: Wed Jan 13 18:31:42 2016 -0800 + + Include some comments in the Makefile about how to run with yubikey. + + Signed-off-by: Ying Li + +commit 050fcb7dbb72768249ae254ee0af313fd2df80f7 +Author: Aaron Lehmann +Date: Wed Jan 13 18:25:20 2016 -0800 + + Upgrade CI to go 1.5.3 + + Go 1.5.0 has some stack pointer bugs. This may have been causing some CI + failures. Upgrade to a newer version. + + Signed-off-by: Aaron Lehmann + +commit e41e6c1241a7e17fddd5c3abf536f462ed5ab1c4 +Author: Joffrey F +Date: Wed Jan 13 18:22:29 2016 -0800 + + Properly validate volume definition + + Test valid empty volume definitions + + Signed-off-by: Joffrey F + +commit 4dc8299de53ff840bd786de27da5f7944c36092e +Author: Ying Li +Date: Wed Jan 13 17:54:14 2016 -0800 + + Fix bug where the yubikey store was not prioritized over the filestore + in a client repo. + + Also, fix a test with exporting/importing all keys - because a key + that is imported into the yubikey is also backed up on disk, when exporting + all keys, it also gets exported. + + Signed-off-by: Ying Li + +commit 81dbebc7d30688c8e3c0b35272c50dcd69ee4a4a +Author: Richard Scothern +Date: Wed Jan 6 14:46:25 2016 -0800 + + Change the parameters to the GCS drivers to allow CircleCI testing. + + Remove the requirement of file system access to run GCS unit tests. Deconstruct + the input parameters to take the private key and email which can be specified on + the build system via environment variables. + + Signed-off-by: Richard Scothern + +commit 6877c6ca06ef605e1227b79092cf8054996df27a +Author: Daniel Nephin +Date: Wed Jan 13 20:51:39 2016 -0500 + + Fix flaky multiplex test. + + Signed-off-by: Daniel Nephin + +commit 71edffc0195ff97e43d8b5a4b9eb85525bf3ce29 +Merge: 11b2dc6ec7 61142e4cbd +Author: Victor Vieux +Date: Wed Jan 13 17:41:28 2016 -0800 + + Merge pull request #1627 from vieux/update_api_version + + add buildtime, kernelversion and experimental to API version + +commit 5120357906fe78a42df9d5d6fad4927ec046339d +Merge: 4378e1aa85 ce88d8a6f4 +Author: Richard Scothern +Date: Wed Jan 13 17:35:49 2016 -0800 + + Merge pull request #1344 from BrianBland/blobCreateWithOptions + + Adds functional options arguments to the Blobs Create method, remove Mount operation + +commit db1d5f7ea37c2a3b0bedc9dbcbf5bd3b32258219 +Author: David Calavera +Date: Wed Jan 13 20:18:06 2016 -0500 + + Add test to verify that response hijacking always works over TLS. + + Signed-off-by: David Calavera + +commit 11b2dc6ec7517fc3d5aed85db31f144afdea1235 +Merge: d21748699d 8cc9b6c284 +Author: Alexandre Beslic +Date: Wed Jan 13 17:15:36 2016 -0800 + + Merge pull request #1628 from dongluochen/createRetry + + Add swarm scheduler retry option + +commit 7a5d8974109ec34e9fb752b2935077eb8da7a229 +Author: David Calavera +Date: Wed Jan 13 19:58:40 2016 -0500 + + Vendor engine-api 0.2.2. + + Signed-off-by: David Calavera + +commit 153185eadb673ccd867135e072ca890bc6bed8ac +Merge: fa01883cb2 e76b2679eb +Author: Joffrey F +Date: Wed Jan 13 17:02:36 2016 -0800 + + Merge pull request #2647 from shin-/preexisting_volume_detection_rb1 + + Support for external volumes + +commit ae7d7db985ea11a5613261e2450cd6fbc3ad108f +Author: Stefan Scherer +Date: Thu Jan 14 01:46:35 2016 +0100 + + Sync changes for registry and notary + + Signed-off-by: Stefan Scherer + +commit 30a2e8e068e28115a24680bf8c64075ad0770347 +Author: Kunal Kushwaha +Date: Thu Jan 14 09:46:15 2016 +0900 + + Configures swarm-master with failover support + + If more then one master is created with same discovery backend, + Rest of master will be configured as replica of primary master + + Signed-off-by: Kunal Kushwaha + +commit ce88d8a6f48b300298f170a21ba5f3b8799d4e5f +Author: Brian Bland +Date: Wed Jan 13 11:44:42 2016 -0800 + + Adds functional options arguments to the Blobs Create method + + Removes the Mount operation and instead implements this behavior as part + of Create a From option is provided, which in turn returns a rich + ErrBlobMounted indicating that a blob upload session was not initiated, + but instead the blob was mounted from another repository + + Signed-off-by: Brian Bland + +commit 8cc9b6c28464be11a26b6be9e03bea485deb3797 +Author: Dong Chen +Date: Tue Jan 12 19:28:06 2016 -0800 + + Add swarm container create retry option. + + Signed-off-by: Dong Chen + +commit 3720fbfb35b2f8173b47c0a381cb0bdf09ae1a20 +Merge: a79307c490 22af8dfb14 +Author: Jess Frazelle +Date: Wed Jan 13 16:00:44 2016 -0800 + + Merge pull request #19318 from Djelibeybi/fix-selinux-rpm-changelog + + Not having a changelog is bad RPM etiquette. + +commit a60f22818950001ada4a6fc121c86c5dc992d517 +Author: David Lawrence +Date: Wed Jan 13 15:59:33 2016 -0800 + + fixing use of require vs assert + Signed-off-by: David Lawrence (github: endophage) + +commit a79307c49037b036d4198812a2de83fe8fe2e450 +Merge: 9c30492e9e 9560d94114 +Author: Jess Frazelle +Date: Wed Jan 13 15:59:19 2016 -0800 + + Merge pull request #19313 from tiborvass/bump-go-1.5.3 + + Bump Go to version 1.5.3 + +commit 26d3f3f92b6332a75ed81d65a3acd92a5e8ba736 +Merge: e8e4155005 06d23e14c9 +Author: Diogo Mónica +Date: Wed Jan 13 15:48:39 2016 -0800 + + Merge pull request #413 from endophage/fix_root_download + + fixing bootstrapClient to prefer cached root + +commit e8e41550057527b86be90524fd1d0e576c2bd9ef +Merge: 8e3126dc9e 5a9e06fe5c +Author: Diogo Mónica +Date: Wed Jan 13 15:48:29 2016 -0800 + + Merge pull request #438 from endophage/db_sha256_column + + adding sha256 column to tuf_files database table + +commit 22af8dfb14d7cc9eb91964ed187a074658f57005 +Author: Avi Miller +Date: Thu Jan 14 10:34:48 2016 +1100 + + Not having a changelog is bad RPM etiquette. + + Signed-off-by: Avi Miller + +commit 06d23e14c96a4f6240a189da6bbae54921edb941 +Author: David Lawrence +Date: Thu Jan 7 10:30:23 2016 -0800 + + add test for invalid remote URL + add offline store for use when we can't initialize a remote store + Signed-off-by: David Lawrence (github: endophage) + +commit 8e3126dc9ee3aef577d0c5663b657de4e3c7466d +Merge: a7e9b9b1fd 0350d56176 +Author: Diogo Mónica +Date: Wed Jan 13 15:17:21 2016 -0800 + + Merge pull request #447 from endophage/dockerfile_rename + + Dockerfile rename + +commit a7e9b9b1fdcd020f7f5b9517130f0799cf306cfa +Merge: 66397d4d40 1a7fd447fb +Author: Diogo Mónica +Date: Wed Jan 13 15:16:49 2016 -0800 + + Merge pull request #448 from HuKeping/broken-links + + Fix broken links + +commit 66397d4d40b2cb93a9578ac22a845e01d9a281db +Merge: 1f7d16373e 945be9db2e +Author: Diogo Mónica +Date: Wed Jan 13 15:16:35 2016 -0800 + + Merge pull request #450 from mtrmac/no-mailing-list + + Drop mailing list link + +commit 4378e1aa8588e39e5ba29ea1f45929f93d454f96 +Merge: 39ff320b82 ac03070245 +Author: Richard Scothern +Date: Wed Jan 13 14:55:59 2016 -0800 + + Merge pull request #1345 from BrianBland/fixErrorCodesInAPITemplate + + Fixes error codes in the API spec template + +commit ee14232647085ce2faf7167959728977d36e5503 +Author: Alessandro Boch +Date: Mon Jan 11 18:03:40 2016 -0800 + + Add missing documentation for static IP options + + Signed-off-by: Alessandro Boch + +commit 9bff308251d1629a9f7107adc5b25f71a3844e12 +Author: Michael A. Smith +Date: Fri Jan 8 15:46:49 2016 -0500 + + Document Entrypoints and Commands as Lists + + Signed-off-by: Michael A. Smith + +commit 59a4ab9634ab227f6bd8a5f2e579661c64aa6813 +Author: Michael A. Smith +Date: Tue Jan 12 13:49:14 2016 -0500 + + Allow Entrypoints to be Lists + + Signed-off-by: Michael A. Smith + +commit eedcf7e365ecf54758e2076d212e75da4c11ecbc +Author: Jeffrey Morgan +Date: Wed Jan 13 14:44:47 2016 -0800 + + Upload the correct filename to github releases + + Signed-off-by: Jeffrey Morgan + +commit ed6b8e9703824d79369245ccc1ccc2610714481a +Author: Jeffrey Morgan +Date: Wed Jan 13 14:34:16 2016 -0800 + + Better circleci versions + + Signed-off-by: Jeffrey Morgan + +commit 70e28a6ea17c0a2dc96d16616727f91b0e0a7d4a +Author: Jeffrey Morgan +Date: Wed Jan 13 14:34:16 2016 -0800 + + Better circleci versions + + Signed-off-by: Jeffrey Morgan + +commit 7289c7218e2101eb94fb90f2cb22e1412d016984 +Author: Brian Bland +Date: Tue Jan 5 14:17:42 2016 -0800 + + Adds cross-repository blob pushing behavior + + Tracks source repository information for each blob in the blobsum + service, which is then used to attempt to mount blobs from another + repository when pushing instead of having to re-push blobs to the same + registry. + + Signed-off-by: Brian Bland + +commit 9560d941142b0bd17b0aa51e4d9bfe22354732ec +Author: Tibor Vass +Date: Wed Jan 13 16:04:36 2016 -0500 + + Bump Go to version 1.5.3 + + Signed-off-by: Tibor Vass + +commit b6618815b91a8e01f87c691d67c1ea9839377e69 +Author: Jonathan Stewmon +Date: Wed Jan 13 16:18:00 2016 -0600 + + update docker-py requirement to use master branch + + Signed-off-by: Jonathan Stewmon + +commit e76b2679eb8f3117c7c0e0444e70bfc4d7fa502d +Author: Joffrey F +Date: Wed Jan 13 13:52:59 2016 -0800 + + external volume disallows other config keys + + Signed-off-by: Joffrey F + +commit 93268d845e41be9cb67744c9bf7a82f8409dff04 +Author: Brian Goff +Date: Wed Jan 13 17:01:48 2016 -0500 + + Don't dump authz request when body is too large + + Signed-off-by: Brian Goff + +commit 89af3835d483fe758f301aa8f3b1062a0ab712fb +Author: Brian Goff +Date: Wed Jan 13 15:28:27 2016 -0500 + + Don't dump request body to log when too large + + Fixes an issue where a client can send a large body but specifiy + application/json as the content-type, and cause Docker to consume lots + of RAM while trying to buffer the body so it can be dumped to the debug + log. + + Signed-off-by: Brian Goff + +commit 9c30492e9e5cf8da5771af87d2b0a83a627ff2b4 +Merge: 661d75f398 5a707d94d6 +Author: David Calavera +Date: Wed Jan 13 13:43:37 2016 -0800 + + Merge pull request #19311 from estesp/no-oom-warning-when-cant-even + + Only warn on OOMKill disable if the feature is actually requested + +commit 661d75f39858934c230c59a68d908ef203c34136 +Merge: d6e01e3337 e47112d3e8 +Author: Sebastiaan van Stijn +Date: Wed Jan 13 13:22:08 2016 -0800 + + Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable + + daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart + +commit fa01883cb206e9600d7c793af5ac5be2f1c652ae +Merge: a08e02f3bd f7a7e68df6 +Author: Aanand Prasad +Date: Wed Jan 13 21:17:18 2016 +0000 + + Merge pull request #2632 from hourliert/master + + Mount $HOME in /root to share docker config between containers. + +commit a08e02f3bdaa6daaafafd4f3fed5442ff0af6680 +Merge: 9f34354c19 b59387401c +Author: Aanand Prasad +Date: Wed Jan 13 21:10:36 2016 +0000 + + Merge pull request #2643 from sdurrheimer/zsh-completion-events + + Add zsh completion for 'docker-compose events' + +commit 9f34354c1906e6e7df10c497ed33866ad129af26 +Merge: c260eb910b 6c205a8e01 +Author: Aanand Prasad +Date: Wed Jan 13 21:10:09 2016 +0000 + + Merge pull request #2638 from albers/completion-events + + Add bash completion for `docker-compose events` + +commit c260eb910b3c89c195b546ac1ff9570adf50252a +Merge: 3aba5bb67e 3a46abd17f +Author: Joffrey F +Date: Wed Jan 13 13:09:22 2016 -0800 + + Merge pull request #2629 from dbonev/2611-support-port-range-in-compose + + Port range in exposed ports + +commit d6e01e3337a6ed1e941cf01840ee91ce55c55db4 +Merge: 612cf0f172 2dccb562df +Author: David Calavera +Date: Wed Jan 13 13:07:39 2016 -0800 + + Merge pull request #19241 from rhvgoyal/fix-device-id-free + + Mark device ID free only if device actually got deleted + +commit 3aba5bb67e8b55ddde1875f6b476c59a864b95f5 +Merge: d56f64c30a 2f07e2ac36 +Author: Aanand Prasad +Date: Wed Jan 13 21:05:38 2016 +0000 + + Merge pull request #2620 from dbonev/2607-ulimits-not-merged-in-extended-services + + Ulimits are now merged into extended services + +commit 4f6fb6dc7e883bc9a38e35777804be8fec6debf6 +Merge: 4291b591f2 f17cce330c +Author: Nathan LeClaire +Date: Wed Jan 13 12:59:49 2016 -0800 + + Merge pull request #2831 from nathanleclaire/aws_panic + + Check for nil before deferencing pointer in SG config + +commit d56f64c30a75cfadc60132cbc6148a2c3823551c +Merge: eced525317 bf48a781db +Author: Daniel Nephin +Date: Wed Jan 13 15:55:19 2016 -0500 + + Merge pull request #2130 from scipetr/master + + Add flag for stops all containers if any container was stopped. + +commit eced5253174d1978865f8c09cfdb7c897ce0e753 +Merge: ad8faad296 85a210d9eb +Author: Daniel Nephin +Date: Wed Jan 13 15:45:34 2016 -0500 + + Merge pull request #2651 from aanand/increase-signal-test-timeout + + Increase timeout on signal-handling tests + +commit 85a210d9eb4d3f7f0de537469680724d94a8abe4 +Author: Aanand Prasad +Date: Wed Jan 13 20:34:07 2016 +0000 + + Increase timeout on signal-handling tests + + Signed-off-by: Aanand Prasad + +commit f17cce330c5b4b7a0b04d3c931d3a96cdff53476 +Author: Nathan LeClaire +Date: Wed Jan 13 12:07:45 2016 -0800 + + Check for nil before deferencing pointer in SG config + + Signed-off-by: Nathan LeClaire + +commit d601199eb5d31da117179c113d77f9d070b3507b +Author: Joffrey F +Date: Wed Jan 13 12:07:08 2016 -0800 + + Normalize external_name + + Signed-off-by: Joffrey F + +commit d21748699d56f8f56e573657e227f6e26f73fada +Merge: 985974854c 1fef59f738 +Author: Alexandre Beslic +Date: Wed Jan 13 12:01:09 2016 -0800 + + Merge pull request #1565 from jimmyxian/fresh-image-when-commit + + fresh image when receive commit event + +commit 5a707d94d605fdf2a35d5a7033d1971b49745352 +Author: Phil Estes +Date: Wed Jan 13 11:53:44 2016 -0800 + + Only warn on OOMKill disable if the feature is actually requested + + Instead of warning the caller who is disabling OOM killer that the + feature isn't available, only warn if they are trying to **enable** OOM + killer and it can't be done. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit ac030702456e33daedb445af3cc50225aa8dc297 +Author: Brian Bland +Date: Wed Jan 13 11:52:17 2016 -0800 + + Fixes error codes in the API spec template + + Uses UPPER_UNDERSCORE_CASE instead of the nice error message format + added in #911 + + Signed-off-by: Brian Bland + +commit 985974854c64dad1fb944af2f0c8cb5e37407940 +Merge: 723a6c724f 9bfc28c291 +Author: Victor Vieux +Date: Wed Jan 13 11:47:10 2016 -0800 + + Merge pull request #1630 from jimenez/driver_join + + Adding observe async for driver abort/errors + +commit 945be9db2e376aa1cb104c895c29cbdba7d79ed8 +Author: Miloslav Trmač +Date: Wed Jan 13 20:34:13 2016 +0100 + + Drop mailing list link + + Per today’s phone call, the mailing list is not currently used (and is closed to external contributors). So, drop the link. + + Signed-off-by: Miloslav Trmač + +commit 612cf0f172948c892d642af3213a012fcf292135 +Merge: c8cc4fb8d9 5c630ea7c3 +Author: Tibor Vass +Date: Wed Jan 13 14:30:18 2016 -0500 + + Merge pull request #19279 from tiborvass/rename-authz-to-authorization + + Rename authz to authorization for greater clarity + +commit 8616b2de515f64d0d2541bcc61f8abcac15ac070 +Author: Joffrey F +Date: Wed Jan 13 11:22:57 2016 -0800 + + Update error message when external volume is missing + + Signed-off-by: Joffrey F + +commit c8cc4fb8d9a8d0cd155b8d26a3108e7762b623e3 +Merge: 184040bdd5 42961a66a5 +Author: David Calavera +Date: Wed Jan 13 11:17:37 2016 -0800 + + Merge pull request #19283 from tonistiigi/fix-permission-build-stdin + + Avoid extracting to temp directory on building from tar + +commit 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc +Author: Tibor Vass +Date: Tue Jan 12 19:38:18 2016 -0500 + + Rename authz to authorization for greater clarity + + Signed-off-by: Tibor Vass + +commit 184040bdd55c3930123ad4984dd976181b26cae8 +Merge: 0ee64127ae aab3596397 +Author: Brian Goff +Date: Wed Jan 13 14:15:17 2016 -0500 + + Merge pull request #19273 from calavera/volume-lazy-init + + [Carry 18549] Lazy initialize Volume on container Mount object. + +commit 723a6c724fe32e89d248b4eaa117fd57c005d181 +Merge: 0e4ebbf61d cdc2cc3d84 +Author: Dongluo Chen +Date: Wed Jan 13 10:59:31 2016 -0800 + + Merge pull request #1632 from thaJeztah/fix-incorrect-link + + Remove link to experimental "rescheduling" + +commit e47112d3e812b90b240624711e7a5d2d203d6746 +Author: Shishir Mahajan +Date: Tue Jan 12 13:44:13 2016 -0500 + + daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart + + Signed-off-by: Shishir Mahajan + +commit 7465a3149f9f0f5c996e95198c46960a4b92c9c2 +Author: Christopher Jones +Date: Wed Jan 13 13:37:08 2016 -0500 + + update registry and remove notary on ppc64le + + ppc64le now installs the second registry used for + f11b6a2ab313a03d051dd6f69d264d0482df72d6 + + Also, removed notary until the change to go 1.5.1+ + + Signed-off-by: Christopher Jones + +commit 4983e5807eb86a71f88dd83791f7a9f277bc2889 +Author: Phil Estes +Date: Wed Jan 13 10:40:49 2016 -0800 + + Better warning message on OOM kill disable without mem limit + + Modify the warning to be more readable/understandable. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 0ee64127ae67844918aa961f81e73185c57c21dc +Merge: 7ea65da7ef b70954e60a +Author: David Calavera +Date: Wed Jan 13 10:13:21 2016 -0800 + + Merge pull request #19276 from calavera/internal + + [Carry 18926] Add network internal mode + +commit 7ea65da7efe317d9dabc07557c8b2d196d20d815 +Merge: ba15b6f049 cfa3682ca4 +Author: Alexander Morozov +Date: Wed Jan 13 09:48:41 2016 -0800 + + Merge pull request #19254 from aboch/v6b + + Account docker0 IPv6 address on daemon start + +commit ba15b6f04936b3e38fb5b832e28ceb02277fc2e5 +Merge: 22f4dad3d7 11a95b9514 +Author: Alexander Morozov +Date: Wed Jan 13 09:28:54 2016 -0800 + + Merge pull request #19294 from runcom/fix-check-test + + integration-cli: check nil before Close'ing + +commit cdc2cc3d8411f6dc23c01adac95493141fc18325 +Author: Sebastiaan van Stijn +Date: Wed Jan 13 09:27:34 2016 -0800 + + Remove link to experimental "rescheduling" + + It's in experimental, so should not be linked + from in the online documentation. + + Signed-off-by: Sebastiaan van Stijn + +commit 446f498ebac56d4ed396b6c20252d152926dc30e +Author: Jessica Frazelle +Date: Tue Jan 12 10:01:04 2016 -0800 + + refactor aaparser pkg, add unit tests + + Signed-off-by: Jessica Frazelle + +commit 22f4dad3d7d3e5a79529bfd763bcefd8af94ba52 +Merge: e44bde8606 5c161f4e1a +Author: Jess Frazelle +Date: Wed Jan 13 08:38:10 2016 -0800 + + Merge pull request #19287 from tianon/check-config-assoc-array + + Update check-config.sh to use "case" instead of an associative array + +commit b70954e60a15d09756bd6b00a6fadedc64829477 +Author: Chun Chen +Date: Mon Dec 28 10:15:50 2015 +0800 + + Add network interal mode + + Signed-off-by: Chun Chen + Signed-off-by: David Calavera + +commit aab3596397c7b4fceac9061625898b3d2606597d +Author: David Calavera +Date: Tue Jan 12 17:18:57 2016 -0500 + + Remove duplicated lazy volume initialization. + + Signed-off-by: David Calavera + +commit e44bde86066606034ca1f7c41a115048fa838c8b +Merge: 46eb470039 40f73c7c8e +Author: Arnaud Porterie +Date: Wed Jan 13 08:10:38 2016 -0800 + + Merge pull request #19293 from albers/completion-connect-all + + bash completion for connecting non-running containers to networks + +commit 3e758c6d869a2ff5757dfe47f372b9adcdd41c78 +Author: Rob Van Mieghem +Date: Fri Jan 8 21:17:54 2016 +0100 + + FIX #2411 Do not default to aufs on a btrfs filesystem + + Signed-off-by: Rob Van Mieghem + +commit 1a7fd447fbf3027cb99db3a85eb01b9286ab9740 +Author: HuKeping +Date: Wed Jan 13 21:11:35 2016 +0800 + + Fix broken links + + Signed-off-by: Hu Keping + +commit 11a95b951435b63accae8765f7ace97c73f133d0 +Author: Antonio Murdaca +Date: Wed Jan 13 10:51:01 2016 +0100 + + integration-cli: check nil before Close'ing + + Signed-off-by: Antonio Murdaca + +commit 46eb4700391e8462756000d584337a763bc563c6 +Merge: a79f96828f 8edbd10349 +Author: Tibor Vass +Date: Wed Jan 13 07:09:58 2016 -0500 + + Merge pull request #19267 from mavenugo/vin-ln + + Vendor libnetwork v0.5.4 + +commit bf48a781dbc4d82e8b9fa940522b68b78e4c12e3 +Author: Evgeniy Dobrohvalov +Date: Fri Oct 2 20:07:44 2015 +0300 + + Add flag for stops all containers if any container was stopped. + + Signed-off-by: Evgeniy Dobrohvalov + +commit 9bfc28c291709bec13b5d4a9f899587315e4ee9e +Author: Isabel Jimenez +Date: Tue Jan 12 16:48:32 2016 -0500 + + Adding obeserve async for driver abort/errors + + Signed-off-by: Isabel Jimenez + +commit a79f96828f7da2fc762002bf79ab8a9dcf908457 +Merge: 40d7ad98a8 e5edc168a6 +Author: Antonio Murdaca +Date: Wed Jan 13 10:42:22 2016 +0100 + + Merge pull request #19249 from calavera/carry_17414 + + [Carry 17414] Added additional container information to "docker info". + +commit 4291b591f23002193ff9aa8642d84a423bc3dd9e +Merge: b589eb9475 2b330c4166 +Author: David Gageot +Date: Wed Jan 13 10:36:21 2016 +0100 + + Merge pull request #2826 from dgageot/nathanleclaire-precreatecheckdoc + + Add note about pre-create check and exit code + +commit 40f73c7c8e577baa795b799e0390c89cc0488d45 +Author: Harald Albers +Date: Wed Jan 13 10:32:23 2016 +0100 + + bash completion for connecting non-running containers to networks + + Signed-off-by: Harald Albers + +commit 2b330c4166a82146f2ade47d059a839068548d85 +Author: David Gageot +Date: Wed Jan 13 10:19:30 2016 +0100 + + Markdown lint + + Signed-off-by: David Gageot + +commit c4e798cafd1eb669438a1b6a685caadc9bba0476 +Author: Nathan LeClaire +Date: Tue Jan 12 11:53:07 2016 -0800 + + Add note about pre-create check and exit code + + Signed-off-by: Nathan LeClaire + +commit 40d7ad98a8e9220745a4505b2f6d902c0732f7a5 +Merge: 9232c09cd5 883be48930 +Author: Antonio Murdaca +Date: Wed Jan 13 10:00:57 2016 +0100 + + Merge pull request #19275 from tonistiigi/delete-image-conflict-bitmask + + Use bitmask for conflict checking + +commit b589eb94750adfdea860c1320fd37d63379efc39 +Merge: 830d17c377 6d41d8c1ad +Author: David Gageot +Date: Wed Jan 13 09:13:55 2016 +0100 + + Merge pull request #2818 from jeffellin/debugaws + + Allow Debug messages from ec2 driver to include request / response + +commit 830d17c377d28e6a975e1b95a7495cd461a0d6b4 +Merge: 63673243fb d80ea22623 +Author: David Gageot +Date: Wed Jan 13 09:11:11 2016 +0100 + + Merge pull request #2823 from nathanleclaire/panic_recovr + + Add panic recovery to Create method for drivers + +commit 1f7d16373e7f10ee8d3e1053d2b5f6a46c2cfab3 +Merge: 3fa73e80b9 31d79d77a3 +Author: Riyaz Faizullabhoy +Date: Tue Jan 12 22:34:52 2016 -0800 + + Merge pull request #439 from HuKeping/improve-logging + + Log: improve error logging + +commit 1ff43d08b007ceae6e83c9724b9d2c7ece0b3140 +Author: David Gageot +Date: Wed Jan 13 07:29:21 2016 +0100 + + Bump Kitematic version to 0.9.5.1 + + Signed-off-by: David Gageot + +commit 9232c09cd5b4512ff267b16526797d9def38396a +Merge: 47d87d3b92 7b616d4743 +Author: Phil Estes +Date: Tue Jan 12 21:54:38 2016 -0800 + + Merge pull request #19281 from hqhq/hq_dont_fail_oomkilldisable + + Do not fail if not support OomKillDisable + +commit 5c161f4e1a7e25abedefb6d40dfe7f355077773a +Author: Tianon Gravi +Date: Tue Jan 12 20:57:56 2016 -0800 + + Update check-config.sh to use "case" instead of an associative array + + This fixes Bash 3.x compatibility (where associative arrays are not available). + + Signed-off-by: Andrew "Tianon" Page + +commit 8edbd10349afb4ea78919e0037cf895eb95cb5fb +Author: Madhu Venugopal +Date: Tue Jan 12 11:36:48 2016 -0800 + + Updating to the new ep.Delete API + + Signed-off-by: Madhu Venugopal + +commit 537089481fd9f6859d851a76b67a4f80e0e3691e +Author: Madhu Venugopal +Date: Tue Jan 12 11:33:16 2016 -0800 + + Vendor libnetwork v0.5.4 + + - Removed the isNodeAlive protection when user forces an endpoint delete + + - Bridge driver supporting internal network option + - Backend implementation to support "force" option to network disconnect + - Fixing a regex in etchosts package to fix docker/docker#19080 + + Signed-off-by: Madhu Venugopal + +commit 6a04ecf81333d7b26928f0dcbfb416ca788f287c +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 12 05:13:44 2016 +0000 + + Update response content for volume mounts + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit d80ea2262373284ba880c2264ae2a798fe797ca7 +Author: Nathan LeClaire +Date: Tue Jan 12 19:25:18 2016 -0800 + + Add panic recovery to Create method for drivers + + Signed-off-by: Nathan LeClaire + +commit 31d79d77a336ab5507febec342ddc76bf0a373a0 +Author: HuKeping +Date: Mon Jan 11 17:52:08 2016 +0800 + + Comment: improve some comment + + To keep consistent with the comment about the interface. + + Signed-off-by: Hu Keping + +commit 5968823ace1371d63c3b083ca89abadd00abdf14 +Author: HuKeping +Date: Mon Jan 11 15:01:55 2016 +0800 + + Log: improve error logging + + When pushing an image to Distribution server with Notary enabled at the + first time, client will try to get the root.json and it will fail since + there is nothing in Notary yet. + + This patch enhances the error message by adding the error detail. + - "404 GET notary-distribution:5678/busybox:root" + + Signed-off-by: Hu Keping + +commit 3fa73e80b96869de069834f45b2e0c5cbd7fd925 +Merge: b6042d923f 6460e8b343 +Author: David Lawrence +Date: Tue Jan 12 18:07:34 2016 -0800 + + Merge pull request #443 from docker/riyaz-maintainer + + Add to maintainers list + +commit b6042d923f7abca7b0833494c92c01149066dc6e +Merge: eb115b987f 89f250c253 +Author: David Lawrence +Date: Tue Jan 12 18:06:28 2016 -0800 + + Merge pull request #442 from endophage/rotate_key_not_read_only + + when doing getTransport readOnly needs to be false + +commit 0350d56176101c32dcbd90152538c977f16b4f48 +Author: David Lawrence +Date: Tue Jan 12 14:19:26 2016 -0800 + + renaming dockerfiles for autobuilds + Signed-off-by: David Lawrence (github: endophage) + +commit 0e4ebbf61d1f58a4955b0f67cb8d1416ee955594 +Merge: 254e095f77 14bf4e08b3 +Author: Victor Vieux +Date: Tue Jan 12 18:00:36 2016 -0800 + + Merge pull request #1626 from vieux/experimental + + add -experimental to enable rescheduling + +commit 42961a66a5c1575d81c89aa258f6624f48bba94d +Author: Tonis Tiigi +Date: Tue Jan 12 13:18:24 2016 -0800 + + Avoid extracting to temp directory on building from tar + + Fixes #15785 + + Signed-off-by: Tonis Tiigi + +commit 7b616d4743c94f8be3eb59f8c23ed7a19fb2786d +Author: Qiang Huang +Date: Wed Jan 13 09:07:40 2016 +0800 + + Do not fail if not support OomKillDisable + + Fixes: #19278 + + The issue seems existed since we add support for OomKillDisable, + OomKillDisable support should not be hard request, we just + discard it if not support and move on. + + Signed-off-by: Qiang Huang + +commit 254e095f77eeedba9bc75ca75f94b70b7df59da0 +Merge: 18b6435839 fedf7aa4cb +Author: Alexandre Beslic +Date: Tue Jan 12 17:06:51 2016 -0800 + + Merge pull request #1601 from vieux/docker_discovery + + use docker/docker/pkg/discovery and update godeps + +commit 18b6435839139140737058670573c6f88a850f2d +Merge: 62fdf2fad1 443d49167a +Author: Victor Vieux +Date: Tue Jan 12 17:02:35 2016 -0800 + + Merge pull request #1621 from jimenez/scheduler_driver + + Restructuring mesos scheduler driver outside of Cluster + +commit f774422d18c32f3d9233e7c697ccf65e30a3fc06 +Author: Joffrey F +Date: Tue Jan 12 16:58:24 2016 -0800 + + Test Volume.exists() behavior + + Signed-off-by: Joffrey F + +commit 9cb58b796e2ea70f37ea857909fa4a3044d8861b +Author: Joffrey F +Date: Tue Jan 12 16:53:49 2016 -0800 + + Implement ability to specify external volumes + + External volumes are created and managed by the user. + They are not namespaced. + They are expected to exist at the beginning of the up phase. + + Signed-off-by: Joffrey F + +commit 47d87d3b92e349608e080f15035d8485af7254c5 +Merge: 1e1a3c9508 2aa5f33b20 +Author: Sebastiaan van Stijn +Date: Tue Jan 12 16:47:32 2016 -0800 + + Merge pull request #19229 from mavenugo/udlinks + + Local alias support + +commit 443d49167a195a53f1fb5fcf5e63619eb52a5f79 +Author: Isabel Jimenez +Date: Thu Jan 7 18:10:11 2016 -0500 + + Restructuring mesos scheduler driver outside of Cluster + + Signed-off-by: Isabel Jimenez + +commit 883be4893049aa97cb874d239cf6b06325fc74f2 +Author: Tonis Tiigi +Date: Tue Jan 12 15:03:08 2016 -0800 + + Use bitmask for conflict checking + + Rather than using 2 different functions for different + types of conflicts use a bitmask to specify what + conflicts need to be checked. This allows a better way + to make exceptions. + + Signed-off-by: Tonis Tiigi + +commit 1e1a3c9508f196f17daec3e47298a86949ab66ec +Merge: 56272c9e9e 38a45eed88 +Author: Tibor Vass +Date: Tue Jan 12 18:56:25 2016 -0500 + + Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id + + Fix rmi by ID untagging image on error + +commit 62fdf2fad164fbb6ce9e37a7244dae77ea0342b6 +Merge: e1213384bc 07031ed7ba +Author: moxiegirl +Date: Tue Jan 12 15:51:59 2016 -0800 + + Merge pull request #1546 from moxiegirl/readme-refs-work + + Remove readmes and point to docs + +commit 05935b5e5448436f210cb5488a65338aae6e722f +Author: Joffrey F +Date: Mon Jan 4 15:10:32 2016 -0800 + + Don't recreate pre-existing volumes. + + During the initialize_volumes phase, if a volume using the + non-namespaced name already exists, don't create the namespaced + equivalent. + + Signed-off-by: Joffrey F + +commit 56272c9e9e6816f7515a7a1f58390eccb35780b0 +Merge: c0c66c57b2 062d0b3921 +Author: Tibor Vass +Date: Tue Jan 12 18:34:59 2016 -0500 + + Merge pull request #19060 from jfrazelle/daemon-read-seccomp + + read seccomp profile locally then pass to daemon + +commit 5d8c2d3cec432fd1853268804b21cdebe3ed81ce +Author: Jonathan Stewmon +Date: Fri Dec 4 16:40:09 2015 -0600 + + add support for stop_signal to compose file + + Signed-off-by: Jonathan Stewmon + +commit 63673243fb79683c2a3573fef0d0581a769f69be +Merge: 6cc068ee4a 45a8f5e7a6 +Author: Nathan LeClaire +Date: Tue Jan 12 15:19:41 2016 -0800 + + Merge pull request #2807 from jeanlaurent/preCreateCheckExitStatus + + Return exit code 3 on pre-create errors + +commit e5edc168a65e038245efbc5353a456302554f4eb +Author: David Calavera +Date: Mon Jan 11 19:23:12 2016 -0500 + + Complete documentation about extra container information. + + Signed-off-by: David Calavera + +commit ad8faad296ca78b0fde7932506566956cdea5435 +Merge: d4b4b126fb 0bca8d9cb3 +Author: Joffrey F +Date: Tue Jan 12 15:16:45 2016 -0800 + + Merge pull request #2579 from vdemeester/update-reference-with-config-and-create + + Add config and create to docs/reference + +commit c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf +Merge: 09510c7c43 2f048f73e1 +Author: David Calavera +Date: Tue Jan 12 15:15:36 2016 -0800 + + Merge pull request #19170 from aaronlehmann/delete-prune-digests + + Prune digest references when deleting by tag + +commit e1213384bc906d7c97a03197c0c56a8dade29097 +Merge: 4a582897e0 74dfe8b0f6 +Author: Alexandre Beslic +Date: Tue Jan 12 15:00:27 2016 -0800 + + Merge pull request #1578 from aluzzardi/rescheduling + + [experimental] Simple container rescheduling on node failure + +commit 2aa673aed7cd10497d578a14a9550c75789e0a43 +Author: Darren Shepherd +Date: Wed Dec 9 12:39:31 2015 -0700 + + Lazy initialize Volume on container Mount object + + Currently on daemon start volumes are "created" which involves invoking + a volume driver if needed. If this process fails the mount is left in a + bad state in which there is no source or Volume set. This now becomes + an unrecoverable state in which that container can not be started. The + only way to fix is to restart the daemon and hopefully you don't get + another error on startup. + + This change moves "createVolume" to be done at container start. If the + start fails it leaves it in the state in which you can try another + start. If the second start can contact the volume driver everything + will recover fine. + + Signed-off-by: Darren Shepherd + +commit d4b4b126fb8d634ac32f38d1cc367d3b18b83824 +Merge: 0c626e63bc 70cce961a8 +Author: Aanand Prasad +Date: Tue Jan 12 22:19:50 2016 +0000 + + Merge pull request #2635 from aanand/use-networking + + Use networking for version 2 Compose files + +commit 3a46abd17fe0b631643a62e2ca5e51a6c9ced462 +Author: Dimitar Bonev +Date: Sun Jan 10 18:15:13 2016 +0200 + + Allowed port range in exposed ports + + Signed-off-by: Dimitar Bonev + +commit 09510c7c43c2717dbd6086a29bfdd63a0d370242 +Merge: c1582f20cc 54bea86b03 +Author: David Calavera +Date: Tue Jan 12 14:06:24 2016 -0800 + + Merge pull request #19272 from sdurrheimer/zsh-completion-daemon-userns-remap + + Add zsh completion for 'docker daemon --userns-remap' + +commit 2f07e2ac3628617b9817dc9f7815d6c3a730aaac +Author: Dimitar Bonev +Date: Thu Jan 7 21:21:47 2016 +0200 + + Ulimits are now merged into extended services + + Signed-off-by: Dimitar Bonev + +commit 4a582897e08ea73c70c362fa508b4ec20b1ab89f +Merge: 8cfc984869 8f384b1d40 +Author: Alexandre Beslic +Date: Tue Jan 12 13:46:17 2016 -0800 + + Merge pull request #1600 from dongluochen/ranking + + Scheduler prefers nodes without connection failures + +commit 38a45eed8850a15d2f737ce7455f29c5ae53ab49 +Author: Tonis Tiigi +Date: Tue Jan 12 10:55:34 2016 -0800 + + Fix rmi by ID untagging image on error + + Do not untag image if it would later get a hard conflict because of running containers. + + Fixes #18873 + + Signed-off-by: Tonis Tiigi + +commit 2aa5f33b20881d3d5e7f412ff946f83f33cde810 +Author: Madhu Venugopal +Date: Mon Jan 11 02:34:17 2016 -0800 + + Docs update for link functionality in user-defined networks + + Signed-off-by: Madhu Venugopal + +commit e221b8a3d64c13178e156fc3ece5e9894dac1603 +Author: Madhu Venugopal +Date: Tue Jan 5 11:20:47 2016 -0800 + + Support `--link` for user-defined networks + + This brings in the container-local alias functionality for containers + connected to u ser-defined networks. + + Signed-off-by: Madhu Venugopal + +commit 54bea86b03b0191fd65d5e25ee0f677ffc2baffb +Author: Steve Durrheimer +Date: Tue Jan 12 22:38:32 2016 +0100 + + Add zsh completion for 'docker daemon --userns-remap' + + Signed-off-by: Steve Durrheimer + +commit 70cce961a8223403d36e8d209925e112f1ebd02f +Author: Aanand Prasad +Date: Tue Jan 12 17:26:18 2016 +0000 + + Don't allow links or external_links in v2 files + + Signed-off-by: Aanand Prasad + +commit 9e17cff0efaff14f2b03d5d0ba70559661733b26 +Author: Aanand Prasad +Date: Tue Jan 12 18:12:53 2016 +0000 + + Refactor API version switching logic + + Signed-off-by: Aanand Prasad + +commit a027a0079c17c87b1e531c82cf8250086dbfbf66 +Author: Aanand Prasad +Date: Tue Jan 12 16:26:20 2016 +0000 + + Use networking for version 2 Compose files + + - Remove --x-networking and --x-network-driver + - There's now no way to set a network driver - this will be added back + with the 'networks' key + + Signed-off-by: Aanand Prasad + +commit 062d0b3921316bc348c7930ce6599e1f8f297090 +Author: Jessica Frazelle +Date: Mon Jan 4 09:59:26 2016 -0800 + + read seccomp profile locally then pass to daemon + + Signed-off-by: Jessica Frazelle + +commit c1582f20cc6ff1abe576e5aabb60c73309055556 +Merge: 293b3767c8 db41c5f5a5 +Author: Jess Frazelle +Date: Tue Jan 12 13:11:39 2016 -0800 + + Merge pull request #19243 from calavera/engine_api_0_2 + + Vendor engine-api 0.2 + +commit 1a66543461c610ff0b6c1dcf117ed965edd5c249 +Author: Aanand Prasad +Date: Tue Jan 12 16:25:15 2016 +0000 + + Make the default network name '{project name}_default' + + Signed-off-by: Aanand Prasad + +commit b786b47bc8425dd75d5f6a257d948d5fd8fda022 +Author: Aanand Prasad +Date: Tue Jan 12 17:35:48 2016 +0000 + + Remove version checks from tests requiring API v1.21 + + Signed-off-by: Aanand Prasad + +commit 0c626e63bcfb988dfc309e878e15d7120322ab79 +Merge: d32a3ec08f e98ab0e534 +Author: Aanand Prasad +Date: Tue Jan 12 21:08:00 2016 +0000 + + Merge pull request #2458 from dnephin/image_and_build_together + + Image and build together + +commit b59387401c0f5c2eea11153eb024932db2748855 +Author: Steve Durrheimer +Date: Tue Jan 12 22:04:05 2016 +0100 + + Add zsh completion for 'docker-compose events' + + Signed-off-by: Steve Durrheimer + +commit 6d41d8c1ad594bd3b552d9d2b46589f2fdbe9b47 +Author: jellin +Date: Tue Jan 12 14:16:37 2016 -0500 + + Allow Debug messages from ec2 driver to include request / response data sent to aws. + + Signed-off-by: Jeffrey Ellin + +commit 2f048f73e122ab90b8f35a088b4be52bd255caad +Author: Aaron Lehmann +Date: Wed Jan 6 17:57:21 2016 -0800 + + Prune digest references when deleting by tag + + When pulling an image with content trust enabled, two references are + created: a digest reference and a tag reference. Deleting by tag + wouldn't actually remove the image, because the digest reference keeps + it alive. + + This change modifies the rmi logic so that digest references don't keep + an image alive. If the last tag referencing a given image is deleted, + any digest references to it will be removed as well, so the image can + actually get deleted. This fixes the usability problem with deletions + when content trust is in use, so something like "docker pull busybox; + docker rmi busybox" will work as expected. + + Signed-off-by: Aaron Lehmann + +commit 6cc068ee4a1fca6451de397f28318f78ca9b93eb +Merge: 248596da8a 3c2aab2abe +Author: Nathan LeClaire +Date: Tue Jan 12 11:58:38 2016 -0800 + + Merge pull request #2809 from smashwilson/unable-to-find-tenant + + Rackspace: Only derive tenant ID if tenant name is supplied. + +commit 01c7556e3ab112d0870e50b427509bb2982dc693 +Author: Nathan LeClaire +Date: Thu Oct 29 10:42:10 2015 -0700 + + Add docker-machine provision command + + Signed-off-by: Nathan LeClaire + +commit 293b3767c8453ee7ccabe53c357965241d7afbf6 +Merge: 45211af702 40d5ced9d0 +Author: Jess Frazelle +Date: Tue Jan 12 11:33:27 2016 -0800 + + Merge pull request #19245 from jfrazelle/seccomp-kernel-check + + check seccomp is configured in the kernel + +commit c64117cbd728710800f369ce52d66141512d7580 +Author: ajneu +Date: Wed Jan 6 13:46:53 2016 +0100 + + documentation: debian/ubuntu need apt-transport-https ca-certificates + + Signed-off-by: ajneu + +commit d32a3ec08f9b63deac5b3627c8ff1f2f58280c3c +Merge: 9e36847eb9 ed4db542d6 +Author: Daniel Nephin +Date: Tue Jan 12 14:13:23 2016 -0500 + + Merge pull request #2639 from dnephin/fix_pep8_errors + + Fix pep8 errors from the new pep8 release. + +commit e98ab0e534a0a0b9ec86f18f0867b05188fc8b02 +Author: Daniel Nephin +Date: Tue Jan 12 11:24:06 2016 -0500 + + Allow both image and build together. + + Signed-off-by: Daniel Nephin + +commit ed4db542d6f6d4ec062bb29d8c99a6ea5c9523d7 +Author: Daniel Nephin +Date: Tue Jan 12 14:02:30 2016 -0500 + + Fix pep8 errors from the new pep8 release. + + Signed-off-by: Daniel Nephin + +commit 9e36847eb9401402686ba814db07de23fa04ebb9 +Merge: 304a44aeab 12b5405420 +Author: Aanand Prasad +Date: Tue Jan 12 18:54:16 2016 +0000 + + Merge pull request #2637 from dnephin/fix_pre_commit_on_master + + Fix pre-commit on master + +commit 6c205a8e017569f3a18ae697edf6310f221860f6 +Author: Harald Albers +Date: Tue Jan 12 10:51:04 2016 -0800 + + Add bash completion for `docker-compose events` + + Signed-off-by: Harald Albers + +commit 45211af7022401e1f9c36704aeb9c4f5a776fba1 +Merge: 1393c450cd 5abef06a15 +Author: Tibor Vass +Date: Tue Jan 12 13:28:50 2016 -0500 + + Merge pull request #19194 from LK4D4/fix_race_clean_net + + Fix race on cleaning endpoint data + +commit 12b5405420ebfd2a3b260f3a4421bfadd52e8a97 +Author: Daniel Nephin +Date: Tue Jan 12 13:27:18 2016 -0500 + + Fix pre-commit on master. + + Signed-off-by: Daniel Nephin + +commit db41c5f5a5fe78aaf851f1c652661ab32e77c788 +Author: David Calavera +Date: Mon Jan 11 18:39:13 2016 -0500 + + Update docker-py commit to the latest HEAD. + + To fix issues with IPAM options. + + Signed-off-by: David Calavera + +commit f4a687334b1d026c84809fd005e1a82225d1c86f +Author: Qiang Huang +Date: Thu Dec 31 14:17:18 2015 +0800 + + Change OomKillDisable to be pointer + + It's like `MemorySwappiness`, the default value has specific + meaning (default false means enable oom kill). + + We need to change it to pointer so we can update it after + container is created. + + Signed-off-by: Qiang Huang + (cherry picked from commit 9c2ea42329179c589f5a8991ccf0253eb10fc897) + + Conflicts: + vendor/src/github.com/docker/engine-api/types/container/host_config.go + +commit 0627bf1a8383ef18146f6a4caa4e212353b1158f +Author: David Calavera +Date: Mon Jan 11 15:01:33 2016 -0500 + + Do not force network disconnection. + + Let that for a future flag. + + Signed-off-by: David Calavera + +commit ca60e6262bc33ce213e40bdebe9e64c4fb00974a +Author: David Calavera +Date: Mon Jan 11 15:00:03 2016 -0500 + + Vendor engine-api 0.2.1. + + Signed-off-by: David Calavera + +commit 304a44aeab22c5dd0ee021c29b7ed7be2eea9720 +Merge: 52e50a9d9a 778c213dfc +Author: Daniel Nephin +Date: Tue Jan 12 12:55:53 2016 -0500 + + Merge pull request #2585 from dnephin/short_signal_handlers + + Fix signal handlers by moving shutdown logic out of handler + +commit 1393c450cd8b4b7143a069ac062fd2adc6e02ca0 +Merge: c72be040bb a4f6920731 +Author: Sebastiaan van Stijn +Date: Tue Jan 12 09:46:19 2016 -0800 + + Merge pull request #19104 from vdemeester/18957-update-config + + Add a specific config struct for the update command (#18957) + +commit 40d5ced9d00113744555ff13f4e62617dda5f1e2 +Author: Jessica Frazelle +Date: Mon Jan 11 11:44:34 2016 -0800 + + check seccomp is configured in the kernel + + Signed-off-by: Jessica Frazelle + +commit 2ac3ccca27c9535fd211ce1be0f3725af8f29844 +Author: David Gageot +Date: Tue Jan 12 18:43:46 2016 +0100 + + Bump toolbox version to 1.9.1i + + Signed-off-by: David Gageot + +commit 430a1d4ab19e47cc24d6f664f024c9570b1dc368 +Author: David Gageot +Date: Tue Jan 12 18:43:09 2016 +0100 + + Bump docker-machine to 0.5.6 + + Signed-off-by: David Gageot + +commit c72be040bb893e49bb12baf7e688c88b635d8ea1 +Merge: 664ba0ec0a cc63db4fd1 +Author: Sebastiaan van Stijn +Date: Tue Jan 12 09:34:19 2016 -0800 + + Merge pull request #19187 from estesp/lets-do-this + + User namespaces: graduate from experimental + +commit 664ba0ec0a220d569df4c409a832d0508a93f6e6 +Merge: 301627c677 1e021ff571 +Author: Arnaud Porterie +Date: Tue Jan 12 08:32:06 2016 -0800 + + Merge pull request #19053 from anusha-ragunathan/vendor-policy + + Create standard vendor policies. + +commit 52e50a9d9a2d6a5f8418a4c342f18fe393188864 +Merge: 063a25ae7d ca634649bb +Author: Aanand Prasad +Date: Tue Jan 12 15:21:10 2016 +0000 + + Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key + + Move logging config under separate key in v2 compose files + +commit 301627c677b530a9ea77ecea6d1c82eec83cd9ac +Merge: 3f1b16e236 79d4f0f56e +Author: Sebastiaan van Stijn +Date: Tue Jan 12 07:06:31 2016 -0800 + + Merge pull request #18906 from coolljt0725/connect_to_created + + Support network connect/disconnect to stopped container + +commit 063a25ae7d55405d33776d7caf51ec28224849aa +Merge: 2f8cb55412 d3cd038b84 +Author: Aanand Prasad +Date: Tue Jan 12 11:45:27 2016 +0000 + + Merge pull request #2392 from dnephin/docker_compose_events + + docker-compose events + +commit 61142e4cbd2333d077796476ab35146c59a3924f +Author: Victor Vieux +Date: Tue Jan 12 02:40:15 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit 6dcb1708083eab48c6165199a7c7069094abf358 +Author: Victor Vieux +Date: Tue Jan 12 02:37:05 2016 -0800 + + add buildtime, kernelversion and experimental to API version + + Signed-off-by: Victor Vieux + +commit ac627fbb38109a66636a619168baca0ac9dec880 +Author: Abhijeet Kasurde +Date: Mon Jan 4 02:00:10 2016 -0500 + + Updated documentation related to apt-cacher-ng + + Signed-off-by: Abhijeet Kasurde + +commit 45a8f5e7a660135baa63f8b89e6edcd5570b8be6 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 11 18:57:23 2016 +0100 + + Returns exit code 3 on pre-create check + + Signed-off-by: Jean-Laurent de Morlhon + +commit 14bf4e08b3de53e4ee2052f9845661f708535fff +Author: Victor Vieux +Date: Tue Jan 12 00:03:00 2016 -0800 + + add -experimental to enable rescheduling + + Signed-off-by: Victor Vieux + +commit fedf7aa4cb8dd04946d5d3d341014feaf8affdbc +Author: Victor Vieux +Date: Mon Jan 11 13:26:49 2016 -0800 + + use "docker/swarm/nodes" + + Signed-off-by: Victor Vieux + +commit 31ad0e047f4a7b236c559ccf3793979ae0af086a +Author: Victor Vieux +Date: Mon Jan 11 12:19:42 2016 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit fc1e7bbca25a33a2cd1d416b13a2c8230edff868 +Author: Victor Vieux +Date: Mon Jan 11 12:05:16 2016 -0800 + + use docker/docker/pkg/discovery + + Signed-off-by: Victor Vieux + +commit 1bfdf55a52ba5f7c37cb082b8bc4a11ef19432a7 +Author: Mary Anthony +Date: Wed Jan 6 18:58:12 2016 -0800 + + Updating READMEs + + Signed-off-by: Mary Anthony + +commit 0ba6a128eeee3f1519fa3842a6847402a7eafa05 +Author: Wen Cheng Ma +Date: Thu Jan 7 17:39:29 2016 +0800 + + Update the doc of build-bridges.md + + Signed-off-by: Wen Cheng Ma + +commit cfa3682ca4e04f4311bc9b1c6186069c9d4f5a90 +Author: Alessandro Boch +Date: Mon Jan 11 23:47:44 2016 -0800 + + Account dcoker0 IPv6 address on daemon start + + - In case --fixed-cidr-v6 is specified and docker0 bridge already + has a global scope IPv6 address belonging to that v6 network + (likely from a previous daemon instance), to maintain consistency + with what done for the docker0 IPv4 address, daemon has to pass it + down to libnetwork in the IPAMConfig as network gateway to make + sure that the address is not given to some container. + + Signed-off-by: Alessandro Boch + +commit a4f6920731c6af27a7e89c3da8d0e6fd309de90a +Author: Vincent Demeester +Date: Tue Jan 12 08:33:41 2016 +0100 + + Add a specific config for the update command + + This allows to define clearly what is mutable or not in a container + and remove the use of the internal HostConfig struct to be used. + + Signed-off-by: Vincent Demeester + +commit d104ddb564b636631c82955e8a6749305e7afee8 +Author: Qiang Huang +Date: Tue Jan 12 15:15:17 2016 +0800 + + Add DOCKER_BUILD_ARGS support for make build + + We always need proxy for build, so we always use "docker build" + command instead of "make build", but now for some reasons, we need + macro defined in Makefile, so it would be helpful if we can use + "make build" without touching Dockerfile. + + Signed-off-by: Qiang Huang + +commit 3a866d3c11488085ac09a87d81079432b2162239 +Merge: bc326800fd 8894285250 +Author: Sebastiaan van Stijn +Date: Mon Jan 11 18:21:40 2016 -0800 + + Merge pull request #49 from HackToday/18698-fix-setup-doc + + Add explanation for unexpected error msg + +commit 74dfe8b0f619e4fadb47f4c2ee05db7e7667ba79 +Author: Victor Vieux +Date: Mon Jan 11 18:09:18 2016 -0800 + + move doc to experimental/ + + Signed-off-by: Victor Vieux + +commit 6460e8b34333080130da5b0d9f92fcea39c64953 +Author: Riyaz Faizullabhoy +Date: Mon Jan 11 18:00:07 2016 -0800 + + Add to maintainers list + + Signed-off-by: Riyaz Faizullabhoy + +commit cc63db4fd19f99372a84cc97a87a023fa9193734 +Author: Phil Estes +Date: Fri Jan 8 10:07:46 2016 -0500 + + Add daemon documentation on user namespaces feature + + Remove the experimental docs for user namespaces and add similar content + to the `docker daemon` command documentation. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit d5743a3a5c0864686a300b1fe5f58b89a36bb2f6 +Author: Phil Estes +Date: Fri Jan 8 09:03:17 2016 -0500 + + Properly report conflicting namespace options when using userns + + This prevents strange errors and clarifies which namespace options are + incompatible with user namespaces (at this time). + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 889428525032acea3432cc09bc0a39a51858d8a4 +Author: Kai Qiang Wu(Kennan) +Date: Thu Dec 24 03:32:33 2015 +0000 + + Add explanation for unexpected error msg + + Fixes: #18698 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 3f1b16e236ad4626e02f3da4643023454d7dbb3f +Merge: 656979670c cc44ea21e4 +Author: Sebastiaan van Stijn +Date: Mon Jan 11 17:41:53 2016 -0800 + + Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port + + Fix ambassador script + +commit 5a9e06fe5ccf9a5d381304f80f209a80f74a2dcc +Author: David Lawrence +Date: Fri Jan 8 17:28:00 2016 -0800 + + adding sha256 column to tuf_files database table + Signed-off-by: David Lawrence (github: endophage) + +commit 89f250c25344aab24cea9ee7da28c1f4255f24b5 +Author: David Lawrence +Date: Mon Jan 11 16:27:09 2016 -0800 + + when doing getTransport readOnly needs to be false for a key rotation as write permissions are required to retrieve keys + Signed-off-by: David Lawrence (github: endophage) + +commit a2018c177c04c82abde234e916fa6f3efab21e81 +Author: Victor Vieux +Date: Mon Jan 11 17:23:48 2016 -0800 + + improve eventHandlers locking + + Signed-off-by: Victor Vieux + +commit 656979670c5225753ad8d0c6d2bb1ab1a82b0b56 +Merge: acff8f7a9d 4b98193bea +Author: Sebastiaan van Stijn +Date: Mon Jan 11 17:21:38 2016 -0800 + + Merge pull request #18998 from calavera/syslog_tls + + Allow syslog over TCP+TLS. + +commit 79d4f0f56ec84922184e25c0263807158b6fb76b +Author: Lei Jitang +Date: Mon Jan 11 20:13:39 2016 -0500 + + Add docker network connect/disconnect to non-running container + + Signed-off-by: Lei Jitang + +commit acff8f7a9d4514cfb2ae8619633e4636d07f1eaa +Merge: 058e6dce18 bce01398dd +Author: Jess Frazelle +Date: Mon Jan 11 16:40:12 2016 -0800 + + Merge pull request #19248 from calavera/list_engine_api + + List engine-api in the client libraries reference. + +commit ca634649bbdb92cd7c52a98ee693d0c55a1e153b +Author: Joffrey F +Date: Mon Jan 11 16:25:19 2016 -0800 + + Changed logging override test into integration test + + Signed-off-by: Joffrey F + +commit bce01398dda39e551a39f287224189f70accaf80 +Author: David Calavera +Date: Mon Jan 11 19:17:13 2016 -0500 + + List engine-api in the client libraries reference. + + Signed-off-by: David Calavera + +commit e732f4e649a3420eab3b6541dacbefe3cf00719a +Author: Kim Eik +Date: Tue Oct 27 21:12:33 2015 +0100 + + Added additional container information to "docker info". + + Instead of just showing the number of containers this patch will + show the number of running, paused and stopped containers as well. + + Signed-off-by: Kim Eik + (cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956) + +commit 058e6dce184fdfc12d7d93faeb669d5afa428518 +Merge: a96a0b3781 df40c61f8a +Author: Tibor Vass +Date: Mon Jan 11 19:13:55 2016 -0500 + + Merge pull request #19247 from tiborvass/remove-tac + + Make Makefile work on OS X + +commit 8f384b1d4092ab499b17d206a3a8683308e2e6c8 +Author: Dong Chen +Date: Mon Jan 11 16:08:51 2016 -0800 + + Address review comments. + + Signed-off-by: Dong Chen + +commit 78008f4d4a6816113b1f34a3bd867abd343139eb +Author: Victor Vieux +Date: Thu Dec 10 21:07:44 2015 -0800 + + add doc + fix tests and keep swarm id + remove duplicate on node reconnect + explicit failure + + Signed-off-by: Victor Vieux + +commit 13f60212f57dae8ba480c28bf26261bd7331ea4f +Author: Andrea Luzzardi +Date: Thu Dec 3 02:30:15 2015 -0800 + + Add support for container rescheduling on node failure. + Add rescheduling integration tests. + + Signed-off-by: Andrea Luzzardi + +commit 56941d02a8794c3ce9cfdb13e417a492b4632a84 +Author: Andrea Luzzardi +Date: Wed Nov 25 09:20:53 2015 -0800 + + cluster: Support multiple event handlers. + + Signed-off-by: Andrea Luzzardi + +commit 46a474ecd9132fcf84eb5568df4245bd13e3ca26 +Author: Joffrey F +Date: Mon Jan 11 15:53:28 2016 -0800 + + Move v1-v2 config normalization to separate function. + + Signed-off-by: Joffrey F + +commit 8cfc9848697bc25724a291fcb42586cd18910d2d +Merge: 8cc26f56f2 3d9d6dab3a +Author: Victor Vieux +Date: Mon Jan 11 15:46:08 2016 -0800 + + Merge pull request #1602 from tkopczynski/typo + + docs: typo in scheduler/strategy.md + +commit c32991a8d491f8af1e4f3502bdb7bc8131922143 +Author: Joffrey F +Date: Mon Jan 11 15:39:59 2016 -0800 + + Remove superfluous service code + + Signed-off-by: Joffrey F + +commit a96a0b37818e26bea173aa718df92f50b21093c3 +Merge: 9c9a1d1b4b 37d35f3c28 +Author: Jess Frazelle +Date: Mon Jan 11 15:26:09 2016 -0800 + + Merge pull request #19217 from justincormack/arm_syscalls + + Add arm specific syscalls to default seccomp profile + +commit df40c61f8ae43349b7504509e8d004f86175c862 +Author: Tibor Vass +Date: Mon Jan 11 18:16:40 2016 -0500 + + Make Makefile work on OS X + + Signed-off-by: Tibor Vass + +commit 5abef06a158b437a020d59ffdba740d19613852e +Author: Alexander Morozov +Date: Fri Jan 8 13:41:28 2016 -0800 + + Fix race on reading endpoint data + + Race is with its cleanup. + + Signed-off-by: Alexander Morozov + +commit 3d9d6dab3ae3f28b1bade301f40a8c10229c11a6 +Author: Tomasz Kopczynski +Date: Mon Jan 11 23:23:11 2016 +0100 + + docs: typo in scheduler/strategy.md + + Signed-off-by: Tomasz Kopczynski + +commit 39ff320b8297a6bfcbdf5ecb53dc83b22a4c19c2 +Merge: 3a1220de01 3ea0d70896 +Author: Richard Scothern +Date: Mon Jan 11 14:17:36 2016 -0800 + + Merge pull request #1335 from RichardScothern/fix-build + + Fix manifest API unit tests + +commit 9c9a1d1b4bc2122548a38b233a2f26ab5304de4c +Merge: f11b6a2ab3 2b4f64e590 +Author: Jess Frazelle +Date: Mon Jan 11 13:50:25 2016 -0800 + + Merge pull request #19069 from jfrazelle/apparmor-regex-proc + + fix proc regex + +commit 3ea0d7089650ad0e45d923020e544180249e1ce1 +Author: Richard Scothern +Date: Mon Jan 11 12:52:21 2016 -0800 + + Fix manifest API unit tests + Signed-off-by: Richard Scothern + +commit f11b6a2ab313a03d051dd6f69d264d0482df72d6 +Merge: 1a7d40c692 7450c258ab +Author: Arnaud Porterie +Date: Mon Jan 11 12:01:46 2016 -0800 + + Merge pull request #18785 from aaronlehmann/new-manifest + + New image manifest format + +commit a4b77dc1af0f4abda3696c35976b72322d7f409f +Author: John Howard +Date: Fri Jan 8 11:43:59 2016 -0800 + + Windows CI: Setup for testing against Windows + + Signed-off-by: John Howard + +commit cf664141b6e852c42f126054f83f57c92d715b56 +Author: Dong Chen +Date: Mon Jan 11 11:22:13 2016 -0800 + + Scheduler prefers nodes without connection failures. + + Signed-off-by: Dong Chen + +commit 1a7d40c69221fe39d7be9976398ade678627b9d6 +Merge: 0cdfd84aee d14eba774d +Author: David Calavera +Date: Mon Jan 11 11:36:55 2016 -0800 + + Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation + + Zsh completion for 'docker update' + common options refactoring + +commit 3a1220de012c994c217572c46676662c59651957 +Merge: 93d9070c8b 94347c8611 +Author: Richard Scothern +Date: Mon Jan 11 11:33:22 2016 -0800 + + Merge pull request #1319 from RichardScothern/update-tags + + Remove tags referencing deleted manifests. + +commit 55cec657bb5391301ceaa07701832762eb5d0a1d +Author: Antonio Murdaca +Date: Sun Jan 10 19:10:45 2016 +0100 + + integration-cli: log error when starting registry + + Signed-off-by: Antonio Murdaca + +commit 0cdfd84aeedda09914ec159e96497a502db9109e +Merge: 9a23569ecf 0757a52737 +Author: Brian Goff +Date: Mon Jan 11 14:09:14 2016 -0500 + + Merge pull request #19239 from aaronlehmann/fix-testsuccessfuldownload + + Fix flaky test TestSuccessfulDownload + +commit 9a23569ecf48e07b6c6e7c1d734b54c7ce4c666a +Merge: 2d5ca742eb 2600777469 +Author: Alexander Morozov +Date: Mon Jan 11 10:59:49 2016 -0800 + + Merge pull request #16032 from cpuguy83/remove_sqlite_dep + + Build names and links at runtime - no more sqlite + +commit 2dccb562dff79fef0f7a1d3b5f0e760e9d799d44 +Author: Vivek Goyal +Date: Mon Jan 11 18:57:37 2016 +0000 + + Mark device ID free only if device actually got deleted + + Right now if somebody has enabled deferred device deletion, then + deleteTransaction() returns success even if device could not be deleted. It + has been marked for deferred deletion. Right now we will mark device ID free + and potentially use it again when somebody tries to create new container. And + that's wrong. Device ID is not free yet. It will become free once devices + has actually been deleted by the goroutine later. + + So move the location of call to markDeviceIDFree() to a place where we know + device actually got deleted and was not marked for deferred deletion. + + Signed-off-by: Vivek Goyal + +commit 3c2aab2abeb50dab611b6e88cfaf07381662b282 +Author: Ash Wilson +Date: Mon Jan 11 13:45:42 2016 -0500 + + Only derive tenant ID if tenant name is supplied. + + The Rackspace provider authenticates with username and API key rather than + tenant name or ID. + + Signed-off-by: Ash Wilson + +commit 2d5ca742eb54e077861a29f201eb8fa38359cb1b +Merge: 47074030f6 91201678c6 +Author: Tibor Vass +Date: Mon Jan 11 13:25:55 2016 -0500 + + Merge pull request #19076 from tianon/multiarch + + Refactor multi-arch support (especially for new mostly-official multi-arch official images) + +commit f7a7e68df63dad82d7bc382cc8832510856c5296 +Author: Thomas Hourlier +Date: Mon Jan 11 09:48:52 2016 -0800 + + Mount $HOME in /root to share docker config. + + Fixes #2630 + + Signed-off-by: Thomas Hourlier + +commit 0757a52737b283e56c9a8f5597e8b52c365ce1f6 +Author: Aaron Lehmann +Date: Mon Jan 11 09:46:34 2016 -0800 + + Fix flaky test TestSuccessfulDownload + + One of the things this test checks is that the progress indicator + completes for each download. Some progress messages may be lost because + only one message is buffered for each download, but the last progress + message is guaranteed not to be lost. The test therefore checks for a + 10/10 progress indication. + + However, the assumption that this is the last progress message to be + sent is incorrect. The last message is actually "Pull complete". So + check for this instead. + + Signed-off-by: Aaron Lehmann + +commit 4b98193beab00bc6cf48762858570a1bd418c9ef +Author: David Calavera +Date: Fri Jan 8 12:36:31 2016 -0500 + + Add support for syslog over TLS. + + Signed-off-by: David Calavera + +commit d3cd038b845d9708c42b9281253be342e2fe97d0 +Author: Daniel Nephin +Date: Fri Jan 8 16:54:35 2016 -0500 + + Update event field names to match the new API fields. + + Signed-off-by: Daniel Nephin + +commit 2600777469b18f7133fc4d6c6c99698d6aa700fe +Author: Brian Goff +Date: Sat Nov 21 13:45:34 2015 -0500 + + Add migration from sqlite links back to hostConfig + + Before #16032, once links were setup + in the sqlite db, hostConfig.Links was cleared out. + This means that we need to migrate data back out of the sqlite db and + put it back into hostConfig.Links so that links specified on older + daemons can be used. + + Signed-off-by: Brian Goff + +commit 47074030f6e34fc238ed503e8c8e5ae0ef526e27 +Merge: ad2966a315 7f0d304f37 +Author: Tibor Vass +Date: Mon Jan 11 11:29:15 2016 -0500 + + Merge pull request #19121 from WeiZhang555/tty-resize + + Check nil Terminal to avoid panic + +commit 248596da8abf15799bc8638a224c292bf1b01c7a +Merge: 0e1bc6c7c6 4a4dbda360 +Author: David Gageot +Date: Mon Jan 11 16:45:50 2016 +0100 + + Merge pull request #2802 from jeanlaurent/smarter-change-log + + During release exclude merge commit from changelog + +commit 0e1bc6c7c638cea7b5c619d9b7781d15fe0b5e81 +Merge: 533e5b3b46 53110b8c96 +Author: David Gageot +Date: Mon Jan 11 16:45:31 2016 +0100 + + Merge pull request #2803 from jeanlaurent/fix-vbox-it-test + + Fix virtualbox upgrade IT + +commit 533e5b3b46cedd488661e2cbee4229beed648edc +Merge: 1b30e7bdec d94bbb3f31 +Author: David Gageot +Date: Mon Jan 11 16:45:13 2016 +0100 + + Merge pull request #2804 from dgageot/bump-0.6.0-dev + + Bump to 0.6.0-dev + +commit d94bbb3f314289ed5bdb35185bf6295ce6fc6151 +Author: David Gageot +Date: Mon Jan 11 16:30:53 2016 +0100 + + Bump to 0.6.0-dev + + Signed-off-by: David Gageot + +commit 1b30e7bdec101bbf93a8778e8e82dc7c623c5314 +Merge: 90e377bae0 a410f4df76 +Author: David Gageot +Date: Mon Jan 11 16:29:01 2016 +0100 + + Merge pull request #2801 from dgageot/release-notes + + Version 0.5.6 + +commit 53110b8c96bd745d2b3274d7ebf702836a2a24d4 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 11 16:24:18 2016 +0100 + + Fix virtualbox upgrade IT + + Signed-off-by: Jean-Laurent de Morlhon + +commit 4a4dbda360a2ab8b73f305c9de1e4b1bd088e3ed +Author: Jean-Laurent de Morlhon +Date: Mon Jan 11 16:19:28 2016 +0100 + + Exclude merge commit from changelog + + Signed-off-by: Jean-Laurent de Morlhon + +commit a410f4df763cf9666bb13defc9f33828e5332176 +Author: David Gageot +Date: Mon Jan 11 16:16:13 2016 +0100 + + Release Notes for 0.5.6 + + Signed-off-by: David Gageot + +commit 61388e98540321b34f4a27f88df9e7a4443b9ac8 +Author: David Gageot +Date: Mon Jan 11 16:04:31 2016 +0100 + + Bump version to 0.5.6 + + Signed-off-by: David Gageot + +commit 90e377bae01c09aef89a058c05213678be2da2b2 +Merge: beb36cbcff 52bd740ad3 +Author: David Gageot +Date: Mon Jan 11 16:02:16 2016 +0100 + + Merge pull request #2800 from dgageot/revert-unexpected-merge + + Revert "Support creating a machine on an existing google VM" + +commit 52bd740ad353a6b1a582668f4da76b8b38a9c89f +Author: David Gageot +Date: Mon Jan 11 15:46:04 2016 +0100 + + Revert "Support creating a machine on an existing google VM" + + This reverts commit 7cf9ae71be7f704a4dd9e00aaf92ae3692ea4343. + + Signed-off-by: David Gageot + +commit beb36cbcffbba91e5cf8bc0068461f97d955d4f3 +Merge: 181367b125 0ef3691069 +Author: David Gageot +Date: Mon Jan 11 15:41:58 2016 +0100 + + Merge pull request #2799 from jeanlaurent/fix-ec2-it + + Fix ec2 ebs optimized integration test + +commit 181367b125d1c0fcf0cfa56b4d4987471a04223e +Merge: 8f1e7653ce 8553dd2d6c +Author: David Gageot +Date: Mon Jan 11 15:41:01 2016 +0100 + + Merge pull request #2797 from dgageot/bug + + Fix multiple VirtualBox bugs on Windows + +commit 8f1e7653ce5e211113cd27f6e1be24a2a5c4a56f +Merge: 36abac3891 0ff18a7c7d +Author: Jean-Laurent de Morlhon +Date: Mon Jan 11 15:22:47 2016 +0100 + + Merge pull request #2750 from jeffellin/1904-UseEBSOptimizedInstanceFlag + + Add option to create amazon ec2 instances with the EbsOptimized setting. + +commit 0ef369106961d3420f2d0e7f1834c62a3c57c3bc +Author: Jean-Laurent de Morlhon +Date: Mon Jan 11 15:21:24 2016 +0100 + + Fix ec2 ebs optimized integration test + + Signed-off-by: Jean-Laurent de Morlhon + +commit 8553dd2d6c4ce0c5b1cfb2ab5ebb947316266828 +Author: David Gageot +Date: Mon Jan 11 09:03:11 2016 +0100 + + Fix multiple bugs with host-only adapterss + + Signed-off-by: David Gageot + +commit f5ba0f7420c891039e1afc176ae579124f18bcd3 +Author: David Gageot +Date: Mon Jan 11 08:57:27 2016 +0100 + + Wait for error logs + + Signed-off-by: David Gageot + +commit f62d4ceba66ef6b979be8f45d0acf260bea27a13 +Author: Lei Jitang +Date: Mon Jan 11 14:45:43 2016 +0800 + + Remove duplication checking for the existence of endpoint + + CreateEndpoint will check if the endpoint exist or not, so there is no + need to check before call CreatEndpoint in connectToNetwork since + checking the existence of the endpoint could take much time especially + if we use external K-V store, this would slow down the staring of container. + + Signed-off-by: Lei Jitang + +commit ad2966a3159514620c2dc36d8e7fdcee948e8468 +Merge: 3f74d10142 676118670d +Author: Arnaud Porterie +Date: Sun Jan 10 18:11:19 2016 -0800 + + Merge pull request #19138 from Microsoft/jjh/failedtodockerversion + + Windows CI: More debugging + +commit 3f74d10142051abc231093cc05b76b08ae30f597 +Merge: 967acd56c1 4c530894f9 +Author: Sebastiaan van Stijn +Date: Mon Jan 11 00:09:45 2016 +0100 + + Merge pull request #19222 from justincormack/shirley + + Add Dame Stephanie "Steve" Shirley to names + +commit 967acd56c175b7c0f3ad4236c664730338a94bb8 +Merge: fc4dffee5e ba19b6927f +Author: Sebastiaan van Stijn +Date: Mon Jan 11 00:09:26 2016 +0100 + + Merge pull request #18512 from euank/18510-fixOomKilled + + Set OOMKilled state on any OOM event + +commit 4c530894f94069c14c872c4b2d0ebfb10c86466a +Author: Justin Cormack +Date: Sun Jan 10 21:02:53 2016 +0000 + + Add Dame Stephanie "Steve" Shirley to names + + Born in Germany, she had to flee on the kindertransport to England in + 1939. In the 1950s she worked at the Post Office Research Station at + Dollis Hill, building computers from scratch, and took evening classes + to get a degree in Mathematics. + + In 1962 she set up a software company, employing almost entirely women, + working at home; the company was floated in 1996. Her team's projects + included programming Concorde's black box flight recorder. She adopted + the name "Steve" to fit in in a male domainated world. + + http://www.bbc.co.uk/programmes/b05pmvl8 + https://en.wikipedia.org/wiki/Steve_Shirley + + Signed-off-by: Justin Cormack + +commit fc4dffee5eca697df07263edf691151078d235c7 +Merge: 6175add0e1 cac23d1caa +Author: Vincent Demeester +Date: Sun Jan 10 22:28:59 2016 +0100 + + Merge pull request #19220 from anujbahuguna/master + + Adding 2 pioneer CS reseachers-Shafi Goldwasser and Michael Stonebraker + +commit 0ff18a7c7de221a1688e119166b4fabc15d9fef3 +Author: jellin +Date: Tue Jan 5 18:10:13 2016 -0500 + + Add option to create anazon ec2 instances with the EbsOptimized setting. + + fixes #1904 Non EbsOptimized instances will be created by default but adding the flag + UseEbsOptimizedInstance will create and EBSOptimized Instance if the instance type supports it. + + Signed-off-by: Jeffrey Ellin + +commit 6175add0e16d275511162f521dafdda7ba8f560c +Merge: 38f4217bff 4c380010a6 +Author: Vincent Demeester +Date: Sun Jan 10 21:18:21 2016 +0100 + + Merge pull request #19193 from Microsoft/jjh/networkapitests + + Windows CI: Turn off network API tests + +commit 38f4217bfff1e5aec7457c2acfbe2409759ee830 +Merge: 7b1caafe27 25c383391a +Author: Sebastiaan van Stijn +Date: Sun Jan 10 21:18:02 2016 +0100 + + Merge pull request #19195 from Microsoft/jjh/wincifailingtests + + Windows CI: Deal with failing tests for TP4 + +commit 37d35f3c280dc27a00f2baa16431d807b24f8b92 +Author: Justin Cormack +Date: Sun Jan 10 11:40:55 2016 +0000 + + Add arm specific syscalls to default seccomp profile + + Signed-off-by: Justin Cormack + +commit 7b1caafe27c06aae3311f00a9bdee021c3be8b63 +Merge: fe3d1f9dd7 5fe38d39e7 +Author: Vincent Demeester +Date: Sun Jan 10 20:53:11 2016 +0100 + + Merge pull request #19205 from runcom/fix-formats + + integration-cli: fix wrong formats + +commit fe3d1f9dd7f2c888ad69034464cba6a35a56018f +Merge: 274558881a 64a6dc3558 +Author: Arnaud Porterie +Date: Sun Jan 10 11:46:34 2016 -0800 + + Merge pull request #19198 from sanimej/vin + + Vendoring libnetwork + +commit cac23d1caa420ce3b2684d8d4fabcf3d7d5c9906 +Author: Anuj +Date: Mon Jan 11 00:16:48 2016 +0530 + + Adding two pioneer CS reseachers - Shafi Goldwasser and Michael Stonebraker + Signed-off-by: Anuj Bahuguna + +commit 274558881ae5d2fcf3a3d72c31d4fde9e415dcbc +Merge: 7058495ab8 13a9d4e899 +Author: Jess Frazelle +Date: Sun Jan 10 09:34:56 2016 -0800 + + Merge pull request #19218 from justincormack/i386_syscalls + + Add i386 specific modify_ldt syscall to default seccomp filter + +commit 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b +Author: Justin Cormack +Date: Sun Jan 10 12:00:11 2016 +0000 + + Add i386 specific modify_ldt syscall to default seccomp filter + + This syscall is used by Go on i386 binaries, although not by libc. + + Signed-off-by: Justin Cormack + +commit 7058495ab8bd358e11e1b06eb90298a0a207d7c5 +Merge: 2a868799bf 2ffb362f9b +Author: moxiegirl +Date: Sat Jan 9 17:43:41 2016 -0800 + + Merge pull request #19171 from londoncalling/cloud-installs-redirects + + added re-directs for cloud install docs as clean-up for #18282 + +commit cbd98e37b88f34fd8ae95f438e6abfd2d779733c +Author: Jeffrey Morgan +Date: Sat Jan 9 17:31:59 2016 -0500 + + Finish removing references to delete.sh + + Signed-off-by: Jeffrey Morgan + +commit 899465b53aa91b14b6e24d6fb5f0ea35fd0f8148 +Author: Jeffrey Morgan +Date: Sat Jan 9 17:28:42 2016 -0500 + + Remove noisy log output in Docker Quickstart Terminal + + Signed-off-by: Jeffrey Morgan + +commit cf9d0cde841ac2ee4404b4d2944d2030a67fb056 +Author: Jeffrey Morgan +Date: Sat Jan 9 17:23:38 2016 -0500 + + Bump version to 1.9.1h + + Signed-off-by: Jeffrey Morgan + +commit f37534ffaadb4635d8973017654a9742fd60b7a5 +Author: Jeffrey Morgan +Date: Sat Jan 9 17:19:15 2016 -0500 + + Use function instead of alias for docker and msys volume fix + + Signed-off-by: Jeffrey Morgan + +commit aec6e7bb883a4b5dc63037e4a077a6f9ab5ae0f6 +Author: Jeffrey Morgan +Date: Sat Jan 9 16:58:39 2016 -0500 + + Removed unused delete script + + Signed-off-by: Jeffrey Morgan + +commit 15b4442bc063bfdff672a1495b5c09fa0f9ed8d7 +Author: Jeffrey Morgan +Date: Sat Jan 9 16:45:21 2016 -0500 + + Fix bug where volume paths would not be converted properly by msys + + Signed-off-by: Jeffrey Morgan + +commit 6c2c3652aeaf08e429906673ce8e081144b2c257 +Author: Jeffrey Morgan +Date: Sat Jan 9 16:43:46 2016 -0500 + + Fix build by bumping innounp + + Signed-off-by: Jeffrey Morgan + +commit 2a868799bfe48afcb2111a060684cab062054cf6 +Merge: c49ccd3192 3f6b0f4c7c +Author: Tianon Gravi +Date: Sat Jan 9 11:05:39 2016 -0800 + + Merge pull request #19210 from albers/completion--shm-size + + bash completion for `docker {build,create,run} --shm-size` + +commit 2f8cb554126f05bc5a4965a10c69dc500d2d1131 +Merge: 37d41f22c6 77d2aae72d +Author: Daniel Nephin +Date: Sat Jan 9 12:31:21 2016 -0500 + + Merge pull request #2571 from vdemeester/fix-unpause-typo + + Fix typo in unpause reference doc + +commit 37d41f22c62a77f2de8b9c07f5504e3387f39649 +Merge: fc57fc1dc1 4e75ed4231 +Author: Daniel Nephin +Date: Sat Jan 9 12:30:57 2016 -0500 + + Merge pull request #2572 from vdemeester/fix-run-missing-flag + + Add missing --name flag to run reference doc + +commit 3f6b0f4c7c87f8f8f01e67ea3750015e9dcab9bf +Author: Harald Albers +Date: Sat Jan 9 09:27:40 2016 -0800 + + bash completion for `docker {build,create,run} --shm-size` + + Signed-off-by: Harald Albers + +commit d14eba774d4a5e51f1208a4aa5e9dad44966d5c9 +Author: Steve Durrheimer +Date: Sat Jan 9 14:48:55 2016 +0100 + + Add zsh completion for 'docker {build,create,run} --isolation' + + Signed-off-by: Steve Durrheimer + +commit 01e6bd3c3e79c77c35a443c5eea9a94fbb9861a3 +Author: Steve Durrheimer +Date: Sat Jan 9 14:46:06 2016 +0100 + + Add zsh completion for 'docker {build,create,run} --shm-size + + Signed-off-by: Steve Durrheimer + +commit 3a8fb8de4f10024cb4968c3e25c417080ac17576 +Author: Steve Durrheimer +Date: Sat Jan 9 14:40:37 2016 +0100 + + Add zsh completion for 'docker {create,run,update} --memory-reservation' + + Signed-off-by: Steve Durrheimer + +commit 8a95f8827231164acc3971cab7c0d0325d6ef31d +Author: Steve Durrheimer +Date: Sat Jan 9 14:38:22 2016 +0100 + + Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update' + + Signed-off-by: Steve Durrheimer + +commit 5fe38d39e7c7085e53904d6403e8b48274f86e8b +Author: Antonio Murdaca +Date: Sat Jan 9 11:44:15 2016 +0100 + + integration-cli: fix wrong formats + + Signed-off-by: Antonio Murdaca + +commit 278cc175a23177ea3b428b82969e02d922a6bc1c +Author: Daehyeok Mun +Date: Sat Jan 9 01:26:23 2016 -0700 + + VMWARE Fusion get IP from multiple leases files + Change to try get IP from multiple dhcp leases files + + Signed-off-by: Daehyeok Mun + +commit c49ccd319249610eb05f0c430b26d7c82383bf76 +Merge: 92b0005a1a a931c78540 +Author: Tõnis Tiigi +Date: Fri Jan 8 22:54:01 2016 -0800 + + Merge pull request #19167 from vieux/bring_discovery_on_par + + Bring discovery on par with the one in docker/swarm + +commit 92b0005a1a31cf14f4836903d0688468b05f4530 +Merge: 2892de760f 5719b136de +Author: Tõnis Tiigi +Date: Fri Jan 8 22:48:18 2016 -0800 + + Merge pull request #19202 from cyli/vendor-notary + + Re-vendoring notary + +commit 7450c258abe01585f861f4a1b5d2b97539dbbdce +Author: Aaron Lehmann +Date: Fri Jan 8 15:38:55 2016 -0800 + + Use RootFS from image config to register layers on Windows + + Signed-off-by: Aaron Lehmann + +commit ad6c1b76497c4b39953b5af28f83a21a2eb36bf7 +Author: Aaron Lehmann +Date: Fri Dec 18 16:03:38 2015 -0800 + + Add integration test for pulling a manifest list + + The test injects a synthetic manifest list into the registry blob store, + since there isn't a tool for pushing them yet. + + Signed-off-by: Aaron Lehmann + +commit 1fa2e3115105f6b2334f452bd08415e8f00633d7 +Author: Aaron Lehmann +Date: Fri Dec 18 15:06:23 2015 -0800 + + Build a pre-schema2 registry to test schema1 push/pull + + Add DockerSchema1RegistrySuite which uses this registry, and make + applicable integration tests run as part of this suite. + + Signed-off-by: Aaron Lehmann + +commit 2bb8c85bc5e59d2f5a154b58bb9a4b6e86775a40 +Author: Aaron Lehmann +Date: Wed Dec 16 19:19:22 2015 -0800 + + Add support for manifest lists ("fat manifests") + + A manifest list refers to platform-specific manifests. This allows + for images that target more than one architecture to share the same tag. + + Signed-off-by: Aaron Lehmann + +commit c8d277d228fbb4ec168a5d459c6e874cf9a872b3 +Author: Aaron Lehmann +Date: Mon Dec 14 15:44:45 2015 -0800 + + Add schema2 push support + + Signed-off-by: Aaron Lehmann + +commit 94726f7c7391d990d3d15f88ea20dbe8fe23c958 +Author: Aaron Lehmann +Date: Fri Dec 11 15:24:12 2015 -0800 + + Add schema2 pull support + + Signed-off-by: Aaron Lehmann + +commit f33fa1b8d3befec31fdf1952ea1190012c812dc7 +Author: Aaron Lehmann +Date: Thu Dec 10 16:27:58 2015 -0800 + + Change push to use manifest builder + + Currently this always uses the schema1 manifest builder. Later, it will + be changed to attempt schema2 first, and fall back when necessary. + + Signed-off-by: Aaron Lehmann + +commit c168a0059f56507731e59c0264d96b5a74f93507 +Author: Aaron Lehmann +Date: Tue Dec 8 11:14:02 2015 -0800 + + Update code to compile against new manifest interface + + Also, digest.FromBytes no longer returns an error. + + Signed-off-by: Aaron Lehmann + +commit 290ba41c00488b8c4ac2e5488bc1b040b758df75 +Author: Aaron Lehmann +Date: Tue Dec 8 10:47:48 2015 -0800 + + Vendor updated github.com/docker/distribution + + Signed-off-by: Aaron Lehmann + +commit 2892de760f412360c5effef9cfc346f2d92eaa4c +Merge: 0a002f4ba8 3f829aa6e4 +Author: Michael Crosby +Date: Fri Jan 8 16:56:57 2016 -0800 + + Merge pull request #18840 from aaronlehmann/trust-messages + + Send push information to trust code out-of-band + +commit 5719b136dec7b2c3e76059cf9226a1b388a772f6 +Author: cyli +Date: Fri Jan 8 16:44:10 2016 -0800 + + Re-vendoring notary in order to deal with a canonical JSON serialization issue. + + Signed-off-by: cyli + +commit 0a002f4ba813305a16f4ffb21488865601f0f18e +Merge: a082f80832 098fdb6408 +Author: Michael Crosby +Date: Fri Jan 8 16:37:57 2016 -0800 + + Merge pull request #19199 from crosbymichael/migrate-errors + + Fixed migrate defect, allow migrate the empty directory + +commit eb115b987f48320f1a0e15c9811749078585f3b3 +Merge: 05b490ae75 cf4b77b760 +Author: Ying Li +Date: Fri Jan 8 15:48:26 2016 -0800 + + Merge pull request #435 from cyli/revert-canonical-json + + Revert "switching out to consistently use canonical json for all marshalling of TUF data + +commit 098fdb6408e4e630c1c78b8283c4bc716cc46698 +Author: andy +Date: Fri Jan 8 08:32:32 2016 +0800 + + Fixed migrate defect, allow migrate the empty directory + + If there is an empty directory exists in the $DOCKER_ROOT/containers , + that will cause migrate fail. Then docker daemon will initialize failed. + This commit allow skips the empty directory. + + Signed-off-by: Andy Zhang + + Change error messages from uppercase to lowercase + + Change error messages from uppercase to lowercase + + Signed-off-by: andy + +commit a082f8083212a50b5a3e40e2d2507b78e0a8e6a8 +Merge: 807d575b5e 1326f0cba5 +Author: Sebastiaan van Stijn +Date: Sat Jan 9 00:35:26 2016 +0100 + + Merge pull request #18736 from WeiZhang555/tiny-lock + + Break big lock into some tiny locks for containerStart + +commit ba19b6927fd79be4d676ff228128d72393cbf76a +Author: Euan +Date: Fri Jan 8 23:09:47 2016 +0000 + + Increase integration cli test memory + + Signed-off-by: Euan + +commit cf4b77b7603174d18365ab9d8472bcdc87003614 +Author: Ying Li +Date: Fri Jan 8 14:53:03 2016 -0800 + + Revert "switching out to consistently use canonical json for all marshalling of TUF data" + + This reverts commit f417c834c49d32e6aa9bdbbc1ba5c544c0f760b2. + + Signed-off-by: Ying Li + +commit 46585fb8e17a4b6cb5763f055ef00d0aa3d952c9 +Author: Joffrey F +Date: Fri Jan 8 14:37:07 2016 -0800 + + Support legacy logging options format + + Additional test for legacy compose file. + + Signed-off-by: Joffrey F + +commit 93d9070c8bb28414de9ec96fd38c89614acd8435 +Merge: cc0b6b86ea 613cfc861d +Author: Richard Scothern +Date: Fri Jan 8 14:37:00 2016 -0800 + + Merge pull request #1269 from BrianBland/crossRepositoryPush + + Adds cross-repository blob mounting behavior + +commit fc57fc1dc1c4b47bdf403df4dfb8016d448f59b6 +Merge: ab98c70dd1 ad9011ed96 +Author: Daniel Nephin +Date: Fri Jan 8 17:18:02 2016 -0500 + + Merge pull request #2609 from dnephin/dont_warn_on_container_volume + + Don't warn when the container volume is a compose option + +commit ab98c70dd1c51f1da3e39df421e1ed52b6ad27b9 +Merge: f38c29f37b c7b71422c0 +Author: Daniel Nephin +Date: Fri Jan 8 17:17:41 2016 -0500 + + Merge pull request #2612 from dnephin/merge_extends_from_multiple_files + + Fix extends with multiple files + +commit 64a6dc355815261ac438b12a262e3cda7c9181df +Author: Santhosh Manohar +Date: Fri Jan 8 13:38:52 2016 -0800 + + Docker changes for libnetwork vendoring.. + + Signed-off-by: Santhosh Manohar + +commit 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc +Author: Santhosh Manohar +Date: Fri Jan 8 13:56:01 2016 -0800 + + Vendoring libnetwork and its dependencies.. + + - replace /etc/hosts based name resolution with embedded DNS for user + defined networks + - overlay veth cleanup: docker/docker#18814 + - check before programming ipv6 in bridge: docker/docker#19139 + - diable DAD: docker/docker#18871 + + Signed-off-by: Santhosh Manohar + +commit 807d575b5ef1785ded1038dca2cfbf2afa2d5a0c +Merge: 335764a591 ebf4c91717 +Author: Alexander Morozov +Date: Fri Jan 8 13:55:41 2016 -0800 + + Merge pull request #19135 from Microsoft/jjh/securitywarning + + Windows: Fix security warning regression + +commit 613cfc861dbb44fa3cf46298e9fdd2f95e89d366 +Author: Brian Bland +Date: Wed Jan 6 15:57:35 2016 -0800 + + Fires a new Mount event when blobs are cross-repo mounted + + Adds an optional "fromRepository" field to the event target + + Signed-off-by: Brian Bland + +commit 3a35a2d95351e2907de84e0e105cdbeb483cf52f +Author: Brian Bland +Date: Tue Jan 5 11:13:27 2016 -0800 + + Allows token authentication handler to request additional scopes + + When an auth request provides the "from" query parameter, the token + handler will add a "pull" scope for the provided repository, refreshing + the token if the overall scope has increased + + Signed-off-by: Brian Bland + +commit 5df21570a76e08b7ca47d37f9e22b8e338dadb27 +Author: Brian Bland +Date: Mon Dec 14 18:34:18 2015 -0800 + + Adds cross-repository blob mounting behavior + + Extends blob upload POST endpoint to support mount and from query + parameters as described in #634 + + Signed-off-by: Brian Bland + +commit 25c383391a951e5bc9cb2f003ce69f119779fb2c +Author: John Howard +Date: Fri Jan 8 13:49:43 2016 -0800 + + Windows CI: Deal with failing tests for TP4 + + Signed-off-by: John Howard + +commit 335764a5913900283a489ef771013041ffba7230 +Merge: 719526d87c 3ff6725613 +Author: Tianon Gravi +Date: Fri Jan 8 13:43:38 2016 -0800 + + Merge pull request #19181 from coolljt0725/enable_build_syscall_test + + Make .ensure-syscall-test to use build-arg + +commit cc0b6b86eaf82477fb90060e94985f6a80fd6b71 +Merge: a7ae88da45 75abeeca11 +Author: Richard Scothern +Date: Fri Jan 8 13:26:09 2016 -0800 + + Merge pull request #1276 from denverdino/oss-test + + Support large layer for OSS driver + +commit 21aae13e77b43ce1cd3a07c660bb411f15993c27 +Author: Joffrey F +Date: Fri Jan 8 13:21:45 2016 -0800 + + Move logging config changes to v2 spec + + Reorganize JSON schemas + Update fixtures + Update service validation function + + Signed-off-by: Joffrey F + +commit 8cc26f56f228a3900fe809e44312fa4ac1153483 +Merge: f31979bbba 5efac03bad +Author: Alexandre Beslic +Date: Fri Jan 8 13:01:47 2016 -0800 + + Merge pull request #1595 from MiLk/docs_typo-scheduler-filter + + docs: Typo in scheduler/filter.md + +commit 4c380010a6c001cda7cbe7184eb298ec885774ce +Author: John Howard +Date: Fri Jan 8 12:58:54 2016 -0800 + + Windows CI: Turn off network API tests + + Signed-off-by: John Howard + +commit cc44ea21e481d34ab9621afd6944b6c14a23106a +Author: Aidan Hobson Sayers +Date: Fri Jan 8 20:52:11 2016 +0000 + + Fix ambassador script based on SvenDowideit/dockerfiles#37 + + Signed-off-by: Aidan Hobson Sayers + +commit 719526d87c17eb65cde9a95048252dd468df99f1 +Merge: 05de2aadff 64e8fa9199 +Author: Jess Frazelle +Date: Fri Jan 8 12:51:59 2016 -0800 + + Merge pull request #19186 from unclejack/no_mail_maintainers + + CONTRIBUTING: add guidelines regarding email + +commit 7c70ad058f89701510ddbb9d9c5ed66d42626208 +Author: Stephen Rust +Date: Fri Jan 8 13:19:25 2016 -0500 + + Allow external volume drivers to host anonymous volumes and copy existing data from image. + + Signed-off-by: Stephen Rust + +commit 557c7cb888ad8e2f1f378c9cf34e5fba14551904 +Author: Phil Estes +Date: Thu Jan 7 22:43:11 2016 -0500 + + Move userns support out of experimental into master + + Adds the `--userns-remap` flag to the master build + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 05de2aadff97be0ffe8a3ed0cf4ac363d291488f +Merge: e26974e20b 2bb3fc1bc5 +Author: Arnaud Porterie +Date: Fri Jan 8 11:49:20 2016 -0800 + + Merge pull request #19001 from aboch/pip + + Allow user to choose the IP address for the container + +commit e26974e20b7e431b7c6e5a0dd4b7fe1b0127271f +Merge: 1c979f7587 b468332707 +Author: Michael Crosby +Date: Fri Jan 8 11:33:40 2016 -0800 + + Merge pull request #19175 from cpuguy83/18670_copy_data_for_named_volumes + + On create, copy image data for named volumes. + +commit 05b490ae75c36ec00f565430bfb4adb14ab32a89 +Merge: af40d720c0 837f659e85 +Author: Riyaz Faizullabhoy +Date: Fri Jan 8 11:03:44 2016 -0800 + + Merge pull request #433 from HuKeping/verbose + + Verbose health check information + +commit 3f829aa6e436dc741785abd795fdcd28afd2da40 +Author: Aaron Lehmann +Date: Tue Dec 22 09:23:59 2015 -0800 + + Remove ansiescape package + + api/client/trust.go was the last file that used it. + + Signed-off-by: Aaron Lehmann + +commit 65370be888d940899593a001024f53d6b83b4bb0 +Author: Aaron Lehmann +Date: Mon Dec 21 15:02:44 2015 -0800 + + Send push information to trust code out-of-band + + The trust code used to parse the console output of `docker push` to + extract the digest, tag, and size information and determine what to + sign. This is fragile and might give an attacker control over what gets + signed if the attacker can find a way to influence what gets printed as + part of the push output. + + This commit sends the push metadata out-of-band. It introduces an `Aux` + field in JSONMessage that can carry application-specific data alongside + progress updates. Instead of parsing formatted output, the client looks + in this field to get the digest, size, and tag from the push. + + Signed-off-by: Aaron Lehmann + +commit 36abac38910702f919c18ad144f762dc9d5d42f0 +Merge: 5527798f48 caf3e815ef +Author: David Gageot +Date: Fri Jan 8 19:45:15 2016 +0100 + + Merge pull request #2786 from jeanlaurent/back-to-0.5.6 + + Preparing 0.5.6 release + +commit 5527798f48ebe97c70d61fee5c7c7c4cf6883946 +Merge: ce057076ce 5a8afd615d +Author: David Gageot +Date: Fri Jan 8 19:45:04 2016 +0100 + + Merge pull request #2784 from jeanlaurent/aws-doc + + AWS documentation for security group + +commit d1d3969661f549311bccde53703a2939402cf769 +Author: Daniel Nephin +Date: Mon Aug 31 14:31:20 2015 -0400 + + Add docker-compose event + + Signed-off-by: Daniel Nephin + +commit 1c979f758753d921ced122dec3953ddbc35ee67f +Merge: 3a8d694e01 1c32a66877 +Author: Jess Frazelle +Date: Fri Jan 8 10:37:55 2016 -0800 + + Merge pull request #18887 from riyazdf/notary-delegations + + notary delegation integration into docker + +commit 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c +Author: Alessandro Boch +Date: Thu Jan 7 16:18:34 2016 -0800 + + Allow user to choose the IP address for the container + + Signed-off-by: Alessandro Boch + +commit 145f020122681d4868f717d64dfa556db22ac83d +Author: David Calavera +Date: Fri Jan 8 12:35:35 2016 -0500 + + Vendor new syslog library with TLS support. + + The syslog package in the stdlib is not maintained anymore. + + Signed-off-by: David Calavera + +commit 19b063e740c8140c70bac65179f944422538babc +Author: Alessandro Boch +Date: Wed Dec 30 12:11:23 2015 -0800 + + Vendoring libnetwork + + - 49c24217054e269aad3dbfd81ee32780b104dd84 + + Signed-off-by: Alessandro Boch + +commit 1c32a66877f2ddc3f1cce66d78c69e032d6cf795 +Author: Riyaz Faizullabhoy +Date: Thu Jan 7 18:43:01 2016 -0800 + + update tests and error messages, revendor notary with tag + + Signed-off-by: Riyaz Faizullabhoy + +commit 5ced01a262698b47b8637d7bd8bba271140d89fd +Author: David Lawrence +Date: Wed Jan 6 17:40:36 2016 -0800 + + add test to confirm bootstrapClient with a bad URL errors + Signed-off-by: David Lawrence (github: endophage) + +commit 6d72fe7fd1d90b2fe671f872339a5f935b992e18 +Author: David Lawrence +Date: Tue Jan 5 17:00:05 2016 -0800 + + adding comment to bootstrapClient + Signed-off-by: David Lawrence (github: endophage) + +commit d11f11748c7a764035d800455dc78f984b372ae8 +Author: David Lawrence +Date: Tue Jan 5 16:44:27 2016 -0800 + + when we download during bootstrapClient we should save the root to cache + Signed-off-by: David Lawrence (github: endophage) + +commit 762c99710479da50653bba121b7cdbe8935ed448 +Author: David Lawrence +Date: Tue Jan 5 10:56:56 2016 -0800 + + fixing bootstrapClient to prefer cached root + Signed-off-by: David Lawrence (github: endophage) + +commit caf3e815ef0290cf36ed5727ab9aa3b93f85fb16 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 17:32:46 2016 +0100 + + Preparing monday 0.5.6 release + + Signed-off-by: Jean-Laurent de Morlhon + +commit 5a8afd615d3c4ff3f5a4c7efa0827ded77a911a5 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 17:26:31 2016 +0100 + + Fix default ubuntu version + + Signed-off-by: Jean-Laurent de Morlhon + +commit 602721d0036b0d1b3795a6775e773afb9c043c73 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 16:32:22 2016 +0100 + + AWS documentation for security group + + Signed-off-by: Jean-Laurent de Morlhon + +commit ce057076ce6decced7f4824645a851e0c6e98641 +Merge: 12cb627e9b b585ca631b +Author: David Gageot +Date: Fri Jan 8 17:01:48 2016 +0100 + + Merge pull request #2780 from jeanlaurent/enhance-ls-doc + + Enhance ls doc + +commit f38c29f37b1f66cb3a374303aef7fa09daab2417 +Merge: e7bba2affe 978e9cf38f +Author: Daniel Nephin +Date: Fri Jan 8 10:17:01 2016 -0500 + + Merge pull request #2624 from aanand/fix-script-clean + + Fix script/clean on systems where `find` requires a path argument + +commit b585ca631b53fb54591b044764198f863b490816 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:54:28 2016 +0100 + + Enhancing doc for the env command + + Signed-off-by: Jean-Laurent de Morlhon + +commit 64e8fa9199fb345e017c8ef5299ca69cee01ab4c +Author: unclejack +Date: Fri Jan 8 16:49:17 2016 +0200 + + CONTRIBUTING: add guidelines regarding email + + This adds guidelines around reaching the maintainers. Emails shouldn't + be sent to maintainers. GitHub mentions should be used instead. + + Signed-off-by: Cristian Staretu + +commit 12cb627e9b53d6e794cd9b89916e7a63037a66e0 +Merge: bacf1db2b9 dc9b0a100b +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 15:21:12 2016 +0100 + + Merge pull request #2782 from jeanlaurent/available-driver-typo + + Cleanup of Available Driver doc + +commit a4ce361ac8dc8c1a8d83b51c787986de256e2f69 +Author: Lukas Waslowski +Date: Tue Jan 5 14:33:20 2016 +0100 + + Improve docs for Daemon.TagImage and dockerfile.BuildFromConfig. + + Signed-off-by: Lukas Waslowski + +commit dc9b0a100ba6252e7a60021d625052dabe622fc5 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 14:42:18 2016 +0100 + + Formatting and applied manual alphabetical pivot sorting :) + + Signed-off-by: Jean-Laurent de Morlhon + +commit 978e9cf38f057a8dc08fd74b969fd38873a27ba6 +Author: Aanand Prasad +Date: Fri Jan 8 13:10:05 2016 +0000 + + Fix script/clean on systems where `find` requires a path argument + + Signed-off-by: Aanand Prasad + +commit 3a8d694e01d8c3353f49a3f220ee861769f8b4a5 +Merge: 018081d5a9 71d6e71cff +Author: Vincent Demeester +Date: Fri Jan 8 13:10:27 2016 +0100 + + Merge pull request #19180 from coolljt0725/fix_flaky_test + + Fix flaky testTestStatsAllNewContainersAdded + +commit ee3265731dd6855841730a3be4fef48756df29d7 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:46:23 2016 +0100 + + Rewrote remove command documentation + + Signed-off-by: Jean-Laurent de Morlhon + +commit 018081d5a9acadb218e1284b11b200418aef5e0f +Merge: f4f848b7a5 0007f5a859 +Author: Antonio Murdaca +Date: Fri Jan 8 12:34:49 2016 +0100 + + Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts + + Move some opts validators to runconfig/opts where they are used + +commit dd7256a96ddf641aff09a9ba23e73be918666a0d +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:30:06 2016 +0100 + + Adding hint on restart ip change + + Signed-off-by: Jean-Laurent de Morlhon + +commit 3c0af5c73382b43fd944c83d5c3505d89dc4da8e +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:27:45 2016 +0100 + + Moving filtering example near the filtering section + + Signed-off-by: Jean-Laurent de Morlhon + +commit bacf1db2b9f69e895f7c9196749da42be0114f8e +Merge: cc4930d7dc c9edb466dd +Author: David Gageot +Date: Fri Jan 8 12:27:12 2016 +0100 + + Merge pull request #2779 from jeanlaurent/fix-integration-test + + Fix integration test + +commit ce3e4e76962098e815bc6943a9211a29b8d6d10a +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:26:47 2016 +0100 + + Refreshing docs with new layout + + Signed-off-by: Jean-Laurent de Morlhon + +commit f4f848b7a55f142befd13b76803d7d884f815419 +Merge: 9e9d7dc884 279dd092b6 +Author: Antonio Murdaca +Date: Fri Jan 8 12:22:45 2016 +0100 + + Merge pull request #19131 from cpuguy83/fix_plugin_error_handling + + Don't error out on plugin err with json + +commit f05b0a4cc0b31742426540e35d99f561d812e289 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:17:53 2016 +0100 + + Adding example of ls filter by name + + Signed-off-by: Jean-Laurent de Morlhon + +commit c9edb466ddb28f600d4d429f32b54f3d788d8aa1 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 12:15:10 2016 +0100 + + Hardening flaky swarm integration test + + Signed-off-by: Jean-Laurent de Morlhon + +commit 9e9d7dc8845cfa4bf46d46b8e0b68b16c8c038f7 +Merge: 611d5e4eeb 72e65e8793 +Author: Antonio Murdaca +Date: Fri Jan 8 12:13:49 2016 +0100 + + Merge pull request #19179 from estesp/btrfs-userns-perms + + Fix btrfs subvolume snapshot dir perms for user namespaces + +commit 501382068c1a5cfbdd6531bf192cae807bda8880 +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 11:53:56 2016 +0100 + + Fix test due to error message change + + Signed-off-by: Jean-Laurent de Morlhon + +commit 1fef59f738c83ee40ff401e68b0d30cedc2ba6a2 +Author: Xian Chaobo +Date: Fri Jan 8 17:25:30 2016 +0800 + + fresh image when receive commit event + + Signed-off-by: Xian Chaobo + +commit 71d6e71cff4122a987a4655723d50a296916f523 +Author: Lei Jitang +Date: Fri Jan 8 17:02:08 2016 +0800 + + Fix flaky test TestStatsAllNewContainersAdded + + Wait the new created container for running and then check if it + is in the docker stats to avoid flaky test. + + Signed-off-by: Lei Jitang + +commit cc4930d7dcdf11e95ed1aa966c6be04f322825b7 +Merge: dd67c30838 2f9241297f +Author: Jean-Laurent de Morlhon +Date: Fri Jan 8 08:41:46 2016 +0100 + + Merge pull request #2778 from pecigonzalo/master + + Add VMWare workstation driver to list + +commit 3ff67256132febad4d039845e97db2ad4d55025d +Author: Lei Jitang +Date: Fri Jan 8 15:27:21 2016 +0800 + + Make .ensure-syscall-test to use build-arg + + .ensure-syscall-test need to build an image, we have + to add http_proxy and https_proxy to make it work. + Inseted of adding http_proxy and https_proxy env to the Dockerfile, + adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more + elegant. + + Signed-off-by: Lei Jitang + +commit cde0ed67a14e3983ba83af8c75434558c865b2bc +Author: Lei Jitang +Date: Fri Jan 8 12:11:21 2016 +0800 + + Create the working directory on container creation + + if create a container with -w to specify the working directory and + the directory does not exist in the container rootfs, the directory + will be created until the container start. It make docker export of + a created container and a running container inconsistent. + + Signed-off-by: Lei Jitang + +commit 72e65e87935e5b82de76a6ef9b8160900f4724b7 +Author: Phil Estes +Date: Thu Jan 7 23:05:28 2016 -0500 + + Fix btrfs subvolume snapshot dir perms for user namespaces + + Make sure btrfs mounted subvolumes are owned properly when a remapped + root exists (user namespaces are enabled, for example) + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 1db0c7bb01863f859a193246a0474f9d1b4d6027 +Author: cyli +Date: Wed Dec 23 16:34:46 2015 -0800 + + Add an integration test for docker being able to push to a repo with delegations. + + Signed-off-by: cyli + +commit 1c125f50cfce422b19a15e84c5a3940890fb2e23 +Author: Riyaz Faizullabhoy +Date: Fri Dec 18 18:47:35 2015 -0800 + + Notary delegation integration into docker + + Signed-off-by: Riyaz Faizullabhoy + +commit 2f9241297f6b4e71b145dc4309c2f896e905d7bf +Author: Gonzalo Peci +Date: Fri Jan 8 16:32:14 2016 +1300 + + Add VMWare workstation driver to list + + Signed-off-by: Gonzalo Peci + +commit 611d5e4eebc4c6153e49a319360df8de5bdd2e7c +Merge: 6213cc9d04 e73ab750ed +Author: Jess Frazelle +Date: Thu Jan 7 19:19:19 2016 -0800 + + Merge pull request #19173 from calavera/vendor_engine_api_0_1_2 + + Vendor engine-api 0.1.3 + +commit 1807681f7363f91eaf359b976ffa21fc4ac6f712 +Merge: 9c9452213b 1b9a0484c0 +Author: Jeffrey Morgan +Date: Thu Jan 7 22:09:07 2016 -0500 + + Merge pull request #1340 from jeffdm/master + + Fix bug where entry point would be repeated if no CMD was specified + +commit 837f659e850462a603132fa1b0093a9f5645e4d9 +Author: HuKeping +Date: Thu Jan 7 21:55:23 2016 +0800 + + Add more information to health check + + Prior to this patch, if the MySQL for signer down, the health check of + Server just warning out: + - "Trust not fully operational: Trust is not healthy" + + Which is not enough to find the problem. + + Signed-off-by: Hu Keping + +commit b4683327074d193428c724b153e8848ef2068c1d +Author: Brian Goff +Date: Thu Jan 7 21:38:38 2016 -0500 + + On create, copy image data for named volumes. + + Signed-off-by: Brian Goff + +commit 5efac03bad5b7b4d813ec27a4a793e71177c5d66 +Author: Emilien Kenler +Date: Fri Jan 8 11:28:51 2016 +0900 + + docs: Typo in scheduler/filter.md + + Signed-off-by: Emilien Kenler + +commit af40d720c0fa716c669cedbe8ddb8d030ded2288 +Merge: 3900238ae9 6a45508107 +Author: Ying Li +Date: Thu Jan 7 18:33:20 2016 -0800 + + Merge pull request #417 from cyli/misc-utilities + + Add a miscellaneous script for testing docker trust functions with notary + +commit e73ab750edc006324d1019b828c8ec9c551b9717 +Author: David Calavera +Date: Thu Jan 7 19:47:12 2016 -0500 + + Make sure docker api client implements engine-api client. + + - Use the master interface in the new repo. + - Use new structures for container create, update and network connect. + + Signed-off-by: David Calavera + +commit 1feeecf6e58c3690347efed9c0712a698ff426f0 +Author: David Calavera +Date: Thu Jan 7 19:43:42 2016 -0500 + + Vendor engine-api 0.1.3. + + Signed-off-by: David Calavera + +commit 3900238ae9c242a8b634ba4ee6148f28fe4abdef +Merge: 160980db89 11795a4573 +Author: David Lawrence +Date: Thu Jan 7 17:56:53 2016 -0800 + + Merge pull request #416 from endophage/no_role_config + + removing the ability to configure role names. + +commit f31979bbbace3b058f498437cc97db5682a17a05 +Merge: 8b173fd382 8cb1733dc2 +Author: Dongluo Chen +Date: Thu Jan 7 17:49:07 2016 -0800 + + Merge pull request #1589 from vieux/update_all_godeps + + update all godeps + +commit 11795a457334d3d5c245d728b8e6b532b15f7580 +Author: David Lawrence +Date: Thu Jan 7 17:36:31 2016 -0800 + + rename data.ValidRoles to data.BaseRoles + Signed-off-by: David Lawrence (github: endophage) + +commit d52dbde683e2caf61760d529deabd64b14bc8791 +Author: David Lawrence +Date: Tue Jan 5 17:19:02 2016 -0800 + + removing the ability to configure role names. It adds a lot of complexity without adding much value. If somebody wants custom role names they can implement it at the display level + Signed-off-by: David Lawrence (github: endophage) + +commit 160980db89d8e0457a2e736b57d1dfe79ec1b213 +Merge: cf57eaa511 c1c0ccf4be +Author: David Lawrence +Date: Thu Jan 7 17:31:55 2016 -0800 + + Merge pull request #428 from docker/merge-bootstrap-and-update + + Combine bootstrapClient and tuf/client's Client.Update into a single Update function + +commit a7ae88da459b98b481a245e5b1750134724ac67d +Merge: 5ebf6391a7 6d17423a6d +Author: Stephen Day +Date: Thu Jan 7 17:19:56 2016 -0800 + + Merge pull request #1281 from aaronlehmann/new-manifest + + Implement schema2 manifest formats + +commit 5ebf6391a704768c325c0d033081048d644d7878 +Merge: 0be4b3f27d 3f7f956f80 +Author: Stephen Day +Date: Thu Jan 7 17:06:12 2016 -0800 + + Merge pull request #911 from stevvooe/consistent-error-string + + More consistent return from ErrorCode.Error() + +commit c1c0ccf4be0084414b389250e4faa9462acc5196 +Author: Ying Li +Date: Wed Jan 6 17:00:59 2016 -0800 + + Combine bootstrapClient and tuf/client's Client.Update into NotaryRepository.Update. + + - it is easier to understand what's going on in the online functions of NotaryRepository + - we can test NotaryRepository.Update independently (although it'd be nice to have some way + of ensuring that the actual public functions of NotaryRepository like ListTargets, + GetTargetByName, and Publish actually calls Update. + - distinct error if the remote repo doesn't exist. + + This also stops wrapping signed.ErrExpired in client.ErrExpired, and just passes + signed.ErrExpired on directly. + + Signed-off-by: Ying Li + +commit 6213cc9d0476ee43bc92e554f4775e33c3c4d38f +Merge: b12ef0fe00 50305d66f5 +Author: moxiegirl +Date: Thu Jan 7 16:47:07 2016 -0800 + + Merge pull request #19165 from shishir-a412ed/man_page_fix + + man page fix: remove -e/--exec-drive=native related description + +commit cf57eaa51138712671db1061e36ca5b77ccf5ef3 +Merge: 7992a7da3d c826329d66 +Author: David Lawrence +Date: Thu Jan 7 16:47:01 2016 -0800 + + Merge pull request #419 from docker/errmeta-message + + improve message for ErrMetaNotFound + +commit b12ef0fe00245ca549be5822d8b26033b59cff7a +Merge: d76640d78a 909821f514 +Author: moxiegirl +Date: Thu Jan 7 16:44:29 2016 -0800 + + Merge pull request #18378 from tonistiigi/content-addressability-storage-docs + + Update storage docs for content-addressability + +commit 8b173fd382efa4cd545af73e22dc37c571fc06bc +Merge: ba5cbb9519 7e266f18ed +Author: Alexandre Beslic +Date: Thu Jan 7 16:14:36 2016 -0800 + + Merge pull request #1569 from dongluochen/nodeManagement + + Improve node management. + +commit 2ffb362f9bbfea5ac72ebe11c5692f129eb8ccd2 +Author: Victoria Bialas +Date: Thu Jan 7 16:06:46 2016 -0800 + + added re-directs for cloud install docs as clean-up for #18282 + + Signed-off-by: Victoria Bialas + +commit c64f9407a4833bcaf34f766378512dd79f47d75f +Author: Avi Miller +Date: Fri Jan 8 11:06:21 2016 +1100 + + Add missing ? to specfile variable. + + Signed-off-by: Avi Miller + +commit 7e266f18ed364a376a9829ef94ff42c8bf0789ec +Author: Dong Chen +Date: Thu Jan 7 15:55:12 2016 -0800 + + Name constants. + + Signed-off-by: Dong Chen + +commit ed5f7bd3949b289cebace496d9a40e67e05db466 +Author: Dimitar Bonev +Date: Thu Dec 17 23:23:00 2015 +0200 + + log_driver and log_opt moved to logging key. + + Signed-off-by: Dimitar Bonev + +commit 1e021ff5715ade80310a04895da414a897529d7a +Author: Anusha Ragunathan +Date: Mon Jan 4 08:44:27 2016 -0800 + + Create standard vendor policies. + + Signed-off-by: Anusha Ragunathan + +commit 6d17423a6dd5fa4503583ad7eede27c921cea83c +Author: Aaron Lehmann +Date: Wed Jan 6 14:15:14 2016 -0800 + + Move MediaType into manifest.Versioned + + This makes content type sniffing cleaner. The document just needs to be + decoded into a manifest.Versioned structure. It's no longer a two-step + process. + + Signed-off-by: Aaron Lehmann + +commit 697af09566a1957c41f1786efa209e2b0d8963ce +Author: Aaron Lehmann +Date: Thu Dec 17 17:32:11 2015 -0800 + + Recognize clients that don't support manifest lists + + Convert a default platform's manifest to schema1 on the fly. + + Signed-off-by: Aaron Lehmann + +commit 9c416f0e949e705db1272087403f14da71a04b75 +Author: Aaron Lehmann +Date: Wed Dec 16 17:26:13 2015 -0800 + + Add support for manifest list ("fat manifest") + + Signed-off-by: Aaron Lehmann + +commit 92848103565d2125eac29e4f949ec7e181a80cef +Author: Aaron Lehmann +Date: Wed Dec 16 14:30:49 2015 -0800 + + Add API unit testing for schema2 manifest + + Signed-off-by: Aaron Lehmann + +commit 3f746a82074f3de56b5212a66fe2f0cb0367a1f0 +Author: Aaron Lehmann +Date: Tue Dec 15 11:37:28 2015 -0800 + + Recognize clients that don't support schema2, and convert manifests to schema1 on the fly + + Signed-off-by: Aaron Lehmann + +commit befd4d6e3c8f50cdc17c3482959f6df85b42c87e +Author: Aaron Lehmann +Date: Mon Dec 14 18:19:34 2015 -0800 + + Factor out schema-specific portions of manifestStore + + Create signedManifestHandler and schema2ManifestHandler. Use these to + unmarshal and put the respective types of manifests from manifestStore. + + Signed-off-by: Aaron Lehmann + +commit 2ff77c00bad887928be04367f0dd58f6aed5b756 +Author: Aaron Lehmann +Date: Wed Dec 9 16:38:04 2015 -0800 + + Add schema2 manifest support + + Add schema2 manifest implementation. + + Add a schema2 builder that creates a schema2 manifest from descriptors + and a configuration. It will add the configuration to the blob store if + necessary. + + Rename the original schema1 manifest builder to ReferenceBuilder, and + create a ConfigBuilder variant that can build a schema1 manifest from an + image configuration and set of descriptors. This will be used to + translate schema2 manifests to the schema1 format for backward + compatibliity, by adding the descriptors from the existing schema2 + manifest to the schema1 builder. It will also be used by engine-side + push code to create schema1 manifests from the new-style image + configration, when necessary to push a schema1 manifest. + + Signed-off-by: Aaron Lehmann + +commit 0be4b3f27d783ea9f3bfddfbc2e3e817f7d02c24 +Merge: 83ccbd18c0 b49c4fff95 +Author: Stephen Day +Date: Thu Jan 7 14:58:35 2016 -0800 + + Merge pull request #1283 from djenriquez/master + + CloudFront-s3-middleware + +commit ba5cbb95196af0d476d0493ab078c00a5e8eb93d +Merge: 017a26175b 2ec3c16efe +Author: Alexandre Beslic +Date: Thu Jan 7 13:55:34 2016 -0800 + + Merge pull request #1590 from jimenez/upgrade_mesos0.25 + + Upgrade mesos0.25 in CI + +commit d76640d78a1a14b1f7f772c100a95cacfd30248c +Merge: ff3b551d2d 4c22c566e2 +Author: Jess Frazelle +Date: Thu Jan 7 13:53:01 2016 -0800 + + Merge pull request #19145 from vdemeester/vendor-my-precious + + Add a validate-vendor script + +commit 017a26175b6e8bf43121766729e584f09f94497c +Merge: 3aa302d706 3f5d018c2d +Author: Victor Vieux +Date: Thu Jan 7 13:37:07 2016 -0800 + + Merge pull request #1592 from jimenez/stress_test + + Stress test for mesos + +commit 28f52bd06a24705bd6958ac505b6b6f36e877547 +Author: Avi Miller +Date: Fri Jan 8 08:09:47 2016 +1100 + + Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec + file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6 + and Oracle Linux 7. + + The UEK R4 provides the required kernel functionality for VxLAN support + required by Docker 1.9 and user namespace support required for 1.10+. + + The build of Docker on Oracle Linux 6 requires some manipulation of the build + environment so that the CGO compiler uses the UEK R4 headers instead of the old + default kernel headers. + + Signed-off-by: Avi Miller + +commit 7992a7da3dee36df6e946a75deb807f2fe3d5771 +Merge: 13eaaf1a22 b56372a1d8 +Author: David Lawrence +Date: Thu Jan 7 11:53:48 2016 -0800 + + Merge pull request #429 from endophage/json_logs + + using JSON logging format + +commit 13eaaf1a22973c49f195a3bfc463b31c41038581 +Merge: 320d565f3b 02ec86cd1b +Author: David Lawrence +Date: Thu Jan 7 11:36:02 2016 -0800 + + Merge pull request #426 from endophage/canonical_json + + use canonical json for all marshalling of TUF data + +commit 50305d66f56774488b6fec2534fd592c263c91e0 +Author: Shishir Mahajan +Date: Thu Jan 7 11:08:30 2016 -0500 + + man page fix: remove -e/--exec-drive=native related description + + Signed-off-by: Shishir Mahajan + +commit ff3b551d2d9c3f955509504b3cfc629c660909cb +Merge: cceac7da35 e0dc4f27f6 +Author: Doug Davis +Date: Thu Jan 7 14:13:50 2016 -0500 + + Merge pull request #18768 from hqhq/hq_remove_dup_error + + Remove redundant error messages + +commit cceac7da358c3e25130ce851312c44dd4418c1b2 +Merge: 938d28e772 52f32818df +Author: Arnaud Porterie +Date: Thu Jan 7 11:13:07 2016 -0800 + + Merge pull request #19059 from jfrazelle/seccomp-docs + + add syscalls we purposely block to docs + +commit 0f9f99500c40f2a46682967ca358cd2346fd5e13 +Author: Brian Goff +Date: Thu Sep 3 20:51:04 2015 -0400 + + Build names and links at runtime + + Don't rely on sqlite db for name registration and linking. + Instead register names and links when the daemon starts to an in-memory + store. + + Signed-off-by: Brian Goff + +commit 4c22c566e25ff2bc6fa80cd9627c59512a1f768d +Author: Vincent Demeester +Date: Thu Jan 7 19:57:15 2016 +0100 + + Add a validate-vendor script + + Makes sure that if ./hack/vendor.sh has been updated, it has been used + to update the vendor folder. + + Signed-off-by: Vincent Demeester + +commit e7bba2affe988cbddae03cafee2367c286f4df7b +Merge: ed87d1f848 bf1552da79 +Author: Aanand Prasad +Date: Thu Jan 7 18:28:22 2016 +0000 + + Merge pull request #2300 from dnephin/always_unicode_literal + + Use "unicode_literals" in all files + +commit 938d28e772ec32ed3b09bfb8907852e497990076 +Merge: 374a9596b2 c1cd45d547 +Author: Jess Frazelle +Date: Thu Jan 7 10:24:51 2016 -0800 + + Merge pull request #19144 from LK4D4/fix_parent_systemd + + Choose default-cgroup parent by cgroup driver + +commit 52f32818df8bad647e4c331878fa44317e724939 +Author: Jessica Frazelle +Date: Mon Jan 4 11:43:28 2016 -0800 + + add syscalls we purposely block to docs + + Signed-off-by: Jessica Frazelle + +commit bf1552da7982b22b874b1938af9bf80094c884e8 +Author: Daniel Nephin +Date: Fri Oct 30 16:50:31 2015 -0400 + + Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. + + Signed-off-by: Daniel Nephin + +commit 475a09176850c3f6d9fd51fc6e82e03263a3d733 +Author: Daniel Nephin +Date: Fri Oct 30 16:22:51 2015 -0400 + + Update pre-commit config to enforace that future imports exist in all files. + + Signed-off-by: Daniel Nephin + +commit 83ccbd18c0e97e5bf176357f76cd1e5c4320a7cf +Merge: 9f83bfc071 9f5ebd0a94 +Author: Aaron Lehmann +Date: Fri Jan 8 01:04:27 2016 +0700 + + Merge pull request #1324 from stevvooe/digest-from-bytes + + digest: add NewDigestFromBytes for completeness + +commit 320d565f3b3bd4a86e16b61d0302e2e041dd914f +Merge: aff9eb929a a64ffd4ae9 +Author: Riyaz Faizullabhoy +Date: Thu Jan 7 09:50:47 2016 -0800 + + Merge pull request #427 from docker/delegation-var + + Move regex compilation to outside var for optimization + +commit a64ffd4ae98a538619b931faae5f09b8fc11b62c +Author: Riyaz Faizullabhoy +Date: Wed Jan 6 16:21:30 2016 -0800 + + Move regex compilation to outside var for optimization + + Signed-off-by: Riyaz Faizullabhoy + +commit 374a9596b22819ddcb1a981ea05a8ba3f4d4f0ed +Merge: 131e2bf12b ca7b69016a +Author: moxiegirl +Date: Thu Jan 7 09:21:58 2016 -0800 + + Merge pull request #19156 from HackToday/19152-fix-voldoc + + Remove the old reference link + +commit aff9eb929a4118bcbe98b27aae13d427cb6a20f1 +Merge: e920e90b1f 9822c6d9be +Author: Ying Li +Date: Thu Jan 7 09:16:43 2016 -0800 + + Merge pull request #430 from HuKeping/dockerfile + + Fix the exposed port in Dockerfile + +commit e920e90b1f95747b25cd6a6f5c383a743d45975f +Merge: cc03297c77 f1067998f6 +Author: Ying Li +Date: Thu Jan 7 09:10:44 2016 -0800 + + Merge pull request #432 from useidel/master + + added /usr/lib64 to search paths + +commit c1cd45d547ef26cf988dc72d456430361dafcf08 +Author: Alexander Morozov +Date: Wed Jan 6 13:59:01 2016 -0800 + + Choose default-cgroup parent by cgroup driver + + It's "/docker" for cgroupfs and "system.slice" for systemd. + + Fix #19140 + + Signed-off-by: Alexander Morozov + +commit ed87d1f848482493feaf42bb966519859d1ab711 +Merge: 4017ea99fe 1dcdd98da4 +Author: Aanand Prasad +Date: Thu Jan 7 16:45:58 2016 +0000 + + Merge pull request #2421 from shin-/2110-compose_yml_v2 + + Add support for declaring named volumes in compose files + +commit 131e2bf12b2e1b3ee31b628a501f96bbb901f479 +Merge: 6aefa898cb c7d811c816 +Author: Tibor Vass +Date: Thu Jan 7 11:14:37 2016 -0500 + + Merge pull request #19068 from calavera/vendor_engine_api + + Introduce the new engine-api library. + +commit dd67c30838e39744a8b1b8ac6d99c38df797824e +Merge: ac7e323bbc f10584ec85 +Author: David Gageot +Date: Thu Jan 7 12:44:41 2016 +0100 + + Merge pull request #2774 from jeanlaurent/log-fatal-is-evil + + log.fatal is evil + +commit 6aefa898cb4733888b4b3ffe126ab1ddb9b337fc +Merge: 3442339b98 ade71ace7d +Author: Sebastiaan van Stijn +Date: Thu Jan 7 12:41:08 2016 +0100 + + Merge pull request #19160 from thaJeztah/carry-19020-groupadd-docs + + (carry 19020) add documentation for groupadd for remote api + +commit f10584ec855e593f80e4d021576c2c528fefa6f3 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 7 12:07:47 2016 +0100 + + Remove remaining log.Fatal + + Signed-off-by: Jean-Laurent de Morlhon + +commit ac7e323bbc91aba978fb7aafcfa3e44cf2d4acb4 +Merge: 738751932c f96595d7d0 +Author: David Gageot +Date: Thu Jan 7 12:31:52 2016 +0100 + + Merge pull request #2775 from dgageot/fix-bugsnag + + Fix Bugnag Report not being sent + +commit ade71ace7df285795381d1317f8069f14e099bb3 +Author: Oliver Neal +Date: Thu Dec 31 15:09:22 2015 +0000 + + added documentation for groupadd within hostConfig that was added in remote api 1.20 + + Signed-off-by: Oliver Neal + Signed-off-by: Sebastiaan van Stijn + +commit f96595d7d0515490c6b39ff3f22126eb495e7dd6 +Author: David Gageot +Date: Thu Jan 7 12:04:51 2016 +0100 + + Fix Bugnag Report not being sent + + Signed-off-by: David Gageot + +commit f1067998f6ce6cbeb7c2c4102b211e6b67c28b56 +Author: Udo Seidel +Date: Thu Jan 7 11:38:48 2016 +0100 + + added /usr/lib64 to search paths + + Signed-off-by: Udo Seidel + +commit 738751932c05b31388a1c04345f006fc82d03cad +Merge: c688617f75 9cdf13b9ab +Author: David Gageot +Date: Thu Jan 7 11:44:08 2016 +0100 + + Merge pull request #2767 from jeanlaurent/double-log-remove + + Fix double error message while removing + +commit c688617f75a7674279c6eb76caf06cf69612a8e2 +Merge: 7a893e1491 6dc0801674 +Author: David Gageot +Date: Thu Jan 7 11:43:59 2016 +0100 + + Merge pull request #2763 from dgageot/retry-vbox + + Retry VirtualBox commands + +commit 9cdf13b9ab3b62b32de6cbc59c7c2391a4228eca +Author: Jean-Laurent de Morlhon +Date: Thu Jan 7 11:33:50 2016 +0100 + + Fix double error logs in docker-machine rm + + Signed-off-by: Jean-Laurent de Morlhon + +commit ca7b69016a13739db74eb09046d8344762a2caa4 +Author: Kai Qiang Wu(Kennan) +Date: Thu Jan 7 09:28:30 2016 +0000 + + Remove the old reference link + Fixes: #19152 + + As issue #14214 closed, so this old link is not needed. + We can remove it now. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 7a893e14913b52929db31a3f60b6280841ac7118 +Merge: 276e7e48b6 c33fd0d548 +Author: Jean-Laurent de Morlhon +Date: Thu Jan 7 10:54:27 2016 +0100 + + Merge pull request #2770 from daehyeok/google_rm + + GCE delete instance during rm + +commit 6dc080167465e04068b3abe469a5d18368bc9044 +Author: David Gageot +Date: Thu Jan 7 09:19:08 2016 +0100 + + Add unit tests for vbm + + Signed-off-by: David Gageot + +commit fcb31f99f2edfdc19a6cf7592db2214726856e85 +Author: David Gageot +Date: Wed Jan 6 13:36:39 2016 +0100 + + FIX #2762 retry Virtualbox commands + + Signed-off-by: David Gageot + +commit 3442339b98dccc7137ea8d49393eff44166a67ec +Merge: af6c6dbf87 72472f5639 +Author: Sebastiaan van Stijn +Date: Thu Jan 7 08:32:01 2016 +0100 + + Merge pull request #19090 from thaJeztah/fix-api-markdown + + fix markdown and typos in API docs + +commit af6c6dbf8748b0e09d48a788cb17cb6d3c30c7a4 +Merge: dd2981c26d 5d1dd8069b +Author: moxiegirl +Date: Wed Jan 6 20:04:09 2016 -0800 + + Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md + + Add docs for volume plugin ls/get + +commit dd2981c26dba1f6d87a2099b886c87aec259031d +Merge: 7fab93175d 9cf29be0ee +Author: moxiegirl +Date: Wed Jan 6 20:02:53 2016 -0800 + + Merge pull request #19127 from thaJeztah/use-the-f-luke + + Add -f flag to cURL install instructions + +commit 3f5d018c2d6b250992810150ef665f5815543fa3 +Author: Isabel Jimenez +Date: Mon Dec 14 16:16:56 2015 -0500 + + moving big run to more adequate stress test + + Signed-off-by: Isabel Jimenez + +commit 07031ed7bac6691dee80f0ec9f7f3fc551bf07d3 +Author: Mary Anthony +Date: Wed Jan 6 18:58:12 2016 -0800 + + Updating READMEs + + Signed-off-by: Mary Anthony + +commit 2ec3c16efeaf472c1c9d5dc6210b1a18ca3ff35b +Author: Isabel Jimenez +Date: Wed Dec 16 14:24:53 2015 -0500 + + adapting tests to mesos0.25 upgrade + + Signed-off-by: Isabel Jimenez + +commit 7f0d304f3767d4f33d23480a3ca2f54bb72938b7 +Author: Zhang Wei +Date: Wed Jan 6 18:56:41 2016 +0800 + + Check nil Terminal to avoid panic + + Signed-off-by: Zhang Wei + +commit 9f5ebd0a941c688b3428e93d5b09443f42bd478b +Author: Stephen J Day +Date: Wed Jan 6 17:24:58 2016 -0800 + + digest: add NewDigestFromBytes for completeness + + Signed-off-by: Stephen J Day + +commit 9822c6d9be407b55e157d2a438c51cebedb67f30 +Author: HuKeping +Date: Thu Jan 7 09:42:28 2016 +0800 + + Fix the exposed port in Dockerfile + + 4443 is default used by Server and 4444 is for Signer. + + Signed-off-by: Hu Keping + +commit 3aa302d7065b6325cc88aa8c4db6418c437453c3 +Merge: b4a6ad2e56 2449a352ef +Author: Xian Chaobo +Date: Thu Jan 7 09:42:16 2016 +0800 + + Merge pull request #1587 from vieux/do_not_save_image_aff + + do not save image affinity on reschedule + +commit 542af0539100cb8cd84884dc4ef8b3cdac51af1b +Author: Isabel Jimenez +Date: Wed Dec 16 14:19:19 2015 -0500 + + updrading tests to use mesos 0.25 + + Signed-off-by: Isabel Jimenez + +commit b56372a1d895cecf28b91a8e647ad8ab374b3864 +Author: David Lawrence +Date: Wed Jan 6 16:59:20 2016 -0800 + + using JSON logging format for notary server and signer for easier integration with backend metrics platforms + Signed-off-by: David Lawrence (github: endophage) + +commit c33fd0d54881735b98aa38849e668fe4f60ce9a8 +Author: Daehyeok Mun +Date: Wed Jan 6 18:04:50 2016 -0700 + + GCE delete instance during rm + Delete instance during rm command regardless instance status + + Signed-off-by: Daehyeok Mun + +commit c7d811c8161b1acc677b15f56b02c773824dfb87 +Author: David Calavera +Date: Mon Jan 4 19:06:11 2016 -0500 + + Remove types and lib packages from the engine. + + They live in github.com/docker/engine-api now. + + Signed-off-by: David Calavera + +commit 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb +Author: David Calavera +Date: Mon Jan 4 19:05:26 2016 -0500 + + Modify import paths to point to the new engine-api package. + + Signed-off-by: David Calavera + +commit 9927e712c0c5a04c2d802e160e27d3c16c650cf2 +Author: David Calavera +Date: Mon Jan 4 18:54:13 2016 -0500 + + Vendor engine-api project. + + Use latest tag for both, engine-api and go-connections. + + Signed-off-by: David Calavera + +commit ebf4c917170215663157f028798e0244040b6be3 +Author: John Howard +Date: Wed Jan 6 10:26:37 2016 -0800 + + Windows: Fix security warning regression + + Signed-off-by: John Howard + +commit 7fab93175d605f98cddf811819d9ab081bb4f90e +Merge: 4ee3048fa8 18d15babef +Author: Tibor Vass +Date: Wed Jan 6 18:09:30 2016 -0500 + + Merge pull request #19099 from calavera/replace_docker_only_trust_enabled + + Do not perform build context switch when content trust is not enabled. + +commit 4ee3048fa8382f9e9af2418029b8e53885bb906a +Merge: d2b8160513 9982631707 +Author: David Calavera +Date: Wed Jan 6 15:09:11 2016 -0800 + + Merge pull request #19110 from brahmaroutu/update_openc + + update runc to the latest code base to fix gccgo builds + +commit d2b8160513e8b43ce3b0e3a79df676f4a10a7974 +Merge: 18fdbdb07b 1698d49abc +Author: Alexander Morozov +Date: Wed Jan 6 14:45:58 2016 -0800 + + Merge pull request #19141 from duglin/FixVendor + + Update src with latest vendor.sh stuff + +commit 91201678c6f58a5e46fe302bed9eb55a7ddcf693 +Author: Tianon Gravi +Date: Mon Jan 4 21:50:15 2016 -0800 + + Refactor multi-arch support (especially for new mostly-official multi-arch official images) + + See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. + + Signed-off-by: Andrew "Tianon" Page + +commit 276e7e48b675290dd933f9ffe1861ec1c2438511 +Merge: 2aebbb8d88 288fddb736 +Author: Nathan LeClaire +Date: Wed Jan 6 14:27:21 2016 -0800 + + Merge pull request #2769 from dustinblackman/fix/swarm-manage-advertise + + Set swarm manage to advertise on 3376 + +commit 18fdbdb07b7843eb2867fd8572fae5b0f4922049 +Merge: 60e577c3b9 af0117cc8f +Author: Doug Davis +Date: Wed Jan 6 16:44:29 2016 -0500 + + Merge pull request #19143 from duglin/AddMorgan + + Add Morgan Bauer to docker/docker/MAINTAINERS + +commit 1698d49abcfb004c3665a9e039be3ba2cf09451d +Author: Doug Davis +Date: Wed Jan 6 13:10:31 2016 -0800 + + Update src with latest vendor.sh stuff + + I **think** someone forgot to run vendor.sh after it was updated so + this just syncs things up. + + Signed-off-by: Doug Davis + +commit 60e577c3b94aef656dad70e3c5f0e61aa41e5867 +Merge: f2036d1108 bdce7dd5c8 +Author: Antonio Murdaca +Date: Wed Jan 6 22:21:56 2016 +0100 + + Merge pull request #19142 from thaJeztah/update-runcom-email + + Update antonio's e-mail address + +commit b4a6ad2e561aad5e83c1fbe6c2ad53446316b2fc +Merge: ef8fb1cbc8 5a529d4c4a +Author: Dongluo Chen +Date: Wed Jan 6 13:20:02 2016 -0800 + + Merge pull request #1585 from jimenez/klaus-jimenez-offer-refuse + + Klaus jimenez offer refuse + +commit af0117cc8f3c3faa6017097977ed9bc484966f9a +Author: Doug Davis +Date: Wed Jan 6 13:19:04 2016 -0800 + + Add Morgan Bauer to docker/docker/MAINTAINERS + + Signed-off-by: Doug Davis + +commit bdce7dd5c87e76f41a0d8c129645c84d0779f5c0 +Author: Sebastiaan van Stijn +Date: Wed Jan 6 22:18:47 2016 +0100 + + Update antonio's e-mail address + + Signed-off-by: Sebastiaan van Stijn + +commit 2aebbb8d8814f8fb43de8fe2288b27834aa9767a +Merge: e681a4bb50 e28f7d5aa9 +Author: David Gageot +Date: Wed Jan 6 21:54:12 2016 +0100 + + Merge pull request #2708 from dgageot/external + + Add CI tests for an external driver + +commit 5a529d4c4a1f1f457a2505bdfe7fc1f2d41e836f +Author: Isabel Jimenez +Date: Tue Jan 5 13:16:57 2016 -0500 + + Adding help for new flag offer_refuse_seconds and renaming + + Signed-off-by: Isabel Jimenez + +commit 0bca8d9cb39a01736f2ce043f2ea7b6407ffc281 +Author: Vincent Demeester +Date: Wed Jan 6 21:28:47 2016 +0100 + + Add config and create to docs/reference + + Signed-off-by: Vincent Demeester + +commit 4e75ed42319b372ac79c7b8762c5fec794afa841 +Author: Vincent Demeester +Date: Wed Dec 23 23:59:48 2015 +0100 + + Add missing --name flag to run reference doc + + Signed-off-by: Vincent Demeester + +commit 77d2aae72dbed943e0b7ae58e392a5bca49a4263 +Author: Vincent Demeester +Date: Wed Dec 23 23:53:32 2015 +0100 + + Fix typo in unpause reference doc + + Signed-off-by: Vincent Demeester + +commit 288fddb736e2da22a6f8e43619be4108aae60999 +Author: Dustin Blackman +Date: Wed Jan 6 15:04:23 2016 -0500 + + set swarm manage to advertise on 3376 + + Signed-off-by: Dustin Blackman + +commit 9f83bfc071094019b942c4332d17327b4dc5cdfc +Merge: 0acca63b93 d3d40a8807 +Author: Richard Scothern +Date: Wed Jan 6 12:00:12 2016 -0800 + + Merge pull request #1321 from aibaars/gcs-fix-retry + + GCS storage driver: fix retry function + +commit c826329d66ae1abe82e419e85034d107cc73ef69 +Author: Riyaz Faizullabhoy +Date: Tue Jan 5 23:22:51 2016 -0800 + + improve message for ErrMetaNotFound + + Signed-off-by: Riyaz Faizullabhoy + +commit 676118670dd0be7781dfd0c12072efc62c53f1bb +Author: John Howard +Date: Wed Jan 6 11:09:47 2016 -0800 + + Windows CI: More debugging + + Signed-off-by: John Howard + +commit 02ec86cd1b379022cb9a10e59ebe611fff85cdd9 +Author: David Lawrence +Date: Wed Jan 6 11:39:55 2016 -0800 + + adding testify/require dependency + Signed-off-by: David Lawrence (github: endophage) + +commit f2036d1108951ad6e99b661ba52ee9200286add1 +Merge: 837de95717 d3ea7e80e8 +Author: David Calavera +Date: Wed Jan 6 11:19:39 2016 -0800 + + Merge pull request #19039 from duglin/Issue19012 + + Add default PATH to 'scratch' images + +commit 0acca63b93c353fa2cef2d228462fe5363332fb7 +Merge: 74d719d83f bb1e9e0a82 +Author: Richard Scothern +Date: Wed Jan 6 11:18:34 2016 -0800 + + Merge pull request #1323 from aibaars/gcs-fix-list-empty + + GCS Storagedriver: fix test failure caused by #1187 + +commit 837de957177363947d5f303d82c972f304d8096b +Merge: 7104f58ac2 824ae85632 +Author: Arnaud Porterie +Date: Wed Jan 6 11:16:40 2016 -0800 + + Merge pull request #16704 from manchoz/16695_manchoz_archarm + + Add support for Arch Linux ARM base images generation (#16695). + +commit f417c834c49d32e6aa9bdbbc1ba5c544c0f760b2 +Author: David Lawrence +Date: Wed Jan 6 11:15:27 2016 -0800 + + switching out to consistently use canonical json for all marshalling of TUF data + Signed-off-by: David Lawrence (github: endophage) + +commit 5ef900a25f1641333fcc48652005c54bc262f958 +Author: Carol Fager-Higgins +Date: Wed Jan 6 11:09:02 2016 -0800 + + edits to capitalization of product + + Signed-off-by: Carol Fager-Higgins + +commit cc03297c773c92b0728ee72637cf3fb9b01e4c74 +Merge: f211b1826d 39701bc858 +Author: Ying Li +Date: Wed Jan 6 11:04:21 2016 -0800 + + Merge pull request #418 from HuKeping/prompt + + Fix here document + +commit 6a455081073e709b6c45d9a17775c053d248f6f2 +Author: Ying Li +Date: Tue Jan 5 17:55:32 2016 -0800 + + Add a miscellaneous script for testing docker trust functions with notary. + + Signed-off-by: Ying Li + +commit bb1e9e0a829a073a00512a838ffa515eae2aa15d +Author: Arthur Baars +Date: Wed Jan 6 18:17:17 2016 +0000 + + GCS Storagedriver: fix test failure caused by #1187 + + Signed-off-by: Arthur Baars + +commit 7104f58ac21b120d94357a736872c34c33018a4e +Merge: fe550a1f17 97f84b5dc1 +Author: Jess Frazelle +Date: Wed Jan 6 10:36:15 2016 -0800 + + Merge pull request #19136 from albers/completion-update + + bash completion for `docker update` + +commit 58a0e1719d035d3c2120d7c767595db68b51caf1 +Author: Dong Chen +Date: Wed Jan 6 10:33:51 2016 -0800 + + Update failureCount scenario and test cases. + + Signed-off-by: Dong Chen + +commit c7b71422c0bea8ce19b8f28e426fe4ea597eb83c +Author: Daniel Nephin +Date: Wed Jan 6 13:30:40 2016 -0500 + + Fix extends with multiple files. + + Signed-off-by: Daniel Nephin + +commit 97f84b5dc1d5326c4c56e5057a8c330725247b9d +Author: Harald Albers +Date: Wed Jan 6 10:15:12 2016 -0800 + + bash completion for `docker update` + + Signed-off-by: Harald Albers + +commit 2b4f64e59018c21aacbf311d5c774dd5521b5352 +Author: Jessica Frazelle +Date: Mon Jan 4 16:23:36 2016 -0800 + + fix proc regex + + Signed-off-by: Jessica Frazelle + +commit e681a4bb502703c5dd020f6ab3430484c29b483a +Merge: 04160e392b fc025e1984 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 6 18:58:56 2016 +0100 + + Merge pull request #2754 from dgageot/shell-bugsnag + + Improve shell detection in bugsnag reports + +commit d3d40a8807cf0856d9fb796297421aab6af628d4 +Author: Arthur Baars +Date: Wed Jan 6 11:47:28 2016 +0000 + + GCS driver: fix retry function + + Signed-off-by: Arthur Baars + +commit 04160e392b1cada27aea99d6358a6239d00e7f5f +Merge: ad3e6b5bf0 dcc77f8891 +Author: Nathan LeClaire +Date: Wed Jan 6 09:52:22 2016 -0800 + + Merge pull request #2760 from dgageot/disable-old-vbox + + Disable support for VBox <= 4.2 + +commit d3ea7e80e879b506bddffd51c3ab65b8078a34f4 +Author: Doug Davis +Date: Sun Jan 3 19:45:06 2016 -0800 + + Add default PATH to 'scratch' images + + Closes #19012 + + Signed-off-by: Doug Davis + +commit fe550a1f17f9ef65e03db65241378d8f89ef4525 +Merge: 8420366e7c e8532023f2 +Author: Tõnis Tiigi +Date: Wed Jan 6 09:48:37 2016 -0800 + + Merge pull request #19093 from estesp/userns-root-rework + + Allow root non-userns metadata backwards compatibility + +commit 5d1dd8069bd8217f946da531c2575280a68bc085 +Author: Brian Goff +Date: Tue Jan 5 21:07:34 2016 -0500 + + Add docs for volume plugin ls/get + + Signed-off-by: Brian Goff + +commit 8420366e7c4c75c7ca540b2178a1748e619933aa +Merge: 4b1872f1ef 178806d2b8 +Author: Tõnis Tiigi +Date: Wed Jan 6 09:34:38 2016 -0800 + + Merge pull request #19132 from icecrime/maintainer_add_tonis + + Add Tõnis Tiigi to MAINTAINERS + +commit 4b1872f1ef08209426d7b9bd7fcbd703cf2c4b48 +Merge: 5ccd33134f 822c4f79ab +Author: David Calavera +Date: Wed Jan 6 09:15:25 2016 -0800 + + Merge pull request #18979 from jfrazelle/make-whitelist + + Change seccomp blacklist to a whitelist + +commit 178806d2b8b1e3c2cebebacc2199128ec2c280d0 +Author: Arnaud Porterie +Date: Wed Jan 6 08:46:22 2016 -0800 + + Add Tõnis Tiigi to MAINTAINERS + + Signed-off-by: Arnaud Porterie + +commit f211b1826dde5fc8c117ccff9bb04ae458a8e3d0 +Merge: 30c488b3b4 00efd4a4c9 +Author: Ying Li +Date: Wed Jan 6 08:39:37 2016 -0800 + + Merge pull request #421 from justincormack/arm + + Update jose2go to latest to fix #239 + +commit 279dd092b6e9d5f6bb405440fa8d407349f5ad84 +Author: Brian Goff +Date: Wed Jan 6 11:29:40 2016 -0500 + + Don't error out on plugin err with json + + We don't want to error out when there is a json unmarshal error since + the `old way` will cause this to error. + + Signed-off-by: Brian Goff + +commit e28f7d5aa9d1a2e64c61d95016bf3f4a6276fc94 +Author: David Gageot +Date: Tue Dec 29 11:46:05 2015 +0100 + + FIX #2498 Introduce CI tests for external binary compatibility + + Signed-off-by: David Gageot + +commit fc025e19841566d9b550fee9775af3cbcb83dd96 +Author: David Gageot +Date: Wed Jan 6 10:36:00 2016 +0100 + + FIX #2746 Improve shell detection in bugsnag reports + + Signed-off-by: David Gageot + +commit 7cf9ae71be7f704a4dd9e00aaf92ae3692ea4343 +Author: David Gageot +Date: Wed Jan 6 08:58:55 2016 +0100 + + Support creating a machine on an existing google VM + + Signed-off-by: David Gageot + +commit ad3e6b5bf0c688aa3ad1a060ad292fe62127b5ee +Merge: 32c75580bc f466aa9499 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 6 16:16:01 2016 +0100 + + Merge pull request #2759 from dgageot/better-windows-version-detection + + Better windows version detection + +commit 32c75580bcd45eac19fdc90077c3a14ec710238e +Merge: e9be8eef71 b36fcbce2c +Author: Jean-Laurent de Morlhon +Date: Wed Jan 6 16:14:27 2016 +0100 + + Merge pull request #2755 from dgageot/bash-windows-path + + FIX #2723 invalid path to docker-machine.exe on Windows/bash + +commit e9be8eef7113ca10a0ff828c8809f5ecab7ae6e3 +Merge: 4fe3bdb628 5e75bf3346 +Author: Jean-Laurent de Morlhon +Date: Wed Jan 6 16:11:46 2016 +0100 + + Merge pull request #2757 from dgageot/fix-broken-vtx-detection + + Fix broken VTx detection + +commit 4fe3bdb628b35940a5ce879ab5c5a9285d8e063d +Merge: 7442ccc585 b0d265a68b +Author: Jean-Laurent de Morlhon +Date: Wed Jan 6 16:11:15 2016 +0100 + + Merge pull request #2758 from dgageot/remove-dead-code + + Remove Dead code + +commit 9cf29be0ee0b19c25471c19c224f9af150beaf1e +Author: Sebastiaan van Stijn +Date: Wed Jan 6 16:05:16 2016 +0100 + + Add -f flag to cURL install instructions + + From the -f description: + + (HTTP) Fail silently (no output at all) on server errors. This is mostly done + to better enable scripts etc to better deal with failed attempts. In normal + cases when an HTTP server fails to deliver a document, it returns an HTML + document stating so (which often also describes why and more). This flag will + prevent curl from outputting that and return error 22. + + Signed-off-by: Sebastiaan van Stijn + +commit 00efd4a4c9dcdc17ac57c29545e1c8ecc29d513b +Author: Justin Cormack +Date: Wed Jan 6 14:04:25 2016 +0000 + + Update jose2go to latest to fix #239 + + This seems to have never been applied; fixes Arm build + + Signed-off-by: Justin Cormack + +commit a931c78540bdecbbe13302ec5156ef832e152994 +Author: Victor Vieux +Date: Tue Jan 5 18:41:51 2016 -0800 + + Before that change, etcd and zookeeper would fail to instantiate + the discovery without the key being already there in the store or + created beforehand and implicitely by a 'swarm join'. + + Signed-off-by: Alexandre Beslic + Signed-off-by: Victor Vieux + + This PR allows to configure the discovery path using the + --discovery-opt flag (with "kv.path=path/to/nodes"). We + can point to "docker/nodes" and use the docker discovery. + + If docker instances are advertising to the cluster using + the `--cluster-advertise` flag, the swarm join command + becomes unnecessary. + + Signed-off-by: Alexandre Beslic + Signed-off-by: Victor Vieux + +commit 5e75bf33462f174ffc6bdc0d8860df411c70631e +Author: David Gageot +Date: Wed Jan 6 12:07:50 2016 +0100 + + Fix broken VTx detection + + Signed-off-by: David Gageot + +commit dcc77f88910f92ea26cd73c9e9c8d36fb71429c8 +Author: David Gageot +Date: Wed Jan 6 12:22:25 2016 +0100 + + FIX #2756 Disable support for VBox <= 4.2 + + Signed-off-by: David Gageot + +commit f466aa94997a6876edb800827a16602bb5dd43aa +Author: David Gageot +Date: Wed Jan 6 11:24:14 2016 +0100 + + FIX #2745 better Windows version detection + + Signed-off-by: David Gageot + +commit af09ebbe4e1b0ac3838bc69d598d8f106094c468 +Author: David Gageot +Date: Wed Jan 6 11:08:14 2016 +0100 + + This code is only useful to crash reports + + Signed-off-by: David Gageot + +commit b0d265a68b87b66182e88f9dd3d90ecc69b78603 +Author: David Gageot +Date: Wed Jan 6 11:04:38 2016 +0100 + + Remove Dead code + + Signed-off-by: David Gageot + +commit b36fcbce2c217410f7f59d3169c5bb41d65732c3 +Author: David Gageot +Date: Wed Jan 6 10:59:23 2016 +0100 + + FIX #2723 invalid path to docker-machine.exe on Windows/bash + + Signed-off-by: David Gageot + +commit 7442ccc585d4384e5e75a7714b61f5c62f80de8c +Merge: 1a72fab4d0 607bac5ce3 +Author: David Gageot +Date: Wed Jan 6 09:39:40 2016 +0100 + + Merge pull request #2738 from jeanlaurent/better-remove + + Enhance remove + +commit 39701bc85841e596cfe49c8932313c432906d971 +Author: HuKeping +Date: Wed Jan 6 12:09:52 2016 +0800 + + Fix here document + + It seems the prompt doesn't work here. + + Signed-off-by: Hu Keping + +commit 1a72fab4d0cdf4b1e378bdd98058647ac15e0de5 +Merge: 222791fec4 f5293e10e2 +Author: Nathan LeClaire +Date: Tue Jan 5 19:20:22 2016 -0800 + + Merge pull request #2743 from dgageot/crash + + Crash reporting shouldn't use global variables + +commit 222791fec442423c744b95a782a017d0f6fedae5 +Merge: cd9301e252 8664af9f9b +Author: Nathan LeClaire +Date: Tue Jan 5 19:20:10 2016 -0800 + + Merge pull request #2744 from dgageot/vtx-hyperv + + Tell the user that Hyperv could cause VBox to fail + +commit 532d3a6911a741fa5ffc83f0729e38fe93f84ffc +Author: Carol Fager-Higgins +Date: Tue Jan 5 18:11:30 2016 -0800 + + edited and finalized docs for cs-engine + + Signed-off-by: Carol Fager-Higgins + +commit 5ccd33134fdfa837df4a59d658d91a81a978cf31 +Merge: 7a15586f4f 1094542c4c +Author: Brian Goff +Date: Tue Jan 5 20:54:00 2016 -0500 + + Merge pull request #19113 from Microsoft/jjh/fix-windows-builder + + Windows: Fix docker build not to sigsegv the daemon + +commit ef8fb1cbc8cef1372f372cf7f8415ad9446f2986 +Merge: 82df09b537 0f93c86398 +Author: Xian Chaobo +Date: Wed Jan 6 09:30:25 2016 +0800 + + Merge pull request #1579 from vieux/fix_api_code + + fix status code when container found on unhealthy node + +commit 82df09b5376dda4788832638ccf71174abe49a2e +Merge: b2739245ce 97f3767618 +Author: Dongluo Chen +Date: Tue Jan 5 17:27:31 2016 -0800 + + Merge pull request #1586 from vieux/fix_soft_affinity_reschedule + + fix soft affinity reschedule + +commit 18d15babefb4e89ac581a0b75455f83c6e7aae25 +Author: David Calavera +Date: Tue Jan 5 13:32:43 2016 -0500 + + Do not perform build context switch when content trust is not enabled. + + Signed-off-by: David Calavera + +commit 6a1b49cf4e9ba7a2cd6a52fef16459c6f0a64e68 +Author: Dong Chen +Date: Tue Jan 5 16:20:38 2016 -0800 + + Fix format issue in state.bats. + + Signed-off-by: Dong Chen + +commit 1094542c4ca23096b8d3b10f9f86792769c075e5 +Author: John Howard +Date: Tue Jan 5 16:08:04 2016 -0800 + + Windows: Fix build not to sigsegv + + Signed-off-by: John Howard + +commit 998263170750ee5504bc4fe23f9a3d1f797e2a41 +Author: Srini Brahmaroutu +Date: Tue Jan 5 22:15:34 2016 +0000 + + update runc to the latest code base to fix gccgo build + Signed-off-by: Srini Brahmaroutu + +commit 9a1584d508eb7c4076328ef0f1e4559512863c3e +Author: Dong Chen +Date: Tue Jan 5 15:56:55 2016 -0800 + + Update integration test. Reduce pending node validation sleep interval. Each pending node has its own validation interval according to failure count. So reducing sleep interval is not increasing validation frequency for unreachable nodes. + + Signed-off-by: Dong Chen + +commit 1dcdd98da4d8f5bce52eddf013875b730e2ed130 +Author: Joffrey F +Date: Tue Jan 5 15:24:58 2016 -0800 + + Add TODO note to restore n-1 version testing after 1.10 release + + Signed-off-by: Joffrey F + +commit b49c4fff95e2f6ee88e26148316c24e6e9adaa29 +Author: DJ Enriquez +Date: Tue Jan 5 15:22:35 2016 -0800 + + Applying recommended changes + + - Adding clarification to the “chunksize” definition + - Changing short-hand “/w” to “with” + + Signed-off-by: DJ Enriquez + +commit a7689f3da8a671b2a5dacd58ebc9259c86793f86 +Author: Joffrey F +Date: Fri Dec 11 17:21:04 2015 -0800 + + Handle volume driver change error in config. + + Assume version=1 if file is empty in get_config_version + Empty files are invalid anyway, so this simplifies the algorithm + somewhat. + https://github.com/docker/compose/pull/2421#discussion_r47223144 + + Don't leak version considerations in interpolation/service validation + + Signed-off-by: Joffrey F + +commit f3a9533dc04cfa43be128d97bea3b30fc003b7c6 +Author: Joffrey F +Date: Wed Dec 9 17:06:56 2015 -0800 + + version no longer optional arg for process_config_file + + Signed-off-by: Joffrey F + +commit 661519ac1c8fa7913cd9d289951c41447eeebff9 +Author: Joffrey F +Date: Wed Dec 9 14:47:09 2015 -0800 + + Only test latest version in CI script + + Signed-off-by: Joffrey F + +commit ec5111f1c29c5dd66d161906042ca39183ebd659 +Author: Joffrey F +Date: Tue Dec 8 17:21:20 2015 -0800 + + Volumes are now prefixed with the project name + + When created through the compose file, volumes are prefixed + with the name of the project they belong to + underscore, + similarly to how containers are currently handled. + + Signed-off-by: Joffrey F + +commit ecef5d37a7eae730eed47648cbe4eb600eef3004 +Author: Joffrey F +Date: Tue Dec 1 17:28:42 2015 -0800 + + Add v2 configuration tests + + Signed-off-by: Joffrey F + +commit bc326800fde3a2c55e662880c9c1912011ae1ca4 +Merge: 941c9105e5 4ac09ed78b +Author: Jess Frazelle +Date: Tue Jan 5 15:14:20 2016 -0800 + + Merge pull request #51 from thaJeztah/add-engine-api + + Add engine-api + +commit df6877a277e1c4bfce24a1fed0bdaa63bdcc84e2 +Author: Joffrey F +Date: Tue Dec 1 17:28:15 2015 -0800 + + Use newer docker-py version + + Signed-off-by: Joffrey F + +commit abe145bbe77d09a5b31ee1453a37938e132604e1 +Author: Joffrey F +Date: Tue Dec 1 17:26:32 2015 -0800 + + Update config resolution to always use explicit version numbers + + Also includes several bugfixes for resolution and validation. + + Signed-off-by: Joffrey F + +commit b253efd8a77447c7ad4f6a6aa5101510704782b1 +Author: Joffrey F +Date: Wed Nov 18 17:45:10 2015 -0800 + + Update docs to define and document new compose.yml file format + + Add volume configuration reference section. + + Signed-off-by: Joffrey F + +commit b4be7b870fb99ed39eb47b5f5cc41d82c5af85e2 +Author: Joffrey F +Date: Mon Nov 16 19:21:56 2015 -0800 + + Add support for declaring named volumes in compose files + + * Bump default API version to 1.21 (required for named volume management) + * Introduce new, versioned compose file format while maintaining support + for current (legacy) format + * Test updates to reflect changes made to the internal API + + Signed-off-by: Joffrey F + +commit 4bf2f8c4f910b5216b2755377e7c394e7c5c7ee6 +Author: Daniel Nephin +Date: Tue Oct 20 12:49:45 2015 -0400 + + Fix lookup of linked containers for API version 1.20 + + Signed-off-by: Daniel Nephin + +commit 97fe2ee40c7018db3cbf0c40feb556e9e7940689 +Author: Daniel Nephin +Date: Wed Nov 4 17:09:40 2015 -0500 + + Don't preserve host volumes on container recreate. + + Fixes a regression after the API changed to use Mounts. + + Signed-off-by: Daniel Nephin + +commit c64b7cbb10b9fd8f1e15d6f0e22a2de4abda7567 +Author: Daniel Nephin +Date: Fri Oct 9 15:42:15 2015 -0400 + + Ignore errors from API about not being able to kill a container. + + Signed-off-by: Daniel Nephin + +commit afab5c76eaf28651181b391cacc4614954134a4b +Author: Joffrey F +Date: Thu Oct 8 06:02:26 2015 -0700 + + Update service volume tests to use mounts key + + Signed-off-by: Joffrey F + +commit 3bdcc9d95459618a1301eb801348fc3805a764a6 +Author: Joffrey F +Date: Tue Oct 6 18:37:43 2015 -0700 + + Update service tests to use mounts instead of volumes + + Signed-off-by: Joffrey F + +commit 73de81b51c0f613ed543f4446a5d76ed9e788659 +Author: Daniel Nephin +Date: Fri Oct 2 19:04:39 2015 -0400 + + Upgrade tests to use new Mounts in container inspect. + + Signed-off-by: Daniel Nephin + +commit 4ac09ed78bdaa46c90819c6107d8c408610aacc7 +Author: Sebastiaan van Stijn +Date: Wed Jan 6 00:02:59 2016 +0100 + + Add engine-api + + Signed-off-by: Sebastiaan van Stijn + +commit 52a7616d9936ebb711ed4150dc062430a6f53af3 +Author: Dong Chen +Date: Tue Jan 5 14:59:30 2016 -0800 + + Add integration test for state machine. + + Signed-off-by: Dong Chen + +commit 7a15586f4fb4d5482b35fc00d1506ea8b36d2b10 +Merge: d9a3812656 6084346bec +Author: Sebastiaan van Stijn +Date: Tue Jan 5 23:53:27 2016 +0100 + + Merge pull request #19056 from clintonskitson/docs-rexray_update + + Updated docs for consolidated list of REX-Ray providers + +commit d9a38126562906381ac6829c4b49d1054e615dc6 +Merge: 55137c19f4 8c1d0e31b4 +Author: Sebastiaan van Stijn +Date: Tue Jan 5 23:50:52 2016 +0100 + + Merge pull request #19077 from AvdN/patch-2 + + example cannot work, pip needs --requirement + +commit ad9011ed96dc35ef6880badd1068276a4493da37 +Author: Daniel Nephin +Date: Tue Jan 5 17:30:27 2016 -0500 + + Don't warn when the container volume is specified as a compose option. + + Signed-off-by: Daniel Nephin + +commit 55137c19f4333e22de7a1ce121298942021b5251 +Merge: b4e26a96da d3eca4451d +Author: Phil Estes +Date: Tue Jan 5 17:29:51 2016 -0500 + + Merge pull request #16534 from cpuguy83/make_volume_drivers_responsible + + Move responsibility of ls/inspect to volume driver + +commit 94347c86110b415e87a50d4d99c820c0f5504eb3 +Author: Richard Scothern +Date: Tue Jan 5 11:22:40 2016 -0800 + + Remove tags referencing deleted manifests. + + When a manifest is deleted by digest, look up the referenced tags in the tag + store and remove all associations. + + Signed-off-by: Richard Scothern + +commit b4e26a96dad3381fb2757172ecc6e04ac375cd6f +Merge: 6c30931b06 79c23fdbf4 +Author: David Calavera +Date: Tue Jan 5 13:34:57 2016 -0800 + + Merge pull request #18752 from cpuguy83/fix_broken_pipe_error_on_download_abrt + + Don't log EPIPE errors on client download abort + +commit d3eca4451d264aac564594fe46b8c097bd85a5cc +Author: Brian Goff +Date: Wed Sep 23 16:29:14 2015 -0400 + + Move responsibility of ls/inspect to volume driver + + Makes `docker volume ls` and `docker volume inspect` ask the volume + drivers rather than only using what is cached locally. + + Previously in order to use a volume from an external driver, one would + either have to use `docker volume create` or have a container that is + already using that volume for it to be visible to the other volume + API's. + + For keeping uniqueness of volume names in the daemon, names are bound to + a driver on a first come first serve basis. If two drivers have a volume + with the same name, the first one is chosen, and a warning is logged + about the second one. + + Adds 2 new methods to the plugin API, `List` and `Get`. + If a plugin does not implement these endpoints, a user will not be able + to find the specified volumes as well requests go through the drivers. + + Signed-off-by: Brian Goff + +commit 6c30931b06ff44e1ce002002430577b7135d2049 +Merge: df9a3d1005 589a5226e7 +Author: Phil Estes +Date: Tue Jan 5 16:20:04 2016 -0500 + + Merge pull request #18889 from aaronlehmann/v1-fallback-pull-all-tags + + Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry + +commit 74d719d83f498cabf27fc4d4ab2edc4bc8516011 +Merge: f277c660ae 7ff5042c1e +Author: Stephen Day +Date: Tue Jan 5 12:23:05 2016 -0800 + + Merge pull request #1249 from k4leung4/print-error-msg + + Print error for failed HTTP auth request. + +commit df9a3d100574a7f6176b8ca544dad352493686b2 +Merge: acfd5eb947 eb4ae8e28a +Author: Tibor Vass +Date: Tue Jan 5 15:21:24 2016 -0500 + + Merge pull request #19092 from anusha-ragunathan/builder-rm-merge + + Remove runconfig.Merge + +commit 941c9105e59a841deef473a49ef4af77f2844e56 +Author: Jessica Frazelle +Date: Tue Jan 5 11:55:20 2016 -0800 + + update + + Signed-off-by: Jessica Frazelle + +commit acfd5eb947bff31239701e754814787e92e1d17f +Merge: 2b489450d7 5190794f1d +Author: David Calavera +Date: Tue Jan 5 11:54:21 2016 -0800 + + Merge pull request #18977 from anusha-ragunathan/builder + + Use ImageBuildOptions in builder. + +commit 2b489450d7abc56301e48f11bc6dabb878d7e585 +Merge: 4f8d794c46 a3858873fa +Author: Sebastiaan van Stijn +Date: Tue Jan 5 20:52:51 2016 +0100 + + Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop + + Windows CI: No integration daemon stop + +commit 8cb1733dc2e584266fa0047ff40e78c457b46f56 +Author: Victor Vieux +Date: Tue Jan 5 11:46:46 2016 -0800 + + update all godeps + + Signed-off-by: Victor Vieux + +commit eb4ae8e28aa0baf28d6cde1079a5f9c618d475b2 +Author: Anusha Ragunathan +Date: Tue Jan 5 08:48:09 2016 -0800 + + Remove runconfig.Merge + + Merge was used by builder and daemon. With this commit, the builder + call has been inlined and the function moved to the daemon package, + which is the only other caller. + + Signed-off-by: Anusha Ragunathan + +commit 4f8d794c46109547ecbfaf60e57208af7094722e +Merge: 180ff8d501 ce2cbde841 +Author: Vincent Demeester +Date: Tue Jan 5 19:56:51 2016 +0100 + + Merge pull request #19097 from albers/completion-daemon--cgroup-parent + + bash completion for `docker daemon --cgroup-parent` + +commit 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117 +Merge: 97bed96759 d92d1de3d5 +Author: moxiegirl +Date: Tue Jan 5 10:55:56 2016 -0800 + + Merge pull request #19045 from wenchma/network_api_update + + Update docker network api doc + +commit a3858873fa87ff5b209e89e70d127d822efc42a6 +Author: John Howard +Date: Tue Jan 5 10:52:59 2016 -0800 + + Windows CI: No integration daemon stop + + Signed-off-by: John Howard + +commit 97bed96759678c3611a6cacb533783b0f55fa67b +Merge: 50917521fc b46f044bf7 +Author: David Calavera +Date: Tue Jan 5 10:50:46 2016 -0800 + + Merge pull request #19067 from jfrazelle/19029-volume-name + + update volume name regex + +commit 50917521fc64e53b6969bbcffb1e02d28b689cce +Merge: 9819a9db20 85599338db +Author: David Calavera +Date: Tue Jan 5 10:46:21 2016 -0800 + + Merge pull request #19094 from ReadmeCritic/master + + Update README URLs based on HTTP redirects + +commit 9819a9db208633c511167d42407e4e53f22e4aef +Merge: 5aae5a5fae 9e624d3250 +Author: David Calavera +Date: Tue Jan 5 10:37:39 2016 -0800 + + Merge pull request #19098 from albers/completion--isolation + + bash completion for `--isolation` + +commit 2449a352ef291ff8aec32025b8b965b97ffef805 +Author: Victor Vieux +Date: Tue Jan 5 10:31:47 2016 -0800 + + add unit test + + Signed-off-by: Victor Vieux + +commit 5daaecdaa133bf5e3ce6b7acfcb5455cd0923faa +Author: Victor Vieux +Date: Tue Jan 5 10:24:20 2016 -0800 + + do not save image affinity on reschedule + + Signed-off-by: Victor Vieux + +commit cf78e799fd5815785c6d0b8c4abf46bc39fc4986 +Author: Klaus Ma +Date: Sun Dec 13 00:07:42 2015 +0800 + + address review comments + + Signed-off-by: Klaus Ma + +commit 5aae5a5fae39cff15f5e92cfe1f80c1c5ef019d9 +Merge: d5685a65d7 a8f88ef403 +Author: Michael Crosby +Date: Tue Jan 5 10:11:56 2016 -0800 + + Merge pull request #18399 from tonistiigi/migration-optimization + + Migration optimizations + +commit 5190794f1d85d5406611eb69c270df62ac1cdc7f +Author: Anusha Ragunathan +Date: Tue Dec 29 12:49:17 2015 -0800 + + Use ImageBuildOptions in builder. + + dockerfile.Config is almost redundant with ImageBuildOptions. + Unify the two so that the latter can be removed. This also + helps build's API endpoint code to be less dependent on package + dockerfile. + + Signed-off-by: Anusha Ragunathan + +commit 9e624d32500e8e1894558e6dedccad5539345ed0 +Author: Harald Albers +Date: Tue Jan 5 09:53:16 2016 -0800 + + bash completion for `--isolation` + + Signed-off-by: Harald Albers + +commit b68537cc20c07867d73269c6815c1f50ebc24c0f +Author: Klaus Ma +Date: Wed Dec 2 18:27:49 2015 +0800 + + correct code style & build error + + Signed-off-by: Klaus Ma + +commit a23ce43337fc2f28e5872b5d0fbff370f80bc572 +Author: Klaus Ma +Date: Wed Dec 2 18:09:22 2015 +0800 + + Add MESOS_OFFER_REFUSE_SECONDS environment configuration + + Signed-off-by: Klaus Ma + +commit 8664af9f9ba0ab0a70a4c1d00a7f5a40728ccee8 +Author: David Gageot +Date: Tue Jan 5 18:20:34 2016 +0100 + + Tell the user that Hyperv could cause VBox to fail + + Signed-off-by: David Gageot + +commit ce2cbde8414380bc6e1e3040acb2c1c7b4c157a8 +Author: Harald Albers +Date: Tue Jan 5 09:29:37 2016 -0800 + + bash completion for `docker daemon --cgroup-parent` + + Signed-off-by: Harald Albers + +commit 822c4f79ab5c84d48bbdd5534cdfd98990cdcee7 +Author: Justin Cormack +Date: Tue Jan 5 15:29:59 2016 +0000 + + Allow the waitpid syscall + + This version is sometimes used eg by glibc on x86 + + Signed-off-by: Justin Cormack + +commit ca3ae72e43a0e6ad2f4f548586110c2e296ae1e9 +Author: Justin Cormack +Date: Tue Jan 5 14:27:32 2016 +0000 + + Support compatible architectures with default seccomp rules + + In the default seccomp rule, allow use of 32 bit syscalls on + 64 bit architectures, so you can run x86 Linux images on x86_64 + without disabling seccomp or using a custom rule. + + Signed-off-by: Justin Cormack + +commit d5685a65d7fb2a4004c941995809931c840c26b6 +Merge: fd1afe1d59 0736598b93 +Author: Tianon Gravi +Date: Tue Jan 5 09:26:59 2016 -0800 + + Merge pull request #19084 from vdemeester/i-am-all-frozen + + Remove hello-world:latest tag before integration + +commit f5293e10e224882bb96b4b90cbebcfdf1d93b880 +Author: David Gageot +Date: Tue Jan 5 11:14:53 2016 +0100 + + Crash reporting shouldn't be static + + Signed-off-by: David Gageot + +commit fd1afe1d59df14e27cdd2d932872fa5c68c8b2dc +Merge: f67fed5f77 fab75bffb0 +Author: Jess Frazelle +Date: Tue Jan 5 09:15:41 2016 -0800 + + Merge pull request #18751 from clnperez/update-gcc-to-5.3 + + Update gcc to 5.3 + +commit f67fed5f77f868dc2550cc7267fb454cae2108b3 +Merge: b2d00e312b fb893cf656 +Author: moxiegirl +Date: Tue Jan 5 09:15:21 2016 -0800 + + Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes + + docs: add note to volume-plugins + +commit 85599338db90c2ccedcbc9a3855db2ae60cb557a +Author: ReadmeCritic +Date: Tue Jan 5 09:13:45 2016 -0800 + + Update README URLs based on HTTP redirects + Signed-off-by: d. khamsing + +commit e8532023f20498e6eb1ce5c079dc8a09aeae3061 +Author: Phil Estes +Date: Tue Jan 5 11:51:14 2016 -0500 + + Allow root non-userns metadata backwards compatibility + + Instead of creating a "0.0" subdirectory and migrating graphroot + metadata into it when user namespaces are available in the daemon + (currently only in experimental), change the graphroot dir permissions + to only include the execute bit for "other" users. + + This allows easy migration to and from user namespaces and will allow + easier integration of user namespace support into the master build. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 72472f5639fc92f3fd554e4eb860b0cb6938f7c2 +Author: Sebastiaan van Stijn +Date: Tue Jan 5 16:33:32 2016 +0100 + + fix markdown and typos in API docs + + Signed-off-by: Sebastiaan van Stijn + +commit 607bac5ce3356ec818cac695663fd7f5d25b5a4b +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 19:03:32 2016 +0100 + + Fix #2671 + + Signed-off-by: Jean-Laurent de Morlhon + +commit cd9301e2524a7893d8b23f4e8067051c7ae2a15b +Merge: e0570c0c2b 85405468de +Author: David Gageot +Date: Tue Jan 5 15:50:44 2016 +0100 + + Merge pull request #2730 from dgageot/close-api + + Close api + +commit b2d00e312b23b9942a1db2ccf6b56288ac3bc57d +Merge: 09ad1bbc58 f8c5420080 +Author: Doug Davis +Date: Tue Jan 5 08:52:12 2016 -0500 + + Merge pull request #19038 from gottwald/logfix + + Fix race condition in JSONFileLogger.Log + +commit 0736598b93d7bc94b376c61ada17658dddee9aa3 +Author: Vincent Demeester +Date: Tue Jan 5 14:40:27 2016 +0100 + + Remove hello-world:latest tag before integration + + This is to make sure we are in the same state on linux/arm, linux/… and + other architecture. + + Signed-off-by: Vincent Demeester + +commit 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d +Merge: 0439e03a27 09e0c9fc24 +Author: Vincent Demeester +Date: Tue Jan 5 14:36:30 2016 +0100 + + Merge pull request #19070 from softprops/shiplift_client + + add shiplift docker client to remote api client list + +commit 09e0c9fc24db44217885c58fb6023bcfef211ae0 +Author: softprops +Date: Mon Jan 4 08:03:14 2016 -0500 + + add shiplift docker client to remote api client list + + Signed-off-by: Doug Tangren + +commit 97f37676184add3c9d51e7412c3efde89020affb +Author: Victor Vieux +Date: Tue Jan 5 04:56:34 2016 -0800 + + fix soft affinity reschedule + + Signed-off-by: Victor Vieux + +commit 4017ea99fe49ca21e056daf8420dc73e34307d97 +Merge: c1a21d2497 2acc29cf1c +Author: Aanand Prasad +Date: Tue Jan 5 12:29:38 2016 +0000 + + Merge pull request #2599 from dnephin/inject_project_name + + Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME + +commit c1a21d24978486e82fbd801537979c6ae6560149 +Merge: ea8cc1c3dc adde805829 +Author: Aanand Prasad +Date: Tue Jan 5 12:27:35 2016 +0000 + + Merge pull request #2577 from TomasTomecek/easier-development + + allow running compose from git + +commit 0439e03a2720987785f98496867c20fd71b9fa44 +Merge: 4a4131ac1b b5f6605ca2 +Author: Sebastiaan van Stijn +Date: Tue Jan 5 13:12:02 2016 +0100 + + Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent + + Add zsh completion for 'docker daemon --cgroup-parent' + +commit 4a4131ac1b5ca28a06802d4e904bc99afa721d1f +Merge: 14a7048df9 52b944dbba +Author: Sebastiaan van Stijn +Date: Tue Jan 5 11:51:33 2016 +0100 + + Merge pull request #19075 from HackToday/fixvoldoc + + Fix the unnecessary parameter + +commit 14a7048df9234608f36b47183fae00ecb46b7e1f +Merge: fccbbe5726 b18fadd115 +Author: Sebastiaan van Stijn +Date: Tue Jan 5 11:48:01 2016 +0100 + + Merge pull request #19064 from RichardScothern/registry-flag + + Show the legacy registry flag only in the daemon arguments + +commit fccbbe572607999dc147bf9dfc06dac0ba4ee25c +Merge: cd9c641b1d 01e873790e +Author: Vincent Demeester +Date: Tue Jan 5 11:34:36 2016 +0100 + + Merge pull request #19078 from HackToday/19072-fix-str + + Fix the str missing + +commit 52b944dbba74b7d2be5bcabfe6937a5578020101 +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 5 07:26:29 2016 +0000 + + Fix the unnecessary parameter + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit cd9c641b1d00e10bddec14ad7f88e2476e55f3c1 +Merge: ebc5a4654e 289faeac11 +Author: Sebastiaan van Stijn +Date: Tue Jan 5 11:06:30 2016 +0100 + + Merge pull request #19079 from wenchma/typo_error + + Fix a typo error + +commit 289faeac111486f19537a06166f283e73fa44c4b +Author: Wen Cheng Ma +Date: Tue Jan 5 17:42:13 2016 +0800 + + Fix a typo error + + Signed-off-by: Wen Cheng Ma + +commit 01e873790e587ebbee761b1f52871901c89c0fc4 +Author: Kai Qiang Wu(Kennan) +Date: Tue Jan 5 09:32:49 2016 +0000 + + Fix the str missing + Fixes: #19072 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 8c1d0e31b40438efd1017535babf8429164a401f +Author: Anthon van der Neut +Date: Tue Jan 5 09:23:53 2016 +0100 + + example cannot work, pip needs --requirement + + The example is not explicit, but the requirements.txt file is most likely a list of requirements (i.e. list of packages to be installed) + and not a python package itself. As such it needs the "--requirements" or "-r" option. + + Signed-off-by: Anthon van der Neut + +commit b5f6605ca20918c9462aad891d4ca2d541d5949e +Author: Steve Durrheimer +Date: Thu Dec 17 08:23:48 2015 +0100 + + Add zsh completion for 'docker daemon --cgroup-parent' + + Signed-off-by: Steve Durrheimer + +commit b2739245ce00d7d580627ed7fce41e83c0454f0f +Merge: 2982243db6 94aad7d423 +Author: Alexandre Beslic +Date: Mon Jan 4 22:27:06 2016 -0800 + + Merge pull request #1581 from vieux/fix_case_test + + fix plugin not found case in tests + +commit 94aad7d4231e710b3ed7dba9a9747733153c5264 +Author: Victor Vieux +Date: Mon Jan 4 22:06:12 2016 -0800 + + fix plugin not found case in tests + + Signed-off-by: Victor Vieux + +commit 30c488b3b4c62fdbc2c1eae7cf3b62ca73f95fad +Merge: 2dfd22dbef 077c28b65d +Author: Diogo Mónica +Date: Mon Jan 4 19:26:13 2016 -0800 + + Merge pull request #393 from docker/path-fix + + use path instead of filepath to express TUF roles + +commit 2dfd22dbefd5628e6990a6157514a9554af7656c +Merge: 53bf7a943f 61bbf7be49 +Author: Diogo Mónica +Date: Mon Jan 4 19:18:38 2016 -0800 + + Merge pull request #401 from cyli/list-targets-lists-role + + When listing targets, the role the target belongs to is also listed + +commit f277c660aecddb4023583cb450e9426c8adf1603 +Merge: a580dae06f 8d1c44f148 +Author: Stephen Day +Date: Mon Jan 4 17:51:51 2016 -0800 + + Merge pull request #1316 from dmcgowan/fix-janky-integration-tests + + Fix broken daemon startup with master + +commit 0f93c86398ed653bf8f71fb818296dbcbc44e136 +Author: Victor Vieux +Date: Mon Jan 4 17:36:51 2016 -0800 + + fix test ps --before + + Signed-off-by: Victor Vieux + +commit cc7acf92e7720dc074f11fabe2b95bebdbe29a69 +Author: Victor Vieux +Date: Mon Jan 4 17:24:10 2016 -0800 + + fix status code when container found on unhealthy node + + Signed-off-by: Victor Vieux + +commit 61bbf7be491a52f12eb700d1dc125c715307a382 +Author: Ying Li +Date: Mon Jan 4 16:59:51 2016 -0800 + + Change ListTargetes and GetTargetsByName to return TargetWithRole. + + This object has both the target and the role in which the target was found. + + Signed-off-by: Ying Li + +commit ebc5a4654eb560b8e1f277e8b041635ce18d5ddd +Merge: 78873dd6e5 2e3186ab06 +Author: David Calavera +Date: Mon Jan 4 16:46:23 2016 -0800 + + Merge pull request #19062 from anusha-ragunathan/cgroup + + Add ability to set cgroup parent for all containers + +commit 53bf7a943f61e2955b3cc741b91925846f41fc4b +Merge: 0014348991 a1178bfc96 +Author: Riyaz Faizullabhoy +Date: Mon Jan 4 16:35:41 2016 -0800 + + Merge pull request #394 from docker/style-cleanup + + fix up style according to comments + +commit 2982243db62a3b8f2e54ee4618c70035f82c9052 +Merge: 40f26856a5 ea5b2290ed +Author: Dongluo Chen +Date: Mon Jan 4 16:35:30 2016 -0800 + + Merge pull request #1375 from vieux/fix_soft + + fix soft affinities/constraints + +commit 8d1c44f1482be4ab21ed3c0f62ca5be49afb0b88 +Author: Derek McGowan +Date: Mon Jan 4 16:32:12 2016 -0800 + + Fix broken daemon startup with master + + Since the daemon flag was deprecated and replaced by the daemon subcommand, the run engine should use the subcommand and only the flag for older versions + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 077c28b65de6310ffb758d417e34cc9a4b7610d7 +Author: Riyaz Faizullabhoy +Date: Tue Dec 29 20:59:48 2015 -0800 + + Use path operation for delegation role check, update RoleTargetsPath to + use path for role name URL + + Signed-off-by: Riyaz Faizullabhoy + +commit dbb8c1065f0b1e0faa9207b4bd27629fc8cf7a27 +Author: Riyaz Faizullabhoy +Date: Tue Dec 29 20:59:48 2015 -0800 + + use path instead of filepath to express TUF roles + + Signed-off-by: Riyaz Faizullabhoy + +commit a1178bfc966d8ed88fbd48df54d7587ffa43d568 +Author: Riyaz Faizullabhoy +Date: Mon Jan 4 10:36:45 2016 -0800 + + improved slice copying and appending + + Signed-off-by: Riyaz Faizullabhoy + +commit 385bd5aa1175c75c8c357e92241c04f5ac4e3cc3 +Author: Riyaz Faizullabhoy +Date: Tue Dec 29 20:55:53 2015 -0800 + + fix up style according to comments + + Signed-off-by: Riyaz Faizullabhoy + +commit d8e06d54cf3f6478ba85f60cca4a9b03bbc68f10 +Author: Justin Cormack +Date: Mon Jan 4 23:56:01 2016 +0000 + + Allow sigreturn syscall + + This is used on some 32 bit architectures, eg x86 + + Signed-off-by: Justin Cormack + +commit ea5b2290ed0ff5161b0b40f96c031ef40b955a5f +Author: Victor Vieux +Date: Tue Nov 3 11:17:08 2015 -0800 + + fix soft affinities/constraints + + Signed-off-by: Victor Vieux + +commit 78873dd6e57c142ab286a0822a5d61491ac8d383 +Merge: 04234bd16a 8213f8caaa +Author: Jess Frazelle +Date: Mon Jan 4 15:59:03 2016 -0800 + + Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script + + Adding Jenkins CI script to sources + +commit 8213f8caaaebbe1627a8efc5b4aac8511f2da9aa +Author: John Howard +Date: Sun Dec 6 18:52:24 2015 -0800 + + Adding Jenkins CI script to sources + + Signed-off-by: John Howard + +commit 2f2a0b9c9fde4d23859ba0e14f8a6f3d1f70a179 +Author: Ying Li +Date: Mon Jan 4 10:48:03 2016 -0800 + + Display the role when listing targets using the Notary CLI. + + Signed-off-by: Ying Li + +commit 2e3186ab065a7130a6e6267d86750848d5eb7d80 +Author: Alexander Morozov +Date: Mon Dec 7 09:55:33 2015 -0800 + + Add ability to set cgroup parent for all containers + + Fix #18022 + + Signed-off-by: Alexander Morozov + +commit b46f044bf71309088b30c1172d4c69287c6a99df +Author: Jessica Frazelle +Date: Mon Jan 4 15:00:49 2016 -0800 + + update volume name regex + + Disallow creating a volume starting with a /. + + Signed-off-by: Jessica Frazelle + +commit b18fadd115f1c9dcbe5bd49636f82d0993067672 +Author: Richard Scothern +Date: Mon Jan 4 14:45:17 2016 -0800 + + Show the legacy registry flag only in the daemon arguments + + Signed-off-by: Richard Scothern + +commit 04234bd16a463af3b5e093ef180351d7b54b6a35 +Merge: 723be0a332 19762da67e +Author: Michael Crosby +Date: Mon Jan 4 14:36:00 2016 -0800 + + Merge pull request #18208 from cpuguy83/restart_links + + Daemon Restart: attempt to wait for container deps + +commit e0570c0c2b2e70ce245efc9b5519058299132af5 +Merge: 9517e1ed6c adc60712c8 +Author: Nathan LeClaire +Date: Mon Jan 4 14:22:43 2016 -0800 + + Merge pull request #2702 from dgageot/ls-format + + Add --format, -f flag to ls command + +commit 723be0a3325799fd6b2a6b689af54f5a07edf992 +Merge: dc4ca0e897 851fe00c64 +Author: David Calavera +Date: Mon Jan 4 13:07:33 2016 -0800 + + Merge pull request #18888 from calavera/event_types + + Event all the things! + +commit 2acc29cf1c25be7078ebeaf70e9d45f8048198da +Author: Daniel Nephin +Date: Mon Jan 4 15:35:57 2016 -0500 + + Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. + + Signed-off-by: Daniel Nephin + +commit 40f26856a57772351f517b27f829cd834f49d5cb +Merge: 31534f6519 13c2b60ca8 +Author: Alexandre Beslic +Date: Mon Jan 4 12:28:17 2016 -0800 + + Merge pull request #1410 from dongluochen/joinSpike + + Add a random delay to avoid synchronized registration at swarm join. Simple fix for #1353 + +commit 851fe00c64ffafeb27b12f7b0ed8e41f7720b477 +Author: David Calavera +Date: Mon Dec 28 15:15:34 2015 -0500 + + Add filter by event type and documentation. + + Signed-off-by: David Calavera + +commit 923609179b18fb5fc9d4ad7820646af7e09786a2 +Author: Justin Cormack +Date: Mon Jan 4 18:21:51 2016 +0000 + + Add _llseek syscall + + This is the newer verion of lseek on many 32 bit platforms + + Signed-off-by: Justin Cormack + +commit d6a9c5abed7370d9ef20b488e315b9730f22ed44 +Author: Justin Cormack +Date: Sun Jan 3 20:31:43 2016 +0000 + + Do not allow obsolete syscalls + + sysfs and ustat syscalls are marked obsolete. + + Signed-off-by: Justin Cormack + +commit c1b57fc1c9e230b95c2c76d1eaca0e3622fc72d5 +Author: Justin Cormack +Date: Sun Jan 3 20:22:09 2016 +0000 + + Do not allow name_to_handle_at, as we have already blocked open_by_handle_at + + Being able to obtain a file handle is no use as we cannot perform + any operation in it, and it may leak kernel state. + + Signed-off-by: Justin Cormack + +commit a1747b3cc861c00803a67e5a61dce73db6ac8eee +Author: Jessica Frazelle +Date: Tue Dec 29 13:48:31 2015 -0800 + + add 32bit syscalls to whitelist + + Signed-off-by: Jessica Frazelle + +commit 17735c3c98056006b40834d7426d8d90afae5a2c +Author: Jessica Frazelle +Date: Tue Dec 29 13:06:10 2015 -0800 + + change seccomp blacklist to whitelist + + Signed-off-by: Jessica Frazelle + +commit 31534f651965c48a48b34f8db77198e91e9396c9 +Merge: 8c5b47b527 4e7e23819b +Author: Victor Vieux +Date: Mon Jan 4 11:51:21 2016 -0800 + + Merge pull request #1577 from dongluochen/clientUpdate + + Godep dockerclient update. + +commit 0007f5a85935b2edcb08eb2d7e736e4db59157a9 +Author: Daniel Nephin +Date: Tue Dec 29 11:28:21 2015 -0500 + + Move some validators from opts to runconfig/opts. + + These validators are only used by runconfig.Parse() or some other part of the + client, so move them into the client-side package. + + Signed-off-by: Daniel Nephin + +commit 6084346bec4d4a50939468590c08ea4ca85f5d60 +Author: Clinton Kitson +Date: Mon Jan 4 11:28:25 2016 -0800 + + Updated docs for consolidated list of REX-Ray providers + + This commit includes the correct project link and also + includes a consolidated list of drivers that are supported. + + Signed-off-by: Clinton Kitson + +commit 4e7e23819bb19414ba82431be6c9e5721978410d +Author: Dong Chen +Date: Mon Jan 4 11:26:53 2016 -0800 + + Godep dockerclient update. + + Signed-off-by: Dong Chen + +commit 8c5b47b52773a64934ff7e618dafcd9471d76eb5 +Merge: 2aff182135 a2380a6c71 +Author: Alexandre Beslic +Date: Mon Jan 4 11:13:38 2016 -0800 + + Merge pull request #1558 from vieux/update_docker_godeps + + cleanup godeps + +commit dc4ca0e89785a93faffeb8736dcb14e3e1769ae8 +Merge: 972653c310 c5a2fdb697 +Author: David Calavera +Date: Mon Jan 4 11:06:18 2016 -0800 + + Merge pull request #18941 from dnephin/runconfig_in_cli + + Move runconfig/parse.go into the runconfig/opts package + +commit 972653c310a400a26b8c618288b2c0a328af4c5e +Merge: fa57eedff4 9961816ade +Author: David Calavera +Date: Mon Jan 4 10:54:47 2016 -0800 + + Merge pull request #19054 from calavera/remove_version_from_types + + Remove version package from API types. + +commit ecd96c82188f47c057836e29ee308af7d0627291 +Author: Ying Li +Date: Mon Jan 4 10:32:00 2016 -0800 + + Fix potential infinite loop in tuf/Client.TargetMeta + + Signed-off-by: Ying Li + +commit 9252d9d892d8abc8519f6e8296b564f246bb45cd +Author: Ying Li +Date: Wed Dec 23 15:08:27 2015 -0800 + + Update client.Target to include a RoleName, so we know where the target is when listed. + + Signed-off-by: Ying Li + +commit fa57eedff409edb7a4ad926b365213a944a97954 +Merge: 0fae65e228 327421d1df +Author: Jess Frazelle +Date: Mon Jan 4 10:24:30 2016 -0800 + + Merge pull request #19002 from jfrazelle/update-test-images + + cleanup test images + +commit 9961816adead89622f5d4201a0b5cb33845fa852 +Author: David Calavera +Date: Mon Jan 4 12:43:38 2016 -0500 + + Remove version package from API types. + + It's an internal type that only extends string. + + Signed-off-by: David Calavera + +commit a8f88ef4036d22aa1feb1de8e86d92371bcd5b67 +Author: Tonis Tiigi +Date: Sun Nov 29 19:55:22 2015 -0800 + + Parallel migration and optimizations + + Signed-off-by: Tonis Tiigi + +commit 0641429ad8a474c25eb99ee3c5a969b28baaad21 +Author: Tonis Tiigi +Date: Fri Dec 4 13:27:44 2015 -0800 + + Use direct filesystem access for tar-split on aufs + + Signed-off-by: Tonis Tiigi + +commit fb893cf6568f2b0cdf500bc3ecfb231fd374ffac +Author: Sebastiaan van Stijn +Date: Mon Jan 4 15:42:03 2016 +0100 + + docs: add note to volume-plugins + + The /var/lib/docker directory is reserved for + docker, and should not be touched by plugins. + + Signed-off-by: Sebastiaan van Stijn + +commit 0014348991ca5aa0ccd9c635f8edb9824b01e283 +Merge: 0c11a97082 74d4af37a3 +Author: Ying Li +Date: Mon Jan 4 09:07:28 2016 -0800 + + Merge pull request #390 from HuKeping/injecting + + Stop injecting to the helper function + +commit c5a2fdb697e403af228a68d08c68d17d347f6cf3 +Author: Daniel Nephin +Date: Tue Dec 22 19:52:27 2015 -0500 + + Move volume.SplitN() to the one place it is used in runconfig. + + Signed-off-by: Daniel Nephin + +commit 2b7ad47bd2649c3f164e8b57b31fae313045c8f4 +Author: Daniel Nephin +Date: Mon Dec 21 20:05:55 2015 -0500 + + Move the runconfig.Parse() function into the runconfig/opts package. + + The parse.go file is used almost exclusively in the client. The few small + functions that are used outside of the client could easily be copied out + when the client is extracted, allowing this runconfig/opts package to + move to the client. + + Signed-off-by: Daniel Nephin + +commit 4c0d586bd3a1b81cfba78af89af02be56041bc6b +Author: Daniel Nephin +Date: Mon Dec 21 17:43:59 2015 -0500 + + Move ParseExec to the client where it is used. + + Signed-off-by: Daniel Nephin + +commit 0fae65e228d29c8f8dd25e29a61eaa0922e13d1d +Merge: 822a808688 9b6592ca85 +Author: moxiegirl +Date: Mon Jan 4 08:51:02 2016 -0800 + + Merge pull request #18499 from thaJeztah/fix-run-reference-example + + Fix pid=host example in documentation + +commit 822a80868801966f2a6664cdc3c9365a0536dc63 +Merge: 0fff66977a 59301e018c +Author: moxiegirl +Date: Mon Jan 4 08:46:45 2016 -0800 + + Merge pull request #19048 from thaJeztah/update-configuring-docker + + docs: update configuring docker for systemd + +commit 9517e1ed6cc0d644d4ae1f5dafaa6b3b0615a6f1 +Merge: 42b1f4e811 93c434eeee +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 17:42:37 2016 +0100 + + Merge pull request #2735 from dgageot/remove-path-windows + + Remove the path to docker-machine in help/version on windows + +commit 42b1f4e8115ac9550d1188ca2129ded368cbaa55 +Merge: 03171b8d21 ccb8c31827 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 17:34:01 2016 +0100 + + Merge pull request #2721 from rediceli/master + + Fix #2717, Driver vmwarefusion fail because of soft link + +commit 2e64534c0f338af2051220ce43e20be19ccb7344 +Merge: 1038964f5a 37a7931e23 +Author: Jeffrey Morgan +Date: Mon Jan 4 11:32:18 2016 -0500 + + Merge pull request #363 from jeanlaurent/machine-0.5.5 + + bump docker-machine to 0.5.5 + +commit 37a7931e23c4b993c3575ef2c5a8c7ef8b421c73 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 17:28:36 2016 +0100 + + Bump toolbox version to 1.9.1g + + Signed-off-by: Jean-Laurent de Morlhon + +commit 68d634593201f171a1f347f144daa4fdd8ca0550 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 17:14:21 2016 +0100 + + bump docker-machine to 0.5.5 + + Signed-off-by: Jean-Laurent de Morlhon + +commit ccb8c318277bef408d9f5a8de4fe5a5b7ff00319 +Author: rediceli +Date: Sat Jan 2 00:33:47 2016 +0800 + + Fix #2717, Driver vmwarefusion fail because of soft link + + Signed-off-by: rediceli + +commit 93c434eeeee47444006217088b602d26a803af55 +Author: David Gageot +Date: Mon Jan 4 16:51:16 2016 +0100 + + Remove the path to docker-machine in help/version on windows + + Signed-off-by: David Gageot + +commit 03171b8d2104ca0a47fa3ac056baa3aca6d5a18e +Merge: b7fa3327cf c59c8a60c5 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 16:34:00 2016 +0100 + + Merge pull request #2727 from soleo/1986-aws-optional-tags + + #1986 aws optional tags for AWS EC2 + +commit b7fa3327cf9669713b5e760b36e6b9f35b64a742 +Merge: e143c68cf9 3990815e10 +Author: David Gageot +Date: Mon Jan 4 16:28:33 2016 +0100 + + Merge pull request #2733 from dgageot/2688-run-docker-machine-from-path + + Run docker-machine from the PATH for core drivers + +commit 9b6592ca858a23376b838e9808d7fa3f15ebc381 +Author: Sebastiaan van Stijn +Date: Tue Dec 8 14:52:58 2015 +0100 + + Fix pid=host example in documentation + + The existing example didn't illustrate how to + install strace in the container. In addition, + the rhel7 image used is no longer public (and maintained) + so not a good image to use in the example. + + This updates the example to use htop (strace is + not working without disabling apparmor for the container) + + Signed-off-by: Sebastiaan van Stijn + +commit e143c68cf9865cf0344b8a0ef5f8d402bced19fd +Merge: d771d65dc4 855de0741a +Author: David Gageot +Date: Mon Jan 4 16:24:55 2016 +0100 + + Merge pull request #2732 from dgageot/better-logs + + Improve Start/Stop/Kill/Restart lifecycle/logs + +commit 0fff66977a5f4245aedc780acde319a587e945a7 +Merge: db738dd77f 9a03967f0a +Author: Brian Goff +Date: Mon Jan 4 10:22:10 2016 -0500 + + Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error + + Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms + +commit c59c8a60c59225f85eb49c36f00e1acd1d17cf66 +Author: Xinjiang Shao +Date: Sun Jan 3 16:17:52 2016 -0600 + + Add --amazonec2-tags for extra tags assignment support. Ref #1986 + + Signed-off-by: Xinjiang Shao + +commit d771d65dc4e4e774178effcc7b98a0293b0ea1c6 +Merge: 61fed5c11b 5ff7ab91fb +Author: David Gageot +Date: Mon Jan 4 16:14:21 2016 +0100 + + Merge pull request #2734 from dgageot/shell-detect-package + + Extract shell detection to its own package + +commit 61fed5c11bef5e8b48af02020f0475fcfdeeab10 +Merge: b282f5abe1 d8fb917cd8 +Author: David Gageot +Date: Mon Jan 4 16:02:30 2016 +0100 + + Merge pull request #2728 from dgageot/update-docker-client + + FIX #2703 Update dockerclient dependency + +commit b282f5abe1d5a68298aac81070f3ff9c8e5a97b1 +Merge: 6511c9a45a 5cfdcfe7b6 +Author: David Gageot +Date: Mon Jan 4 16:00:28 2016 +0100 + + Merge pull request #2729 from dgageot/simpler-code + + Simpler code + +commit 5ff7ab91fbbfc87b974f418d938079cd121d6b7b +Author: David Gageot +Date: Mon Jan 4 15:39:38 2016 +0100 + + Extract shell detection to its own package + + Signed-off-by: David Gageot + +commit 59301e018ce7933c86c9874c209802acdb170d69 +Author: Sebastiaan van Stijn +Date: Mon Jan 4 15:26:55 2016 +0100 + + docs: update configuring docker for systemd + + Ubuntu 15.04 and above uses systemd. Add a note + in the docs to point users to the right instructions. + + Signed-off-by: Sebastiaan van Stijn + +commit 6511c9a45a780002691c16b5e510d6935be65c4f +Merge: db07b70a66 18e4081160 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 15:15:37 2016 +0100 + + Merge pull request #2731 from Akasurde/patch_1 + + Updated documentation for bash completion in install-machine + +commit db07b70a6637ec8d12cc1962290172f2538a07a6 +Merge: e2c4801a93 d394cffe49 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 15:11:33 2016 +0100 + + Merge pull request #2724 from hypriot/improve-detect-shell-on-windows + + Auto-detect shell on Windows + +commit 85405468de1d92ef2c5e38d34741a702ec8909fe +Author: David Gageot +Date: Mon Jan 4 14:58:28 2016 +0100 + + Fix the vbox sample code + + Signed-off-by: David Gageot + +commit 263f8c5cddaef930427a1b1b1a5829b842a08620 +Author: David Gageot +Date: Wed Dec 30 17:19:11 2015 +0100 + + Remove duplication + + Signed-off-by: David Gageot + +commit 00eee7db1d409e14a4d1e8f3dbc64d45e07a8ffd +Author: David Gageot +Date: Wed Dec 30 16:42:45 2015 +0100 + + Simplify Api + + Signed-off-by: David Gageot + +commit 67f8b19c9b2f07a54bca02d82295acfe1ea2fdd3 +Author: David Gageot +Date: Wed Dec 30 16:11:11 2015 +0100 + + Don't use global variables. Make the Api closeable + + Signed-off-by: David Gageot + +commit 3990815e1056c7683fc33f084f71ebf219a2a266 +Author: David Gageot +Date: Mon Jan 4 14:49:50 2016 +0100 + + FIX #2688 - Run docker-machine from the PATH for core drivers + + Signed-off-by: David Gageot + +commit d8fb917cd8572e8f4a7d59b595914447097b6d6e +Author: David Gageot +Date: Mon Jan 4 09:08:38 2016 +0100 + + FIX #2703 Update dockerclient + + Signed-off-by: David Gageot + +commit d92d1de3d529343317e47f604963e5ad8476b3e6 +Author: Wen Cheng Ma +Date: Mon Jan 4 18:05:02 2016 +0800 + + Update docker network api doc + + Signed-off-by: Wen Cheng Ma + +commit 18e4081160bfbfa367547844f6a47b4b40f17505 +Author: Abhijeet Kasurde +Date: Mon Jan 4 15:20:37 2016 +0530 + + Updated documentation for bash completion in install-machine + + Signed-off-by: Abhijeet Kasurde + +commit 5cfdcfe7b64fcc93a29976d650da1c4e346d6dd9 +Author: David Gageot +Date: Wed Dec 30 13:15:19 2015 +0100 + + Remove duplication on certificates code + + Signed-off-by: David Gageot + +commit 885c37e536ad69b98a1ac54c9d786eac181be236 +Author: David Gageot +Date: Wed Dec 30 13:05:23 2015 +0100 + + Use accessor + + Signed-off-by: David Gageot + +commit 9354fed274d49f6239658b9fcd7daa54f71ab71d +Author: David Gageot +Date: Tue Dec 29 10:14:53 2015 +0100 + + Remove some duplication related to swarm + + Signed-off-by: David Gageot + +commit 2b96c0656dcf22f19f06c0166eeef3c025b6c4e7 +Author: David Gageot +Date: Wed Dec 30 12:19:10 2015 +0100 + + Dead code + + Signed-off-by: David Gageot + +commit 6f53a0b9ed12e9cb13e65ad51b65e784af95401e +Author: David Gageot +Date: Wed Dec 30 12:12:06 2015 +0100 + + Simpler code + + Signed-off-by: David Gageot + +commit 855de0741a12b3ef1941694ccaebd5f0daa84215 +Author: David Gageot +Date: Wed Dec 30 12:05:12 2015 +0100 + + Logs for Kill + + Signed-off-by: David Gageot + +commit e9aa75f021b4c6c115c21b7179ee9d65598ad4a6 +Author: David Gageot +Date: Wed Dec 30 11:57:37 2015 +0100 + + Logs for Restart + + Signed-off-by: David Gageot + +commit 783d2b124e718cba39390c047c0928c7f3e84d21 +Author: David Gageot +Date: Wed Dec 30 11:50:39 2015 +0100 + + Logs for Start + + Signed-off-by: David Gageot + +commit bbe76b5a2650e2817b29f0ebb478e706c65c3773 +Author: David Gageot +Date: Wed Dec 30 11:44:53 2015 +0100 + + Logs for Stop + + Signed-off-by: David Gageot + +commit e2c4801a93462862f08ec9719389a7e1f9f6a768 +Merge: c115e037da 94329a6e06 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 10:24:24 2016 +0100 + + Merge pull request #2716 from dweomer/swarm-provisioning-fix-restart-policy-2715 + + fix swarm provision issue #2715: invalid restart policy + +commit c115e037da5d867a3f24b2c696f1f5dc38dc6d9d +Merge: 626bd0df89 54d0e43914 +Author: Jean-Laurent de Morlhon +Date: Mon Jan 4 10:22:33 2016 +0100 + + Merge pull request #2725 from albers/patch-1 + + Fix "installing bash completion" instructions + +commit a580dae06fc7fda5a5b476ead748e5a54d72f6b2 +Merge: 0e73b8a37f ef006ca1a1 +Author: Sven Dowideit +Date: Mon Jan 4 18:44:11 2016 +1000 + + Merge pull request #1310 from thaJeztah/fix-hugo-linting + + docs: mark manifest as "draft" + +commit 54d0e43914ea461486fae74241582944d17b9fd0 +Author: Harald Albers +Date: Sun Jan 3 17:38:06 2016 +0100 + + Fix "installing bash completion" instructions + + The scripts are copied/linked into a _directory_, not a file. + The two directories are the default locations for bash completion extensions. + + Signed-off-by: Harald Albers + +commit db738dd77f699e93f976441d5fc11ab48a2d6c68 +Merge: 2916ceb313 15aa2a663b +Author: Sebastiaan van Stijn +Date: Mon Jan 4 00:49:07 2016 +0100 + + Merge pull request #15666 from vdemeester/3519-configurable-escape + + Implement configurable escape key for attach/exec + +commit 15aa2a663b47b6126a66efefcadb64edfbffb9f5 +Author: Vincent Demeester +Date: Sun Jan 3 23:03:39 2016 +0100 + + Implement configurable detach key + + Implement configurable detach keys (for `attach`, exec`, `run` and + `start`) using the client-side configuration + + - Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start` + commands. + - Adds a new configuration field (in `~/.docker/config.json`) to + configure the default escape keys for docker client. + + Signed-off-by: Vincent Demeester + +commit 2916ceb31376cc7ed92f87d7ff413b0dad82b984 +Merge: 9d6c2196b5 32b5f71f0d +Author: Sebastiaan van Stijn +Date: Sun Jan 3 22:50:32 2016 +0100 + + Merge pull request #19037 from moxiegirl/15666-file-carry + + Creating a man page for the configuration file + +commit f8c54200805a9b9088c90f0b46bfa848d7bae67c +Author: Ingo Gottwald +Date: Sun Jan 3 22:45:56 2016 +0100 + + Fix race condition in JSONFileLogger.Log + + Signed-off-by: Ingo Gottwald + +commit 32b5f71f0d9e997bcbc28cc450b23aa70e445bfa +Author: Mary Anthony +Date: Sat Jan 2 19:30:31 2016 -0800 + + Creating a man page for the configuration file + + Signed-off-by: Mary Anthony + + Adding comments. Fixing bit in daemon + + Signed-off-by: Mary Anthony + + Arrrgggh + + Signed-off-by: Mary Anthony + +commit 9d6c2196b54a20cef3ede074d521ccb6bdabbe63 +Merge: 29da9903d4 d7dc439623 +Author: Sebastiaan van Stijn +Date: Sun Jan 3 12:19:53 2016 +0100 + + Merge pull request #18387 from wenchma/18385-improve_help_msg + + Improvement for docker subcommand's help messages + +commit d394cffe49e92f97139bb33f32baed54aea16cbe +Author: Stefan Scherer +Date: Sun Jan 3 03:01:46 2016 +0100 + + Auto-detect shell on Windows + + Signed-off-by: Stefan Scherer + +commit 29da9903d4bccb19a9f26322f031374583f8bf4f +Merge: 233787040c 2134d38935 +Author: Tianon Gravi +Date: Sat Jan 2 18:21:19 2016 -0800 + + Merge pull request #19035 from albers/completion-authorization-plugins + + Compute plugin list in bash completion for `docker daemon --authz-plugin` + +commit 233787040c6441b8c8eac5bc4802332babf2eb6d +Merge: dcbd5e04b7 e11ebfcb09 +Author: Phil Estes +Date: Sat Jan 2 21:21:03 2016 -0500 + + Merge pull request #19036 from calavera/thank_you_ian + + Thanks for everything Ian. + +commit e11ebfcb0984225690dccc1e644712a80bae2dec +Author: David Calavera +Date: Sat Jan 2 19:15:47 2016 -0500 + + Add Ian Murdock to the names generator. + + :heart: :cry: + + Signed-off-by: David Calavera + +commit 83c19407418381ba89fc340a7b5419886e87af27 +Merge: 19090252b9 9c9452213b +Author: Alexandre Vazquez +Date: Sun Jan 3 01:07:11 2016 +0100 + + Merge branch 'master' of https://github.com/docker/kitematic + +commit 2134d38935e99a0fa750870e1a509eb2515d104f +Author: Harald Albers +Date: Sat Jan 2 14:53:10 2016 -0800 + + Compute plugin list in bash completion for `docker daemon --authz-plugin` + + Signed-off-by: Harald Albers + +commit 9a03967f0abae4cc1dca00f339c58c31579c45b5 +Author: Lukas Waslowski +Date: Sat Jan 2 19:55:37 2016 +0100 + + Fix declarations of of execdriver/native.NewDriver to have the same signature. + + This change is done so that driver_unsupported.go and driver_unsupported_nocgo.go + declare the same signature for NewDriver as driver.go. + + Fixes #19032 + + Signed-off-by: Lukas Waslowski + +commit 1b9a0484c045943521898a90ed7d2c374d3c9bc8 +Author: Jeffrey Morgan +Date: Fri Jan 1 21:18:10 2016 -0500 + + Fix bug where entry point would be repeated if no CMD was specified + +commit dcbd5e04b79cab9e53f9700a07939f21a3268e6b +Merge: 1a5b97c761 83c705c00d +Author: Sebastiaan van Stijn +Date: Sat Jan 2 00:43:46 2016 +0100 + + Merge pull request #18891 from HackToday/18872-fix-volume-cmd + + Fix the restore data example + +commit 1a5b97c76143b7d26006916b23daf8fde73c35ac +Merge: c431bcba5b 9fbb1306e8 +Author: Vincent Demeester +Date: Fri Jan 1 21:40:51 2016 +0100 + + Merge pull request #18932 from wenchma/same_name_of_container_image + + Update integration tests when container and image have same name + +commit c431bcba5bc8fd01d07d8b394044b22a250bc5b2 +Merge: 838e4c86e8 b4d4a805ea +Author: Arnaud Porterie +Date: Fri Jan 1 12:26:44 2016 -0800 + + Merge pull request #19028 from AvdN/patch-1 + + fix typo + +commit 838e4c86e85c724e914e8e6d192b58d5c1a89e6f +Merge: 3544d48ca1 77ef3a606a +Author: Arnaud Porterie +Date: Fri Jan 1 12:26:24 2016 -0800 + + Merge pull request #19027 from runcom/remove-getter + + daemon: info: remove exported getter + +commit 3544d48ca1e673b6e7f5990431fe39a1d3803152 +Merge: 5c0af43ebe e6806223e8 +Author: Vincent Demeester +Date: Fri Jan 1 21:02:41 2016 +0100 + + Merge pull request #19019 from duglin/constScratch + + Use constant instead of "scratch" + +commit b4d4a805eaaf56c071327a528d8837f18796e209 +Author: Anthon van der Neut +Date: Thu Dec 31 17:07:45 2015 +0100 + + fix typo + + Signed-off-by: Anthon van der Neut + +commit 77ef3a606a228a688bb6a4108af7b34aa3a2aa65 +Author: Antonio Murdaca +Date: Fri Jan 1 20:22:29 2016 +0100 + + daemon: info: remove exported getter + + Signed-off-by: Antonio Murdaca + +commit 5c0af43ebe043713aad1284d8d6d7928d271fa9a +Merge: e7c6206574 c12dbb8c82 +Author: Vincent Demeester +Date: Fri Jan 1 20:09:22 2016 +0100 + + Merge pull request #19006 from jen20/f-solaris-stat + + Fix downstream client API build errors on Solaris + +commit e7c62065742ab59ad546d905c6349892011da9b2 +Merge: e7e3e568d1 aa97eee1a3 +Author: Arnaud Porterie +Date: Fri Jan 1 10:50:54 2016 -0800 + + Merge pull request #19007 from aboch/npe + + Properly initialize IpamConf structure in initBridgeDriver + +commit d7dc439623ff18d2a8dd152dbb032a307100cb2e +Author: Wen Cheng Ma +Date: Thu Dec 3 15:16:53 2015 +0800 + + Improvement for docker subcommand's help messages + + Signed-off-by: Wen Cheng Ma + +commit d4e913e42cf7141421d76407ce2ca22935bb1a25 +Author: Mary Anthony +Date: Thu Dec 31 19:04:38 2015 -0800 + + Fixing TODO visible in docs + + Signed-off-by: Mary Anthony + +commit e7e3e568d12ea7b1759a311ed3ef722ed187bcec +Merge: d88e92d839 4a1eb3f3e2 +Author: Brian Goff +Date: Thu Dec 31 09:47:59 2015 -0500 + + Merge pull request #18836 from vdemeester/18829-info-authz-plugins + + Add authorization plugins to docker info + +commit e6806223e81c916c9b24580b19207271f1a36965 +Author: Doug Davis +Date: Thu Dec 31 05:57:58 2015 -0800 + + Use constant instead of "scratch" + + Move NoBaseImageSpecifier to a common spot and then use it instead of + "scratch" in a couple of places. + + Signed-off-by: Doug Davis + +commit d88e92d839c91156676d58d3818d7c72a3c692c3 +Merge: 102eb03c68 4b32d59595 +Author: Sebastiaan van Stijn +Date: Thu Dec 31 14:26:10 2015 +0100 + + Merge pull request #19015 from timwangdev/patch-1 + + 🎉 Happy New Year! 🎉 + +commit 4b32d59595f6cf59dafb10782d464a13d5ab5fbe +Author: Tim Wang +Date: Thu Dec 31 19:21:10 2015 +0800 + + Update LICENSE date + + Signed-off-by: Tim + +commit 94329a6e0657a6140b120c38941a0d992591a17e +Author: Jacob Blain Christen +Date: Wed Dec 30 19:25:39 2015 -0700 + + fix swarm provision issue #2715: invalid restart policy + + Signed-off-by: Jacob Blain Christen + +commit 327421d1df557e156b29d14359a2bfdc59cfb46f +Author: Jessica Frazelle +Date: Wed Dec 30 11:20:23 2015 -0800 + + add more seccomp profile tests + + Signed-off-by: Jessica Frazelle + +commit 83c705c00d9be3d5064a7a3fcc5de0645fce21b1 +Author: Kai Qiang Wu(Kennan) +Date: Thu Dec 24 03:09:59 2015 +0000 + + Fix the restore data example + Fixes: #18872 + + For backup, restore case, we usually restore in same directory, so + when we untar it, we not need go to /dbdata directory, wich could + result in /dbdata/dbdata, this fix make it untar directly. The directory + /dbdata would be same as old container /dbdata. + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 0e73b8a37ff5704f495886b6268e3ceabd8dbe82 +Merge: 00b983b837 d724bb1d24 +Author: Stephen Day +Date: Wed Dec 30 16:35:20 2015 -0800 + + Merge pull request #1097 from hopkings2008/master + + use the scheme and host from x-forward-proto and x-forward-host if the… + +commit 626c933730cffb6ca9112271dc4df5a1e462cac1 +Author: Jessica Frazelle +Date: Wed Dec 30 09:49:10 2015 -0800 + + cleanup jess/unshare image + + Signed-off-by: Jessica Frazelle + +commit aa97eee1a3cf5c932bdd31535b1e82ca53347ca5 +Author: Alessandro Boch +Date: Wed Dec 30 14:51:51 2015 -0800 + + Properly initialize IpamConf structure in initBridgeDriver + + Signed-off-by: Alessandro Boch + +commit c12dbb8c82457a58e209302bf9752aec64234404 +Author: James Nugent +Date: Wed Dec 30 18:18:30 2015 -0500 + + Fix downstream client API build errors on Solaris + + The client API at fsouza/go-dockerclient has dependencies on packages in + the docker/docker repository which currently do not build on Solaris. In + particular, stat_unsupported.go makes use of the Mtimespec field of the + syscall.Stat_t struct, which is not present on Solaris, and a number of + Unix-specific packages do not list Solaris in their compile targets. + + This commit adds enough support to be able to build + fsouza/go-dockerclient on SmartOS using Go 1.5.1 without affecting other + platforms. + + Signed-off-by: James Nugent + +commit 102eb03c680b2989efc1548ed1e28686a6aab4bd +Merge: 83a194e2dd d32f43013b +Author: David Calavera +Date: Wed Dec 30 15:07:04 2015 -0800 + + Merge pull request #18999 from tonistiigi/fix-comment-in-inspect + + Fix missing comment in docker inspect + +commit f15af1eff75f920c956e7c437d1ef81f5c31129a +Author: David Calavera +Date: Mon Dec 21 23:35:30 2015 -0500 + + Add network events. + + Signed-off-by: David Calavera + +commit 9d12d093009d3c4bf3bd4ebad3f8327c36d2d584 +Author: David Calavera +Date: Mon Dec 21 19:45:31 2015 -0500 + + Add volume events. + + Signed-off-by: David Calavera + +commit 72f1881df102fce9ad31e98045b91c204dd44513 +Author: David Calavera +Date: Mon Dec 21 17:55:23 2015 -0500 + + Add event types. + + - Stop serializing JSONMessage in favor of events.Message. + - Keep backwards compatibility with JSONMessage for container events. + + Signed-off-by: David Calavera + +commit 687ef0056204c487aa1a2aeb283e8bda37be74a1 +Author: Lei Jitang +Date: Mon Dec 7 08:33:16 2015 -0500 + + Add tests for docker events -f container. + + Signed-off-by: Lei Jitang + (cherry picked from commit 531ecf59f5bd92b12d4548617ca7bf179c8179a3) + +commit 83a194e2ddf4ce3ad9b2f7e770fd8abac87dc3bc +Merge: 2c3d1a9b12 9aad7d209f +Author: Jess Frazelle +Date: Wed Dec 30 14:37:28 2015 -0800 + + Merge pull request #19003 from calavera/fix_windows_build + + Move test out of the windows build. + +commit 9aad7d209f8919726b40034a40e619f1efa46716 +Author: David Calavera +Date: Wed Dec 30 16:36:48 2015 -0500 + + Move test out of the windows build. + + Because it can still run on windows server and fail because it doesn't + have `chown`. + + Signed-off-by: David Calavera + +commit 995866d76c749185c7f2eac31644b6c69ceddf68 +Author: Dong Chen +Date: Tue Dec 22 11:35:52 2015 -0800 + + Improve node management. + 1. Introduce pending state. Pending nodes need validation before moving to healthy state. Resolve issues of duplicate ID and dead node drop issues. + 2. Expose error and last update time in docker info. + 3. Use connect success/failure to drive state transition between healthy and unhealthy. + + Signed-off-by: Dong Chen + +commit 2c3d1a9b126d45647cfe8aa89008a93f83203a0c +Merge: 56f8b051eb c68a483e44 +Author: Sebastiaan van Stijn +Date: Wed Dec 30 21:01:48 2015 +0100 + + Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2 + + Fix docs for memory-swap + +commit ef006ca1a164f152930700b245676d816187f910 +Author: Sebastiaan van Stijn +Date: Wed Dec 30 15:00:00 2015 +0100 + + docs: mark manifest as "draft" + + Markdown linter produced an error on this page; + + running markdownlint + ERROR (registry/spec/manifest-v2-2.md) frontmatter: Unexpected non-whitespace char: # Image Manifest Version 2, Schema 2 + + Signed-off-by: Sebastiaan van Stijn + +commit d32f43013bf4c3aaa90c9ea409fbb9ade4105200 +Author: Tonis Tiigi +Date: Wed Dec 30 11:52:53 2015 -0800 + + Fix missing comment in docker inspect + + Fixes #18571 + + Signed-off-by: Tonis Tiigi + +commit 56f8b051ebc423b188c4a9eb8c151a338a4cb042 +Merge: 51fa287368 b638bc6f17 +Author: David Calavera +Date: Wed Dec 30 11:19:15 2015 -0800 + + Merge pull request #18158 from mauri/add_owner + + ADD files to a folder doesn't set correct UID and GID + +commit 51fa287368205e1f043d632e5930b7cce08a2419 +Merge: f962aac1ec 1b010516d0 +Author: David Calavera +Date: Wed Dec 30 10:00:41 2015 -0800 + + Merge pull request #18714 from jecarey/16756-docker_cli_pull_test + + Use of checkers in docker_cli_pull_test.go + +commit f962aac1ecd2d30f7ffafbfae7bcd4f14300b402 +Merge: 3b605b5926 1cb9b0745c +Author: David Calavera +Date: Wed Dec 30 09:55:02 2015 -0800 + + Merge pull request #18991 from qq690388648/master + + replace the os.Stdout with stdout to adapt platform + +commit 3b605b5926cff095452f2c2dca374bd132e23fac +Merge: 3be1a80f1a 2bd8322dba +Author: Sebastiaan van Stijn +Date: Wed Dec 30 17:49:08 2015 +0100 + + Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses + + fix incorrect ip addresses in networkingcontainers + +commit 3be1a80f1ab2c07322cf54e4bce42914b797c3b1 +Merge: 1dd4a2a966 dc38061bee +Author: Jess Frazelle +Date: Wed Dec 30 08:21:52 2015 -0800 + + Merge pull request #18987 from tianon/armhf + + Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets + +commit 778c213dfc9c65ac27d4f527018eb66d841d890e +Author: Daniel Nephin +Date: Mon Dec 28 16:57:55 2015 -0500 + + Fix signal handlers by moving shutdown logic out of handler. + + Signed-off-by: Daniel Nephin + +commit 1dd4a2a966cb51b0797a07166a84aea7282ce99d +Merge: 708f98f5f9 ac0180620d +Author: Arnaud Porterie +Date: Wed Dec 30 08:19:07 2015 -0800 + + Merge pull request #18994 from thaJeztah/add-new-impact-labels + + add new impact/distribution label + +commit 708f98f5f9e0a8e957c689a15ca380b8e52f6269 +Merge: 9860effc4e 518ed75e1a +Author: David Calavera +Date: Wed Dec 30 08:17:42 2015 -0800 + + Merge pull request #18952 from coolljt0725/fix_stats_update + + Fix docker stats show wrong memory limit when do docker update + +commit 9860effc4e4a303aa12bdc8b0738003ddac1b121 +Merge: c4486e48f2 72d3d1ef85 +Author: Sebastiaan van Stijn +Date: Wed Dec 30 16:52:41 2015 +0100 + + Merge pull request #18984 from coolljt0725/fix_daemon_start + + Fix daemon failed to start with error "layer does not exist" + +commit b638bc6f17f7cef6534b20dd44845e5b066ae2cc +Author: Mauricio Garavaglia +Date: Mon Nov 23 02:22:22 2015 -0300 + + Fix files ownership when ADD is used + + Signed-off-by: Mauricio Garavaglia + +commit c4486e48f2911ad6269c4746fb5a0ae4ea2c5e73 +Merge: 024eead82f 1b34008532 +Author: Vincent Demeester +Date: Wed Dec 30 15:25:20 2015 +0100 + + Merge pull request #18985 from hqhq/hq_handle_dockerCmdInDir + + Handle error for dockerCmdInDir + +commit ac0180620d906c39486963460415502f7abbd16f +Author: Sebastiaan van Stijn +Date: Wed Dec 30 13:53:46 2015 +0100 + + add new impact/distribution label + + Adds the new label to the documentation. The + impact/distribution label is intended for changes + that affect the image-format or interaction + with the registry (distribution). + + Signed-off-by: Sebastiaan van Stijn + +commit 024eead82f4739d028052b8138c3505d9e157a34 +Merge: 135180bc4c 849f64eeab +Author: Sebastiaan van Stijn +Date: Wed Dec 30 11:41:32 2015 +0100 + + Merge pull request #18925 from thaJeztah/please-dont-plus-one + + Be more explicit about "+1" comments + +commit 1cb9b0745c225433758397606a5ccd8404cb575e +Author: qq690388648 <690388648@qq.com> +Date: Wed Dec 30 18:24:02 2015 +0800 + + replace the os.Stdout with stdout to adapt platform + + Signed-off-by: Sun Gengze <690388648@qq.com> + +commit dc38061bee468ebfbfa3c89f0bb5b2edb5fd5147 +Author: Tianon Gravi +Date: Wed Dec 30 00:50:10 2015 -0800 + + Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets + + Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit. + + Signed-off-by: Andrew "Tianon" Page + +commit 626bd0df89e2e5986db75d4333b1bdd339b0df72 +Merge: 14ea20ffdb c63d303a2e +Author: David Gageot +Date: Wed Dec 30 08:34:49 2015 +0100 + + Merge pull request #2593 from fsoppelsa/1738-reusekeypairs + + Add --openstack-keypair-name and --openstack-private-key-file + +commit 1b34008532849467623039f78191e0f706fb34a5 +Author: Qiang Huang +Date: Wed Dec 30 15:21:34 2015 +0800 + + Handle error for dockerCmdInDir + + Only two of these are not handled, the one in `TestBuildForceRm` + is intended to not be handled, while the other one in + `TestBuildResourceConstraintsAreUsed` causes problem. + + In test case `TestBuildResourceConstraintsAreUsed`, somehow we + are not able to access network to get base image, but the error + message is: + + ``` + Error: failed to inspect container : Unable to read inspect data: json: cannot unmarshal array into Go value of type types.ContainerJSON + ``` + + Totally confusion. + + Signed-off-by: Qiang Huang + +commit 72d3d1ef856e2b3af78cccf463be5a9be823997b +Author: Lei Jitang +Date: Wed Dec 30 14:18:12 2015 +0800 + + Fix daemon failed to start with error "layer does not exist" + + Signed-off-by: Lei Jitang + +commit 135180bc4c6328cace293eb45ff901228a85092f +Merge: de84dfba75 8e034802b7 +Author: Brian Goff +Date: Tue Dec 29 22:22:11 2015 -0500 + + Merge pull request #18981 from calavera/stop_using_sockets_package + + Remove pkg sockets and tlsconfig. + +commit 00b983b837f48f00cc13d127eced5982fcbd1d19 +Merge: e63ad1e3d6 f19deba809 +Author: Stephen Day +Date: Tue Dec 29 19:06:45 2015 -0800 + + Merge pull request #1304 from BrianBland/fsDriverRelaxedPermissions + + Relaxes filesystem driver permissions to 0777 (dirs) and 0666 (files) + +commit e63ad1e3d6c244cd814d2eca75060eb1b0396f6d +Merge: 0404e5a622 4646282448 +Author: Stephen Day +Date: Tue Dec 29 18:59:47 2015 -0800 + + Merge pull request #1306 from stevvooe/from-bytes-algorithm + + digest: make FromBytes available on digest.Algorithm + +commit 0404e5a622f6d412e7c6d3a19b53c0cbadeead38 +Merge: 2259d9c09b 95bee1895a +Author: Stephen Day +Date: Tue Dec 29 18:47:02 2015 -0800 + + Merge pull request #1307 from stevvooe/panic-on-unavailable + + digest: panic on unavailable hash algorithm + +commit 2259d9c09be2d845d66af4113e37895bd517617d +Merge: 05d1abbcb4 5b550f919f +Author: Stephen Day +Date: Tue Dec 29 18:44:36 2015 -0800 + + Merge pull request #1302 from liusdu/arm64 + + update panicwrap package to fix building error on aarch64 platform + +commit 74d4af37a324f5f46f98a71f70888f57fbe389ef +Author: HuKeping +Date: Fri Dec 25 16:48:41 2015 +0800 + + Stop injecting to the helper function + + GetCryptoService is a helper function and we have injected a specific + http.ResponseWriter object for it to write back error message. Meanwhile + the caller for that function checks whether the cryptoService is nil + or not and return immediately if it is nil. + + I think it's not a good idea to write back HTTP response in the helper function, + it's the caller's work and thus there is no need to inject the specific + ResponseWriter object into it. + + Signed-off-by: Hu Keping + +commit 518ed75e1ab5b102fffd7fcbf046c127b44c7be7 +Author: Lei Jitang +Date: Tue Dec 29 20:33:16 2015 -0500 + + Fix docker stats show wrong memory limit when do docker update + + When a container create with -m 100m and then docker update other + cgroup settings such as --cpu-quota, the memory limit show by + docker stats will become the default value but not the 100m. + + Signed-off-by: Lei Jitang + +commit c68a483e442758733e800546545f1e016113d9cd +Author: Qiang Huang +Date: Wed Dec 30 09:23:35 2015 +0800 + + Fix docs for memory-swap + + Fixes: #18894 + + Signed-off-by: Qiang Huang + +commit 8e034802b7ad92a29f08785e553415adcd1348a3 +Author: David Calavera +Date: Tue Dec 29 19:27:12 2015 -0500 + + Remove usage of pkg sockets and tlsconfig. + + - Use the ones provided by docker/go-connections, they are a drop in replacement. + - Remove pkg/sockets from docker. + - Keep pkg/tlsconfig because libnetwork still needs it and there is a + circular dependency issue. + + Signed-off-by: David Calavera + +commit 7ff5042c1ede76602f189136376faad230816fa7 +Merge: c28278f7a2 e128a821db +Author: Kenny Leung +Date: Tue Dec 29 16:21:03 2015 -0800 + + Merge branch 'print-error-msg' of https://github.com/k4leung4/distribution into print-error-msg + + Changed to use typed error instead of formatted string. + Added tests for new public method. + + Signed-off-by: Kenny Leung + +commit 82d91007e5275629fdfe28ad3c6a5576dd6e6152 +Author: Jessica Frazelle +Date: Tue Dec 29 15:59:06 2015 -0800 + + update engine maintainers + + Signed-off-by: Jessica Frazelle + +commit 95bee1895a85e8eadd41a8fb69212b56fadcbf5b +Author: Stephen J Day +Date: Tue Dec 29 15:24:32 2015 -0800 + + digest: panic on unavailable hash algorithm + + After running into a few nil pointer errors during development, it is clear + that having this function return nil when a hash is not available is the wrong + approach. Nearly every time, this lack of availability was due to a missing + import statement for the hash. This is always a programming error. + + To avoid future confusion, we now appropriately panic when the hash function is + not imported by the application. More dynamic uses of the package should call + Algorithm.Available() before calling Algorithm.Hash() to avoid this panic. + + Signed-off-by: Stephen J Day + +commit 4646282448d60f138dd17f016e46e797c7f032d9 +Author: Stephen J Day +Date: Tue Dec 29 15:16:56 2015 -0800 + + digest: make FromBytes available on digest.Algorithm + + Signed-off-by: Stephen J Day + +commit de84dfba75a3055b8cad4eb8e6d9fd7bcecc30fc +Merge: 1614a86520 3ff20fafcc +Author: moxiegirl +Date: Tue Dec 29 14:54:18 2015 -0800 + + Merge pull request #18627 from londoncalling/cloud-installs + + [WIP] docs updates per issue 18282 cloud installs + +commit eb2e88ff4536e42e23790f352de8a162b6fdbfd5 +Merge: 01cfa62856 f0f434bbfc +Author: Victoria +Date: Tue Dec 29 14:45:46 2015 -0800 + + Merge pull request #50 from londoncalling/kitematic_contributors + + added example issue number to kitematic contributors guide instead of… + + Merging this, @moxiegirl I got all Ben's comments in, and re-ran make docs to check it. LGTM :+1: :-) + +commit 1614a8652034b4a52b8260187094a09296b7e879 +Merge: acffc79fe4 c44a8d8d8c +Author: Sebastiaan van Stijn +Date: Tue Dec 29 23:33:05 2015 +0100 + + Merge pull request #18978 from tswift242/fix-daemon-storage-doc-typo + + Fix typo in daemon storage-driver docs + +commit acffc79fe43e7ffe7d97d427b6a339c6b1dc072a +Merge: abc695d9d5 b3e1178ad0 +Author: David Calavera +Date: Tue Dec 29 14:12:22 2015 -0800 + + Merge pull request #18965 from duglin/FixError + + Fix error messages + +commit c44a8d8d8c9eccb79b16c874f083cd9597c3f6ca +Author: Thomas Swift +Date: Tue Dec 29 17:06:02 2015 -0500 + + Fix typo in daemon storage-driver docs + + Signed-off-by: Thomas Swift + +commit 05d1abbcb4273fe8d0ff8256809bf3d1d43df66b +Merge: e02a0b0399 cf487a7911 +Author: Brian Bland +Date: Tue Dec 29 13:28:45 2015 -0800 + + Merge pull request #1303 from BrianBland/fixDisabledStorageRedirects + + Serve blobs when a storage driver supports redirects but are disabled + +commit abc695d9d540610546e860ed5a9e432685b924b3 +Merge: 7b540ee653 b610fc226a +Author: Jess Frazelle +Date: Tue Dec 29 13:15:14 2015 -0800 + + Merge pull request #18974 from jfrazelle/remove-seccomp-from-seccomp-profile + + remove seccomp from seccomp profile + +commit 4a1eb3f3e275e2675a4c53852e21fddcaa301be9 +Author: Vincent Demeester +Date: Tue Dec 29 22:10:23 2015 +0100 + + Add authorization plugins to docker info + + Signed-off-by: Vincent Demeester + +commit f0f434bbfcbee81b2cb6fc83fd5cc0cfe9cbfbff +Author: Victoria Bialas +Date: Tue Dec 29 11:43:09 2015 -0800 + + updates per Ben's comments, corrected the git push statement to include create of new branch, and references to repo name now docker/kitematic + + Signed-off-by: Victoria Bialas + +commit 7b540ee65358bce76575aa1370019444a86c99c1 +Merge: a81e438544 91154e9235 +Author: Arnaud Porterie +Date: Tue Dec 29 12:19:02 2015 -0800 + + Merge pull request #18877 from dnephin/move_graph_driver_to_layer_store + + Move graph driver to layer store + +commit 2aff1821357a292bab0d393ae0c2b0fbcaadf431 +Merge: 15a91b1c73 5728b670ae +Author: Alexandre Beslic +Date: Tue Dec 29 11:59:42 2015 -0800 + + Merge pull request #1566 from lowstz/fix-doc-typo + + Fix leadership doc example typo + +commit a81e438544500a121298c82f340db490efda8a86 +Merge: 2307f47fdd 6c3ea7a511 +Author: Arnaud Porterie +Date: Tue Dec 29 11:57:35 2015 -0800 + + Merge pull request #18969 from justincormack/vm86 + + Block vm86 syscalls in default seccomp profile + +commit 2307f47fdd2b3079cb623a69b0fa0a0ef502c624 +Merge: e01cab1cc5 33568405f3 +Author: Arnaud Porterie +Date: Tue Dec 29 11:57:07 2015 -0800 + + Merge pull request #18972 from justincormack/bpf + + Block bpf syscall from default seccomp profile + +commit e01cab1cc5c7f92747a479b5480ca78f7fc37101 +Merge: 3858027e27 a0a8ca0ae0 +Author: Arnaud Porterie +Date: Tue Dec 29 11:56:51 2015 -0800 + + Merge pull request #18971 from justincormack/ptrace + + Block additional ptrace related syscalls in default seccomp profile + +commit 3858027e27bb57457b641634afc8ffb1f3630884 +Merge: 194e69507b 82051ab996 +Author: Arnaud Porterie +Date: Tue Dec 29 11:53:06 2015 -0800 + + Merge pull request #18933 from coolljt0725/always_build + + Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm + +commit c63d303a2e5aa3df889dfa69d952735fad2503ff +Author: Fabrizio Soppelsa +Date: Tue Dec 15 18:22:38 2015 -0800 + + Add --openstack-key-pair and --openstack-private-file-name so to + import and reuse existing nova keypairs. + + Signed-off-by: Fabrizio Soppelsa + +commit c28278f7a2adfc98553284b052f2848a3df495b9 +Author: Kenny Leung +Date: Tue Dec 8 14:24:03 2015 -0800 + + Print error for failed HTTP auth request. + + Signed-off-by: Kenny Leung + +commit 14ea20ffdba3b4eaf9d3a3a9bcb224754dbd7110 +Merge: 1b76a4467c eb33b7e9ed +Author: Nathan LeClaire +Date: Tue Dec 29 11:32:51 2015 -0800 + + Merge pull request #2701 from dgageot/completions + + Fix completion installation guide + +commit 1b76a4467cead0c534ea45c925b20ab0563f86ca +Merge: 7fff3d1407 8524a4e7d9 +Author: Nathan LeClaire +Date: Tue Dec 29 11:21:42 2015 -0800 + + Merge pull request #2711 from dgageot/ssh-batch-mode + + We must never ask for a password interactively + +commit b610fc226afdf663b0ad46ad982c27fdee61f671 +Author: Jessica Frazelle +Date: Tue Dec 29 11:21:33 2015 -0800 + + remove seccomp from seccomp profile + + This can be allowed because it should only restrict more per the seccomp docs, and multiple apps use it today. + + Signed-off-by: Jessica Frazelle + +commit 7fff3d14075a3b98a4972ad31140bf6dbb29c1b8 +Merge: 20b748e063 51a30db7a2 +Author: Nathan LeClaire +Date: Tue Dec 29 11:17:02 2015 -0800 + + Merge pull request #2704 from AkihiroSuda/mention-docker-18180 + + Print a warning for Boot2Docker v1.9.1 (AUFS issue) + +commit 5b550f919ff72fa7e3b0ad355d81154fc50af26c +Author: Liu Hua +Date: Sat Dec 26 18:31:50 2015 +0000 + + update panicwrap package to fix building error on aarch64 platform + + Linux on aarch64 lacks of dup2, uses dup3 instead + + Signed-off-by: Liu Hua + +commit 5728b670ae71ababc31b4b6487eb5a72f0bd02dd +Author: Aaron Chen +Date: Wed Dec 30 03:08:09 2015 +0800 + + Fix Fault Tolerance section code example without ttl + + Signed-off-by: Aaron Chen + +commit 194e69507be4144d8a9ac72da524dcf46c3bb0e8 +Merge: 94e0760868 35667c3826 +Author: Jess Frazelle +Date: Tue Dec 29 10:58:10 2015 -0800 + + Merge pull request #18949 from jfrazelle/fix-libseccomp-version + + fix libseccomp where version < 2.2.1 + +commit 94e076086820aa34e6fc4fadb18714cd8b9263df +Merge: afdc4747dc 94b45310f4 +Author: Arnaud Porterie +Date: Tue Dec 29 10:21:07 2015 -0800 + + Merge pull request #18947 from jfrazelle/fix-seccomp-unsupported + + fix default profile where unsupported + +commit 8524a4e7d97d0de5e3af90ebfa7886ab9320218b +Author: David Gageot +Date: Tue Dec 29 19:17:19 2015 +0100 + + We must never ask for a password interactively + + Signed-off-by: David Gageot + +commit afdc4747dc16d4302ffd4f5dcb0fc537108862b7 +Merge: a32b06b067 7b133e7235 +Author: Arnaud Porterie +Date: Tue Dec 29 10:19:41 2015 -0800 + + Merge pull request #18953 from justincormack/robust_list + + Allow use of robust list syscalls in default seccomp policy + +commit a32b06b067f847ee2cefe104430499c425c8fc2c +Merge: 3ec3597d58 9be0d93cf7 +Author: Arnaud Porterie +Date: Tue Dec 29 10:19:04 2015 -0800 + + Merge pull request #18956 from justincormack/umount + + Block original umount syscall in default seccomp filter + +commit a0a8ca0ae0bc9dc7faa0b8bacf4ca376c7257348 +Author: Justin Cormack +Date: Tue Dec 29 17:02:11 2015 +0000 + + Block additional ptrace related syscalls in default seccomp profile + + Block kcmp, procees_vm_readv, process_vm_writev. + All these require CAP_PTRACE, and are only used for ptrace related + actions, so are not useful as we block ptrace. + + Signed-off-by: Justin Cormack + +commit 3ec3597d58dd3c3d91465a03942e60c8e736a225 +Merge: ad8bce2ce4 85e355605a +Author: David Calavera +Date: Tue Dec 29 10:16:05 2015 -0800 + + Merge pull request #18950 from zhanghuanzhong/docker-fix-pull-image-log-info + + Print the registry name while pulling an image + +commit ad8bce2ce4e27f7484fc65a3e6b9bf111793a263 +Merge: 8ac3d083a8 0d5306a0b6 +Author: Arnaud Porterie +Date: Tue Dec 29 10:12:50 2015 -0800 + + Merge pull request #18959 from justincormack/finit_module + + Deny finit_module in default seccomp profile + +commit 8ac3d083a856729bc78adad3924e85d73d07173f +Merge: 294336a1af 0e5c43cdda +Author: Arnaud Porterie +Date: Tue Dec 29 10:08:45 2015 -0800 + + Merge pull request #18961 from justincormack/clock_adjtime + + Block clock_adjtime in default seccomp config + +commit 294336a1af9d00c1a803c3318e092b1c1d0c5be9 +Merge: 31bd242cba 6300a08be9 +Author: Arnaud Porterie +Date: Tue Dec 29 10:07:40 2015 -0800 + + Merge pull request #18968 from justincormack/stime + + Block stime in default seccomp profile + +commit 33568405f34f363de49b1146119cc53bcb9e5f16 +Author: Justin Cormack +Date: Tue Dec 29 17:28:30 2015 +0000 + + Block bpf syscall from default seccomp profile + + The bpf syscall can load code into the kernel which may + persist beyond container lifecycle. Requires CAP_SYS_ADMIN + already. + + Signed-off-by: Justin Cormack + +commit 31bd242cba2eea84b3690e7b0f00864dd780a1af +Merge: eb551baf6f 94fb7458ea +Author: Tianon Gravi +Date: Tue Dec 29 09:24:29 2015 -0800 + + Merge pull request #18728 from hypriot/update-dockerfile-for-arm + + update Dockerfile.arm to reflect latest changes in main Dockerfile + +commit 35667c3826d111babdeb35c7ab54609813fdb464 +Author: Jessica Frazelle +Date: Tue Dec 29 08:47:20 2015 -0800 + + add note to packagers.md about libseccomp version + + Signed-off-by: Jessica Frazelle + +commit 6c3ea7a511ca641cdf4fa4da1d775d5b6f4bef3e +Author: Justin Cormack +Date: Tue Dec 29 15:47:23 2015 +0000 + + Block vm86 syscalls in default seccomp profile + + These provide an in kernel virtual machine for x86 real mode on x86 + used by one very early DOS emulator. Not required for any normal use. + + Signed-off-by: Justin Cormack + +commit 6300a08be905969b16197f6a82a3d0d99a3f99cd +Author: Justin Cormack +Date: Tue Dec 29 15:22:52 2015 +0000 + + Block stime in default seccomp profile + + The stime syscall is a legacy syscall on some architectures + to set the clock, should be blocked as time is not namespaced. + + Signed-off-by: Justin Cormack + +commit b3e1178ad0e2cee43e9958f0f3b6e720bddc4ea4 +Author: Doug Davis +Date: Tue Dec 29 06:05:24 2015 -0800 + + Fix error messages + + `docker kill 123` will show something like: + `Error response from daemon: Cannot kill container 123: nosuchcontainer: No such container: 123` + Notice the `nosuchcontainer` text, that should not be there as that's an internal ID that means nothing to the end user. + This PR fixes this by using `util.GetErrorMessage()` to extract just the message. + + While in that dir I found a couple of other spots that could use the same call, just to be safe. + + Signed-off-by: Doug Davis + +commit e0dc4f27f66d4311238adf4d7027bb3c6b58ad26 +Author: Qiang Huang +Date: Tue Dec 29 22:03:39 2015 +0800 + + Remove redundant error messages + + For operations on multi containers, we printed error for each + failed container, then printed an extra message for container + names, it seems redundant. + + Addresses comments: + https://github.com/docker/docker/pull/15078#discussion_r47988449 + + Signed-off-by: Qiang Huang + +commit 0e5c43cddad304301ca8a82f652e15f75ee68cfe +Author: Justin Cormack +Date: Tue Dec 29 12:48:16 2015 +0000 + + Block clock_adjtime in default seccomp config + + clock_adjtime is the new posix style version of adjtime allowing + a specific clock to be specified. Time is not namespaced, so do + not allow. + + Signed-off-by: Justin Cormack + +commit 0d5306a0b69c912a981f3a4bd41b80beb1207851 +Author: Justin Cormack +Date: Tue Dec 29 12:31:33 2015 +0000 + + Deny finit_module in default seccomp profile + + This is a new version of init_module that takes a file descriptor + rather than a file name. + + Signed-off-by: Justin Cormack + +commit 9be0d93cf74d1bb31c401f1154abc773af31cbd6 +Author: Justin Cormack +Date: Tue Dec 29 11:57:16 2015 +0000 + + Block original umount syscall in default seccomp filter + + The original umount syscall without flags argument needs to + be blocked too. + + Signed-off-by: Justin Cormack + +commit 51a30db7a274fe375274c912deee64da014ad33d +Author: Akihiro Suda +Date: Mon Dec 28 18:02:23 2015 +0000 + + Print a warning for Boot2Docker v1.9.1, which is known to have an issue with AUFS (docker/docker#18180) + + Signed-off-by: Akihiro Suda + +commit 3cf44b5b241e53715137006f50262926c4282a21 +Author: Aaron Chen +Date: Tue Dec 29 19:08:07 2015 +0800 + + Fix leadership doc example typo + + Signed-off-by: Aaron Chen + +commit eb551baf6f239eb2a5f6838dac37530c022289b1 +Merge: 78ce43bad8 b4c14a0bb8 +Author: Vincent Demeester +Date: Tue Dec 29 12:00:37 2015 +0100 + + Merge pull request #18951 from jfrazelle/fix-code-comment + + fix code comment + +commit 7b133e7235593f8d46832045da339395e71e8148 +Author: Justin Cormack +Date: Tue Dec 29 10:22:05 2015 +0000 + + Allow use of robust list syscalls + + The set_robust_list syscall sets the list of futexes which are + cleaned up on thread exit, and are needed to avoid mutexes + being held forever on thread exit. + + See for example in Musl libc mutex handling: + http://git.musl-libc.org/cgit/musl/tree/src/thread/pthread_mutex_trylock.c#n22 + + Signed-off-by: Justin Cormack + +commit 82051ab996910993c655fe2551fc84df592c4b81 +Author: Lei Jitang +Date: Tue Dec 29 04:09:44 2015 -0500 + + Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm + + Signed-off-by: Lei Jitang + +commit b4c14a0bb846343c6d6d5dde6d9259c2c62a0b1e +Author: Jessica Frazelle +Date: Mon Dec 28 21:55:43 2015 -0800 + + fix code comment + + Signed-off-by: Jessica Frazelle + +commit 85e355605ac8f58452a712b160fdec51ff944aa2 +Author: Huanzhong Zhang +Date: Tue Dec 29 13:33:04 2015 +0800 + + print the registry name. + + Signed-off-by: Huanzhong Zhang + +commit ae54e39c80b8cc071143bfcb99bf80e3b0a0ec93 +Author: Jessica Frazelle +Date: Mon Dec 28 21:25:11 2015 -0800 + + fix libseccomp where version < 2.2.1 + + Signed-off-by: Jessica Frazelle + +commit 94b45310f400310af908a71f63ffcdaa504266de +Author: Jessica Frazelle +Date: Mon Dec 28 19:24:44 2015 -0800 + + fix default profile where unsupported + + Signed-off-by: Jessica Frazelle + +commit 0c11a970826e62479379ccc75a45184460b9200f +Merge: fc4fae6b8a f8ef61fe82 +Author: David Lawrence +Date: Mon Dec 28 20:14:57 2015 -0800 + + Merge pull request #392 from hqhq/update_panicwrap + + Update github.com/bugsnag/panicwrap + +commit 75abeeca1159d0ac6f074744c78023e86d320d78 +Author: weiyuan.yl +Date: Tue Dec 29 12:09:04 2015 +0800 + + Replace 404 to http.StatusNotFound + + Change-Id: Ia100975cb93c0a6d94ea5542b1c9ce386bc87649 + Signed-off-by: weiyuan.yl + +commit 9fbb1306e83576086e924ff4fbf35b9a74beb28a +Author: Wen Cheng Ma +Date: Mon Dec 28 16:29:39 2015 +0800 + + Update integration tests when container and image have same name + + Signed-off-by: Wen Cheng Ma + +commit 78ce43bad85fdf97d7c836315e46b531901c8ae7 +Merge: a3ca176e3c d34bbb66d5 +Author: David Calavera +Date: Mon Dec 28 16:46:30 2015 -0800 + + Merge pull request #18780 from jfrazelle/seccomp-default + + set default seccomp profile + +commit f19deba809c3d287617b2f040aedf210d6dcb8f4 +Author: Brian Bland +Date: Mon Dec 28 15:22:28 2015 -0800 + + Relaxes filesystem driver permissions to 0777 (dirs) and 0666 (files) + + Leaves any further permissions restrictions to the process umask + + Signed-off-by: Brian Bland + +commit a3ca176e3c23907225f2e34a3b4a565b6f7bf31a +Merge: 6cd167386b 153948ac46 +Author: Sebastiaan van Stijn +Date: Tue Dec 29 00:05:45 2015 +0100 + + Merge pull request #18945 from jbruni/patch-2 + + Fixed /etc/defaults/docker to /etc/default/docker + +commit 153948ac46851397c9c4fd8117647c608f4d216a +Author: J Bruni +Date: Mon Dec 28 20:57:36 2015 -0200 + + Fixed /etc/defaults/docker to /etc/default/docker + + /etc/default/docker is the correct file location in my system, and also according Docker's own documentation at https://github.com/docker/docker/blob/master/docs/articles/configuring.md#configuring-docker + + Signed-off-by: J Bruni + +commit 39af6b653b1ca95463c699ad62f69c86adc79e95 +Author: Michael Gilliland +Date: Mon Dec 28 16:35:05 2015 -0500 + + Update `volumes_from` docs to state default + + [Proof of read-write](https://github.com/docker/compose/blob/cfb1b37da22242dc67d5123772b3fa4518458504/compose/config/types.py#L26). + + I found myself wondering what the default was a couple of times, and finally decided to change it :) + + Signed-off-by: Michael Gilliland + +commit 6cd167386b0133600ea5bbcd0f93d464e6f89e0c +Merge: 8c6ad0991e 9e19b4839f +Author: Vincent Demeester +Date: Mon Dec 28 22:06:13 2015 +0100 + + Merge pull request #18835 from dnephin/move_validate_context_dir + + Move utils.ValidateContextDirectory to the one package that uses it + +commit 8c6ad0991e313805ea2c67275086f2c9130cceda +Merge: 8b68853ef5 5eef38d364 +Author: Sebastiaan van Stijn +Date: Mon Dec 28 21:58:43 2015 +0100 + + Merge pull request #18899 from cpswan/18898-fix-storage-driver-example + + Fix --storage-driver example + +commit 8b68853ef5015f5dea9fb5a06e6715d0876a1eef +Merge: 1d4306d2fa 7fa40ef513 +Author: Jess Frazelle +Date: Mon Dec 28 12:51:31 2015 -0800 + + Merge pull request #18937 from cbalducci/patch-1 + + [mkimage-alpine.sh] Additional repo and container cleanup + +commit 1d4306d2fa73506ed101cd085fea3174a3edda8b +Merge: b6a251a551 c0bde4e92c +Author: David Calavera +Date: Mon Dec 28 12:38:16 2015 -0800 + + Merge pull request #18905 from coolljt0725/fix_disconnect_not_save + + Fix network disconnect does not save the config to disk + +commit b6a251a551395dc727d458062fe49b9dc110529f +Merge: baee7ae045 5facd0e94b +Author: David Calavera +Date: Mon Dec 28 12:31:18 2015 -0800 + + Merge pull request #18942 from thaJeztah/move-vish-to-alumni + + Move Vishnu to alumni + +commit fc4fae6b8a9f5964b1cf926db61d1503d9aa0fb2 +Merge: 6028de0dd1 a7cc3926dd +Author: Diogo Mónica +Date: Mon Dec 28 12:02:53 2015 -0800 + + Merge pull request #391 from hqhq/dont_use_strings_compare + + Do not use strings.Compare + +commit baee7ae045019d33e6833043bbf86bd76e1b9d41 +Merge: 38440cadf3 af94f941df +Author: Arnaud Porterie +Date: Mon Dec 28 11:25:11 2015 -0800 + + Merge pull request #18715 from calavera/remove_is_paused_from_interface + + Remove `IsPaused` from backend interface. + +commit cf487a7911e983239e413e65a4d2fc470895bc4f +Author: Brian Bland +Date: Mon Dec 28 11:04:58 2015 -0800 + + Serve blobs when a storage driver supports redirects but are disabled + + Fixes issue where an error was returned instead of serving the blob + + Signed-off-by: Brian Bland + +commit 38440cadf3e27b32b3ee7b9011b1a0a87cbcca69 +Merge: 00362f8ea2 bb8e1dc8fa +Author: Jess Frazelle +Date: Mon Dec 28 10:51:18 2015 -0800 + + Merge pull request #18897 from runcom/fix-net-none-build + + integration-cli: fix --net=none build + +commit 9c9452213b65cdc682b3a51411dabbc6cdb8814a +Merge: 14bdaf25db bf901c2256 +Author: French Ben +Date: Mon Dec 28 13:46:42 2015 -0500 + + Merge pull request #1322 from docker/latest-electron + + Updated all electron calls for proper interactions - Tests pass :tada: + +commit d34bbb66d5d5f2f07b8f0c1b63df5f058f20b436 +Author: Jessica Frazelle +Date: Wed Dec 23 13:11:45 2015 -0800 + + bump docker-py + + Signed-off-by: Jessica Frazelle + +commit 15674c5fb74df00d7560fb35619a5372ea2ee74e +Author: Jessica Frazelle +Date: Mon Dec 21 19:32:12 2015 -0800 + + add docs and unconfined to run a container without the default seccomp profile + + Signed-off-by: Jessica Frazelle + +commit a48fe6238494547f392b06adf9d48944b4dd8ac3 +Author: Jessica Frazelle +Date: Mon Dec 21 14:42:58 2015 -0800 + + add default seccomp profile tests + + Signed-off-by: Jessica Frazelle + +commit 947293a28084cb5ee2e10e4d128c6e2b9d9da89d +Author: Jessica Frazelle +Date: Fri Dec 18 10:01:58 2015 -0800 + + set default seccomp profile + + Signed-off-by: Jessica Frazelle + +commit 00362f8ea28a1ae04be66372ccee55d80c4bb11c +Merge: ad56c972b4 f2ba1e4d80 +Author: Jess Frazelle +Date: Mon Dec 28 10:16:17 2015 -0800 + + Merge pull request #18923 from albers/completion-network-ls--filter + + bash completion for `docker network ls --filter` + +commit 91154e9235c71bc120b93d2e16632970e0f0ce0e +Author: Daniel Nephin +Date: Wed Dec 23 13:43:34 2015 -0500 + + Move graph driver registration out of the daemon package. + + Signed-off-by: Daniel Nephin + +commit f5916b10ae02c7db83052a97205ac345a3d96300 +Author: Daniel Nephin +Date: Wed Dec 16 15:32:16 2015 -0500 + + Remove the graph driver from the daemon, move it into the layer store. + + Support restoreCustomImage for windows with a new interface to extract + the graph driver from the LayerStore. + + Signed-off-by: Daniel Nephin + +commit ad56c972b4dc07fa23ebdaf6a35735764503c415 +Merge: 206046f0ba 6dba0b5d89 +Author: Vincent Demeester +Date: Mon Dec 28 18:47:05 2015 +0100 + + Merge pull request #18939 from dnephin/dont_use_parse_from_builder + + Remove the need for runconfig.Parse() in the builder + +commit 206046f0baed3476ed83211837202a1d7ce7ee69 +Merge: 8669ea01ba c8badcbd26 +Author: Jess Frazelle +Date: Mon Dec 28 09:09:33 2015 -0800 + + Merge pull request #18807 from FlorinAsavoaie/master + + New features in mkimage-yum.sh script + +commit 8669ea01ba93139a51783ac17658dedd47538b9c +Merge: 603d488a00 8799c4fc0f +Author: David Calavera +Date: Mon Dec 28 08:55:32 2015 -0800 + + Merge pull request #15078 from hqhq/hq_add_set_api_v2 + + Implement docker update command + +commit 9e19b4839fe32d2935306a630305e7b821544c14 +Author: Daniel Nephin +Date: Mon Dec 21 17:00:22 2015 -0500 + + Move ValidateContextDirectory to the one package that uses it. + + Signed-off-by: Daniel Nephin + +commit adc60712c87a6d61ee7378ed12e6f1528ac73f8a +Author: David Gageot +Date: Mon Dec 28 16:53:52 2015 +0100 + + Allow custom format for ls + + Signed-off-by: David Gageot + +commit 79c23fdbf4ab5aea2170c7bc6762e24c44eb84e0 +Author: Brian Goff +Date: Thu Dec 17 12:35:24 2015 -0500 + + Don't log EPIPE errors on client download abort + + Signed-off-by: Brian Goff + +commit 19762da67e40879be77b1b55c21a9754235fbb78 +Author: Brian Goff +Date: Tue Nov 24 15:25:12 2015 -0500 + + Daemon Restart: attempt to wait for container deps + + This provides a best effort on daemon restarts to restart containers + which have linked containers that are not up yet instead of failing. + + Signed-off-by: Brian Goff + +commit 5facd0e94be0bce668a4d335b1b6bb284934df94 +Author: Sebastiaan van Stijn +Date: Mon Dec 28 16:30:05 2015 +0100 + + Move Vishnu to alumni + + Signed-off-by: Sebastiaan van Stijn + +commit c64af2918edf486e69abad9d7cb58db426d5d9b2 +Author: David Gageot +Date: Mon Dec 28 16:18:30 2015 +0100 + + Default template for ls command + + Signed-off-by: David Gageot + +commit eb33b7e9ed039226f63db19e31660f8e2eb9f08e +Author: David Gageot +Date: Mon Dec 28 15:42:08 2015 +0100 + + Fix completion installation guide + + Signed-off-by: David Gageot + +commit 20b748e063c0fd610a612935fee5fe7d121f9354 +Merge: 48f047b046 3c52f32192 +Author: David Gageot +Date: Mon Dec 28 14:28:26 2015 +0100 + + Merge pull request #2699 from dgageot/bump-dev-0.6.0 + + Bump dev version to 0.6.0 + +commit 3c52f32192b6bb7f7496922b711d06cf0bc71925 +Author: David Gageot +Date: Mon Dec 28 14:14:28 2015 +0100 + + Bump dev version to 0.6.0 + + Signed-off-by: David Gageot + +commit 48f047b0465c5077895778aa689fc3ba8085593f +Merge: 98a490517a ccff70887f +Author: David Gageot +Date: Mon Dec 28 14:12:42 2015 +0100 + + Merge pull request #2698 from dgageot/releaase-0.5.5 + + Release 0.5.5 + +commit 7fa40ef513aedffefce9237a7db30340be0b6696 +Author: cristiano balducci +Date: Mon Dec 28 13:54:12 2015 +0100 + + Additional repo and container cleanup + + - Added support for adding custom repo (defaults to community) + - Added cleanup of the test container (--rm) + - Added --text to grep in apkv() to avoid "Binary file matches" output on Fedora + + Signed-off-by: Cristiano Balducci + +commit ccff70887f48420b1fa6765c524fa22f3c83fb31 +Author: David Gageot +Date: Mon Dec 28 13:56:07 2015 +0100 + + Update Changelog for 0.5.5 + + Signed-off-by: David Gageot + +commit 7a8c38a0e48845e6e3302e129797a20782916de9 +Author: David Gageot +Date: Mon Dec 28 14:03:31 2015 +0100 + + Update doc to version 0.5.5 + + Signed-off-by: David Gageot + +commit 02c4254cb4c93a4bbb5dc4ca0467abeb12d72546 +Author: David Gageot +Date: Mon Dec 28 13:44:26 2015 +0100 + + Bump version to 0.5.5 + + Signed-off-by: David Gageot + +commit 98a490517af9193ab1fa5c8c459cdb4cb28565a6 +Merge: 01cc4af89e c180a7962b +Author: David Gageot +Date: Mon Dec 28 13:41:53 2015 +0100 + + Merge pull request #2697 from dgageot/truncate-logs + + Fix truncated plugin binary logs + +commit c180a7962bf50f9b8387eaf73507289d9b3923bc +Author: David Gageot +Date: Mon Dec 28 13:11:28 2015 +0100 + + Fix race condition. cmdWait will do the closing + + Signed-off-by: David Gageot + +commit 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79 +Author: Qiang Huang +Date: Mon Dec 28 19:19:26 2015 +0800 + + Implemet docker update command + + It's used for updating properties of one or more containers, we only + support resource configs for now. It can be extended in the future. + + Signed-off-by: Qiang Huang + +commit 01cc4af89e782eacc6953d4f8104bf226bb04795 +Merge: 86f5af3cf6 c36a2711af +Author: David Gageot +Date: Mon Dec 28 12:17:41 2015 +0100 + + Merge pull request #2695 from dgageot/hyperv-vbox-incompatibility + + Detect VBox/HyperV incompatibility + +commit 86f5af3cf620a150f6a990a335c57aae6b3eb0e2 +Merge: 9e8c6b8ff0 6fe81d3dd4 +Author: David Gageot +Date: Mon Dec 28 12:17:22 2015 +0100 + + Merge pull request #2696 from dgageot/working-version-vbox + + Working version vbox + +commit b185bb3dbd4d5b06e5c254310ffd5486b7e39922 +Author: David Gageot +Date: Mon Dec 28 11:33:38 2015 +0100 + + Keep on heartbeating after failure + + Signed-off-by: David Gageot + +commit 501c4f34602971713a80230704f8af970923bfd3 +Author: David Gageot +Date: Mon Dec 28 11:32:31 2015 +0100 + + Read only if there is something to read + + Signed-off-by: David Gageot + +commit 232c0ea37e443098103233112631340ac7c4202b +Author: Nathan LeClaire +Date: Fri Dec 18 18:54:09 2015 -0800 + + Fix truncated plugin binary logs + + Signed-off-by: Nathan LeClaire + +commit 34f6e201657628a091bd4faa7a788ca1ee05be85 +Author: David Gageot +Date: Sat Dec 26 13:39:06 2015 +0100 + + Print an error when a driver cannot be closed + + Signed-off-by: David Gageot + +commit 0cd8312e72b439fb711b226d7f1922d41db064cc +Author: David Gageot +Date: Sat Dec 26 13:38:35 2015 +0100 + + Remove dead code + + Signed-off-by: David Gageot + +commit f56dab06765ff5c9fec217b993a789431103698a +Author: David Gageot +Date: Sat Dec 26 13:36:02 2015 +0100 + + Make test 10s faster + + Signed-off-by: David Gageot + +commit 6fe81d3dd4a128911039b0466c215d24414d2d29 +Author: David Gageot +Date: Mon Dec 28 11:22:07 2015 +0100 + + Point to working version of vbox + + Signed-off-by: David Gageot + +commit c36a2711af2dc8aa4f3a0540f0b5e1b6b035fd4e +Author: David Gageot +Date: Mon Dec 28 11:18:56 2015 +0100 + + Detect VBox/HyperV incompatibility + + Signed-off-by: David Gageot + +commit 9e8c6b8ff0a3cd1237f7547dfa4644cb74dbc012 +Merge: 3988b5fabf 3b0f2b06ff +Author: David Gageot +Date: Mon Dec 28 11:13:02 2015 +0100 + + Merge pull request #2694 from dgageot/improve-release + + Small improvements to the release script + +commit 3988b5fabf026e7d5c3cce1cb6824f39ba342a38 +Merge: 93bc3585a7 28ac085cdd +Author: David Gageot +Date: Mon Dec 28 10:41:54 2015 +0100 + + Merge pull request #2640 from pottava/2492-awsec2-blockdevicemapping-configurable + + Fix amazonec2 initiated shutdown caused by constant DeviceName + +commit 3b0f2b06ff086e5ce77cb7ce1f533d9a9424e0c8 +Author: David Gageot +Date: Mon Dec 28 10:39:41 2015 +0100 + + Small improvements to the release script + + Signed-off-by: David Gageot + +commit d724bb1d24576d89ecde2916d7e1e25f486f1f16 +Author: yuzou +Date: Thu Oct 15 16:56:28 2015 +0800 + + use the scheme and host from x-forward-proto and x-forward-host if they exits and correct the scheme for Location header during image upload + + Signed-off-by: yuzou + +commit 28ac085cdd81a510037de8366ded46f1f693590c +Author: ryo nakamaru +Date: Sat Dec 19 23:20:57 2015 +0900 + + Fixes aws-ec2 initiated shutdown caused by constant DeviceName (/dev/sda1) + + Signed-off-by: ryo nakamaru + +commit 93bc3585a7435499e82e4b67bd90ce90383a88b4 +Merge: c80906a543 45cf74508a +Author: David Gageot +Date: Mon Dec 28 09:16:29 2015 +0100 + + Merge pull request #2684 from jeanlaurent/AWS-SDK + + Migrate 'amazonec2' driver to AWS SDK + +commit 3e4b554f8d628f64ef0675096ecf927727640036 +Author: weiyuan.yl +Date: Mon Dec 28 11:28:01 2015 +0800 + + In HEAD request for missing resource, only 404 NOT FOUND is returned + + Change-Id: I73caf67b59519e6f4f82f7d78f5d4fd4ad9affcd + Signed-off-by: weiyuan.yl + +commit 6dba0b5d89bfa262757493679788b171f23b891c +Author: Daniel Nephin +Date: Sun Dec 27 19:58:51 2015 -0500 + + Remove the need for runconfig.Parse() in the builder. + + By using a container.Config directly. + + Signed-off-by: Daniel Nephin + +commit 849f64eeab5c026bad3e10bef06097c1bc684bf3 +Author: Sebastiaan van Stijn +Date: Mon Dec 28 00:26:05 2015 +0100 + + Be more explicit about "+1" comments + + Add some more information about not leaving random + "+1" comments. + + Also removed the requirements to send "uname -a", + because that information is now included in the output + of "docker version". + + Signed-off-by: Sebastiaan van Stijn + +commit f2ba1e4d80c6c811f2c0a6c905f5590d65e70812 +Author: Harald Albers +Date: Sun Dec 27 09:28:19 2015 -0800 + + bash completion for `docker network ls --filter` + + Signed-off-by: Harald Albers + +commit 603d488a00ea59ba7a7bd0e4cb0d6226e4b8cf03 +Merge: 087e4c1024 de7f6cf16b +Author: Arnaud Porterie +Date: Sat Dec 26 19:20:10 2015 -0800 + + Merge pull request #18907 from mountkin/rm + + ingnore the NotExist error when removing inexistent files + +commit 087e4c10241d70803bc0b7ae61fa2258879ddccf +Merge: d4270c1764 8134a562c6 +Author: Sebastiaan van Stijn +Date: Sun Dec 27 01:19:38 2015 +0100 + + Merge pull request #18782 from aditirajagopal/docker-no-like-x86 + + Specify that Docker requires x64 + +commit 8134a562c603679a02bc7841f10676ddba6e4001 +Author: Aditi Rajagopal +Date: Fri Dec 18 16:25:22 2015 -0500 + + Specify that Docker requires x64 + + Adds this requirement to docker/docker. Already replicated in docker/tutorials + + Resolves: #18401 + + Signed-off-by: Aditi Rajagopal + +commit f8ef61fe82df844b019939586d1b0520e3f7646e +Author: Qiang Huang +Date: Sat Dec 26 15:28:43 2015 +0000 + + Update github.com/bugsnag/panicwrap + + With this, we can build notary on ARM64. + + Signed-off-by: Qiang Huang + +commit a7cc3926dd5e1a09bb6b1a165f075d7dff28526c +Author: Qiang Huang +Date: Sat Dec 26 13:50:52 2015 +0000 + + Do not use strings.Compare + + According to https://golang.org/src/strings/compare.go?s=491:520#L3 + It's suggested to use the built-in string comparison operators. + + And also, seems like this function does not exist in some arch + such as arm64. So we better not use it. + + Signed-off-by: Qiang Huang + +commit d4270c1764bbebb2eaaafc86837970b62699865e +Merge: d1b7d58e73 f0904affd1 +Author: Sebastiaan van Stijn +Date: Sat Dec 26 11:42:55 2015 +0100 + + Merge pull request #18775 from mrjana/mh + + libnetwork vendoring + +commit adde8058292076a564c6fce36f8fc75c2ac52381 +Author: Tomas Tomecek +Date: Sat Dec 26 11:03:58 2015 +0100 + + allow running compose from git + + with: + + ``` + $ git clone docker/compose && cd compose + $ export PYTHONPATH="$PWD:$PYTHONPATH" + $ python -m compose --help + ``` + + Signed-off-by: Tomas Tomecek + +commit de7f6cf16be659cca9217ece6e5dc1221706d504 +Author: Shijiang Wei +Date: Fri Dec 25 15:04:34 2015 +0800 + + ingnore the NotExist error when removing inexistent files + + Signed-off-by: Shijiang Wei + +commit c0bde4e92c1da26e206bfbcb8308bd9a5f037659 +Author: Lei Jitang +Date: Fri Dec 25 02:09:37 2015 -0500 + + Fix network disconnect does not save the config to disk + + Signed-off-by: Lei Jitang + +commit d1b7d58e7353c6e2d707eaf613b4d7e45052b471 +Merge: d08ac6e256 3e298c5928 +Author: Jess Frazelle +Date: Thu Dec 24 11:06:25 2015 -0700 + + Merge pull request #18900 from icecrime/dirty_to_unsupported + + Rename `-dirty` to `-unsupported` + +commit 3e298c5928d0a2cbf5e1b374783ce59de2076637 +Author: Arnaud Porterie +Date: Thu Dec 24 09:11:49 2015 -0800 + + Rename `-dirty` to `-unsupported` + + Nightly and unofficial builds of Docker bear the suffix `-dirty` in the + version string. Change this suffix to `-unsupported` to make it explicit + that no support will be provided on such versions, and that it is for + example unnecessary to file an issue for it. + + Signed-off-by: Arnaud Porterie + +commit 5eef38d364c2d850bd98c70824a67178a44d94c0 +Author: Chris Swan +Date: Thu Dec 24 17:02:58 2015 +0000 + + Fix --storage-driver example (and --graph) + + Signed-off-by: Chris Swan + +commit b6be4acfcc1d8801dc4250acd3701a7d3325334f +Author: Chris Swan +Date: Thu Dec 24 16:43:37 2015 +0000 + + Fix --storage-driver example + + Signed-off-by: Chris Swan + +commit c80906a5437b500331d6b9c9dc4c31b7a2728e28 +Merge: 7f2e3c1d19 76923dd156 +Author: David Gageot +Date: Thu Dec 24 16:55:42 2015 +0100 + + Merge pull request #2685 from jeanlaurent/release-followup + + Release followup + +commit 76923dd156dea48b23c7f549ffbb9040892fa8b3 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 16:45:36 2015 +0100 + + Remove temporary lines + + ( they were useful until the relesase template land on master, which is + the case now ) + + Signed-off-by: Jean-Laurent de Morlhon + +commit cfe6702839d13f7587e260e73d7181115a8d3fb4 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 16:44:55 2015 +0100 + + Quieter UI + + Signed-off-by: Jean-Laurent de Morlhon + +commit 36cffd958c1a1cde891eb3673f791ebe745d7766 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 16:44:18 2015 +0100 + + typos + + Signed-off-by: Jean-Laurent de Morlhon + +commit bb8e1dc8fa7bda27592b140b433b5ffabdb44917 +Author: Antonio Murdaca +Date: Thu Dec 24 16:18:23 2015 +0100 + + integration-cli: fix --net=none build + + Signed-off-by: Antonio Murdaca + +commit 45cf74508a3f4886fe8dcc5ce0f1a8c1af551cad +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 16:11:31 2015 +0100 + + Better naming & cleanup + + Signed-off-by: Jean-Laurent de Morlhon + +commit b41ead67ecae8efd1cbebfc1d55c7604de3e798a +Author: Euan +Date: Wed Nov 25 01:41:24 2015 -0800 + + Remove unneeded 'amz' package + + Deprecated by the conversion to the upstream SDK + + Signed-off-by: Euan + +commit 062a8a4443d5dd16c6c6730b2d12ec4bf465ea9f +Author: Euan +Date: Wed Nov 25 01:40:06 2015 -0800 + + Vendor AWS SDK + + Signed-off-by: Euan + +commit 8d98d2b7b7129c33a947e6bf2adc6c5af7b79c70 +Author: Euan +Date: Wed Nov 25 00:42:39 2015 -0800 + + amazonec2: Convert EC2 API calls to official SDK + + This does an almost 1-to-1 translation of API calls. + + The differences are as follows: + 1. Use the SDK waiter for spot instance request fulfillment + 2. Uses the toplevel private/public ip fields instead of the + networkinterface's fields + 3. Recognizes the 'Terminated' state as an error explicitly instead of + implicitly. + 4. Uses filters on DescribeSecurityGroups to find the correct one more + efficiently and to limit to a given VPC. + + Other than that, it really should be identical apart from the perhaps + obvious error message differences. + + Signed-off-by: Euan + +commit 7f2e3c1d19ceabaa369ab149882985b2488143f4 +Merge: 93ebc78487 07a0dfdd58 +Author: David Gageot +Date: Thu Dec 24 15:24:50 2015 +0100 + + Merge pull request #2611 from jeanlaurent/automate-release + + Automate most of the release process + +commit 93ebc78487270460221c044eb64b4dad9b9c71f5 +Merge: b935949c5e 26c68b5c88 +Author: David Gageot +Date: Thu Dec 24 14:46:52 2015 +0100 + + Merge pull request #2682 from dgageot/controlPath-none + + Disable ControlPath on SSH connections + +commit 07a0dfdd583a674e07299d2038b50dfbe0d8f0c8 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 10:12:47 2015 +0100 + + Automate the release + + Signed-off-by: Jean-Laurent de Morlhon + +commit 26c68b5c881430c766097ed95b82718434e2d793 +Author: stelcheck +Date: Fri Dec 18 12:22:09 2015 +0900 + + Disable ControlPath on SSH connections + + Signed-off-by: Marc Trudel + + Signed-off-by: David Gageot + +commit b935949c5e3461d1821236c6b1197373af592bdf +Merge: 0ab066eadb 946712b1f7 +Author: David Gageot +Date: Thu Dec 24 14:25:03 2015 +0100 + + Merge pull request #2680 from dgageot/better-swarm-error + + Better error when swarm is not started + +commit 0ab066eadbeb55ba4274cf110afb2db96dbaf1b7 +Merge: 12bf80fb12 89d9e2fe90 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 14:14:20 2015 +0100 + + Merge pull request #2681 from dgageot/close-drivers + + Close drivers on exit + +commit 8c97a853d8c7ca5887345639f7f50481c529ca10 +Author: weiyuan.yl +Date: Thu Dec 24 21:02:35 2015 +0800 + + Update OSS client for more details in the error message + + Change-Id: Ie2aa70dfeb69930ee5eda17d7e744e3f95a8b926 + Signed-off-by: weiyuan.yl + +commit d08ac6e256933b50dc956abddac6d1fd5c750bf9 +Merge: 824a865e41 54f8ba7e9e +Author: Brian Goff +Date: Thu Dec 24 08:02:15 2015 -0500 + + Merge pull request #18834 from dmcgowan/layerstore-refactor-rw-layer + + Layerstore refactor rw layer + +commit 89d9e2fe903e16e0ee77c5707bf6f70bb3032667 +Author: David Gageot +Date: Thu Dec 24 13:20:40 2015 +0100 + + Close drivers on exit + + Signed-off-by: David Gageot + +commit 946712b1f702f0088b5593e0a812bf9a7c89e8da +Author: David Gageot +Date: Thu Dec 24 13:30:02 2015 +0100 + + Fix vet issues + + Signed-off-by: David Gageot + +commit 6462e7ecfac360c66a3ee3d15ba98cf11248f62d +Author: David Gageot +Date: Thu Dec 24 11:09:50 2015 +0100 + + FIX #2677 better error message if swarm is down + + Signed-off-by: David Gageot + +commit 824a865e41ab06023824753f8d55f812382797a7 +Merge: b0be88c111 2e02077e9f +Author: Vincent Demeester +Date: Thu Dec 24 11:29:24 2015 +0100 + + Merge pull request #18895 from hqhq/hq_remove_dup_oomkilldisable + + Remove duplicated OomKilldisable + +commit 12bf80fb125046eda58dd439b6124da24357a120 +Merge: 1c0a05529f f4bfba96f1 +Author: David Gageot +Date: Thu Dec 24 11:11:35 2015 +0100 + + Merge pull request #2679 from dgageot/fix-coreos-google + + Fix for coreos provisionning with google driver + +commit 1c0a05529f371a5cc3aa7167ac6af9e41ae0ae59 +Merge: efbec45e2d e7c0ebab5e +Author: Jean-Laurent de Morlhon +Date: Thu Dec 24 11:09:57 2015 +0100 + + Merge pull request #1522 from frapposelli/vspheredriver-with-govmomi + + Full rewrite of the vSphere driver + +commit cef64513cbc04369329994a4bd58a44ce7c60815 +Author: David Gageot +Date: Thu Dec 24 10:44:59 2015 +0100 + + Simplify code + + Signed-off-by: David Gageot + +commit efbec45e2deea63d8eeae56120dfe5c33fab7ae9 +Merge: fd44d1b1e4 75849b81d4 +Author: David Gageot +Date: Thu Dec 24 10:30:21 2015 +0100 + + Merge pull request #2674 from dustinblackman/coreos/swarm + + Add swarm configuration to CoreOS provisioner + +commit f4bfba96f11cdebb14b4c969c339f3cd4c163c90 +Author: David Gageot +Date: Thu Dec 24 10:11:34 2015 +0100 + + Fix for coreos provisionning with google driver + + Signed-off-by: David Gageot + +commit fd44d1b1e4a535de1c4f6d8c2954ff8c423b859e +Merge: 816614cdce 9d19ecfd27 +Author: David Gageot +Date: Thu Dec 24 09:57:53 2015 +0100 + + Merge pull request #2658 from dgageot/improve-hyper-v + + Improve hyper-v driver + +commit 816614cdce04445a954850c6b989ae7dc7fcb636 +Merge: f86274d6ed 24a13af61e +Author: David Gageot +Date: Thu Dec 24 09:57:07 2015 +0100 + + Merge pull request #2675 from dgageot/active-swarm + + FIX #2653 docker-machine ls need to identify machine or cluster + +commit f86274d6ed82739162dc89f23a60186aeb5631fe +Merge: eeec362ba4 949f3b05e1 +Author: David Gageot +Date: Thu Dec 24 09:17:25 2015 +0100 + + Merge pull request #2678 from juliengarcia/master + + Update docker-machine version in installation docs + +commit 2e02077e9f9608e1f5aa462be2bb88655763a113 +Author: Qiang Huang +Date: Thu Dec 24 15:28:56 2015 +0800 + + Remove duplicated OomKilldisable + + It's in Resources, but wrongly added back to HostConfig in + https://github.com/docker/docker/pull/18762 + + Signed-off-by: Qiang Huang + +commit 949f3b05e1dcc4819772a2fa9718c6cfa0189dda +Author: juliengarcia +Date: Thu Dec 24 08:13:12 2015 +0100 + + Update docker-machine version in installation docs + + From 0.5.3 to 0.5.4 + + Signed-off-by: Julien Garcia Gonzalez + +commit bf901c2256baba37fb5f53bb727699924cd240d8 +Author: French Ben +Date: Wed Dec 23 20:10:57 2015 -0500 + + Updated tests to pass + + Signed-off-by: French Ben + +commit 3ff20fafccdce09428171511982305a180dc9928 +Author: Victoria Bialas +Date: Sun Dec 13 22:37:15 2015 -0800 + + fixed links in Digital Ocean example + + Signed-off-by: Victoria Bialas + +commit b0be88c1116d4a3e12df42fb903456f608a19756 +Merge: 914fad8b7d 9fd2c0feb0 +Author: Antonio Murdaca +Date: Thu Dec 24 01:11:54 2015 +0100 + + Merge pull request #18878 from calavera/conditional_load_response + + Make `docker load` to output json when the response content type is json. + +commit 589a5226e7d4880ab7afa9e31202849db08a4bfa +Author: Aaron Lehmann +Date: Wed Dec 23 15:21:43 2015 -0800 + + Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry + + This is a followup to #18839. That PR relaxed the fallback logic so that + if a manifest doesn't exist on v2, or the user is unauthorized to access + it, we try again with the v1 protocol. A similar special case is needed + for "pull all tags" (docker pull -a). If the v2 registry doesn't + recognize the repository, or doesn't allow the user to access it, we + should fall back to v1 and try to pull all tags from the v1 registry. + Conversely, if the v2 registry does allow us to list the tags, there + should be no fallback, even if there are errors pulling those tags. + + Signed-off-by: Aaron Lehmann + +commit 914fad8b7d3426d9c637bfa07ccb47c141048163 +Merge: 725eef361a c28fc06e00 +Author: Arnaud Porterie +Date: Wed Dec 23 15:09:06 2015 -0800 + + Merge pull request #18810 from runcom/pkg-authz-fixes + + pkg: authorization: do not register the same plugin + +commit 53436e81b2d289bf91f3e4321a1ce168d0687ea1 +Author: French Ben +Date: Wed Dec 23 16:58:10 2015 -0500 + + Updated all electron calls for proper interactions + + Signed-off-by: French Ben + +commit 725eef361a5d4610db1849f5f95392ecf6e3a7f0 +Merge: 3499e3a230 63f9f2c05b +Author: David Calavera +Date: Wed Dec 23 13:44:17 2015 -0800 + + Merge pull request #18885 from samueldg/fix-btrfs-docs-typos + + Fix typo in btrfs userguide doc + +commit 3499e3a2305c9dcc937e55d37b3252bccfdecb92 +Merge: 9ae6d7d551 83237aab2b +Author: David Calavera +Date: Wed Dec 23 12:26:54 2015 -0800 + + Merge pull request #18862 from dnephin/move_ulimit_opts_to_runconfig + + Move ulimit opts to runconfig + +commit 9ae6d7d551bba84e7007cdc140eb0fc175ef404b +Merge: fc87c5a2f1 f015c29193 +Author: Vincent Demeester +Date: Wed Dec 23 21:19:44 2015 +0100 + + Merge pull request #18861 from dnephin/move_blkiodev_to_runconfig + + Move runconfig blkiodev options and parsing into runconfig/opts package + +commit 6028de0dd13e1263892515a96876909d46c3d463 +Merge: ffca6fb522 785b2527b1 +Author: Ying Li +Date: Wed Dec 23 12:15:03 2015 -0800 + + Merge pull request #387 from docker/backwards-compatibility + + Tests for backwards-compatibility reading/writing/exporting/importing old repo format + +commit 63f9f2c05bd4c62dbd366f1acb97f4a0b1b52f1d +Author: Samuel Dion-Girardeau +Date: Wed Dec 23 15:10:01 2015 -0500 + + Fix typo in btrfs userguide doc + + Signed-off-by: Samuel Dion-Girardeau + +commit c28fc06e002e06deed3437da76bc213b7bd752ba +Author: Antonio Murdaca +Date: Sun Dec 20 19:44:01 2015 +0100 + + pkg: authorization: do not register the same plugin + + This patches avoids registering (and calling) the same plugin more than + once. Using an helper map which indexes by name guarantees this and keeps + the order. + The behavior of overriding the same name in a flag is consistent with, + for instance, the `docker run -v /test -v /test` flag which register + the volume just once. + Adds integration tests. + + Without this patch: + ``` + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.080901676+01:00" level=debug msg="Calling + GET + /v1.22/info" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.081213202+01:00" level=debug msg="AuthZ + request using plugin docker-novolume-plugin" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.081268132+01:00" level=debug + msg="docker-novolume-plugin implements: authz" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.081699788+01:00" level=debug msg="AuthZ + request using plugin docker-novolume-plugin" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.081762507+01:00" level=debug + msg="docker-novolume-plugin implements: authz" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.082092480+01:00" level=debug msg="GET + /v1.22/info" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.628691038+01:00" level=debug msg="AuthZ + response using plugin docker-novolume-plugin" + Dec 20 19:34:52 localhost.localdomain docker[9988]: + time="2015-12-20T19:34:52.629880930+01:00" level=debug msg="AuthZ + response using plugin docker-novolume-plugin" + ``` + + With this patch: + ``` + Dec 20 19:37:32 localhost.localdomain docker[16620]: + time="2015-12-20T19:37:32.376523958+01:00" level=debug msg="Calling + GET + /v1.22/info" + Dec 20 19:37:32 localhost.localdomain docker[16620]: + time="2015-12-20T19:37:32.376715483+01:00" level=debug msg="AuthZ + request using plugin docker-novolume-plugin" + Dec 20 19:37:32 localhost.localdomain docker[16620]: + time="2015-12-20T19:37:32.376771230+01:00" level=debug + msg="docker-novolume-plugin implements: authz" + Dec 20 19:37:32 localhost.localdomain docker[16620]: + time="2015-12-20T19:37:32.377698897+01:00" level=debug msg="GET + /v1.22/info" + Dec 20 19:37:32 localhost.localdomain docker[16620]: + time="2015-12-20T19:37:32.951016441+01:00" level=debug msg="AuthZ + response using plugin docker-novolume-plugin" + ``` + + Also removes a somehow duplicate debug statement (leaving only the + second one as it's a loop of plugin's manifest): + ``` + Dec 20 19:52:30 localhost.localdomain docker[25767]: + time="2015-12-20T19:52:30.544090518+01:00" level=debug + msg="docker-novolume-plugin's manifest: &{[authz]}" + Dec 20 19:52:30 localhost.localdomain docker[25767]: + time="2015-12-20T19:52:30.544170677+01:00" level=debug + msg="docker-novolume-plugin implements: authz" + ``` + + Signed-off-by: Antonio Murdaca + +commit 785b2527b19d7461c0c675fe8d7db942ae406a2a +Author: Ying Li +Date: Tue Dec 22 21:26:49 2015 -0800 + + Test import/export of old repo format. + + Signed-off-by: Ying Li + +commit fc87c5a2f1120a70e04d787a340abfa204e3fb13 +Merge: 577cf61afa 602498d1b0 +Author: David Calavera +Date: Wed Dec 23 11:39:38 2015 -0800 + + Merge pull request #18876 from konstruktoid/tmpfs_apparmor + + add /bin/tar to apparmor profile + +commit ffca6fb522fc0dc9d582c848b20746e9cda9ca87 +Merge: e87d2aa196 0465365fb6 +Author: Diogo Mónica +Date: Wed Dec 23 11:36:25 2015 -0800 + + Merge pull request #388 from docker/cleanup + + Rebased cleanup/remove PEM headers + +commit e87d2aa1967ee4cd5319a0f92982ce94520daa6d +Merge: db9705dd97 9b0ae29427 +Author: Diogo Mónica +Date: Wed Dec 23 11:32:50 2015 -0800 + + Merge pull request #386 from docker/errors-fix + + fixes errors in notary for testing + +commit 54f8ba7e9e496ae58c15eddb084fbd51418ab197 +Author: Derek McGowan +Date: Mon Dec 21 16:13:02 2015 -0800 + + Revert create return parameter removal + + Cleanup does not happen if retErr is not set on return + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit d8e090669ed4d9b27206d7f8797c01ed4b2cd20f +Author: Derek McGowan +Date: Mon Dec 21 11:23:20 2015 -0800 + + Fix race condition between container register and mount + + When a container is created it is registered before the mount is created. This can lead to mount does not exist errors when inspecting between create and mount. + + Fixes #18753 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit d04fa49a0dec89d2f71a813ce8eaa182184139c5 +Author: Derek McGowan +Date: Wed Dec 16 14:13:50 2015 -0800 + + Refactor RWLayer to use referenced object instead of string + + RWLayer will now have more operations and be protected through a referenced type rather than always looked up by string in the layer store. + Separates creation of RWLayer (write capture layer) from mounting of the layer. + This allows mount labels to be applied after creation and allowing RWLayer objects to have the same lifespan as a container without performance regressions from requiring mount. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 83237aab2b9430a88790467867505cc9a5147f3e +Author: Daniel Nephin +Date: Mon Dec 21 15:10:53 2015 -0500 + + Remove package pkg/ulimit, use go-units instead. + + Signed-off-by: Daniel Nephin + +commit 5adbea7075b2fda6ea9947d131aaa2a5db0c1295 +Author: Daniel Nephin +Date: Mon Dec 21 15:06:46 2015 -0500 + + Move ulimit options to runconfig opts + + Signed-off-by: Daniel Nephin + +commit 3b8301b6600855e348bf4eeacabe5059f52e9d99 +Author: Daniel Nephin +Date: Mon Dec 21 15:18:24 2015 -0500 + + Upgrade go-units vendor to latest version with ulimits. + + Signed-off-by: Daniel Nephin + +commit 577cf61afad695f0ba226cdf8a995a8c78883e51 +Merge: 95b708cf19 b8659da214 +Author: David Calavera +Date: Wed Dec 23 10:02:25 2015 -0800 + + Merge pull request #18863 from dnephin/upgrade_connections_pkg + + Update go-connections vendor to pickup addition of parser functions + +commit 95b708cf19f24dcf0044f2f4e96db2579201cbeb +Merge: 0295b0a026 9d6acbee92 +Author: David Calavera +Date: Wed Dec 23 10:01:39 2015 -0800 + + Merge pull request #18839 from aaronlehmann/v1-fallback-404 + + When a manifest is not found, allow fallback to v1 + +commit 0465365fb6fb9d1f5f995e0f19f772f5334fbe09 +Author: Ying Li +Date: Wed Dec 23 09:44:48 2015 -0800 + + Return an error if unable to encrypt a key as a valid PEM file + + Also address review comments and fix semantic conflict after rebase. + + Signed-off-by: Ying Li + +commit fa788cb2a92ab3f6b74d8402ad0ca8bf8b324ce6 +Author: David Lawrence +Date: Tue Dec 22 14:49:43 2015 -0800 + + make x509 certs viable as delegated public key object + Signed-off-by: David Lawrence (github: endophage) + +commit 2bf5d4b09a730997f1c3f35218ecc8260ab7cf03 +Author: David Lawrence +Date: Tue Dec 22 14:22:42 2015 -0800 + + test for legacy keys and some bugfixes for same + Signed-off-by: David Lawrence (github: endophage) + +commit e516dd88f2515b592d809ec5e0ba3bedc8bc0480 +Author: David Lawrence +Date: Tue Dec 22 13:58:29 2015 -0800 + + cleaning up tests by converting t.Fatal to assert.___ + Signed-off-by: David Lawrence (github: endophage) + +commit f2ec72b5b6e615f59cead320a91f0cba17b52c8b +Author: David Lawrence +Date: Tue Dec 22 03:00:26 2015 -0800 + + aliases removed from file names + Signed-off-by: David Lawrence (github: endophage) + +commit 6d5b8ff54a07c70eb16e5760f8f7373644af6f0c +Author: David Lawrence +Date: Mon Dec 21 23:00:06 2015 -0800 + + add role into PEM headers + Signed-off-by: David Lawrence (github: endophage) + +commit 1f329868e8f3f77c514607f8004e20462d30c63b +Author: David Lawrence +Date: Mon Dec 21 18:10:53 2015 -0800 + + making filestores consistent so you can Get, Remove, etc... the paths returned by ListFiles + Signed-off-by: David Lawrence (github: endophage) + +commit 8f7fddd5d5b987ba9404159897cb4586bce5b42c +Author: David Lawrence +Date: Mon Dec 21 16:10:48 2015 -0800 + + breaking up low level storage into logical files + Signed-off-by: David Lawrence (github: endophage) + +commit 0295b0a02655d496b30e46781ea24f304022fe4e +Merge: 8022d1159d fae00ad445 +Author: David Calavera +Date: Wed Dec 23 09:15:59 2015 -0800 + + Merge pull request #18875 from thaJeztah/move-erikh-to-alumni + + Move Erik to alumni + +commit 9d19ecfd277514f86ffe1082458cf1047faf421b +Author: David Gageot +Date: Wed Dec 23 16:34:51 2015 +0100 + + Add ENV variables for each flag + + Signed-off-by: David Gageot + +commit 602498d1b093e4d066e8434aa1cbc041999d44ea +Author: Thomas Sjögren +Date: Wed Dec 23 18:11:16 2015 +0100 + + add /bin/tar to apparmor profile + + Signed-off-by: Thomas Sjögren + +commit 24a13af61e659df7d461bfe6ff88a691fe4daded +Author: David Gageot +Date: Wed Dec 23 18:09:24 2015 +0100 + + FIX #2653 docker-machine ls need to identify machine or cluster + + Signed-off-by: David Gageot + +commit fae00ad445cd6071e86d3372a6056d98dcdb9f6c +Author: Sebastiaan van Stijn +Date: Wed Dec 23 17:56:49 2015 +0100 + + Move Erik to alumni + + Signed-off-by: Sebastiaan van Stijn + +commit 75849b81d4addc2d3b732e568f18b720bae8db57 +Author: Dustin Blackman +Date: Wed Dec 23 11:40:39 2015 -0500 + + add swarm config to coreos + + Signed-off-by: Dustin Blackman + +commit 22cf29b2ee45054a589fa5f7ce788b8f4acb4a50 +Author: David Gageot +Date: Wed Dec 23 11:56:40 2015 +0100 + + FIX #639 and #510 find powershell.exe + + Signed-off-by: David Gageot + +commit fa8fa69e7cb43a3185a558681ed4098097d7de6e +Author: David Gageot +Date: Wed Dec 23 10:06:59 2015 +0100 + + Wait for machine to start/stop + + Signed-off-by: David Gageot + +commit 8b31854a8011715703295ee42f13a048ca0f7d06 +Author: David Gageot +Date: Wed Dec 23 11:43:27 2015 +0100 + + Extract the code to create a b2d disk image + + Signed-off-by: David Gageot + +commit 0c783976e0fa665c5dea2592e26d3f9d9e3d457c +Author: David Gageot +Date: Tue Dec 22 17:55:32 2015 +0100 + + Only get the IP of a running machine + + Signed-off-by: David Gageot + +commit af87c000d2b40fdbc02d96b16cd905c90852138f +Author: David Gageot +Date: Tue Dec 22 16:44:23 2015 +0100 + + Simplify commands + + Signed-off-by: David Gageot + +commit a4995adbc70913dc9fece55428bc73e19da1d77d +Author: David Gageot +Date: Wed Dec 23 09:30:45 2015 +0100 + + Add comments + + Signed-off-by: David Gageot + +commit 7e7c83427af389a3f10cbac82179dfe2b830afac +Author: David Gageot +Date: Wed Dec 23 09:25:41 2015 +0100 + + VSwitch name should be saved to config.json + + Signed-off-by: David Gageot + +commit 40ab483a351ec5d5b81845d60d43ec6b2cfa0140 +Author: David Gageot +Date: Tue Dec 22 14:23:32 2015 +0100 + + FIX #2457 Add a flag to set the CPU count + + Signed-off-by: David Gageot + +commit 8022d1159d472f0a54957d4e8cc2f39a0856f088 +Merge: 4432a89821 e6115a6c1c +Author: Sebastiaan van Stijn +Date: Wed Dec 23 16:34:44 2015 +0100 + + Merge pull request #18874 from duglin/falseDocs + + remove =false from options that default to false in the docs + +commit eeec362ba4cd788e7afada8e381a454bf5854493 +Merge: 5bb3d901b9 8e2ccd996c +Author: Jean-Laurent de Morlhon +Date: Wed Dec 23 16:25:45 2015 +0100 + + Merge pull request #2673 from dgageot/no-32bits-osx-linux + + FIX #2271 don't build 32bits binaries for linux/osx + +commit 5bb3d901b97d196a9a1e22068a380f7ae1de8774 +Merge: 1db7f13763 12a361c3bc +Author: Jean-Laurent de Morlhon +Date: Wed Dec 23 16:19:58 2015 +0100 + + Merge pull request #2672 from dgageot/golang-1.5.2 + + FIX #2670 Upgrade to go 1.5.2 + +commit 14bdaf25db534c21bdf6f6690b3f812fded90564 +Merge: a8b5b4f2de 7a3f4780c9 +Author: French Ben +Date: Wed Dec 23 10:15:47 2015 -0500 + + Merge pull request #1319 from docker/fix-api + + Updated API calls for 1.22 and electron IPC update + +commit e6115a6c1c02768898b0a47e550e6c67b433c436 +Author: Doug Davis +Date: Wed Dec 23 06:37:06 2015 -0800 + + remove =false from options that default to false in the docs + + This re-aligns the docs with what the cmd line now does. + + Signed-off-by: Doug Davis + +commit 8e2ccd996c482c5be1e62bb2d0aad12321f89a85 +Author: David Gageot +Date: Wed Dec 23 16:07:30 2015 +0100 + + FIX #2271 don't build 32bits binaries for linux/osx + + Signed-off-by: David Gageot + +commit 12a361c3bc537c1d464d0d65b064204c27bf50e6 +Author: David Gageot +Date: Wed Dec 23 15:49:33 2015 +0100 + + FIX #2670 Upgrade to go 1.5.2 + + Signed-off-by: David Gageot + +commit 1db7f13763706641f4670714b86fe566d3d9ebd5 +Merge: 9f6764ccd3 670c4808ed +Author: Jean-Laurent de Morlhon +Date: Wed Dec 23 14:50:08 2015 +0100 + + Merge pull request #2669 from dgageot/faster-ls + + FIX #2663 reduce calls to the driver in ls + +commit 4432a8982188f5f3ccad753860b12bf0e516c4e9 +Merge: 1105caa7f1 26dd026bd7 +Author: Sebastiaan van Stijn +Date: Wed Dec 23 13:59:17 2015 +0100 + + Merge pull request #17782 from WeiZhang555/network-ls-nopre + + Add filter for `network ls` to hide predefined network + +commit 670c4808ed8abdc80d4a71444b10df5360bed62b +Author: David Gageot +Date: Wed Dec 23 12:20:20 2015 +0100 + + FIX #2663 reduce calls to the driver in ls + + Signed-off-by: David Gageot + +commit 6a5cc751bb07e382383cf5eecb7127cd7eead864 +Author: David Gageot +Date: Tue Dec 22 14:03:05 2015 +0100 + + FIX #2232 Check that the user is an Administrator + + Signed-off-by: David Gageot + +commit d5e11fb961d1992aca4f751f4f6269f890ad3918 +Author: David Gageot +Date: Tue Dec 22 13:37:07 2015 +0100 + + FIX #512 Check the virtual switch in PreCreateCheck() + + Signed-off-by: David Gageot + +commit aa3a4e449851b68b2491de44e908ae74b39e31cc +Author: David Gageot +Date: Tue Dec 22 13:39:31 2015 +0100 + + Simplify code + + Signed-off-by: David Gageot + +commit 2311fd69c9e3de5c5ad369b21569acd788e9c00b +Author: David Gageot +Date: Tue Dec 22 13:35:57 2015 +0100 + + Format code + + Signed-off-by: David Gageot + +commit 19fc64d5839e09cc93b6abd7eed39815f6d2d00f +Author: David Gageot +Date: Tue Dec 22 13:32:04 2015 +0100 + + Remove redundant code + + Signed-off-by: David Gageot + +commit 9f6764ccd37da4c218f66af070897426efbd0c84 +Merge: 1976613fa8 1cd6a37343 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 23 09:34:41 2015 +0100 + + Merge pull request #2666 from cvstebut/master + + close handle on destination after copying boot2docker.iso into vm folder + +commit 26dd026bd70c9c18a16b0e339821c309e56d8ff0 +Author: Zhang Wei +Date: Tue Nov 10 16:57:06 2015 +0800 + + Add filter for `network ls` to hide predefined net + + Add filter support for `network ls` to hide predefined network, + then user can use "docker network rm `docker network ls -f type=custom`" + to delete a bundle of userdefined networks. + + Signed-off-by: Zhang Wei + +commit 1326f0cba5f933674e23769de1385d3b0841e758 +Author: Zhang Wei +Date: Thu Dec 17 11:20:30 2015 +0800 + + Break big lock into some tiny locks + + Don't involve code waiting for blocking channel in locked critical + section because it has potential risk of hanging forever. + + Signed-off-by: Zhang Wei + +commit 9573252ace3f7284d9370b7fafd6df16c3240d06 +Author: Ying Li +Date: Tue Dec 22 18:01:36 2015 -0800 + + Add backwards-compatbility test for client reading-writing 0.1-style repos. + + Signed-off-by: Ying Li + +commit 0c54c6caef214ff2e2dbdc235a6d388c221a20a9 +Author: Ying Li +Date: Tue Dec 22 18:00:57 2015 -0800 + + Add an example of a 0.1 style repository for backwards compatibility tests + + Signed-off-by: Ying Li + +commit 9b0ae294270225f268fd79748a5a59e6475f402d +Author: Riyaz Faizullabhoy +Date: Tue Dec 22 14:18:49 2015 -0800 + + ErrRepoNotInitialized test + + Signed-off-by: Riyaz Faizullabhoy + +commit 98b7dd7dafa77d305d597a666a96372cf2614a83 +Author: Riyaz Faizullabhoy +Date: Tue Dec 22 08:55:02 2015 -0800 + + fixes to notary for docker integration + + Signed-off-by: Riyaz Faizullabhoy + +commit db9705dd97509e71adb1c74d466ccf5272b9990a +Merge: d1fa795f20 2900423fa2 +Author: Ying Li +Date: Tue Dec 22 16:50:17 2015 -0800 + + Merge pull request #384 from docker/more-client-negative-tests + + More client writing/publishing negative tests + +commit 1cd6a37343d2bc23dcef8a409aaf347a562b974d +Author: Christian von Stebut +Date: Wed Dec 23 00:48:18 2015 +0100 + + close handle on destination after copying boot2docker.iso into vm folder - will otherwise keep hyper-v from starting vm + + Signed-off-by: Christian von Stebut + +commit d1fa795f201bfa5f3f20d51c60bed705bd0dbc86 +Merge: 8128026459 203adfc13c +Author: Ying Li +Date: Tue Dec 22 16:30:41 2015 -0800 + + Merge pull request #382 from cyli/passphrase-tests + + Add basic tests for passphrase retriever to make sure it handles delegations + +commit 2900423fa26d6622b3439cfb3a00fd161fdc5e63 +Author: Ying Li +Date: Tue Dec 22 14:12:28 2015 -0800 + + Minor error message changes + + Signed-off-by: Ying Li + +commit 9ca22007756f6e6b6e356c1106deb11624db38cd +Author: Ying Li +Date: Tue Dec 22 14:11:41 2015 -0800 + + Update filestore to first remove existing metadata before setting metadata. + + This would let it remove corrupt or bad-state metadata. + + Signed-off-by: Ying Li + +commit 332621607ee085fe9c17dd5e218657680ce5d9b5 +Author: Ying Li +Date: Tue Dec 22 11:19:01 2015 -0800 + + Add more comments and assertions as per review. + + Signed-off-by: Ying Li + +commit 6423c16233ece5e308853c8ef5d7d6a00bed7ef4 +Author: Ying Li +Date: Tue Dec 22 10:13:12 2015 -0800 + + Test pushing an uninitialized repo as well. + + Signed-off-by: Ying Li + +commit ebac6b158a757cb4b4f5cbba6105b7ae359d3af6 +Author: Ying Li +Date: Mon Dec 21 23:04:32 2015 -0800 + + Refactor tests to cover corrupt root/targets/delegations. + + Signed-off-by: Ying Li + +commit ab97f9e12e589d7b6ceb0ad91ab4ce51304d3869 +Author: Ying Li +Date: Mon Dec 21 22:29:46 2015 -0800 + + Refactor some of the code to reduce creating temp notary repo directory boilerplate. + + Signed-off-by: Ying Li + +commit d6234e5ef0f3f1713b1f6d1eb53d07ef6a6fe134 +Author: Ying Li +Date: Mon Dec 21 17:59:05 2015 -0800 + + Add some simple failure cases where data is corrupt or we can't get server keys. + + Signed-off-by: Ying Li + +commit c1eb344b899dddcf67259833442a6a631f77ff90 +Author: Ying Li +Date: Mon Dec 21 14:08:55 2015 -0800 + + Rotation tests now test reading from other (non-publishing) clients. + + Signed-off-by: Ying Li + +commit b8659da2147293b6ecb49e05927ddbc6ef6b8cc4 +Author: Daniel Nephin +Date: Tue Dec 22 19:02:47 2015 -0500 + + Remove unused parser functions that were replaced by go-connections/nat. + + Signed-off-by: Daniel Nephin + +commit 8128026459ad9b3cf894eee80222ee863481bc1d +Merge: 340a337c31 f794193382 +Author: Ying Li +Date: Tue Dec 22 16:01:55 2015 -0800 + + Merge pull request #385 from docker/client-delegation-write-tests + + Add more delegation writing/publishing tests. + +commit 9fd2c0feb0c131d01d727d50baa7183b976c7bdc +Author: David Calavera +Date: Tue Dec 22 19:00:27 2015 -0500 + + Make `docker load` to output json when the response content type is json. + + Signed-off-by: David Calavera + +commit fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c +Author: Daniel Nephin +Date: Tue Dec 22 18:59:47 2015 -0500 + + Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions. + + Signed-off-by: Daniel Nephin + +commit f794193382ffe5312413f1f6237c7e9f7966c184 +Author: Ying Li +Date: Tue Dec 22 14:20:40 2015 -0800 + + Address review comments (renaming, extra code left in, etc.) + + Signed-off-by: Ying Li + +commit 15a91b1c73a3a184680b579dc4a643697beeab04 +Merge: de0e67f571 c11d4fe82c +Author: Victor Vieux +Date: Tue Dec 22 15:21:39 2015 -0800 + + Merge pull request #1564 from vieux/fix_stable_tests + + fix stable tests + +commit f015c29193c1afefff907ed65cbfb876e36263fa +Author: Daniel Nephin +Date: Mon Dec 21 16:34:05 2015 -0500 + + Move runconfig blkiodev options and parsing into runconfig/opts package. + + Signed-off-by: Daniel Nephin + +commit 7a3f4780c90b0b9df64ea3fce13c4cddcefe910b +Author: French Ben +Date: Tue Dec 22 16:55:47 2015 -0500 + + Updated API calls for 1.9.1 and electron IPC update + + Signed-off-by: French Ben + + Signed-off-by: French Ben + +commit 1105caa7f10ae1fa775670256fa7d4ca9d44e4dd +Merge: eacedcbe21 0673361ef6 +Author: Sebastiaan van Stijn +Date: Wed Dec 23 00:08:36 2015 +0100 + + Merge pull request #18860 from dnephin/remove_migrate_if_downlevel + + Remove migrateIfDownlevel and aufs migration from docker pre-0.7 + +commit eacedcbe21e15f396ea1d9f620047718cce03df7 +Merge: 45033c0bde af51df20bd +Author: David Calavera +Date: Tue Dec 22 15:04:32 2015 -0800 + + Merge pull request #18831 from calavera/test_event_observer + + Extract event processing to a common function for testing. + +commit 45033c0bdee09d63c6f92de6d71028a5b0a152d2 +Merge: 319d488e6e a5d8e41e82 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 23:42:34 2015 +0100 + + Merge pull request #18757 from thaJeztah/patch-release-process + + Document process for patch-releases + +commit 319d488e6e66112ddf0f14072591fe0bf4461ec3 +Merge: 030347c3c9 ff3687c965 +Author: Arnaud Porterie +Date: Tue Dec 22 14:38:54 2015 -0800 + + Merge pull request #18858 from thaJeztah/adieu-vieux + + Move Victor to alumni + +commit 030347c3c9505fa80eed0ecfde5d1e9af05c3cbc +Merge: 9f228b37fc 7ac4232e70 +Author: Alexander Morozov +Date: Tue Dec 22 14:22:08 2015 -0800 + + Merge pull request #18762 from calavera/runconfig_to_types + + Move container configuration types to api/types/container. + +commit 203adfc13c60e7dbf43a8b3bbffebb0d50169538 +Author: Ying Li +Date: Fri Dec 18 18:13:27 2015 -0800 + + Add basic tests for passphrase retriever to make sure it handles delegations. + + Signed-off-by: Ying Li + +commit af51df20bdd9962b1aaa79819cafefc715290d28 +Author: David Calavera +Date: Mon Dec 21 15:34:08 2015 -0500 + + Extract event processing to a common function for testing. + + We keep only one logic to test event related behavior that will help us + diagnose flacky event errors. + + Signed-off-by: David Calavera + +commit 0673361ef6a0439b79239efb000574ae991b84f7 +Author: Daniel Nephin +Date: Tue Dec 22 16:34:16 2015 -0500 + + Remove migrateIfDownlevel and aufs migration from docker pre-0.7 + + Signed-off-by: Daniel Nephin + +commit 9f228b37fc1108bee544973841513ffd0d06035c +Merge: 0bbed98bc0 f38257308b +Author: Alexander Morozov +Date: Tue Dec 22 13:34:56 2015 -0800 + + Merge pull request #18857 from calavera/catch_pipeline_error + + Catch command pipeline error. + +commit f0904affd127ea8bdebfc3f3c586f8eb38e91da5 +Author: Jana Radhakrishnan +Date: Fri Dec 18 11:03:57 2015 -0800 + + libnetwork vendoring + + Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436 + + Brings in: + * Support for overlay network driver in 3.10+ kernels + * Freebsd compilation fixes + * Remove .dockerinit dependency + * IPAM driver capability support + * Network internal mode support + * Misc. fixes + + Signed-off-by: Jana Radhakrishnan + +commit 0bbed98bc0f4456f8e2be8e91e978dd167113678 +Merge: 9c89e83ff1 f03695efc1 +Author: Tianon Gravi +Date: Tue Dec 22 12:38:11 2015 -0800 + + Merge pull request #18856 from albers/completion-network-rm + + remove `--format` from bash completion for `docker network rm` + +commit 5dfc78997dc9d817fd23eb4b4670db25c6bf8f51 +Author: DJ Enriquez +Date: Tue Dec 22 11:33:28 2015 -0900 + + Adding suggested changes + + Adding changed suggested by moxiegirl. + + Signed-off-by: DJ Enriquez + +commit 9c89e83ff1b8d6598b487bebbbc29cef58840cc0 +Merge: 81c8e4d4c8 89a775d2dc +Author: Alexander Morozov +Date: Tue Dec 22 12:24:51 2015 -0800 + + Merge pull request #18855 from rhatdan/volume-tmpfs + + No options to tmpfs is valid + +commit f38257308b12ecf6de7ce72895a6430d6a3dc775 +Author: David Calavera +Date: Tue Dec 22 15:17:15 2015 -0500 + + Catch command pipeline error. + + Rather than ignoring errors in the pipeline, return an execution error + and do not proceed with the latest command in the pipeline. + + Signed-off-by: David Calavera + +commit f03695efc100a8f35e73bf51fc694e370e019d25 +Author: Harald Albers +Date: Tue Dec 22 11:35:41 2015 -0800 + + remove `--format` from bash completion for `docker network rm` + + Signed-off-by: Harald Albers + +commit 01cfa628564730f8d1311d32079df67d2eee7e3e +Merge: 812aa04350 e578e6e644 +Author: David Calavera +Date: Tue Dec 22 11:29:55 2015 -0800 + + Merge pull request #46 from thaJeztah/add-new-projects + + Add go-connections, go-units + +commit 89a775d2dc596b9ac86873edf447fff2f7012ef3 +Author: Dan Walsh +Date: Tue Dec 22 13:59:28 2015 -0500 + + No options to tmpfs is valid + + If you run a + + docker run command with --tmpfs /mountpoint:noexec + + Or certain options that get translated into mount options, the mount command can get passed "" for mount data. + So this should be valid. + + Signed-off-by: Dan Walsh + +commit 7ac4232e70fe7cf7318333cd0890db7f95663079 +Author: David Calavera +Date: Fri Dec 18 13:36:17 2015 -0500 + + Move Config and HostConfig from runconfig to types/container. + + - Make the API client library completely standalone. + - Move windows partition isolation detection to the client, so the + driver doesn't use external types. + + Signed-off-by: David Calavera + +commit 747dccde41762f10d0afcdd9b243fb1ea85cbd9f +Author: David Calavera +Date: Fri Dec 18 13:25:32 2015 -0500 + + Remove usage of runconfig.ConvertKVStringsToMap in the API client library. + + It's a very simple function that we can duplicate. + + Signed-off-by: David Calavera + +commit 839f73c3028629ac1dde6617d6466b98f2bde416 +Author: David Calavera +Date: Fri Dec 18 13:17:54 2015 -0500 + + Move ExecConfig to types. + + Signed-off-by: David Calavera + +commit 056e7449039af522fa0a1567ef67916eaa0de93e +Author: David Calavera +Date: Fri Dec 18 12:58:48 2015 -0500 + + Replace usage of pkg/nat with go-connections/nat. + + Signed-off-by: David Calavera + +commit 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1 +Author: David Calavera +Date: Fri Dec 18 12:44:39 2015 -0500 + + Move blkiodev package to types. + + Signed-off-by: David Calavera + +commit ad7fa0110206de6ff53825afb17cb8bbf181785d +Author: David Calavera +Date: Thu Dec 17 19:06:58 2015 -0500 + + Vendor new connections library. + + Signed-off-by: David Calavera + +commit f9b857a200696b07b67e6a7f94ede32487f5649d +Author: David Calavera +Date: Thu Dec 17 17:22:18 2015 -0500 + + Move StrSlice to types. + + This is a very docker concept that nobody elses need. + We only maintain it to keep the API backwards compatible. + + Signed-off-by: David Calavera + +commit e02a0b03992ffa726c3903cf0cec1014fea4a2a3 +Merge: 236c19fa30 de3263c9d6 +Author: Olivier Gambier +Date: Tue Dec 22 10:25:10 2015 -0800 + + Merge pull request #1244 from carsonoid/carsonoid-nginx-doc-patch + + Update nginx.md + +commit 236c19fa30e925fd3028cf801ea57731efba09f3 +Merge: 29213af431 eb654589db +Author: Olivier Gambier +Date: Tue Dec 22 10:23:13 2015 -0800 + + Merge pull request #1255 from donhcd/convergeSwiftDocs + + Help converge disagreeing swift docs + +commit 29213af431ef9865e3ed3a455db871fc1e40fb3a +Merge: 9604f0843d e0fe14618f +Author: Olivier Gambier +Date: Tue Dec 22 10:15:51 2015 -0800 + + Merge pull request #1294 from rhcarvalho/patch-1 + + Fix godoc + +commit 812aa04350f19da05631b8def02375f97f4da7fa +Merge: b4cb02bf89 f4419e3735 +Author: Jess Frazelle +Date: Tue Dec 22 10:09:09 2015 -0800 + + Merge pull request #48 from thaJeztah/add-alumni + + Add Alumni rule + +commit e7c0ebab5e04d52b20dc6d069879f2fd2da61220 +Author: Fabio Rapposelli +Date: Tue Dec 22 18:59:23 2015 +0100 + + Dependencies update + + Signed-off-by: Fabio Rapposelli + +commit 2e90b7cb55d08d53eda1347ea1a75fa5afa4f9f1 +Author: Fabio Rapposelli +Date: Wed Jul 8 09:36:27 2015 +0200 + + Update vSphere driver to work with govmomi instead of wrapping govc. + + Signed-off-by: Fabio Rapposelli + +commit 81c8e4d4c8937980f16ef7ac95d1710b5122aa46 +Merge: ac1187dc8d 673f2b8697 +Author: Jess Frazelle +Date: Tue Dec 22 09:53:22 2015 -0800 + + Merge pull request #18765 from Mashimiao/update-blkio-weight-device-test + + update Blkio Tests name + +commit ac1187dc8d5b264bfa06a91ae3a300bdf4e7adbc +Merge: ff796e5bf7 8498ed73f7 +Author: Antonio Murdaca +Date: Tue Dec 22 18:52:24 2015 +0100 + + Merge pull request #18844 from hqhq/hq_mv_oom_disable + + Move OomKillDisable to resource + +commit ff796e5bf740dba44c88132406892bf4c7050a92 +Merge: b5fb5b9d00 814ce44d5a +Author: Jess Frazelle +Date: Tue Dec 22 09:51:29 2015 -0800 + + Merge pull request #18837 from thaJeztah/remove-darwin-i386 + + Don't build Darwin 32-bit binaries + +commit b5fb5b9d006a7a392396fcdbc9490b89634dce63 +Merge: 61e28f17a3 6150157e8f +Author: Jess Frazelle +Date: Tue Dec 22 09:49:53 2015 -0800 + + Merge pull request #18851 from thaJeztah/update-contributing + + Update contributing.md + +commit 61e28f17a3524f2efffbd9c4f999b16ccf1c9236 +Merge: 5b913de5e6 45241d36d3 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 18:32:38 2015 +0100 + + Merge pull request #18852 from errordeveloper/master + + Update link for Weave Net plugin docs + +commit 1976613fa8f0358f3fb705270485467bab87f44e +Merge: ee8c9abed2 1744bf4fd7 +Author: David Gageot +Date: Tue Dec 22 18:26:20 2015 +0100 + + Merge pull request #2659 from dgageot/powershell-env + + Fix Powershell env hints + +commit 45241d36d349e0802cf12a2437a732b8c8c18479 +Author: Ilya Dmitrichenko +Date: Tue Dec 22 16:45:46 2015 +0000 + + Update link for Weave Net plugin docs + + Signed-off-by: Ilya Dmitrichenko + +commit 5b913de5e68690c79563feb9a5082d5915371dcf +Merge: eafecff258 e715daab3d +Author: David Calavera +Date: Tue Dec 22 08:43:08 2015 -0800 + + Merge pull request #18847 from albers/completion-rename-functions + + Better function names in bash completion + +commit eafecff25894cdf030f7c1994b384afce183881e +Merge: 312c82677b bbbc01b86e +Author: Tianon Gravi +Date: Tue Dec 22 06:48:22 2015 -0800 + + Merge pull request #18821 from oyld/script_fix + + Fix syntax error in init script + +commit 6150157e8f00d957b279483a7b21e4f299318a98 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 15:42:36 2015 +0100 + + Update contributing.md + + - Add a link to the new procedures for adding maintainers + - Remove section about monthly IRC meetings, which are in flux + + Signed-off-by: Sebastiaan van Stijn + +commit 1744bf4fd71251e6167630cb30384f6c6724523d +Author: David Gageot +Date: Tue Dec 22 15:18:09 2015 +0100 + + Fix Powershell env hints + + Signed-off-by: David Gageot + +commit ff3687c965dc544df6cbe9c4616f2aa601a13853 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 15:00:21 2015 +0100 + + Move Victor to alumni + + Victor is now a maintainer for Docker Swarm, and no + longer active as a maintainer for this repository. + + Signed-off-by: Sebastiaan van Stijn + +commit ee8c9abed2a08f1e3ac2e68fe9aa1fb1382e31f7 +Merge: e22f1db4bf 1c6ceed28e +Author: David Gageot +Date: Tue Dec 22 14:32:49 2015 +0100 + + Merge pull request #2654 from dgageot/2140_driver_restart + + Change host restart to use the driver implementation + +commit f4419e37350ad27013ae75af82a161430b3ed5f0 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 14:17:37 2015 +0100 + + Add Alumni rule + + Signed-off-by: Sebastiaan van Stijn + +commit e22f1db4bf010f3525fd16307517eabb35968966 +Merge: 7d72a7824d cdfa729f36 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 14:13:22 2015 +0100 + + Merge pull request #2657 from dgageot/improve-generic-driver + + Improve generic driver + +commit 7d72a7824dbb2c34bb9d0509e68d4a865c35ffa6 +Merge: 643df3c0a7 e7e72c37d6 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 14:12:58 2015 +0100 + + Merge pull request #2656 from dgageot/missing-quotes + + FIX #2655 Add quotes to the eval cmdline if there are spaces in the path + +commit 643df3c0a785e20ae49b384eb970ce0378c976cd +Merge: acf2d1da4c 0815379c26 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 14:12:21 2015 +0100 + + Merge pull request #2589 from boyvinall/mv/filter-openstack-floating + + Filter openstack floating IPs by tenant ID + +commit e715daab3d531725dc4faef2265337d133bd16bc +Author: Harald Albers +Date: Tue Dec 22 12:27:56 2015 +0100 + + Better function names in bash completion + + The new names make it easier to distinguish between helper functions and + functions that actually perform completion by modifying the global COMPOPT + variable. + + Signed-off-by: Harald Albers + +commit bbbc01b86edf9a5676ad735d008097942e0a93ac +Author: oyld +Date: Tue Dec 22 02:27:18 2015 -0800 + + Fix syntax error in init script + + Signed-off-by: oyld + +commit e0fe14618f50d79c05b851d5168220ab34e79bf4 +Author: Rodolfo Carvalho +Date: Tue Dec 22 12:22:31 2015 +0100 + + Fix godoc + + `RepositoryNameTotalLengthMax` doesn't exist anymore. + + Signed-off-by: Rodolfo Carvalho + +commit cdfa729f366b73ea91aecd8f07fdf1288cff498a +Author: David Gageot +Date: Tue Dec 22 11:47:41 2015 +0100 + + Simplify code + + Signed-off-by: David Gageot + +commit 181a1d47b4a05e918f4d6f89a7397de16f10cbe9 +Author: David Gageot +Date: Tue Dec 22 11:46:59 2015 +0100 + + The generic driver shouldn't support kill since stop is not supported + + Signed-off-by: David Gageot + +commit 4bfd8ab4c1ea760d9850a90e3a0fa530f5f3cc12 +Author: David Gageot +Date: Tue Dec 22 11:46:14 2015 +0100 + + Remove dead code in generic driver + + Signed-off-by: David Gageot + +commit e7e72c37d6180c344b8981493188b122ebbc625b +Author: David Gageot +Date: Tue Dec 22 11:16:36 2015 +0100 + + FIX #2655 Add quotes to the eval cmdline if there are spaces in the path + + Signed-off-by: David Gageot + +commit 1c6ceed28ee8d2868003ca3ba4622b8eca51a179 +Author: David Gageot +Date: Tue Dec 22 10:32:57 2015 +0100 + + Fix Restart() for some drivers + + Signed-off-by: David Gageot + +commit c045ceec1ed6ae1f4ca4785d7e191f49b6be534a +Author: Neil Wilson +Date: Mon Nov 9 12:58:56 2015 +0000 + + Change host restart to use the driver implementation + + Fixes #2140 + + Signed-off-by: Neil Wilson + +commit acf2d1da4c84fb5c5bd76882d3a3a80e41217ebf +Merge: 5ee9dfdc94 302044858b +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 09:57:17 2015 +0100 + + Merge pull request #2652 from kaustavha/kaustavha/fix/Makefile + + fix(Makefile): Prevent makefile from using containers when $USE_CONTAINERS=false + +commit 5ee9dfdc94cb38e0dfdd8781d02d351baef86e02 +Merge: f2ca6b8bd0 280f9c6cc6 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 09:53:40 2015 +0100 + + Merge pull request #2649 from dgageot/2540-honor-engine-install-url + + FIX #2540 provisioners honor engine-install-url + +commit f2ca6b8bd0bdb84ef81e1df73a06de038b5db553 +Merge: 01873fe22d f6a67ef9c2 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 22 09:49:24 2015 +0100 + + Merge pull request #2651 from synhaptein/patch-1 + + Update aws.md + +commit 66384edfc36f9ba2abebb97dad35da1eb8316fcc +Author: Ying Li +Date: Tue Dec 22 00:34:56 2015 -0800 + + Add some more publishing tests. + + Signed-off-by: Ying Li + +commit dcef24996e5dc4e571c7a31146c6306d132ab0db +Author: Ying Li +Date: Tue Dec 22 00:23:32 2015 -0800 + + Add more delegation writing/publishing tests. + + Signed-off-by: Ying Li + +commit a2380a6c71599bd5a6ff1b0ed9b60760d37035f3 +Author: Victor Vieux +Date: Thu Dec 17 20:48:36 2015 -0800 + + update godeps + + Signed-off-by: Victor Vieux + +commit be0fce961f476bc07013a0ffb821b8d38890b910 +Author: Victor Vieux +Date: Thu Dec 17 20:46:39 2015 -0800 + + update code + + Signed-off-by: Victor Vieux + +commit 8498ed73f7b35da807b5d5dcf532114c7b3df52d +Author: Qiang Huang +Date: Tue Dec 22 16:08:04 2015 +0800 + + Move OomKillDisable to resource + + 1. It's a cgroup api, fit the general defination that we take + cgroup options as kind of resource options. + 2. It's common usage and very helpful as explained here: + https://github.com/docker/docker/pull/18270#issuecomment-160561316 + 3. It's already in `Resource` struct in + daemon/execdriver/driver_unix.go + + Signed-off-by: Qiang Huang + +commit c11d4fe82cbf1a049a94985c0d656f3f8c5caf23 +Author: Victor Vieux +Date: Tue Dec 22 00:03:59 2015 -0800 + + fix stable tests + + Signed-off-by: Victor Vieux + +commit 673f2b8697727a0f0bfb3c4bd049cdac89a5a508 +Author: Ma Shimiao +Date: Fri Dec 18 13:34:25 2015 +0800 + + upate TestRunWithBlkioInvalidWeightDevice with clearly invalid device name + + Signed-off-by: Ma Shimiao + +commit 9d6acbee92016c47796ee8751dce9c59056f850d +Author: Aaron Lehmann +Date: Mon Dec 21 15:42:04 2015 -0800 + + When a manifest is not found, allow fallback to v1 + + PR #18590 caused compatibility issues with registries such as gcr.io + which support both the v1 and v2 protocols, but do not provide the same + set of images over both protocols. After #18590, pulls from these + registries would never use the v1 protocol, because of the + Docker-Distribution-Api-Version header indicating that v2 was supported. + + Fix the problem by making an exception for the case where a manifest is + not found. This should allow fallback to v1 in case that image is + exposed over the v1 protocol but not the v2 protocol. + + This avoids the overly aggressive fallback behavior before #18590 which + would allow protocol fallback after almost any error, but restores + interoperability with mixed v1/v2 registry setups. + + Fixes #18832 + + Signed-off-by: Aaron Lehmann + +commit 9604f0843d13d0f4d20a5af006b257b8d2e97502 +Merge: c56d49b111 aaab336edc +Author: Olivier Gambier +Date: Mon Dec 21 17:49:45 2015 -0800 + + Merge pull request #1290 from BrianBland/crossPackageCoverage + + Enables cross-package code coverage reporting + +commit 302044858b943d724ac765af0ecbbb08b01f46db +Author: kaustav haldar +Date: Mon Dec 21 17:19:39 2015 -0800 + + fix(Makefile): Prevent makefile from defaulting to using containers if use_containers=false + + Signed-off-by: kaustav haldar + +commit aaab336edc02bc170f1e9edb11f5701cad1b0e99 +Author: Brian Bland +Date: Mon Dec 21 12:35:33 2015 -0800 + + Enables cross-package code coverage reporting + + Signed-off-by: Brian Bland + +commit 814ce44d5ad442b940e44b41eff00bac0e579fc6 +Author: Sebastiaan van Stijn +Date: Tue Dec 22 00:08:18 2015 +0100 + + Don't build Darwin 32-bit binaries + + The last 32-bit OS X computers were built in 2006, + so we probably don't need these anymore. + + Signed-off-by: Sebastiaan van Stijn + +commit 312c82677bdc86d50b483d642ad8c61f1c840c55 +Merge: eff810aed6 843084b08b +Author: Sebastiaan van Stijn +Date: Mon Dec 21 23:45:18 2015 +0100 + + Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops + + Add support for blkio read/write iops device + +commit eff810aed688879f67a3730c41d9adce4637470f +Merge: 8537501ebd 325b1f35ae +Author: Vincent Demeester +Date: Mon Dec 21 22:02:18 2015 +0100 + + Merge pull request #18809 from thaJeztah/EOL-ubuntu-15.04-vivid + + Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL + +commit f6a67ef9c2917b23cd1154c023b12c3773ee8da1 +Author: Philippe L'Heureux +Date: Mon Dec 21 15:03:38 2015 -0500 + + Update aws.md + + --amazonec2-use-private-address wasn't documented + + Signed-off-by: Philippe L'Heureux + +commit 1b010516d09fb587999eff6abb69cc76b25f7944 +Author: James Carey +Date: Wed Dec 16 10:20:56 2015 -0600 + + Use of checkers in docker_cli_pull_test.go + + Signed-off-by: James Carey + +commit c56d49b111aea675a81d411c2db1acfac6179de9 +Merge: 6b3908878f dd0d28d541 +Author: Olivier Gambier +Date: Mon Dec 21 11:41:12 2015 -0800 + + Merge pull request #1289 from BrianBland/codecov + + Adds codecov coverage reporting to circle.yml + +commit dd0d28d541c30617df6e9d5de5bc6c499aa5dd77 +Author: Brian Bland +Date: Mon Dec 21 10:26:53 2015 -0800 + + Adds codecov coverage reporting to circle.yml + + Signed-off-by: Brian Bland + +commit 8537501ebd433d19eeae99664d78dc9f2cecf05c +Merge: 1a8e8f2967 23a18b5f93 +Author: Brian Goff +Date: Mon Dec 21 13:18:39 2015 -0500 + + Merge pull request #18811 from runcom/fix-volume-debug + + volume: store: store.go: fix debug message + +commit 23a18b5f93b4dfbed419509589687220e5aff487 +Author: Antonio Murdaca +Date: Sun Dec 20 20:47:16 2015 +0100 + + volume: store: store.go: remove debug message + + When driver is `local` an empty string is given to the debug message. + This patch removes the debug statement. + + ``` + Dec 20 19:07:01 localhost.localdomain docker[19734]: + time="2015-12-20T19:07:01.872021857+01:00" level=debug msg="Registering + new volume reference: driver , name + c2291b964b4d7b1b51ec51d2ccfe2544f83fd23404709225a43743c5faadad55" + ``` + + Signed-off-by: Antonio Murdaca + +commit 1a8e8f2967c8f17072d4f2b43ad0c69dd6952ac8 +Merge: 88c4d4a943 4e2c0f385c +Author: Alexander Morozov +Date: Mon Dec 21 10:02:32 2015 -0800 + + Merge pull request #18830 from calavera/tls_verify_godoc + + Add godoc comment about client tls verification. + +commit 88c4d4a94306f6cd6e415eb0ddd887f3fabe8a0e +Merge: 42460b6772 2033c09705 +Author: David Calavera +Date: Mon Dec 21 09:57:48 2015 -0800 + + Merge pull request #18828 from albers/completion-plugins + + Use computed plugin lists in bash completion + +commit 42460b6772323552bfb58ae703124145ffd8a56b +Merge: f4ea3b2cb1 34a3c3cacf +Author: Alexander Morozov +Date: Mon Dec 21 09:57:29 2015 -0800 + + Merge pull request #17692 from vdemeester/images-format + + Add --format support to images command + +commit 4e2c0f385c3032b0b15105c81b18e3981e6e40ad +Author: David Calavera +Date: Mon Dec 21 12:55:37 2015 -0500 + + Add godoc comment about client tls verification. + + Signed-off-by: David Calavera + +commit af94f941df9ee43b61e0e8f9d3c3b3962597eff6 +Author: David Calavera +Date: Wed Dec 16 01:41:46 2015 -0500 + + Remove `IsPaused` from backend interface. + + Move connection hijacking logic to the daemon. + + Signed-off-by: David Calavera + +commit 2033c09705dc14ea32a23a9fa78d5b7d0cac1229 +Author: Harald Albers +Date: Tue Dec 15 16:07:13 2015 +0100 + + Use computed plugin lists in bash completion + + Signed-off-by: Harald Albers + +commit f4ea3b2cb1d864ac6f1c7063da87b62b9191aaac +Merge: 67620bc028 60b4db7eb1 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 17:59:16 2015 +0100 + + Merge pull request #17428 from ripcurld00d/cli_ninja_build + + Change the quiet flag behavior in the build command [closes #17623] + +commit b4cb02bf89772563ec664c87805a21f27f841cb2 +Merge: a58150b5c8 9eabcaef99 +Author: Arnaud Porterie +Date: Mon Dec 21 08:41:52 2015 -0800 + + Merge pull request #42 from thaJeztah/add-maintainer-rules + + Update rules for adding/removing maintainers and holidays + +commit 34a3c3cacf2fd827f13a5e37541acff1409658c4 +Author: Vincent Demeester +Date: Fri Dec 18 14:03:41 2015 +0100 + + Add --format support to images command + + - rename `api/client/ps` to `api/client/formatter` + - add a a image formatter + + Signed-off-by: Vincent Demeester + +commit ea8cc1c3dc47c9ed3bff56c5a8d99175b57af650 +Merge: a2d2915a64 5ed559fa0e +Author: Daniel Nephin +Date: Mon Dec 21 08:31:39 2015 -0800 + + Merge pull request #2562 from thaJeztah/update-links + + Update links + +commit 01873fe22d263fb94bbdbbeaa512f85c93856f34 +Merge: ed12b42ca0 464e19ba1c +Author: Jean-Laurent de Morlhon +Date: Mon Dec 21 17:24:29 2015 +0100 + + Merge pull request #2638 from schlosna/bugfix/bash-wrapper + + Fix bash docker-machine wrapper + +commit ed12b42ca0b6c8e8f2f895c34c7b3828eb4e6b45 +Merge: 6e8aaa0d56 d977ec73af +Author: Jean-Laurent de Morlhon +Date: Mon Dec 21 17:16:22 2015 +0100 + + Merge pull request #2646 from dgageot/2643-scp-without-ssh-key + + FIX #2643 Ignore empty ssh key + +commit 6e8aaa0d568f1caabf5f794d9740831c4dfad3ff +Merge: cd6690ccd5 34b6468c2c +Author: Jean-Laurent de Morlhon +Date: Mon Dec 21 17:08:07 2015 +0100 + + Merge pull request #2645 from dgageot/2370-add-feedback + + FIX #2370 add feedback to the user + +commit cd6690ccd56082284a5760f58d57e943955f8a57 +Merge: 1815d0bb16 7b638738cc +Author: Jean-Laurent de Morlhon +Date: Mon Dec 21 17:06:00 2015 +0100 + + Merge pull request #2647 from dgageot/windows-version + + Try multiple commands to find windows version + +commit 1815d0bb1667b9a4ba037b9e68827788dbf2de19 +Merge: df30a135b2 6f8a6dd272 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 21 17:01:24 2015 +0100 + + Merge pull request #2648 from dgageot/2641-do-custom-ssh-port + + FIX #2641 Digital Ocean Custom SSH port + +commit 7b638738cc29891a5888cdd75208970f26358616 +Author: David Gageot +Date: Mon Dec 21 14:33:40 2015 +0100 + + Try multiple commands to find windows version + + Signed-off-by: David Gageot + +commit 6f8a6dd2728484d3338b0a6f0f979d0168a114ff +Author: David Gageot +Date: Mon Dec 21 14:50:27 2015 +0100 + + FIX #2641 Digital Ocean Custom SSH port + + Signed-off-by: David Gageot + +commit 60b4db7eb17f4eb509be4a4968364ada2075d60c +Author: Boaz Shuster +Date: Wed Oct 28 02:29:21 2015 +0200 + + Change the quiet flag behavior in the build command + + Right now, the quiet (-q, --quiet) flag ignores the output + generated from within the container. + + However, it ought to be quiet in a way that all kind + of diagnostic output should be ignored, unless the build + process fails. + + This patch makes the quiet flag behave in the following way: + 1. If the build process succeeds, stdout contains the image ID + and stderr is empty. + 2. If the build process fails, stdout is empty and stderr + has the error message and the diagnostic output of that process. + + If the quiet flag is not set, then everything goes to stdout + and error messages, if there are any, go to stderr. + + Signed-off-by: Boaz Shuster + +commit a2d2915a64c887ddc4bfa2a2e41bfb65eb4f86ad +Merge: 12a08255b5 3c76d5a467 +Author: Aanand Prasad +Date: Mon Dec 21 14:20:56 2015 +0000 + + Merge pull request #2547 from seguins/1125-docker-compose-create + + Add docker-compose create command. + +commit 280f9c6cc6fcf4c7186b5d9d438837adf35c2b58 +Author: David Gageot +Date: Mon Dec 21 15:07:43 2015 +0100 + + FIX #2540 provisioners honor engine-install-url + + Signed-off-by: David Gageot + +commit 67620bc0288ae7ecb12511879e6eb605e98594a1 +Merge: 6d04d9cda8 bb853137be +Author: Sebastiaan van Stijn +Date: Mon Dec 21 14:01:27 2015 +0100 + + Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests + + Fix the api/client/ps unit tests. + +commit d977ec73af80b349a8375292b75c6379e3ec7258 +Author: David Gageot +Date: Mon Dec 21 12:53:54 2015 +0100 + + FIX #2643 Ignore empty ssh key + + Signed-off-by: David Gageot + +commit 34b6468c2c22a7a144ef5ce9f966c3acba0cf1a5 +Author: David Gageot +Date: Mon Dec 21 09:47:54 2015 +0100 + + FIX #2370 add feedback to the user + + Signed-off-by: David Gageot + +commit bb853137bea8481037b88d16eeb6499b8ed63a81 +Author: Vincent Demeester +Date: Mon Dec 21 11:07:14 2015 +0100 + + Fix the api/client/ps unit tests. + + TestFormat was depending on the time so (comparing again + 1970-01-01).. at some point it was bounded to fail >_<. Updating it to + be *not* time-dependent :). + + Signed-off-by: Vincent Demeester + +commit 6d04d9cda8061456b921569266ca9f996c4b7eae +Merge: e9f72410ae 41c2dab459 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 09:56:05 2015 +0100 + + Merge pull request #18804 from mqliang/patch-6 + + Update selectadriver.md + +commit df30a135b26a0c5faa6185dfb4b23b767f73b22e +Merge: c584b8e641 54bda622d3 +Author: David Gageot +Date: Mon Dec 21 09:46:31 2015 +0100 + + Merge pull request #2644 from dgageot/nathanleclaire-xtra_vbox_logs + + Add extra logging to VirtualBox driver + +commit c584b8e64165dbe9ed48c672cddf4e2f28d563a6 +Merge: 352d28220c 3c4fd63f93 +Author: David Gageot +Date: Mon Dec 21 09:29:25 2015 +0100 + + Merge pull request #2625 from dgageot/2624-reject-duplicate-hostonlyifs + + FIX #2624 reject duplicate hostonlyifs name/IP + +commit 54bda622d31d98da11107e8b3b642d963e15ce56 +Author: Nathan LeClaire +Date: Fri Dec 18 18:44:14 2015 -0800 + + Add extra logging to VirtualBox driver + + Signed-off-by: Nathan LeClaire + +commit 352d28220ccf68058beab76991a7bf543b1528f4 +Merge: 906ac38d5a ac45f88ce3 +Author: David Gageot +Date: Mon Dec 21 09:18:49 2015 +0100 + + Merge pull request #2620 from dgageot/2619-hardware-virtualization-test + + Don't create the VM if no hardware virtualization + +commit 3c4fd63f939001c46c8246d4730dad716be579c3 +Author: David Gageot +Date: Fri Dec 18 15:43:38 2015 +0100 + + FIX #2624 reject duplicate hostonlyifs name/IP + + Signed-off-by: David Gageot + +commit 906ac38d5a1a7c4e68aeffba0105e83cb8a03357 +Merge: 34a6231837 403b57437f +Author: David Gageot +Date: Mon Dec 21 09:06:48 2015 +0100 + + Merge pull request #2607 from askb/2595-dm-force-fails + + Fixes #2595 remove fails when config.json is not found + +commit 34a62318370229abd8c0dc43ac712219e1ae543b +Merge: 3b84a94a84 e143ef730c +Author: David Gageot +Date: Mon Dec 21 09:05:50 2015 +0100 + + Merge pull request #2633 from nathanleclaire/ssh_client_log + + Log SSH client used + +commit 3b84a94a84e3cd18934bf4b8c82ab1436d6efb02 +Merge: 204af9fe5e 98ca59394a +Author: David Gageot +Date: Mon Dec 21 09:04:23 2015 +0100 + + Merge pull request #2636 from nathanleclaire/increase_heartbeat_intervals + + Increase heartbeat interval and timeout + +commit 6b3908878f1c54890bc092f60eae5889ba3f071f +Merge: ed3346eeb0 bacfea16bb +Author: Olivier Gambier +Date: Sun Dec 20 21:20:49 2015 -0800 + + Merge pull request #1286 from thaJeztah/update-links + + Update links to documentation + +commit 41c2dab459ff9e4075e15889b7aea03cab58ce71 +Author: mqliang +Date: Mon Dec 21 11:53:38 2015 +0800 + + update document + + Signed-off-by: mqliang + +commit 843084b08b521a70baf9284ec4e23e941ab38367 +Author: Ma Shimiao +Date: Wed Jul 8 19:06:48 2015 +0800 + + Add support for blkio read/write iops device + + Signed-off-by: Ma Shimiao + +commit 5ed559fa0ef89c944734226278155050f994ece0 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 01:52:54 2015 +0100 + + Update links + + Updates some links to their new locations, and + replaces some http:// with https:// links. + + Signed-off-by: Sebastiaan van Stijn + +commit bacfea16bbe39f4a4e55e19040d086dbde9b1de0 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 01:22:01 2015 +0100 + + Update links to documentation + + Signed-off-by: Sebastiaan van Stijn + +commit e9f72410ae5c91133a63fbe2d2bd9b36614bc460 +Merge: 83f28cb374 3dd90e564c +Author: Sebastiaan van Stijn +Date: Mon Dec 21 01:09:52 2015 +0100 + + Merge pull request #18798 from mqliang/patch-1 + + Update dockervolumes.md + +commit 83f28cb374f6e08e2e929ea86833c0976ce47cf3 +Merge: 4f9ed6164d 38ee016966 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 01:08:58 2015 +0100 + + Merge pull request #18801 from mqliang/patch-3 + + Update index.md + +commit 4f9ed6164de03b4bfb8693c8108ef1137522aa11 +Merge: 91b56a7c26 c32ec8b93b +Author: Sebastiaan van Stijn +Date: Mon Dec 21 01:04:38 2015 +0100 + + Merge pull request #18813 from thaJeztah/update-restart-description + + (carry 18273) update description for restart policies + +commit c32ec8b93b199168425f29cab040d9d8cc23566f +Author: Aidan Feldman +Date: Thu Nov 26 23:54:24 2015 -0600 + + Update restart description + + add a note around restart policies only working in detached mode + + Signed-off-by: Aidan Feldman + + Update restart description with Mary's comments. + + Signed-off-by: Sebastiaan van Stijn + +commit eb654589db4c34345d54c119d0a46372bea95e5a +Author: Donald Huang +Date: Fri Dec 11 00:02:50 2015 +0000 + + help converge disagreeing swift docs + + Signed-off-by: Donald Huang + +commit e578e6e644393bb4b89dda22969682460d6b2962 +Author: Sebastiaan van Stijn +Date: Mon Dec 21 00:21:41 2015 +0100 + + Add go-connections, go-units + + Signed-off-by: Sebastiaan van Stijn + +commit 91b56a7c269c45a12b3c2e7643caa5dc3ca761bd +Merge: 9f306364f5 0635403536 +Author: moxiegirl +Date: Sun Dec 20 08:46:31 2015 -0800 + + Merge pull request #18790 from tbonza/master + + updated fedora yum to dnf package manager + +commit 9f306364f573e99d3dd6d7db7c57a23ac27fc5a8 +Merge: cc6f0df2e4 8737896e42 +Author: Sebastiaan van Stijn +Date: Sun Dec 20 17:24:29 2015 +0100 + + Merge pull request #18806 from mqliang/patch-8 + + Update btrfs-driver.md + +commit 3dd90e564c65e3a38160a6d24c036c0b0ee3c8b8 +Author: Liang Mingqiang +Date: Sun Dec 20 13:29:29 2015 +0800 + + Update dockervolumes.md + + Signed-off-by: mqliang mqliang.zju@gmail.com + Signed-off-by: lmq + +commit 8737896e421ed5a9c90a7b0e4395633ea93f8f92 +Author: Liang Mingqiang +Date: Sun Dec 20 18:22:28 2015 +0800 + + Update btrfs-driver.md + + Signed-off-by: lmq + +commit 325b1f35ae7419cd7454800c8eda4dfaca1d9a77 +Author: Sebastiaan van Stijn +Date: Sun Dec 20 16:00:53 2015 +0100 + + Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL + + Ubuntu 15.04 (Vivid) will be EOL'd in January, + so we should remove it from our builds in the + Docker 1.10 release. + + For information about the EOL data, see: + https://wiki.ubuntu.com/Releases + + Signed-off-by: Sebastiaan van Stijn + +commit 38ee016966ef5ad8f08d42c9a0dd9effd6930c73 +Author: Liang Mingqiang +Date: Sun Dec 20 14:46:53 2015 +0800 + + Update index.md + + fix typo in document + + Signed-off-by: mqliang mqliang.zju@gmail.com + Signed-off-by: lmq + +commit c8badcbd26535ff6763c724328debb1282fccb82 +Author: Florin Asavoaie +Date: Sun Dec 20 14:20:30 2015 +0200 + + New features in mkimage-yum.sh script + + Added -g and -p options for the contrib/mkimage-yum.sh script to allow generating images with the dependencies you want. I use this because I generate images where I only need "glibc" with its dependencies or "java-1.8.0-openjdk-headless" and so on. This makes sure that I don't get a lot of bogus packages from the Core group. + + Possible usages now include sudo ./mkimage-yum.sh -y yum.conf -g '' -p java-1.8.0-openjdk-headless. + + Also changed the "test" at the end to add --rm parameter to docker run so it doesn't leave a junk container and use bash to echo "success" in case you don't get coreutils in your dependencies tree. + + Signed-off-by: Florin Asavoaie + +commit cc6f0df2e41c7d01dffd8e0630c14275960130fc +Merge: 18925f37ed a08c955e30 +Author: Antonio Murdaca +Date: Sun Dec 20 11:53:51 2015 +0100 + + Merge pull request #18794 from thaJeztah/EOL-fedora-21 + + Remove Fedora 21 from RPM build as it is EOL + +commit 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0 +Merge: 3d43ebebfa aada8d8117 +Author: moxiegirl +Date: Sat Dec 19 21:53:21 2015 -0800 + + Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables + + update syntax for empty value labels + +commit 3d43ebebfae82b4c5cf5ce0987d087e7059829aa +Merge: fa720ad987 68b07c0af9 +Author: moxiegirl +Date: Sat Dec 19 21:17:38 2015 -0800 + + Merge pull request #18720 from kytrinyx/unspecific-ubuntu + + docs: remove ubuntu version in dockerizing userguide + +commit fa720ad98746eb33073af9f4fde16df4f774644f +Merge: fbefbc5281 c170e97197 +Author: moxiegirl +Date: Sat Dec 19 21:09:39 2015 -0800 + + Merge pull request #18667 from bboreham/inspect-json-doc + + Improved explanation of docker inspect 'json' function + +commit fbefbc52817ce23a07a5634126abf9a12f83b7f0 +Merge: fb879e849d 579d35e33c +Author: Sebastiaan van Stijn +Date: Sun Dec 20 01:33:27 2015 +0100 + + Merge pull request #18795 from thaJeztah/o-oracle-o-oracle-where-art-thou-oracle + + Update link to Oracle Linux + +commit 579d35e33c161fa20bf6cf8d0e41969d9821e378 +Author: Sebastiaan van Stijn +Date: Sun Dec 20 00:52:12 2015 +0100 + + Update link to Oracle Linux + + The https://linux.oracle.com/ url results in + too many redirects, which may result in our + link-checker to think the link is broken. + + Replacing the link, per discussion in + https://github.com/docker/docker/pull/18534#issuecomment-164202592 + + Signed-off-by: Sebastiaan van Stijn + +commit a08c955e30d6790d1f69483d5e33e2a81a08b100 +Author: Sebastiaan van Stijn +Date: Sun Dec 20 00:27:02 2015 +0100 + + Remove Fedora 21 from RPM build as it is EOL + + Fedora 21 is EOL'd as of December 1st, 2015. + + Announcement: + https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html + + Fedora 21 will reach end of life on 2015-12-01, and no further updates + will be pushed out after that time. Additionally, with the recent + release of Fedora 23, no new packages will be added to the Fedora 21 + collection. + + Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more + information on upgrading from Fedora 21 to a newer release. + + Signed-off-by: Sebastiaan van Stijn + +commit fb879e849d6a895edab097c8feed3b5f71f33770 +Merge: 58c049595f 55a65e18c0 +Author: Sebastiaan van Stijn +Date: Sat Dec 19 22:21:41 2015 +0100 + + Merge pull request #18792 from moxiegirl/fix-typo + + Fixing typo reported by @projectvalis + +commit 55a65e18c08e2612b5cc7384119e6ec44e476da7 +Author: Mary Anthony +Date: Sat Dec 19 12:47:24 2015 -0800 + + Fixing typo reported by @projectvalis + + Signed-off-by: Mary Anthony + +commit 0635403536802063e8633ab04a6a825a1daa02c4 +Author: tbonza +Date: Sat Dec 19 02:22:02 2015 -0500 + + updated fedora yum to dnf package manager Signed-off-by: Tyler Brown + +commit 58c049595fba7cb509d8a6656ecce6389c34a5a5 +Merge: 69fbdf4294 5649dae89b +Author: Doug Davis +Date: Sat Dec 19 10:46:11 2015 -0500 + + Merge pull request #18767 from wenchma/add_checkduplicate_test + + Add network create api test on CheckDuplicate + +commit 69fbdf4294b9c062bc711b978efcde82e40a293f +Merge: eaf7932faf efb763aa10 +Author: Sebastiaan van Stijn +Date: Sat Dec 19 15:29:44 2015 +0100 + + Merge pull request #18684 from cdauth/volume-docs + + Add note to volume docs that data is not copied to mounted volumes + +commit 5649dae89bbbb356a24560c1d3164722b2207344 +Author: Wen Cheng Ma +Date: Fri Dec 18 14:35:16 2015 +0800 + + Add network create api test on CheckDuplicate + + Signed-off-by: Wen Cheng Ma + +commit eaf7932fafdfdbcefa3be3ccacab016938969cf4 +Merge: 7ff61dd592 1e28f04fec +Author: Sebastiaan van Stijn +Date: Sat Dec 19 14:53:25 2015 +0100 + + Merge pull request #18769 from runcom/docs-auth-1 + + docs: extend: authorization.md: add a note about confidential stuff in Err + +commit a5d8e41e8287d26ca2b32a2712b87088a84b3bfb +Author: Sebastiaan van Stijn +Date: Thu Dec 17 15:20:51 2015 +0100 + + Document process for patch-releases + + This documents the procedures around creating patch-releases. + + Signed-off-by: Sebastiaan van Stijn + +commit 464e19ba1cf83cc1babb30eff3ecde24b2e79567 +Author: David Schlosnagle +Date: Sat Dec 19 04:15:26 2015 -0500 + + Delegate to docker-machine from wrapper + + Fix an issue with the bash __docker-machine-wrapper function where + commands other than `use` would result in an error. + + Signed-off-by: David Schlosnagle + +commit aada8d81177de793db38845ff3a26949436e1ed6 +Author: Antonio Murdaca +Date: Wed Dec 16 13:43:41 2015 +0100 + + docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels + + Signed-off-by: Antonio Murdaca + +commit 403b57437fdb69fba1c2990722f22149c372f770 +Author: Anil Belur +Date: Wed Dec 16 18:50:59 2015 +0530 + + Fixes #2595 `dm rm` fails when config.json is not found + + This issue occurs when `api.Load()` fails while loading + the `config.json` file, in case the config file is not present. + Refactored the code to handled `-y` and `-f` as documented. + Now added UT for remove options. + + Signed-off-by: Anil Belur + +commit 98ca59394a8c6729e075ddd3cd32589bc0a98c51 +Author: Nathan LeClaire +Date: Fri Dec 18 18:53:01 2015 -0800 + + Increase heartbeat interval and timeout + + Signed-off-by: Nathan LeClaire + +commit 7ff61dd592335c7b3673b41153d9cf8995e468a3 +Merge: 58ebc71272 278e75800c +Author: Doug Davis +Date: Fri Dec 18 21:21:17 2015 -0500 + + Merge pull request #18779 from aditirajagopal/18750-new-string-method + + pkg/version.Version: use the new String() method + +commit 1038964f5ab1932eda1531e5d4bb26bea64b72e8 +Author: French Ben +Date: Fri Dec 18 17:03:21 2015 -0800 + + Toolbox 1.9.1.f + + Signed-off-by: French Ben + +commit e143ef730ccf7cdbc43564aab5dad498e46e5ce0 +Author: Nathan LeClaire +Date: Fri Dec 18 17:26:26 2015 -0800 + + Log SSH client used + + Signed-off-by: Nathan LeClaire + +commit a8b5b4f2de826fb39e960da00a63d2748ef185a6 +Author: French Ben +Date: Fri Dec 18 17:13:56 2015 -0800 + + bump to 0.9.5 + + Signed-off-by: French Ben + +commit 340a337c3168814271c9bcfb592a123a8dad6f62 +Merge: 28128c28af 34055f8cf7 +Author: Ying Li +Date: Fri Dec 18 17:08:34 2015 -0800 + + Merge pull request #378 from cyli/publish-delegations + + Publishing delegation changes, and targets to delegations + +commit 204af9fe5edcd6f98d76a8a1ef22cee5d6d24084 +Merge: ecfe9a18bf a7bd9e06d2 +Author: Nathan LeClaire +Date: Fri Dec 18 16:51:56 2015 -0800 + + Merge pull request #2618 from dgageot/2189-update-b2d-cache-in-precreatecheck + + Update b2d cache in PreCreateCheck + +commit 34055f8cf78f1f2e4bb4b81821b0718054a04c61 +Author: Ying Li +Date: Fri Dec 18 15:43:31 2015 -0800 + + Code cleanups as per review, and after rebasing. + + Signed-off-by: Ying Li + +commit b87361fc1a3de8ce2f86ca55c0528fe1b8c7cf2a +Author: Carol Fager-Higgins +Date: Fri Dec 18 16:38:31 2015 -0800 + + changed date on RN to reflect delayed shipping + + Signed-off-by: Carol Fager-Higgins + +commit 0892ebb13f1ddbd25a737a4ed81c6c3b24664868 +Author: Ying Li +Date: Fri Dec 18 15:40:00 2015 -0800 + + Add checks to TUFRepo to fail on updating a target if there are no signing keys. + + So UpdateDelegation, DeleteDelegation, AddTargets, RemoveTargets now + all check for the role existence, not metadata existence. And they + also check the role's signing keys - there's no point in adding if + we can't sign. + + Signed-off-by: Ying Li + +commit a1cbe5d43c10f91b70478b736f81a25698a5c91c +Author: Ying Li +Date: Fri Dec 18 13:39:19 2015 -0800 + + Add test for, and fix bug with, publishing a bare repo not sending the targets file. + + It should always be published the first time, like the root.json. + + Signed-off-by: Ying Li + +commit c12958af3682e9bb99c9214b98c65340abb365cd +Author: Ying Li +Date: Fri Dec 18 01:51:42 2015 -0800 + + Do not sign the actual targets metadata unless it's dirty. + + Previously we were always signing it, but we can't do that anymore + because then delegated users won't be able to publish ever (they + probably don't have the target key). + + Some other related changes: when role keys are rotated, that role + needs to be marked as dirty now in order to be re-signed and + published. + + Signed-off-by: Ying Li + +commit 7592a029ef214622f0267e4c494ee17ab186268b +Author: Ying Li +Date: Fri Dec 18 00:49:52 2015 -0800 + + Do not create the delegation metadata when the delegation is created. + + Only create it when a target is added to it, or other delegations + are added to it, or when getting a child delegation. + + Signed-off-by: Ying Li + +commit f1761afc253b9dce0430809c876503f20844c64a +Author: Ying Li +Date: Thu Dec 17 22:16:34 2015 -0800 + + Fallback on the parent role if the role to add a target to doesn't exist. + + Signed-off-by: Ying Li + +commit 3ecba2441068e9a6abb25f8838257f80d105eb7c +Author: Ying Li +Date: Thu Dec 17 18:49:25 2015 -0800 + + When publishing, also publish all the dirty targets roles. + + This is in addition to the canonical targets role, which always gets + re-signed and publish (we may want to revisit this later). + + This makes some tests pass - still need to do fallback of roles + and publishing a created delegation role without necessarily + having the signing key for that role. + + Signed-off-by: Ying Li + +commit 9f04ca66f7f01a3b691a1bae1b37116359c03145 +Author: Ying Li +Date: Wed Dec 16 10:31:57 2015 -0800 + + Add tests for publishing targets to delegations, and delegations themselves. + + This involved a refactor test helper function assertPublishSucceeds to + take roles and expected published-to-roles. + + Signed-off-by: Ying Li + +commit 28128c28af78ab176c96017b1f6864dd3ca2cc98 +Merge: 547a17c96b d3a54cab25 +Author: David Lawrence +Date: Fri Dec 18 16:29:07 2015 -0800 + + Merge pull request #379 from endophage/delegated_paths + + the empty string should be used in delegation Paths to indicate a role can sign everything + +commit ed3346eeb0e196a50848c33db81abc5655b01ba8 +Merge: 67d3675d55 2e3f4934a7 +Author: Stephen Day +Date: Fri Dec 18 16:25:14 2015 -0800 + + Merge pull request #1068 from aaronlehmann/manifest-proposal + + docs/spec: Proposal for new manifest format + +commit ecfe9a18bf4c4a75085e23ace67871fcd3cda428 +Merge: 932c4a2d27 39694f1ab4 +Author: Nathan LeClaire +Date: Fri Dec 18 16:16:41 2015 -0800 + + Merge pull request #2627 from dgageot/2626-windows-version-non-english + + FIX #2626 Retrieve windows version on non-english OS + +commit 932c4a2d270b8c15fe7e488726cffab91a943280 +Merge: df8faf56cb dd379d33c8 +Author: Nathan LeClaire +Date: Fri Dec 18 16:15:26 2015 -0800 + + Merge pull request #2629 from dgageot/2617-check-hostonlyif-after-its-creation + + FIX #2617 Check hostonlyif after its creation + +commit d3a54cab25c4d83626608194676b7d40673b71c4 +Author: David Lawrence +Date: Fri Dec 18 15:43:37 2015 -0800 + + the empty string should be used in delegation Paths to indicate a role can sign anything + Signed-off-by: David Lawrence (github: endophage) + +commit 58ebc71272d3facec798664366cc169aa8df8449 +Merge: 54f945994a 1f5674363e +Author: Alexander Morozov +Date: Fri Dec 18 15:25:38 2015 -0800 + + Merge pull request #18763 from calavera/fix_raw_inspect + + Print the raw inspected elements when there is no template for `docker inspect`. + +commit 54f945994a0eb79c43c8c34fc77625dc56c0c421 +Merge: 92605b823d af59752712 +Author: David Calavera +Date: Fri Dec 18 15:13:28 2015 -0800 + + Merge pull request #18651 from vbatts/dm-cleanup + + loopback (and devicemapper) cleanup + +commit df8faf56cbb9d79ec67accd9cfacbfbee9ba0969 +Merge: fbf97b7c73 fd25762c05 +Author: Nathan LeClaire +Date: Fri Dec 18 14:09:18 2015 -0800 + + Merge pull request #2609 from jeanlaurent/vbox.log + + Add vbox.log to crashreport + +commit 9eabcaef992b48d673ba7bde93e1a6d4425d805a +Author: Sebastiaan van Stijn +Date: Tue Dec 15 14:20:00 2015 +0100 + + Update rules for adding/removing maintainers and holidays + + This adds new rules to the maintainers file to clarify + the way maintainers are added and removed from the list. + + Also removed the "holidays" rule, which is not used + in practice. + + Signed-off-by: Sebastiaan van Stijn + +commit 8108539037d4324537da4afdb90fcc605bab64d1 +Author: DJ Enriquez +Date: Fri Dec 18 12:48:13 2015 -0800 + + Relocating documentation to s3 storage-driver doc + + Since the CloudFront middleware does not work without an S3 backend, it + became obvious that this documentation should exist within the S3 + storage-driver documentation. + + Signed-off-by: DJ Enriquez + +commit 547a17c96b13d6b022c53f75a9719a43cfb5d605 +Merge: cde61e4fad d49228ad70 +Author: David Lawrence +Date: Fri Dec 18 12:35:17 2015 -0800 + + Merge pull request #368 from endophage/download_everything + + download all delegated roles when doing downloadTargets + +commit 278e75800c7be10ca43ffb11de25cd342da106fe +Author: Aditi Rajagopal +Date: Fri Dec 18 15:28:17 2015 -0500 + + pkg/version.Version: use the new String() method + + Resolves #18750 + + Signed-off-by: Aditi Rajagopal + +commit 2e3f4934a73b27c22ae8966549e11920ffb28b81 +Author: Aaron Lehmann +Date: Mon Oct 5 14:35:47 2015 -0700 + + docs/spec: Proposal for new manifest format + + This is a follow-on to PR #62, and it borrows much of the format + from #993, but uses specific formats for the image manifest and manifest + list (fat manifest) instead of a combined generic format. + + The intent of this proposed manifest format is to allow multi-arch, and + allow for full content-addressability of images in the Docker engine. + + Signed-off-by: Aaron Lehmann + +commit 92605b823d4facbe9076b58dd0b0d77101529ad9 +Merge: 6ee7c94263 f8dc044aec +Author: Antonio Murdaca +Date: Fri Dec 18 21:09:43 2015 +0100 + + Merge pull request #18761 from anusha-ragunathan/add-build-routes + + Create build router separate from image router. + +commit 4a9f6c7975dd00fa85de16a084fed0734cc83374 +Author: DJ Enriquez +Date: Fri Dec 18 11:55:19 2015 -0800 + + Applying recommended changes + + - Corrected headings + - Added blank line after headings + - Changed example snippet to use `...` + + Signed-off-by: DJ Enriquez + +commit d49228ad70d6b78e1b3882216a3c1ef619a89186 +Author: David Lawrence +Date: Fri Dec 18 11:36:54 2015 -0800 + + fixing copy paste bad var name + Signed-off-by: David Lawrence (github: endophage) + +commit 22ed6876c23973bd8fbf83f5dc3d6fe2527db03a +Author: Carol Fager-Higgins +Date: Thu Dec 10 14:36:21 2015 -0800 + + first draft of RNs, swift documentation to config doc, moved stuff to prior rn + edited cron fixes in RN + edited cron jobs to reflect updates + typo in RN + mentioned users can use 3 parameters to GC + added links to FQDM and upgrade docs + small fixes in GC doc. want to add 2 graphics on line 28 + reordered numbering and removed DTR refs + fixed typos + fixed link + removed broken link per https://docker.atlassian.net/browse/DTR-1595 + removed another broken link + added two more RN issues for RC2 + tweaks to GC + tweaking code in gc doc + added another issue to RNs + minor changes, and adding daemon parameters but need review + added daemon parameters to limit dupe logs + + Signed-off-by: Carol Fager-Higgins + +commit 882df3d42947ff2165d2d0797cd93542f138bb19 +Author: David Lawrence +Date: Fri Dec 18 11:33:50 2015 -0800 + + downloadTargets should continue on ErrMissingMeta, not ErrMetaNotFound. ErrMetaNotFoudn will ocurr when we expect to find the data and don't. ErrMissingMeta indicates it's not in the snapshot and that's OK for targets delegations (technically it's OK for the targets role too, indicating simply an empty repository with lazy targets file creation). + Signed-off-by: David Lawrence (github: endophage) + +commit a2a48705128e61e515af62965b6d12fad86e7042 +Author: David Lawrence +Date: Fri Dec 18 11:21:12 2015 -0800 + + adding comment about priority ordering and updating test for ListTargets with delegates to hit default no roles passed case + Signed-off-by: David Lawrence (github: endophage) + +commit 6ee7c94263e367cfc03c6f08af3bdcd28f70ed7a +Merge: b714e03fdd f946782316 +Author: David Calavera +Date: Fri Dec 18 11:10:55 2015 -0800 + + Merge pull request #18727 from tonistiigi/partial-load + + Add support for partial load + +commit de0e67f571c862569aa904624ae1e82e34578e7d +Merge: 7b1fee929a 219f7192d6 +Author: Isabel Jimenez +Date: Fri Dec 18 10:20:29 2015 -0800 + + Merge pull request #1554 from ezrasilvera/mesosFixLock + + Change the scheduler lock in Mesos cluster + +commit b714e03fddc71b0d1af7a27198ae5a342b8ce39f +Merge: 7f62d311bd 5a64c8027e +Author: Vincent Demeester +Date: Fri Dec 18 17:58:02 2015 +0100 + + Merge pull request #18771 from runcom/authz-fixes-1 + + authZ: more fixes + +commit 7f62d311bdf11f2bd8792c7e90e38edf2f77ef82 +Merge: 64d70de0a2 fa7d676891 +Author: Tibor Vass +Date: Fri Dec 18 17:48:36 2015 +0100 + + Merge pull request #18773 from runcom/rej-gitignore + + .gitignore: do not ignore *.rej + +commit dd379d33c8c905411addb0146ddc02258fde2132 +Author: David Gageot +Date: Fri Dec 18 17:43:05 2015 +0100 + + FIX #2617 Check hostonlyif after its creation + + Signed-off-by: David Gageot + +commit 12a08255b59d181eaaf02e1e06d4d6d057e86bd7 +Merge: 100d6f2fbb 2e9a49b4eb +Author: Aanand Prasad +Date: Fri Dec 18 16:42:05 2015 +0000 + + Merge pull request #2554 from aanand/clarify-rm-behaviour + + Clarify behaviour of 'rm' + +commit 64d70de0a2aa29f565336e896b76c23c879a9a98 +Merge: 1ca6690b4f b0d9476153 +Author: Vincent Demeester +Date: Fri Dec 18 17:19:55 2015 +0100 + + Merge pull request #18721 from tiborvass/remove-dependencies-from-builder + + Remove image and daemon dependencies from builder + +commit fa7d676891d0dda30119ccfcf675a8f49c93073f +Author: Antonio Murdaca +Date: Fri Dec 18 17:12:54 2015 +0100 + + .gitignore: do not ignore *.rej + + Signed-off-by: Antonio Murdaca + +commit 1ca6690b4fbef191d242265c813cc1a4dd8ece25 +Merge: b708a2249b f408b4f463 +Author: Phil Estes +Date: Fri Dec 18 11:07:43 2015 -0500 + + Merge pull request #18561 from hqhq/hq_adapt_at_start + + Adapt container settings when start + +commit af597527121c0ad973e9d0ae4f9cf970da1513cc +Author: Vincent Batts +Date: Mon Dec 14 17:16:34 2015 -0500 + + loopback: separate loop logic from devicemapper + + The loopback logic is not technically exclusive to the devicemapper + driver. This reorganizes the code such that the loopback code is usable + outside of the devicemapper package and driver. + + Signed-off-by: Vincent Batts + +commit a292c04c01cbe4a6c9f74e7cf3b0315249ed8993 +Author: Vincent Batts +Date: Mon Dec 14 17:00:54 2015 -0500 + + devicemapper: remove unused type mapping + + Signed-off-by: Vincent Batts + +commit b708a2249bfa7d9a7bff74b28264fd40ca4e6d1e +Merge: 47060efdb7 defd1519f7 +Author: Brian Goff +Date: Fri Dec 18 10:35:51 2015 -0500 + + Merge pull request #18730 from calavera/remove_sockets_dependency + + Remove api client lib dependency on tlsconfig and sockets packages. + +commit 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1 +Author: Antonio Murdaca +Date: Fri Dec 18 12:34:19 2015 +0100 + + authZ: more fixes + + - fix naming and formatting + - provide more context when erroring auth + - do not capitalize errors + - fix wrong documentation + - remove ugly remoteError{} + + Signed-off-by: Antonio Murdaca + +commit 39694f1ab442498ea05f3c729952d45d77498b3c +Author: David Gageot +Date: Fri Dec 18 16:26:01 2015 +0100 + + FIX #2626 Retrieve windows version on non-english OS + + Signed-off-by: David Gageot + +commit 47060efdb763305ed7c406ac3a62062d9f51ef21 +Merge: 6bf8844f11 aaf65a47a7 +Author: Antonio Murdaca +Date: Fri Dec 18 16:06:07 2015 +0100 + + Merge pull request #18741 from WeiZhang555/debug-info + + Better debug message for post form data + +commit ac45f88ce32d87da28237fe9e268097e89490bf1 +Author: David Gageot +Date: Fri Dec 18 11:44:37 2015 +0100 + + Don't create the VM if no hardware virtualization + + Signed-off-by: David Gageot + +commit fbf97b7c73ef2b30233d3ba6a9f1cbe726bb48c3 +Merge: 0a74068b11 c279d0aba2 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 18 12:19:46 2015 +0100 + + Merge pull request #2610 from jeanlaurent/detect-shell + + Enhance shell detection in `env` command + +commit fd25762c059e72b74ae57c0270d9ac8c8f76cefb +Author: Jean-Laurent de Morlhon +Date: Thu Dec 17 13:42:09 2015 +0100 + + Add vbox.log to crashreport + + Signed-off-by: Jean-Laurent de Morlhon + +commit c279d0aba256e5ee5a5a24048fc772fae68b6b6c +Author: Jean-Laurent de Morlhon +Date: Thu Dec 17 16:25:50 2015 +0100 + + Default to cmd shell on windows + + Signed-off-by: Jean-Laurent de Morlhon + +commit 1e28f04fec70affd8fae57f4bdd23a84853f4efc +Author: Antonio Murdaca +Date: Fri Dec 18 11:28:28 2015 +0100 + + docs: extend: authorization.md: add a note about confidential stuff in Err + + Signed-off-by: Antonio Murdaca + +commit a7bd9e06d20e2daae13bab184f19ba4e93f804c5 +Author: David Gageot +Date: Fri Dec 18 09:47:12 2015 +0100 + + Update B2D cache in PreCreateCheck phase + + Signed-off-by: David Gageot + +commit 3c76d5a46770b68910223456226a5353ce2f51c3 +Author: Stéphane Seguin +Date: Mon Dec 14 22:46:13 2015 +0100 + + Add docker-compose create command. + Closes #1125 + + Signed-off-by: Stéphane Seguin + +commit 0a74068b1128a2b7d3a1c0608ee996ddfd796609 +Merge: 80c9f5bbd9 bbe7a00db5 +Author: David Gageot +Date: Fri Dec 18 08:39:22 2015 +0100 + + Merge pull request #2298 from skatsuta/create-update-iso + + Upgrade the boot2docker.iso cache if possible when creating a VirtualBox machine + +commit 506905fd90babb3cac2d250941d04a108141a5d9 +Author: DJ Enriquez +Date: Thu Dec 17 22:30:10 2015 -0800 + + CloudFront-s3-middleware + + Adding a more detailed document regarding how to use CloudFront as + middleware for an s3 backed registry. + + Signed-off-by: DJ Enriquez + +commit cde61e4fadee965441e2eb4f93c1431711c9f217 +Merge: 016d98c96d 849a318580 +Author: Ying Li +Date: Thu Dec 17 22:15:17 2015 -0800 + + Merge pull request #377 from docker/ensuring-set-meta-creates-parents + + Ensure that SetMeta creates parent directory first + +commit 574b4d543d4a64694d7f64bc9a5dea30cd6b8c17 +Author: David Lawrence +Date: Thu Dec 17 21:28:52 2015 -0800 + + updating ListTargets delegate test to check iteration of children and correct (lack of) overwriting. + Signed-off-by: David Lawrence (github: endophage) + +commit 1f5674363e4dd81c9ecd52ef3e1f252c76784697 +Author: David Calavera +Date: Thu Dec 17 20:46:48 2015 -0500 + + Print the raw inspected elements when there is no template for `docker inspect`. + + Otherwise we're ignoring the fields that Swarm adds to the output. + + Signed-off-by: David Calavera + +commit 849a31858082841404a74d61dfd0600c24004fb3 +Author: Diogo Monica +Date: Thu Dec 17 19:38:49 2015 -0800 + + Ensure that SetMeta creates parent directory first + + Signed-off-by: Diogo Monica + +commit 2bd8322dba34eb5855ca5cd3af04f0f1289b3d45 +Author: Donovan Jones +Date: Fri Dec 18 16:11:03 2015 +1300 + + fix incorrect ip addresses in networkingcontainers + + Signed-off-by: Donovan Jones + +commit 016d98c96d7bd932636c4bf0a1926838f945609c +Merge: 90e22ff5ff ad4c50709f +Author: Riyaz Faizullabhoy +Date: Thu Dec 17 18:24:09 2015 -0800 + + Merge pull request #376 from riyazdf/master + + add extra validation checks to isDelegation + +commit 7b1fee929a9ae0945707fcb434d0c0b11b33f40b +Merge: c60ec6fd23 d00c23094b +Author: Alexandre Beslic +Date: Thu Dec 17 17:53:12 2015 -0800 + + Merge pull request #1555 from vieux/removes + + remove sleep from tests + +commit 638b06b36ad1db56d661b234f151ab1462e1f9e5 +Author: David Lawrence +Date: Thu Dec 17 17:40:44 2015 -0800 + + add assert to make sure a failed typed stack pop doesn't remove the item from the stack + Signed-off-by: David Lawrence (github: endophage) + +commit 67d3675d555e6c46f371c5690599920cb17871ab +Merge: 7f41cd7587 cb6f002350 +Author: Richard Scothern +Date: Thu Dec 17 17:32:55 2015 -0800 + + Merge pull request #1268 from RichardScothern/manifest-refactor-impl + + Implementation of the Manifest Service API refactor. + +commit ad4c50709f656c1ac46371c1069eab3e233e828e +Author: Riyaz Faizullabhoy +Date: Thu Dec 17 17:31:13 2015 -0800 + + add additional length and lowercase checks, change regex to explicitly reject empty string, add hyphen char + + Signed-off-by: Riyaz Faizullabhoy + +commit c60ec6fd232eb76101c30a41fb2446e572c757fd +Merge: 53cf899e31 065551eaaa +Author: Dongluo Chen +Date: Thu Dec 17 17:22:33 2015 -0800 + + Merge pull request #1520 from dongluochen/DocUpdateResource + + Update document on resource occupation. + +commit cb6f0023500c3d2afb8c9f3ee4a0097526192156 +Author: Richard Scothern +Date: Thu Aug 20 21:50:15 2015 -0700 + + Implementation of the Manifest Service API refactor. + + Add a generic Manifest interface to represent manifests in the registry and + remove references to schema specific manifests. + + Add a ManifestBuilder to construct Manifest objects. Concrete manifest builders + will exist for each manifest type and implementations will contain manifest + specific data used to build a manifest. + + Remove Signatures() from Repository interface. + + Signatures are relevant only to schema1 manifests. Move access to the signature + store inside the schema1 manifestStore. Add some API tests to verify + signature roundtripping. + + schema1 + ------- + + Change the way data is stored in schema1.Manifest to enable Payload() to be used + to return complete Manifest JSON from the HTTP handler without knowledge of the + schema1 protocol. + + tags + ---- + + Move tag functionality to a seperate TagService and update ManifestService + to use the new interfaces. Implement a driver based tagService to be backward + compatible with the current tag service. + + Add a proxyTagService to enable the registry to get a digest for remote manifests + from a tag. + + manifest store + -------------- + + Remove revision store and move all signing functionality into the signed manifeststore. + + manifest registration + --------------------- + + Add a mechanism to register manifest media types and to allow different manifest + types to be Unmarshalled correctly. + + client + ------ + + Add ManifestServiceOptions to client functions to allow tags to be passed into Put and + Get for building correct registry URLs. Change functional arguments to be an interface type + to allow passing data without mutating shared state. + + Signed-off-by: Richard Scothern + + Signed-off-by: Richard Scothern + +commit e80591e28f3e13833cca035db3ce0122b1b228ca +Author: Mary Anthony +Date: Mon Dec 14 18:37:16 2015 -0800 + + Fixing layout around options + Fixing some problems in list formats + + Signed-off-by: Mary Anthony + +commit f8dc044aecd6fa00c33dc6a72321a3e249a0b40d +Author: Anusha Ragunathan +Date: Thu Dec 17 16:17:50 2015 -0800 + + Create build router separate from image router. + + Signed-off-by: Anusha Ragunathan + +commit d00c23094be619b1cdb0e786eccc3c06f832b19a +Author: Victor Vieux +Date: Thu Dec 17 16:49:54 2015 -0800 + + remove sleep from tests + + Signed-off-by: Victor Vieux + +commit 53cf899e318e6c998d20e1539feade103043e43e +Merge: 5050e79f83 02553d0727 +Author: Victor Vieux +Date: Thu Dec 17 16:35:29 2015 -0800 + + Merge pull request #1517 from dongluochen/EngineFastFailure + + Use failureCount as a secondary health indicator. + +commit 9307692b52691c1850f3b85daa3fd32cdf9fd7d3 +Author: David Lawrence +Date: Thu Dec 17 16:33:52 2015 -0800 + + reverse priority order or roles for ListTargets and GetTargetsByName + Signed-off-by: David Lawrence (github: endophage) + +commit 6bf8844f1179108b9fabd271a655bf9eaaf1ee8c +Merge: ff69b23dc0 881a30c707 +Author: Doug Davis +Date: Thu Dec 17 19:26:41 2015 -0500 + + Merge pull request #18759 from mikedanese/doc-fix + + daemon/logger: fix typo in godoc + +commit defd1519f77ef0caaab2cfeeb6433c8a24c62ffc +Author: David Calavera +Date: Wed Dec 16 20:32:17 2015 -0500 + + Remove api client lib dependency on tlsconfig and sockets packages. + + - Let consumers to configure the http transport initially and apply or + defaults on top. + - Add function to initialize a new client based on environment + variables, useful for integrators. + + Signed-off-by: David Calavera + +commit 594049b24fbfca64d39104ccc4e5d036903c8f06 +Author: David Lawrence +Date: Thu Dec 17 15:53:57 2015 -0800 + + fixing download to continue if we get ErrMetaNotFound + Signed-off-by: David Lawrence (github: endophage) + +commit 881a30c707141b06af0cc7a076b62ff338615f2b +Author: Mike Danese +Date: Thu Dec 17 15:51:20 2015 -0800 + + daemon/logger: fix typo in godoc + + Signed-off-by: Mike Danese + +commit 2c39fa2214fbe1ebaf420fd8123eec2284a8275f +Author: Riyaz Faizullabhoy +Date: Thu Dec 17 15:47:38 2015 -0800 + + simplify and clean logic, gofmt + + Signed-off-by: Riyaz Faizullabhoy + +commit e82371e687a77b40f4afe95a2d59713d1f014f1d +Author: Riyaz Faizullabhoy +Date: Thu Dec 17 14:19:15 2015 -0800 + + add extra validation checks to isDelegation + + Signed-off-by: Riyaz Faizullabhoy + +commit a58150b5c8320eda758b42a857a41b6ba1f3d541 +Merge: 5f4391e3c1 5b3720afba +Author: Jess Frazelle +Date: Thu Dec 17 15:43:59 2015 -0800 + + Merge pull request #45 from thaJeztah/add-containerd + + Add containerd + +commit 5b3720afba1e4ea7b6ce85eabd14033ff3e19b0e +Author: Sebastiaan van Stijn +Date: Fri Dec 18 00:31:49 2015 +0100 + + Add containerd + + Signed-off-by: Sebastiaan van Stijn + +commit f72f7998063e14ef0db54d7e33d5ea86484e99b3 +Author: David Lawrence +Date: Thu Dec 17 14:56:05 2015 -0800 + + fixing up ListTargets and GetTargetByName to process prioritized roles more efficiently + Signed-off-by: David Lawrence (github: endophage) + +commit 7f41cd7587fb4c3e21fccfe72420eef8ed7bba89 +Merge: 9162760443 be1f4114c7 +Author: Stephen Day +Date: Thu Dec 17 14:10:12 2015 -0800 + + Merge pull request #1257 from aaronlehmann/remove-extra-stat + + Remove unnecessary stat from blob Get method + +commit 19090252b9110b5324c80bdfd38889abc20e2c5e +Merge: d060ef4d2a 1b44c2007c +Author: Alexandre Vázquez +Date: Thu Dec 17 23:01:26 2015 +0100 + + Merge remote-tracking branch 'kitematic/master' + +commit ff69b23dc09e544fb8ae9dccbd1f7992d2005b70 +Merge: 5553aab705 4b55765c11 +Author: Jess Frazelle +Date: Thu Dec 17 13:59:00 2015 -0800 + + Merge pull request #18395 from LK4D4/default_cgroup_is_not_daemon + + Use /docker as cgroup parent instead of docker + +commit 5050e79f83e1b82037f4bd7da978dc313c904f15 +Merge: 2a9e162556 5e8998eb6d +Author: Victor Vieux +Date: Thu Dec 17 13:27:42 2015 -0800 + + Merge pull request #1552 from abronan/fix_lock_ttl_store_failure + + Fix Consul Lock TTL with store failure + +commit fab75bffb01486ca73edb5b72868929007cf7d40 +Author: Christy Perez +Date: Wed Dec 16 17:56:28 2015 -0600 + + Update gcc from 5.2 to 5.3 + + gcc 5.3 is out, so let's use the new one! + + Signed-off-by: Christy Perez + +commit 5553aab705d7ffed1bee94b8df860a36af767a20 +Merge: 406da8616c 1d2b62ceae +Author: Alexander Morozov +Date: Thu Dec 17 10:50:04 2015 -0800 + + Merge pull request #18744 from runcom/plugins-deadcode + + pkg: plugins: remove dead code + +commit 4243b258b38717a1caac2a885f6d39dc4a51ad44 +Author: David Lawrence +Date: Wed Dec 16 21:46:54 2015 -0800 + + making GetTargetsByName work with delegations + Signed-off-by: David Lawrence (github: endophage) + +commit 406da8616ccc13795cb85b9a34c459d3cda2ae82 +Merge: 9681f0f0d4 2236ecddfb +Author: David Calavera +Date: Thu Dec 17 10:23:59 2015 -0800 + + Merge pull request #18716 from clnperez/fix-blkio-tests + + Update TestRunWithBlkioInvalidDevice Tests + +commit 2a9e162556e24ecf00075a2a666673c843238fe6 +Merge: 91f9a4e89b 2cfa251165 +Author: Alexandre Beslic +Date: Thu Dec 17 10:13:55 2015 -0800 + + Merge pull request #1553 from fsoppelsa/readme-contributelinks + + Readme contributelinks + +commit 4a9ebb8bc804467ef5e28168f38d8fc72d0056a7 +Author: David Lawrence +Date: Wed Dec 16 20:05:51 2015 -0800 + + adding test for ListTargets with delegation + Signed-off-by: David Lawrence (github: endophage) + +commit 4694178bbec992d2eee5ac49151497b913d83a47 +Author: David Lawrence +Date: Wed Dec 16 13:24:58 2015 -0800 + + download delegation test + Signed-off-by: David Lawrence (github: endophage) + +commit 377b72a54fea727461123f38291d437f41082aa8 +Author: David Lawrence +Date: Tue Dec 15 16:28:34 2015 -0800 + + updating list targets to list across multiple roles + Signed-off-by: David Lawrence (github: endophage) + +commit 8f7e7adcefdb46150b68dac5e82fbf5944057e4a +Author: David Lawrence +Date: Tue Dec 15 15:51:47 2015 -0800 + + making stack thread safe + Signed-off-by: David Lawrence (github: endophage) + +commit 4982cc7c42ad0ad6a90d06aa0dc5aaa45166c949 +Author: David Lawrence +Date: Tue Dec 15 15:27:34 2015 -0800 + + adding stack tests + Signed-off-by: David Lawrence (github: endophage) + +commit 33d39afdf5c3023b4460bfa83d98df37c1950a58 +Author: David Lawrence +Date: Tue Dec 15 15:15:37 2015 -0800 + + download all delegated roles when doing downloadTargets + Signed-off-by: David Lawrence (github: endophage) + +commit 90e22ff5ff8a7342e713f16a20e5f64e34a35a23 +Merge: 7d688f7ea1 15ad91eea3 +Author: David Lawrence +Date: Thu Dec 17 10:06:01 2015 -0800 + + Merge pull request #373 from cyli/add-remove-delegation + + Add support for creating/deleting a delegation to Notary Repository + +commit 7d688f7ea1cdc10305af9f2553cd0a272cd5818a +Merge: e137ea02d7 e0dd8c82bf +Author: David Lawrence +Date: Thu Dec 17 10:01:06 2015 -0800 + + Merge pull request #370 from endophage/server_delegation_support + + server side delegations support in validation and snapshot generation + +commit 94fb7458eae64ad58853bf7170790848c8979af9 +Author: Stefan Scherer +Date: Thu Dec 17 18:55:45 2015 +0100 + + Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile + + Signed-off-by: Stefan Scherer + +commit 43ee5643261f9b8741ab23a1749b3d55e13171c5 +Author: Govinda Fichtner +Date: Wed Dec 16 23:01:51 2015 +0100 + + update Dockerfile to reflect latest changes + + Signed-off-by: Govinda Fichtner + +commit 2e9a49b4eb48d7611543bf5cb34130e8f5448dff +Author: Aanand Prasad +Date: Thu Dec 17 17:50:45 2015 +0000 + + Clarify behaviour of 'rm' + + Signed-off-by: Aanand Prasad + +commit 80c9f5bbd9b0cc5f90e990c81c2f899a13eec5fe +Merge: 32795c9d1f dcdbd84452 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 17 17:46:58 2015 +0100 + + Merge pull request #2605 from askb/update_bash_comp + + update the bash completion with new options added. + +commit 219f7192d67c2d3a215d9362cb03f2739323b199 +Author: Ezra Silvera +Date: Thu Dec 17 18:20:57 2015 +0200 + + Change the scheduler lock in Mesos cluster + + Signed-off-by: Ezra Silvera + +commit 9681f0f0d4457f0e8dfb0c0473557a97e0cfef2b +Merge: 742fd4fa63 0d9f1e344a +Author: Tibor Vass +Date: Thu Dec 17 16:58:41 2015 +0100 + + Merge pull request #18745 from runcom/pkg-version-String + + pkg: version: add String method + +commit b0d947615335fe115b5b93c0c09912a4888e5b29 +Author: Tibor Vass +Date: Wed Dec 16 19:19:12 2015 +0100 + + builder: remove daemon dependency in ContainerAttach + + Signed-off-by: Tibor Vass + +commit 03a170c48d660be72c387f1821ca48a713dd1cea +Author: Tibor Vass +Date: Wed Dec 16 17:56:49 2015 +0100 + + builder: remove daemon dependency in ContainerCreate() + + Signed-off-by: Tibor Vass + +commit c07067c7e4e08a449bbe8165161e65588b54c09d +Author: Jean-Laurent de Morlhon +Date: Thu Dec 17 16:05:13 2015 +0100 + + Detect fish shell + + Signed-off-by: Jean-Laurent de Morlhon + +commit 742fd4fa633bfb105e501b74cc27871a972e8001 +Merge: 98be580794 e0db2fa4da +Author: Sebastiaan van Stijn +Date: Thu Dec 17 15:43:14 2015 +0100 + + Merge pull request #18739 from wenchma/typo + + Fix typo error and update index + +commit 98be580794923df223ea623c55311c290d402c54 +Merge: 3f4dc49210 891bbc17ec +Author: Antonio Murdaca +Date: Thu Dec 17 14:44:05 2015 +0100 + + Merge pull request #18590 from aaronlehmann/limit-v1-fallbacks + + Limit v1 protocol fallbacks + +commit 100d6f2fbbae209457c48355c4340bbb63cd3000 +Merge: c8f63306e0 a542041264 +Author: Aanand Prasad +Date: Thu Dec 17 12:21:15 2015 +0000 + + Merge pull request #2552 from dbonev/2452-implement-cpu-quota + + Added support for cpu_quota flag + +commit 3f4dc492102bf4bceea92a59c78439420f7527c9 +Merge: 5baa93c04e 597835e645 +Author: Sebastiaan van Stijn +Date: Thu Dec 17 12:16:23 2015 +0100 + + Merge pull request #18743 from wenchma/plugin_not_found + + Sync the docker network create api docs with the error code + +commit 0d9f1e344a629e5abcd6a385952d22d19555f125 +Author: Antonio Murdaca +Date: Thu Dec 17 11:52:23 2015 +0100 + + pkg: version: add String method + + Signed-off-by: Antonio Murdaca + +commit 5baa93c04ef4a195df397914baf0a980c93d1271 +Merge: 0f749ad55a 46e3a249a1 +Author: Sebastiaan van Stijn +Date: Thu Dec 17 11:12:27 2015 +0100 + + Merge pull request #18662 from runcom/pkg-authZ-response + + pkg: authorization: add Err to tweak response status code + +commit 46e3a249a1971f8697ca338c9b02e27d36ddab12 +Author: Antonio Murdaca +Date: Tue Dec 15 09:49:18 2015 +0100 + + pkg: authorization: add Err to tweak response status code + + Signed-off-by: Antonio Murdaca + +commit 1d2b62ceae17238f842bb2a7febf1bead8a982d5 +Author: Antonio Murdaca +Date: Thu Dec 17 11:05:50 2015 +0100 + + pkg: plugins: remove dead code + + Signed-off-by: Antonio Murdaca + +commit 597835e6454be55963959f5f9d586b71517a7f1e +Author: Wen Cheng Ma +Date: Thu Dec 17 17:48:50 2015 +0800 + + Sync the docker network create api docs with the error code + + Signed-off-by: Wen Cheng Ma + +commit 0f749ad55ab794872e601b4f665b07c0be07abfc +Merge: cf0acc8eb9 755f8609f6 +Author: Vincent Demeester +Date: Thu Dec 17 10:11:18 2015 +0100 + + Merge pull request #18559 from ahmetalpbalkan/return-container-networks + + Proposal: Add container networks list to /containers/json + +commit cf0acc8eb9bb83f0f8d603d72aeb3eef10de9da2 +Merge: 905f3336b2 f7ed97a630 +Author: Vincent Demeester +Date: Thu Dec 17 09:10:09 2015 +0100 + + Merge pull request #18622 from runcom/return-err + + layer: layer_store.go: return on error + +commit 2cfa251165468c241d7cacb76cc336f7406af6a4 +Author: Fabrizio Soppelsa +Date: Wed Dec 16 23:30:41 2015 -0800 + + Add the Swarm contribute link and correct a "here" without link + + Signed-off-by: Fabrizio Soppelsa + +commit aaf65a47a7a6d9e45b77815ea252a302eefe1096 +Author: Zhang Wei +Date: Thu Dec 17 15:55:39 2015 +0800 + + Better debug message for post form data + + Print json format instead of default `%q` + + Signed-off-by: Zhang Wei + +commit e0db2fa4da8f4de861ff83e6f19e7e6d4251289d +Author: Wen Cheng Ma +Date: Thu Dec 17 15:40:10 2015 +0800 + + Fix typo error and update index + + Signed-off-by: Wen Cheng Ma + +commit e0dd8c82bffb95eba312395d42141c2fc36c1a66 +Author: David Lawrence +Date: Wed Dec 16 22:00:58 2015 -0800 + + removing TODO for delegated roles on server + Signed-off-by: David Lawrence (github: endophage) + +commit dcdbd84452bbf4823cfb36725037022aa913115b +Author: Anil Belur +Date: Thu Dec 17 10:20:22 2015 +0530 + + Updated the bash completion with new options added. + now changes should reflect the following: + dm ls --timeout + dm env --no-proxy + dm --bugsnag-api-token --github-api-token + + Signed-off-by: Anil Belur + +commit ad0582ae9cc083fbfdc8c6c6892d232080db7b61 +Author: David Lawrence +Date: Wed Dec 16 19:27:04 2015 -0800 + + test that a child role gets removed from the update if it doesn't exist in the parent + Signed-off-by: David Lawrence (github: endophage) + +commit 15ad91eea3173549396f890d0950a951a81d2d4c +Author: Ying Li +Date: Wed Dec 16 18:29:54 2015 -0800 + + Add tests for not being able to write changefiles when changing delegations. + + This involves refactoring some of the previous write error code. + + Signed-off-by: Ying Li + +commit e137ea02d7bf53a8a3e80fff3390c6841430cdcd +Merge: b5c077dd95 478b6f93e0 +Author: Riyaz Faizullabhoy +Date: Wed Dec 16 18:15:39 2015 -0800 + + Merge pull request #374 from docker/changing-version + + Changing version to current + 0.1 + +commit c917c0b884c47f819b5c832c61397e48423842fa +Author: Ying Li +Date: Wed Dec 16 17:54:50 2015 -0800 + + Split AddDelegation test so more more levels + + Signed-off-by: Ying Li + +commit a27e4f747180d0ec3fa7b08d99d1d1a8a3605529 +Author: David Lawrence +Date: Wed Dec 16 16:42:27 2015 -0800 + + moving comment about sorting for clarity + Signed-off-by: David Lawrence (github: endophage) + +commit a3002aafd81862345834735c7724d8557c156e2a +Author: David Lawrence +Date: Wed Dec 16 16:41:34 2015 -0800 + + make roles sort alphabetically when equivalent number of segments + Signed-off-by: David Lawrence (github: endophage) + +commit 478b6f93e00777744d63d455081fd74bf85c3fc0 +Author: Diogo Monica +Date: Wed Dec 16 16:22:00 2015 -0800 + + Changing version to current + 0.1 + + Signed-off-by: Diogo Monica + +commit 351d5483b7e354a2c0b07e67d2037e81108d7504 +Author: Ying Li +Date: Wed Dec 16 15:52:11 2015 -0800 + + Implement RemoveDelegation for NotaryRepository. + + Signed-off-by: Ying Li + +commit c72934794ae834a4e52377ccc02e7a0241d69d84 +Author: Ying Li +Date: Wed Dec 16 15:41:14 2015 -0800 + + Implement AddDelegation for NotaryRepository. + + Signed-off-by: Ying Li + +commit 6fb531faee3d03ef9f573e97da941b10fc64dc9a +Author: Ying Li +Date: Wed Dec 16 13:38:54 2015 -0800 + + Add a test that applyTargetsChange for invalid delegation parents. + + It will not create a delegation role if the parent doesn't exist. + + Signed-off-by: Ying Li + +commit 5e8998eb6de2aac88e080575970701d2179fc52c +Author: Alexandre Beslic +Date: Wed Dec 16 15:46:11 2015 -0800 + + Fix Consul Lock TTL with store failure + + If using the Lock TTL feature with Consul, the code + path in libkv is issuing a Put in the background through + the PeriodicRenewal call. The error is then eaten up and + ignored on the candidate loop. This would lead to the + candidate and followers being stuck in their candidate + loop. Consequence would be that they would not retry to + take the lock ending in a state with no Leader. + + This patch restores an explicit error check instead of + wrongfully passing on the error to the channel before + giving it back to the caller. + + Signed-off-by: Alexandre Beslic + +commit 32795c9d1fb4f43216df62bddb4172cb8244496d +Merge: 6643d0e53e 552967fc00 +Author: Nathan LeClaire +Date: Wed Dec 16 15:45:54 2015 -0800 + + Merge pull request #2604 from nathanleclaire/bump_v0.5.5_dev + + Bump version to 0.5.5-dev + +commit 552967fc00cb4f28c9d1f788b678599627290f59 +Author: Nathan LeClaire +Date: Wed Dec 16 15:38:09 2015 -0800 + + Bump version to 0.5.5-dev + + Signed-off-by: Nathan LeClaire + +commit 6643d0e53ed8f7a15391425d8336d6734bc9a097 +Merge: 5b5163812c 403fe4a98a +Author: Nathan LeClaire +Date: Wed Dec 16 15:23:27 2015 -0800 + + Merge pull request #2603 from nathanleclaire/bump_version_0.5.4 + + Bump version to 0.5.4 + +commit 38d21750874ed7dec3702c7abe186b8b6bdb8022 +Author: David Lawrence +Date: Wed Dec 16 12:09:11 2015 -0800 + + tests for new validation code + Signed-off-by: David Lawrence (github: endophage) + +commit 829254a98cbfbd78a6bf8e08af64befa95bc1b89 +Author: David Lawrence +Date: Wed Dec 16 10:56:15 2015 -0800 + + minor test cleanup and small new tests + Signed-off-by: David Lawrence (github: endophage) + +commit 309ef5679196bb66c36a3be12b9656a8b8791ee6 +Author: David Lawrence +Date: Wed Dec 16 10:41:15 2015 -0800 + + adding tests for RoleList + Signed-off-by: David Lawrence (github: endophage) + +commit 63ecf5f92f13c7afd9014a178f65053b627cff43 +Author: David Lawrence +Date: Tue Dec 15 23:11:58 2015 -0800 + + server side delegations support in validation and snapshot generation + Signed-off-by: David Lawrence (github: endophage) + +commit 891bbc17ec2623897e32a3b9116cb2047ba70fdd +Author: Aaron Lehmann +Date: Mon Dec 7 11:05:48 2015 -0800 + + Make v1 pull/push output consistent with v2 + + - Use layer DiffIDs for progress output in v1 push. This makes the + output consistent with v2 pushes, which means that a fallback to v1 + won't start progress bars for a different set of IDs. + + - Change wording used in v1 status updates to be consistent with v2. + + Signed-off-by: Aaron Lehmann + +commit a57478d65f1f5782cc746c260f9d841a0907ce54 +Author: Aaron Lehmann +Date: Fri Dec 4 13:42:33 2015 -0800 + + Do not fall back to the V1 protocol when we know we are talking to a V2 registry + + If we detect a Docker-Distribution-Api-Version header indicating that + the registry speaks the V2 protocol, no fallback to V1 should take + place. + + The same applies if a V2 registry operation succeeds while attempting a + push or pull. + + Signed-off-by: Aaron Lehmann + +commit b5c077dd959328d0632b39814e110dc71da17b19 +Merge: 56ab7292e7 22aefc9317 +Author: Ying Li +Date: Wed Dec 16 14:55:24 2015 -0800 + + Merge pull request #371 from cyli/add-target-picks-delegation + + Add/Remove targets takes a list of roles to modify + +commit 22aefc93178900d278de972ab7d92bcf0d14ea4c +Author: Ying Li +Date: Wed Dec 16 11:42:35 2015 -0800 + + Make the addChange code easier to read using the IsDelegation function + + Signed-off-by: Ying Li + +commit 91627604434db8ac744db66b8d83554767ada3c1 +Merge: 200cbe8b8e 4c850e7165 +Author: Stephen Day +Date: Wed Dec 16 14:24:11 2015 -0800 + + Merge pull request #1271 from aaronlehmann/remove-tarsum + + Remove tarsum support for digest package + +commit 905f3336b2715b3960b5ff4f860db387797d9adf +Merge: cd1ace316d 6287ec9095 +Author: David Calavera +Date: Wed Dec 16 14:23:47 2015 -0800 + + Merge pull request #15964 from duglin/APIVersion + + Add a DOCKER_API_VERSION env var + +commit 403fe4a98a4f6e17a06eb73dfd2dacf4552e3810 +Author: Nathan LeClaire +Date: Wed Dec 16 14:20:32 2015 -0800 + + Bump version to 0.5.4 + + Signed-off-by: Nathan LeClaire + +commit cd1ace316df667719da810e2998c72dd2f2ef566 +Merge: dc81c25031 22023e05a3 +Author: David Calavera +Date: Wed Dec 16 14:16:12 2015 -0800 + + Merge pull request #18671 from saturnism/patch-1 + + Updated REX-Ray plugin platform support. + +commit dc81c2503163025ec5835cf11c53164a437bad6c +Merge: e21d06a972 eeb2d4c1ad +Author: Tibor Vass +Date: Wed Dec 16 23:08:02 2015 +0100 + + Merge pull request #18586 from tonistiigi/tag-reference-squashed + + Improve reference validation + +commit f946782316ea5fa635773587bd4c6da7ecf118b8 +Author: Tonis Tiigi +Date: Wed Dec 16 13:46:40 2015 -0800 + + Add support for partial load + + Missing layers in tar will not cause an error if + layers are already loaded before. + + Fixes #18723 + + Signed-off-by: Tonis Tiigi + +commit e21d06a972b0edb44030db72b35e4882f05082e4 +Merge: 3805c29099 89ab39b050 +Author: David Calavera +Date: Wed Dec 16 13:34:06 2015 -0800 + + Merge pull request #18717 from anusha-ragunathan/rm-mount-bld-iface + + Remove Mount/Unmount from Builder interface. + +commit 5b5163812ce3b34b699464c2ef020c277d01cc03 +Merge: 43a48dc235 aa9ff22395 +Author: Nathan LeClaire +Date: Wed Dec 16 13:33:01 2015 -0800 + + Merge pull request #2599 from jeanlaurent/extract-recording + + Remove Logrus follow-up + +commit 43a48dc235ef83130c894ed8f745ea7c46f7c120 +Merge: fca8c187b1 c4799621dc +Author: Nathan LeClaire +Date: Wed Dec 16 13:32:46 2015 -0800 + + Merge pull request #2598 from jeanlaurent/logrus-vendoring + + Remove logrus vendoring + +commit 89f4858c3ed29aa32cf48a8e5401f6a4b0ebbeaf +Author: Ying Li +Date: Wed Dec 16 11:31:49 2015 -0800 + + Stealing @endophage's code to add an IsDelegation function that takes a name. + + Signed-off-by: Ying Li + +commit 0bec06eb9b31adb32e30bf68968d7645606084ef +Author: Ying Li +Date: Wed Dec 16 00:14:09 2015 -0800 + + RemoveTarget now takes an optional variadic list of roles to remove from. + + If none are provided, it defaults to the targets role, as before. + + Signed-off-by: Ying Li + +commit 19c49cf7ceea2e6eca4694ae7705d729031a416e +Author: Ying Li +Date: Tue Dec 15 17:21:36 2015 -0800 + + AddTarget now takes an optional variadic list of roles to add target to. + + If none are provided, it defaults to the targets role, as before. + + Signed-off-by: Ying Li + +commit 3805c2909948c3827f242b1a8843320bddde9796 +Merge: cf7ccaf370 233a4fc33c +Author: Brian Goff +Date: Wed Dec 16 16:15:52 2015 -0500 + + Merge pull request #18695 from dnephin/move_parse_link + + Move ParseLink and validators into runconfig.parse where they are used + +commit 065551eaaaaeac9693975ea49aa6384b24a8dee2 +Author: Dong Chen +Date: Wed Dec 9 14:01:13 2015 -0800 + + Update documents on resource occupation. + + Signed-off-by: Dong Chen + +commit eeb2d4c1adbe4e00f9fbcdc70f9ac31997968e1d +Author: Tonis Tiigi +Date: Thu Dec 10 11:01:34 2015 -0800 + + Clean up reference type switches + + Signed-off-by: Tonis Tiigi + +commit 15d84a3a48efa12ed8bdc500f28ca58a7b1d1083 +Author: Tonis Tiigi +Date: Wed Dec 9 23:31:38 2015 -0800 + + Improve reference parse errors + + Fixes #18093 + + Signed-off-by: Tonis Tiigi + +commit c1040b222c2520f8a0ebe14e81b5b7fe188e8dc6 +Author: Tonis Tiigi +Date: Wed Dec 9 23:21:17 2015 -0800 + + Remove unused repoinfo + + Signed-off-by: Tonis Tiigi + +commit ffded61dad76e4c6530359d879afe83907e409a7 +Author: Tonis Tiigi +Date: Fri Dec 11 11:00:13 2015 -0800 + + Update Named reference with validation of conversions + + Signed-off-by: Tonis Tiigi + +commit 2655954c2dd9d92c2394b04e4262543174c4c038 +Author: Tonis Tiigi +Date: Fri Dec 4 13:55:15 2015 -0800 + + Add own reference package wrapper + + Signed-off-by: Tonis Tiigi + +commit cf7ccaf370b62fdf6d5b872f3c582370793656a9 +Merge: 8ec00e6d0e 4d8ce0ef4a +Author: Vincent Demeester +Date: Wed Dec 16 20:56:43 2015 +0100 + + Merge pull request #18722 from calavera/remove_unused_packages + + Remove timeoutconn package, it's not used anywhere + +commit 8ec00e6d0ecc49454e84d8bc67d9aeb9f1430e3f +Merge: f8140332c0 81c334fa56 +Author: Vincent Demeester +Date: Wed Dec 16 20:45:55 2015 +0100 + + Merge pull request #18518 from MHBauer/spurious-timing + + adjust test sleep timing to avoid spurious failure + +commit f8140332c0ea83a0821550452ed0aa26e2df3b3b +Merge: f57d56350e a016ec6fd1 +Author: Alexander Morozov +Date: Wed Dec 16 11:27:02 2015 -0800 + + Merge pull request #18719 from jfrazelle/vendor-updates + + update and run vendor script + +commit f57d56350ecf02a88f38219f55cbc42c1a9e07b5 +Merge: b44b5bbc8b f9befce2d3 +Author: Vincent Batts +Date: Wed Dec 16 14:26:40 2015 -0500 + + Merge pull request #18686 from cpuguy83/fix_btrfs_subvol_delete_panic + + Fix btrfs recursive btrfs subvol delete + +commit a5420412646d5d8912949d2b114f364162fd2cd1 +Author: Dimitar Bonev +Date: Wed Dec 16 21:25:30 2015 +0200 + + Added support for cpu_quota flag + + Signed-off-by: Dimitar Bonev + +commit 233a4fc33ccaf279cc5a0ad1842ef5b053cccde7 +Author: Daniel Nephin +Date: Tue Dec 15 21:36:35 2015 -0500 + + Move ParseLink and validators into runconfig.parse where they are used. + + Signed-off-by: Daniel Nephin + +commit 4d8ce0ef4a1ebf992906056f46b3f664b0bd30a4 +Author: David Calavera +Date: Wed Dec 16 13:51:56 2015 -0500 + + Remove timeoutconn package. + + It's not used anywhere. + + Signed-off-by: David Calavera + +commit b44b5bbc8ba48f50343602a21e7d44c017c1e23d +Merge: c2276c1fe3 4fef42ba20 +Author: David Calavera +Date: Wed Dec 16 10:48:59 2015 -0800 + + Merge pull request #18682 from calavera/replace_units_package + + Replace pkg/units with docker/go-units. + +commit 68b07c0af947956581b1c3c1692ab5d8f96af73d +Author: Katrina Owen +Date: Wed Dec 16 11:13:01 2015 -0700 + + docs: remove ubuntu version in dockerizing userguide + + The docs/installation/mac guide causes a user to download the + `ubuntu` image, which defaults to `ubuntu:latest`. + + After installing the next logical step is to work through + the userguide. If the userguide specifies ubuntu:14.04, then + a second ubuntu image will be downloaded. + + On slow internet connections this takes a long time. + The cost of specificity in this case seems higher than the value. + + Since this might be the first or second interaction a user has + with docker, they might not realize that they can remove the ":14.04" + bit to use the image that was previously downloaded. + + Signed-off-by: Katrina Owen + +commit 9be1ec60d4d4fe63d5ef6e1ec36c585b548a00d0 +Author: Tibor Vass +Date: Wed Dec 16 17:01:36 2015 +0100 + + builder: remove dependency on image + + Signed-off-by: Tibor Vass + +commit c2276c1fe30f53f6a86ad8da916934defe39f55d +Merge: 64377e3466 9b99591054 +Author: Antonio Murdaca +Date: Wed Dec 16 19:05:07 2015 +0100 + + Merge pull request #18693 from dnephin/move_parse_docker_host + + Move ParseDockerDaemonHost to opts/ package + +commit a016ec6fd168016d94d6cfd1e2189f8c25f6de1f +Author: Jessica Frazelle +Date: Wed Dec 16 09:58:20 2015 -0800 + + update and run vendor script + + so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :) + + Signed-off-by: Jessica Frazelle + +commit 64377e3466db413d71003c4890702598ad1f6c89 +Merge: ebb1d56ecb b0a18d57a7 +Author: David Calavera +Date: Wed Dec 16 09:49:06 2015 -0800 + + Merge pull request #18694 from duglin/BetterError + + Add the filename to the error message while trying to parse the config file + +commit ebb1d56ecb21ff9833159a52766561bb82be285b +Merge: 8f2a15b880 baba1a8493 +Author: Brian Goff +Date: Wed Dec 16 12:40:31 2015 -0500 + + Merge pull request #18705 from runcom/cleanups + + Cleanups + +commit 4fef42ba206ac90346e6e0fe25bead3f77dc4b0f +Author: David Calavera +Date: Wed Dec 16 12:26:49 2015 -0500 + + Replace pkg/units with docker/go-units. + + Signed-off-by: David Calavera + +commit 0609342d04e3e5fbcf17f36c5affef5073643636 +Author: David Calavera +Date: Wed Dec 16 12:25:54 2015 -0500 + + Vendor go-units and libcontainer. + + Libcontainer depends on the new package now to avoid cycled + dependencies. + + Signed-off-by: David Calavera + +commit 8f2a15b88096b3196356240eac5704a17949a9ea +Merge: 6f930a2ffa cc62a88524 +Author: Brian Goff +Date: Wed Dec 16 12:23:34 2015 -0500 + + Merge pull request #18703 from runcom/nit-plugins-volume + + docs: extend: plugins_volume.md: Err default to empty string + +commit 89ab39b050e0b6bbb7766a4662132b1b7bc8545f +Author: Anusha Ragunathan +Date: Wed Dec 16 09:11:57 2015 -0800 + + Remove Mount/Unmount from Builder interface. + + Signed-off-by: Anusha Ragunathan + +commit 2236ecddfb89dcc09ba1f4f416b1e44e17308497 +Author: Christy Perez +Date: Wed Dec 16 10:58:31 2015 -0600 + + Update TestRunWithBlkioInvalidDevice Tests + + /dev/sda wasn't an invalid device and this test failed, so, hopefully + /dev/sdX isn't going to exist in other envs. + + Signed-off-by: Christy Perez + +commit 6f930a2ffa57b022947743d6f16751a27b93fbed +Merge: 39fea54b2b f480b7c1f5 +Author: Sebastiaan van Stijn +Date: Wed Dec 16 16:58:25 2015 +0100 + + Merge pull request #18700 from mqliang/patch-2 + + Update dockernetworks.md + +commit aa9ff223953b9ee19806f0246b92fb0f120c4c0d +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 16:54:10 2015 +0100 + + Test distinguish stdout from stderr + + Signed-off-by: Jean-Laurent de Morlhon + +commit 39fea54b2bf99dccd7fb2cc6a3835242b7ab731c +Merge: bb2c92355c e1f012cf39 +Author: Sebastiaan van Stijn +Date: Wed Dec 16 16:53:46 2015 +0100 + + Merge pull request #18696 from mqliang/patch-1 + + fix typo in dockerlinks.md + +commit 854219d44a001428a8aefaf212bd7aba882fc857 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 16:51:03 2015 +0100 + + Clearer writer name + + Signed-off-by: Jean-Laurent de Morlhon + +commit baba1a84935bd2114d48f1f4823ee9c379d62e68 +Author: Antonio Murdaca +Date: Wed Dec 16 16:35:35 2015 +0100 + + reorder imports with goimports + + Signed-off-by: Antonio Murdaca + +commit 728114286861e6dc78b00926895b69776ea8b89d +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 16:35:19 2015 +0100 + + Extract Recording Code + + Signed-off-by: Jean-Laurent de Morlhon + +commit c8f63306e0bc390d99a417a2b6eec71cd639e35a +Merge: ae7e48ea2f bc843d6758 +Author: Aanand Prasad +Date: Wed Dec 16 15:25:34 2015 +0000 + + Merge pull request #2550 from dbonev/1236-restart-to-exit-with-non-zero + + Start, restart, pause and unpause exit with non-zero if nothing to do + +commit ae7e48ea2f23ce3016025d7682a42df68fc68f3d +Merge: 5b32d32b2d 1d3aeaaae7 +Author: Aanand Prasad +Date: Wed Dec 16 15:18:10 2015 +0000 + + Merge pull request #2526 from dnephin/remove_extra_coverage_files + + Ignore extra coverage files + +commit c4799621dc38be7a6c1e010d06541473088d5755 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 16:16:59 2015 +0100 + + Remove logrus vendoring + + Signed-off-by: Jean-Laurent de Morlhon + +commit fca8c187b1ba408abe4cc38d60b1367d10a52ac4 +Merge: 190e946f87 06c97cfb17 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 15:52:49 2015 +0100 + + Merge pull request #2592 from nathanleclaire/stdout_stderr_redirect + + Fix STDOUT and STDERR direction based on Log.* calls + +commit 190e946f87d073b778104bb2f191a8e433200bf4 +Merge: fb916f2389 93456ab28c +Author: Jean-Laurent de Morlhon +Date: Wed Dec 16 15:31:02 2015 +0100 + + Merge pull request #2597 from felixge/virtualbox-sendfile-warning + + docs: warn about virtualbox sendfile issue + +commit b0a18d57a73bf6b6bd2b7ea71de6065a0053e048 +Author: Doug Davis +Date: Tue Dec 15 18:24:10 2015 -0800 + + Add the filename to the error message while trying to parse the config file + + Notice this while looking at #18634. W/o this extra text we're not sure if + its complaining about the old or new config file. + + Signed-off-by: Doug Davis + +commit 93456ab28c53916676eede9a348274fd527a36a9 +Author: Felix Geisendörfer +Date: Wed Dec 16 13:20:25 2015 +0000 + + docs: warn about virtualbox sendfile issue + + This is a common issue new users may experience, so it seems worth + warning about. + + See https://github.com/docker/docker/issues/18666 + + Signed-off-by: Felix Geisendörfer + +commit 5f4391e3c1277dd0e92f0d43432c939d449293f8 +Merge: b118871190 3e430b9a8a +Author: Sebastiaan van Stijn +Date: Wed Dec 16 13:20:10 2015 +0100 + + Merge pull request #43 from kytrinyx/typo-code + + fix typo in code documentation + +commit bb2c92355cb6f4e6935a945c22989fd3afe8e3cb +Merge: 61a94411b5 a7e0968321 +Author: Antonio Murdaca +Date: Wed Dec 16 12:23:41 2015 +0100 + + Merge pull request #18655 from dmcgowan/fix-docker-inspect-container + + Add metadata function to layer store + +commit 8435ea52893ef69c5a264bfbf0a1d3472f377ba2 +Author: Antonio Murdaca +Date: Wed Dec 16 12:01:04 2015 +0100 + + pkg: authorization: cleanup + + Signed-off-by: Antonio Murdaca + +commit 38f409d283c9ec328f25a3646bf6605beb897e0d +Author: Antonio Murdaca +Date: Wed Dec 16 12:00:48 2015 +0100 + + api: client: lib: fix go vet + + Signed-off-by: Antonio Murdaca + +commit cc62a88524b623c8f86075d9ed220196cf5e92da +Author: Antonio Murdaca +Date: Wed Dec 16 09:52:26 2015 +0100 + + docs: extend: plugins_volume.md: Err default to empty string + + Signed-off-by: Antonio Murdaca + +commit f480b7c1f576f033ee276a026a790de415b9bf9c +Author: Liang Mingqiang +Date: Wed Dec 16 15:25:06 2015 +0800 + + Update dockernetworks.md + + fix typo + + Signed-off-by: mqliang + +commit 56ab7292e78f4b936c4ec0da4a4fcd13d57cec6a +Merge: 01f42b7313 34655a2efc +Author: Ying Li +Date: Tue Dec 15 21:13:24 2015 -0800 + + Merge pull request #369 from HuKeping/docs-update + + Docs: update docs for notary config + +commit 34655a2efc7a13d34538c61eda99b349b093e008 +Author: HuKeping +Date: Wed Dec 16 11:20:15 2015 +0800 + + Docs: update docs for notary config + + Greate docs but still have some nit. + + Signed-off-by: Hu Keping + +commit e1f012cf397f170e12443e4993c09171791d37db +Author: Liang Mingqiang +Date: Wed Dec 16 11:21:39 2015 +0800 + + fix typo in dockerlinks.md + + fix typo in dockerlinks.md + + Signed-off-by: mqliang + +commit 02553d07279d9cc644946d812868abb519db8e34 +Author: Dong Chen +Date: Tue Dec 15 15:29:16 2015 -0800 + + Cover connection failure error reported by dockerclient and by proxy cases. + + Signed-off-by: Dong Chen + +commit d80a32b3df1a0f3db43c3541c2a39d7e9d04c271 +Author: Dong Chen +Date: Fri Dec 11 17:43:45 2015 -0800 + + Explicitly deprecate --engine-refresh-retry. + + Signed-off-by: Dong Chen + +commit 82d16226e647c52abb316c55ab98697e80114262 +Author: Dong Chen +Date: Fri Dec 11 14:18:59 2015 -0800 + + rebase and update test case. + + Signed-off-by: Dong Chen + +commit 9bc6c35321110a37f69d22b8bb8450397f818bed +Author: Dong Chen +Date: Thu Dec 10 12:21:46 2015 -0800 + + Use engine connection error to fail engine fast. + + Signed-off-by: Dong Chen + +commit ec3b00c48426a045339eaccbf5f51e5bea5580c8 +Author: Dong Chen +Date: Wed Dec 9 17:14:56 2015 -0800 + + Reorganize engine failure detection procedure. Change engine option 'RefreshRetry' to 'FailureRetry'. + + Signed-off-by: Dong Chen + +commit 4d24256c19c890eb8a87fde4a99f50895c869856 +Author: Dong Chen +Date: Tue Dec 8 17:58:36 2015 -0800 + + Use failureCount as a secondary health indicator. + + Signed-off-by: Dong Chen + +commit 91f9a4e89be71091bc077be59492e8f16d9b3c88 +Merge: 7291ec144c cdd42a5c6b +Author: Alexandre Beslic +Date: Tue Dec 15 18:05:28 2015 -0800 + + Merge pull request #1547 from vieux/fix_network_inspect_global + + display all the containers that are part of a global network on inspect + +commit 06c97cfb17f148cf90f11ebd91750786aeceb1a4 +Author: Nathan LeClaire +Date: Tue Dec 15 18:01:42 2015 -0800 + + Fix STDOUT and STDERR direction based on Log.* calls + + Signed-off-by: Nathan LeClaire + +commit 9b9959105499248ab6cdbfde2277ed1bd83233e3 +Author: Daniel Nephin +Date: Tue Dec 15 20:53:17 2015 -0500 + + Move ParseDockerDaemonHost to opts/ package. + + This function was only being used from a single place opts/opts.go. This + change moves it from a incohesive package (parsers) to the single place it + is used. + + Also made a bunch of the helper methods private because they are not used + by any external modules. + + Signed-off-by: Daniel Nephin + +commit cdd42a5c6b4e77604d6fd2e9bd394d484d66581d +Author: Victor Vieux +Date: Tue Dec 15 16:55:06 2015 -0800 + + display all the containers that are part of a global network on inspect + update godeps + + Signed-off-by: Victor Vieux + +commit 4c850e7165f4d8d7ea3df2454a2e2a890829d5ce +Author: Aaron Lehmann +Date: Tue Dec 15 17:18:13 2015 -0800 + + Remove tarsum support for digest package + + tarsum is not actually used by the registry. Remove support for it. + + Convert numerous uses in unit tests to SHA256. + + Update docs to remove mentions of tarsums (which were often inaccurate). + + Remove tarsum dependency. + + Signed-off-by: Aaron Lehmann + +commit 200cbe8b8e5c866f99004e1f1df1cd2497f20a8c +Merge: 9a06c58d70 31047c8113 +Author: Stephen Day +Date: Tue Dec 15 16:50:50 2015 -0800 + + Merge pull request #1264 from aaronlehmann/hash-errors + + Simplify digest.FromBytes calling convention + +commit 61a94411b5b4c8527c8844ed58d74f9c52601b92 +Merge: 731433a55b 6636aec38a +Author: Jess Frazelle +Date: Tue Dec 15 16:48:45 2015 -0800 + + Merge pull request #18689 from jfrazelle/fix-vendor-helpers + + cleanup hack/.vendor-helpers.sh + +commit 731433a55b02aec2ba1a534fc48883f42096acb0 +Merge: 803c7626ca 7ddf4214a6 +Author: Alexander Morozov +Date: Tue Dec 15 16:42:31 2015 -0800 + + Merge pull request #18691 from jfrazelle/remove-oraclelinux-6 + + remove oracle linux 6 for time being + +commit 01f42b7313f221b27e21a020520c50c48b8a0ba8 +Merge: ade56e47f2 5891805b29 +Author: David Lawrence +Date: Tue Dec 15 16:34:46 2015 -0800 + + Merge pull request #354 from endophage/delegations + + Delegation primitives up to changelist level + +commit 7ddf4214a666c3182acc031cec02fc99c877e98b +Author: Jessica Frazelle +Date: Tue Dec 15 16:34:41 2015 -0800 + + remove oracle linux 6 for time being + + Signed-off-by: Jessica Frazelle + +commit 803c7626ca076ddee50de5861531aa174e88e397 +Merge: 52fd30079a e98cae4919 +Author: Alexander Morozov +Date: Tue Dec 15 16:25:27 2015 -0800 + + Merge pull request #18687 from calavera/move_filters_to_api + + Move filters package to the API. + +commit 5891805b296d625b78caf1322ec685cc0205b695 +Author: David Lawrence +Date: Tue Dec 15 14:31:12 2015 -0800 + + addressing review + Signed-off-by: David Lawrence (github: endophage) + +commit 6636aec38a6cb93cab2924dc94acd5615f4ccab8 +Author: Jessica Frazelle +Date: Tue Dec 15 15:50:10 2015 -0800 + + cleanup hack/.vendor-helpers.sh + + seccomp is already in $dockerBuildTags + + Signed-off-by: Jessica Frazelle + +commit 3e430b9a8a07276bada8181f1323ca8d1c00d618 +Author: Katrina Owen +Date: Tue Dec 15 16:46:27 2015 -0700 + + fix typo in code documentation + + Signed-off-by: Katrina Owen + +commit ade56e47f2dab04c9019e79954c59b22d835739a +Merge: 20c557a10b e1e53c3cc9 +Author: Ying Li +Date: Tue Dec 15 15:14:28 2015 -0800 + + Merge pull request #367 from riyazdf/master + + readme and doc typo fixes + +commit e98cae4919da69dc6f9ae46527792cf2012cc7f2 +Author: David Calavera +Date: Tue Dec 15 16:40:11 2015 -0500 + + Move filters package to the API. + + These filters are only use to interchange data between clients and daemons. + They don't belong to the parsers package. + + Signed-off-by: David Calavera + +commit f9befce2d38614de3dfa474bc0f2e1b9937a8ca2 +Author: Brian Goff +Date: Tue Dec 15 15:16:06 2015 -0500 + + Fix btrfs recursive btrfs subvol delete + + Really fixing 2 things: + + 1. Panic when any error is detected while walking the btrfs graph dir on + removal due to no error check. + 2. Nested subvolumes weren't actually being removed due to passing in + the wrong path + + On point 2, for a path detected as a nested subvolume, we were calling + `subvolDelete("/path/to/subvol", "subvol")`, where the last part of the + path was duplicated due to a logic error, and as such actually causing + point #1 since `subvolDelete` joins the two arguemtns, and + `/path/to/subvol/subvol` (the joined version) doesn't exist. + + Also adds a test for nested subvol delete. + + Signed-off-by: Brian Goff + +commit 52fd30079a8f9a56402d4c4f1666c96bd9af98da +Merge: d3fbd43432 27220ecc6b +Author: David Calavera +Date: Tue Dec 15 15:11:18 2015 -0800 + + Merge pull request #18685 from calavera/remove_timeutils + + Move timeutils functions to the only places where they are used. + +commit 9a06c58d7086bd9c9a3a16ba502578ebb37fdf79 +Merge: bf09bb1314 129c9a22f7 +Author: Richard Scothern +Date: Tue Dec 15 14:55:00 2015 -0800 + + Merge pull request #1258 from thaJeztah/fix-docs-headers + + Fix headers in documentation + +commit 0815379c2697a570ed4128670672b7d6116938f0 +Author: Matt Vinall +Date: Tue Dec 15 22:30:49 2015 +0000 + + Filter openstack floating IPs by tenant ID + Merge j2sol:filter-openstack-floating and fix up for comments in PR #1809. + + Signed-off-by: Matt Vinall + +commit e1e53c3cc94e931d0fb6fdd2a809d464f7d08675 +Author: Riyaz Faizullabhoy +Date: Tue Dec 15 14:24:34 2015 -0800 + + doc typo fixes + + Signed-off-by: Riyaz Faizullabhoy + +commit e338dd0caac75a1910a9828d293fb08f282edf7b +Author: Riyaz Faizullabhoy +Date: Tue Dec 15 14:23:47 2015 -0800 + + fix readme link to be consistent with prior client link + + Signed-off-by: Riyaz Faizullabhoy + +commit d3fbd434327e8081de318646bc44d3973814965b +Merge: b0f652fc38 4133dc2212 +Author: David Calavera +Date: Tue Dec 15 14:17:52 2015 -0800 + + Merge pull request #18677 from runcom/fix-plugins-error + + pkg: plugins: fix and better handle errors + +commit 1b44c2007ca41cec775a54ad8163453621f7e03a +Author: Jeffrey Morgan +Date: Tue Dec 15 13:39:09 2015 -0800 + + Look at stderr and stdout for docker-machine status + + Signed-off-by: Jeffrey Morgan + +commit 81c334fa56eab0f9e85c9f6745efa34bbb1b444b +Author: Morgan Bauer +Date: Tue Dec 8 15:32:34 2015 -0800 + + adjust test sleep timing to avoid spurious failure + + - refactor ConsumeWithSpeed + - documentation + + Signed-off-by: Morgan Bauer + +commit 20c557a10bc800d4d34cb79d88530b6600c8e704 +Merge: b0bfab2868 f3f8de50d1 +Author: Ying Li +Date: Tue Dec 15 13:26:08 2015 -0800 + + Merge pull request #291 from docker/server-docs + + Server and signer docs + +commit bc843d67588c6305b82cd2eb7c057cfdef02a4eb +Author: Dimitar Bonev +Date: Tue Dec 15 20:05:22 2015 +0200 + + Start, restart, pause and unpause exit with non-zero if nothing to do + + Signed-off-by: Dimitar Bonev + +commit b0f652fc3892ed85673c79587807a8b9cb6256a4 +Merge: 33abc6f8af bdde4b32a1 +Author: David Calavera +Date: Tue Dec 15 12:55:01 2015 -0800 + + Merge pull request #18648 from jfrazelle/fix-install-script-trusty + + fix install script for ubuntu trusty + +commit 33abc6f8af0fce5bd3923a3e8a1f5748f282ec92 +Merge: c0c5c00337 0faee5896d +Author: Alexander Morozov +Date: Tue Dec 15 12:47:03 2015 -0800 + + Merge pull request #18683 from estesp/no-dev-symlink-chown + + Remove unecessary chown on mqueue device path + +commit c0c5c00337e8858dccf7f30e3b8997b04eed0dfc +Merge: 7bb30e0aeb e226383614 +Author: David Calavera +Date: Tue Dec 15 12:42:38 2015 -0800 + + Merge pull request #18681 from dnephin/move_cliconfig_test + + Move the TestEncodeAuth test to the correct package + +commit 5b32d32b2da1cee758f6b72be92792cf2616be15 +Merge: a1217dc050 c8f266b637 +Author: Daniel Nephin +Date: Tue Dec 15 12:04:42 2015 -0800 + + Merge pull request #2521 from jeanpralo/master + + Add method to get more info about container status + +commit 7bb30e0aeb19b5d724a68eefacf0495abd7a874f +Merge: 2180dd6cf0 c4472b389d +Author: David Calavera +Date: Tue Dec 15 12:00:24 2015 -0800 + + Merge pull request #18676 from dnephin/more_registry_types_to_api + + Move registry.SearchResult types to api/types/registry + +commit 27220ecc6b1eedf650ca9cf94965cb0dc2054efd +Author: David Calavera +Date: Tue Dec 15 14:49:41 2015 -0500 + + Move timeutils functions to the only places where they are used. + + - Move time json marshaling to the jsonlog package: this is a docker + internal hack that we should not promote as a library. + - Move Timestamp encoding/decoding functions to the API types: This is + only used there. It could be a standalone library but I don't this + it's worth having a separated repo for this. It could introduce more + complexity than it solves. + + Signed-off-by: David Calavera + +commit 0b5131444df83eb1e9fe4cfc6bfbf85314e089dc +Author: Euan +Date: Sat Dec 5 05:01:31 2015 +0000 + + Set OOMKilled state on any OOM event + + This restores the behavior that existed prior to #16235 for setting + OOMKilled, while retaining the additional benefits it introduced around + emitting the oom event. + + This also adds a test for the most obvious OOM cases which would have + caught this regression. + + Fixes #18510 + + Signed-off-by: Euan + +commit efb763aa10187e049fc6854e5a97efc410fcd214 +Author: Candid Dauth +Date: Tue Dec 15 20:23:56 2015 +0100 + + Add note to volume docs that data is not copied to mounted volumes + + Signed-off-by: Candid Dauth + +commit c8f266b637c1ec8c8a017d18d4f2bf4339055ae0 +Author: Jean Praloran +Date: Wed Dec 16 08:19:28 2015 +1300 + + add restarting status for human_readable_state + + Signed-off-by: Jean Praloran + +commit 0faee5896d5cd389cb022f6cea050bbf1bfd9443 +Author: Phil Estes +Date: Tue Dec 15 14:11:03 2015 -0500 + + Remove unecessary chown on mqueue device path + + This was causing the host /dev/mqueue to be remapped to the daemon's + user namespace range root user and group. Given the perms are open on + the mqueue path, there is no need to chown this path at all. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit b0bfab28686b102b1e33cb3eb1a3a0a020859006 +Merge: aa81b91ab4 63f48791c3 +Author: Ying Li +Date: Tue Dec 15 11:05:16 2015 -0800 + + Merge pull request #348 from cyli/client-rotate-snapshot-key-to-server + + Client rotate snapshot key to server + +commit e2263836141e9d6daa03765a3f4c5ccf39a429b9 +Author: Daniel Nephin +Date: Tue Dec 15 13:36:47 2015 -0500 + + Move the TestEncodeAuth test to the correct package. + + Also make EncodeAuth and DecodeAuth private because they're only used by cliconfig. + + Signed-off-by: Daniel Nephin + +commit bf09bb1314a5d0d3d582ac8e83fa1a1d9e01a274 +Merge: 23e4099973 74255cd4f2 +Author: Olivier Gambier +Date: Tue Dec 15 10:22:07 2015 -0800 + + Merge pull request #1267 from gabriellhrn/typo + + Fix typo in docs/configuration.md + +commit 63f48791c3339ad6bf927d7dccd4d0680fd1be31 +Author: Ying Li +Date: Tue Dec 15 10:18:58 2015 -0800 + + Fix docstring for 'key-type' parameter on key rotate. + + Signed-off-by: Ying Li + +commit 74255cd4f24dfde8df71b7bc20095215fd52b70d +Author: gabriell nascimento +Date: Tue Dec 15 15:08:32 2015 -0200 + + Fix typo in docs/configuration.md + + Signed-off-by: Gabriell Nascimento + +commit 2180dd6cf0258dee45a11ce6bf597448b8157984 +Merge: ce0b1841c8 93c0de2af4 +Author: Jess Frazelle +Date: Tue Dec 15 09:59:29 2015 -0800 + + Merge pull request #18617 from tiborvass/cleanup-builder + + Cleanup builder: remove container package dependency + +commit ce0b1841c82b6972d96654e083f813944e72443f +Merge: 42ea7a8a93 f988c98ff3 +Author: Brian Goff +Date: Tue Dec 15 12:14:41 2015 -0500 + + Merge pull request #17034 from rhvgoyal/volume-propagation + + Capability to specify per volume mount propagation mode + +commit 42ea7a8a93c15e77904e4324b77aa86cc0cab29d +Merge: adf1ffd53b 9c1ccf7084 +Author: Tianon Gravi +Date: Tue Dec 15 08:52:53 2015 -0800 + + Merge pull request #18097 from btorresgil/kali-linux-2.0-installer + + Add support for installation on Kali Linux 2.0 + +commit adf1ffd53b070443fd0f544c568e6c53d373caeb +Merge: 812a7c204a 0d824c760e +Author: Jess Frazelle +Date: Tue Dec 15 08:52:36 2015 -0800 + + Merge pull request #18416 from toli/disable-official-repo-check-in-push + + Removing the restriction to push to an 'official' repo + +commit 4133dc22122c6a032276adb073d651bc6aca181b +Author: Antonio Murdaca +Date: Tue Dec 15 17:51:48 2015 +0100 + + pkg: plugins: fix and better handle errors + + Signed-off-by: Antonio Murdaca + +commit 812a7c204a2396700ca1e95d949659b16302a120 +Merge: 06ce22c6e6 c427131c94 +Author: Alexander Morozov +Date: Tue Dec 15 08:47:54 2015 -0800 + + Merge pull request #18531 from coolljt0725/update_container_networking_on_create + + fix docker inspect return unconsistent network settings of created container and stopped container + +commit c4472b389dae8e86c8d98872fcbfe0c63d1e15a1 +Author: Daniel Nephin +Date: Tue Dec 15 11:44:20 2015 -0500 + + Move registry.SearchResult types to api/types/registry. + + Signed-off-by: Daniel Nephin + +commit 93c0de2af4f88f68b793a282cb654a14bd32eb3f +Author: Tibor Vass +Date: Tue Dec 15 17:21:04 2015 +0100 + + builder: remove unused Retain/Release and put Mount/Unmount back + + Signed-off-by: Tibor Vass + +commit c70f8b3c9c7a6dc6a219354acaa2e650d1403ecf +Author: Tibor Vass +Date: Thu Dec 10 15:35:53 2015 +0100 + + builder: remove container package dependency + + Signed-off-by: Tibor Vass + +commit 2a2d1f57b586632a5304f1093add28ef64661902 +Author: Tibor Vass +Date: Wed Dec 9 20:07:53 2015 +0100 + + dockerfile: get rid of Commit and CommitConfig + + Signed-off-by: Tibor Vass + (cherry picked from commit 400e4922cbd004b93774fc55005f74bd8a995242) + +commit 22023e05a319c60af2bc2c2f30ade8fa1f6f33fe +Author: Ray Tsang +Date: Tue Dec 15 11:04:53 2015 -0500 + + Updated REX-Ray plugin platform support. + + REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113 + + Signed-off-by: Ray Tsang + +commit 06ce22c6e6ceecbc03084399274ab1b2d5d6088e +Merge: effdb3b763 4c1243dc76 +Author: Sebastiaan van Stijn +Date: Tue Dec 15 16:06:58 2015 +0100 + + Merge pull request #18669 from mqliang/patch-1 + + fixed typo + +commit 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a +Author: Liang Mingqiang +Date: Tue Dec 15 23:00:47 2015 +0800 + + fixed typo + + Signed-off-by: mqliang + +commit c170e971977d32f16916d1189c5755c79e36fc56 +Author: Bryan Boreham +Date: Tue Dec 15 13:35:55 2015 +0000 + + Explain 'json' function a bit better + + Signed-off-by: Bryan Boreham + +commit effdb3b7635a832be1db9704a0264096c25130f1 +Merge: 7fe5631b5e 941bbd57ac +Author: Sebastiaan van Stijn +Date: Tue Dec 15 13:13:36 2015 +0100 + + Merge pull request #18664 from mqliang/patch-1 + + fix typo in runmetrics.md + +commit 7fe5631b5e043a5b1ab0b666422e6132ca60a2ce +Merge: b32713bed1 badfc7e10f +Author: Vincent Demeester +Date: Tue Dec 15 12:32:52 2015 +0100 + + Merge pull request #18661 from zhanghuanzhong/docker-fix-a-confused-variable + + The logName is confused here, it's a localName actually. + +commit b32713bed18a185ee05275bf252221f7d039c180 +Merge: 98d97743d2 f22ee02c6d +Author: Vincent Demeester +Date: Tue Dec 15 12:22:15 2015 +0100 + + Merge pull request #18606 from runcom/dmwtf + + devmapper: store base device fs type + +commit 941bbd57ac26d77ecf651b8e418c6ed8f08b39bd +Author: Liang Mingqiang +Date: Tue Dec 15 19:12:31 2015 +0800 + + fix typo in runmetrics.md + + fix typo + + Signed-off-by: mqliang + +commit fb916f2389082537b4b766eff2b888a37d14d005 +Merge: ffdf19c562 074e323bfa +Author: David Gageot +Date: Tue Dec 15 11:56:10 2015 +0100 + + Merge pull request #2580 from londoncalling/18282_cloud_installs + + minor updates to add Digital Ocean example heading and more links to … + +commit ffdf19c562d21137cb5cd82da3f032115d907331 +Merge: b85efca4f0 20c2293f9f +Author: David Gageot +Date: Tue Dec 15 11:55:46 2015 +0100 + + Merge pull request #2583 from jeanlaurent/softlayer-doc + + FIX #2577 - Softlayer doc + +commit b85efca4f0580817bb23f990a0330eae348a9d73 +Merge: 87e0e2597e b995a4d65a +Author: Jean-Laurent de Morlhon +Date: Tue Dec 15 11:54:42 2015 +0100 + + Merge pull request #2584 from dgageot/2561-pubkey-username + + FIX #2561 SSH pubkey should have username comment + +commit 87e0e2597e7f734f25bf469e0ec9c9988c3efc59 +Merge: c14770f395 ffd70ac33a +Author: Jean-Laurent de Morlhon +Date: Tue Dec 15 11:54:18 2015 +0100 + + Merge pull request #2582 from dgageot/improve-makefile + + Improve makefile + +commit 98d97743d2ef40156a28f82381d60a0635a1aff8 +Merge: 6c0c199103 20012e423c +Author: Sebastiaan van Stijn +Date: Tue Dec 15 11:51:47 2015 +0100 + + Merge pull request #18536 from WeiZhang555/daemon-err + + Better error message for invalid unix socket format + +commit ffd70ac33a21e62d24566f1c4765cc4c7d9a2d54 +Author: David Gageot +Date: Tue Dec 15 11:14:30 2015 +0100 + + Remove invalid target + + Signed-off-by: David Gageot + +commit 35ff801ae429723a4b760358dc04fc14ef24bcea +Author: David Gageot +Date: Tue Dec 15 09:57:28 2015 +0100 + + make build should build if any go file is touched + + Signed-off-by: David Gageot + +commit 72d2fb6b27032e015880bd631834c56bbb64d072 +Author: David Gageot +Date: Tue Dec 15 09:54:32 2015 +0100 + + Remove duplication + + Signed-off-by: David Gageot + +commit 54293d727b08d84876838a231f1ffe56e8a47eb5 +Author: David Gageot +Date: Tue Dec 15 09:53:17 2015 +0100 + + Use the makefile to compute the checksums + + Signed-off-by: David Gageot + +commit ff5dc0c64414111773fd2396f4cddaac18eb8211 +Author: David Gageot +Date: Tue Dec 15 09:13:09 2015 +0100 + + No need to archive the binaries anymore + + Signed-off-by: David Gageot + +commit 4fb50623b5d0238e36d5d8fd3cb96329ba406455 +Author: David Gageot +Date: Tue Dec 15 09:12:22 2015 +0100 + + Cross build binaries directly in `bin` + + Signed-off-by: David Gageot + +commit b995a4d65a3e666b6cdec79036db0379b3d58b69 +Author: David Gageot +Date: Tue Dec 15 11:12:53 2015 +0100 + + FIX #2561 SSH pubkey should have username comment + + Signed-off-by: David Gageot + +commit 20c2293f9f7ba810e591239dbbcd1bbfe2c7eb6b +Author: Jean-Laurent de Morlhon +Date: Tue Dec 15 10:53:43 2015 +0100 + + FIX #2577 - Softlayer doc + + Signed-off-by: Jean-Laurent de Morlhon + +commit 97ff79139860c544192a279125c2da500cf9143a +Author: Jeffrey Morgan +Date: Tue Dec 15 01:09:36 2015 -0800 + + Improved modify path text in Windows installer + + Signed-off-by: Jeffrey Morgan + +commit fdc9e8194718989db3206b8204becf8063948f77 +Author: Jeffrey Morgan +Date: Tue Dec 15 00:56:04 2015 -0800 + + Bump versions + + Signed-off-by: Jeffrey Morgan + +commit e95cada26c20e96da18b183cb92597127669fa8c +Author: Jeffrey Morgan +Date: Tue Dec 15 00:53:54 2015 -0800 + + Fix bug where docker start.sh on windows would error when VM is running + + Signed-off-by: Jeffrey Morgan + +commit f22ee02c6d6bd16f2179e71366ec641a7d234e96 +Author: Antonio Murdaca +Date: Fri Dec 11 17:39:29 2015 +0100 + + devmapper: store base device fs type + + After the very first init of the graph `docker info` correctly shows the + base fs type under `Backing Filesystem`. This information isn't stored + anywhere. After a restart (w/o erasing `/var/lib/docker`) `docker info` + shows an empty string under `Backing Filesystem`. + This patch records the base fs type after the first run in the metadata + or, to fix old devices that don't have this info in the metadata, just + probe the fs type of the base device at graph startup. + + Signed-off-by: Antonio Murdaca + +commit 6c0c199103a40979340763467d23108553a350a6 +Merge: a398536d5e 38797ca61b +Author: Vincent Demeester +Date: Tue Dec 15 09:20:15 2015 +0100 + + Merge pull request #18659 from Mashimiao/blkio-bps-tfix + + tfix: modify internal variable name to be lower-case + +commit badfc7e10fdc96d32190806df80b11f2fc41db13 +Author: huanzhong zhang +Date: Tue Dec 15 15:21:28 2015 +0800 + + The logName is confused here, it's a localName actually. + + Signed-off-by: huanzhong zhang + +commit 7291ec144c84ffc4c894a29801d32b20ad4a2169 +Merge: 9dc6ce8d0f 5aecaddf72 +Author: Andrea Luzzardi +Date: Mon Dec 14 22:11:03 2015 -0800 + + Merge pull request #1544 from yangdongsheng/sort + + api: Sort images by Created. + +commit 5aecaddf72a1134549f9c47501f9b9ba326ae647 +Author: Dongsheng Yang +Date: Tue Dec 15 10:00:52 2015 +0800 + + api: Sort images by Created. + + Signed-off-by: Dongsheng Yang + +commit a398536d5e001efe06c329cdea3c33a075db8594 +Merge: 2ec34dca05 9b584781ad +Author: Phil Estes +Date: Tue Dec 15 00:08:00 2015 -0500 + + Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix + + Make all the devmapper log messages consistent with a common prefix. + +commit 2ec34dca050f839480e6b2f0c8b892e0a73a0d16 +Merge: 8970337f60 83b5729f64 +Author: Arnaud Porterie +Date: Mon Dec 14 20:51:53 2015 -0800 + + Merge pull request #18650 from calavera/remove_httputils_dep_from_api + + Remove httputils dependency from API client lib. + +commit 9b584781ad9c810bc9060448f391a3ae6a7d7cbb +Author: Chris Dituri +Date: Mon Dec 14 15:07:17 2015 -0600 + + Make pkg/devicemapper/ log messages with a common, consistent prefix. + + Closes #16667 + + Uses the prefix "devicemapper:" for all the fmt and logrus error, debug, and info messages. + + Signed-off-by: Chris Dituri + +commit 0aa6ace6e6e819551d21ebdcaa0c5802f76d7603 +Author: Chris Dituri +Date: Mon Dec 14 15:03:33 2015 -0600 + + Make daemon/graphdriver/devmapper log messages with a common, consistent prefix. + + Closes #16667 + + Uses the prefix "devmapper:" for all the fmt and logrus error, debug, and info messages. + + Signed-off-by: Chris Dituri + +commit 755f8609f699a20cb47ec7269e3a9469541a9419 +Author: Ahmet Alp Balkan +Date: Wed Dec 9 20:48:50 2015 -0800 + + Add containers’ networks to /containers/json + + After addition of multi-host networking in Docker 1.9, Docker Remote + API is still returning only the network specified during creation + of the container in the “List Containers” (`/containers/json`) endpoint: + + ... + "HostConfig": { + "NetworkMode": "default" + }, + + The list of networks containers are attached to is only available at + Get Container (`/containers//json`) endpoint. + This does not allow applications utilizing multi-host networking to + be built on top of Docker Remote API. + + Therefore I added a simple `"NetworkSettings"` section to the + `/containers/json` endpoint. This is not identical to the NetworkSettings + returned in Get Container (`/containers//json`) endpoint. It only + contains a single field `"Networks"`, which is essentially the same + value shown in inspect output of a container. + + This change adds the following section to the `/containers/json`: + + "NetworkSettings": { + "Networks": { + "bridge": { + "EndpointID": "2cdc4edb1ded3631c81f57966563e...", + "Gateway": "172.17.0.1", + "IPAddress": "172.17.0.2", + "IPPrefixLen": 16, + "IPv6Gateway": "", + "GlobalIPv6Address": "", + "GlobalIPv6PrefixLen": 0, + "MacAddress": "02:42:ac:11:00:02" + } + } + } + + This is of type `SummaryNetworkSettings` type, a minimal version of + `api/types#NetworkSettings`. + + Actually all I need is the network name and the IPAddress fields. If folks + find this addition too big, I can create a `SummaryEndpointSettings` field + as well, containing just the IPAddress field. + + Signed-off-by: Ahmet Alp Balkan + +commit 20012e423c865d12889af89f41459d30e7fe7901 +Author: Zhang Wei +Date: Wed Dec 9 22:18:45 2015 +0800 + + Better error message for invalid unix socket format + + Give more meaningful error prompts when user try to bind a directory as + unix socket. + + Signed-off-by: Zhang Wei + +commit 38797ca61b6d88fe71615108897b1f7d1767f449 +Author: Ma Shimiao +Date: Tue Dec 15 09:50:16 2015 +0800 + + tfix: modify internal variable name to be lower-case + + Signed-off-by: Ma Shimiao + +commit 2c7e632925a1236589778855b45c89fb5ede8c4a +Author: Ying Li +Date: Fri Dec 11 17:56:00 2015 -0800 + + Amend rotation tests to assert old keys are removed after rotation. + + Signed-off-by: Ying Li + +commit 79b05d4c0a5a400f6b23edf5c35cb24df1c2fd12 +Author: David Lawrence +Date: Fri Dec 11 15:04:04 2015 -0800 + + changelists for delegations + Signed-off-by: David Lawrence (github: endophage) + +commit 13c2b60ca8c3e322a005f4e7d43325410432affc +Author: Dong Chen +Date: Mon Dec 14 17:21:15 2015 -0800 + + Update documentation for swarm join `--delay` option. + + Signed-off-by: Dong Chen + +commit ca1623e17bc017a9144697ef5286b12eee3008b8 +Author: Ying Li +Date: Wed Dec 9 00:24:10 2015 -0800 + + Update CLI rotate key command to optionally rotate a single key. + + This makes it possible to delegate snapshots key management to the + server, and to reclaim the responsibility. + + Signed-off-by: Ying Li + +commit 2ce02329726e5718afae59cf375f717050a55d12 +Author: Ying Li +Date: Tue Dec 8 20:26:19 2015 -0800 + + Refactor notary CLI keys cmds to use less globally mutable state. + + This way we can test the command functions more easily. + + Signed-off-by: Ying Li + +commit 8521ea5b6dc9560e405fc5936c0f54a434552808 +Author: Ying Li +Date: Tue Dec 8 15:38:03 2015 -0800 + + Convert NotaryRepository.RotateKeys to RotateKey(role, serverManages bool) + + This should make it possible to delegate snapshot key management + to the server for existing repos, or switching back to user managing + snapshot keys. + + Signed-off-by: Ying Li + +commit 2c029f9795fc60a53ae2fa6445983aba9970a5f5 +Author: Dong Chen +Date: Tue Dec 8 15:42:19 2015 -0800 + + Change '--joindelay' to '--delay' since it's a join option. + + Signed-off-by: Dong Chen + +commit db5c8aba7cfdbc971c07e523b2c2c500faf66af1 +Author: Dong Chen +Date: Thu Dec 3 15:01:02 2015 -0800 + + Add a command line option for swam join delay. + + Signed-off-by: Dong Chen + +commit 36ca8ff63ff9575fab52e868d93baaf871b5dbc1 +Author: Dong Chen +Date: Thu Nov 12 16:17:29 2015 -0800 + + Add a random delay to avoid synchronized registration at swarm join. + + Signed-off-by: Dong Chen + +commit a7e096832123280d26df3c121ecad8dd012060b9 +Author: Derek McGowan +Date: Mon Dec 14 16:52:15 2015 -0800 + + Add metadata function to layer store + + Add function to get metadata from layer store for a mutable layer + + fixes #18614 + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit f408b4f4639b7c987c93b26174fccfcc513519e4 +Author: Qiang Huang +Date: Tue Dec 15 08:42:26 2015 +0800 + + Adapt container settings when start + + `adaptContainerSettings` is growing up, new it's only called + when create. It'll be a problem that old containers will never + have chance to adapt the latest rule. `HostConfig` of these + containers will be obsoleted. + + Add this calling to start to avoid problems like #18550 and + avoid such backward compatability in the future. + + Signed-off-by: Qiang Huang + +commit f3f35ba0da7d483346feb4036189645961f1dc84 +Author: Jeffrey Morgan +Date: Mon Dec 14 16:35:50 2015 -0800 + + Fix docker-machine shell out for status command + + Signed-off-by: Jeffrey Morgan + +commit 074e323bfa3124473c8b6b325f33a8de7cbcad3a +Author: Victoria Bialas +Date: Mon Dec 14 16:28:16 2015 -0800 + + minor updates to add Digital Ocean example heading and more links to driver plugin topics + + Signed-off-by: Victoria Bialas + +commit 7e1e9bb84f774bc0f4c289ee4f8a56274e0b34be +Author: Jeffrey Morgan +Date: Mon Dec 14 16:14:23 2015 -0800 + + Bump versions + + Signed-off-by: Jeffrey Morgan + +commit 9dc6ce8d0f802739a1b53d28179999edacd0f8ec +Merge: ed987b8d85 c5810d6a64 +Author: moxiegirl +Date: Mon Dec 14 15:45:17 2015 -0800 + + Merge pull request #1474 from abronan/fix_license_grant + + Fix Swarm project License grant and scope + +commit 31047c8113563880290a21d4dad8bc375d934310 +Author: Aaron Lehmann +Date: Mon Dec 14 14:30:51 2015 -0800 + + Simplify digest.FromBytes calling convention + + The current implementation of digest.FromBytes returns an error. This + error can never be non-nil, but its presence in the function signature + means each call site needs error handling code for an error that is + always nil. + + I verified that none of the hash.Hash implementations in the standard + library can return an error on Write. Nor can any of the hash.Hash + implementations vendored in distribution. + + This commit changes digest.FromBytes not to return an error. If Write + returns an error, it will panic, but as discussed above, this should + never happen. + + This commit also avoids using a bytes.Reader to feed data into the hash + function in FromBytes. This makes the hypothetical case that would panic + a bit more explicit, and should also be more performant. + + Signed-off-by: Aaron Lehmann + +commit aa81b91ab40ef53b1b2e66ef14f86e4ee25d5781 +Merge: 3d54349e4a fd01151cd2 +Author: Ying Li +Date: Mon Dec 14 14:28:04 2015 -0800 + + Merge pull request #359 from docker/diogo-volumes + + Adding a volume to MySQL container to ensure data persistence + +commit 8970337f609d38dab69785f963d4a64a539ebf1b +Merge: 87740d001c 069fe81fa6 +Author: Sebastiaan van Stijn +Date: Mon Dec 14 23:13:21 2015 +0100 + + Merge pull request #18649 from albers/completion-daemon--authz-plugin + + bash completion for `docker daemon --authz-plugin` + +commit 87740d001c5888834496f1612ae80aa95306ff5f +Merge: a7e30a4ffb 9dc7d07fc1 +Author: Vincent Demeester +Date: Mon Dec 14 23:05:29 2015 +0100 + + Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib + + Remove timeout shared function. + +commit ed987b8d850c9363caace796483b70ddcef64dd6 +Merge: 2fdda583ec 18cccc521c +Author: Victor Vieux +Date: Mon Dec 14 13:57:31 2015 -0800 + + Merge pull request #1542 from jimenez/slave_to_agent + + Name changing slave to agent + +commit a7e30a4ffba7989362537ebdc78d136fbcab59be +Merge: 260cbb19c9 226329e540 +Author: Sebastiaan van Stijn +Date: Mon Dec 14 22:54:17 2015 +0100 + + Merge pull request #18643 from tianon/apt-get-clean + + Remove mention of "apt-get clean" as it's performed automatically + +commit 83b5729f6452de6b40719b9485947eea0bd0eedd +Author: David Calavera +Date: Mon Dec 14 16:45:29 2015 -0500 + + Remove httputils dependency from API client lib. + + Signed-off-by: David Calavera + +commit 2fdda583ecb71ed43e1212aee6c4a9b59aee74c5 +Merge: 81bf5bc067 c8dd8d8b66 +Author: Sebastiaan van Stijn +Date: Mon Dec 14 22:44:44 2015 +0100 + + Merge pull request #1473 from abronan/typo_networking_doc + + Typos networking doc + +commit c8dd8d8b66d3c2d162248a1ca24e6a46c82e5e16 +Author: Alexandre Beslic +Date: Mon Dec 14 13:35:59 2015 -0800 + + carry #1409, improve networking docs, remove duplicate link in discovery.md + + Signed-off-by: Alexandre Beslic + +commit 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d +Merge: ecc3717cb1 8fe6b3835c +Author: Alexander Morozov +Date: Mon Dec 14 13:32:01 2015 -0800 + + Merge pull request #18486 from aboch/vnd + + Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90 + +commit 069fe81fa602e7d8af98e2b67b761a62526f014a +Author: Harald Albers +Date: Mon Dec 14 13:25:45 2015 -0800 + + bash completion for `docker daemon --authz-plugin` + + Signed-off-by: Harald Albers + +commit 18cccc521c1b044608826aa2b91249b3519b2dae +Author: Isabel Jimenez +Date: Mon Dec 14 16:20:38 2015 -0500 + + renaming files + change on tests + + Signed-off-by: Isabel Jimenez + +commit 81bf5bc067d021a13cb6a0e5d99eb4284ff4084b +Merge: 94c0593c0b 72db0bbc04 +Author: Victor Vieux +Date: Mon Dec 14 13:18:26 2015 -0800 + + Merge pull request #1538 from vitan/patch-1 + + Typo + +commit bdde4b32a1bd1b2c79ac22464ffb78509046fcb4 +Author: Jessica Frazelle +Date: Mon Dec 14 13:13:39 2015 -0800 + + fix install script for ubuntu trusty + + Signed-off-by: Jessica Frazelle + +commit ecc3717cb17313186ee711e624b960b096a9334f +Merge: 6e85d30f1b e8f7d5885d +Author: Alexander Morozov +Date: Mon Dec 14 13:05:53 2015 -0800 + + Merge pull request #18612 from mrunalp/update_runc + + Update runc/libcontainer to v0.0.6 + +commit c14770f395c6d6f3698ab62c000b3096acc8ea1e +Merge: 7370e58ba8 de99d4abe5 +Author: Nathan LeClaire +Date: Mon Dec 14 13:00:40 2015 -0800 + + Merge pull request #2576 from jeanlaurent/harden-test + + Make integration test a bit more resilient + +commit 226329e54031256958740af0ae5bc1a4f2cd9c2e +Author: Tianon Gravi +Date: Mon Dec 14 10:45:47 2015 -0800 + + Remove mention of "apt-get clean" as it's performed automatically + + Signed-off-by: Andrew "Tianon" Page + +commit 6e85d30f1b2d7d73502b17fee87a57e16841a56a +Merge: 75d69ce0da 4ba173630a +Author: David Calavera +Date: Mon Dec 14 12:50:14 2015 -0800 + + Merge pull request #18645 from sdurrheimer/zsh-completion-daemon-authz-plugin + + Zsh completion daemon authz plugin + +commit 6287ec9095f380449f0b4f1a06d4e5df43fc4449 +Author: Doug Davis +Date: Mon Aug 31 14:45:27 2015 -0700 + + Add a DOCKER_API_VERSION env var + + Closes: #11486 + + Just for @ahmetalpbalkan :-) + + Fixed some comment formatting too while in there. + + Signed-off-by: Doug Davis + +commit 4ba173630ad2b7a5fc59df280617a1bfa1dda323 +Author: Steve Durrheimer +Date: Mon Dec 14 21:20:49 2015 +0100 + + Fix small missing equal sign for 'docker daemon --cluster-store-opt' + + Signed-off-by: Steve Durrheimer + +commit 23e40999731b2b43af9010d5804a6d67f8df058b +Merge: e6c60e79c5 2c2fbc4c24 +Author: Stephen Day +Date: Mon Dec 14 12:19:43 2015 -0800 + + Merge pull request #1245 from carsonoid/carsonoid-nginx-doc-patch-2 + + Fix incorrectly interpolated config setting + +commit 76844d786bea2e435d25f150044fa242206ce364 +Author: Steve Durrheimer +Date: Mon Dec 14 21:16:54 2015 +0100 + + Add zsh completion for 'docker daemon --authz-plugin' + + Signed-off-by: Steve Durrheimer + +commit 75d69ce0da2e360773736502acd92d4a9cf7faa5 +Merge: 0c2dd27581 96c10098ac +Author: David Calavera +Date: Mon Dec 14 11:53:30 2015 -0800 + + Merge pull request #18637 from dnephin/move_auth_config + + Move more api types to api/types package + +commit 60c15834daa7010f7d50aa4c0d1c1e9fd981f873 +Author: Isabel Jimenez +Date: Mon Dec 14 13:50:00 2015 -0500 + + changing slave to agent + + Signed-off-by: Isabel Jimenez + +commit e895136580d7d5f8033f3dd0cc0d3c700403a0f7 +Author: Phil Whelan +Date: Thu Nov 12 15:37:11 2015 -0800 + + typos + + Signed-off-by: Phil Whelan + +commit 0c2dd27581048102b5d8803f95e6bc58834842d7 +Merge: 984282e28c 52e53814ea +Author: Jess Frazelle +Date: Mon Dec 14 11:32:27 2015 -0800 + + Merge pull request #18642 from tophj-ibm/add-z-unshare-image + + Add unshare image to s390x Dockerfile + +commit 94c0593c0b668803060233fa7b5f3d77888197b7 +Merge: bbbcd0e510 f1fb2722a1 +Author: Sebastiaan van Stijn +Date: Mon Dec 14 20:30:26 2015 +0100 + + Merge pull request #1537 from moxiegirl/fix-1483 + + Chaning User guide to overview close #1483 + +commit 9dc7d07fc11163205985b7d56742a4f9b89d7e09 +Author: David Calavera +Date: Mon Dec 14 14:23:21 2015 -0500 + + Remove timeout shared function. + + Handle timeouts when it's necessary based on a Timeout interface. + + Signed-off-by: David Calavera + +commit bbbcd0e510c0538f1c98e8414610d9a1ae6665ba +Merge: d3affe5904 dde577d154 +Author: Victor Vieux +Date: Mon Dec 14 11:22:10 2015 -0800 + + Merge pull request #1384 from dhiltgen/token_auth + + Add token pass-thru for Authconfig + +commit 984282e28cf68e658112f199e8baa5f0931cc242 +Merge: 03e2923e42 b679eb9a82 +Author: David Calavera +Date: Mon Dec 14 11:20:12 2015 -0800 + + Merge pull request #18639 from calavera/force_api_version + + Force API versioning in the client library. + +commit 03e2923e42446dbb830c654d0eec323a0b4ef02a +Merge: b13fd10109 8d2a423d87 +Author: Jess Frazelle +Date: Mon Dec 14 10:41:56 2015 -0800 + + Merge pull request #18570 from suihkulokki/control-fix + + hack/make/.build-deb/control: add missing fields + +commit b13fd10109db75996a31fd52393ef3410feee3ca +Merge: c38aa60180 e078adc93b +Author: Jess Frazelle +Date: Mon Dec 14 10:32:53 2015 -0800 + + Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen + + Windows CI Fix: No subshell due to bash 3.x + +commit 52e53814ea860919f8ddf2c82a6b24d41630072c +Author: Christopher Jones +Date: Mon Dec 14 12:16:18 2015 -0600 + + Add unshare image to s390x Dockerfile + This adds unshare image to Dockerfile.s390x + + Signed-off-by: Christopher Jones + +commit fb5c9b28a466e886540e555a9d6a77f558597e33 +Author: David Lawrence +Date: Thu Dec 10 16:29:17 2015 -0800 + + low level tuf delegation primitives with full test coverage + Signed-off-by: David Lawrence (github: endophage) + +commit c38aa60180792210a21f162a57958bda86f9c381 +Merge: 44299989b2 6480feb766 +Author: Jess Frazelle +Date: Mon Dec 14 10:07:01 2015 -0800 + + Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14 + + Enable ptrace in a container on apparmor below 2.9 + +commit 3d54349e4aed191681dbe740d433dcf95f2b32e4 +Merge: ad1fd268af 8bca542c17 +Author: Diogo Mónica +Date: Mon Dec 14 09:42:26 2015 -0800 + + Merge pull request #349 from endophage/server_snapshot_bugfixes + + fixing bugs raised by @mtrmac + +commit ad1fd268afed7ae2e174a5dada1bbddf8fc67da6 +Merge: 4aa9239aaf c0bf1a4a68 +Author: Diogo Mónica +Date: Mon Dec 14 09:32:19 2015 -0800 + + Merge pull request #360 from docker/fix-merge-conflict + + Fix semantic merge conflict. + +commit de99d4abe57a0a3e98bd5bad30814fa8c9029ea8 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 14 18:09:21 2015 +0100 + + Make test a bit more resilient + + Signed-off-by: Jean-Laurent de Morlhon + +commit b679eb9a8263d2cb00fecc8741d62d2b35db5ac5 +Author: David Calavera +Date: Mon Dec 14 12:06:42 2015 -0500 + + Force API versioning in the client library. + + Remove dependencies on docker's version packages. + Allow empty version as a fallback to latest version. + + Signed-off-by: David Calavera + +commit 7370e58ba89367db3de038be983ce5f52d159dc8 +Merge: df25736479 9d4ba57ce2 +Author: David Gageot +Date: Mon Dec 14 18:02:34 2015 +0100 + + Merge pull request #2575 from dgageot/fix-installation-notes + + Fix installation notes for 0.5.3 + +commit df2573647917df551c486aa857c35804d7c16dfe +Merge: 4d39a66899 c86e537ae7 +Author: Nathan LeClaire +Date: Mon Dec 14 09:00:36 2015 -0800 + + Merge pull request #2574 from dgageot/bump_v_0.6.0-dev + + Update to v0.6.0-dev + +commit 979fa6fd2ac549c82a4fc5ae4e0d3a048dc8d5ea +Author: Jeffrey Morgan +Date: Mon Dec 14 08:57:15 2015 -0800 + + Bump version to 0.9.4 + + Signed-off-by: Jeffrey Morgan + +commit 9d4ba57ce2d317d8511153f276265c6c85e86c0e +Author: David Gageot +Date: Mon Dec 14 17:55:04 2015 +0100 + + Fix installation notes for 0.5.3 + + Signed-off-by: David Gageot + +commit c86e537ae7d9dee5e6de0ce8d53598cfc66d01af +Author: David Gageot +Date: Mon Dec 14 17:47:44 2015 +0100 + + Update to v0.6.0-dev + + Signed-off-by: David Gageot + +commit 96c10098ac32f700f37358e2adc36c94741772bb +Author: Daniel Nephin +Date: Fri Dec 11 18:14:52 2015 -0800 + + Move IndexInfo and ServiceConfig types to api/types/registry/registry.go + + Signed-off-by: Daniel Nephin + +commit 44299989b24507dad0bcd66fefcbc2a00e13665c +Merge: 5e0283effa 63e3816c1d +Author: Tibor Vass +Date: Mon Dec 14 17:22:01 2015 +0100 + + Merge pull request #18631 from tiborvass/cleanup-utils + + Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils` + +commit 5b321e328769cc93c3454e82ec3fe07672156f2e +Author: Daniel Nephin +Date: Fri Dec 11 20:11:42 2015 -0800 + + Move AuthConfig to api/types + + Signed-off-by: Daniel Nephin + +commit 4d39a66899b2e55d5bf65b041f7d4234dfd4e995 +Merge: 5dd64c6bf8 d3041c3166 +Author: David Gageot +Date: Mon Dec 14 16:45:40 2015 +0100 + + Merge pull request #2573 from dgageot/bump_v0.5.3 + + Bump to version 0.5.3 + +commit 0d824c760ec2413f4df7855b9b6559424d01e556 +Author: toli +Date: Thu Dec 3 17:01:39 2015 -0800 + + Removing the restriction to push to a 'official' repo + + Signed-off-by: toli + +commit f988c98ff318dcfecb9d2db9511fe78e70b43e44 +Author: Vivek Goyal +Date: Mon Dec 14 10:39:53 2015 -0500 + + Add some unit and integration tests + + Add a unit test and couple of integration tests for volume propagation. + + Signed-off-by: Vivek Goyal + +commit d4b4ce2588d02acd3602d42b788c6b36ab9b01e5 +Author: Vivek Goyal +Date: Fri Oct 23 16:57:57 2015 -0400 + + Check Propagation properties of source mount point + + Whether a shared/slave volume propagation will work or not also depends on + where source directory is mounted on and what are the propagation properties + of that mount point. For example, for shared volume mount to work, source + mount point should be shared. For slave volume mount to work, source mount + point should be either shared/slave. + + This patch determines the mount point on which directory is mounted and + checks for desired minimum propagation properties of that mount point. It + errors out of configuration does not seem right. + + Signed-off-by: Vivek Goyal + +commit a2dc4f79f260247afe55ab7117c9de02a769d883 +Author: Vivek Goyal +Date: Fri Oct 23 16:57:57 2015 -0400 + + Add capability to specify mount propagation per volume + + Allow passing mount propagation option shared, slave, or private as volume + property. + + For example. + docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash + + Signed-off-by: Vivek Goyal + +commit d3041c3166e64592520f23dc3850a5029eaface2 +Author: David Gageot +Date: Mon Dec 14 15:07:27 2015 +0100 + + Bump to version 0.5.3 + + Signed-off-by: David Gageot + +commit 5dd64c6bf8b71acdb2449e9f1029e999d659d1f3 +Merge: eaf2641b49 8faaa2a51f +Author: David Gageot +Date: Mon Dec 14 15:43:00 2015 +0100 + + Merge pull request #2572 from jeanlaurent/osversion + + Add OS Version to crash report + +commit eaf2641b49222fe69ed9782fb0572c17016006e0 +Merge: a88f1011ad 339b5ac743 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 14 15:38:21 2015 +0100 + + Merge pull request #2569 from askb/docs_fixes + + minor fix to formatting update for `dm config` output + +commit a88f1011ad3b84b157c48b8bfe2cccc4f5af1a5f +Merge: 8090f1d1c0 f66655fd77 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 14 15:36:29 2015 +0100 + + Merge pull request #2570 from dgageot/2280-prevent-nil-dereference + + 2280 prevent nil dereference + +commit 8faaa2a51f1d2789add2466b0f141d47618e8c12 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 14 15:21:15 2015 +0100 + + Add OS Version to crash report + + Signed-off-by: Jean-Laurent de Morlhon + +commit f66655fd771109e44b84a5a0507cfa1ee5afa234 +Author: David Gageot +Date: Mon Dec 14 12:22:14 2015 +0100 + + FIX #2280 prevent nil dereference + + Signed-off-by: David Gageot + +commit 5e0283effa73223e5528c61beb4e05b5018c5d6b +Merge: f8bc4ed573 920ea13516 +Author: Vincent Demeester +Date: Mon Dec 14 15:23:36 2015 +0100 + + Merge pull request #18618 from dnephin/refactor_resolve_auth_config + + Refactor ResolveAuthConfig to remove the builder dependency on cli code + +commit 8090f1d1c00e447a3f4401035cca0f8155420333 +Merge: 5af18c9972 f09bbb8f7f +Author: Jean-Laurent de Morlhon +Date: Mon Dec 14 15:22:44 2015 +0100 + + Merge pull request #2571 from dgageot/increase-provision-timeout + + Increase the provisioning timeout + +commit 63e3816c1dd449de63500a2b5fec9c2a33a0894c +Author: Tibor Vass +Date: Mon Dec 14 11:15:00 2015 +0100 + + utils: move dockerignore function to builder/dockerignore + + Signed-off-by: Tibor Vass + +commit 135cca6f52c7862f13f50c30ccf5925038ba40a9 +Author: Tibor Vass +Date: Mon Dec 14 11:17:51 2015 +0100 + + utils: move git functions to pkg/gitutils + + Signed-off-by: Tibor Vass + +commit f09bbb8f7f6d0043f9f39ecb8b038e44378b5ecc +Author: David Gageot +Date: Mon Dec 14 12:17:18 2015 +0100 + + Increase the provisioning timeout + + Signed-off-by: David Gageot + +commit 339b5ac743dc86f05b106d5b30e687b8204a7829 +Author: Anil Belur +Date: Mon Dec 14 18:28:34 2015 +0530 + + Fixes a minor formatting update for `dm config` output + + Signed-off-by: Anil Belur + +commit f8bc4ed573e4bf6883d8888b8143ddfb7d31a1d7 +Merge: 5fd9a8f603 ba6b69adc2 +Author: Antonio Murdaca +Date: Mon Dec 14 13:31:17 2015 +0100 + + Merge pull request #18112 from daehyeok/fix_dry_run_test + + Change TestRunNonRootUserResolvName Fail log. + +commit f7ed97a6303787983f6f01f72afff74e7d2b0690 +Author: Antonio Murdaca +Date: Sun Dec 13 16:39:41 2015 +0100 + + layer: layer_store.go: return on error + + Signed-off-by: Antonio Murdaca + +commit 5fd9a8f6030558d90f4e1a3e55f6b0017d34d23f +Merge: ec1002db58 229d3bace8 +Author: Antonio Murdaca +Date: Mon Dec 14 11:43:01 2015 +0100 + + Merge pull request #18616 from calavera/move_client_version_to_docker_cli + + Move client version to the docker cli. + +commit 5af18c9972a99ebd4749c900156959cdcc6ca283 +Merge: 5ced4fe387 1d98b690be +Author: David Gageot +Date: Mon Dec 14 08:45:00 2015 +0100 + + Merge pull request #2562 from nathanleclaire/strip_log_secrets + + Strip certs and keys in log before sending to Bugsnag + +commit 5ced4fe387ddcdba4032ab97b04ee37a7a83b6ae +Merge: d29a42ebc6 60ec6dc1a1 +Author: David Gageot +Date: Mon Dec 14 08:43:28 2015 +0100 + + Merge pull request #2564 from nathanleclaire/docs_polish + + Add docs polish for 0.5.3 release + +commit 10ddf62efb37c3ddf6f4bfcf65c68aaae38da29e +Merge: 862ed0e0d4 c26965ccc5 +Author: Jeffrey Morgan +Date: Sun Dec 13 19:35:30 2015 -0800 + + Merge pull request #347 from docker/machine-error-report + + Add & remove no-error-report file for machine 0.5.3 + +commit c26965ccc5589ccd5f7320c89a93cfaaa9cbdb39 +Author: Jeffrey Morgan +Date: Sun Dec 13 19:13:26 2015 -0800 + + Add error reporting file for machine + + Signed-off-by: Jeffrey Morgan + +commit ba6b69adc2a790331701f021ac798ee23e059151 +Author: Daehyeok Mun +Date: Thu Nov 19 21:44:42 2015 -0700 + + Change TestRunNonRootUserResolvName Fail log. + + Signed-off-by: Daehyeok Mun + +commit 0cc18ddf9bc4a48ff71300bb72329e54548b8d35 +Merge: fe50b66c88 ad0d7e003f +Author: Jeffrey Morgan +Date: Sun Dec 13 18:39:06 2015 -0800 + + Merge pull request #1301 from docker/fix-bash-entrypoint + + Fix bug where container would be run with bash even thought it has a valid entrypoint + +commit ad0d7e003ff4a886c9e8c0abcf274bc837bdc27c +Author: Jeffrey Morgan +Date: Sun Dec 13 18:37:05 2015 -0800 + + Fix bug where container would be run with bash even with a valid entrypoint + + Signed-off-by: Jeffrey Morgan + +commit fe50b66c889f45d411cd5598377f41748fc43197 +Merge: 07c3c67bf5 13537af0bc +Author: Jeffrey Morgan +Date: Sun Dec 13 18:21:19 2015 -0800 + + Merge pull request #1300 from docker/fix-vtx-exec + + Dont track VTX as an error & fix bugs relating to exec on windows + +commit 13537af0bc1dfcf0b9fafc61c24c722402931fab +Author: Jeffrey Morgan +Date: Sat Dec 12 21:29:22 2015 -0800 + + Fix bugs related to exec and dont track VTX as an error + + Signed-off-by: Jeffrey Morgan + +commit 72db0bbc04b331424e35337c95f7033505d80fd4 +Author: Zhou Weitao +Date: Sun Dec 13 20:21:35 2015 +0800 + + Typo + + Signed-off-by: Weitao Zhou + +commit 07c3c67bf568a13d9a43426f98599954a514cc4c +Merge: 806efdd767 94f7ce8b71 +Author: Jeffrey Morgan +Date: Sun Dec 13 17:47:55 2015 -0800 + + Merge pull request #1295 from docker/fix-volume-settings-bugs + + Fix bug where renaming or editing container settings would cause volume settings to be lost + +commit ec1002db58e8f84fc6d8306a3dd580e5fa88872c +Merge: f5e6b09783 927b334ebf +Author: Antonio Murdaca +Date: Sun Dec 13 19:52:31 2015 +0100 + + Merge pull request #18623 from jutaz/bugfix/typos + + Bugfix - Typos + +commit 824ae856325b53d4c84bd000713f63720d79b67a +Author: manchoz +Date: Tue Sep 29 12:06:19 2015 +0000 + + Add support for Arch Linux ARM. (Close #16695) + + Signed-off-by: Giampaolo Mancini + + Switch to "case" + + Signed-off-by: Giampaolo Mancini + + Support multiple ARM architectures + + Signed-off-by: Giampaolo Mancini + + Add check for ArchLinuxARM Keyring + + Signed-off-by: Giampaolo Mancini + + mkimage-arch.sh: Fix for merging + + Signed-off-by: Giampaolo Mancini + +commit 927b334ebfc786276a039e45ec097e71bf9a104c +Author: Justas Brazauskas +Date: Sun Dec 13 18:00:39 2015 +0200 + + Fix typos found across repository + + Signed-off-by: Justas Brazauskas + +commit f5e6b09783b592c67631e77c43c81e996a3971c3 +Merge: 94026969b4 a77861bca7 +Author: Sebastiaan van Stijn +Date: Sun Dec 13 14:10:46 2015 +0100 + + Merge pull request #18620 from jeffjohnston/DOC-16770 + + Update configuring Docker article + +commit c427131c94369d5c49a4f14d78e6ab9c678e12df +Author: Lei Jitang +Date: Sun Dec 13 02:33:18 2015 -0500 + + update network settings on container creating + + To make docker inspect return a consistent result of networksettings + for created container and stopped container, it's bettew to update + the network settings on container creating. + + Signed-off-by: Lei Jitang + +commit 94026969b43fddee3fbf35e5888dee006a14e098 +Merge: 34e38312bf a947377297 +Author: moxiegirl +Date: Sat Dec 12 21:39:34 2015 -0800 + + Merge pull request #18389 from wenchma/doc_update_for_container-basics + + docs: delete draft container-basics.md + +commit 862ed0e0d453690fef0c6452cc1fc412ec81e64e +Merge: 6932813f5e b70a7255ff +Author: Jeffrey Morgan +Date: Sat Dec 12 21:36:35 2015 -0800 + + Merge pull request #319 from nerro/310-optional-git-installation + + Make Git installation optional + +commit 34e38312bf2c1a54b4230d30664c655a23d8e5a2 +Merge: 51ffc088a5 32402a7b9f +Author: moxiegirl +Date: Sat Dec 12 21:29:26 2015 -0800 + + Merge pull request #18438 from bfirsh/update-getting-started-in-readme + + Link getting started in readme to installation instructions + +commit f1fb2722a1f40ac436c3f529dc2614f9f83e5fad +Author: Mary Anthony +Date: Sat Dec 12 21:22:17 2015 -0800 + + Chaning User guide to overview close #1483 + + Signed-off-by: Mary Anthony + +commit a77861bca7b93489dc3d804ef816b0070dbb678e +Author: Jeff Johnston +Date: Sat Dec 12 20:36:48 2015 -0600 + + Update configuring Docker article + + Signed-off-by: Jeff Johnston + +commit 94f7ce8b7129c899ecaf4767cc5fa7a40103a0c2 +Author: Jeffrey Morgan +Date: Sat Dec 12 17:32:18 2015 -0800 + + Fix bug where renaming or editing container settings would cause volume settings to be lost + + Signed-off-by: Jeffrey Morgan + +commit 51ffc088a55728b124045e297be216a83506a438 +Merge: 1fffc0270f c6bfb54ac1 +Author: Sebastiaan van Stijn +Date: Sat Dec 12 12:47:19 2015 +0100 + + Merge pull request #18270 from hqhq/hq_refactor_verify_config + + Move verify container resources to a separate function + +commit 1fffc0270ffb56d99a8440a10a0effdb3acd934d +Merge: 241f6d7107 de4ffdfe48 +Author: Antonio Murdaca +Date: Sat Dec 12 12:30:33 2015 +0100 + + Merge pull request #15365 from twistlock/14674-docker-authz + + Docker authorization plug-in infrastructure + +commit 241f6d71078916e987e131e3dd07beb0c5a1242e +Merge: 8d36f097cf 464eefd795 +Author: Antonio Murdaca +Date: Sat Dec 12 12:17:18 2015 +0100 + + Merge pull request #18592 from hqhq/hq_fix_start + + Add lock for container update + +commit 920ea13516c24d00931cac42b608b5827986ede7 +Author: Daniel Nephin +Date: Fri Dec 11 19:11:20 2015 -0800 + + Refactor ResolveAuthConfig to remove the builder dependency on cli code. + + registry.ResolveAuthConfig() only needs the AuthConfigs from the ConfigFile, so + this change passed just the AuthConfigs. + + Signed-off-by: Daniel Nephin + +commit dde577d154032fdb8bca201e44dd2261e190f796 +Author: Daniel Hiltgen +Date: Wed Nov 4 11:03:33 2015 -0800 + + Add token pass-thru for Authconfig + + This augments the CreateContainer call to detect the AuthConfig header + and use any supplied auth for pull operations. This will allow pulling + of protected image on to specific node during the create operation. + + CLI usage example using username/password: + + # Calculate the header + REPO_USER=yourusername + read -s PASSWORD + HEADER=$(echo "{\"username\":\"${REPO_USER}\",\"password\":\"${PASSWORD}\"}"|base64 -w 0 ) + unset PASSWORD + echo HEADER=$HEADER + + # Then add the following to your ~/.docker/config.json + "HttpHeaders": { + "X-Registry-Auth": "
    " + } + + # Now run a private image against swarm: + docker run --rm -it yourprivateimage:latest + + CLI usage example using registry tokens: (Required engine 1.10 with new auth token support) + + REPO=yourrepo/yourimage + REPO_USER=yourusername + read -s PASSWORD + AUTH_URL=https://auth.docker.io/token + TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" | + jq -r ".token") + HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 ) + echo HEADER=$HEADER + + # Update the docker config as above, but the token will expire quickly... + + Signed-off-by: Daniel Hiltgen + +commit f0b785a206b1fc6b891607e87939ff13e53d2ab0 +Author: Daniel Hiltgen +Date: Mon Dec 7 17:48:16 2015 -0800 + + Vendor bump of dockerclient + + This adds the new auth client token support. + + Signed-off-by: Daniel Hiltgen + +commit 60ec6dc1a10a935950b42eef83e7e4a290be78a5 +Author: Nathan LeClaire +Date: Fri Dec 11 18:19:23 2015 -0800 + + Add docs polish for 0.5.3 release + + Signed-off-by: Nathan LeClaire + +commit d3affe590404479040b225b6d2927071e0fe7894 +Merge: 47d63f9b72 2497df0862 +Author: Alexandre Beslic +Date: Fri Dec 11 17:50:08 2015 -0800 + + Merge pull request #1535 from vieux/prevent_panic_no_name + + prevent panic in filters when container has no name + +commit c0bf1a4a68c36fa676003fcd06be7468cfbb4f90 +Author: Ying Li +Date: Fri Dec 11 17:35:25 2015 -0800 + + Fix semantic merge conflict. + + Signed-off-by: Ying Li + +commit d29a42ebc6e97d545f880ac075fcd2ea1f83cc05 +Merge: 104b04d3de cf6136fed0 +Author: Nathan LeClaire +Date: Fri Dec 11 17:31:55 2015 -0800 + + Merge pull request #1299 from hairyhenderson/ssh-agent-support-1291 + + Allowing generic driver to use ssh-agent to get identities + +commit 1d98b690be2e5b7dd7ac4e56826615b3ca5d088f +Author: Nathan LeClaire +Date: Fri Dec 11 16:56:19 2015 -0800 + + Strip certs and keys in log before sending to Bugsnag + + Signed-off-by: Nathan LeClaire + +commit 104b04d3de6b0c0b85edbd10f287a7a6b891765c +Merge: 5dadfe093d a8ba712286 +Author: Nathan LeClaire +Date: Fri Dec 11 16:50:37 2015 -0800 + + Merge pull request #2556 from jeanlaurent/use-bundled-key + + Use bundled bugsnag APIKey + +commit 129c9a22f77c32c409ca5ef632a602205db664f1 +Author: Sebastiaan van Stijn +Date: Sat Dec 12 01:39:51 2015 +0100 + + Fix headers in documentation + + These headers were rendered as body text + because there was no space, but a "tab" after + the `#`. + + Signed-off-by: Sebastiaan van Stijn + +commit fd01151cd27d2a9fdc5ed38bec5c436e190c3bd0 +Author: Diogo Monica +Date: Fri Dec 11 16:36:04 2015 -0800 + + Adding a volume to MYSQL to ensure data persistence + + Signed-off-by: Diogo Monica + +commit 8bca542c17a07c9b0deeea0b14c4bac800846e05 +Author: David Lawrence +Date: Wed Dec 9 14:25:47 2015 -0800 + + restructuring validateUpdate to get rid of prepRepo + + removing attempt in server/snapshot/snapshot.go to regenerate + metadata for roles in snapshot. + + Signed-off-by: David Lawrence (github: endophage) + +commit 4aa9239aafa4e421134daab980f0c32d45d0ed85 +Merge: ec78a03045 9d2590ffb5 +Author: David Lawrence +Date: Fri Dec 11 16:04:29 2015 -0800 + + Merge pull request #335 from cyli/client-snapshot + + Client supports server snapshot + +commit 229d3bace8fbf1c077c063047710a6857ee2aaa6 +Author: David Calavera +Date: Fri Dec 11 18:58:54 2015 -0500 + + Move client version to the docker cli. + + This removes the dockerversion dependency from the client library. + + Signed-off-by: David Calavera + +commit 47d63f9b720d125780fb672fc97293954c98f386 +Merge: 982c568991 70a2713c60 +Author: Victor Vieux +Date: Fri Dec 11 15:56:34 2015 -0800 + + Merge pull request #1532 from jimenez/integration_tests + + Adding integration tests for mesos + +commit 8d36f097cfe8fd3a4e6bed6123fb1fea24889c7b +Merge: 83d0a86470 a3056f9f72 +Author: Sebastiaan van Stijn +Date: Sat Dec 12 00:40:25 2015 +0100 + + Merge pull request #18613 from calavera/flack_streaming_events_test + + Log events stream when TestEventStreaming fails. + +commit 982c568991ff8e638656a3c98130091d93dbcaed +Merge: f9e4b84a19 f25040f3ab +Author: Dongluo Chen +Date: Fri Dec 11 15:25:25 2015 -0800 + + Merge pull request #1523 from vieux/release_checklist + + add RELEASE-CHECKLIST.md + +commit be1f4114c73c74bdeccf68f7acacaac5d60d7757 +Author: Aaron Lehmann +Date: Fri Dec 11 15:13:03 2015 -0800 + + Remove unnecessary stat from blob Get method + + This calls Stat before Open, which should be unnecessary because Open + can handle the case of a nonexistent blob. Removing the Stat saves a + round trip. + + This is similar to the removal of stat in Open in #1226. + + Signed-off-by: Aaron Lehmann + +commit 83d0a8647037954fafe646a4261ccfb427ea8ff9 +Merge: 91799c232e d7d512bb92 +Author: Sebastiaan van Stijn +Date: Sat Dec 12 00:10:42 2015 +0100 + + Merge pull request #18608 from calavera/rename_get_to_get_container + + Rename `Daemon.Get` to `Daemon.GetContainer`. + +commit 03aa3509bdb0feb9f959c1a0d735ee49b0fae298 +Author: David Lawrence +Date: Wed Dec 9 11:00:04 2015 -0800 + + fixing bugs raised by @mtrmac + Signed-off-by: David Lawrence (github: endophage) + +commit 9d2590ffb5fe7c9a6a701c998ab228b588b87617 +Author: Ying Li +Date: Thu Dec 10 17:52:20 2015 -0800 + + Only allow publishing if there is no snapshot.json, not if it's corrupt + or unreadable. + + This also modifies tuf/store/filestore to return ErrMetaNotFound if the + metadata file does not exist. + + Signed-off-by: Ying Li + +commit a1217dc050144843acb54474ee877ab50fc2eb98 +Merge: bc09698897 6d709caaa5 +Author: Daniel Nephin +Date: Fri Dec 11 14:39:36 2015 -0800 + + Merge pull request #2536 from dbonev/2345-incorrect-network-name + + Incorrect network name shown in the log when no driver is specified + +commit a3056f9f72baf71655a47ac5b891c892d0174ac4 +Author: David Calavera +Date: Fri Dec 11 16:06:24 2015 -0500 + + Log events stream when TestEventStreaming fails. + + Let the tag event some more time to be emitted. + + Signed-off-by: David Calavera + +commit 91799c232e5f4e2f5dbfd78e0520a97eb2d826c0 +Merge: a84982a9c7 bb3d7e1e65 +Author: David Calavera +Date: Fri Dec 11 13:41:14 2015 -0800 + + Merge pull request #18610 from runcom/fix-warn + + api: client: info: add newline after warning + +commit 70a2713c60cddecc781c178b810ffab6d2ba80b3 +Author: Isabel Jimenez +Date: Fri Dec 11 16:07:38 2015 -0500 + + Adding integration tests for mesos + + Signed-off-by: Isabel Jimenez + +commit a84982a9c764a86358a6f53715efdc9caa0814e8 +Merge: 5525593a68 bc02d42d9e +Author: Sebastiaan van Stijn +Date: Fri Dec 11 22:03:42 2015 +0100 + + Merge pull request #18591 from calavera/inspector_tests + + Make sure template inspector always prints a carriage return. + +commit f3f8de50d1836fc468188ddddfd332c1cc30b8ae +Author: Ying Li +Date: Wed Dec 9 17:58:58 2015 -0800 + + Clarified the default_alias configuration for Notary Signer. + + Also changed the on-container paths for the server/signer configuration + to be /etc/docker/notary-(signer|server). + + Signed-off-by: Ying Li + +commit 54c7de5bd6ee975e4a3db129de4efeaf730cb0b5 +Author: Ying Li +Date: Mon Nov 30 14:32:03 2015 -0800 + + Update the server and signer docs to reflect new code changes. + + Signed-off-by: Ying Li + +commit 4d696a01874cf79d16fc21133ed596de31488f4b +Author: Ying Li +Date: Fri Nov 20 10:48:32 2015 -0800 + + Grammar/spelling/formatting/readability fixes. + + Signed-off-by: Ying Li + +commit 7ee1173084745300be44cde3d53ac4bea5afb854 +Author: Ying Li +Date: Thu Nov 19 23:57:59 2015 -0800 + + Add information on how to run notary-signer. + + Signed-off-by: Ying Li + +commit 2e8721564da0cc9b8e46a2029944cb136579000b +Author: Ying Li +Date: Wed Nov 18 18:45:24 2015 -0800 + + Added documentation for the notary signer configuration file. + + Signed-off-by: Ying Li + +commit e9d0e68b97d981c2679c6b8b90c88d586b944acb +Author: Ying Li +Date: Thu Nov 19 23:31:27 2015 -0800 + + Add information on how to run notary-server from a docker image. + + Also include information on how to override the configuration file + in the docker image. + + Signed-off-by: Ying Li + +commit ca54b435ce86970d7fa33844d010e68a0c085155 +Author: Ying Li +Date: Wed Nov 18 15:09:51 2015 -0800 + + Add documentation for notary server (what it does, etc.). + + Signed-off-by: Ying Li + +commit 41b1d57b95f094f6bda9e93266f4c2d1fa02bc91 +Author: Ying Li +Date: Mon Nov 16 16:49:57 2015 -0800 + + Document the notary-server configuration JSON file. + + Signed-off-by: Ying Li + +commit 351f90fa1caaf1f15720e2ffe324d973e88158bf +Author: Ying Li +Date: Sat Nov 14 20:20:13 2015 -0800 + + Add a script to use openssl to generate root/server/client ssl certs. + + Signed-off-by: Ying Li + +commit e8f7d5885dad5364b25a8f1efa8bb6b29afa89b1 +Author: Mrunal Patel +Date: Fri Dec 11 15:18:39 2015 -0500 + + Update runc/libcontainer to v0.0.6 + + Signed-off-by: Mrunal Patel + +commit bb3d7e1e6543a49fd344e765169265a08a19331a +Author: Antonio Murdaca +Date: Fri Dec 11 20:23:16 2015 +0100 + + api: client: info: add newline after warning + + Signed-off-by: Antonio Murdaca + +commit ec78a03045ae0b4c1b2b0327becddd806628d1c4 +Merge: 25f22a2dc8 b78823e5c3 +Author: Diogo Mónica +Date: Fri Dec 11 11:46:26 2015 -0800 + + Merge pull request #356 from HuKeping/refactor-mainhandler + + Refactor a little to reduce indentation + +commit 25f22a2dc8c1a8a538b28e884b4879fe27a9b627 +Merge: 8fd8916b15 da7c87f9dc +Author: Ying Li +Date: Fri Dec 11 11:33:24 2015 -0800 + + Merge pull request #357 from mtrmac/fix-vet + + Fix (make vet) + +commit f9e4b84a195c535b52c04914a83ab95862b164a7 +Merge: 0116fbf3d0 4b33656bb4 +Author: Alexandre Beslic +Date: Fri Dec 11 11:00:43 2015 -0800 + + Merge pull request #1530 from vieux/handle_engine_unhealthy_in_proxy + + return proper error for inspect and proxy on unhealthy node + +commit da7c87f9dcb8d77924556e53f9b1a33372c5ac14 +Author: Miloslav Trmač +Date: Fri Dec 11 19:59:16 2015 +0100 + + Fix (make vet) + + server/handlers/default_test.go:353: GetCurrent passes Lock by value: handlers.failStore contains github.com/docker/notary/server/storage.MemStorage contains sync.Mutex + tuf/store/httpstore_test.go:208: github.com/docker/notary/tuf/validation.ErrBadRoot composite literal uses unkeyed fields + + Signed-off-by: Miloslav Trmač + +commit de4ffdfe488494c9c300a785ad4f2263c6182988 +Author: Liron Levin +Date: Fri Dec 11 20:59:15 2015 +0200 + + Change authz plugin argument name + + Signed-off-by: Liron Levin + +commit 0116fbf3d0b0c4472704b88a188ff3f56bab93b2 +Merge: 744e3a3925 3e0d4f124e +Author: Victor Vieux +Date: Fri Dec 11 10:37:10 2015 -0800 + + Merge pull request #1531 from ch3lo/fix-typo + + fix bracket + +commit d7d512bb927023b76c3c01f54a3655ee7c341637 +Author: David Calavera +Date: Fri Dec 11 12:39:28 2015 -0500 + + Rename `Daemon.Get` to `Daemon.GetContainer`. + + This is more aligned with `Daemon.GetImage` and less confusing. + + Signed-off-by: David Calavera + +commit a8ba712286ad184c7f0544d7a5c3393a5c08a0e0 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 11:45:17 2015 +0100 + + Use bundled bugsnag APIKey + + Signed-off-by: Jean-Laurent de Morlhon + +commit 5525593a681a478dc51d7ce10a8cb3135d39e785 +Merge: cd648dce3a a31435c8a2 +Author: Alexander Morozov +Date: Fri Dec 11 07:39:44 2015 -0800 + + Merge pull request #18595 from mariussturm/gelf-no-trim-18568 + + don't trim GELF message + +commit 5dadfe093db4684de1dc5c86bef97eaf9c2c3bdc +Merge: 54a85e6863 6ab09860af +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 16:21:40 2015 +0100 + + Merge pull request #2557 from dgageot/2553-fix-build-x + + Fix the build on linux/windows by excluding fusion driver + +commit 6ab09860af935fa518b8351e5c2f222f4d0e8d98 +Author: David Gageot +Date: Fri Dec 11 11:45:07 2015 +0100 + + Fix the CI on darwin/windows + + Signed-off-by: David Gageot + +commit f3775f774c37249388ab87dfcf4613991896990b +Author: David Gageot +Date: Fri Dec 11 10:47:18 2015 +0100 + + FIX #2553 Fusion Driver is supported only on darwin + + Signed-off-by: David Gageot + +commit bbe7a00db52bf1cd850426ae3a37e05a3813428a +Author: Soshi Katsuta +Date: Tue Oct 27 21:32:37 2015 +0900 + + libmachine/mcnutils: check the version of cached iso and download the latest one when it is out-of-date + + Signed-off-by: Soshi Katsuta + +commit 54a85e686329efd5e33910624d1c095daa49f3f0 +Merge: 02dde087c9 5f4583bd3f +Author: David Gageot +Date: Fri Dec 11 13:48:05 2015 +0100 + + Merge pull request #2555 from jeanlaurent/bugsnag-info-detail + + Add context, driver name & command to crash report + +commit 5f4583bd3fc08248250cc81e3032614e2a03fe27 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 11:01:24 2015 +0100 + + Add context, driver name & command to crash report + + Signed-off-by: Jean-Laurent de Morlhon + +commit cd648dce3adf0f15059eb848d3140d5c7b9f350f +Merge: 23bd9b881f 68c9ebdf1f +Author: Tibor Vass +Date: Fri Dec 11 11:23:41 2015 +0100 + + Merge pull request #18242 from jfrazelle/i-have-no-idea + + Remove ipc rule in docker-engine apparmor profile + +commit 2497df086240508c24c8fdd496da7531365d3d59 +Author: Victor Vieux +Date: Fri Dec 11 02:11:21 2015 -0800 + + prevent panic in filters when container has no name + + Signed-off-by: Victor Vieux + +commit 02dde087c96c646f284baa17589124f997e038fe +Merge: ac41fba24e 29ffc04cc9 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 10:55:40 2015 +0100 + + Merge pull request #2552 from nathanleclaire/ls_timeout_nits + + Aesthetic nitpicks on ls timeout + +commit a31435c8a2c4560b6e1a0e84450c45490fa587be +Author: Marius Sturm +Date: Fri Dec 11 10:25:44 2015 +0100 + + dont trim gelf log message + + Signed-off-by: Marius Sturm + +commit ac41fba24e4d822e89d0ba8e053d3de38a4db2a4 +Merge: 974270bb77 4e58bb9434 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 09:37:06 2015 +0100 + + Merge pull request #2541 from dougm/env-emacs + + Add emacs support to env command + +commit 6d709caaa50d094c4948355bfab24c97d8f2ed94 +Author: Dimitar Bonev +Date: Thu Dec 10 22:56:45 2015 +0200 + + Fixes incorrect network name shown in the log when no driver is specified + + Signed-off-by: Dimitar Bonev + +commit b78823e5c3f04089835d5a75c51dff79935a6fdc +Author: HuKeping +Date: Fri Dec 11 15:43:01 2015 +0800 + + Refactor a little to reduce indentation + + Signed-off-by: Hu Keping + +commit 8fd8916b15d727c205d735b19732ea948586973d +Merge: c77bbee0ef 54af67344b +Author: Ying Li +Date: Thu Dec 10 23:13:27 2015 -0800 + + Merge pull request #352 from HuKeping/check-map + + Use canonical way to check if a map contains a key + +commit 974270bb77b433650fccfdd6981ad68ce3e13879 +Merge: 5358010229 6439ee967d +Author: Jean-Laurent de Morlhon +Date: Fri Dec 11 07:58:30 2015 +0100 + + Merge pull request #2554 from nathanleclaire/err-recording + + Add style and phrasing nitpicks + +commit f25040f3ab39c9df8281b4b5b1c8e3d351d9b376 +Author: Victor Vieux +Date: Wed Dec 9 16:16:16 2015 -0800 + + add RELEASE-CHECKLIST.md + + Signed-off-by: Victor Vieux + +commit 54af67344ba50c5df2e577933e495561daf135ce +Author: HuKeping +Date: Thu Dec 10 19:50:10 2015 +0800 + + Minor typo + + Signed-off-by: Hu Keping + +commit f147a7ac6861512e4e69aedd0de160e1a5af3f01 +Author: HuKeping +Date: Thu Dec 10 16:47:54 2015 +0800 + + Use canonical way to check if a map contains a key + + As the language spec: + https://golang.org/ref/spec#Index_expressions + + Signed-off-by: Hu Keping + +commit 3e0d4f124edd6b0bfc7787bd592c7122545de28f +Author: Marcelo Salazar R +Date: Fri Dec 11 02:44:19 2015 -0300 + + fix bracket + + Signed-off-by: Marcelo Salazar R + +commit c77bbee0ef30a274c5f0c0ebcec8f04e1013d3b9 +Merge: 26d30953c8 6aa114a49f +Author: Ying Li +Date: Thu Dec 10 21:29:57 2015 -0800 + + Merge pull request #351 from cyli/better-validation-errors + + Propagate error validations from server to client + +commit b7af5bcd20b64e7481538490a0ee1d844f5a462e +Author: Dima Stopel +Date: Thu Dec 10 12:53:27 2015 +0200 + + Fixing documentation comments by @thaJeztah + + Signed-off-by: Dima Stopel + +commit 4b33656bb460ada714409ece90f8414eab3657c6 +Author: Victor Vieux +Date: Thu Dec 10 14:21:04 2015 -0800 + + return proper error for inspect and proxy on unhealthy node + + Signed-off-by: Victor Vieux + +commit 6439ee967d34787ca78d8cd93cc92393acaffaba +Author: Nathan LeClaire +Date: Thu Dec 10 19:25:54 2015 -0800 + + Add style and phrasing nitpicks + + Signed-off-by: Nathan LeClaire + +commit 5358010229ef5b8072560a59489ec434fdb4c281 +Merge: 18372b13c3 4f0c24483b +Author: Nathan LeClaire +Date: Thu Dec 10 19:01:22 2015 -0800 + + Merge pull request #2526 from jeanlaurent/bugsnag + + Monitor and report bug with bugsnag + +commit c6bfb54ac19ec8d2822ab4dae6123e705a299d73 +Author: Qiang Huang +Date: Fri Dec 11 10:59:29 2015 +0800 + + Move verify container resources to a separate function + + Make the code easy to view. + + Signed-off-by: Qiang Huang + +commit 54da47d63652d0c86abe362c15aad7b382785168 +Author: Li Yi +Date: Sun Oct 25 11:01:15 2015 +0800 + + Support large layer for OSS driver + + Signed-off-by: Li Yi + +commit 464eefd7957c3e0c7bcfb80bdc96ef8790687615 +Author: Qiang Huang +Date: Fri Dec 11 10:33:13 2015 +0800 + + Add lock for container update + + Container needs to be locked when updating the fields, and + this PR also remove the redundant `parseSecurityOpt` since + it'll be done in `setHostConfig`. + + Signed-off-by: Qiang Huang + +commit bc02d42d9ec6d6741946e2edbd13ff8a78bbdb80 +Author: David Calavera +Date: Thu Dec 10 20:36:08 2015 -0500 + + Make sure template inspector always prints a carriage return. + + To match with the raw inspector. + Adds tests to verify its functionality. + + Signed-off-by: David Calavera + +commit 23bd9b881fd4a04d3f363d4d5205f7ac63a904e5 +Merge: 8cd356630a 76de01c138 +Author: Sebastiaan van Stijn +Date: Fri Dec 11 02:38:24 2015 +0100 + + Merge pull request #18577 from devvyn/patch-1 + + Update custom-docker0.md (corrections) + +commit 8cd356630a84699485432fd9ecdde18c0b866a34 +Merge: a16a1d75d9 5c329633d7 +Author: Sebastiaan van Stijn +Date: Fri Dec 11 02:27:13 2015 +0100 + + Merge pull request #18142 from ekuric/mkimage + + mkimage-yum.sh to support dnf + +commit 8b9cc4c3f68f1616e7fbd41107233d995df6a827 +Author: Ying Li +Date: Thu Dec 10 17:16:53 2015 -0800 + + Minor review comment changes: + + - add a specific error type when the server is requested to manage + an unsupported key type + - variable name change + + Signed-off-by: Ying Li + +commit 57172589318eb7d5b3cb184f697d17938fd3ed95 +Author: Ying Li +Date: Thu Dec 10 16:28:20 2015 -0800 + + When publishing, if no snapshot data exists, create it and then try to sign. + + This supports the case of a user intializing a repo so that the server + signs the snapshot, and then changing their minds and rotating the keys + so that they now sign the snapshot, but all before publishing a single + thing. + + Signed-off-by: Ying Li + +commit b1188711903d79d2d6c3dfa3b425b0d86dfd0983 +Author: Jessica Frazelle +Date: Thu Dec 10 16:15:13 2015 -0800 + + update w docker-py and toolbox + + Signed-off-by: Jessica Frazelle + +commit a16a1d75d928000c8e8e9995d8843a685aa5df65 +Merge: b89676bead a2c4c0cd3a +Author: Jess Frazelle +Date: Fri Dec 11 10:11:03 2015 +1000 + + Merge pull request #18564 from runcom/warn-on-loopback + + api: client: info: print a warning if dm is using a loopback file + +commit 1d3aeaaae7085995ab2f2d6b482b3dd64794d8aa +Author: Daniel Nephin +Date: Wed Dec 9 16:03:26 2015 -0800 + + Ignore extra coverge files + + These files are created because we run acceptance tests in a subprocess. + They have the process id in their name, so they wont be removed by the + normal coverage cleanup on each run. + + Signed-off-by: Daniel Nephin + +commit 4e58bb943490911ba1a4f754b90dcdcb3a3547b9 +Author: Doug MacEachern +Date: Wed Dec 9 14:29:35 2015 -0800 + + Add emacs support to env command + + Signed-off-by: Doug MacEachern + +commit b89676beadce5a078dd8fc8b37ce00729e6e7232 +Merge: ac453a310b 7c077c2c34 +Author: David Calavera +Date: Thu Dec 10 15:19:41 2015 -0800 + + Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device + + Fix typo in named test and docs. + +commit 6aa114a49fbce829b7e3098c78ae32a7f3d6440f +Author: Ying Li +Date: Thu Dec 10 15:12:05 2015 -0800 + + Fix all instances where 'propagate' was mispelled as 'propogate' + + Signed-off-by: Ying Li + +commit aaf45a9ccec53bbcfd9c88b5032f32bf8c64cfcd +Author: Ying Li +Date: Thu Dec 10 14:40:16 2015 -0800 + + Refactor Initialize to be easier to read, and update comments per review. + + Signed-off-by: Ying Li + +commit ac453a310bac6bdd7cd9d780a63d4168064570d1 +Merge: 9381c744b8 d92e7ad735 +Author: Alexander Morozov +Date: Thu Dec 10 14:52:48 2015 -0800 + + Merge pull request #18353 from aaronlehmann/transfer-manager + + Improved push and pull with upload manager and download manager + +commit 18372b13c37c2bc918353c2aac882cf3bce04d82 +Merge: a5eb979f09 42ad416c0a +Author: Nathan LeClaire +Date: Thu Dec 10 14:19:38 2015 -0800 + + Merge pull request #2550 from dgageot/2479-warn-vbox-version + + FIX #2479 Warn on VirtualBox version + +commit 29ffc04cc9c162e09e321a2cb5c556a63c0e1f5f +Author: Nathan LeClaire +Date: Thu Dec 10 13:25:13 2015 -0800 + + Aesthetic nitpicks on ls timeout + + Signed-off-by: Nathan LeClaire + +commit 7c077c2c3443fdb9b13b7790bc96cdaa287cf381 +Author: Christopher Jones +Date: Thu Dec 10 14:40:32 2015 -0600 + + Fixed typo change deivce to device. + + This changes deivce to device in daemon, test and docs. + + Signed-off-by: Christopher Jones + +commit a5eb979f095fd2fe27073653fb01086b4727f939 +Merge: cc6dc7c1be 02c235b8b9 +Author: Nathan LeClaire +Date: Thu Dec 10 13:09:29 2015 -0800 + + Merge pull request #2546 from jeanlaurent/ls-timeout + + add timeout override to ls command + +commit 9381c744b89bf006e90483738601a24323647678 +Merge: a0f80079b8 0e16eacad4 +Author: Alexander Morozov +Date: Thu Dec 10 12:53:47 2015 -0800 + + Merge pull request #18566 from coolljt0725/fix_18544 + + Probably fix flaky test TestExecTTY + +commit a0f80079b8e699b992f34cc76a97ba578421fdbb +Merge: 13155ac47e 3260ddb10b +Author: David Calavera +Date: Thu Dec 10 12:37:13 2015 -0800 + + Merge pull request #18557 from cpuguy83/use_correct_resize_fn + + Use correct fn for resizing TTY + +commit 80e3d4b21984b1ba99e3a867f9a8483e0eb3fe31 +Author: Andrew T Nguyen +Date: Wed Dec 9 18:05:22 2015 -0800 + + fix links? + +commit 62f5304f7fe3051e1186fe4f7c854c7d313ddfee +Author: Andrew T Nguyen +Date: Fri Dec 4 11:22:33 2015 -0800 + + Necromancy on Swift support + +commit 76de01c13833e42c89afa7e46d97bb4864a9be9b +Author: Devvyn Murphy +Date: Thu Dec 10 13:11:59 2015 -0600 + + Update custom-docker0.md (corrections) + + Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup). + + Signed-off-by: Devvyn Murphy + +commit a89bdaa9bf2e5683d65b2a73c59ad37437d2bc61 +Author: Ying Li +Date: Wed Dec 9 16:57:25 2015 -0800 + + Just propogate server error if server can't sign snapshot. + + The errors returned by the server aren't great right now, so it's hard + to try to be clever in synthesizing a signed.ErrNoKeys{}. + + Signed-off-by: Ying Li + +commit a924ca172f6baf0da2703bf9c7dd11feada7f1c5 +Author: Ying Li +Date: Wed Dec 9 10:40:50 2015 -0800 + + When initializing a repo, create local keys before getting remote keys. + + Signed-off-by: Ying Li + +commit d0e789740a0bb53de0013179dca454a9ac388445 +Author: Ying Li +Date: Wed Dec 9 09:59:08 2015 -0800 + + Simplify the logic to determine whether to publish the root + + Signed-off-by: Ying Li + +commit 642cf7f35308ef82646d439fd412935ff49d09f2 +Author: Ying Li +Date: Tue Dec 8 16:53:32 2015 -0800 + + Slight refactor of NotaryRepository.Initialize + + Signed-off-by: Ying Li + +commit 39d79d9844b74e2d7892df46b21cedd831202ce5 +Author: Ying Li +Date: Mon Dec 7 16:50:35 2015 -0800 + + NotaryRepository.Publish supports server managing snapshot keys. + + When publishing, do not sign and send the snapshot metadata if the + client does not have the snapshot key. If the server sends back + an error, then it also does not have a snapshot key and the + client should propogate the no signing key error. + + Signed-off-by: Ying Li + +commit 4b46a3452409390e53fa3d8e15a3e81207d7ead4 +Author: Ying Li +Date: Thu Dec 3 17:11:26 2015 -0800 + + NotaryRepository.Intialize supports server managing snapshot keys. + + If configured to have the server manage the snapshot key, the snapshot + key is not generated and there will be no snapshot metadata. + + Signed-off-by: Ying Li + +commit 13155ac47ea27eceda2c59d42e05e4b6ab1f516a +Merge: 31a31adf7e 037cbcec98 +Author: Vincent Demeester +Date: Thu Dec 10 18:17:04 2015 +0100 + + Merge pull request #18555 from runcom/clean-devmapper + + devmapper: remove unused var + +commit 31a31adf7eeebfb0b5ca8622c33ff47d66c6c067 +Merge: 2ea48e9fc0 c07e79fa8a +Author: David Calavera +Date: Thu Dec 10 08:58:32 2015 -0800 + + Merge pull request #18459 from Microsoft/jjh/winci-bash4fix + + Windows CI Fix: Allow bash v4 + +commit 2ea48e9fc09ba83785355c5d073e9bfae81ea266 +Merge: 8e2c27abeb 800505729b +Author: Phil Estes +Date: Thu Dec 10 11:50:03 2015 -0500 + + Merge pull request #18197 from nalind/workaround-go-libgcc + + Work around a linking problem on 32-bit arches + +commit 26d30953c87b04b0029d1361f69f49b3b0448baa +Merge: 6f221551a3 06e58c1d11 +Author: David Lawrence +Date: Thu Dec 10 08:40:24 2015 -0800 + + Merge pull request #312 from mtrmac/cert-expiration + + Cert expiration + +commit 6f221551a396e76f047e8c36e896063b59ae604f +Merge: 2bfadacf34 e19e7fc44d +Author: David Lawrence +Date: Thu Dec 10 08:40:02 2015 -0800 + + Merge pull request #311 from mtrmac/invalid-passphrase + + Fix error handling on invalid root passphrase + +commit 8e2c27abeb5c870045aa8ba8fd8863e8e2d2fd84 +Merge: 3d82564c7a bd00905614 +Author: Alexander Morozov +Date: Thu Dec 10 08:27:15 2015 -0800 + + Merge pull request #18565 from hqhq/hq_fix_ensure_format + + Fix format issue + +commit 4f0c24483b7d2796b8ce721cc9502a0d2e403936 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 8 12:13:59 2015 +0100 + + bugsnag integration + + Signed-off-by: Jean-Laurent de Morlhon + +commit 02c235b8b91e093fc185713e965fd17d7c462873 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 10 12:14:05 2015 +0100 + + Fix #2534 and #1696 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 42ad416c0aea6299bd9c2010ba22cdb8ff08a6f9 +Author: David Gageot +Date: Thu Dec 10 15:44:37 2015 +0100 + + FIX #2479 Warn on VirtualBox version + + Signed-off-by: David Gageot + +commit 8d2a423d8716aafc4bd5d05eeceec87dae27202b +Author: Riku Voipio +Date: Thu Dec 10 16:54:47 2015 +0200 + + control: add missing fields + + Without section/priority, reprepro will reject the packages. Add + sections following the Debian docker.io packages + + Signed-off-by: Riku Voipio + +commit cc6dc7c1be6d29600c43f3d2b2e05769f26099a9 +Merge: 47354051e7 82edc1d174 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 10 14:31:08 2015 +0100 + + Merge pull request #2545 from dgageot/1432-google-update-firewall + + Google driver - Update firewall open ports + +commit 47354051e7fbd9da4e2c888daeb4977830feb96c +Merge: 8a64fd4716 98b59afc39 +Author: David Gageot +Date: Thu Dec 10 14:30:53 2015 +0100 + + Merge pull request #2544 from dgageot/simplify-makefile + + Simplify makefile + +commit 82edc1d1742c4e7a58ac2cf8d6a02d5358eb61c8 +Author: David Gageot +Date: Thu Dec 10 10:33:23 2015 +0100 + + FIX #1432 open all the ports need for google driver + + Signed-off-by: David Gageot + +commit 58b4cce3925b797d8f27f2e980a083a10e400b87 +Author: David Gageot +Date: Thu Dec 10 09:09:35 2015 +0100 + + Remove dead code and other cosmetic changes + + Signed-off-by: David Gageot + +commit a2c4c0cd3a2e5b58b36718290cb7c31f99f6495e +Author: Antonio Murdaca +Date: Thu Dec 10 08:58:02 2015 +0100 + + api: client: info: print a warning if dm is using a loopback file + + Signed-off-by: Antonio Murdaca + +commit 3d82564c7a6ae139879b869a987bf9274ed0275d +Merge: d46650b3c7 413e058b72 +Author: Sebastiaan van Stijn +Date: Thu Dec 10 13:32:10 2015 +0100 + + Merge pull request #18562 from haoshuwei/modify-wordspelling-in-docker-stats + + Modify word spelling in stats.go's comments + +commit bc096988976176d200b72567b76d7a0bfb1c0d4f +Merge: 6fe747e0ee fa3528ea25 +Author: Aanand Prasad +Date: Thu Dec 10 11:31:01 2015 +0000 + + Merge pull request #2527 from dnephin/fix_dns_config_option + + Fix dns and dns_search when used strings and without extends. + +commit 98b59afc3925a528f4736de7bb2f808a3a62e912 +Author: David Gageot +Date: Thu Dec 10 09:45:15 2015 +0100 + + Simplify makefile + + Signed-off-by: David Gageot + +commit 0e16eacad44f1485d6857a61e2e7690e0a37ddec +Author: Lei Jitang +Date: Thu Dec 10 04:13:58 2015 -0500 + + Probably fix flaky test TestExecTTY + + sleep 2 seconds before exec exit to make sure + the output of `cat /foo` will be read + + Signed-off-by: Lei Jitang + +commit d46650b3c7700cd6828f57409e981d8312c3fd32 +Merge: ff0e33824a 6df3fc5175 +Author: Sebastiaan van Stijn +Date: Thu Dec 10 09:28:00 2015 +0100 + + Merge pull request #18553 from calavera/remove_specific_go_1_5_calls + + Remove call to template.Option when building with 1.4. + +commit 8a64fd4716006a84f6fce25aefbf013a675b04c8 +Merge: 95bd94da62 d5ff6b21ea +Author: David Gageot +Date: Thu Dec 10 09:24:09 2015 +0100 + + Merge pull request #2528 from jhoos/vmwarefusion-umask + + Explicitly set umask before invoking vmrun in vmwarefusion + +commit 95bd94da625615be9ce9841a2518b8c377314e69 +Merge: a1275f6f11 fd0f002065 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 10 08:46:10 2015 +0100 + + Merge pull request #2511 from dgageot/faster-integration-tests + + Faster integration tests + +commit 037cbcec989f7867b6062455e8b042b8d2b0ab18 +Author: Antonio Murdaca +Date: Wed Dec 9 23:49:33 2015 +0100 + + devmapper: remove unused var + + Signed-off-by: Antonio Murdaca + +commit bd00905614346f6b9a6289bd1042252f8d99df2e +Author: Qiang Huang +Date: Thu Dec 10 15:18:16 2015 +0800 + + Fix format issue + + Remove prefix and suffix spaces and tabs. + + Signed-off-by: Qiang Huang + +commit 413e058b72eab50001496b1a4d0af7393be26df0 +Author: Shuwei Hao +Date: Thu Dec 10 06:57:25 2015 +0000 + + Modify word spelling errors in stats.go + + Signed-off-by: Shuwei Hao + +commit ff0e33824a09284084683d9e00f0f7bcc6950a76 +Merge: 10bbe0ee7c 5ac12c418f +Author: Brian Goff +Date: Wed Dec 9 23:11:18 2015 -0500 + + Merge pull request #18550 from ibuildthecloud/panic + + Don't dereference HostConfig.MemorySwapiness if nil + +commit 3260ddb10bff8d1b5cabe547ecb77e19d379a3c6 +Author: Brian Goff +Date: Wed Dec 9 22:55:01 2015 -0500 + + Use correct fn for resizing TTY + + Signed-off-by: Brian Goff + +commit d92e7ad7356e10c86e7dc479356578ac40fd2bbd +Author: Aaron Lehmann +Date: Wed Dec 9 11:26:07 2015 -0800 + + Update docs for addition of transfer manager + + Closing the HTTP connection requesting a push or pull will cancel the + push or pull. This behavior also applies to the CLI. + + Signed-off-by: Aaron Lehmann + +commit 572ce802306a4e919802e5b77cbeca94acda7c0a +Author: Aaron Lehmann +Date: Fri Nov 13 16:59:01 2015 -0800 + + Improved push and pull with upload manager and download manager + + This commit adds a transfer manager which deduplicates and schedules + transfers, and also an upload manager and download manager that build on + top of the transfer manager to provide high-level interfaces for uploads + and downloads. The push and pull code is modified to use these building + blocks. + + Some benefits of the changes: + + - Simplification of push/pull code + - Pushes can upload layers concurrently + - Failed downloads and uploads are retried after backoff delays + - Cancellation is supported, but individual transfers will only be + cancelled if all pushes or pulls using them are cancelled. + - The distribution code is decoupled from Docker Engine packages and API + conventions (i.e. streamformatter), which will make it easier to split + out. + + This commit also includes unit tests for the new distribution/xfer + package. The tests cover 87.8% of the statements in the package. + + Signed-off-by: Aaron Lehmann + +commit 10bbe0ee7ccb3f8e6c37f84b89a887e882f83944 +Merge: 0b930e8fec efda9618db +Author: David Calavera +Date: Wed Dec 9 17:42:14 2015 -0800 + + Merge pull request #18552 from dnephin/move_network_types + + Move networking api types to the api/types/networking package. + +commit b0653fa4734a7b8542fc753cc5868751dd9a0111 +Author: Chang Long Xu +Date: Thu Dec 10 09:16:12 2015 +0800 + + recommit + + Signed-off-by: Chang Long Xu + +commit b69c2000384589d12db39df03c4c4706103d630a +Author: Ying Li +Date: Wed Dec 9 17:12:14 2015 -0800 + + More coverage of the validation error serialization + + Signed-off-by: Ying Li + +commit 20f5b5f3b29e30e14ada79ec5c07f658d1679d21 +Author: Ying Li +Date: Wed Dec 9 16:48:09 2015 -0800 + + Ensure that the server produces errors the client can parse. + + Signed-off-by: Ying Li + +commit fa3528ea2558cc4b1efca9ba5ea061b57191ae30 +Author: Daniel Nephin +Date: Wed Dec 9 16:32:39 2015 -0800 + + Fix dns and dns_search when used strings and without extends. + + Signed-off-by: Daniel Nephin + +commit 3f3110bba2db1220457f5f3c6bfd9b1c408c2efa +Author: Ying Li +Date: Wed Dec 9 16:27:52 2015 -0800 + + In tuf/httpstore, attempt to parse any validation errors from server. + + Signed-off-by: Ying Li + +commit 0b930e8fec026f0a7c84e3bccbc375c2443ae33d +Merge: 1d775a54cc 19e5c01230 +Author: David Calavera +Date: Wed Dec 9 16:26:02 2015 -0800 + + Merge pull request #18417 from jfrazelle/remove-parallel + + remove parallel we no longer use it + +commit 744e3a39252fb09a7072890c4531c543fca6a842 +Merge: 94220e5f96 af8cabf71d +Author: Victor Vieux +Date: Wed Dec 9 15:51:57 2015 -0800 + + Merge pull request #1522 from dongluochen/bump-1.0.1 + + Bump version to 1.0.1 + +commit af8cabf71dec9252eb324139783e36bb60221a45 +Author: Dong Chen +Date: Wed Dec 9 15:39:20 2015 -0800 + + Bump version to 1.0.1 + + Signed-off-by: Dong Chen + +commit fb9afbc5d895f018977a561ec6ca46c51627bd27 +Author: Ying Li +Date: Wed Dec 9 15:10:17 2015 -0800 + + Server propogates validation failures in the 400 response. + + Previously, it just said that the update was invalid, but not why. + + Signed-off-by: Ying Li + +commit 6df3fc51759a6219e965a30c413cb43ddbc897c9 +Author: David Calavera +Date: Wed Dec 9 16:52:02 2015 -0500 + + Remove call to template.Option when building with 1.4. + + Windows still relies on 1.4.2 to build Docker. + + Signed-off-by: David Calavera + +commit 94220e5f9611902cc8e2a2038b7f68f301ee952f +Merge: 059ab13807 284a00e811 +Author: Victor Vieux +Date: Wed Dec 9 14:25:09 2015 -0800 + + Merge pull request #1519 from vieux/add_dong_maintainers + + Add Dongluo to the MAINTAINERS file + +commit 284a00e811ccb99db0356542abcf7c36b19a5af1 +Author: Victor Vieux +Date: Wed Dec 9 14:07:29 2015 -0800 + + Add Dongluo to the MAINTAINERS file + + Signed-off-by: Victor Vieux + +commit 3aa13e6645c922cf511d1ac5d239c2359cad86a2 +Author: Ying Li +Date: Wed Dec 9 14:01:46 2015 -0800 + + Move validation errors to tuf, since that is the expected server interface. + + Also make the validation errors serializable as JSON. + + Signed-off-by: Ying Li + +commit efda9618db07152ce6a94e0ac391ba58d1463fcd +Author: Daniel Nephin +Date: Wed Dec 9 13:38:39 2015 -0800 + + Move networking api types to the api/types/networking package. + + Signed-off-by: Daniel Nephin + +commit 8fe6b3835c87abf0c48d60f9c1f70bdcb496566c +Author: Alessandro Boch +Date: Mon Dec 7 15:46:14 2015 -0800 + + Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90 + + Signed-off-by: Alessandro Boch + +commit 5ac12c418f163a49ad3355506fc8ed632905dbd9 +Author: Darren Shepherd +Date: Wed Dec 9 13:11:41 2015 -0700 + + Don't dereference HostConfig.MemorySwapiness if nil + + Signed-off-by: Darren Shepherd + +commit 059ab13807822ee1ea5579fcc34f68d2aeb3af81 +Merge: 54c97525e3 a8d4c4b0f4 +Author: Victor Vieux +Date: Wed Dec 9 12:29:59 2015 -0800 + + Merge pull request #1518 from suryagaddipati/patch-1 + + Fix busted link + +commit 54c97525e361cc9b2e3cf1072ddcd0d956d10bb5 +Merge: 5b28d35d31 fa19c3fd55 +Author: Victor Vieux +Date: Wed Dec 9 12:29:41 2015 -0800 + + Merge pull request #1514 from moxiegirl/carry-1510 + + Carry 1510 + +commit 1d775a54cc67e27f755c7338c3ee938498e845d7 +Merge: 8b6132aa15 d8d38f2345 +Author: Sebastiaan van Stijn +Date: Wed Dec 9 21:10:46 2015 +0100 + + Merge pull request #18541 from programmerq/inspect_command_ip_address + + Add the actual command in this example. + +commit fa19c3fd55da51f7a5e24b02bc810858ce84af0a +Author: Alexandre Beslic +Date: Mon Dec 7 15:30:27 2015 -0800 + + add docs for distributed K/V discovery with secured TLS communication + + Signed-off-by: Alexandre Beslic + + Closes #1510 and carries + Adding abronan's commentary + Tweak recommend + + Signed-off-by: Mary Anthony + +commit e6c60e79c570f97ef36f280fcebed497682a5f37 +Merge: afa4448f38 a67000a814 +Author: Richard Scothern +Date: Wed Dec 9 11:52:51 2015 -0800 + + Merge pull request #1253 from RichardScothern/go-1.5.2 + + Update go version to 1.5.2 + +commit 8b6132aa15367456b04cf659045e7996252df1f0 +Merge: 7470e39c73 1626c9dae0 +Author: Brian Goff +Date: Wed Dec 9 14:47:01 2015 -0500 + + Merge pull request #18538 from estesp/aufs-whiteout-userns-fix + + Skip aufs whiteout files on userns translation to container + +commit a67000a814f17b993080b8530247818dc69c6805 +Author: Richard Scothern +Date: Wed Dec 9 11:33:18 2015 -0800 + + Update go version to 1.5.2 + Signed-off-by: Richard Scothern + +commit 7470e39c736db638588976f3d699a88b53b197c5 +Merge: 375f754f49 d9f4e5c13c +Author: Sebastiaan van Stijn +Date: Wed Dec 9 20:24:39 2015 +0100 + + Merge pull request #18533 from thaJeztah/fix-oracle-package-name + + docs: fix incorrect package name on Oracle Linux + +commit 4208945fc13cc806efabda61845d97dd7f6b2ecb +Author: Ying Li +Date: Wed Dec 9 11:22:49 2015 -0800 + + Move the notary errors HTTP errors into the server package. + + Signed-off-by: Ying Li + +commit afa4448f3877e444af999184b8221f5caadc0886 +Merge: 796d6e7915 5ffa6564b8 +Author: Richard Scothern +Date: Wed Dec 9 11:18:37 2015 -0800 + + Merge pull request #1250 from RichardScothern/AUTHORS + + Update AUTHORS for release + +commit 45c740b6b837d97dd5cce878f88c225cf5c52a16 +Author: Ying Li +Date: Wed Dec 9 11:16:35 2015 -0800 + + Add an invalid update error to the server errors. + + This would represent a validation error on the updates, as opposed to + a malformed upload error. + + Signed-off-by: Ying Li + +commit 06e58c1d11ba646f8d3181fa1ec5e9524a609289 +Author: Miloslav Trmač +Date: Mon Nov 23 14:13:46 2015 +0100 + + Tighten TestNewCertificate tests + + Using the just added facility to generate a certificate as of a specific + time, tighten TestNewCertificate to use equality comparisons. + + Signed-off-by: Miloslav Trmač + +commit bd6d937f43887dec7f53b371c41a1ca5dc45d218 +Author: Miloslav Trmač +Date: Wed Dec 2 17:13:57 2015 +0100 + + Fix computation of certificate expiration + + Instead of 3650 days, actually use 10 years (i.e. take into account leap + days). + + Signed-off-by: Miloslav Trmač + +commit 3c6335c57260daae0b7c030c5403aaeda5008cc2 +Author: Miloslav Trmač +Date: Wed Dec 2 17:12:10 2015 +0100 + + Explicitly supply validity times to certificate generation + + Add explicit startTime and endTime parameters to + cryptoservice.GenerateCertificate and trustmanager.NewCertificate. + + trustmanager.NewCertificate as a low-level data manipulation function + should not be hard-coding policy (10-year expiration); that policy + belongs to its callers, or one more level higher to callers of + cryptoservice.GenerateCertificate. + + These places hard-coding policy now also have an explict comment to + that effect. + + In addition to conceptual cleanliness, this will allow writing tests + of certificate expiry by generating appropriate expired or nearly-expired + certificates. + + Tests which don't care about the policy much will continue to use the + just added cryptoservice.GenerateTestingCertificate. + + Signed-off-by: Miloslav Trmač + +commit d5c080ae9cb1d27893f4928caae49995da0fa7e3 +Author: Miloslav Trmač +Date: Wed Dec 2 17:05:07 2015 +0100 + + Add cryptoservice.GenerateTestingCertificate + + Various tests have been calling trustmanager.NewCertificate and + open-coding most of cryptoservice.GenerateCertificate. So, add + cryptoservice.GenerateTestingCertificate. It differs only by using + crypto.Signer instead of data.PrivateKey because the tests + have a crypto.Signer more frequently available, and converting + from data.PrivateKey to crypto.Signer is easier than the other way. + + This will make it easier to add policy parameters which the tests don't + care about to trustmanager.NewCertificate and + cryptoservice.GenerateCertificate in the future. + + Signed-off-by: Miloslav Trmač + +commit 74d327f2730e9fc7dcf3b8aba195c45c97f136f1 +Author: Miloslav Trmač +Date: Wed Dec 2 17:08:20 2015 +0100 + + Remove an incorrect comment. + + The commented code is not converting DER to PEM, it is parsing DER into + an in-memory data structure, and is hopefully just as clear without a + comment. + + Signed-off-by: Miloslav Trmač + +commit e19e7fc44d6b8428ae3eee965d70b93ca4c5a8aa +Author: Miloslav Trmač +Date: Wed Dec 2 14:58:37 2015 +0100 + + Remove misleading passphrase-related error handling in NotaryRepository.Initialize: + + 1. It is on a path where those errors can never happen + 2. The specific error handling would silently ignore the error, which + can’t be right anyway. + + Signed-off-by: Miloslav Trmač + +commit 57a15112c8f86b1bea057585868c4a256fe986fc +Author: Miloslav Trmač +Date: Wed Dec 2 14:59:08 2015 +0100 + + Fix error handling on invalid root passphrase + + When the user insists on an invalid passphrase (or aborts the + operation), CryptoService.GetPrivateKey will try the correct root + location first, correctly failing, and then try to look for the root key + in the $gun subdirectory, and so will return the last error, a confusing + ”open $path: no such file or directory”. + + So, recognize the passphrase-related errors and fail with them directly. + + Signed-off-by: Miloslav Trmač + +commit d3c3d70d6d85d05d3c1269ec3a777c2b10ef5632 +Author: Miloslav Trmač +Date: Wed Dec 2 14:44:23 2015 +0100 + + Add gun to CryptoServiceTester + + The gun field is not necessary yet, but will be useful in a future + commit. But including it immediately allows us to simplify by using + an ordinary method for cryptoServiceFactory instead of closures. + + Signed-off-by: Miloslav Trmač + +commit 6fe747e0ee736067121fe6b8304745f8ad75a558 +Merge: 0b7a407055 01bba5ea23 +Author: Daniel Nephin +Date: Wed Dec 9 10:40:44 2015 -0800 + + Merge pull request #2522 from sdurrheimer/zsh-completion-config-cmd + + Add zsh completion for config subcommand + +commit 375f754f49ee6e9de942816a47a21a715fe3bacb +Merge: 61b832dc5c 2ec468e284 +Author: Tibor Vass +Date: Wed Dec 9 19:17:11 2015 +0100 + + Merge pull request #18472 from calavera/api_client_lib + + Api client lib + +commit 5ffa6564b8a6816af69e6752bcd69c59611fca45 +Author: Richard Scothern +Date: Tue Dec 8 16:54:32 2015 -0800 + + Update AUTHORS and .mailmap for release + + Signed-off-by: Richard Scothern + +commit 61b832dc5cb72401b4e0358b8b15854404adcd89 +Merge: c6c4ae152a 7a6f5d9b31 +Author: David Calavera +Date: Wed Dec 9 09:48:11 2015 -0800 + + Merge pull request #18540 from thaJeztah/remove-redundant-check + + Remove redundant check + +commit a8d4c4b0f4d729ce2f3c99ce77b3ace133f182a7 +Author: Surya Gaddipati +Date: Wed Dec 9 11:11:30 2015 -0600 + + Fix busted link + + Signed-off-by: Surya Gaddpati + +commit d8d38f234563a3be0b23cc94df3a9453eacfdee8 +Author: Jeff Anderson +Date: Wed Dec 9 10:17:39 2015 -0700 + + Add the actual command in this example. + + Signed-off-by: Jeff Anderson + +commit 2ec468e2844365f0d7e2afd744f322cde25c077e +Author: David Calavera +Date: Wed Dec 9 12:03:09 2015 -0500 + + Make the commit configuration to be a typed struct rather than accepting a string. + + Signed-off-by: David Calavera + +commit 57b6796304880331d0d4e9cbefab7b139e718915 +Author: David Calavera +Date: Mon Dec 7 22:04:38 2015 -0500 + + Implement all inspect commands with the new inspector interface. + + It makes the behavior completely consistent across commands. + It adds tests to check that execution stops when an element is not + found. + + Signed-off-by: David Calavera + +commit 5a0a6ee9cd55f3e2f57d992a032421d0e126040d +Author: David Calavera +Date: Sun Dec 6 19:35:56 2015 -0500 + + Remove old http from the docker cli. + + Everything has been ported to the client library :tada: + + Signed-off-by: David Calavera + +commit e4abf485677cd1d93d584753e19545e6ec8c2335 +Author: David Calavera +Date: Sun Dec 6 19:29:15 2015 -0500 + + Implement docker search with standalone client lib. + + Signed-off-by: David Calavera + +commit d1057e4c4672b584590295f3d9b96a90183bbfcd +Author: David Calavera +Date: Sun Dec 6 18:41:57 2015 -0500 + + Implement docker resize with standalone client lib. + + Signed-off-by: David Calavera + +commit cf3efd05d42e92d8f92338be3730894dca85aa26 +Author: David Calavera +Date: Sun Dec 6 18:34:25 2015 -0500 + + Implement docker inspect with standalone client lib. + + Signed-off-by: David Calavera + +commit 42670e30eef7023d2df9c6c8900041bc9e1546e0 +Author: David Calavera +Date: Sun Dec 6 15:37:54 2015 -0500 + + Implement docker push with standalone client lib. + + Signed-off-by: David Calavera + +commit e78f02c4dbc3cada909c114fef6b6643969ab912 +Author: David Calavera +Date: Sun Dec 6 15:17:34 2015 -0500 + + Implement docker pull with standalone client lib. + + Signed-off-by: David Calavera + +commit e59d54bd99a1a06bf178f8dbda29980136f94a58 +Author: David Calavera +Date: Sun Dec 6 02:34:23 2015 -0500 + + Implement docker stats with standalone client lib. + + Signed-off-by: David Calavera + +commit 3f9f23114f7cccd9e9972d457f0f1d2502eaa4af +Author: David Calavera +Date: Sun Dec 6 00:33:38 2015 -0500 + + Implement docker exec with standalone client lib. + + Signed-off-by: David Calavera + +commit bcb848c87f496fe2b946530521a0d262a489c019 +Author: David Calavera +Date: Sat Dec 5 23:18:06 2015 -0500 + + Implement docker run with standalone client lib. + + Signed-off-by: David Calavera + +commit 962b2d8b9b0201db2132ec17f06513e33ad419d0 +Author: David Calavera +Date: Sat Dec 5 22:53:52 2015 -0500 + + Implement docker start with standalone client lib. + + Signed-off-by: David Calavera + +commit 5e80ac9c8438252ebb16f6c4aef450e2861a2e5d +Author: David Calavera +Date: Sat Dec 5 22:22:00 2015 -0500 + + Implement docker attach with standalone client lib. + + Signed-off-by: David Calavera + +commit d9a62c5f2b11131d4b8c3d62af60cd7e6ceaa350 +Author: David Calavera +Date: Sat Dec 5 20:28:36 2015 -0500 + + Lowercase http method functions. + + Signed-off-by: David Calavera + +commit 0b0431a856fd9087b15665790cb8cda9e4286eff +Author: David Calavera +Date: Fri Dec 4 21:06:12 2015 -0500 + + Change references to query values. + + Signed-off-by: David Calavera + +commit 8b15839ee85b291266d07f97d9ad6ca0326d1339 +Author: David Calavera +Date: Fri Dec 4 17:02:06 2015 -0500 + + Create interface that clients that talk to the api must fulfill. + + Signed-off-by: David Calavera + +commit a413be33929a637d565687aa07805bfefca547e5 +Author: David Calavera +Date: Fri Dec 4 15:29:58 2015 -0500 + + Fix client lib errors documentation. + + Signed-off-by: David Calavera + +commit 73bca058ae5d1e4ad2b94835fb1593ba3ca3983b +Author: David Calavera +Date: Fri Dec 4 15:17:23 2015 -0500 + + Implement docker volume with standalone client lib. + + Signed-off-by: David Calavera + +commit 8c9c9e137c5c7a84ed4ac4459c52147daf8a2a80 +Author: David Calavera +Date: Fri Dec 4 14:57:22 2015 -0500 + + Use ensureReaderClosed consistently to close a response body reader. + + Signed-off-by: David Calavera + +commit 7df71ca31dad5eb48093879730b4761b2109291e +Author: David Calavera +Date: Fri Dec 4 14:49:22 2015 -0500 + + Implement getExitCode with standalone client lib. + + Signed-off-by: David Calavera + +commit 51efb1480a58b2317e1ad1833964ccad4456e6be +Author: David Calavera +Date: Fri Dec 4 14:38:15 2015 -0500 + + Implement docker wait with standalone client lib. + + Signed-off-by: David Calavera + +commit 1fe912151b9239b891b2da704c6ddcc6081fad2d +Author: David Calavera +Date: Fri Dec 4 14:31:24 2015 -0500 + + Implement docker version with standalone client lib. + + Use Go template definitions for default format. + + Signed-off-by: David Calavera + +commit b8be62e28eee322b791251f29595648f795efcb3 +Author: David Calavera +Date: Fri Dec 4 13:58:16 2015 -0500 + + Implement docker unpause with standalone client lib. + + Signed-off-by: David Calavera + +commit d78ce02f881785ac5f2014673b6ee587f74d9279 +Author: David Calavera +Date: Fri Dec 4 13:56:04 2015 -0500 + + Implement trusted tagging with standalone client lib. + + Signed-off-by: David Calavera + +commit 7573c153c5708091177aca058a3cc84a1ab58377 +Author: David Calavera +Date: Fri Dec 4 13:52:40 2015 -0500 + + Implement docker top with standalone client lib. + + Signed-off-by: David Calavera + +commit 21ffdf0e0e402cfc00f2bb1476fb2a8510418ec0 +Author: David Calavera +Date: Fri Dec 4 13:45:51 2015 -0500 + + Implement docker tag with standalone client lib. + + Signed-off-by: David Calavera + +commit 9ec1cf92f5fda4b5bae02408b469cf8f65c96f9a +Author: David Calavera +Date: Fri Dec 4 13:38:31 2015 -0500 + + Implement docker stop with standalone client lib. + + Signed-off-by: David Calavera + +commit 373f55eecd39625f9f2751d8f940e83a056b6261 +Author: David Calavera +Date: Fri Dec 4 13:14:20 2015 -0500 + + Implement docker save with standalone client lib. + + Signed-off-by: David Calavera + +commit 37d6fee8cfddd8e1afabbdaa232fa64a36494579 +Author: David Calavera +Date: Fri Dec 4 13:13:43 2015 -0500 + + Implement docker rmi with standalone client lib. + + Signed-off-by: David Calavera + +commit fb6533e6cf1793b653ab0ea9f12b6b6876076d97 +Author: David Calavera +Date: Fri Dec 4 12:53:57 2015 -0500 + + Implement docker remove with standalone client lib. + + Signed-off-by: David Calavera + +commit b7de53634c3262997593d140c9b68683135b55e1 +Author: David Calavera +Date: Fri Dec 4 12:44:12 2015 -0500 + + Implement docker restart with standalone client lib. + + Signed-off-by: David Calavera + +commit ac8fb77c7401d2d8cfd75bb8399b0f91484210ad +Author: David Calavera +Date: Fri Dec 4 12:39:27 2015 -0500 + + Implement container rename with standalone client lib. + + Signed-off-by: David Calavera + +commit d05aa418b0466553a24d42896f99176cfa29765f +Author: David Calavera +Date: Fri Dec 4 11:59:44 2015 -0500 + + Implement docker ps with standanlone client lib. + + Signed-off-by: David Calavera + +commit eeee2eae8671ce05d863aadf289a0695ac62629b +Author: David Calavera +Date: Fri Dec 4 11:42:33 2015 -0500 + + Implement docker port with standalone client lib. + + Signed-off-by: David Calavera + +commit 55333e8f9018585f28f13231a3073e2746d7c969 +Author: David Calavera +Date: Fri Dec 4 11:38:36 2015 -0500 + + Implement docker pause with standalone client lib. + + Signed-off-by: David Calavera + +commit 356768bc01adc6d74e723397fbc3ac7efcb0af64 +Author: David Calavera +Date: Fri Dec 4 11:33:00 2015 -0500 + + Implement docker network with standalone client lib. + + Signed-off-by: David Calavera + +commit 087674264674eaf946d185691ea92eee16f16a4f +Author: David Calavera +Date: Thu Dec 3 19:34:16 2015 -0500 + + Implement docker logs with standalone client lib. + + Signed-off-by: David Calavera + +commit b36531db6020134c8b561db71a67c4346051ed4a +Author: David Calavera +Date: Thu Dec 3 19:12:35 2015 -0500 + + Implement docker login with standalone client lib. + + Signed-off-by: David Calavera + +commit 9073a52ea839ef224931e1105bfa9c715ee48e2c +Author: David Calavera +Date: Thu Dec 3 18:49:55 2015 -0500 + + Implement docker load with standalone client lib. + + Signed-off-by: David Calavera + +commit c57e62d00e209288e4f2734d32a3184b4abf4248 +Author: David Calavera +Date: Thu Dec 3 18:40:56 2015 -0500 + + Implement docker kill with standalone client lib. + + Signed-off-by: David Calavera + +commit 535c4c9a59b1e58c897677d6948a595cb3d28639 +Author: David Calavera +Date: Thu Dec 3 18:27:01 2015 -0500 + + Implement docker build with standalone client lib. + + Signed-off-by: David Calavera + +commit 900ad2897f58bffd2992c5fd8b1cd50cfb61198f +Author: David Calavera +Date: Thu Dec 3 17:20:46 2015 -0500 + + Implement docker info with standalone client lib. + + Signed-off-by: David Calavera + +commit 6bf757500b404311cf24c6ce656d317f49b7cc37 +Author: David Calavera +Date: Thu Dec 3 17:11:37 2015 -0500 + + Implement docker import with the standalone client lib. + + Signed-off-by: David Calavera + +commit 381262fbeab88f4195ec4d0ccd036e3233398204 +Author: David Calavera +Date: Thu Dec 3 15:20:36 2015 -0500 + + Implement docker images with the standalone client lib. + + Signed-off-by: David Calavera + +commit 45eca43f5bead5d9d22e65e0609410b266c32e18 +Author: David Calavera +Date: Thu Dec 3 14:54:31 2015 -0500 + + Implement docker history with the standalone client lib. + + Signed-off-by: David Calavera + +commit e0549b8cebee4dbe8614688767c9b666afdd32d9 +Author: David Calavera +Date: Thu Dec 3 14:49:41 2015 -0500 + + Implement docker export with standalone client lib. + + Signed-off-by: David Calavera + +commit 11c4cc9dded3aaed8be2fdcebc976b63ff80ef2c +Author: David Calavera +Date: Thu Dec 3 14:34:35 2015 -0500 + + Implement docker events with standalone client lib. + + Signed-off-by: David Calavera + +commit e562ac42f445f01625f2e1fc220d1aae3a28b8e1 +Author: David Calavera +Date: Thu Dec 3 14:18:35 2015 -0500 + + Implement docker diff with standalone client lib. + + Signed-off-by: David Calavera + +commit 136e8fef64d3dd0e7601ffdad8864b8e1af7c7e5 +Author: David Calavera +Date: Thu Dec 3 14:14:36 2015 -0500 + + Implement docker container create with standalone client lib. + + Signed-off-by: David Calavera + +commit 1698fe01f58e090e736c611bc8c21e67544251e9 +Author: David Calavera +Date: Thu Dec 3 11:14:07 2015 -0500 + + Implement docker image create with standalone client lib. + + Signed-off-by: David Calavera + +commit 1b2b91ba43dc6fa1b4b758fc5a8090ce6cc597ff +Author: David Calavera +Date: Wed Dec 2 23:56:03 2015 -0500 + + Implement docker cp with standalone client lib. + + Signed-off-by: David Calavera + +commit 8c9ad7b818c0a7b1e39f8df1fabba243a0961c2d +Author: David Calavera +Date: Wed Dec 2 23:55:07 2015 -0500 + + Implement docker commit with standalone client lib. + + Signed-off-by: David Calavera + +commit 589df17a1a1dc649a4c3095cea6dd05e0c2a3bb5 +Author: David Calavera +Date: Wed Dec 2 23:53:06 2015 -0500 + + Extract API client struct as standalone client. + + Signed-off-by: David Calavera + +commit 7a6f5d9b3186de2116686d5e2c40eff673dae6ec +Author: Sebastiaan van Stijn +Date: Wed Dec 9 17:38:06 2015 +0100 + + Remove redundant check + + jm.ID is already checked in the outer "if", + so theres no reason to check it again here. + + Signed-off-by: Sebastiaan van Stijn + +commit 32402a7b9fb022c469d40b0668ac4420c02eb1df +Author: Ben Firshman +Date: Fri Dec 4 17:29:45 2015 +0000 + + Link getting started to installation instructions + + Signed-off-by: Ben Firshman + +commit a1275f6f1117c84e6bb6fca18dca1ab70e74b4c4 +Merge: c2ed9e3f1c 75b2d5fcc4 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 9 16:30:01 2015 +0100 + + Merge pull request #2537 from Godin/patch-1 + + Fix link + +commit 1626c9dae0f285185e3ef4c1e2be55a807e8c0ed +Author: Phil Estes +Date: Wed Dec 9 10:11:32 2015 -0500 + + Skip aufs whiteout files on userns translation to container + + aufs kernel module creates whiteout files on upper layer delete (and + other situations) and those files already are 'translated' regarding + ownership in host terms (e.g. they are already "0:0" owned), so when + these layers are copied around with pkg/archive we don't want to try and + translate these files regarding ownership. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 75b2d5fcc47d1514bb33e4ab5f3207c7c7bfafd8 +Author: Evgeny Mandrikov +Date: Wed Dec 9 15:45:05 2015 +0100 + + Fix link + + Signed-off-by: Evgeny Mandrikov + +commit fd0f002065b9865ec9de1cea34238094a5cddea1 +Author: David Gageot +Date: Wed Dec 9 15:54:08 2015 +0100 + + Fix test + + Signed-off-by: David Gageot + +commit 3071da0673c53f2f3b730a5efd262e969b6df5ca +Author: David Gageot +Date: Mon Dec 7 17:13:13 2015 +0100 + + FIX #2490 - Reuse machines in ITs + + Signed-off-by: David Gageot + +commit 57085d89e580e8ed58acdb5a29a8de7cf61ba77f +Author: David Gageot +Date: Tue Dec 8 12:28:02 2015 +0100 + + Fix test + + Signed-off-by: David Gageot + +commit cf6136fed0b647b70f8d7cadd697917f735c0b7d +Author: Dave Henderson +Date: Wed Jun 3 10:07:59 2015 -0400 + + Allowing generic driver to use ssh-agent to get identities + + Signed-off-by: Dave Henderson + +commit c2ed9e3f1c774983b6b0425131e0d39cb0ade163 +Merge: c2209b8636 f3689349a4 +Author: David Gageot +Date: Wed Dec 9 14:58:27 2015 +0100 + + Merge pull request #2521 from kunalkushwaha/refactor-provisioning + + Run Swarm containers in provisioning step using Docker API instead of SSH/shell + +commit 0b7a407055094ec1f4e09305925b09f1f111062d +Merge: 67829f08b6 999d15b225 +Author: Aanand Prasad +Date: Wed Dec 9 13:51:27 2015 +0000 + + Merge pull request #2519 from seguins/clean_service + + Remove unused functions in service + +commit c2209b8636dd43839bb718f712fed7abf287d901 +Merge: 768418b98e f37a0290dd +Author: David Gageot +Date: Wed Dec 9 14:42:34 2015 +0100 + + Merge pull request #2536 from jeanlaurent/help-shell + + List supported value for shell in env command + +commit d9f4e5c13ccb5c76547937399078784e4e7ed023 +Author: Sebastiaan van Stijn +Date: Wed Dec 9 14:19:27 2015 +0100 + + docs: fix incorrect package name on Oracle Linux + + Signed-off-by: Sebastiaan van Stijn + +commit 67829f08b66fdbfda756fd68387f37c39d19d67d +Merge: dc39b01e00 a5b48a3dc2 +Author: Aanand Prasad +Date: Wed Dec 9 12:43:41 2015 +0000 + + Merge pull request #2518 from albers/completion-config + + Add bash completion for config subcommand + +commit c6c4ae152ad029a8546e127de477b65bc0e05572 +Merge: c8ed1492bf 2347f98003 +Author: Sebastiaan van Stijn +Date: Wed Dec 9 13:12:17 2015 +0100 + + Merge pull request #18428 from hqhq/hq_limit_kernel_memory + + Check minimum kernel memory limit to be 4M + +commit f37a0290dd8e42d0cf2db13f3748bc7c4ac50662 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 9 09:46:03 2015 +0100 + + Add shell list to help command + + Signed-off-by: Jean-Laurent de Morlhon + +commit 01bba5ea239fb747b9cd5ca34bf9c5f168f8a6d4 +Author: Steve Durrheimer +Date: Wed Dec 9 08:55:59 2015 +0100 + + Add zsh completion for config subcommand + + Signed-off-by: Steve Durrheimer + +commit 2347f98003af34dd1cfd290bf0f2cc7e6ae07b03 +Author: Qiang Huang +Date: Wed Dec 9 14:26:41 2015 +0800 + + Check minimum kernel memory limit to be 4M + + Fixes: #18405 + + Signed-off-by: Qiang Huang + +commit e078adc93b9ba52d85a21adb61c16c2e25e367c9 +Author: John Howard +Date: Wed Dec 2 11:26:13 2015 -0800 + + Windows: No subshell due to bash 3.x + + Signed-off-by: John Howard + +commit f3689349a40da872eb3e7ad025fc82aa8e06527b +Author: Kunal Kushwaha +Date: Fri Nov 27 17:48:35 2015 +0900 + + Host provisioing using Docker API + + Replaces the code of provisioing with Go Templates with DockerAPI + + Signed-off-by: Kunal Kushwaha + +commit c8ed1492bfc651a86014af695894a4bb66fe52f9 +Merge: 8ed14c2072 a796eea2b5 +Author: Doug Davis +Date: Tue Dec 8 21:28:18 2015 -0500 + + Merge pull request #18515 from tophj-ibm/add-new-image-to-dockerfiles-hotfix + + Add new ppc64le image + +commit 5b28d35d31ce76b0143d3da7d1538b06d20b6d1e +Merge: a51ebdacb9 cac42dc677 +Author: Xian Chaobo +Date: Wed Dec 9 10:15:45 2015 +0800 + + Merge pull request #1515 from vieux/refresh_docker_godeps + + update docker godeps + +commit 2bfadacf34efebf237f06d222a746d62d7dba1e3 +Merge: a3d2974e1b 639f1e80f0 +Author: David Lawrence +Date: Tue Dec 8 17:31:55 2015 -0800 + + Merge pull request #341 from HuKeping/parse-viper + + Add a function to parse viper + +commit 639f1e80f05999a4ee33a5f2763ac6c9a65ae691 +Author: HuKeping +Date: Tue Dec 8 14:08:05 2015 +0800 + + Use the function to parse viper on server side + + Signed-off-by: Hu Keping + +commit bfe7316de9cd0e55a880d27ec8be44f20a2617b0 +Author: HuKeping +Date: Mon Dec 7 14:27:09 2015 +0800 + + Add a function to parse viper + + None of these `filename`, `ext` or `configPath` should be in `main`, + they are all just for creating a instance of Viper and then nothing. + Do it in a separate function will make the function `main` more readable. + + Signed-off-by: Hu Keping + +commit a796eea2b526743d391ba2ea1f4a0bb03eb94bfe +Author: Christopher Jones +Date: Tue Dec 8 18:05:25 2015 -0500 + + Added ppc64le ensure image to the Dockerfile + + Adds ppc64le image to the Dockerfile, + should be with 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e + + Signed-off-by: Christopher Jones + +commit 8ed14c207256836f86308f76d88fc800bb34e5f1 +Merge: dead67308c 0d1c5193b3 +Author: moxiegirl +Date: Tue Dec 8 16:45:29 2015 -0800 + + Merge pull request #18478 from programmerq/novirt + + Call it "containerization" instead of "virtualization" in the docs + +commit 796d6e79150238193d5a0784b16d797d177dde52 +Merge: e4208ad5a7 66cd2bf950 +Author: Richard Scothern +Date: Tue Dec 8 16:32:02 2015 -0800 + + Merge pull request #1187 from stevvooe/check-storage-drivers-list-path-not-found + + [WIP] registry/storage/driver: checking that non-existent path returns PathNotFoundError + +commit dead67308cf89d055a83ba66fd6a6bdc87e82f14 +Merge: 82eb104509 6eef5ab42d +Author: David Calavera +Date: Tue Dec 8 16:28:54 2015 -0800 + + Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions + + Fixed 80-docker.rules file permissions to 644 + +commit 6932813f5eb1c47393cb51de61cfee4c2482e913 +Merge: 1a50516178 704955ee78 +Author: Jeffrey Morgan +Date: Tue Dec 8 16:18:36 2015 -0800 + + Merge pull request #336 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 82eb1045094d6b098d03b7893d9d65335711de4a +Merge: fcddd9d2f5 a848c5e782 +Author: David Calavera +Date: Tue Dec 8 16:11:04 2015 -0800 + + Merge pull request #18517 from thaJeztah/cleanup-maintainers-file + + Cleanup MAINTAINERS file + +commit fcddd9d2f56554ddacb798098cd72b553e799487 +Merge: e8a0e126f7 1bafa3cdcd +Author: David Calavera +Date: Tue Dec 8 15:52:03 2015 -0800 + + Merge pull request #18507 from sammyshj/13397-untaggedimages + + Docs now explain dangling images with repo:tag as : + +commit 66cd2bf95098f047cd52a9566a46062ef1922679 +Author: Stephen J Day +Date: Tue Dec 8 11:02:40 2015 -0800 + + storage/driver/s3: adjust s3 driver to return unmunged path + + This fixes both the s3 driver and the oss driver to return the unmunged path + when returning errors. + + Signed-off-by: Stephen J Day + +commit a848c5e78214cb0f00bbd01bf069169ae90b0908 +Author: Sebastiaan van Stijn +Date: Wed Dec 9 00:20:23 2015 +0100 + + Cleanup MAINTAINERS file + + This removes sections from the maintainers file + that have been moved to the https://github.com/docker/opensource + repository. + + Also replaces spaces for tabs for consistency (yay ocd). + + Signed-off-by: Sebastiaan van Stijn + +commit a3d2974e1b6d8b91f4fcf0ea6109ae5cf4cf4c1e +Merge: 5f1100a3bf 9ef782184c +Author: Diogo Mónica +Date: Tue Dec 8 15:11:09 2015 -0800 + + Merge pull request #344 from cyli/client-new-repo-refactor + + Minor refactor of NotaryRepository constructor to use more shared code. + +commit e4208ad5a7ef27bb9027e1eaf039c0b05130f821 +Merge: 7d9b2774f0 9dc3c6df0e +Author: Stephen Day +Date: Tue Dec 8 14:52:59 2015 -0800 + + Merge pull request #1246 from stevvooe/decrease-driver-testsuite-allocations + + storage/driver: decrease memory allocation done during testsuite + +commit 6767bc8b08260d5d12380cbc67d94fca5f49ba74 +Author: Jessica Frazelle +Date: Tue Dec 8 14:47:54 2015 -0800 + + add distribution; + + Signed-off-by: Jessica Frazelle + +commit a51ebdacb9e6ab075fe6ba222c816583ca4d559f +Merge: 31791e2241 4dcf5a2c05 +Author: Alexandre Beslic +Date: Tue Dec 8 14:27:29 2015 -0800 + + Merge pull request #1446 from MHBauer/gh1442 + + OPTIONS response when cors is enabled + +commit e128a821db4f008d2b1744fd652be037ab46faa5 +Author: Kenny Leung +Date: Tue Dec 8 14:24:03 2015 -0800 + + Print error for failed HTTP auth request. + + Signed-off-by: Kenny Leung + +commit e8a0e126f73ec8773fd880b9eff54dba8eaf1dac +Merge: 44f709ab07 d17669999f +Author: Derek McGowan +Date: Tue Dec 8 14:15:55 2015 -0800 + + Merge pull request #18503 from aaronlehmann/test-pull-all-tags + + Fix flaky test TestPullAllTagsFromCentralRegistry + +commit 0d1c5193b389052f11d77ca576f7dbb49b601135 +Author: Jeff Anderson +Date: Mon Dec 7 13:29:09 2015 -0700 + + Change "virtualization" to "containerization" + + * Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion. + * Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro. + * Remove "virtualization" keywords. + + Signed-off-by: Jeff Anderson + +commit 44f709ab0700182729ad51fc2256373c96dc0f3f +Merge: 6d2130ee8e 03fc212b6d +Author: Tianon Gravi +Date: Tue Dec 8 13:58:25 2015 -0800 + + Merge pull request #18506 from tophj-ibm/power-and-z-frozen-images-fix + + Fixes for building on ppc64le and 390x due to ensure-frozen-images + +commit 6d2130ee8e7ddebb31a0258ffe111adc0ecea273 +Merge: de7b80db03 59df2adc07 +Author: Jess Frazelle +Date: Wed Dec 9 10:56:24 2015 +1300 + + Merge pull request #18484 from aaronlehmann/progress-fixes + + JSONMessage terminal display fixes + +commit 7d9b2774f0e25a06673303abb2482dcd0ddd7025 +Merge: 807a80ff06 434aaf7e4e +Author: Stephen Day +Date: Tue Dec 8 13:35:34 2015 -0800 + + Merge pull request #1237 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 4dcf5a2c050e5e0f13ea8052ad1270f85a938654 +Author: Morgan Bauer +Date: Tue Nov 24 13:56:32 2015 -0800 + + OPTIONS response when cors is enabled + + - pulled out router setup into separate method for testing + - unit test without cors + - unit test for cors + OPTIONS + - resolves #1442 + + Signed-off-by: Morgan Bauer + +commit de7b80db0344a46ba948ce64df88017a69b6bfaa +Merge: 81014900d5 d7c9ae60e6 +Author: Tianon Gravi +Date: Tue Dec 8 12:46:15 2015 -0800 + + Merge pull request #18465 from albers/completion-network-disconnect-2 + + Improve bash completion for `docker network disconnect` + +commit 81014900d5adeedf90ee6c90b5a79d19859b0958 +Merge: 591493bfb5 191cefbaca +Author: David Calavera +Date: Tue Dec 8 12:44:46 2015 -0800 + + Merge pull request #18505 from estesp/overlay-userns-fix + + Fix overlay + user namespaces underlay dir permissions + +commit 31791e2241486bdf6ed9c9f52da5dea5042f28f1 +Merge: 4aafe4aa7b b399d7c7ed +Author: Alexandre Beslic +Date: Tue Dec 8 12:43:37 2015 -0800 + + Merge pull request #1513 from vieux/compose_1.5.2 + + update compose to 1.5.2 + +commit 4aafe4aa7b1ee762ae4d2e503ea67d3410bf909b +Merge: ba976ed0b9 0bddb0096f +Author: Victor Vieux +Date: Tue Dec 8 12:43:00 2015 -0800 + + Merge pull request #1492 from aluzzardi/profiling + + Enable profiling over HTTP in debug mode + +commit 591493bfb56a3f7ad2338b7d6620ef8d631f21ef +Merge: adb19755e1 1ebfa29954 +Author: Alexander Morozov +Date: Tue Dec 8 12:40:55 2015 -0800 + + Merge pull request #18485 from aaronlehmann/errors-bounds-check + + Add missing bounds check in ContinueOnError + +commit ba976ed0b91cc7c1d5ac10d6911bc6b5c35e280d +Merge: a4a1d3bd01 9677ddd06f +Author: Alexandre Beslic +Date: Tue Dec 8 12:23:10 2015 -0800 + + Merge pull request #1512 from vieux/1.5.1- + + go 1.5.1->1.5.2 + +commit 999d15b2256cf279afc310ec8ae843f073a21d26 +Author: Stéphane Seguin +Date: Tue Dec 8 21:11:05 2015 +0100 + + Remove unused functions in service + + Signed-off-by: Stéphane Seguin + +commit b6756a3d89d4f8e6e30941d0e95d6f7a3b469793 +Author: Li Yi +Date: Tue Dec 8 19:55:28 2015 +0800 + + Fix the issue for listing root directory + + Change-Id: I1c6181fa4e5666bd2e6ec69cb608c4778ae0fe48 + Signed-off-by: Li Yi + +commit 7161fa055917e45f70e0f0ef727f60c70fe22fda +Author: Li Yi +Date: Tue Dec 1 17:06:06 2015 +0800 + + Fix for stevvooe:check-storage-drivers-list-path-not-found in OSS driver + + Change-Id: I5e96fe761d3833c962084fd2d597f47e8a72e7c2 + Signed-off-by: Li Yi + +commit 79d4d7f54655f9c209e5e6c613d8e7d7a078841f +Author: davidli +Date: Tue Dec 1 10:30:14 2015 +0800 + + driver/swift: treat empty object list as a PathNotFoundError + + Swift returns an empty object list when trying to read a non-existing object path, treat it as a + PathNotFoundError when trying to list a non existing virtual directory. + + Signed-off-by: David li + +commit f25ccea279407cbcdebdf50aae7fb3cfeb78b1bd +Author: Vincent Giersch +Date: Wed Nov 25 00:13:36 2015 +0100 + + driver/rados: treat OMAP EIO as a PathNotFoundError + + RADOS returns a -EIO when trying to read a non-existing OMAP, treat it as a + PathNotFoundError when trying to list a non existing virtual directory. + + Signed-off-by: Vincent Giersch + +commit a889f462235a8a997fccbdb96459a56d4299caff +Author: Stephen J Day +Date: Tue Nov 24 14:23:12 2015 -0800 + + storage/driver/s3: correct response on list of missing directory + + Signed-off-by: Stephen J Day + +commit b45078eb442fe56b2df62f4089f045e3e16d7319 +Author: Stephen J Day +Date: Tue Nov 24 14:17:25 2015 -0800 + + storage/driver/base: use correct error format style + + Signed-off-by: Stephen J Day + +commit a4eae0917e40bdc919c822b07d8231966ed9f1df +Author: Stephen J Day +Date: Wed Nov 18 16:11:44 2015 +0100 + + driver/filesystem: address filesystem driver on behavior of List + + Signed-off-by: Stephen J Day + +commit 0322c3bf1f1094d1b6c23912892aa36c64ff7f08 +Author: Stephen J Day +Date: Fri Nov 13 13:47:07 2015 -0800 + + registry/storage/driver: checking that non-existent path returns PathNotFoundError + + Issue #1186 describes a condition where a null tags response is returned when + using the s3 driver. The issue seems to be related to a missing + PathNotFoundError in s3. This change adds a test for that to get an idea of the + lack of compliance across storage drivers. If the failures are manageable, + we'll add this test condition and fix the s3 driver. + + Signed-off-by: Stephen J Day + +commit 191cefbaca45ba86341379d09d2f75d5fc1868fb +Author: Phil Estes +Date: Tue Dec 8 14:28:28 2015 -0500 + + Fix overlay and user namespace permissions + + All underlay dirs need proper remapped ownership. This bug was masked by the + fact that the setupInitLayer code was chown'ing the dirs at startup + time. Since that bug is now fixed, it revealed this permissions issue. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e +Author: Christopher Jones +Date: Thu Dec 3 17:44:28 2015 -0500 + + Fixes for ppc64le and 390x frozen-images + + Signed-off-by: Christopher Jones + +commit d17669999fff55219f5ed236f00fdf8a08d09304 +Author: Aaron Lehmann +Date: Tue Dec 8 11:23:04 2015 -0800 + + Fix flaky test TestPullAllTagsFromCentralRegistry + + This test was directly comparing lines of output from "docker images". + Sometimes, when busybox had been pushed to the hub recently, the + relative creation times would differ like this: + + ... obtained []string = []string{"busybox", "latest", "d9551b4026f0", "27", "minutes", "ago", "1.113", "MB"} + ... expected []string = []string{"busybox", "latest", "d9551b4026f0", "26", "minutes", "ago", "1.113", "MB"} + + Fixing by removing the time-since-creation fields from the comparison. + + Signed-off-by: Aaron Lehmann + +commit 807a80ff06b64927775c45887b432ef4495c0795 +Merge: ce17efc71e d4435b79d9 +Author: Stephen Day +Date: Tue Dec 8 10:41:16 2015 -0800 + + Merge pull request #1238 from noxiouz/fix_comment + + Fix comment for PathRegexp + +commit a5b48a3dc2b7e4545959801e5a669e7b6dbc2b23 +Author: Harald Albers +Date: Tue Dec 8 10:23:55 2015 -0800 + + Add bash completion for config subcommand + + Signed-off-by: Harald Albers + +commit ce17efc71ecdbd0f9ebe2099a75a7e803067c318 +Merge: 95e80a8283 1027f5e066 +Author: Stephen Day +Date: Tue Dec 8 10:20:51 2015 -0800 + + Merge pull request #1241 from pdevine/catalog-speedup + + Make the catalog more efficient + +commit 1bafa3cdcd102041948375643a5e2752ad506e0c +Author: Sambuddha Basu +Date: Tue Dec 8 22:08:29 2015 +0400 + + The docs now explain that images with repo:tag as : are dangling images. + + Signed-off-by: Sambuddha Basu + +commit 1ebfa299545e5c2273ce449d72b10745b9e38087 +Author: Aaron Lehmann +Date: Mon Dec 7 17:28:10 2015 -0800 + + Add missing bounds in ContinueOnError + + ContinueOnError assumes that something of type errcode.Errors contains + at least one error. This is generally true, but might not be true if the + remote registry returns an empty error body or invalid JSON. Add the + bounds check, and in the case where it fails, allow fallbacks to v1. + + Fixes #18481 + + Signed-off-by: Aaron Lehmann + +commit 95e80a82830d739436fc9685f30bdd9c615084f6 +Merge: 74bb6f89c8 f18bf5e343 +Author: Richard Scothern +Date: Tue Dec 8 09:54:18 2015 -0800 + + Merge pull request #1243 from RichardScothern/client-header-message + + Add clearer messaging around missing content-length headers. + +commit d5ff6b21eafec9a56209cc9196dfe2b8c43d8593 +Author: Jason Hoos +Date: Sun Oct 4 18:15:28 2015 -0500 + + Explicitly set umask before invoking vmrun in vmwarefusion + + For some reason, invoking vmrun with the nogui option doesn't + work right if umask is set to not allow world-readable permissions + by default. This seems to be true at least in VMware Fusion 7.0.x + through 8.0.1. As a workaround, the driver now explicitly sets + the umask to 022 before invoking vmrun. + + Signed-off-by: Jason Hoos + +commit f28230d35c19befe5d6799667f37c1362dd1b782 +Author: Liron Levin +Date: Tue Dec 8 17:37:59 2015 +0200 + + Rebase from master + + Signed-off-by: Liron Levin + +commit adb19755e1d0b6e2e7693ddb7932f26e63d1b0b5 +Merge: 6eeff9288b 7ab0f9bf61 +Author: Alexander Morozov +Date: Tue Dec 8 09:03:39 2015 -0800 + + Merge pull request #18479 from aaronlehmann/flaky-logs-test + + Fix flaky test TestLogsSince + +commit 768418b98e9efb67620d4d3710aca7b05ff016f8 +Merge: aece926d13 3d56a87539 +Author: David Gageot +Date: Tue Dec 8 17:58:20 2015 +0100 + + Merge pull request #2525 from askb/doc_fix_ls + + doc update for `dm ls --filter` + +commit aece926d13eec3aeb07840ff6ac6b6bf334355eb +Merge: caf74d156b 52128128fd +Author: David Gageot +Date: Tue Dec 8 17:58:11 2015 +0100 + + Merge pull request #2527 from dgageot/another-virtualisation-issue + + Detect Yet Another Virtualization issue + +commit 52128128fd2589c998c6ba10f3dc4e392aad1a19 +Author: David Gageot +Date: Tue Dec 8 17:04:45 2015 +0100 + + Detect Yet Another Virtualization issue + + Signed-off-by: David Gageot + +commit dc39b01e0045b6306db5c3001892e11750379522 +Merge: 53cc99a822 2525752a05 +Author: Aanand Prasad +Date: Tue Dec 8 16:27:09 2015 +0000 + + Merge pull request #2512 from albers/completion-url + + Use more robust download URL for completions + +commit 3d56a87539258ded988bd4ec64b254953cd53d8e +Author: Anil Belur +Date: Tue Dec 8 17:31:20 2015 +0530 + + Update docs with examples for `dm ls --filter`. + + This is a follow-up for PR #2310. + + Signed-off-by: Anil Belur + +commit 8cc0892269fb532f117aadc0e8acf7a173fe4e1b +Author: Dima Stopel +Date: Tue Dec 8 14:54:33 2015 +0200 + + Fixing documentation according to comments by @moxiegirl and @thaJeztah + + Signed-off-by: Dima Stopel + +commit 75c353f0ad73bd83ed18e92857dd99a103bb47e3 +Author: Liron Levin +Date: Thu Nov 12 13:06:47 2015 +0200 + + Docker authorization plug-in infrastructure enables extending the functionality of the Docker daemon with respect to user authorization. The infrastructure enables registering a set of external authorization plug-in. Each plug-in receives information about the user and the request and decides whether to allow or deny the request. Only in case all plug-ins allow accessing the resource the access is granted. + + Each plug-in operates as a separate service, and registers with Docker + through general (plug-ins API) + [https://blog.docker.com/2015/06/extending-docker-with-plugins/]. No + Docker daemon recompilation is required in order to add / remove an + authentication plug-in. Each plug-in is notified twice for each + operation: 1) before the operation is performed and, 2) before the + response is returned to the client. The plug-ins can modify the response + that is returned to the client. + + The authorization depends on the authorization effort that takes place + in parallel [https://github.com/docker/docker/issues/13697]. + + This is the official issue of the authorization effort: + https://github.com/docker/docker/issues/14674 + + (Here)[https://github.com/rhatdan/docker-rbac] you can find an open + document that discusses a default RBAC plug-in for Docker. + + Signed-off-by: Liron Levin + Added container create flow test and extended the verification for ps + +commit 630f695fb1c26ffba03df1cb5059bf592df44e81 +Author: Dima Stopel +Date: Wed Nov 4 15:49:53 2015 +0200 + + Adding authorization subsystem documentation + + Signed-off-by: Dima Stopel + +commit 53cc99a822967e83ddc14adcc4c51f817d3e0e41 +Merge: 82dfd465a2 f2c232bb10 +Author: Aanand Prasad +Date: Tue Dec 8 15:26:46 2015 +0000 + + Merge pull request #2513 from punkstar/detect-tty + + Only allocate a tty if we detect one + +commit 82dfd465a214a4021a80f9915c4dec4b8a2e8880 +Merge: ecf2dd11f9 437f3f8adb +Author: Aanand Prasad +Date: Tue Dec 8 15:16:48 2015 +0000 + + Merge pull request #2407 from dnephin/config_command + + New `docker-compose config` command + +commit 6eeff9288b885a79f5d12a32190e6e66b08388e5 +Merge: 5c45f47f01 6e37b622d3 +Author: Vincent Demeester +Date: Tue Dec 8 15:35:59 2015 +0100 + + Merge pull request #18488 from aaronlehmann/docker-images-order + + Make order of items in "docker images" deterministic + +commit 5c45f47f015270712a24e10e652f3e31a845cd34 +Merge: 0d8c1a8797 8ce5d05492 +Author: Phil Estes +Date: Tue Dec 8 09:29:09 2015 -0500 + + Merge pull request #18487 from clnperez/gccgo-seccomp-support + + Add seccomp stuff for gccgo + +commit caf74d156b63371bf38a41c9d7e77260a23b1e39 +Merge: 53a7528e4d a2a9ebb078 +Author: David Gageot +Date: Tue Dec 8 15:20:33 2015 +0100 + + Merge pull request #2524 from askb/docs_fixes + + Minor usage fix updating the sub-command rm usage with `-f`. + +commit 0d8c1a879734029bb9127d2bdabec187c6b4c897 +Merge: ee7a599351 c60c0c4e9b +Author: Sebastiaan van Stijn +Date: Tue Dec 8 15:16:51 2015 +0100 + + Merge pull request #18432 from thaJeztah/docs-run-reference-fixups + + docs: markdown and textual fixups in reference/run.md + +commit 2051e6eeaea0df2f4f9fa4a768c6767690080260 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 8 13:53:26 2015 +0100 + + Vendoring bugsnag + + Signed-off-by: Jean-Laurent de Morlhon + +commit cac42dc677a52f8b5593b4c71ae9463ccd9bc0b1 +Author: Victor Vieux +Date: Tue Dec 8 03:33:17 2015 -0800 + + update docker godeps + + Signed-off-by: Victor Vieux + +commit a708bf7e6c156555b85be5fcdd12df5f80199f56 +Author: David Gageot +Date: Mon Dec 7 15:43:16 2015 +0100 + + Cleanup machines only at the end + + Signed-off-by: David Gageot + +commit 17b1e571f2feff8385411fc235115862bb1ce5f6 +Author: David Gageot +Date: Mon Dec 7 15:42:33 2015 +0100 + + Group engine options test + + Signed-off-by: David Gageot + +commit a2a9ebb0785e4df79694d71f73f595e910987c29 +Author: Anil Belur +Date: Thu Dec 3 10:19:12 2015 +0530 + + Minor fix updating the sub-command rm usage with -f. + This is a follow up for #2349 + + Signed-off-by: Anil Belur + +commit 53a7528e4d92121acad6a913f6ff371883ede6f7 +Merge: 92854bd31f 60dba4d2d5 +Author: David Gageot +Date: Tue Dec 8 10:55:47 2015 +0100 + + Merge pull request #2515 from drankinn/2342_replication_advertise + + Fixes issue #2342 - Issue provisioning swarm master with --replication through Docker Machine + +commit 92854bd31f80ceb67c77980d78ec66fa4558372a +Merge: be1d75f1c5 eeb568fd27 +Author: David Gageot +Date: Tue Dec 8 10:54:40 2015 +0100 + + Merge pull request #2523 from dgageot/2510-support-dns-names + + FIX 2510 Support DNS names + +commit be1d75f1c567c49b4195615c4db8747be4667da4 +Merge: a729e3e2f6 c421bb456e +Author: David Gageot +Date: Tue Dec 8 10:50:19 2015 +0100 + + Merge pull request #2522 from dgageot/simplify-ls-tests + + Simplify ls command tests + +commit a729e3e2f6cd3adafc2848ee96e470d2570bb02b +Merge: aca111a373 0b0373d436 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 8 10:36:21 2015 +0100 + + Merge pull request #2464 from askb/2310_filter_engine_label + + Fixes issue #2310 - docker-machine ls --filter with engine label + +commit aca111a37387587f6e80f5846900618d8b1bf2ec +Merge: c41476ee74 4792177b11 +Author: David Gageot +Date: Tue Dec 8 10:27:38 2015 +0100 + + Merge pull request #2489 from jeanlaurent/logrus + + Replace custom logging system by logrus + +commit c421bb456ee58717f93c31272553a5a76ac91209 +Author: David Gageot +Date: Tue Dec 8 09:28:42 2015 +0100 + + Simplify ls command tests + + Signed-off-by: David Gageot + +commit eeb568fd270cd62a376db673b37d202079539a2a +Author: David Gageot +Date: Tue Dec 8 10:09:02 2015 +0100 + + FIX 2510 Support DNS names + + Signed-off-by: David Gageot + +commit c41476ee74d87de687cb6c9e5d6302864196c594 +Merge: 8f6b8da399 db9ca3c3b7 +Author: David Gageot +Date: Tue Dec 8 09:39:01 2015 +0100 + + Merge pull request #2506 from dgageot/fix-installation-notes + + Fix installation notes for 0.5.3 + +commit db9ca3c3b7844d8711b0dfd4decc30f0bd9bdcae +Author: David Gageot +Date: Tue Dec 8 09:20:53 2015 +0100 + + Markdown linting + + Signed-off-by: David Gageot + +commit 3322b8e70c3cdd85078f495a91fe88eb4e6e7404 +Author: David Gageot +Date: Mon Dec 7 08:41:38 2015 +0100 + + Fix installation notes for 0.5.3 + + Signed-off-by: David Gageot + +commit 8f6b8da3999744594f0f3f8293e86491b21689db +Merge: 6583e64e48 ce524e1740 +Author: David Gageot +Date: Tue Dec 8 09:03:35 2015 +0100 + + Merge pull request #2483 from dongmx/master + + Swarm container net should be host. If use bridge, sometime containers… + +commit 6583e64e4852591031b20db4a56a84fd3846859c +Merge: 44d089a363 e799388e85 +Author: David Gageot +Date: Tue Dec 8 09:01:35 2015 +0100 + + Merge pull request #2486 from dongmx/issue2485 + + issue #2485, In generic driver If a permanent IP address and hostname has alread in /etc/hosts + +commit 44d089a363f0de136f6f1852b752cb680dff33d0 +Merge: 9371741bd3 ed8ed5f14e +Author: David Gageot +Date: Tue Dec 8 09:01:08 2015 +0100 + + Merge pull request #2491 from nathanleclaire/fix_ssh_help + + Revise SSH help flow and add 'docker-machine ssh' test + +commit 9371741bd3d00ec9d562f6369e2388117d070f29 +Merge: a88d80b345 98cf2856db +Author: David Gageot +Date: Tue Dec 8 08:58:34 2015 +0100 + + Merge pull request #2514 from xaka/patch-1 + + Align version output with other docker tools + +commit a88d80b345507d4ca032f6472dc3f12a5c23e8c6 +Merge: 7f499308fc 8a799b36f8 +Author: David Gageot +Date: Tue Dec 8 08:58:12 2015 +0100 + + Merge pull request #2520 from fsoppelsa/2519-orderoptionsopenstackdocs + + Order options in openstack.md, to make docs more readable + +commit ee7a599351c71a408872d8b48473e217d6aafd91 +Merge: b36b492039 0433e38915 +Author: Vincent Demeester +Date: Tue Dec 8 08:38:06 2015 +0100 + + Merge pull request #18483 from estesp/seccomp-test-requirement + + Allow non-seccomp platforms to pass integration-cli tests + +commit b399d7c7edb560d1e4fc682f82f8861e7c4c152f +Author: Victor Vieux +Date: Mon Dec 7 22:05:58 2015 -0800 + + update compose to 1.5.2 + + Signed-off-by: Victor Vieux + +commit 0bddb0096fdc76805744d6b0b5fce2b70a8cb338 +Author: Victor Vieux +Date: Mon Dec 7 22:04:14 2015 -0800 + + longer retries + + Signed-off-by: Victor Vieux + +commit 4748bb14ddddb0343d2344e16e4fb82e2f918842 +Author: Victor Vieux +Date: Mon Dec 7 21:59:03 2015 -0800 + + add trace + + Signed-off-by: Victor Vieux + +commit 9677ddd06f23b1c62ee2b448d3ac411a0769fd9c +Author: Victor Vieux +Date: Mon Dec 7 21:45:34 2015 -0800 + + 1.5.1->1.5.2 + + Signed-off-by: Victor Vieux + +commit a4a1d3bd0125aba170874d2ba3040ffca5217081 +Merge: 67a4d559db f1b7b7be59 +Author: Victor Vieux +Date: Mon Dec 7 21:11:20 2015 -0800 + + Merge pull request #1466 from abronan/fix_ci_discovery_race + + Integration: Wait for nodes to be registered and discovered before testing + +commit 0b0373d436c8ec8d45fbf5fd5b882d20a9a83ae6 +Author: Anil Belur +Date: Mon Dec 7 17:29:22 2015 +0530 + + Fixes issue #2310 - machine ls --filter with engine label + + * Added a new members `Labels` to `FilterOptions struct`, and `EngineOptions` to + `HostListItem struct`. `HostListItems` is already being read from the file + store `config.json` which TestFilterHostsReturnSetLabel engine labels. + + * Modified `parseFilters()` and added new `func matchesLabel(`) which compares + the one or more label values provided as input. + + * Also the changes include added tests for UT and integration. + Note: Have kept `--filter label==` syntax which is similar to + `docker images --filter` to keep the usability consistent. + + review comments from @dgageot + + Signed-off-by: Anil Belur + +commit f1b7b7be59272def27f14acf75f242859b5b75e7 +Author: Victor Vieux +Date: Mon Dec 7 18:25:24 2015 -0800 + + fix tests + + Signed-off-by: Victor Vieux + +commit 056df32e5f36670c29f36905e724bcb85d16c486 +Author: Jessica Frazelle +Date: Mon Dec 7 19:20:12 2015 -0800 + + update with more repos + + Signed-off-by: Jessica Frazelle + +commit 8a799b36f882b423a4949645a738059ccd56ebfc +Author: Fabrizio Soppelsa +Date: Mon Dec 7 19:14:29 2015 -0800 + + Order options in openstack.md, to make docs more readable + + Signed-off-by: Fabrizio Soppelsa + +commit 9dc3c6df0e864f05214944e5e97d20ee5152b557 +Author: Stephen J Day +Date: Mon Dec 7 18:54:22 2015 -0800 + + storage/driver: decrease memory allocation done during testsuite + + Signed-off-by: Stephen J Day + +commit d159c83c687cb114022cd40a7dfe9b7ef4e44786 +Merge: a40fc131b5 02cd3c9413 +Author: Jess Frazelle +Date: Tue Dec 8 16:01:17 2015 +1300 + + Merge pull request #41 from thaJeztah/add-more-projects + + Add more projects + +commit 437f3f8adbc3012e07b4629e8a668a7bb18e8ddd +Author: Daniel Nephin +Date: Sat Oct 10 14:41:17 2015 -0400 + + Add docker-compose config subcommand. + + Signed-off-by: Daniel Nephin + +commit 6e37b622d39591038a4907ee7171a359076bc1db +Author: Aaron Lehmann +Date: Mon Dec 7 17:55:35 2015 -0800 + + Make order of items in "docker images" deterministic + + The server-side portion of "docker images" sorts the images it returns + by creation timestamp so the list keeps a consistent order. However, it + does not sort the RepoTags and RepoDigests lists that each image carries + along with it. Since items in these lists are populated from a map, + their order will vary. If the user has a collection of tags which point + to overlapping IDs, for example tags that point to the same images on + different registries, the order will fluctuate between invocations of + "docker images". This can be disorienting with a long list of images. + + Sort these references at the tag store level, so that the tag store's + References call always returns references in a lexically sorted order. + As well as giving the tag store more deterministic behavior, doing it at + this level simplifies the tag store unit tests. + + Do the same for the ReferencesByName call. This will make push-all-tags + iterate over the tags in a consistent order. + + Signed-off-by: Aaron Lehmann + +commit a40fc131b57c9f0928ddadb1fd4d29af4e21b3c9 +Author: Jessica Frazelle +Date: Mon Dec 7 18:31:05 2015 -0800 + + update + + Signed-off-by: Jessica Frazelle + +commit 8ce5d05492b27e2d27660ddc6d2292e3ee553607 +Author: Christy Perez +Date: Mon Dec 7 19:40:55 2015 -0600 + + Add seccomp stuff for gccgo + + Signed-off-by: Christy Perez + +commit 9ef782184c66185c36fef855a0f2a66651a0307a +Author: Ying Li +Date: Mon Dec 7 17:19:28 2015 -0800 + + Minor refactor of NotaryRepository constructor to use more shared code. + + Signed-off-by: Ying Li + +commit 0433e3891532a9783b77d6b02c041bab359b0d91 +Author: Phil Estes +Date: Mon Dec 7 20:14:52 2015 -0500 + + Allow non-seccomp platforms to pass integration-cli tests + + Since seccomp is still a configurable build-tag, add a requirements + entry for seccomp, as well as move seccomp tests to "_unix" given it + won't be applicable to other platforms at this time. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 59df2adc071e0186ccd0ba7ea9387142e168d735 +Author: Aaron Lehmann +Date: Mon Dec 7 17:01:47 2015 -0800 + + Fix the scoping of "diff" so its value doesn't leak between loop iterations + + In the existing code, "diff" has function scope and the value from the + previous iteration may be used if it is not reset. This appears to be an + oversight. This commit changes its scope to the for loop body. + + One confusing point is that the cursor movement escape sequences appear + to be necessary even if the requested movement is 0. I haven't been able + to figure out why this makes a difference. + + Signed-off-by: Aaron Lehmann + +commit 5f1100a3bffa028b84dd6e1085412ccd023d8c0c +Merge: d9419287ea 4261d28d46 +Author: David Lawrence +Date: Mon Dec 7 16:37:55 2015 -0800 + + Merge pull request #343 from endophage/fix_340 + + fixing incomplete comment as raised in #340 + +commit d9419287ea6fd5aeeff0f229c8c4bb525ad9f84d +Merge: dd69872bb6 d59ae2d90f +Author: Ying Li +Date: Mon Dec 7 16:22:15 2015 -0800 + + Merge pull request #339 from cyli/server-handler + + Get Snapshot Key Handler + +commit 4261d28d46a9f6ab943deddd9c385cdfdb7a836c +Author: David Lawrence +Date: Mon Dec 7 16:12:09 2015 -0800 + + fixing incomplete comment as raised in #340 + Signed-off-by: David Lawrence (github: endophage) + +commit fc41d393946e6da59792da9ed6e5ab8ed6f58814 +Author: Aaron Lehmann +Date: Mon Dec 7 16:04:42 2015 -0800 + + Don't update lines on the terminal from a previous operation + + When we handle a message that isn't tracked in the "line" map (for + example, one with no ID), clear the line map. This means we won't update + lines that were part of a previous, completed set of operations when + doing something like pull -a. It also has the beneficial side effect + of avoiding terminal glitching in these types of situations, since + messages that don't get tracked in the "line" map cause the count of the + number of lines to get out of sync. + + Signed-off-by: Aaron Lehmann + +commit b36b4920399cc95e1b357f60aa738e84bd970f47 +Merge: 1f0886a713 fd9d7c02fc +Author: Sebastiaan van Stijn +Date: Tue Dec 8 00:26:29 2015 +0100 + + Merge pull request #18108 from phemmer/no-mtu-discovery + + don't try to use default route MTU as container MTU + +commit d59ae2d90fb474839a5ee0b164edda31ed238e0e +Author: Ying Li +Date: Fri Dec 4 13:56:03 2015 -0800 + + Add the handler for GET-ting a snapshot key. + + Signed-off-by: Ying Li + +commit bf0c6d0844f2ca2b853d9cbdaf1b5d924f31f296 +Author: Ying Li +Date: Fri Dec 4 13:47:54 2015 -0800 + + Fix bug with ED25519 cryptoservice's ListKeys + + Signed-off-by: Ying Li + +commit 806efdd7673077886b1004621ab4416cef3f02f8 +Merge: ff1960485c 31928e6914 +Author: Jeffrey Morgan +Date: Mon Dec 7 14:58:43 2015 -0800 + + Merge pull request #1280 from docker/bump-version + + Bump version, fix exec related error in new version + +commit ff1960485cf7b653ca1ddac9afdecc0671099f72 +Merge: b162d6bd51 18a5bfba9b +Author: Jeffrey Morgan +Date: Mon Dec 7 14:58:29 2015 -0800 + + Merge pull request #1257 from mikaoelitiana/fix-702-bis + + Fix #702 + +commit dd69872bb6d095a5afe30568f2cc55d39784d129 +Merge: 3e96684ba1 eb75898c43 +Author: David Lawrence +Date: Mon Dec 7 14:56:07 2015 -0800 + + Merge pull request #332 from endophage/server_snapshot + + Server snapshot + +commit 31928e6914a817f6a7a9862d90935f92f16b3781 +Author: Jeffrey Morgan +Date: Mon Dec 7 14:54:38 2015 -0800 + + Bump version, fix exec related error in new version + + Signed-off-by: Jeffrey Morgan + +commit 2c2fbc4c245250df92fd7772ac515e50dbfb2c7d +Author: Carson A +Date: Mon Dec 7 15:47:51 2015 -0700 + + Update nginx.md + + Fixes a huge problem where a nginx variable was not escaped and nginx was adding the literal string "always" to all requests. + The most obvious result was that basic auth was entirely broken. + + Signed-off-by: Carson Anderson + +commit eb75898c43d4cd68a291aa2f0801e8f1d1f11a93 +Author: David Lawrence +Date: Mon Dec 7 14:44:11 2015 -0800 + + fix roleExpired varname, it shadowed a func name + Signed-off-by: David Lawrence (github: endophage) + +commit 3e96684ba19a8d2b391c0e74f394f8ea55af4af2 +Merge: d02f6f2686 8417f6670b +Author: David Lawrence +Date: Mon Dec 7 14:33:01 2015 -0800 + + Merge pull request #338 from cyli/keydbstore-error + + KeyDBStore refactor so that it just directly takes the DB arguments. + +commit fd9d7c02fcc8edd73d056f56f17e5cfe1760495b +Author: Patrick Hemmer +Date: Thu Nov 19 20:14:35 2015 -0500 + + don't try to use default route MTU as bridge MTU + + Signed-off-by: Patrick Hemmer + +commit 1f0886a71338339d6917953c5efb729f7491aa08 +Merge: 41ae615aa1 741924384e +Author: Alexander Morozov +Date: Mon Dec 7 14:09:14 2015 -0800 + + Merge pull request #18476 from aaronlehmann/v1-push-size + + Use DiffSize instead of Size in v1 push + +commit 67a4d559db820b21636e4e1526f5532c6fdbf61f +Merge: d9265c4f21 e71bda76f8 +Author: Victor Vieux +Date: Mon Dec 7 13:43:34 2015 -0800 + + Merge pull request #1449 from jimenez/mesos_user_abnormal_error + + Improving error output for bad swarm mesos user + +commit 7ab0f9bf6142b828ac8972fae6cb8aabcaf1d742 +Author: Aaron Lehmann +Date: Mon Dec 7 13:26:30 2015 -0800 + + Fix flaky test TestLogsSince + + This test can fail if it is run close to a second boundary: + + FAIL: docker_cli_logs_test.go:169: DockerSuite.TestLogsSince + + docker_cli_logs_test.go:183: + c.Assert(out, checker.Not(checker.Contains), v, + check.Commentf("unexpected log message returned, since=%v", since)) + ... obtained string = "" + + ... "2015-12-07T19:54:45.000551883Z 1449518084 log2\n" + + ... "2015-12-07T19:54:47.001310929Z 1449518086 log3\n" + ... substring string = "log2" + ... unexpected log message returned, since=1449518085 + + The problem is that it generates log lines using date +%s and uses that + timestamp as a reference for log filtering with (--since) later on in + the test. However, the timestamp that date +%s generates may not match + the log timestamp. + + This commit changes the test to parse the log timestamp itself instead + of relying on a parallel timestamp. + + Signed-off-by: Aaron Lehmann + +commit d9265c4f212e8c924394755a63be516915a69950 +Merge: 19369febf4 f21efa4337 +Author: Victor Vieux +Date: Mon Dec 7 13:22:25 2015 -0800 + + Merge pull request #1501 from abronan/modify_default_ttl_heartbeat + + Increase default TTL and heartbeat value + +commit ed8ed5f14e9f5e866021ff33d57d88cdf4037a43 +Author: Nathan LeClaire +Date: Thu Dec 3 11:10:21 2015 -0800 + + Revise SSH help flow and add 'docker-machine ssh' test + + Signed-off-by: Nathan LeClaire + +commit 19369febf4f8cf596a11f737bcc175f20b33e04d +Merge: 0b0e328b7b 0e8763920e +Author: Morgan Bauer +Date: Mon Dec 7 12:56:26 2015 -0800 + + Merge pull request #1509 from MHBauer/maintainers + + Add @mhbauer to maintainers + +commit fb76bca9f0df40fa6c351a26fb6a8548b365985a +Author: David Lawrence +Date: Mon Dec 7 12:54:57 2015 -0800 + + adding comment to snapshot key insert race condition test per @cyli's request + Signed-off-by: David Lawrence (github: endophage) + +commit 09a6fa07a1d96eb7da2629d91b5f28c352bac3d1 +Author: David Lawrence +Date: Fri Dec 4 15:43:56 2015 -0800 + + some tests for the handlers + Signed-off-by: David Lawrence (github: endophage) + +commit 91c9b61edbad528cc22ae7397767781e58ad6b6c +Author: David Lawrence +Date: Fri Dec 4 14:45:33 2015 -0800 + + update GetHandler to use new snapshot code + Signed-off-by: David Lawrence (github: endophage) + +commit 844c1872c4cd07c74177aaad91150345db0da9a4 +Author: David Lawrence +Date: Fri Dec 4 11:20:20 2015 -0800 + + adding tests for server/snapshot/snapshot.go + Signed-off-by: David Lawrence (github: endophage) + +commit b0c7ef5b88649eb4177b60b6d20df907ffc1dce7 +Author: David Lawrence +Date: Fri Dec 4 09:54:26 2015 -0800 + + addressing @cyli's comments + Signed-off-by: David Lawrence (github: endophage) + +commit cae5940c70e3b0837534169c2366b77e0834a9dc +Author: David Lawrence +Date: Wed Dec 2 15:50:42 2015 -0800 + + generate snapshots server side + Signed-off-by: David Lawrence (github: endophage) + +commit d02f6f26869cbcfb680b2358a3bd9e82ce2fcf39 +Merge: 52aa55076b e3cee0cdbd +Author: Ying Li +Date: Mon Dec 7 12:52:04 2015 -0800 + + Merge pull request #334 from docker/client-test-refactor + + Refactor the client TestInitRepo test into reusable helper functions. + +commit 1027f5e066c62e24ce78d8012d168d28b1cc7d76 +Author: Patrick Devine +Date: Sun Dec 6 14:41:38 2015 -0800 + + Make the catalog more efficient + + This change removes the sort() from the Repositories() function since + we're now guaranteed to have a lexigraphically sorted walk. + + Signed-off-by: Patrick Devine + +commit 60dba4d2d562d4dc221c894e5fb51c73c540774b +Author: Lance Andersen +Date: Mon Dec 7 12:17:49 2015 -0700 + + added advertise flag to swarm manager + + Signed-off-by: Lance Andersen + +commit de3263c9d63ebb0d7aea591879d779520ba207f7 +Author: Carson A +Date: Mon Dec 7 12:28:30 2015 -0700 + + Update nginx.md + + Split commands out from their lead-ins. + + Signed-off-by: Carson Anderson + +commit 741924384ee7a617af1a0275e2dc674e86b9d0d9 +Author: Aaron Lehmann +Date: Mon Dec 7 10:59:59 2015 -0800 + + Use DiffSize instead of Size in v1 push + + The v1 push code was querying the size of the layer chain up to the + layer it was pushing, rather than just that layer. This made the + progress indicator inaccurate. + + Signed-off-by: Aaron Lehmann + +commit 0e8763920e39c3f0690d6b41cf811408fae07e6b +Author: Morgan Bauer +Date: Mon Dec 7 11:09:45 2015 -0800 + + Add @mhbauer to maintainers + + Signed-off-by: Morgan Bauer + +commit 74bb6f89c87dacc5c538a1807cda5b4d3f335262 +Merge: 7a584f21b8 ef4ab7a885 +Author: Richard Scothern +Date: Mon Dec 7 10:56:32 2015 -0800 + + Merge pull request #1157 from lebauce/swift-bulk-delete-fixes + + Use bulk delete to remove segments in Swift driver + +commit 41ae615aa13508b8f8958dc1c338fce5bccb8e6b +Merge: 5f1af8da5b 63fb931a0b +Author: Brian Goff +Date: Mon Dec 7 13:38:43 2015 -0500 + + Merge pull request #18442 from MHBauer/move-configs + + move configs structs to remove dependency on deamon + +commit 7a584f21b829382dd22fded3fffb5823c43db446 +Merge: 226d8c4f07 3150937b9f +Author: Stephen Day +Date: Mon Dec 7 10:31:43 2015 -0800 + + Merge pull request #1239 from stevvooe/refactor-reference-grammar + + reference: refactor grammar and regular expressions + +commit f18bf5e3432dd00f892192cf0909a0f541897ca9 +Author: Richard Scothern +Date: Mon Dec 7 10:17:49 2015 -0800 + + Add clearer messaging around missing content-length headers. + Signed-off-by: Richard Scothern + +commit 98cf2856dbd5e4b026c9d87626275e6a38ed4fd7 +Author: Pavel Strashkin +Date: Mon Dec 7 10:11:19 2015 -0800 + + Align version output with other docker tools + + ``` + $ docker-compose -v + docker-compose version 1.5.2, build 7240ff3 + + $ docker -v + Docker version 1.9.1, build a34a1d5 + ``` + + Signed-off-by: Pavel Strashkin + +commit 4792177b11dd47521ef61ff89b45b363e685c100 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 7 12:29:24 2015 +0100 + + Logrus Machine Logger + + Signed-off-by: Jean-Laurent de Morlhon + +commit 63fb931a0b7298c6281898bcc5f53ab0655ad1a6 +Author: Morgan Bauer +Date: Fri Dec 4 12:34:43 2015 -0800 + + move configs structs to remove dependency on daemon + + - Moved the following config structs to api/types + - ContainerRmConfig + - ContainerCommitConfig + + Signed-off-by: Morgan Bauer + +commit 5f1af8da5bd824010d3c744d3adf23106f22c6a9 +Merge: 7d6a2e3cf5 a2d348968f +Author: Sebastiaan van Stijn +Date: Mon Dec 7 16:03:28 2015 +0100 + + Merge pull request #18449 from coolljt0725/plugins_cleanup + + pkg/plugins/client.go: don't try to encode os decode if it's nil + +commit ecf2dd11f9cf95c0db266e71bc71b279b619b66e +Merge: 9f4e83e456 a21f9993b3 +Author: Aanand Prasad +Date: Mon Dec 7 14:31:23 2015 +0000 + + Merge pull request #2467 from dnephin/remove_migrate_to_labels + + Remove migrate-to-labels. + +commit 9f4e83e4564ac7ac8f1cbef52bd1892a10843ed1 +Merge: 50dcb1d7e7 2f568984f7 +Author: Aanand Prasad +Date: Mon Dec 7 14:29:33 2015 +0000 + + Merge pull request #2466 from dnephin/remove_insecure_ssl_warning + + Removes the deprecated --allow-insecure-ssl flag + +commit 50dcb1d7e746acab18bf466250ec9aff5f3ca1a1 +Merge: 509059cdab 377f084dfe +Author: Aanand Prasad +Date: Mon Dec 7 14:29:08 2015 +0000 + + Merge pull request #2468 from dnephin/increase_timeout_in_tests + + Increase timeout in tests + +commit 7d6a2e3cf5d172c21c831c3466e30d693e12e6fd +Merge: 1f8efc687c 8edb941b79 +Author: Phil Estes +Date: Mon Dec 7 09:17:48 2015 -0500 + + Merge pull request #18451 from WeiZhang555/net-err + + Better error message for network connect + +commit 1f8efc687cdf8ba98a7332cf9d4401afb8108be6 +Merge: 2ecbc9774b 3243e504d0 +Author: Tibor Vass +Date: Mon Dec 7 14:38:21 2015 +0100 + + Merge pull request #18123 from aidanhs/aphs-fail-on-broken-tar + + Ensure adding a broken tar doesn't silently fail + +commit 2ecbc9774b0b942b5314faa60b566039f31ba90b +Merge: 0bb4f82d2d e719c9225c +Author: Doug Davis +Date: Mon Dec 7 07:55:26 2015 -0500 + + Merge pull request #18463 from haoshuwei/modify-containerinspect-tocheckstatuscode + + Modify docker inspect client to check statusCode instead of strings c… + +commit 0bb4f82d2d9f3d741fea6251dc4b2925576a8d02 +Merge: ce7ae7868e c424c8c32c +Author: Doug Davis +Date: Mon Dec 7 07:48:04 2015 -0500 + + Merge pull request #18425 from wenchma/18424-ErrorCodeNoSuchContainer + + Correct the message of ErrorCodeNoSuchContainer to "No such container" + +commit ce7ae7868e12dcb331c4e427630bf9615c959055 +Merge: f7c0d0ec50 8923c30b4a +Author: Tibor Vass +Date: Mon Dec 7 13:38:16 2015 +0100 + + Merge pull request #18468 from iGusev/patch-1 + + added rm flag to backup/restore commands in examples + +commit f7c0d0ec5041ae32830a1edb79dfec55cba7b261 +Merge: 6fcd33b576 bcd0f0cdc4 +Author: Tibor Vass +Date: Mon Dec 7 13:35:02 2015 +0100 + + Merge pull request #18105 from mishak87/registry-improvements + + Registry tiny code improvements + +commit 8923c30b4ad304b8ff285afae77bc70b1a2036cc +Author: Ilya Gusev +Date: Mon Dec 7 15:17:03 2015 +0300 + + Update dockervolumes.md + + added rm flag to backup/restore commands in examples + + Signed-off-by: Ilya Gusev + +commit 6fcd33b576bb59e17f8d14f1f96e2dc180052ddb +Merge: ba77a5b46f 6306eb3cd3 +Author: Vincent Demeester +Date: Mon Dec 7 12:48:41 2015 +0100 + + Merge pull request #18462 from haoshuwei/modify-networkinspect-tocheckstatuscode + + Modify docker network inspect client to check statusCode instead of s… + +commit ba77a5b46fb86f6765fdab8a85f82266e1032efe +Merge: 91657008f2 451f751773 +Author: Tibor Vass +Date: Mon Dec 7 12:47:52 2015 +0100 + + Merge pull request #18329 from liusdu/mount_err + + Fix rm container error in aufs and devicemapper after daemon crash + +commit 6306eb3cd320bed914104cfd7110fe0aac2c3e4f +Author: Shuwei Hao +Date: Mon Dec 7 03:38:47 2015 +0000 + + Modify docker network inspect client to check statusCode instead of string contain + + Signed-off-by: Shuwei Hao + +commit 010a1c76e203fee1d90e1d3112d5c1706e0061fd +Author: Jean-Laurent de Morlhon +Date: Fri Dec 4 12:19:04 2015 +0100 + + Use logrus + + Signed-off-by: Jean-Laurent de Morlhon + +commit 6fe3b5581ebeb4803ac284d755319cefaaf96a74 +Author: Jean-Laurent de Morlhon +Date: Fri Dec 4 15:19:56 2015 +0100 + + vendoring logrus + + Signed-off-by: Jean-Laurent de Morlhon + +commit 6480feb7668851d3878bf36eedc5fd8ffa789e25 +Author: Joel Hansson +Date: Thu Dec 3 09:57:58 2015 +0100 + + Enable ptrace in a container on apparmor below 2.9 + + Ubuntu 14.04 LTS is on apparmor 2.8.95. + This enables `ps` inside a container without causing + audit log entries on the host. + + Signed-off-by: Joel Hansson + +commit e719c9225cb4dd6e415c06f6fa4f625a87bfc861 +Author: Shuwei Hao +Date: Mon Dec 7 05:22:37 2015 +0000 + + Modufy docker inspect client to check statusCode instead of strings contains + + Signed-off-by: Shuwei Hao + +commit f2c232bb1013f6734f9556a67766373d08473c5b +Author: Nick Jones +Date: Tue Dec 1 16:20:36 2015 +0000 + + Only allocate a tty if we detect one + + Signed-off-by: Nick Jones + +commit 8edb941b796cbdd2c9f3809a3290fcd4d8ae76ea +Author: Zhang Wei +Date: Sat Dec 5 23:28:51 2015 +0800 + + Better error message for network connect + + Use better error message when user want to connect container with same + name to one network, this can help avoid confusion. + + Signed-off-by: Zhang Wei + +commit 1079735af8a76a73fe98f501d12c784e0f94665d +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 17:22:36 2015 +0100 + + Remove withFields + + Signed-off-by: Jean-Laurent de Morlhon + +commit 2e79f67e93f77909cc0cd6fd67ad7ead423296b9 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 15:56:22 2015 +0100 + + Cleanup stdout/stderr log initialization + + Signed-off-by: Jean-Laurent de Morlhon + +commit 892e19c01976c452649247c6be7c219159c285a9 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 15:42:09 2015 +0100 + + delete unused method + + Signed-off-by: Jean-Laurent de Morlhon + +commit 109bea4151244c058755d792cf186de797b1acf3 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 15:31:09 2015 +0100 + + Extract interface and Remove log.print + + Signed-off-by: Jean-Laurent de Morlhon + +commit 91657008f245f972f3bc44819ae67d31af8f81fe +Merge: 78d8df73b5 d125ddaeda +Author: Sebastiaan van Stijn +Date: Mon Dec 7 10:26:18 2015 +0100 + + Merge pull request #18458 from vdemeester/fix-volume-test + + Fix DockerSuite.TestVolumeCliInspectMulti + +commit d7c9ae60e646e827e741c2be4646d0b867cdc207 +Author: Harald Albers +Date: Sun Nov 15 13:31:13 2015 -0800 + + Improve bash completion for `docker network disconnect` + + Signed-off-by: Harald Albers + +commit 7f499308fc4d23cf14c76607c10677a652e357b1 +Merge: 760e814d43 293055fcbc +Author: David Gageot +Date: Mon Dec 7 09:51:07 2015 +0100 + + Merge pull request #2507 from dgageot/dead-code + + Remove dead code + +commit 760e814d43d0ce73062e81387d00b7f850a56bb1 +Merge: ff54bf1b0c 6e43436a3d +Author: Jean-Laurent de Morlhon +Date: Mon Dec 7 09:41:34 2015 +0100 + + Merge pull request #2501 from fsoppelsa/2478-sanitizekey + + Sanitize keynames by replacing dots with underscores + +commit ff54bf1b0c684c81e838db9d22c4b20a91428ca3 +Merge: 1de66c75e4 66db37814d +Author: Jean-Laurent de Morlhon +Date: Mon Dec 7 09:40:42 2015 +0100 + + Merge pull request #2505 from kunalkushwaha/bugfix#2504 + + Bugfix#2504 Rename of temp file fails. + +commit 1de66c75e429dbbfdd241f124693e7ddcf9d33dd +Merge: a277bc6c0a 850e2646a6 +Author: Jean-Laurent de Morlhon +Date: Mon Dec 7 09:37:54 2015 +0100 + + Merge pull request #2503 from larskanis/fix-amd-svm-detection-on-linux + + Fix detection of virtualization support on AMD CPU. + +commit 293055fcbc29734699d18772b1d6992218961f61 +Author: David Gageot +Date: Mon Dec 7 09:15:12 2015 +0100 + + Remove dead code + + Signed-off-by: David Gageot + +commit 2525752a05464d964b184a8a70d2b96674a69bbc +Author: Harald Albers +Date: Mon Dec 7 09:10:19 2015 +0100 + + Use more robust download URL for completions + + Signed-off-by: Harald Albers + +commit d125ddaeda6b99d5c2c5920664a7e3baa9fb8d92 +Author: Vincent Demeester +Date: Mon Dec 7 08:34:18 2015 +0100 + + Fix DockerSuite.TestVolumeCliInspectMulti + + Use dockerCmdWithError now that it actually returns an error code. + + Signed-off-by: Vincent Demeester + +commit 850e2646a6979e9c484297ce1828684800d66406 +Author: Lars Kanis +Date: Sun Dec 6 22:02:54 2015 +0100 + + Fix detection of virtualisation support on AMD CPU. + + This also changes the amd test case to /proc/cpuinfo content of + a real AMD CPU. + + Signed-off-by: Lars Kanis + +commit 0b0e328b7b662f4d65246c9e699e5b0f98d41f13 +Merge: 63ba877cff 75a3ac2c7f +Author: Alexandre Beslic +Date: Sun Dec 6 21:39:37 2015 -0800 + + Merge pull request #1472 from abronan/improve_docs_duplicate_engine_ids + + Add clarification on install for VM cloning and Engine ID duplication issue + +commit 75a3ac2c7f7fcf05af11dfa697a1335b821164d8 +Author: Alexandre Beslic +Date: Sun Dec 6 21:27:37 2015 -0800 + + add clarification on install for VM cloning and Engine ID duplication problem + + Signed-off-by: Alexandre Beslic + +commit 66db37814d164e5d8dd5be5cff68f759362c3959 +Author: Kunal Kushwaha +Date: Mon Dec 7 14:02:36 2015 +0900 + + Bugfix#2504 Rename of temp file fails. + + Tempfile was not closed, so rename opertion was failing. + Minor code refactor is done, to make function more readable. + + Signed-off-by: Kunal Kushwaha + +commit 63ba877cfffb1e69cfb978ea075e4d1ac41ac80c +Merge: 3048dc996d fe0a2a9427 +Author: moxiegirl +Date: Sun Dec 6 20:49:29 2015 -0800 + + Merge pull request #1506 from thaJeztah/fix-readme-links + + Fix broken links in discovery README + +commit 78d8df73b578cbb35595fda062e7735d839617bd +Merge: 6b8d8bfbf8 f27572312f +Author: James Turnbull +Date: Sun Dec 6 18:08:51 2015 -0600 + + Merge pull request #18460 from thaJeztah/fix-pull-by-digest + + docs: fix pull by digest example + +commit f27572312fd363bcfe43a1ce71c7d225620302ac +Author: Sebastiaan van Stijn +Date: Mon Dec 7 00:58:46 2015 +0100 + + Fix pull by digest example + + Also reduced the column spacing in the output, so + that more output is visible in the documentation. + + Signed-off-by: Sebastiaan van Stijn + +commit fe0a2a9427e16132b289e9c0187fde80dd04cbaf +Author: Sebastiaan van Stijn +Date: Mon Dec 7 00:43:17 2015 +0100 + + Fix broken links in discovery README + + Signed-off-by: Sebastiaan van Stijn + +commit c07e79fa8adfaf8e110803c9d1ad2cf6cbc67ee9 +Author: John Howard +Date: Sun Dec 6 14:37:07 2015 -0800 + + Windows CI Fix: Allow bash v4 + + Signed-off-by: John Howard + +commit 6b8d8bfbf8f3125187f677d55cad7587dd070b27 +Merge: 715f6a135c a94bede2aa +Author: James Turnbull +Date: Sun Dec 6 15:01:55 2015 -0600 + + Merge pull request #18454 from dcylabs/master + + added albatros library + +commit a94bede2aa04bbb4f05fcda70f8edfa7917a3238 +Author: dcylabs +Date: Sun Dec 6 20:40:42 2015 +0100 + + added albatros library + + Signed-off-by: dcylabs + +commit 02cd3c9413d1c425c6cf79fb615b9d25aa95cc5a +Author: Sebastiaan van Stijn +Date: Sun Dec 6 18:03:16 2015 +0100 + + Add more projects + + Signed-off-by: Sebastiaan van Stijn + +commit 715f6a135c6787fdb6834a6d167b3adc06943afe +Merge: 32f08e06e6 8dce8e9901 +Author: Sebastiaan van Stijn +Date: Sun Dec 6 16:40:06 2015 +0100 + + Merge pull request #17741 from dhiltgen/pull_token + + Add token pass-thru for AuthConfig + +commit bd6ad72c29e5a70c9b100be4f2552dc758231fd5 +Author: ahaurw01 +Date: Sun Dec 6 10:24:55 2015 -0500 + + Add a note to install-w-machine with pointers if hosted discovery is down + + Signed-off-by: Aaron Haurwitz + +commit 32f08e06e635adac43cd7113e8118394eeafc0b6 +Merge: 5b4734aaa5 74900edbf8 +Author: Vincent Demeester +Date: Sun Dec 6 16:02:40 2015 +0100 + + Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api + + Remove CLI specific information for API error messages. Issue #17147 + +commit 5b4734aaa543243ba076bf606286bbc46fed9e38 +Merge: b98577af83 6295345005 +Author: Sebastiaan van Stijn +Date: Sun Dec 6 14:03:46 2015 +0100 + + Merge pull request #17788 from haoshuwei/modify-volume-inspect-multi + + Modify docker volume inspect to return existed volumes and the names of the unexsited volumes + +commit 3048dc996d190237900212b3f608137f7c0ac66b +Merge: f78c8054b7 501b9609dd +Author: Alexandre Beslic +Date: Sun Dec 6 01:16:22 2015 -0800 + + Merge pull request #1497 from vieux/emphasis_token_not_prod + + emphasize the hosted discovery service is not meant for production + +commit 501b9609dde2953dadf032852daeade8cd25308a +Author: Alexandre Beslic +Date: Sun Dec 6 01:04:30 2015 -0800 + + fix typos and add note in discovery README for token usage scenarios + + Signed-off-by: Alexandre Beslic + +commit ac210c448310f6aeb3661bac3fea4931a4c08d02 +Merge: f7ddf13d25 94d5b3dffe +Author: Sebastiaan van Stijn +Date: Sun Dec 6 01:56:12 2015 +0100 + + Merge pull request #40 from thaJeztah/more-more-more + + Add boot2docker maintainers + +commit 94d5b3dffe9e68f03fd302cf4cd1cbc210456177 +Author: Sebastiaan van Stijn +Date: Sun Dec 6 01:50:52 2015 +0100 + + Add boot2docker maintainers + + Signed-off-by: Sebastiaan van Stijn + +commit f7ddf13d25948a6911470a7f937e3941772ce7f9 +Merge: ecfbfef587 49fecde2ab +Author: Sebastiaan van Stijn +Date: Sun Dec 6 01:47:11 2015 +0100 + + Merge pull request #38 from thaJeztah/make-it-work-on-case-insensitive-filesystems + + rename maintainers for case-insensitive filesystems + +commit 49fecde2ab8cba2e8a05c85f85430e7ccef8f18a +Author: Sebastiaan van Stijn +Date: Sat Dec 5 03:04:54 2015 +0100 + + rename maintainers for case-insensitive filesystems + + where maintainers===MAINTAINERS + + also added a .dockerignore to prevent busting the cache + when it's not needed \o/ + + Signed-off-by: Sebastiaan van Stijn + +commit 6e43436a3d72dd100b124547e35f4d626910a2bd +Author: Fabrizio +Date: Sat Dec 5 15:56:51 2015 -0800 + + Sanitize keynames by replacing dots with underscores + + Signed-off-by: Fabrizio Soppelsa + +commit ecfbfef5877c437c4b8ddbd5a2fcea3e7236179c +Merge: 59df5c3d3f 962d5091ae +Author: Jess Frazelle +Date: Sat Dec 5 11:55:01 2015 -0800 + + Merge pull request #37 from thaJeztah/and-the-others + + Add boot2docker, docker-py, libkv + +commit b98577af83100ac91e94deba50093f9e0aedad93 +Merge: 87a614ed55 9c8d6edbf1 +Author: Jess Frazelle +Date: Sat Dec 5 10:06:52 2015 -0800 + + Merge pull request #18446 from LK4D4/vendor_pkg_dockerignore + + Add vendor/pkg to .dockerignore + +commit 59df5c3d3fbbe9b6393d54f9c595d813cbbb8bfd +Merge: 2beb424f48 be0be46d3a +Author: Sebastiaan van Stijn +Date: Sat Dec 5 18:36:36 2015 +0100 + + Merge pull request #39 from thaJeztah/you-have-been-assimilated + + Update MAINTAINERS + +commit be0be46d3a1d4892ae59a78ba6efe91be7253fc1 +Author: Sebastiaan van Stijn +Date: Sat Dec 5 18:32:56 2015 +0100 + + Update MAINTAINERS + + Signed-off-by: Sebastiaan van Stijn + +commit 87a614ed55f2a9076d8150f846b0d27fe60095a8 +Merge: 540c607972 831af89991 +Author: Jess Frazelle +Date: Sat Dec 5 08:33:58 2015 -0800 + + Merge pull request #17989 from jfrazelle/initial-seccomp-support + + Phase 1: Initial seccomp support + +commit 540c60797283545489193b533c1da93b738ee1bd +Merge: 82c47088db 09c4643ce1 +Author: Doug Davis +Date: Sat Dec 5 09:15:51 2015 -0500 + + Merge pull request #18450 from runcom/typo-ocd + + integration-cli: fix test name typo + +commit 09c4643ce1e9c0ae29e0489daefe0053aeed260f +Author: Antonio Murdaca +Date: Sat Dec 5 11:42:46 2015 +0100 + + integration-cli: fix test name typo + + Signed-off-by: Antonio Murdaca + +commit a2d348968fe754df41d0a1b56c7ba29ebbaa6849 +Author: Lei Jitang +Date: Sat Dec 5 02:55:50 2015 -0500 + + pkg/plugins/client.go: don't try to encode os decode if it's nil + + When user call the `Call()` method, they don't always want to sent + some args or get the return value, so they use `nil` when call `Call()` + method and this will casue an error. It's better to not trying to + encode or decode if it's nil. + + Signed-off-by: Lei Jitang + +commit 3150937b9f2b1b5b096b2634d0e7c44d4a0f89fb +Author: Stephen J Day +Date: Fri Dec 4 14:40:09 2015 -0800 + + reference: refactor grammar and regular expressions + + To resolve some inconsistencies between the grammar and the regular + expressions, the grammar has been slightly refactored to match the intent. The + regular expressions have been redefined with the same structure to make it + easier to verify the grammar is correct. + + Signed-off-by: Stephen J Day + +commit 962d5091ae461ac043efc1d2695567815e003ed6 +Author: Sebastiaan van Stijn +Date: Sat Dec 5 01:31:30 2015 +0100 + + Add boot2docker, docker-py, libkv + + Signed-off-by: Sebastiaan van Stijn + +commit f21efa43377de61c02259fc0a03fd0602b66c678 +Author: Alexandre Beslic +Date: Fri Dec 4 17:11:33 2015 -0800 + + Increase default TTL and heartbeat value + + Increases the default ttl and heartbeat value for discovery. + Because the node will still be listed for a long period on + `docker info`, there is now a Status to know if a node is + in the healthy or unhealthy state. + + Signed-off-by: Alexandre Beslic + +commit 9c8d6edbf15a33045cffb37b6406715dc8776675 +Author: Alexander Morozov +Date: Fri Dec 4 17:02:15 2015 -0800 + + Add vendor/pkg to .dockerignore + + It's in .gitignore too, so why not + + Signed-off-by: Alexander Morozov + +commit 2beb424f483c7ebf12421c04b36c577b6bda9109 +Merge: 4447859011 3239e8879d +Author: Jess Frazelle +Date: Fri Dec 4 17:01:32 2015 -0800 + + Merge pull request #36 from thaJeztah/the-need-for-speed + + Add spdystream + +commit 3239e8879da016ad339131cf2f6f5f038fa4c9dc +Author: Sebastiaan van Stijn +Date: Sat Dec 5 01:31:30 2015 +0100 + + Add spdystream + + Signed-off-by: Sebastiaan van Stijn + +commit f78c8054b7d660b2467063cb9ec42bce74f057de +Merge: 4581e65432 f73ec80548 +Author: Victor Vieux +Date: Fri Dec 4 16:10:10 2015 -0800 + + Merge pull request #1498 from vieux/default_aufs + + default back to aufs + +commit 434aaf7e4ea34e0209df6999e9641460ab91aff4 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 17:51:07 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit 4581e65432ff5895c54762ed57efaa0b021e612d +Merge: b1d621c286 10986a6038 +Author: Alexandre Beslic +Date: Fri Dec 4 16:03:54 2015 -0800 + + Merge pull request #1438 from dongluochen/networkId + + Route network connect/disconnect request to the right engine. + +commit a277bc6c0afed21e974e6e60014529b9568f0ac0 +Merge: dac327f167 92ce49b367 +Author: Nathan LeClaire +Date: Fri Dec 4 15:31:45 2015 -0800 + + Merge pull request #2453 from dgageot/single-binary + + Put all core drivers in docker-machine binary + +commit b1d621c286db628351c11876c984f491cf863b28 +Merge: 8111304a52 925ac57d6c +Author: Sven Dowideit +Date: Sat Dec 5 09:31:09 2015 +1000 + + Merge pull request #1493 from SvenDowideit/linkchecker-fixes + + Small fixes found by linkchecker + +commit 226d8c4f07955f1246308af3fdba9d89db6e4ca5 +Merge: 568bf038af 7d0d94814b +Author: Sven Dowideit +Date: Sat Dec 5 09:30:58 2015 +1000 + + Merge pull request #1234 from SvenDowideit/linkchecker-fixes + + Small doc fixes found by the linkchecker + +commit 765431f70f12d6d91386ef0b3ed6b98ae764c6a7 +Author: Victor Vieux +Date: Fri Dec 4 15:22:30 2015 -0800 + + emphasize the hosted discovery service is not meant for production + + Signed-off-by: Victor Vieux + +commit 8111304a523920c454d5964e289c3160974f03c4 +Merge: 6aa6f76f3e 2360ffe0dd +Author: Victor Vieux +Date: Fri Dec 4 15:06:05 2015 -0800 + + Merge pull request #1496 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 82c47088db8a0b460df81e5c2c7a099989ba48b8 +Merge: a4817b8b21 39589800b4 +Author: David Calavera +Date: Fri Dec 4 14:51:54 2015 -0800 + + Merge pull request #18418 from aaronlehmann/no-head-requests + + Avoid a HEAD request for each layer in a v2 pull + +commit a4817b8b2143556c7b656c314fbcda6d5603bf2f +Merge: 23f00624a1 fcb083c6ac +Author: David Calavera +Date: Fri Dec 4 14:49:18 2015 -0800 + + Merge pull request #18443 from tonistiigi/fix-images-delete + + Fix image deletion conflicts with search + +commit b162d6bd51cb366dec33936508182bcdcead8049 +Merge: 548fefc508 262a9cda37 +Author: Jeffrey Morgan +Date: Fri Dec 4 14:09:09 2015 -0800 + + Merge pull request #1274 from docker/fix-json-streams + + Fix errors due to json streams over sockets + +commit 262a9cda378ad807ebcf9a1ae3631003b9f1ec34 +Author: Jeffrey Morgan +Date: Fri Dec 4 13:59:30 2015 -0800 + + Fix errors due to json streams over sockets + + Signed-off-by: Jeffrey Morgan + +commit 4447859011ee290fb3c7ef50480cc16868989145 +Author: Jessica Frazelle +Date: Fri Dec 4 13:53:17 2015 -0800 + + add kitematic + + Signed-off-by: Jessica Frazelle + +commit dac327f16784237f3498c254dbf8b0b063fe4154 +Merge: 90aaae4ab4 bd12140d6b +Author: Nathan LeClaire +Date: Fri Dec 4 13:51:59 2015 -0800 + + Merge pull request #2488 from trecloux/2361-ubuntu-15.10-base-images + + Update default images to ubuntu 15.10 + +commit 548fefc508163f8da43399d9f699e5641c644f21 +Merge: 6ee3742a5d 3d83d34e22 +Author: Jeffrey Morgan +Date: Fri Dec 4 13:48:21 2015 -0800 + + Merge pull request #1270 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 6ee3742a5d4f4bbdcdb43e777b1a0ef4b8b7ff3b +Merge: f8746f4d66 3fc43ec829 +Author: Jeffrey Morgan +Date: Fri Dec 4 13:48:09 2015 -0800 + + Merge pull request #1273 from docker/fix-event-fetch + + Fix error when fetching containers upon daemon events + +commit 3fc43ec8294463f09b66be7884680ed67f6ba980 +Author: Jeffrey Morgan +Date: Fri Dec 4 13:26:56 2015 -0800 + + Fix error when fetching containers upon daemon events + + Signed-off-by: Jeffrey Morgan + +commit fcb083c6ac0fdb71e8db7a58f07a561342d631d3 +Author: Tonis Tiigi +Date: Fri Dec 4 13:15:54 2015 -0800 + + Fix image deletion conflicts with search + + Removed images were not cleaned up from the + digest-set that is used for the search index. + + Fixes #18437 + + Signed-off-by: Tonis Tiigi + +commit 23f00624a174dce985615ba4438303039b16dd09 +Merge: a56f258c8a eff5e6498f +Author: Alexander Morozov +Date: Fri Dec 4 12:34:19 2015 -0800 + + Merge pull request #18408 from tonistiigi/disable-systemd-timeout + + Disable timeout for systemd + +commit 509059cdab3194ecc6f3b44607cedf0f05320391 +Merge: 3e7b2ab865 e760c42ae0 +Author: Daniel Nephin +Date: Fri Dec 4 12:22:56 2015 -0800 + + Merge pull request #2492 from jake-low/no-yaml-warning + + Stop warning about ".yaml" file extension + +commit 3e7b2ab865e2fd4da5ac8809428820d79d0023ad +Merge: 0a84833474 de4a18ea6c +Author: Daniel Nephin +Date: Fri Dec 4 12:21:27 2015 -0800 + + Merge pull request #2506 from dnephin/update_changelog + + Cherry-pick release notes for 1.5.2 + +commit a56f258c8af4524f00750fbaa92d7b1f85981cef +Merge: 51b0f23127 23b771782a +Author: Jess Frazelle +Date: Fri Dec 4 11:53:09 2015 -0800 + + Merge pull request #18436 from estesp/fix-initlayer-perms + + Fix init layer chown of existing dir ownership + +commit d4435b79d9b2387efd981a5f63faede78b9a2356 +Author: Anton Tiurin +Date: Fri Dec 4 22:12:32 2015 +0300 + + Fix comment for PathRegexp + + Signed-off-by: Anton Tiurin + +commit 85485889fc4994a727c1c62b5c7ff9f228967e32 +Author: Jessica Frazelle +Date: Fri Dec 4 10:26:24 2015 -0800 + + add dockercraft + + Signed-off-by: Jessica Frazelle + +commit de4a18ea6c1b4addfeb3aad32204a01a90a2e776 +Author: Daniel Nephin +Date: Wed Dec 2 17:06:17 2015 -0800 + + Cherry-pick release notes for 1.5.2 + + Signed-off-by: Daniel Nephin + +commit 5cf3550d9bb543d056b4a27d87e1931ed00fe003 +Author: Jessica Frazelle +Date: Fri Dec 4 10:13:23 2015 -0800 + + add libnetwork + + Signed-off-by: Jessica Frazelle + +commit 8417f6670b24308b3003084639e22422fdc0fa4c +Author: Ying Li +Date: Fri Dec 4 09:55:52 2015 -0800 + + KeyDBStore refactor so that it just directly takes the DB arguments. + + Rather than create an SQL DB, then create a gorm BD using the SQL + DB. Also split the Create/Get test into two tests. + + Signed-off-by: Ying Li + +commit 51b0f23127f115ce24b45dac2d565db58d25458e +Merge: e29f208547 867f432985 +Author: Phil Estes +Date: Fri Dec 4 12:56:57 2015 -0500 + + Merge pull request #18398 from calavera/system_backend + + Move docker system information to a dedicated router and backend. + +commit 5fe270eb4112b08a7b1d0453bb52203edf3ba3e2 +Merge: 592c2cf704 6caa3d7833 +Author: Jessica Frazelle +Date: Fri Dec 4 09:42:03 2015 -0800 + + Merge branch 'add-readme' + + * add-readme: + add readme + +commit 6caa3d783394c1568be21a524957267e41f73804 +Author: Jessica Frazelle +Date: Fri Dec 4 09:40:58 2015 -0800 + + add readme + + Signed-off-by: Jessica Frazelle + +commit 592c2cf7045e1fe44ed8efde8f076cf9d9acb74b +Merge: cf011bc1cb 57e15b3c66 +Author: Jess Frazelle +Date: Fri Dec 4 09:38:40 2015 -0800 + + Merge pull request #35 from docker/add-maintainers-file-parsing + + inital parsing of maintainers files + +commit 57e15b3c6603de114b5382e45481d68ab71b2e79 +Author: Jessica Frazelle +Date: Thu Dec 3 11:49:42 2015 -0800 + + inital parsing of maintainers files + + Signed-off-by: Jessica Frazelle + +commit 39589800b4750bf28078efe57f7f1e74d971248f +Author: Aaron Lehmann +Date: Thu Dec 3 18:23:21 2015 -0800 + + Avoid a HEAD request for each layer in a v2 pull + + We were calling Stat for each layer to get the size so we could indicate + progress, but https://github.com/docker/distribution/pull/1226 made it + possible to get the length from the GET request that Open initiates. + + Saving one round-trip per layer should make pull operations slightly + faster and more robust. + + Signed-off-by: Aaron Lehmann + +commit 1a505161783992f3673ad6d6d04cc376fc80b556 +Author: Jeffrey Morgan +Date: Fri Dec 4 09:31:56 2015 -0800 + + Bump compose version + + Signed-off-by: Jeff Morgan + +commit e29f208547220c3c31abb2f8fd36d9e1ea70ec05 +Merge: 5a9bf3a3d3 b97110dda7 +Author: Jess Frazelle +Date: Fri Dec 4 09:25:43 2015 -0800 + + Merge pull request #18404 from jfrazelle/cleanup-maintainers + + cleanup people in maintainers file + +commit 52aa55076befc77bfdfd359a756a9a9a99407c57 +Merge: 414aeb4c42 132122a454 +Author: Ying Li +Date: Fri Dec 4 09:24:35 2015 -0800 + + Merge pull request #333 from jfrazelle/update-maintainers + + update maintainers file for parsing + +commit 23b771782ab7236ce5024ac5773a6ded9a2af753 +Author: Phil Estes +Date: Fri Dec 4 12:18:05 2015 -0500 + + Fix init layer chown of existing dir ownership + + This solves a bug where /etc may have pre-existing permissions from + build time, but init layer setup (reworked for user namespaces) was + assuming root ownership. Adds a test as well to catch this situation in + the future. + + Minor fix to wrong ordering of chown/close on files created during the + same initlayer setup. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 90aaae4ab4cb3b80a15eb81abf521829d2819fd9 +Merge: b8b5bd8a45 c27cc3ae7f +Author: Jean-Laurent de Morlhon +Date: Fri Dec 4 18:04:42 2015 +0100 + + Merge pull request #2495 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 3d83d34e22d0e8ef7ce8a1f6467d70acd490866b +Author: Sebastiaan van Stijn +Date: Fri Dec 4 17:59:15 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit 704955ee78f9c7e33f12fc449f4ee29753b8f069 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 17:31:39 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit c27cc3ae7fb12da21e4937daa8db1a12dacfe403 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 17:23:51 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit 0a84833474fbb5e02d299980d8deea222dd827dd +Merge: 707281aadb 7698da57ca +Author: Aanand Prasad +Date: Fri Dec 4 16:16:09 2015 +0000 + + Merge pull request #2505 from thaJeztah/update-maintainers + + update maintainers file for parsing + +commit 7698da57ca9c8c17001a137dd128fca2881957ac +Author: Sebastiaan van Stijn +Date: Fri Dec 4 16:50:50 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit 6eef5ab42d31b9aa5287e34f95af05fd584a4f85 +Author: André Martins +Date: Fri Dec 4 15:31:44 2015 +0000 + + Fixed 80-docker.rules file permissions to 644 + + Signed-off-by: André Martins + +commit 2360ffe0dd6e7f44cc8ebda769fd29f14168c987 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 16:27:15 2015 +0100 + + update maintainers file for parsing + + this updates the MAINTAINERS file to the new format, + so that it can be parsed and collected in the docker/opensource + repository. + + Signed-off-by: Sebastiaan van Stijn + +commit 5a9bf3a3d38043b88ae137ff388001a690cc94f0 +Merge: e3fbd6922f 655766ed95 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 16:15:36 2015 +0100 + + Merge pull request #18434 from haugene/master + + docs: fix typo in bash_history mount example + +commit 655766ed955477299fac95a0fcd60af58f2b5be8 +Author: Kristian Haugene +Date: Fri Dec 4 15:57:44 2015 +0100 + + docs: fix typo in bash_history mount example + + Signed-off-by: Kristian Haugene + +commit e3fbd6922fe549755890a205a0b8dd88022d5924 +Merge: cb6a1a6042 8fd2630d01 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 14:03:55 2015 +0100 + + Merge pull request #18325 from RsrchBoy/topic/newtorks + + newtork -> network (minor spelling correction) + +commit c60c0c4e9b65bd69fd1e1d6ca78bfcb2d7281c87 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 13:09:46 2015 +0100 + + docs: markdown and textual fixups in reference/run.md + + This fixes markdown formatting, and formatting of tables; + + - Our markdown engine doesn't support spanning rows, so + re-wrapped table contents. + - Added a CSS-styles to prevent "code" blocks in tables + from wrapping + - The "logging drivers" table didn't have a header + - Aligned table borders in source code for better readability. + - Standardize on using `-it` in stead of -i -t or -ti + - Some markup issues + - Some minor textual fixups + + Signed-off-by: Sebastiaan van Stijn + +commit cb6a1a6042fc30e0beeaa79a2f8def4b53019483 +Merge: 605c56295f 3f15a055e5 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 12:29:58 2015 +0100 + + Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps + + Add support for blkio read/write bps device + +commit ef4ab7a8850affa0033a387fb0c773975eb452c4 +Author: Sylvain Baubeau +Date: Fri Oct 30 17:08:56 2015 +0100 + + Use bulk delete to remove segments in Swift driver + + Signed-off-by: Sylvain Baubeau + +commit 605c56295fffdf3658d0f6c8faa1b0de03e50e37 +Merge: 7c1c96551d cc0e407e17 +Author: Sebastiaan van Stijn +Date: Fri Dec 4 12:04:23 2015 +0100 + + Merge pull request #18384 from Mashimiao/weight-device-docs-fix + + docs: fix blkio-weight-device option args + +commit c424c8c32c86d5e02964ad84802e9f9fa4e55522 +Author: Wen Cheng Ma +Date: Fri Dec 4 15:00:08 2015 +0800 + + Correct the message of ErrorCodeNoSuchContainer to "No such container" + + Fixes issue #18424 + + Signed-off-by: Wen Cheng Ma + +commit 6aa6f76f3e6b5f868cd81306dddc62c6fa47d1a3 +Merge: 9386efdfb1 c57c8a329e +Author: Andrea Luzzardi +Date: Thu Dec 3 19:51:19 2015 -0800 + + Merge pull request #1463 from cpuguy83/1430_tls_closewrite + + Ensure CloseWrite is called for hijacked TLS conns + +commit c57c8a329eaacc905bdb49ff3bca9f2c5fe08bd7 +Author: Brian Goff +Date: Sun Nov 29 11:07:29 2015 -0500 + + Ensure CloseWrite is called for hijacked TLS conns + + Golang's `*tls.Conn` does not support `CloseWrite`, this means that + connections using TLS will not be able to properly close on hijacked + connections. + + This copies Go's tls.Dial and instead returns an internal + `tlsClientConn` type that does store the raw net.Conn and implements + `CloseWrite`. + Implementation is mostly copied from + `github.com/docker/docker/api/client/hijack.go` + + Signed-off-by: Brian Goff + +commit 9386efdfb1226073b38b592fe3cf7033a86f0df3 +Merge: 0bd250bcf0 63498b1a80 +Author: Andrea Luzzardi +Date: Thu Dec 3 19:36:06 2015 -0800 + + Merge pull request #1425 from jimmyxian/set-memory-wappiness-default-value + + set MemorySwappiness default value + +commit 7c1c96551d41e369a588e365a9bb99acb5bc8fdb +Merge: a65502f751 2704fd9156 +Author: Alexander Morozov +Date: Thu Dec 3 19:35:04 2015 -0800 + + Merge pull request #18412 from aaronlehmann/runcommand-race + + Fix race in RunCommandWithOutputForDuration + +commit a65502f7513b6695d18a68785080192454ef9236 +Merge: c80d03db77 b7b707af2e +Author: Jess Frazelle +Date: Thu Dec 3 18:18:47 2015 -0800 + + Merge pull request #18413 from jfrazelle/update-go-version + + update go version + +commit c80d03db77d1bb70f85b3d765221bf7206714344 +Merge: 4e6bea5964 61d6240069 +Author: Doug Davis +Date: Thu Dec 3 20:59:47 2015 -0500 + + Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect + + Vendor distribution and fix inspect by sha256 prefix + +commit e3cee0cdbd9024aca1fec8254b134cffdce020f6 +Author: Ying Li +Date: Thu Dec 3 16:36:25 2015 -0800 + + Refactor the client TestInitRepo test into reusable helper functions. + + Also, eliminate the timestamp JSON constant and just generate a new + one for the tests. + + The client test now also uses KeyFileStore and certs.Manager to + verify the keys and certs on disk, rather than directly manipulating + the files themselves. This way, if the exact implementation of + KeyFileStore or certs.Manager changes, this test won't fail so long + as KeyFileStore and certs.Manager are self-consistent. + + Signed-off-by: Ying Li + +commit cc0e407e1778b79a3c75fd68f7c7e48e5449f99b +Author: Ma Shimiao +Date: Thu Dec 3 11:14:05 2015 +0800 + + docs: fix weight-deivce option args + + Signed-off-by: Ma Shimiao + +commit 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29 +Author: Ma Shimiao +Date: Wed Jul 8 19:06:48 2015 +0800 + + Add support for blkio read/write bps device + + Signed-off-by: Ma Shimiao + +commit 63498b1a8025f28c5eff27f6d004a375932f0764 +Author: Xian Chaobo +Date: Thu Dec 3 14:25:44 2015 +0800 + + set MemorySwappiness default value + + Signed-off-by: Xian Chaobo + +commit 0bd250bcf03e37f959d9f1d68b1bf275a3e1a98a +Merge: ed0b11e506 9df95842a9 +Author: Xian Chaobo +Date: Fri Dec 4 09:15:27 2015 +0800 + + Merge pull request #1494 from dongluochen/clientUpdate + + Godep update github.com/samalba/dockerclient + +commit 8f48fa47472bbabf7e9181872501db2e53dc1879 +Merge: fae20305ec 7240ff35ee +Author: Daniel Nephin +Date: Thu Dec 3 17:11:51 2015 -0800 + + Merge pull request #2491 from dnephin/bump-1.5.2 + + WIP: Bump 1.5.2 + +commit 19e5c0123060129c2529221ed5a6e7c41de22b5b +Author: Jessica Frazelle +Date: Thu Dec 3 17:04:01 2015 -0800 + + remove parallel we no longer use it + + Signed-off-by: Jessica Frazelle + +commit b7b707af2e617d62343391c6c82b984ff41b08e2 +Author: Jessica Frazelle +Date: Thu Dec 3 16:37:13 2015 -0800 + + update go version + + Signed-off-by: Jessica Frazelle + +commit 4e6bea596472a02509bb966d077a93fe9490f6e1 +Merge: 2856a30482 13d768b8ee +Author: Alexander Morozov +Date: Thu Dec 3 16:34:36 2015 -0800 + + Merge pull request #18411 from aaronlehmann/unit-test-timing + + Adjust TestDockerCmdWithTimeout timeout to improve reliability + +commit 2704fd9156bfb0fb8dc16c42902bb18ea5aa94a9 +Author: Aaron Lehmann +Date: Thu Dec 3 16:04:58 2015 -0800 + + Fix race in RunCommandWithOutputForDuration + + This function was starting a goroutine that modifies one of its return + values. The intent is for the goroutine to only influence the return + value when it's causing the function to return, but it's racy and can + also modify the return value when the function is returning due to the + timeout. Fix the goroutine to not modify return values directly. + + Also, give the channel a buffer so that the goroutine doesn't block + forever after a timeout. + + Fixes #18305 + + Signed-off-by: Aaron Lehmann + +commit 831af89991edd442ef4eeb29fd01da576b04bcfc +Author: Jessica Frazelle +Date: Wed Nov 18 01:38:57 2015 -0800 + + add docs + + Signed-off-by: Jessica Frazelle + +commit ec6d3392f1efc49d0609370e70a749a00555508c +Author: Jessica Frazelle +Date: Wed Dec 2 11:35:12 2015 -0800 + + hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms + + Signed-off-by: Jessica Frazelle + +commit cde9e8bc83182f0d100c4eda6acb5d4cbc995aac +Author: Jessica Frazelle +Date: Wed Nov 18 01:42:12 2015 -0800 + + update packagers.md and kernel config check + + Signed-off-by: Jessica Frazelle + +commit ae76f7e23e0b9d7aceb711077a7ffc1f0e57de9c +Author: Jessica Frazelle +Date: Wed Nov 18 01:13:02 2015 -0800 + + update bash completion for seccomp + + Signed-off-by: Jessica Frazelle + +commit ed5853de40b5e5c5df070a1f90f1fdde3ac56b20 +Author: Jessica Frazelle +Date: Sat Nov 14 18:06:59 2015 -0800 + + update hack/vendor.sh scripts and run vendor + + Signed-off-by: Jessica Frazelle + +commit 6707f4b9b638b367a1dde6f8684a5b9817a882f0 +Author: Jessica Frazelle +Date: Sat Nov 14 18:02:26 2015 -0800 + + inital seccomp support + + Signed-off-by: Jessica Frazelle + +commit 255004ef335d5e6cc4ec0f51ecff676e9d84643b +Author: Jessica Frazelle +Date: Sat Nov 14 18:02:08 2015 -0800 + + update debs/rpms for seccomp + + Signed-off-by: Jessica Frazelle + +commit d616a097638bc73a652bcf5f7b25465c25bfaa83 +Author: Jessica Frazelle +Date: Sat Nov 14 18:01:24 2015 -0800 + + dockerfile update for seccomp + + Signed-off-by: Jessica Frazelle + +commit bdf78fa7719d595a207fa007f2fb41b602fd9db6 +Author: Carol Fager-Higgins +Date: Tue Dec 1 14:51:37 2015 -0800 + + added cs engine minor changes to upgrade doc + changed code from start to restart in upgrade doc + mentioned diff cs engine upgrade process in RNs + + Signed-off-by: Carol Fager-Higgins + +commit 13d768b8ee05d3158c62d761e4ebe657cd7a8c25 +Author: Aaron Lehmann +Date: Thu Dec 3 14:42:32 2015 -0800 + + Adjust TestDockerCmdWithTimeout timeout to improve reliability + + I saw a failure of TestDockerCmdWithTimeout. This test starts a command + that produces output after 10 ms, but uses a 5 ms timeout, so normally + the command will be killed before the output. The time intervals are so + small that the timeout may not reliably trigger before the output, which + can cause the test to fail. + + This commit changes the test to only fail if the process is still alive + after 10 seconds. This means the test will confirm that the timeouts are + happening, but not attempt to gauge that the timeouts are happening + within milliseconds of when they are expected (which can't be done + reliably). + + Signed-off-by: Aaron Lehmann + +commit 2856a3048238d7a746d57028e48ea2489555e6e5 +Merge: 168b490062 2097e7fcee +Author: Michael Crosby +Date: Thu Dec 3 14:33:09 2015 -0800 + + Merge pull request #18402 from Microsoft/jjh/timeout + + Windows CI Fix: Timeout change + +commit 414aeb4c42781749223718c82c2f08a62eba81bd +Merge: 9b4f7ca599 064e37560e +Author: David Lawrence +Date: Thu Dec 3 14:22:09 2015 -0800 + + Merge pull request #329 from endophage/generalize_server_keys + + Generalize server keys + +commit 168b490062aed36bf95426d9d66dcf5703842016 +Merge: 29c69ce2a9 5bb4d0d9ea +Author: Michael Crosby +Date: Thu Dec 3 14:10:16 2015 -0800 + + Merge pull request #18347 from tiborvass/container_package + + Move Container to its own package (carry of 17969) + +commit 61d6240069cda31559523b98cecb6b340a9d45fd +Author: Tonis Tiigi +Date: Thu Dec 3 13:55:18 2015 -0800 + + Add test for inspect with a sha256 prefix + + Signed-off-by: Tonis Tiigi + +commit 132122a4540992667f378a5fb22ac5c0b8711618 +Author: Jessica Frazelle +Date: Thu Dec 3 12:04:52 2015 -0800 + + update maintainers file for parsing + + update standard for dockerfiles so we can clean up dockers and parse + into one repo + + Signed-off-by: Jessica Frazelle + +commit 064e37560e264abd5e0b2cb12e6dfc9eb152eb63 +Author: David Lawrence +Date: Thu Dec 3 12:01:00 2015 -0800 + + adding tests for role based key support on server + Signed-off-by: David Lawrence (github: endophage) + +commit 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2 +Author: Tonis Tiigi +Date: Thu Dec 3 13:36:31 2015 -0800 + + vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61 + + Signed-off-by: Tonis Tiigi + +commit 29c69ce2a9158899257aa3e015b4db098f662bdd +Merge: 4d849619d4 b9d30280f6 +Author: David Calavera +Date: Thu Dec 3 13:31:47 2015 -0800 + + Merge pull request #18374 from calavera/volume_inspect_exit + + Return error code when `volume inspect` fails with a template. + +commit 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4 +Merge: 94d5459a0c 295c27388d +Author: Phil Estes +Date: Thu Dec 3 16:16:04 2015 -0500 + + Merge pull request #17481 from vdemeester/17446-network-inspect-format + + Add format flag to network inspect + +commit eff5e6498fa424587c339b5ae54e28f003775e4b +Author: Tonis Tiigi +Date: Thu Dec 3 13:15:31 2015 -0800 + + Disable timeout for systemd + + With content addressability update starting upgraded + daemon for the first time can take a long time if + graph dir was not prepared with a migration tool before. + This avoids systemd timeouts while the migration is + taking place. + + Signed-off-by: Tonis Tiigi + +commit 2097e7fceec5c58352f78e8667000c8b5cb85231 +Author: John Howard +Date: Thu Dec 3 11:09:14 2015 -0800 + + Windows CI Fix: Timeout change + + Signed-off-by: John Howard + +commit 94d5459a0ca3b40d0ae34747a862d06bf20fd221 +Merge: 2f9b541b89 c10311bc9a +Author: Jess Frazelle +Date: Thu Dec 3 12:41:19 2015 -0800 + + Merge pull request #18397 from Microsoft/jjh/fix-windows-ci + + Fix broken Windows CI + +commit 568bf038af6d65b376165d02886b1c7fcaef1f61 +Merge: 4cf93714f3 6357b02236 +Author: Stephen Day +Date: Thu Dec 3 12:29:12 2015 -0800 + + Merge pull request #1233 from kendru/patch-1 + + Escape dollar signs + +commit 4cf93714f3c2bd1308752c16264cbc0b0abf4d1c +Merge: d46b6a8796 f015982f0f +Author: Stephen Day +Date: Thu Dec 3 12:17:16 2015 -0800 + + Merge pull request #1231 from tonistiigi/digest-length-check + + Validate digest length on parsing + +commit b97110dda7770f99d9d0fc3df304b1c88ce50189 +Author: Jessica Frazelle +Date: Thu Dec 3 12:14:37 2015 -0800 + + cleanup people in maintainers file + + Signed-off-by: Jessica Frazelle + +commit d46b6a8796d66767978ae4e6153f6d898f758a0d +Merge: eef3382222 300ce35c12 +Author: Stephen Day +Date: Thu Dec 3 11:59:21 2015 -0800 + + Merge pull request #1211 from tt/remove-name-verification + + Remove name verification + +commit c0a84c250863a06d39214cad3b0032f425bcd185 +Author: David Lawrence +Date: Thu Dec 3 11:48:18 2015 -0800 + + update notarymysql/migrate.go to add role to timestamp_keys and update indexes + Signed-off-by: David Lawrence (github: endophage) + +commit 8dce8e9901501863a80caf47d71713d4d36925a3 +Author: Daniel Hiltgen +Date: Tue Nov 3 21:03:12 2015 -0800 + + Add token pass-thru for AuthConfig + + This change allows API clients to retrieve an authentication token from + a registry, and then pass that token directly to the API. + + Example usage: + + REPO_USER=dhiltgen + read -s PASSWORD + REPO=privateorg/repo + AUTH_URL=https://auth.docker.io/token + TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" | + jq -r ".token") + + HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 ) + curl -s -D - -H "X-Registry-Auth: ${HEADER}" -X POST "http://localhost:2376/images/create?fromImage=${REPO}" + + Signed-off-by: Daniel Hiltgen + +commit 2dc2fe6738d99f82d6e539d6aab144fd28965efd +Author: David Lawrence +Date: Wed Dec 2 20:49:18 2015 -0800 + + set initial role value for existing records in timestamp_keys table + Signed-off-by: David Lawrence (github: endophage) + +commit e20773f2b1a64250ae9dabee078b476fddc3fd75 +Author: David Lawrence +Date: Wed Dec 2 17:19:57 2015 -0800 + + renaming TimestampKey and ErrTimestampKeyExists to just Key and ErrKeyExists + Signed-off-by: David Lawrence (github: endophage) + +commit 76caa3d76aa3c77150a6a586f531b8b9168587fc +Author: David Lawrence +Date: Wed Dec 2 17:08:14 2015 -0800 + + adding migrations for new timestamp_keys role column including key changes + Signed-off-by: David Lawrence (github: endophage) + +commit c2c474b9c6fa8340e8982e1c44c44f478ed8a9bf +Author: David Lawrence +Date: Wed Dec 2 17:01:32 2015 -0800 + + generalize notary server key storage to be able to handle any role, not just timestamps + Signed-off-by: David Lawrence (github: endophage) + +commit 7240ff35eeac36d7fb53892af495bb172e0e00c2 +Author: Daniel Nephin +Date: Wed Dec 2 17:06:17 2015 -0800 + + Bump 1.5.2 + + Signed-off-by: Daniel Nephin + +commit 5bb4d0d9ea6a6c85a3f9a4a147fd7db0101eb725 +Author: Tibor Vass +Date: Thu Dec 3 20:10:27 2015 +0100 + + Move DisconnectFromNetwork back to daemon/ + + Signed-off-by: Tibor Vass + +commit 2f9b541b8991a371dfa800fbef0ccaea61601f59 +Merge: d9755df2b3 a2120e5ba3 +Author: Sebastiaan van Stijn +Date: Thu Dec 3 20:06:18 2015 +0100 + + Merge pull request #18394 from thaJeztah/carry-17869-add-volume-driver + + [Carry 17869] Add docs and man page entry for --volume-driver + +commit 9b4f7ca599d05db26afeca1af3dc6d9300e047d1 +Merge: 60fe3c48f6 77d72ba81c +Author: David Lawrence +Date: Thu Dec 3 11:05:27 2015 -0800 + + Merge pull request #323 from endophage/mysql_parsetime + + when using a mysql database, need to set parseTime=True in connection… + +commit aaf66e34856361cfbf63638fa5bad93d6d75643a +Author: Daniel Nephin +Date: Wed Oct 21 20:13:43 2015 -0400 + + FAQ document for Compose + + Signed-off-by: Daniel Nephin + +commit 96f4a42a3572ec05bb37116cd53664fb6df629f9 +Author: Aanand Prasad +Date: Thu Nov 26 19:17:58 2015 +0000 + + Validate the 'expose' option + + Signed-off-by: Aanand Prasad + +commit e6fbca42a13c6eda9af333f8775b8369ed0ec585 +Author: Aanand Prasad +Date: Thu Nov 26 19:17:13 2015 +0000 + + Split out ports validation tests into type, uniqueness, format + + Signed-off-by: Aanand Prasad + +commit 527bf3b0234e28d8de73d385c298ae1e0ecd15e2 +Author: Aanand Prasad +Date: Thu Nov 26 18:54:30 2015 +0000 + + Fix ports validation message + + - The `raises` kwarg to the `cls_check` decorator was being used + incorrectly (it should be an exception class, not an object). + + - We need to check for `error.cause` and get the message out of the + exception object. + + NB: The particular case where validation fails in the case of `ports` is + only when ranges don't match in length - no further validation is + currently performed client-side. + + Signed-off-by: Aanand Prasad + +commit ab36c9c6cd5df22f3647b1c619b1ae4c6b604208 +Author: Aanand Prasad +Date: Thu Nov 26 18:52:14 2015 +0000 + + Refactor ports section of fields schema + + Signed-off-by: Aanand Prasad + +commit e67419065ac55e8e9aae9bce73021e7da571733c +Author: Aanand Prasad +Date: Thu Nov 26 15:06:30 2015 +0000 + + Fix ports validation test + + We were essentially only testing that *at least one* of the invalid + values fails the validation check, rather than that *all* of them fail. + + Signed-off-by: Aanand Prasad + +commit 69e956ce8b7d278dccf705d74280836f20fbf68a +Author: Daniel Nephin +Date: Thu Nov 19 15:46:14 2015 -0500 + + Add integration test and docs for build with a git url. + + Signed-off-by: Daniel Nephin + +commit 0dbd99bad2c6b3d99beda32e705777a912231053 +Author: Jonas Eckerström +Date: Wed Apr 29 10:22:24 2015 +0200 + + Added support for url buid paths + + Signed-off-by: Jonas Eckerström + +commit fa975d7fbefd9578b02287ad5a2763efa3a446c7 +Author: Daniel Nephin +Date: Mon Nov 23 13:24:57 2015 -0500 + + Properly resolve environment from all sources. + + Split env resolving into two phases. The first phase is to expand the paths + of env_files, which is done before merging extends. Once all files are merged + together, the final phase is to read the env_files and use them as the base + for environment variables. + + Signed-off-by: Daniel Nephin + +commit 77d72ba81c7777c3468ed0d9d69a0bd1950b9eaa +Author: David Lawrence +Date: Wed Dec 2 13:38:21 2015 -0800 + + when using a mysql database, need to set parseTime=True in connection string query params + Signed-off-by: David Lawrence (github: endophage) + +commit 867f432985d6b4a46c2f66225d70a4ffdb28d8a3 +Author: David Calavera +Date: Thu Dec 3 13:11:19 2015 -0500 + + Move docker system information to a dedicated router and backend. + + Because I like the name `system` better than `local` :) + + Signed-off-by: David Calavera + +commit 9df95842a9a57140eb1440a5c562e3c78876f722 +Author: Dong Chen +Date: Thu Dec 3 10:28:48 2015 -0800 + + Godep update github.com/samalba/dockerclient. + + Signed-off-by: Dong Chen + +commit b9d30280f6eb2f817b1315c22953a133f1b66e69 +Author: David Calavera +Date: Wed Dec 2 15:24:30 2015 -0500 + + Return error code when `volume inspect` fails with a template. + + Following `docker inspect` conventions: + + - Keep partial info in a buffer to not print incomplete template outputs. + - Break execution when template parsing or decoding fail. + + Signed-off-by: David Calavera + +commit bd12140d6b13ec8f3dd6b4ca005b495115169fc6 +Author: Thomas Recloux +Date: Thu Dec 3 19:02:24 2015 +0100 + + Google : update default image to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit 697b5437890f32d168dc18caac5ba9799b385a1f +Author: Thomas Recloux +Date: Thu Dec 3 14:24:29 2015 +0100 + + Rackspace : update default image to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit ca7ea324c4914dda7e87a83aa1658fa548ae27aa +Author: Thomas Recloux +Date: Wed Dec 2 22:32:41 2015 +0100 + + Exoscale : update default image to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit 73ddbe02ac994d5fec8c06233dc89a792d04ab94 +Author: Thomas Recloux +Date: Thu Dec 3 11:19:43 2015 +0100 + + DigitalOcean : update default image to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit 977fa7e48f6e94cab8edf0f38c04ee27492bb4c8 +Author: Thomas Recloux +Date: Wed Dec 2 23:07:39 2015 +0100 + + Azure : update default image to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit c10311bc9a981f1fdea88ba5f488225eaeea2b69 +Author: John Howard +Date: Thu Dec 3 10:12:11 2015 -0800 + + Fix broken Windows CI + + Signed-off-by: John Howard + +commit cf011bc1cb5ed27b77aa435e3a50a10d88284603 +Merge: da6cbc6f53 785d26288b +Author: moxiegirl +Date: Thu Dec 3 09:49:17 2015 -0800 + + Merge pull request #34 from thaJeztah/lyndaoleary-16156-find-an-issue-labels + + [carry] update "find an issue" with new labels + +commit 785d26288bd4f871c25e1c8112b327f515a7d483 +Author: Sebastiaan van Stijn +Date: Thu Dec 3 18:18:34 2015 +0100 + + Updated find an issue with new labels + + Signed-off-by: Lynda O'Leary + Signed-off-by: Sebastiaan van Stijn + +commit eef33822222011efb9adb74ed6ce89475863149e +Merge: b66bb1287c b084c77c70 +Author: Richard Scothern +Date: Thu Dec 3 09:14:23 2015 -0800 + + Merge pull request #1232 from pdevine/catalog-clarification + + Clarify pagination for catalog API endpoint + +commit b8b5bd8a457dc4dd82a9a6c6af3a9169264ed139 +Merge: 3f0625fbac 3612c55677 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 17:55:58 2015 +0100 + + Merge pull request #2442 from dgageot/version + + Add version to machine ls + +commit 4b55765c11b3ae3bc02385ad17fe2a3c419e71bc +Author: Alexander Morozov +Date: Thu Dec 3 08:42:39 2015 -0800 + + Use /docker as cgroup parent instead of docker + + It means that containers will be created under root cgroup and not under + daemon cgroup. + + Signed-off-by: Alexander Morozov + +commit d9755df2b3b224a7c9895279fde17e9d4f826c10 +Merge: 33ab2bb52c 3662f58083 +Author: Phil Estes +Date: Thu Dec 3 11:42:31 2015 -0500 + + Merge pull request #18391 from runcom/remove-daemon-config-func + + daemon: remove private func config() + +commit 6bb0d1816acd8d4f7a542a6aac047da2b874f476 +Author: David Calavera +Date: Thu Nov 12 11:55:17 2015 -0800 + + Move Container to its own package. + + So other packages don't need to import the daemon package when they + want to use this struct. + + Signed-off-by: David Calavera + Signed-off-by: Tibor Vass + +commit 33ab2bb52c130380e038013d68fdd8ad3c663360 +Merge: 1475f567cb 434d2e8745 +Author: Tibor Vass +Date: Thu Dec 3 17:11:40 2015 +0100 + + Merge pull request #18266 from calavera/events_pub_sub + + Event PubSub topics + linear filtering. + +commit 3612c556770b19e330356f8e285becfd392328b5 +Author: David Gageot +Date: Fri Nov 27 18:32:13 2015 +0100 + + Add version to machine ls + + Signed-off-by: David Gageot + +commit 74900edbf867e6ffe4e824a8c6383eb34a658341 +Author: Karol Duleba +Date: Tue Dec 1 22:01:51 2015 +0000 + + Remove CLI specific information for API error messages. Issue #17147 + + Signed-off-by: Karol Duleba + +commit a2120e5ba3337f70a63fd64ea773e50ce5af31ca +Author: Sebastiaan van Stijn +Date: Thu Dec 3 16:07:54 2015 +0100 + + Address review comments. + + Signed-off-by: Sebastiaan van Stijn + +commit fe3ec3f77fd71d8544bc640b3d91f563f7d68013 +Author: Ben Firshman +Date: Tue Nov 10 15:25:53 2015 +0000 + + Add docs and man page entry for --volume-driver + + Signed-off-by: Ben Firshman + +commit 3f0625fbace32e39ee17055390b64686c30bb283 +Merge: 029b39ee62 2dcfcf2b06 +Author: Jean-Laurent de Morlhon +Date: Thu Dec 3 15:33:25 2015 +0100 + + Merge pull request #2487 from frapposelli/vsphere-path-fix + + Fix for vSphere driver boot2docker ISO issues + +commit a9473772972aefca9b88754c8e4dc98fdee71e92 +Author: Wen Cheng Ma +Date: Thu Dec 3 16:25:02 2015 +0800 + + Update the "Manually network" section with detailed info in container-basics + + Signed-off-by: Wen Cheng Ma + +commit 451f7517733087a8629fe20894b6c10a63bb155e +Author: Liu Hua +Date: Tue Dec 1 17:19:34 2015 +0800 + + fix Put without Get in aufs + + this Patch is ported from 3916561619d45a3d8ca17dfa467149824111023a + + Signed-off-by: Liu Hua + +commit f7bdb973578a08a5012c741e4ebb262d2dd81165 +Author: Liu Hua +Date: Thu Dec 3 22:22:25 2015 +0800 + + Fix Put without Get in devicemapper + + Signed-off-by: Liu Hua + +commit 04083783329621a8414f54d8c50de5e638278941 +Author: Thomas Recloux +Date: Thu Dec 3 09:42:35 2015 +0100 + + AWS : update default images to ubuntu 15.10 + + Signed-off-by: Thomas Recloux + +commit 2dcfcf2b066c646f4854ba5231441b4f40f0a4a4 +Author: Fabio Rapposelli +Date: Thu Dec 3 07:24:26 2015 -0500 + + Fix for vSphere driver boot2docker ISO issues + + Fixes #2279 #2060 + + Signed-off-by: Fabio Rapposelli + +commit 925ac57d6ccd0fc41c6aa99e2c5051000c375945 +Author: Sven Dowideit +Date: Thu Dec 3 21:38:12 2015 +1000 + + Small fixes found by linkchecker + + Signed-off-by: Sven Dowideit + +commit 7d0d94814b2afa5025043eba65c6e6510338bf94 +Author: Sven Dowideit +Date: Thu Dec 3 21:11:10 2015 +1000 + + Small doc fixes found by the linkchecker + + Signed-off-by: Sven Dowideit + +commit ce524e17406d1c7427652c58fddc93b36ed1c321 +Author: dongmx +Date: Thu Dec 3 13:54:22 2015 +0800 + + Swarm container net should be host. If use bridge, sometime container ip addresses conflict. + + Signed-off-by: dongmx + +commit f1155ca431373b79a6c83e4597ae205c146f3cba +Author: Andrea Luzzardi +Date: Thu Dec 3 03:01:05 2015 -0800 + + Enable profiling over HTTP in debug mode + + Signed-off-by: Andrea Luzzardi + +commit e799388e8598b740a5559c0c77850c70b049f241 +Author: dongmx +Date: Thu Dec 3 18:40:09 2015 +0800 + + issue #2485, If a permanent IP address and hostname has alread in /etc/hosts + + Signed-off-by: dongmx + +commit 3662f58083fbef56caf0eb4b2bab7d2a2a2672d5 +Author: Antonio Murdaca +Date: Thu Dec 3 11:46:53 2015 +0100 + + daemon: remove private func config() + + Signed-off-by: Antonio Murdaca + +commit e26c4850136967cf0391213fc255dda610e74f87 +Author: David Gageot +Date: Fri Nov 27 18:30:44 2015 +0100 + + Vendor samalba.dockerclient + + Signed-off-by: David Gageot + +commit 029b39ee62bcaf64bc8f988ef6657e3d62eb0008 +Merge: fc0c883957 59d7c3ca61 +Author: David Gageot +Date: Thu Dec 3 10:53:06 2015 +0100 + + Merge pull request #2141 from janeczku/digitalocean-userdata + + Digitalocean driver: Support for creating Droplets with Cloud-init User Data + +commit fc0c8839577ea78e78b529f66df6f475a2292bf7 +Merge: 98a1c8c159 2d71dc77dc +Author: David Gageot +Date: Thu Dec 3 10:46:31 2015 +0100 + + Merge pull request #2482 from askb/fix_test + + Now the returned `err` is being checked to ensure its `Nil` + +commit ed0b11e506bf31804c2a0977c9c56721f74565e4 +Merge: 913073ff5f 19c0c0e6f9 +Author: Alexandre Beslic +Date: Thu Dec 3 01:02:06 2015 -0800 + + Merge pull request #1490 from jimmyxian/fix-retry-time + + Fix retry time when check disconnect events + +commit 19c0c0e6f919755b3c4e0d545d6403826ca6b5b2 +Author: Xian Chaobo +Date: Thu Dec 3 16:53:24 2015 +0800 + + integration: fix retry time when check disconnect events + + Signed-off-by: Xian Chaobo + +commit 913073ff5fad787aa19c68d3e63f97de97b97471 +Merge: 7ba5bc7ab0 44d96a6185 +Author: Xian Chaobo +Date: Thu Dec 3 16:48:24 2015 +0800 + + Merge pull request #1489 from abronan/fix_ci_kernel_memory + + Integration: fix --kernel-memory value set too low + +commit 44d96a6185e6693d5ae070da6e447776b8b10e2d +Author: Alexandre Beslic +Date: Thu Dec 3 00:28:00 2015 -0800 + + integration: fix --kernel-memory value set too low + + Signed-off-by: Alexandre Beslic + +commit 6357b02236734bcf4de46c9e93f98d6cc45ea25c +Author: Andrew Meredith +Date: Wed Dec 2 23:41:05 2015 -0700 + + Escape dollar signs + + If this example was copied and pasted, the shell would try to interpolate `$upstream_http_docker_distribution_api_version` and `$docker_distribution_api_version`. + + Signed-off-by: Andrew Meredith + +commit a17f18202608eaf85304822612da420f0a23382a +Author: Victor Vieux +Date: Wed Dec 2 22:16:00 2015 -0800 + + add mesos + + Signed-off-by: Victor Vieux + +commit 2ac860e3353ba266b5266c420c5549cf08986895 +Author: Alexandre Beslic +Date: Wed Dec 2 18:32:36 2015 -0800 + + integration: wait for agents to be registered on the Manager before running tests + + Signed-off-by: Alexandre Beslic + +commit e760c42ae00b9e1cccf2aeff4a17a3f5a0bd8cbe +Author: jake-low +Date: Wed Dec 2 21:45:36 2015 -0800 + + Stop warning about ".yaml" extension + + ".yaml" is the preferred extension according to http://www.yaml.org/faq.html + + Signed-off-by: jake-low + +commit f73ec8054839ed2840ce8a695a14aafe15f844a6 +Author: Victor Vieux +Date: Wed Dec 2 20:45:15 2015 -0800 + + default back to aufs + + Signed-off-by: Victor Vieux + +commit 1475f567cbf002aad3db6ed829d9285a70febdb0 +Merge: 580534ba2e 919104e6bb +Author: Alexander Morozov +Date: Wed Dec 2 20:25:07 2015 -0800 + + Merge pull request #18375 from vbatts/tar-split_update + + vendor: update tar-split to v0.9.11 + +commit 2d71dc77dc8115d69ed7c892288d3681c4df7d92 +Author: Anil Belur +Date: Thu Dec 3 09:11:46 2015 +0530 + + This is a follow up for PR #2473 + + Now the returned `err` is being checked to ensure its `Nil` + + Signed-off-by: Anil Belur + +commit 10986a6038aaaeacaa34e95ff59ba144cb58ba30 +Author: Dong Chen +Date: Mon Nov 23 15:03:30 2015 -0800 + + Use ioutil.NopCloser to make copy of http.request.Body. + + Signed-off-by: Dong Chen + +commit 22ff794c2ec1966234c5649987017fbd4f411e3e +Author: Dong Chen +Date: Fri Nov 20 12:27:52 2015 -0800 + + Route network connect/disconnect request to the right engine. + + Signed-off-by: Dong Chen + +commit b66bb1287c49c3ca6649447a968a7df7aa62cc68 +Merge: 2b63f65543 8aa3ee6923 +Author: Stephen Day +Date: Wed Dec 2 18:37:44 2015 -0800 + + Merge pull request #1227 from stevvooe/walk-sorted + + storage: enforce sorted traversal during Walk + +commit b084c77c70800143f49613cd8df2caf5d9e5c990 +Author: Patrick Devine +Date: Wed Dec 2 17:26:52 2015 -0800 + + Clarify pagination for catalog API endpoint + + This change clarifies the way the catalog endpoint returns results + when pagination was not explicitly requested. + + Signed-off-by: Patrick Devine + +commit 81f0e72bd2fa33327c7fe1ceb9303d0614ffd3bd +Author: Daniel Nephin +Date: Tue Nov 17 13:35:28 2015 -0500 + + Move service sorting to config package. + + Signed-off-by: Daniel Nephin + +commit da27f8e7e244883eaf9dec24c00c7179b63a94f3 +Author: Daniel Nephin +Date: Fri Nov 13 19:49:14 2015 -0500 + + Remove unnecessary intermediate variables in get_container_host_config. + + Signed-off-by: Daniel Nephin + +commit 8572d5090366811834e9247fac17ade4a3d8a813 +Author: Daniel Nephin +Date: Fri Nov 13 19:40:10 2015 -0500 + + Move volume parsing to config.types module + + This removes the last of the old service.ConfigError + + Signed-off-by: Daniel Nephin + +commit 5d39813e1bbf3b25f60c1e230d2493d5b3b5be37 +Author: Daniel Nephin +Date: Fri Nov 13 18:58:24 2015 -0500 + + Fixes #2008 - re-use list_or_dict schema for all the types + + At the same time, moves extra_hosts validation to the config module. + + Signed-off-by: Daniel Nephin + +commit b19315b57ea4bd3b4594ca4b5c8abf9d18a3d8a0 +Author: Daniel Nephin +Date: Fri Nov 13 18:29:25 2015 -0500 + + Move restart spec to the config.types module. + + Signed-off-by: Daniel Nephin + +commit e549875e896ac49f203463f5a2997b2b0297e00e +Author: Daniel Nephin +Date: Fri Nov 13 18:20:09 2015 -0500 + + Move parsing of volumes_from to the last step of config parsing. + + Includes creating a new compose.config.types module for all the domain objects. + + Signed-off-by: Daniel Nephin + +commit 7e21b05f057911c11c447a463e5ab3e392a16640 +Author: Daniel Nephin +Date: Fri Nov 13 17:39:02 2015 -0500 + + Remove project name validation + + project name is already normalized to a valid name before creating a service. + + Signed-off-by: Daniel Nephin + +commit bea2072b95a2fe679c2d33a2d6c6672dacc4a52f +Author: Daniel Nephin +Date: Thu Nov 12 17:29:58 2015 -0500 + + Add the git sha to version output + + Signed-off-by: Daniel Nephin + +commit 3b6cc7a7bbf6ce79fff98ca43b10778913a059dd +Author: Daniel Nephin +Date: Tue Nov 24 10:40:36 2015 -0500 + + Add missing assert and autospec. + + Signed-off-by: Daniel Nephin + +commit a264470cc05bd76fee567294e8801dfe7dadcdcf +Author: Daniel Nephin +Date: Fri Nov 20 17:51:36 2015 -0500 + + Make sure we always have the latest busybox image, so that build --pull tests don't flake. + + Signed-off-by: Daniel Nephin + +commit 844e2c3d268e2af8cdce556b1b53f8658c6e4881 +Author: Daniel Nephin +Date: Thu Nov 19 14:52:50 2015 -0500 + + Fix use case link in readme. + + Signed-off-by: Daniel Nephin + +commit 210a14cf28fa5e537cf81ffd23d5a29f86a1e298 +Author: Daniel Nephin +Date: Thu Nov 19 12:55:03 2015 -0500 + + Add note about required pip version. + + Signed-off-by: Daniel Nephin + +commit 9ce402495160c126ea0ec43c24b2c2f03ca56f2f +Author: Brandon Burton +Date: Fri Nov 20 16:02:37 2015 -0800 + + Fixing matrix include so `os: linux` goes to trusty + + Signed-off-by: Brandon Burton + +commit 8fb6fb7b19467e20189c710ebd7b65ec071d7adc +Author: Daniel Nephin +Date: Wed Nov 18 14:51:01 2015 -0500 + + Fix env_file and environment when used with extends. + + Signed-off-by: Daniel Nephin + +commit 83760d0e9ee04ace2fa4da2efa13a3a933b62cd2 +Author: Daniel Nephin +Date: Tue Nov 10 19:43:05 2015 -0500 + + Handle both SIGINT and SIGTERM for docker-compose run. + + Signed-off-by: Daniel Nephin + +commit be5b7b6f0e3b8dd330b93523b7a98e47e8d9a833 +Author: Daniel Nephin +Date: Tue Nov 10 18:52:21 2015 -0500 + + Handle both SIGINT and SIGTERM for docker-compose up. + + Signed-off-by: Daniel Nephin + +commit e5a02d30524ac83fa0bc27e2697e1d2f69330658 +Author: Daniel Nephin +Date: Fri Nov 13 10:49:17 2015 -0500 + + Fix extra warnings on masked volumes. + + Signed-off-by: Daniel Nephin + +commit 3a395892fc18bd097f767d6a420dc887f9e76e8b +Author: Stéphane Seguin +Date: Sat Nov 14 12:19:57 2015 +0100 + + Fix restart with stopped containers. Fixes #1814 + + Signed-off-by: Stéphane Seguin + +commit 09f6a876cfc2c7cdbaba9383e0828d4435537bea +Author: Daniel Nephin +Date: Mon Nov 16 12:35:26 2015 -0500 + + Fixes #2398 - the build progress stream can contain empty json objects. + + Previously these empty objects would hit a bug in splitting objects causing it crash. + With this fix the empty objects are returned properly. + + Signed-off-by: Daniel Nephin + +commit 0117148a360ccc1bc783e16435314bd6c69eaf11 +Author: Stefan Scherer +Date: Fri Nov 13 08:33:51 2015 +0100 + + Use uname to build target name for different platforms + + Signed-off-by: Stefan Scherer + +commit 8f70c8cdeb28f82d9ccf4f060ccd9b44d002c502 +Author: Simon van der Veldt +Date: Wed Nov 18 21:38:58 2015 +0100 + + run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH env vars to compose container + + Signed-off-by: Simon van der Veldt + +commit 16a74f3797a9afb06a6f522f452e0426d873221f +Author: Daniel Nephin +Date: Mon Nov 16 12:55:35 2015 -0500 + + Fix texttable dep. 0.8.2 was removed from pypi. + + Signed-off-by: Daniel Nephin + +commit c42918ec7c736b16394deeb30a7724ed5d403a52 +Author: Viranch Mehta +Date: Sun Oct 18 00:40:51 2015 +0530 + + Fix specifies_host_port() to handle port binding with host IP but no host port + + Signed-off-by: Viranch Mehta + +commit d28b2027b8f584c3492bdc6554b73e926a583356 +Author: Mazz Mosley +Date: Wed Oct 28 16:48:35 2015 +0000 + + Clarify `dockerfile` requires `build` key + + Credit to @funkyfuture for the first PR addressing the clarification. + https://github.com/docker/compose/pull/1767 + + Signed-off-by: Mazz Mosley + +commit 8d816fc2f39ae0c2e95c758c78e1108e72c09446 +Author: Mazz Mosley +Date: Wed Oct 28 16:27:14 2015 +0000 + + Add cross references for env/cli + + Signed-off-by: Mazz Mosley + +commit f4764360272390c8eb3ce0420b447478420a3590 +Merge: 4628e93fb2 fae20305ec +Author: Daniel Nephin +Date: Wed Dec 2 16:56:55 2015 -0800 + + Merge remote-tracking branch 'docker/release' into bump-1.5.2 + +commit 60fe3c48f63b14f2a3a925e42bc2e5f76e562f6a +Merge: 7c5563b7b2 44fe5bcaa4 +Author: David Lawrence +Date: Wed Dec 2 16:22:11 2015 -0800 + + Merge pull request #319 from endophage/migrations + + initial database migration state + +commit 44fe5bcaa4803cab238388779f20c03ff84f233a +Author: David Lawrence +Date: Tue Dec 1 16:13:28 2015 -0800 + + initial database migration state + Signed-off-by: David Lawrence (github: endophage) + +commit 2b63f65543695bb63bff16a2aceb39c312936451 +Merge: 329c353411 6beeb935cd +Author: Stephen Day +Date: Wed Dec 2 16:09:29 2015 -0800 + + Merge pull request #1226 from aaronlehmann/avoid-stat-roundtrips + + Avoid stat round-trips when fetching a blob + +commit 7c5563b7b2abe2f85e52f347128b15bd619870ae +Merge: 5593112f85 a1ec8c69e0 +Author: David Lawrence +Date: Wed Dec 2 16:04:52 2015 -0800 + + Merge pull request #327 from endophage/unify_tuf_http_get + + unify the timestamp handler with the handler for getting other tuf metadata + +commit f015982f0f4ad7158d70974fdbba8eeed228b876 +Author: Tonis Tiigi +Date: Wed Dec 2 15:57:47 2015 -0800 + + Validate digest length on parsing + + Signed-off-by: Tonis Tiigi + +commit a1ec8c69e02dd00487637e8d2d51481397ca1c45 +Author: David Lawrence +Date: Wed Dec 2 15:02:13 2015 -0800 + + unify the timestamp handler with the handler for getting other tuf metadata + Signed-off-by: David Lawrence (github: endophage) + +commit 5593112f85bf30079384cb06184e03c395fd8301 +Merge: cb2b2951e0 9c8e084e0d +Author: Ying Li +Date: Wed Dec 2 15:45:51 2015 -0800 + + Merge pull request #318 from docker/post-to-codecov + + Re-enable pushing coverage reports to codecov.io + +commit 98a1c8c159025e4f0a780034c9d72eed628bd53c +Merge: e35b169139 22cacbf152 +Author: Nathan LeClaire +Date: Wed Dec 2 15:42:12 2015 -0800 + + Merge pull request #2473 from askb/2451_key_filter_case + + Fixes #2451 - ensures ls filters `` and `` works case-insensitive + +commit 9c8e084e0df65a725e788cf68ebc4f600cc94328 +Author: Ying Li +Date: Wed Dec 2 10:02:24 2015 -0800 + + Run coverage merge and reporting on all parallel containers. + + Signed-off-by: Ying Li + +commit 555a46d8f8f677f21dc5583622213d0dc9385733 +Author: Ying Li +Date: Mon Nov 30 15:32:22 2015 -0800 + + Re-enable pushing coverage reports to codecov.io + + Signed-off-by: Ying Li + +commit cb2b2951e0260077a4e3acac4ac37635786d8af8 +Merge: d131a7a7fd 3b02384a0a +Author: Ying Li +Date: Wed Dec 2 15:27:46 2015 -0800 + + Merge pull request #325 from mbentley/db-exist-check + + Added check to skip db import if exists + +commit 580534ba2e71782d65237170d4ad6356760042c7 +Merge: ee3e07d359 519236b478 +Author: David Calavera +Date: Wed Dec 2 14:58:29 2015 -0800 + + Merge pull request #18231 from mqliang/resp + + rename req to resp + +commit e22999c9029a24c5729535829499771c2567daad +Author: Jeffrey Morgan +Date: Wed Dec 2 14:52:00 2015 -0800 + + CI: fix concurrent builds + + Signed-off-by: Jeffrey Morgan + +commit 6beeb935cdf3df53dab06f27b0e7b1194e63ffaf +Author: Aaron Lehmann +Date: Mon Nov 30 18:35:19 2015 -0800 + + Avoid stat round-trips when fetching a blob + + Without this commit, three round-trips are required to fetch a blob with + a progress bar. The first is a call to Stat (HEAD request), to determine + the size. Then Open is called, which also calls Stat, and finally + performs a GET request. + + Only the GET request is actually needed. The size of the blob can be + sniffed from Content-Length in the GET response. + + This commit changes HTTPReadSeeker to automatically detect the size from + Content-Length instead of requiring it to be passed in. The Stat call is + removed from Open because it is no longer necessary. + + HTTPReadSeeker now takes an additional errorHandler callback argument which + translates an unsuccessful HTTP response into an appropriate API-level + error. Using a callback for this makes it possible to avoid leaking the + repsonse body to Read's caller, which would make lifecycle management + problematic. + + Fixes #1223 + + Signed-off-by: Aaron Lehmann + +commit 3b02384a0a8d820ee5e6a759d1b9f1bc19b53cd7 +Author: Matt Bentley +Date: Wed Dec 2 17:05:24 2015 -0500 + + Added check to skip db import if exists + + Signed-off-by: Matt Bentley + +commit 434d2e8745696255a204d9eefc6a2854ff74e5c2 +Author: David Calavera +Date: Wed Nov 25 21:03:10 2015 -0500 + + Add PubSub topics. + + A TopicFunc is an interface to let the pubisher decide whether it needs + to send a message to a subscriber or not. It returns true if the + publisher must send the message and false otherwise. + + Users of the pubsub package can create a subscriber with a topic + function by calling `pubsub.SubscribeTopic`. + + Message delivery has also been modified to use concurrent channels per + subscriber. That way, topic verification and message delivery is not + o(N+M) anymore, based on the number of subscribers and topic verification + complexity. + + Using pubsub topics, the API stops controlling the message delivery, + delegating that function to a topic generated with the filtering + provided by the user. The publisher sends every message to the + subscriber if there is no filter, but the api doesn't have to select + messages to return anymore. + + Signed-off-by: David Calavera + +commit ee3e07d3593f97466df6fc11c19f91c1aee76dd4 +Merge: 6deec021e5 08328cb703 +Author: Sebastiaan van Stijn +Date: Wed Dec 2 22:36:01 2015 +0100 + + Merge pull request #18301 from wenchma/doc_update_for_net + + Add NETWORK_NAME_or_ID value for --net= option + +commit 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b +Author: Vincent Demeester +Date: Wed Dec 2 22:32:10 2015 +0100 + + Add format flag to network inspect + + …for consistency as docker inspect and docker volume inspect supports it too + + Signed-off-by: Vincent Demeester + +commit 6deec021e5bbfd1942cfacb34c6593379e8b8c30 +Merge: 61773e5cbf 9daca1222a +Author: Sebastiaan van Stijn +Date: Wed Dec 2 22:28:28 2015 +0100 + + Merge pull request #18309 from WeiZhang555/time + + Consolidate time format for API + +commit 909821f51455a856d9d205639341fac2e3e7f756 +Author: Tonis Tiigi +Date: Fri Nov 20 11:58:13 2015 -0800 + + Update storage docs for content-addressability + + Signed-off-by: Tonis Tiigi + +commit 61773e5cbf62badf41c6c9d110fca2e7b036a6ac +Merge: d410cd4751 4354b348ad +Author: Alexander Morozov +Date: Wed Dec 2 12:54:07 2015 -0800 + + Merge pull request #18376 from jfrazelle/fix-default-shm-size + + fix default shm size in test + +commit d410cd47518b323064994f80022927a45b4e22c2 +Merge: aa2ca5d93c 920a261839 +Author: Sebastiaan van Stijn +Date: Wed Dec 2 21:52:52 2015 +0100 + + Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search + + Carry 17293 add examples in search + +commit 4354b348ad6f9a585c57d37147c2a893a2d873da +Author: Jessica Frazelle +Date: Wed Dec 2 12:43:51 2015 -0800 + + fix default shm size in test + + Signed-off-by: Jessica Frazelle + +commit 919104e6bb19b2e815236ee5cffa919c373f85e2 +Author: Vincent Batts +Date: Wed Dec 2 15:34:12 2015 -0500 + + vendor: update tar-split to v0.9.11 + + For optimizations. + https://github.com/docker/docker/issues/18370#issuecomment-161399901 + + Signed-off-by: Vincent Batts + +commit aa2ca5d93c2b30ba13ff67820a49d6f570323576 +Merge: f8364c013d bfa5027e96 +Author: David Calavera +Date: Wed Dec 2 11:59:50 2015 -0800 + + Merge pull request #18371 from sallyom/dontReturnNonError + + don't return error if can't delete non-existing container + +commit f8364c013db9fe8483f2c44a513eaea473f54ebe +Merge: 8f1f53f735 828f63f1ab +Author: David Calavera +Date: Wed Dec 2 11:57:18 2015 -0800 + + Merge pull request #18369 from LK4D4/misleading_rm + + daemon/delete.go: use less confusing naming of functions + +commit 8f1f53f735e278bb23bb41d9387a75786d7ec1dc +Merge: f4176f9169 d3af7f283d +Author: Arnaud Porterie +Date: Wed Dec 2 11:49:51 2015 -0800 + + Merge pull request #16277 from runcom/add-oom-score-adj + + Add OomScoreAdj + +commit da6cbc6f534585b4399b97ea060a22dc7ffe2172 +Merge: 634789baa2 01c7368fba +Author: Sebastiaan van Stijn +Date: Wed Dec 2 20:41:46 2015 +0100 + + Merge pull request #33 from thaJeztah/remove-dev.dockerproject.com + + remove link to dev.dockerproject.com + +commit f4176f91690a16b08c320984e17c049098d3f1f7 +Merge: f411b101ac 0f2986cee5 +Author: moxiegirl +Date: Wed Dec 2 11:39:18 2015 -0800 + + Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation + + [carry] configuring DNS options on systemd + +commit f411b101acdeefa731dc9e03dc75fbbd6ba816c6 +Merge: d4be46def4 4089b4e440 +Author: Brian Goff +Date: Wed Dec 2 14:25:08 2015 -0500 + + Merge pull request #18285 from hqhq/hq_fix_swappiness + + Set default MemorySwappiness when adapt + +commit d4be46def4660f2dea090646f8d768f38c6fd520 +Merge: 10b30cf09c b3e527dfd2 +Author: David Calavera +Date: Wed Dec 2 11:16:49 2015 -0800 + + Merge pull request #13587 from rhatdan/volume-tmpfs + + Add tmpfs as a valid volume source command. + +commit 707281aadb5b5cc08bdb04c19aec9ee843eb69a8 +Merge: 0eba234c54 3f39ffe72e +Author: Daniel Nephin +Date: Wed Dec 2 11:12:37 2015 -0800 + + Merge pull request #2291 from dnephin/compose_faq + + FAQ document for Compose + +commit 828f63f1abbad4246bd5198f02c9c34ce0d44b2b +Author: Alexander Morozov +Date: Wed Dec 2 09:18:34 2015 -0800 + + daemon/delete.go: use less confusing naming of functions + + Signed-off-by: Alexander Morozov + +commit bfa5027e96a6a5532c7cc89bd00be219082833fa +Author: Sally O'Malley +Date: Wed Dec 2 13:48:59 2015 -0500 + + don't return error if can't delete non-existing container + + Signed-off-by: Sally O'Malley + +commit 3f39ffe72e471c3ca06c8ac6330e2858ba66795e +Author: Daniel Nephin +Date: Wed Oct 21 20:13:43 2015 -0400 + + FAQ document for Compose + + Signed-off-by: Daniel Nephin + +commit 10b30cf09c42904d8072a64c1d0ebd96a91ad8f3 +Merge: e274db94dd 1edc410e41 +Author: David Calavera +Date: Wed Dec 2 10:29:00 2015 -0800 + + Merge pull request #18240 from pospispa/Improvement-of-docker-top-Man-Page + + Improvement of docker top Man Page + +commit e274db94dd16e3a8439972cbe36d0dbaccf7e57a +Merge: 289251d088 50814a2bc0 +Author: Jess Frazelle +Date: Wed Dec 2 10:03:29 2015 -0800 + + Merge pull request #18368 from brahmaroutu/gccgo_fix + + fix the Dockerfile.gccgo for new dependency + +commit 289251d088959076d0e8a0335a4b028d3453d486 +Merge: fcccf2dae4 1c383af6ae +Author: Jess Frazelle +Date: Wed Dec 2 10:02:08 2015 -0800 + + Merge pull request #17769 from tianon/vendor-windows + + Fix Windows support in .vendor-helpers.sh + +commit d131a7a7fd6ca222f0f967f9f6afc7ea82170d77 +Merge: 8292d1866d 9ad415e0b5 +Author: Ying Li +Date: Wed Dec 2 09:58:49 2015 -0800 + + Merge pull request #320 from HuKeping/tiny + + Tiny refactor + +commit 1edc410e412b9c06869e508f5781cd2cdc0a14af +Author: Pavel Pospisil +Date: Wed Dec 2 18:54:52 2015 +0100 + + Improvement of docker top Man Page + + Some users expect that the `docker top $CONT` command displays information from the inside container perspective. + They expect that the `docker top $CONT` command displays same information as the `docker exec $CONT ps -ef` command. But it does not. + + That's why the `docker top` man page shall explicitly state that the `docker top $CONT` displays information from the host's point of view. + + Signed-off-by: Pavel Pospisil + +commit 92ce49b367d466cc459aacf10e8115b95f032fcb +Author: David Gageot +Date: Sat Nov 28 11:02:01 2015 +0100 + + Put all core drivers in docker-machine binary + + Signed-off-by: David Gageot + +commit e35b1691390a2c91e03ff1c1e32a09e269b3dbd5 +Merge: d7d6ca205a f9f886f529 +Author: David Gageot +Date: Wed Dec 2 18:42:09 2015 +0100 + + Merge pull request #2441 from jeanlaurent/support-load-driver-error + + Display driver in error without crashing + +commit f9f886f529675e1fe48f8cc3145587085b6e4f00 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 17:38:26 2015 +0100 + + Display driver in error without crashing + + Signed-off-by: Jean-Laurent de Morlhon + +commit 22cacbf152a9ed95bed388edc8a8dba82fbcfc6d +Author: Anil Belur +Date: Mon Nov 30 17:42:12 2015 +0530 + + Fixes #2451 ensure filters `` and `` work when case-insensitive + Added unit tests to verify filters + + Signed-off-by: Anil Belur + +commit 50814a2bc0376bf144f5d235dd3662971adac14d +Author: Srini Brahmaroutu +Date: Wed Dec 2 16:43:41 2015 +0000 + + fix the Dockerfile.gccgo for new dependency + Signed-off-by: Srini Brahmaroutu + +commit d7d6ca205ab25eca43f4000bb15037b540bfedeb +Merge: df20cc4713 1a3c3898c1 +Author: David Gageot +Date: Wed Dec 2 17:22:32 2015 +0100 + + Merge pull request #2450 from askb/1931_full_disk + + Fixes #1931 - config.json integrity when disk is full + +commit 0f2986cee57e1854f3346ca7609740bdd51d0dcb +Author: Sebastiaan van Stijn +Date: Wed Dec 2 17:08:54 2015 +0100 + + fix minor markup issues + + Signed-off-by: Sebastiaan van Stijn + +commit 0fb1845e957353792b39475751221d1b8b66da52 +Author: Zuhayr Elahi +Date: Wed Nov 18 20:35:34 2015 -0800 + + Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater + + modified note to provide a link for installation instructions on Ubuntu 15.04 or above + + cleaned up typos for ubuntulinux.md + + Signed-off-by: Zuhayr Elahi + +commit fcccf2dae4770bdb7781d57e20ae94b9565b67ac +Merge: d9163e088e 8d4fe141c4 +Author: Jess Frazelle +Date: Wed Dec 2 08:16:09 2015 -0800 + + Merge pull request #18350 from duglin/Issue9798a + + Deprecate -f flag from docker tag + +commit d9163e088e41491cfe6d49fef17b1dff149a1b0e +Merge: e07769bc5a 3241b564a5 +Author: Jess Frazelle +Date: Wed Dec 2 08:14:53 2015 -0800 + + Merge pull request #18365 from estesp/clarify-error-messages + + Differentiate integration test error messages + +commit e07769bc5a50355d972cbc71d150dc2d339f7370 +Merge: 8a350c5c7b 4d1007d75c +Author: Jess Frazelle +Date: Wed Dec 2 08:13:52 2015 -0800 + + Merge pull request #18351 from LK4D4/fix_rm_race + + Fix race between two ContainerRm + +commit 93d1dd8036d57f5cf1e5cbbbad875ae9a6fa6180 +Author: David Calavera +Date: Wed Nov 25 20:27:11 2015 -0500 + + Make filtering a linear operation. + + Improves the current filtering implementation complixity. + Currently, the best case is O(N) and worst case O(N^2) for key-value filtering. + In the new implementation, the best case is O(1) and worst case O(N), again for key-value filtering. + + Signed-off-by: David Calavera + +commit 1a3c3898c12d4a3d315d8460bb48617e8ef59c2c +Author: Anil Belur +Date: Sun Nov 29 09:08:03 2015 +0530 + + Fixes #1931 + + Now this change ensures `config.json` is first written into a temp-file and + rename into the original file, if no errors from the FS. If ENOSPC occurs on write, + when the machine is restarted, the previous `config.json` is still available on startup. + + Extended `TestStoreSave()` to check for any residual config files in the + machine directory. + + Signed-off-by: Anil Belur + +commit df20cc47137f27e5efa7314e40b239b1453a56e9 +Merge: a8b7f74b88 225abe05fe +Author: David Gageot +Date: Wed Dec 2 16:45:50 2015 +0100 + + Merge pull request #2476 from jeanlaurent/0.5.0-compatibility + + Fix for #2474 - docker-machine 0.5.1+ is incompatible with 0.5.0 drivers + +commit 920a2618392d5235b9823b97aeb80ad858639b81 +Author: Sebastiaan van Stijn +Date: Wed Dec 2 14:40:44 2015 +0100 + + update order and address review notes + + Signed-off-by: Sebastiaan van Stijn + +commit 42d4eabeb22f98267c2294bbf7551f1fe0c13cb1 +Author: gwx296173 +Date: Fri Oct 23 18:32:23 2015 +0800 + + add examples in search.md + + Signed-off-by: gwx296173 + +commit 800505729b280a19fb0c2779b1081b6c4e20d43c +Author: Nalin Dahyabhai +Date: Tue Nov 24 15:19:16 2015 -0500 + + Use -z,muldefs on arm,x86 + + Assume that the linker can make sense of us passing in the -z,muldefs + option to tell it to ignore symbol-multiply-defined errors triggered by + https://github.com/golang/go/issues/9510. We should be able to stop + doing this once we move to Go 1.6. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit 0ca6d77e6e17ea378ff04b59f971dc1338e0ddc2 +Author: Nalin Dahyabhai +Date: Tue Nov 24 11:14:17 2015 -0500 + + Revert "prevent journald from being built on ARM" + + This reverts commit 6f6f10a75f8b447637e8a89d685452871899e9c0, so that we + can apply a different workaround. + + Signed-off-by: Nalin Dahyabhai (github: nalind) + +commit 225abe05fea1d038dda1bc3f86d410b290dde0fd +Author: Jean-Laurent de Morlhon +Date: Wed Dec 2 15:34:58 2015 +0100 + + Move heartbeat code after getversion + + Signed-off-by: Jean-Laurent de Morlhon + +commit 88f6fce2041f8ad12d12e15908f775acd621e383 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 2 12:45:01 2015 +0100 + + Fix for #2474 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 3241b564a5c2799cac9836101b9e208b216a9ff5 +Author: Phil Estes +Date: Wed Dec 2 09:35:54 2015 -0500 + + Differentiate integration test error messages + + Makes it easier to debug in the future given three different docker run + executions were all outputting the same error string. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 8a350c5c7b3b5934812915702d4c50b68eeead56 +Merge: db6c4c99d8 38ec5d86a3 +Author: Sebastiaan van Stijn +Date: Wed Dec 2 16:18:15 2015 +0100 + + Merge pull request #17822 from WeiZhang555/docs-isolation + + Add docs for option `--isolation` + +commit b3e527dfd242ad30c0297c8b257862116cf2c50e +Author: Dan Walsh +Date: Tue Dec 1 13:39:34 2015 -0500 + + This patch adds --tmpfs as a option for mounting tmpfs on directories + + It will Tar up contents of child directory onto tmpfs if mounted over + + This patch will use the new PreMount and PostMount hooks to "tar" + up the contents of the base image on top of tmpfs mount points. + + Signed-off-by: Dan Walsh + +commit 08328cb703c51ed4a2dfe985f618925fe3234080 +Author: Wen Cheng Ma +Date: Mon Nov 30 16:28:54 2015 +0800 + + Add NETWORK_NAME_or_ID value for --net= option + + Signed-off-by: Wen Cheng Ma + +commit 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1 +Author: Zhang Wei +Date: Mon Nov 30 22:44:06 2015 +0800 + + Consolidate time format for API + + Consolidate all the API to same time format: RFC3339, and it will be + client's responsibility to present it in more user friendly way. + + Signed-off-by: Zhang Wei + +commit 38ec5d86a355674cfddf8c998591abb098475bab +Author: Zhang Wei +Date: Mon Nov 9 17:11:10 2015 +0800 + + Add docs for option `--isolation` + + Add docs for `run`/`create`/`build` command option `isolation` + + Signed-off-by: Zhang Wei + +commit db6c4c99d86aeabaae840ba0933d94587f9dc7b5 +Merge: e75da4b6ff 2969abc6c5 +Author: Phil Estes +Date: Wed Dec 2 09:18:21 2015 -0500 + + Merge pull request #18340 from runcom/move-defshmsize-to-daemon + + Move defaultSHMSize in daemon pkg + +commit a8b7f74b8833dbc5c71dec326d5e1cc0b9754125 +Merge: 5ccd7f57e7 b0e0a564c9 +Author: Jean-Laurent de Morlhon +Date: Wed Dec 2 15:06:23 2015 +0100 + + Merge pull request #2477 from zchee/rename_xhyve_driver + + Rename xhyve driver + +commit 01c7368fba4d1172d731264ae154890c412d5b0c +Author: Sebastiaan van Stijn +Date: Wed Dec 2 14:32:23 2015 +0100 + + remove link to dev.dockerproject.com + + it wasn't actively used, so better to remove references to it. + + Signed-off-by: Sebastiaan van Stijn + +commit 519236b47866cc77a3400b7905ffb97d79e39b0f +Author: mqliang +Date: Wed Nov 25 22:29:23 2015 +0800 + + rename req to resp + + Signed-off-by: mqliang + +commit b0e0a564c99a817e8d30fcef1709c3a5f2895de7 +Author: Koichi Shiraishi +Date: Wed Dec 2 21:38:38 2015 +0900 + + Rename xhyve driver + + Signed-off-by: Koichi Shiraishi + +commit 9ad415e0b5ad4994f9e20397eec0c2a8944069d4 +Author: HuKeping +Date: Wed Dec 2 19:21:47 2015 +0800 + + Tiny refactor + + It's no need to keep the `err` after asserting it should be `nil`, and + we can merge these two logs into one I suppose. + + Signed-off-by: Hu Keping + +commit 18a5bfba9b611af49b9f9a1bb4eb880f90ca777b +Merge: c1709f5288 b1fcc307cc +Author: Mika Andrianarijaona +Date: Fri Nov 27 09:44:06 2015 +0300 + + Fix #702 : Cmd+0 reopen Kitematic window in Mac + + Signed-off-by: Mika Andrianarijaona + +commit 5ccd7f57e77e6ca59d1587c6deaad88ef5d32f7c +Merge: 3d55545ba7 b356a2249e +Author: David Gageot +Date: Wed Dec 2 12:07:51 2015 +0100 + + Merge pull request #2475 from dgageot/remove-flag + + Remove redundant flag in integration tests + +commit b356a2249e0f4791bb5a47a933a4a7138cea8e62 +Author: David Gageot +Date: Wed Dec 2 11:51:29 2015 +0100 + + Remove redundant flag in integration tests + + Signed-off-by: David Gageot + +commit 3d55545ba7251e60542a34cbbea9f330ece0feb1 +Merge: 650bd3384d 77fba72d13 +Author: David Gageot +Date: Wed Dec 2 11:50:22 2015 +0100 + + Merge pull request #2404 from askb/2349_rm_confirm + + 2349 rm should ask for confirmation before proceeding + +commit 2969abc6c55a9ab126b90d0af4b67860b4103f3f +Author: Antonio Murdaca +Date: Tue Dec 1 17:51:18 2015 +0100 + + Move defaultSHMSize in daemon pkg + + Signed-off-by: Antonio Murdaca + +commit 7ba5bc7ab0912c58f152249d3ff928f5167dd934 +Merge: 5fe196d61f a250ded715 +Author: Victor Vieux +Date: Tue Dec 1 23:59:24 2015 -0800 + + Merge pull request #1476 from jimenez/zk_tests + + Zk tests + +commit a250ded7159cdca0737a36939bb7c103ce73b352 +Author: Isabel Jimenez +Date: Tue Dec 1 19:02:21 2015 -0500 + + Adding zk tests for swarm-mesos integration + + Signed-off-by: Isabel Jimenez + +commit c86de629a89772783f93887fe9189582ec1e7392 +Author: Isabel Jimenez +Date: Tue Dec 1 18:48:28 2015 -0500 + + godep update + + Signed-off-by: Isabel Jimenez + +commit 4d1007d75c24f4e9f1d8df18cb3faae53b183661 +Author: Alexander Morozov +Date: Tue Dec 1 09:54:26 2015 -0800 + + Fix race between two ContainerRm + + Signed-off-by: Alexander Morozov + +commit 8d4fe141c4c3f456df9c2be75ffe5071d1665717 +Author: Doug Davis +Date: Tue Dec 1 14:02:02 2015 -0800 + + Deprecate -f flag from docker tag + + Closes #9798 + + @maintainers please note that this is a change to the UX. We no longer + require the -f flag on `docker tag` to move a tag from an existing image. + However, this does make us more consistent across our commands, + see https://github.com/docker/docker/issues/9798 for the history. + + Signed-off-by: Doug Davis + +commit 77fba72d13edd1b7964c2dbeeedbe190f1831ae8 +Author: Anil Belur +Date: Tue Nov 24 21:34:33 2015 +0530 + + Fixes #2349 - rm get user confirmation before proceeding further + + * adds new flag `-y` prompting for user confirmation before removal + * Modified existing integration tests to work with the fix #2349. + * Added tests for checking user confirmation, updated the test cases use sub-shell with `|` + * Updated the reference docs for rm sub-command + + incorporated changes by @dgageot, @jeanlaurent and @nathanleclaire + + Signed-off-by: Anil Belur + +commit 4089b4e4400d44f7c0a5b15065c70228f10ebf0c +Author: Qiang Huang +Date: Wed Dec 2 10:53:52 2015 +0800 + + Set default MemorySwappiness when adapt + + It makes the inspect result consistent between cli and REST api + when MemorySwappiness is not set. + + Signed-off-by: Qiang Huang + +commit 650bd3384d02533d83b449aca2065435c80c59b3 +Merge: ee530831c3 b2c9366245 +Author: Nathan LeClaire +Date: Tue Dec 1 18:18:26 2015 -0800 + + Merge pull request #2448 from grampajoe/virtualbox-natdns + + Add the --virtualbox-host-dns-resolver flag + +commit 5fe196d61fe331a29b07d1a8d8fde5ee0ba95e8e +Merge: 4fdcd3f903 f432b63fe3 +Author: Victor Vieux +Date: Tue Dec 1 18:13:42 2015 -0800 + + Merge pull request #1445 from dnephin/doc_filter_includes_stopped + + Update filter docs + +commit b2c93662450b62ff6b1708ec197281ea2bed4b52 +Author: Joe Friedl +Date: Sat Nov 28 16:30:04 2015 -0500 + + Add the --virtualbox-host-dns-resolver flag + + Signed-off-by: Joe Friedl + +commit f432b63fe366c2ab3f509c6808d285d5585b323b +Author: Daniel Nephin +Date: Tue Nov 24 16:46:42 2015 -0500 + + Updates to swarm filters documentation + + Support reloading of docs. + + Adjust the titles in docs/scheduler.filter to be more descriptive. + + Also moves the meta sections about constraints out from the container affinity section. + + Add a note about stopped containers being used by filters to the docs. + + Signed-off-by: Daniel Nephin + +commit 4fdcd3f903bd172b54241265c8f87a55868c7a0b +Merge: f5d21c19db d295d4b323 +Author: Alexandre Beslic +Date: Tue Dec 1 17:38:59 2015 -0800 + + Merge pull request #1477 from vieux/update_compose_1.5.1 + + update compose to 1.5.1 + +commit 8aa3ee6923a9e51644c95b09e9e3f274c8d75c55 +Author: Stephen J Day +Date: Tue Dec 1 16:55:10 2015 -0800 + + storage: add further tests for Walk implementation + + Signed-off-by: Stephen J Day + +commit 1415f55cc09230e19ca3110af7174baa3f5569ba +Author: Qiang Huang +Date: Mon Nov 30 13:10:18 2015 +0800 + + Move security opt adaption to adapt function + + Signed-off-by: Qiang Huang + +commit 5d576bc0cd07de6a773964eb8de73fa3f49c6f00 +Author: Stephen J Day +Date: Tue Dec 1 16:24:31 2015 -0800 + + storage: enforce sorted traversal during Walk + + Signed-off-by: Stephen J Day + +commit 6ad10796eff92e2996beba56d42c9bc8203434d4 +Author: Stephen J Day +Date: Tue Dec 1 16:24:07 2015 -0800 + + storage: correctly handle error during Walk + + Signed-off-by: Stephen J Day + +commit e75da4b6fffbcf9dab86cd581e962a19d3efa35a +Merge: da0c9286a9 6842c906c4 +Author: Alexander Morozov +Date: Tue Dec 1 16:04:24 2015 -0800 + + Merge pull request #18352 from jfrazelle/update-go-md2man + + update go-md2man because code.google.com needs to go away + +commit 6842c906c44fefeb3ca78aae550e64341e040391 +Author: Jessica Frazelle +Date: Tue Dec 1 15:23:33 2015 -0800 + + update go-md2man because code.google.com needs to go away + + Signed-off-by: Jessica Frazelle + +commit 569ffdc028f9b25c8dbadda6a0e0e3459b4a2652 +Author: Jeffrey Morgan +Date: Tue Dec 1 15:47:58 2015 -0800 + + Bump machine + + Signed-off-by: Jeffrey Morgan + +commit ee530831c346f9336903140d764b5816f83045b7 +Merge: 609c74af3b 6b293a415a +Author: Nathan LeClaire +Date: Tue Dec 1 15:45:20 2015 -0800 + + Merge pull request #2466 from ubiquityhosting/master + + adding Ubiquity to driver list + +commit 609c74af3b22e9fa23e994fb873f9d061422d4d9 +Merge: 98777f6774 b7b767aafe +Author: Nathan LeClaire +Date: Tue Dec 1 15:45:07 2015 -0800 + + Merge pull request #2467 from jeanlaurent/virtualbox-proxy-dns + + Allow virtualbox DNSProxy override + +commit 3a3cf02d592eecd5e7211ab63c26b36c25a0e92c +Merge: e5c87a3260 6c37eab64a +Author: Jeffrey Morgan +Date: Tue Dec 1 15:14:22 2015 -0800 + + Merge branch 'master' of github.com:docker/toolbox + +commit e5c87a326009b99ee3fea4828a540439ee1038c1 +Author: Jeffrey Morgan +Date: Tue Dec 1 15:07:21 2015 -0800 + + CI: add deployment step + + Signed-off-by: Jeffrey Morgan + +commit 6c37eab64aafcd11e59a4016683f120a80b95bcb +Merge: df4707d7a5 68eb241194 +Author: Jeffrey Morgan +Date: Tue Dec 1 14:40:25 2015 -0800 + + Merge pull request #333 from michaelfavia/master + + Remove the machine drivers in uninstall + +commit 6b293a415a03c9f9a21c4cc5c01903698f82c049 +Author: Justin Canington +Date: Tue Dec 1 15:21:32 2015 -0700 + + adding Ubiquity to driver list + + Signed-off-by: Justin Canington + +commit c5810d6a640f9cc5eb36f6f7e87f4fbb066bc79c +Author: Alexandre Beslic +Date: Tue Dec 1 14:14:22 2015 -0800 + + fix swarm license grant + + Signed-off-by: Alexandre Beslic + +commit da0c9286a9e82a88e75eb9298e96426978fba4bc +Merge: 3962fe5d7b 359d0c247f +Author: Phil Estes +Date: Tue Dec 1 17:12:00 2015 -0500 + + Merge pull request #18315 from jfrazelle/change-frozen-image-v2 + + update download-frozen-image.sh to v2 registry + +commit 3962fe5d7b47383b752383b48adf7e1ac0a6f202 +Merge: 5efb37616f 82323294db +Author: Alexander Morozov +Date: Tue Dec 1 13:42:57 2015 -0800 + + Merge pull request #18343 from calavera/unify_debug_logging + + [Carry 18260] Remove info logging from every api call. + +commit 68eb241194cb1fbf7804e191e8c9c0d0d574d7fb +Merge: df4707d7a5 6100b075c3 +Author: michaelfavia +Date: Tue Dec 1 15:39:10 2015 -0600 + + Merge pull request #1 from michaelfavia/michaelfavia-drivers-uninstall + + Remove the machine drivers in uninstall + +commit 6100b075c33a5117f9a3a5aa54ec5ecdb0263392 +Author: michaelfavia +Date: Tue Dec 1 15:38:23 2015 -0600 + + Remove the machine drivers + + These were left behind on my box. + +commit 300ce35c121b53020858f35584fe97d12386a8c8 +Author: Troels Thomsen +Date: Tue Dec 1 22:26:37 2015 +0100 + + Map error type to error code + + Signed-off-by: Troels Thomsen + +commit 8fd2630d01d65dd64053091ef9b35a98f4fc3d5c +Author: Chris Weyl +Date: Mon Nov 30 23:33:55 2015 -0600 + + newtork -> network (minor spelling correction) + + ...yeah, that was bugging me. :) + + Signed-off-by: Chris Weyl + +commit 1ece510198b47621052ddb93e703f9e138769796 +Author: Troels Thomsen +Date: Tue Dec 1 22:22:27 2015 +0100 + + Use well-known error type + + Signed-off-by: Troels Thomsen + +commit e2b4b426b4e3b291c90302d967c6a864ff01b008 +Author: Troels Thomsen +Date: Tue Dec 1 22:21:22 2015 +0100 + + Define error type + + Signed-off-by: Troels Thomsen + +commit 5efb37616ffd4b848578424ebb7b290af9965eff +Merge: f199a4bad6 4953ea1eae +Author: Alexander Morozov +Date: Tue Dec 1 13:19:59 2015 -0800 + + Merge pull request #18308 from mountkin/delete-graphdb-later + + fix 2 corner cases in container create cleanup and container removal + +commit 359d0c247fe523ef82676f9ae4046b79e6854fe1 +Author: Jessica Frazelle +Date: Mon Aug 31 10:06:22 2015 -0700 + + update download-frozen-image.sh to v2 registry + + Signed-off-by: Jessica Frazelle + +commit 59d7c3ca6119b78f5489506ecdce5cb64b29cb29 +Author: Jan Broer +Date: Mon Nov 2 17:02:10 2015 +0100 + + Enhances Digitalocean driver to support creating Droplets with user-data + + Signed-off-by: Jan Broer + +commit f8746f4d66688aa92c3757562167e00c882db2bb +Merge: 4e14413786 bc6c264989 +Author: Jeffrey Morgan +Date: Tue Dec 1 12:08:16 2015 -0800 + + Merge branch 'master' of github.com:docker/kitematic + +commit 4e14413786210d8e42f12f87be93739878a92029 +Author: Jeffrey Morgan +Date: Tue Dec 1 12:08:11 2015 -0800 + + Use generic .zip names for releases, upload to GitHub + + Signed-off-by: Jeffrey Morgan + +commit bc6c264989ef6dfc4f475b5aacee24c64a0f8035 +Merge: f93c58da72 77c6ce65f8 +Author: French Ben +Date: Tue Dec 1 12:05:58 2015 -0800 + + Merge pull request #1264 from FrenchBen/fix-setup + + Updated setup check + +commit 77c6ce65f86f25ea6eb872a100313e6d461c371d +Author: French Ben +Date: Tue Dec 1 12:03:55 2015 -0800 + + Updated setup check + + Signed-off-by: French Ben + +commit f93c58da72b9b36d8ac51b440c4bf1afc333308f +Author: Jeffrey Morgan +Date: Tue Dec 1 11:56:13 2015 -0800 + + Remove reference to container logs + + Signed-off-by: Jeffrey Morgan + +commit 82323294db96e8043244027c262481af6c8f478d +Author: David Calavera +Date: Tue Dec 1 14:33:33 2015 -0500 + + Unify both debug logging middlewares. + + We can remove one function from the stack by injecting the middleware + only when logging in enabled and the level is debug. + + Signed-off-by: David Calavera + +commit e78f7453293af84febb468d31134260fa3229ee2 +Author: Jeffrey Morgan +Date: Tue Dec 1 10:16:10 2015 -0800 + + Build Linux to dist + + Signed-off-by: Jeffrey Morgan + +commit dc8b36045507cf9b202c4ff79d81e0740cb2d08d +Merge: e5ddc4d041 4e4516da6a +Author: Jeffrey Morgan +Date: Tue Dec 1 10:09:46 2015 -0800 + + Merge pull request #696 from zedtux/linux-support + + Linux support + +commit 329c35341121646c55e8131bb5b98325d0005d0b +Merge: 261ed7fa98 9ec49c04fd +Author: Richard Scothern +Date: Tue Dec 1 09:57:45 2015 -0800 + + Merge pull request #1225 from SvenDowideit/DOCS-227 + + TOC for configuration page incorrect + +commit f199a4bad6aefb0fc131374abb258ed4351552b1 +Merge: c6f1feb07b 09742bcd69 +Author: moxiegirl +Date: Tue Dec 1 09:46:45 2015 -0800 + + Merge pull request #18341 from thaJeztah/fix-broken-link + + docs: fix broken link to 1.7 Hub API + +commit 98777f67740e8b595577dcffbe60ac704eb4c850 +Merge: cf85b11344 75fd2cdac0 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 1 18:44:23 2015 +0100 + + Merge pull request #2468 from jeanlaurent/config-fish + + Fix docker-machine config does not work on fish + +commit 4953ea1eae211366c7214bfd2381a4a189d5466a +Author: Shijiang Wei +Date: Mon Nov 30 22:05:41 2015 +0800 + + fix 2 corner cases in container create cleanup and container removal + + - avoid empty Names in container list API when fails to remove + a container + - avoid dead containers when fails to create a container + + Signed-off-by: Shijiang Wei + +commit 09742bcd692b2594800631e5c5c16d76dcf0e9f2 +Author: Sebastiaan van Stijn +Date: Tue Dec 1 17:57:12 2015 +0100 + + docs: fix broken link to 1.7 Hub API + + Signed-off-by: Sebastiaan van Stijn + +commit 0eba234c54a948051d1c2d3b0f4ebe4a4100e44d +Merge: defcf5a21f fd06d699f2 +Author: moxiegirl +Date: Tue Dec 1 08:54:13 2015 -0800 + + Merge pull request #2461 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit c6f1feb07be5fbeb058a29dc9a9b1efff5431d50 +Merge: 7b23976a83 bd2d53af2c +Author: Phil Estes +Date: Tue Dec 1 11:48:22 2015 -0500 + + Merge pull request #18321 from icecrime/maintainers_rework + + MAINTAINERS file cleanup + +commit 7b23976a83a5b2d342876118d365abb75f4bf625 +Merge: c8891158bd ef1d410b02 +Author: Brian Goff +Date: Tue Dec 1 11:47:27 2015 -0500 + + Merge pull request #18261 from runcom/fix-shm-size + + fix shm size handling + +commit 75fd2cdac0f81a5e40d401186177a2da658a16c8 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 1 17:09:40 2015 +0100 + + Fix for #2415 + + Signed-off-by: Jean-Laurent de Morlhon + +commit bd2d53af2c6b8da6ab136298650318186cabbdf8 +Author: Arnaud Porterie +Date: Tue Dec 1 07:56:19 2015 -0800 + + Update core maintainers, remove duplicates + + Move cpuguy83, duglin, tianon to core maintainers to reflect reality. + + Remove james (duplicate for jamtur01) and add [people.jamtur01] section. + + Signed-off-by: Arnaud Porterie + +commit ef1d410b0270fa7309d76aded34113396def7fb2 +Author: Antonio Murdaca +Date: Thu Nov 26 13:14:09 2015 +0100 + + fix shm size handling + + Signed-off-by: Antonio Murdaca + +commit b7b767aafed0ada5b2470e664a88a00ea9c22d30 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 1 15:57:02 2015 +0100 + + Allow virtualbox DNSProxy override + + Signed-off-by: Jean-Laurent de Morlhon + +commit c8891158bd1499b060346f42f52be45484a3ac94 +Merge: c6a2bce919 a489e685c0 +Author: Phil Estes +Date: Tue Dec 1 09:49:13 2015 -0500 + + Merge pull request #18310 from rhvgoyal/log-fs-creation + + devmapper: Log start and end of filesystem creation + +commit c6a2bce9198efe21ae40213fed2e3c25df9de613 +Merge: 27bfa93b69 4c8088268c +Author: Sebastiaan van Stijn +Date: Tue Dec 1 15:48:10 2015 +0100 + + Merge pull request #18331 from runcom/fix-typo + + daemon: daemon_experimental.go: fix typo + +commit 27bfa93b696a955693f1f581e4723a9ea7d1691a +Merge: c247b3d104 3ddd21b8b6 +Author: Sebastiaan van Stijn +Date: Tue Dec 1 14:18:53 2015 +0100 + + Merge pull request #18330 from thaJeztah/re-enable-api-v1.22 + + docs: add API v1.22 to the list again + +commit a489e685c0d17455463945316cfe366e4e65dca6 +Author: Vivek Goyal +Date: Tue Dec 1 13:05:46 2015 +0000 + + devmapper: Log start and end of filesystem creation + + ext4 filesystem creation can take a long time on 100G thin device and + systemd might time out and kill docker service. Often user is left thinking + why docker is taking so long and logs don't give any hint. Log an info + message in journal for start and end of filesystem creation. That way + a user can look at logs and figure out that filesystem creation is + taking long time. + + Signed-off-by: Vivek Goyal + +commit c247b3d104ad7e768e2540fccb3861c36eb2e60f +Merge: 657085dfdb d7117a1b71 +Author: Tibor Vass +Date: Tue Dec 1 12:43:16 2015 +0100 + + Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start + + Make sure container start doesn't make the DNS fields nil. + +commit 4c8088268ccef8652add808e3367faafe713f485 +Author: Antonio Murdaca +Date: Tue Dec 1 12:03:50 2015 +0100 + + daemon: daemon_experimental.go: fix typo + + Signed-off-by: Antonio Murdaca + +commit 3ddd21b8b66be248ea04eb74c7a81349bffddac1 +Author: Sebastiaan van Stijn +Date: Tue Dec 1 11:59:45 2015 +0100 + + docs: add API v1.22 to the list again + + The 1.22 API was temporarily removed in e4d86c2c38f4c99660da8ed65a8103e283e07e23 + to prevent it showing up in the 1.9 documentation. + + This reverts that change and tweaks the aligning + of the table headers in Markdown source. + + Signed-off-by: Sebastiaan van Stijn + +commit 4e4516da6a11dcb777d10b3b11fa0c70777ce7bf +Merge: de0b2efd2a 5f1b34ff92 +Author: Guillaume Hain +Date: Tue Dec 1 11:36:42 2015 +0100 + + Merge branch 'master' into linux-support + +commit 5f1b34ff92f32951b8aa955fc07a9e815a58dcb0 +Merge: 0ed907553b e5ddc4d041 +Author: Guillaume Hain +Date: Tue Dec 1 11:34:17 2015 +0100 + + Merge pull request #6 from docker/master + + Merge upstream master + +commit d295d4b323dd6b1fefc24be105f3d411b16d8405 +Author: Victor Vieux +Date: Tue Dec 1 02:27:50 2015 -0800 + + update compose to 1.5.1 + + Signed-off-by: Victor Vieux + +commit cf85b113445252e8dbd49bac98f2fb0389bc6e56 +Merge: f0757312e5 69fcbb8505 +Author: Jean-Laurent de Morlhon +Date: Tue Dec 1 10:45:21 2015 +0100 + + Merge pull request #2463 from xiaohui/doc/ucloud-driver-reference + + Add UCloud driver + +commit 69fcbb8505328e626d9e6c70664d0fa848bb9a1f +Author: Xiaohui Liu +Date: Tue Dec 1 17:40:49 2015 +0800 + + Add UCloud driver + + Signed-off-by: Xiaohui Liu + +commit f0757312e576536a94618842b39bedb57e9377b7 +Merge: c0478b8dc7 40aab51e6a +Author: David Gageot +Date: Tue Dec 1 10:33:46 2015 +0100 + + Merge pull request #2461 from frapposelli/fusion-mount-id-fix + + Add id/gid option to mount when using vmhgfs + +commit 657085dfdb5ef789d07d0a3985aedbdeb4a1b4d9 +Merge: 1ddd4b1dcc 85e5b05018 +Author: Vincent Demeester +Date: Tue Dec 1 09:56:01 2015 +0100 + + Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test + + Checkers on docker_api_inspect_test.go + +commit c0478b8dc7c31d13b07ed217d7d54ca48dfc56a7 +Merge: 0456b9fc8f 00cb219dd9 +Author: David Gageot +Date: Tue Dec 1 09:19:49 2015 +0100 + + Merge pull request #2462 from nathanleclaire/bump_v_0.5.3-dev + + Update to v0.5.3-dev + +commit 00cb219dd9e4f15ff9590ccf0456d7b0eea9cae8 +Author: Nathan LeClaire +Date: Mon Nov 30 23:58:40 2015 -0800 + + Update to v0.5.3-dev + + Signed-off-by: Nathan LeClaire + +commit 0456b9fc8f6d2202cfc6df8b2ef46474052896cc +Merge: f7ea3d9f19 6887e5fec2 +Author: Nathan LeClaire +Date: Mon Nov 30 21:59:00 2015 -0800 + + Merge pull request #2460 from nathanleclaire/bump_v0.5.2 + + Bump to version 0.5.2 + +commit 40aab51e6a8eb14cd527f5591b1a30e209f157d2 +Author: Fabio Rapposelli +Date: Tue Dec 1 05:47:37 2015 +0100 + + Add id/gid option to mount when using vmhgfs + + Signed-off-by: Fabio Rapposelli + +commit 9ec49c04fd26a932dcac55962d3bdd1cd6fbd3b7 +Author: Sven Dowideit +Date: Tue Dec 1 14:07:55 2015 +1000 + + TOC for configuration page incorrect + + Signed-off-by: Sven Dowideit + +commit d7117a1b713042096bd97815bbb9663a4a01c8af +Author: David Calavera +Date: Mon Nov 30 17:44:34 2015 -0500 + + Make sure container start doesn't make the DNS fields nil. + + Signed-off-by: David Calavera + +commit 8292d1866d8b7c2825fac653769568aa6ce2ab36 +Merge: 5500c81cd9 870fe0fd01 +Author: David Lawrence +Date: Mon Nov 30 19:31:13 2015 -0800 + + Merge pull request #299 from docker/server-parsing-trust + + Fixed bug parsing trust service info in notary server. + +commit 6295345005b5c251b465f18fd6e77edad50a50b7 +Author: Shuwei Hao +Date: Sat Nov 7 17:11:37 2015 +0000 + + Modify docker volume inspect to return existed volumes + + Signed-off-by: Shuwei Hao + +commit 870fe0fd01b6e84af59b96a8ff968b5cbe617f57 +Author: Ying Li +Date: Mon Nov 30 16:57:18 2015 -0800 + + Define injected function types for notary-server/main.getTrustService + + Signed-off-by: Ying Li + +commit 1dd04d4e5d22aae5cab96c65a5c452f2529bac15 +Author: Ying Li +Date: Mon Nov 23 20:10:22 2015 -0500 + + trust_service is now a required section of the notary-server config. + + The type must either be "local" or "remote". Previously, any invalid + configuration would default to a local signing service, but since + a remote signing service is recommended, the user has to specifically + configure a local signing service. We don't want it to be the + fallback. + + Signed-off-by: Ying Li + +commit d62ac788a3863a874f04ea1dfd31014e6e486bfc +Author: Ying Li +Date: Mon Nov 16 18:31:31 2015 -0800 + + Fixed bug parsing trust service info in notary server. + + Previously, if it wasn't a remote service, the config parser was + still setting the key algorithm to be whatever was configured. + Now, if we are using a local trust service, the algorithm is always + ED25519. + + Also broke the trust parsing into its own function for testing. + + Signed-off-by: Ying Li + +commit 5500c81cd91f4b2355ab50ac9e7929a292ae1a03 +Merge: a8b376ec0f 7153dc7463 +Author: David Lawrence +Date: Mon Nov 30 17:06:13 2015 -0800 + + Merge pull request #304 from docker/server-signer-config + + Make the server/signer configurations more similar + +commit a8b376ec0fa8b2873e2f941c8f8cb40c733837e0 +Merge: 909260ff03 ae7459b5f2 +Author: David Lawrence +Date: Mon Nov 30 17:04:39 2015 -0800 + + Merge pull request #294 from endophage/remove_cryptoservice_sign + + CryptoService.Sign is now dead code. Remove it and update tests + +commit 6887e5fec25f2426739a667b434e0770072b871a +Author: Nathan LeClaire +Date: Mon Nov 30 17:02:19 2015 -0800 + + Bump to version 0.5.2 + + Signed-off-by: Nathan LeClaire + +commit ae7459b5f2e355748e5bb8cbcc751081c13e4b43 +Author: David Lawrence +Date: Mon Nov 30 16:38:14 2015 -0800 + + updating commend and renaming test per comments + Signed-off-by: David Lawrence (github: endophage) + +commit 909260ff03cd5446cdb354445878d4a57e13d1b6 +Merge: 7c5382b256 35b104beee +Author: David Lawrence +Date: Mon Nov 30 16:52:15 2015 -0800 + + Merge pull request #308 from docker/pretty-print-certs + + Pretty-print certificates from the notary CLI command `notary cert list` + +commit 7153dc74633472e9741b7d87930e2bf59debcd62 +Author: Ying Li +Date: Mon Nov 30 16:41:07 2015 -0800 + + Fix bug with keystore not getting assigned in the signer in the DB case. + + Thanks @endophage! + + Signed-off-by: Ying Li + +commit 1e091a0f5623a2cad05e7eb5c79265e127761afd +Author: David Lawrence +Date: Sun Nov 15 02:16:13 2015 -0800 + + CryptoService.Sign is now dead code. Remove it and update tests + Signed-off-by: David Lawrence (github: endophage) + +commit 35b104beee713febba1429caae82425ad0ed8c3c +Author: Ying Li +Date: Mon Nov 23 14:47:56 2015 -0500 + + Move all the pretty-print functions to their own file in cmd/notary. + + Also add tests for pretty-printing and sorting targets. + + Signed-off-by: Ying Li + +commit 1670b69a187b98dafd106f462ac9ac2c26c10b3e +Author: Ying Li +Date: Fri Nov 20 14:31:10 2015 -0800 + + Pretty-print certificates from the notary CLI command `notary cert list` + + Signed-off-by: Ying Li + +commit f7ea3d9f193808ca4446803c90d711f270e3c327 +Merge: d18a5f62d9 0c12b7dbc1 +Author: Nathan LeClaire +Date: Mon Nov 30 16:24:43 2015 -0800 + + Merge pull request #2434 from dgageot/check-after-create + + Check machine after create + +commit 1ddd4b1dccb6d185b7007e032ff0c1f4c81e4bad +Merge: 94997e56a9 09d448f924 +Author: David Calavera +Date: Mon Nov 30 16:20:08 2015 -0800 + + Merge pull request #18320 from jfrazelle/add-license-selinux + + add licence to rpm + +commit 7c5382b256e2e047cac8bc20d43470e2526a014d +Merge: 3ce5d2527c 9c3d87d5eb +Author: David Lawrence +Date: Mon Nov 30 15:34:18 2015 -0800 + + Merge pull request #300 from docker/server-validate-timestamp-key + + Server check that the root.json's timestamp key ID is valid. + +commit 3ce5d2527c148cc095a57b05d4137147c5d70170 +Merge: c4636411bc e8dc2097a1 +Author: Ying Li +Date: Mon Nov 30 15:24:17 2015 -0800 + + Merge pull request #315 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit 09d448f924aabf67ad476ce20539efa78a2715ca +Author: Jessica Frazelle +Date: Mon Nov 30 15:19:31 2015 -0800 + + add licence to rpm + + Signed-off-by: Jessica Frazelle + +commit f5d21c19db6e1043606e49b551ee0ee73e3f2167 +Merge: de6383c4dd 3f6182c384 +Author: Victor Vieux +Date: Mon Nov 30 14:54:47 2015 -0800 + + Merge pull request #1465 from mountkin/fix-1436 + + fix the panic when "ps -a" with dead containers + +commit 94997e56a9a65ee651f759377be1f83f03693656 +Merge: dc9f9d9445 09b7af9095 +Author: David Calavera +Date: Mon Nov 30 14:37:29 2015 -0800 + + Merge pull request #18211 from Djelibeybi/master + + Updated LICENSE file + +commit de6383c4dd0d9fc72d259205334b50aa3f97b02c +Merge: b7ca0e7844 484edd33cd +Author: Victor Vieux +Date: Mon Nov 30 14:35:09 2015 -0800 + + Merge pull request #1448 from jimenez/timeout_default + + Changing offers timeout default to prevent other frameworks starvation + +commit e5ddc4d0416141be76a6270b514345c75e3c9adc +Merge: 0dd51c775e 322b17d290 +Author: Jeffrey Morgan +Date: Mon Nov 30 14:29:48 2015 -0800 + + Merge branch 'master' of github.com:docker/kitematic + +commit 0dd51c775ef798251f4fced569fe9dba903e13f9 +Author: Jeffrey Morgan +Date: Mon Nov 30 14:29:43 2015 -0800 + + CI: Release on tags + + Signed-off-by: Jeffrey Morgan + +commit 85e5b05018a5b8095dc7390644829845794a56f7 +Author: Aditi Rajagopal +Date: Tue Nov 24 12:24:27 2015 -0500 + + Checkers on docker_api_inspect_test.go + + Applying #16756 to integration-cli/docker_api_inspect_test.go + + Signed-off-by: Aditi Rajagopal + +commit 56e8d864ce3ca94cd8fe80484835cf7bd9dda0a6 +Author: Ying Li +Date: Tue Nov 24 17:57:43 2015 -0500 + + Add some standalone (does not require MySQL) configuration files for + server and signer, and set these to be the default configuration + files when running the images. + + Compose specifies the configuration with MySQL. + + Signed-off-by: Ying Li + +commit 322b17d290059b0b3f0f17865de4a7a6403a8212 +Merge: 321fedb069 83b2bff850 +Author: Jeffrey Morgan +Date: Mon Nov 30 14:12:55 2015 -0800 + + Merge pull request #1199 from docker/fix-log-streaming + + Improved log performance and reliability + +commit dc9f9d9445afe9dff091ff49259a622745a2f457 +Merge: 91c653d73a 4bdf957c26 +Author: David Calavera +Date: Mon Nov 30 14:04:54 2015 -0800 + + Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test + + Checkers on docker_api_containers_test + +commit 91c653d73a1c5db67801bced12d882211f0f8264 +Merge: c84f5dfd74 4935f7f500 +Author: Tianon Gravi +Date: Mon Nov 30 14:04:41 2015 -0800 + + Merge pull request #18317 from jfrazelle/fix-gopath + + fix gopath when building debs + +commit 83b2bff85024f28a6ea35ec8a3863cde5e807052 +Author: Jeffrey Morgan +Date: Mon Nov 9 23:16:44 2015 -0800 + + Improved log performance and reliability + + Signed-off-by: Jeffrey Morgan + +commit 29dbce8357358a675cc90ecb0cd29b1a59633881 +Author: Arnaud Porterie +Date: Mon Nov 30 14:00:12 2015 -0800 + + MAINTAINERS file cleanup + + First phase in cleaning up the MAINTAINERS file to make it better + reflect reality by: + + - Removing "Operators" that have no practical role. + - Removing "Subsystems" as they often are separate repositories with + their own MAINTAINERS files. + + Signed-off-by: Arnaud Porterie + +commit 4935f7f500b8473ce53848e0c9673bac7a9fb522 +Author: Jessica Frazelle +Date: Mon Nov 30 11:56:21 2015 -0800 + + fix gopath when building debs + + Signed-off-by: Jessica Frazelle + +commit b7ca0e784408e862485a4638d14017bd1869a884 +Merge: d05c80c1ae 185a46481a +Author: Victor Vieux +Date: Mon Nov 30 13:40:06 2015 -0800 + + Merge pull request #1450 from jimenez/glog_enable + + Enabling glog for mesos + +commit d18a5f62d9aa67a3207335678b9232201608732e +Merge: f00b0b83cf 643b7349f7 +Author: Nathan LeClaire +Date: Mon Nov 30 13:01:58 2015 -0800 + + Merge pull request #2459 from dgageot/remove-fake-api + + Remove duplicated test FakeApi + +commit 321fedb069e7debc5099b9022a1e11849bd965ed +Merge: c1709f5288 d39b8235b9 +Author: French Ben +Date: Mon Nov 30 12:51:20 2015 -0800 + + Merge pull request #1241 from FrenchBen/enable-debug + + Add package option for devTools window on start + +commit d39b8235b96161d6532c2d4226eec9b1b0ca1164 +Author: French Ben +Date: Mon Nov 23 15:50:43 2015 -0800 + + Add package option for devTools window on start + + Signed-off-by: French Ben + +commit 4bdf957c26559d659af604dc6814a5cd2225a0f3 +Author: Aditi Rajagopal +Date: Thu Nov 19 01:37:42 2015 +0100 + + Checkers on docker_api_containers_test + + Applying #16756 to integration-cli/docker_api_containers_test.go + + Signed-off-by: Aditi Rajagopal + +commit c84f5dfd7431dfef94a073b47f591515a58d9e00 +Merge: 2a354790a6 f6896b61ff +Author: David Calavera +Date: Mon Nov 30 11:47:16 2015 -0800 + + Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup + + Fix docker status incorrectly reports containerized + +commit 2a354790a635537c2ed5325b6615e9bdccdc6954 +Merge: e852959fad a0251b2bbf +Author: Phil Estes +Date: Mon Nov 30 14:37:14 2015 -0500 + + Merge pull request #18241 from LK4D4/remove_listenbuffer + + Remove listenbuffer + +commit e852959fadf7ec77ffb57877806603b8c0bf523e +Merge: 54733abba3 f8db9a09e0 +Author: Jess Frazelle +Date: Mon Nov 30 11:34:34 2015 -0800 + + Merge pull request #18178 from jfrazelle/apparmor-we-meet-again + + Fix docker-default profile handing signals + +commit 54733abba337134b4de439182175a9ec51331c60 +Merge: 0f0cf267e8 5cfa13ae48 +Author: David Calavera +Date: Mon Nov 30 11:06:15 2015 -0800 + + Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test + + Checkers on integration-cli/docker_api_info_test + +commit 0f0cf267e898f9a84533855304d542f524c814c1 +Merge: 221d979e7b 2efdb8cbf5 +Author: Alexandre Beslic +Date: Mon Nov 30 11:00:53 2015 -0800 + + Merge pull request #18204 from mavenugo/dhb + + Configurable discovery ttl and heartbeat timer + +commit a94a47651f7d679cbde50cb33638b72396fdc7ea +Author: Ying Li +Date: Mon Nov 23 19:22:22 2015 -0500 + + Adds specific memory backend support to server and signer. + + The server already supported a memory backend, but now it must be + specified, rather than just being a fallback if no storage is + specified. This also adds a signer backend to signer, which + previously required a MySQL backend. + + Thanks @endophage for the excellent suggestion! + + Signed-off-by: Ying Li + +commit f1bd28caf4efcd475fb57d4e638b1ac9458a835e +Author: Ying Li +Date: Fri Nov 20 01:17:45 2015 -0800 + + The TLS certificates are now relative to the config file used. + + Previously, if a relative path was provided, it was relative to the + current working directory to wherever the binaries were run. Now + it is relative to whatever config file was used. + + Signed-off-by: Ying Li + +commit c43776d36f8173c6d430724e6167f21c1eafc307 +Author: Ying Li +Date: Thu Nov 19 21:03:03 2015 -0800 + + Use shared configuration parsing tools in notary-server. + + This changes the 'addr' parameter of notary-server's config to + 'http_addr', so we can add a GRPC server to notary-server if + necessary. This also allows environment variables to override + the notary-server config file entries, as notary-signer already + does. + + The bugsnag configuration has also been changed so that the + bugsnag parameters are under the "bugsnag" key. + + Signed-off-by: Ying Li + +commit 9e5ac006ecb61675f42d65c6a6ce7cff472d7e8e +Author: Ying Li +Date: Thu Nov 19 20:29:47 2015 -0800 + + Use the shared configuration parsing code in notary-signer's parsing. + + Also add bugsnag support to notary-signer. + + This also changes the 'server.cert_file' and 'server.key_file' + parameters to 'server.tls_cert_file' and 'server.tls_key_file', + respectively, to match notary-server. + + Previously, the default alias, which was under the environment + variable NOTARY_SERVER_DEFAULT_ALIAS is now also available in + the config file in storage.default_alias. The password has + not changed. + + Finally, this removes some of the HSM references in notary-signer. + + Signed-off-by: Ying Li + +commit b25f8546f83b503cb21f350f7e1263d66e5d6df8 +Author: Ying Li +Date: Thu Nov 19 20:28:13 2015 -0800 + + Ensure that environment variables can override config file entries. + + Also support parameterized allowed backends when parsing for + storage backends, so that a DB backend can be tested. + + Signed-off-by: Ying Li + +commit b1fdea5b56e869bc5c0d2ee91913543eee933a40 +Author: Ying Li +Date: Thu Nov 19 16:19:24 2015 -0800 + + Add shared config file parsing to the utils package. + + Signed-off-by: Ying Li + +commit c4636411bccf984bd6fb0614f040841f444a8379 +Merge: 69dae91788 dbcb56b3bf +Author: David Lawrence +Date: Mon Nov 30 10:56:13 2015 -0800 + + Merge pull request #309 from docker/rename-keystoremanager + + Renamed keystoremanager to certs, and KeyStoreManager to Manager. + +commit 69dae917886e374a5348461d55701d8315eb8df1 +Merge: ff75aefc84 6ebb1fc7a8 +Author: David Lawrence +Date: Mon Nov 30 10:55:54 2015 -0800 + + Merge pull request #314 from docker/mysql-user + + Just connect to mysql as root, rather than as dockerdemo user. + +commit 261ed7fa988c110b0ef1c143795af283f52a3b34 +Merge: 4874f111ea b43d0baec0 +Author: Richard Scothern +Date: Mon Nov 30 10:22:44 2015 -0800 + + Merge pull request #1213 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit f8db9a09e0ec9b1925839ffff4f1cc5fe3ace630 +Author: Jessica Frazelle +Date: Mon Nov 23 15:41:18 2015 -0800 + + check version for docker-default aa profile + + Signed-off-by: Jessica Frazelle + +commit 221d979e7b6fbc1c631370a8d44bc588b68df543 +Merge: 360a106511 bf66deeb08 +Author: David Calavera +Date: Mon Nov 30 10:00:21 2015 -0800 + + Merge pull request #18296 from jfrazelle/add-james + + add james golick to names generator + +commit 360a10651188fcf79b0110265c3f2723637e11b7 +Merge: 377e1d75f9 1b726b29b2 +Author: Jess Frazelle +Date: Mon Nov 30 09:37:05 2015 -0800 + + Merge pull request #18303 from runcom/lxc-leftover + + daemon: remove sysInitPath, lxc leftover + +commit 643b7349f77beca0940209e8b905fdbca83bc0cd +Author: David Gageot +Date: Mon Nov 30 18:30:00 2015 +0100 + + Remove duplicated FakeApi + + Signed-off-by: David Gageot + +commit 377e1d75f93101acbff7cf06df2c05a2df3b6760 +Merge: 7bef428110 c0f7fdc025 +Author: Alexander Morozov +Date: Mon Nov 30 09:15:25 2015 -0800 + + Merge pull request #18239 from jfrazelle/17783-fix-regex + + Fix parsing of apparmor pcre syntax + +commit a0251b2bbfe259c8d089e34415159f1b609779be +Author: Alexander Morozov +Date: Wed Nov 25 11:06:36 2015 -0800 + + Remove listenbuffer package + + Signed-off-by: Alexander Morozov + +commit ca5795cef810c85f101eb0aa3efe3ec8d756490b +Author: Alexander Morozov +Date: Wed Nov 25 11:05:31 2015 -0800 + + Remove usage of listenbuffer package + + It actually adds nothing to queuing requests. + + Signed-off-by: Alexander Morozov + +commit f00b0b83cff83eb1f7517d6a3d58fdb5b034251b +Merge: 47df63e932 6d5bc99387 +Author: David Gageot +Date: Mon Nov 30 17:37:30 2015 +0100 + + Merge pull request #2458 from jeanlaurent/typo + + Typo in EC2 Driver + +commit 6d5bc9938722499d2d24ca43fb296e1ae5c637e8 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 30 17:22:52 2015 +0100 + + Typo + + Signed-off-by: Jean-Laurent de Morlhon + +commit 7bef4281103035373d97d5807893aafc81f21735 +Merge: a26accfb5d 1f0f41e8d7 +Author: Vincent Demeester +Date: Mon Nov 30 17:02:15 2015 +0100 + + Merge pull request #18306 from runcom/add-test-suffix + + integration-cli: add _test suffix to test file + +commit a26accfb5d52f81b6df339da36855b85d3a473fe +Merge: f3ff09f578 7bb9fc415a +Author: Vincent Batts +Date: Mon Nov 30 09:57:37 2015 -0600 + + Merge pull request #18226 from duglin/Issue18170 + + Fix for zero-sized layers + +commit 47df63e9321ee8f1f4adb9c8f0b044014676a3c2 +Merge: 48554182f1 ec76843e03 +Author: David Gageot +Date: Mon Nov 30 16:04:47 2015 +0100 + + Merge pull request #2454 from dgageot/google + + Improve Google Driver + +commit f3ff09f5786fc74161b13ebb48299d07bb0847d2 +Merge: f187bdbb9b 0a426c47c8 +Author: Phil Estes +Date: Mon Nov 30 10:01:45 2015 -0500 + + Merge pull request #18272 from hqhq/hq_fix_kernel_memory + + Fix kernel memory limit + +commit 3f6182c38449ebb0980ae7660d3318e97787f62d +Author: Shijiang Wei +Date: Mon Nov 30 21:28:21 2015 +0800 + + fix the panic when "ps -a" with dead containers + + Signed-off-by: Shijiang Wei + +commit ec76843e03c8901d9ce65e722833115b191f73e0 +Author: David Gageot +Date: Mon Nov 30 09:45:21 2015 +0100 + + Cosmetics + + Signed-off-by: David Gageot + +commit fea0dcb3da2bf94913265c2a7c25c5010669f579 +Author: David Gageot +Date: Mon Nov 30 09:45:14 2015 +0100 + + Simpler error message + + Signed-off-by: David Gageot + +commit 77b7734404430006de74154262429bd0c9f7f08e +Author: David Gageot +Date: Mon Nov 30 09:05:53 2015 +0100 + + Simplify code + + Signed-off-by: David Gageot + +commit 085fe1334aa0ff4b1c5cf02bfc0a1b60616c7de3 +Author: David Gageot +Date: Mon Nov 30 08:55:59 2015 +0100 + + Faster google driver + + Signed-off-by: David Gageot + +commit f187bdbb9b954a3c617442a0e2c8310af1cc1439 +Merge: dd25d2c3db a7b73e57bc +Author: Antonio Murdaca +Date: Mon Nov 30 12:32:23 2015 +0100 + + Merge pull request #18302 from WeiZhang555/lint-auto + + Golint auto-generated file + +commit 1f0f41e8d7511999faad79866e2799f78956bb37 +Author: Antonio Murdaca +Date: Mon Nov 30 11:33:57 2015 +0100 + + integration-cli: add _test suffix to test file + + Signed-off-by: Antonio Murdaca + +commit d3af7f283d8dc0be67be48e14cd740fbeb690f7a +Author: Antonio Murdaca +Date: Tue Oct 13 11:26:27 2015 +0200 + + Add OomScoreAdj to configure container oom killer preferences + + libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to + better tune oom killing preferences for container process. This patch + simply integrates OomScoreAdj libcontainer's config option and adjust + the cli with this new option. + + Signed-off-by: Antonio Murdaca + Signed-off-by: Antonio Murdaca + +commit 634789baa2b6e23fbc3eff7b9879326234fd9b29 +Merge: 67fcfbb90a 8a4dea8916 +Author: Sebastiaan van Stijn +Date: Mon Nov 30 10:35:20 2015 +0100 + + Merge pull request #32 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit 1b726b29b21bbc1aebfe0f6b71dfd61145bdd6af +Author: Antonio Murdaca +Date: Mon Nov 30 10:04:13 2015 +0100 + + daemon: remove sysInitPath, lxc leftover + + Signed-off-by: Antonio Murdaca + +commit 48554182f13ba73dd96d124f4fdcb6789dec5efe +Merge: 2f92045679 83f3c2f921 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 30 09:56:29 2015 +0100 + + Merge pull request #2427 from newpcraft/debugmsg_in_daemonresponding + + add debug message in dockerDaemonResponding function due to helping f… + +commit 2f920456796f33b0279c822c7bdf560ce7215ef6 +Merge: 72044d6018 faaac3df8c +Author: Jean-Laurent de Morlhon +Date: Mon Nov 30 09:36:55 2015 +0100 + + Merge pull request #2452 from dgageot/2444-fix-scp + + FIX 2444 Command scp being called twice + +commit a7b73e57bc55ff63ccbe3a9ff879a25253292c9b +Author: Zhang Wei +Date: Mon Nov 30 16:34:07 2015 +0800 + + Golint auto-generated file + + Fix auto-generation script to golint auto-generated files. + + Signed-off-by: Zhang Wei + +commit 72044d601873d9cb32835762b7ba258efcceda3a +Merge: 5aff328a09 c4b74f57ab +Author: Jean-Laurent de Morlhon +Date: Mon Nov 30 09:19:57 2015 +0100 + + Merge pull request #2447 from yadutaf/master + + Reference OVH Cloud driver + +commit 8a4dea8916102fc1fef4dfaf882baa24caeb7a7b +Author: Sven Dowideit +Date: Mon Nov 30 15:28:16 2015 +1000 + + Fix up some links to moved files + + Signed-off-by: Sven Dowideit + +commit 1c52d8fe6fad90ae555f567c3c0df6c14fdb1c39 +Author: Sven Dowideit +Date: Thu Nov 26 20:11:18 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit 0a426c47c84cb8aec714cce2c21e6c6696cbc8c4 +Author: Qiang Huang +Date: Mon Nov 30 08:40:47 2015 +0800 + + Update cgroup integration tests + + Cgroup integtaion tests should cover: + - docker can run sucessfully with these options + - these cgroup options are set to HostConfig as expected + - these cgroup options are really set to cgroup files as expected + - other cases (wrong value, combinations etc..) + + Signed-off-by: Qiang Huang + +commit bf66deeb080787c3bda9aa619d3cdb22c68bbee1 +Author: Jessica Frazelle +Date: Sun Nov 29 09:53:21 2015 -0800 + + add james golick to names generator + + Signed-off-by: Jessica Frazelle + +commit d05c80c1ae89364706055102b4dbbf28aee4937f +Merge: 2b1d392b8c f7e02d64ae +Author: Alexandre Beslic +Date: Sun Nov 29 01:25:50 2015 -0800 + + Merge pull request #1459 from sandric/patch-1 + + Update networking.md + +commit c4b74f57ab45668efa0e4fbc32928b03cc3cdd76 +Author: Jean-Tiare Le Bigot +Date: Sat Nov 28 13:21:30 2015 +0100 + + Reference OVH Cloud driver + + Signed-off-by: Jean-Tiare Le Bigot + +commit dd25d2c3db0c96cd74bbec786203a708079c20f5 +Merge: a415b0c220 4c3c3fedf8 +Author: Sebastiaan van Stijn +Date: Sat Nov 28 13:03:09 2015 +0100 + + Merge pull request #18281 from runcom/18199-followup + + integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s) + +commit faaac3df8c76473a1ae6aa099bcd4109e968629f +Author: David Gageot +Date: Sat Nov 28 11:59:43 2015 +0100 + + FIX 2444 Command scp being called twice + + Signed-off-by: David Gageot + +commit f7e02d64ae4de659714e4db64765f2a17b949d71 +Author: sandric +Date: Sat Nov 28 07:08:20 2015 +0200 + + Update networking.md + + Fix typos + + Signed-off-by: sandric + +commit dd7b4fd651a6f9354efb991f6ce547a03729fa18 +Author: Qiang Huang +Date: Sat Nov 28 09:47:25 2015 +0800 + + Fix kernel memory limit + + Signed-off-by: Qiang Huang + +commit 377f084dfe799d43798c9015081437f98228171d +Author: Daniel Nephin +Date: Fri Nov 27 13:54:00 2015 -0500 + + Increase timeout in tests. + + Signed-off-by: Daniel Nephin + +commit a21f9993b3acf20efafad70b02da81debfd37830 +Author: Daniel Nephin +Date: Fri Nov 27 12:02:13 2015 -0500 + + Remove migrate-to-labels. + + Signed-off-by: Daniel Nephin + +commit 2f568984f73e7bade8d01127dd4e8cf7202eaaec +Author: Daniel Nephin +Date: Fri Nov 27 11:52:25 2015 -0500 + + Fixes #2368, removes the deprecated --allow-insecure-ssl flag. + + Signed-off-by: Daniel Nephin + +commit 4c3c3fedf81a47f9da1a92665ae53e81ce30db62 +Author: Antonio Murdaca +Date: Fri Nov 27 17:10:01 2015 +0100 + + integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s) + + Signed-off-by: Antonio Murdaca + +commit a415b0c2208bd426df731491fe6e4714156f3527 +Merge: b8c21783f0 bc2682badc +Author: Antonio Murdaca +Date: Fri Nov 27 17:04:28 2015 +0100 + + Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test + + Checkers on docker_cli_pull_local_test.go + +commit defcf5a21f1dab837b3bfc7fe250279f48df5d26 +Merge: 0fedd9969f ccf548b98c +Author: Aanand Prasad +Date: Fri Nov 27 14:44:55 2015 +0000 + + Merge pull request #2464 from aanand/validate-expose + + Validate `expose` + +commit 5aff328a090ce1e6a76f4da2be21fe30fa33911c +Merge: e9470d3b26 4aa398657d +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 12:44:03 2015 +0100 + + Merge pull request #2438 from dgageot/generic-doc + + Improve generic driver documentation + +commit 4aa398657deceebd422385a0c39b433eac01a057 +Author: David Gageot +Date: Fri Nov 27 12:21:14 2015 +0100 + + Improve generic driver documentation + + Signed-off-by: David Gageot + +commit e9470d3b26084e717a3d1547da6770d47b26fb1a +Merge: e0998d030b 68e6e3f905 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 10:57:36 2015 +0100 + + Merge pull request #2435 from dgageot/lint-markdown + + Lint all Markdown documents + +commit 68e6e3f905856bc1d93cb5c1e99cc3b3ac900022 +Author: David Gageot +Date: Fri Nov 27 10:16:42 2015 +0100 + + Lint all Markdown documents + + Signed-off-by: David Gageot + +commit e0998d030b53de7ad6d73101957879285c0bfc77 +Merge: aa36205174 55ecd6561c +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 10:18:01 2015 +0100 + + Merge pull request #2433 from dgageot/generic-driver + + Improve Generic driver + +commit 55ecd6561c626e65f51ee0b7ffada317969f7fbc +Author: David Gageot +Date: Fri Nov 27 09:16:30 2015 +0100 + + Add env variables to generic driver + + Signed-off-by: David Gageot + +commit aa36205174b7aa8728db3b80d87300bc7933e0e7 +Merge: 0a1a67345f 78b088d135 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 09:50:42 2015 +0100 + + Merge pull request #2432 from dgageot/provision-logs + + Add more logs to provisioner + +commit 0a1a67345f3299bcefedd4aa44c203c0f1207dca +Merge: 03abd8575a 515bdad0f6 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 27 09:50:33 2015 +0100 + + Merge pull request #2431 from dgageot/code-quality + + Code quality + +commit 0c12b7dbc1e8e7a6fcb07617cc121a0a9097b5f5 +Author: David Gageot +Date: Fri Nov 27 08:39:55 2015 +0100 + + Check machine after create + + Signed-off-by: David Gageot + +commit 7d6bfffb8f3b953c15d69e4facf8dee4e44b97a4 +Author: David Gageot +Date: Fri Nov 27 08:38:57 2015 +0100 + + Generic Driver - Check key in PreCheck + + Signed-off-by: David Gageot + +commit 78b088d13544a0b4c9cac8407dedc8f5fe48fb20 +Author: David Gageot +Date: Thu Nov 26 15:06:55 2015 +0100 + + Add more logs to provisioner + + Signed-off-by: David Gageot + +commit 515bdad0f6eab45d82247700214239d7aaf10189 +Author: David Gageot +Date: Fri Nov 27 08:40:14 2015 +0100 + + Remove redundant log + + Signed-off-by: David Gageot + +commit 2b1d392b8cccda12a01341060ae0aff9eda6e2a0 +Merge: 56e90a56dc b0705e56ee +Author: Alexandre Beslic +Date: Thu Nov 26 15:49:36 2015 -0800 + + Merge pull request #1454 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit b8c21783f0c7915779de3fa487f233ebc145738d +Merge: 88aca3610f 0bbc9f1d2d +Author: Alexander Morozov +Date: Thu Nov 26 12:21:30 2015 -0800 + + Merge pull request #17108 from coolljt0725/fix_remove_image + + Fix docker rmi trying to remove a being used parent + +commit 88aca3610fecdf790c4604ed705d31f8d17ef8e6 +Merge: 0b5a28590f 302325a3aa +Author: Alexander Morozov +Date: Thu Nov 26 12:20:55 2015 -0800 + + Merge pull request #18232 from mqliang/defer + + move defer statement for readability + +commit 0b5a28590f278881309b77f42be06a1da4212e1e +Merge: 2adeef9d1d 65900d7603 +Author: Alexander Morozov +Date: Thu Nov 26 12:15:48 2015 -0800 + + Merge pull request #18106 from runcom/bump-runc-libcontainer + + vendor: bump libcontainer and its deps + +commit ccf548b98c5eca779b753c14439d83832e1f6b54 +Author: Aanand Prasad +Date: Thu Nov 26 19:17:58 2015 +0000 + + Validate the 'expose' option + + Signed-off-by: Aanand Prasad + +commit 042c7048f26713d18da559941bc25f974d60883c +Author: Aanand Prasad +Date: Thu Nov 26 19:17:13 2015 +0000 + + Split out ports validation tests into type, uniqueness, format + + Signed-off-by: Aanand Prasad + +commit 374b16843fedca5908d166226e4d1fc9f455acfc +Author: Aanand Prasad +Date: Thu Nov 26 18:54:30 2015 +0000 + + Fix ports validation message + + - The `raises` kwarg to the `cls_check` decorator was being used + incorrectly (it should be an exception class, not an object). + + - We need to check for `error.cause` and get the message out of the + exception object. + + NB: The particular case where validation fails in the case of `ports` is + only when ranges don't match in length - no further validation is + currently performed client-side. + + Signed-off-by: Aanand Prasad + +commit d52508e2b1b8e59900d492cff69169fe4fed7d1f +Author: Aanand Prasad +Date: Thu Nov 26 18:52:14 2015 +0000 + + Refactor ports section of fields schema + + Signed-off-by: Aanand Prasad + +commit 0fedd9969fcc56c3bfd89a2d43f0c6768bea3669 +Merge: 7b893164a4 2ab3cb212a +Author: Aanand Prasad +Date: Thu Nov 26 18:15:03 2015 +0000 + + Merge pull request #2430 from dnephin/build_from_url + + Build from url + +commit 83f3c2f9219757356974b0a2273ccc158c643336 +Author: CHOE JUNGYEON +Date: Fri Nov 27 02:37:50 2015 +0900 + + add debug message in dockerDaemonResponding function due to helping for troubleshooting of docker daemon state + +commit c1709f5288cebfcebb9c657fd9470350f39d5527 +Merge: 9e9363603d ecd6b4bf17 +Author: Jeffrey Morgan +Date: Thu Nov 26 11:40:07 2015 -0500 + + Merge pull request #1248 from jeffdm/master + + Delete .jshintrc + +commit 9e9363603d30a1a772283ef21576cba8eaa40862 +Merge: 8ad771c898 835dc9c047 +Author: Jeffrey Morgan +Date: Thu Nov 26 11:40:01 2015 -0500 + + Merge pull request #1253 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit 2ab3cb212a3c4c0e3b6f3daf6792d3e8cb60782c +Author: Daniel Nephin +Date: Thu Nov 19 15:46:14 2015 -0500 + + Add integration test and docs for build with a git url. + + Signed-off-by: Daniel Nephin + +commit f7239f41efe039137da352e249ae0914d683524f +Author: Jonas Eckerström +Date: Wed Apr 29 10:22:24 2015 +0200 + + Added support for url buid paths + + Signed-off-by: Jonas Eckerström + +commit 65900d7603368f045c904d178fab05a13c44a066 +Author: Antonio Murdaca +Date: Thu Nov 26 00:44:44 2015 +0100 + + vendor: bump deps + + bump runc/libcontainer to v0.0.5 + bump runc deps to latest + bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d + + Signed-off-by: Antonio Murdaca + +commit b85bfce65e26a85150be2073576e3ebe840f3ee1 +Author: Aanand Prasad +Date: Thu Nov 26 15:06:30 2015 +0000 + + Fix ports validation test + + We were essentially only testing that *at least one* of the invalid + values fails the validation check, rather than that *all* of them fail. + + Signed-off-by: Aanand Prasad + +commit 2adeef9d1d4a0cf1fb6b0d56dc246008d72f777e +Merge: 9be2eea415 a1733c6575 +Author: Vincent Demeester +Date: Thu Nov 26 16:03:23 2015 +0100 + + Merge pull request #18262 from runcom/add-line + + hack: make: .go-autogen: add blank line after build tag + +commit cfe3972d1811e73a2ef209afe0971c5e4b1b6ce0 +Author: David Gageot +Date: Thu Nov 26 14:10:47 2015 +0100 + + Minor + + Signed-off-by: David Gageot + +commit 518e3b8bdef302b5d20b01c60482defe6e0492a1 +Author: David Gageot +Date: Thu Nov 26 14:07:29 2015 +0100 + + Rename to rawDriver + + Signed-off-by: David Gageot + +commit a1733c6575339e254f2b49625d597f46f883fe42 +Author: Antonio Murdaca +Date: Thu Nov 26 13:16:39 2015 +0100 + + hack: make: .go-autogen: add blank line after build tag + + Signed-off-by: Antonio Murdaca + +commit 9be2eea41593db2e6203097592e9347bb40c5637 +Merge: bb11900393 ce5177cf4b +Author: Sebastiaan van Stijn +Date: Thu Nov 26 13:12:41 2015 +0100 + + Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit cf4fb150880ec5f4153c291e67238e28f3cbdf9b +Author: Dan Walsh +Date: Thu Nov 26 07:10:38 2015 -0500 + + The loggingMiddleware function is adding lots of messages to the log + + When tools like kubernetes and cockpit are talking to the docker daemon + actively, we are seeing large number of log messages that look like debug + information. + + For example + + docker info adds the following line to journald. + + Nov 26 07:09:23 dhcp-10-19-62-196.boston.devel.redhat.com docker[32686]: time="2015-11-26T07:09:23.124503455-05:00" level=info msg="GET /v1.22/info" + + We think this should be Debug level not Info level. + + Signed-off-by: Dan Walsh + +commit 03abd8575ab25a6f9a4860a761230bec3b53c880 +Merge: 5caed51a00 41a9edbfb2 +Author: Jean-Laurent de Morlhon +Date: Thu Nov 26 11:54:31 2015 +0100 + + Merge pull request #2425 from dgageot/pro-tip + + B2D_CACHE can be used to speedup integration tests + +commit 41a9edbfb28967eb2e0ea2a565d7df31fba5559f +Author: David Gageot +Date: Thu Nov 26 11:42:55 2015 +0100 + + B2D_CACHE can be used to speedup integration tests + + Signed-off-by: David Gageot + +commit 724f5ab1a97e7f526afbc8fec51d30b786b1ab8d +Author: Sven Dowideit +Date: Thu Nov 26 20:40:44 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit bb11900393df21002a7608c007c90438522be7dd +Merge: 9ebf7dfae3 478b773fe5 +Author: Arnaud Porterie +Date: Thu Nov 26 11:40:02 2015 +0100 + + Merge pull request #18220 from mqliang/temvarible + + remove unnecessary temporary variable + +commit b43d0baec017d718b6e03c4f7762c91f642f895e +Author: Sven Dowideit +Date: Thu Nov 26 20:34:00 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit 5caed51a00f69e6ada43be1508ea954546cf6994 +Merge: 7ff3124a4f abca150dd8 +Author: David Gageot +Date: Thu Nov 26 11:33:10 2015 +0100 + + Merge pull request #2424 from jeanlaurent/test-provision + + Move doubtful provision tests out of the integration folder + +commit fd06d699f22fc9d473ac4201feba5847782688ec +Author: Sven Dowideit +Date: Thu Nov 26 20:30:12 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit ce5177cf4b175435a667aeced586f653a9203790 +Author: Sven Dowideit +Date: Thu Nov 26 20:20:46 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit 835dc9c0470c5c525e2f439906ae56b29f9d15ed +Author: Sven Dowideit +Date: Thu Nov 26 20:17:43 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit abca150dd838648a5f17a2c6bdac188d9ca64e68 +Author: Jean-Laurent de Morlhon +Date: Thu Nov 26 11:16:04 2015 +0100 + + Move doubtfull provision test out of the integration folder + + Signed-off-by: Jean-Laurent de Morlhon + +commit e8dc2097a18760b39ab2028b5b61d8b16ddd8d9a +Author: Sven Dowideit +Date: Thu Nov 26 20:14:11 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit 7ff3124a4f9cfa8c123a92b56b7d604d314ab1e2 +Merge: c7418806dd 64a3a2f804 +Author: Jean-Laurent de Morlhon +Date: Thu Nov 26 11:11:42 2015 +0100 + + Merge pull request #2421 from nathanleclaire/force_env + + Update DRIVER checking to universal function + +commit c7418806ddf9104349220efa6d011ff88fb57771 +Merge: 3177b1ee92 348d808eba +Author: David Gageot +Date: Thu Nov 26 11:09:14 2015 +0100 + + Merge pull request #2423 from SvenDowideit/move-to-docs-base-latest + + Use FROM docs/base:latest again + +commit 348d808eba58f4c5a9932189a61e9e6be9e8248c +Author: Sven Dowideit +Date: Thu Nov 26 19:59:13 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit d309bce2d1ba7fa06fbaa29a4768651afaba72c2 +Author: Troels Thomsen +Date: Thu Nov 26 10:28:35 2015 +0100 + + Verify manifest name format + + Signed-off-by: Troels Thomsen + +commit 34c8194c9501e9e0baca2f0a1c618e6317df50d0 +Author: Troels Thomsen +Date: Thu Nov 26 10:28:28 2015 +0100 + + Verify manifest name length + + Signed-off-by: Troels Thomsen + +commit 3177b1ee9276d82193053766b84b9ae3622f9d14 +Merge: f0bf69c1ef 00f62150b4 +Author: David Gageot +Date: Thu Nov 26 09:05:31 2015 +0100 + + Merge pull request #2403 from dgageot/machine-ls-tests + + Machine ls tests + +commit f0bf69c1ef48b2efedf1098b3baafac4d6c7474c +Merge: 1f86d0b426 3a8061221c +Author: David Gageot +Date: Thu Nov 26 09:04:55 2015 +0100 + + Merge pull request #2419 from nathanleclaire/rm_rawdriver + + Remove RawDriver from persistence on disk + +commit 1f86d0b4269b0152220a3b6c8ecb9a3bbd46865e +Merge: 08565fd198 14f29c07d7 +Author: David Gageot +Date: Thu Nov 26 08:54:55 2015 +0100 + + Merge pull request #2416 from jeffellin/master + + Add link to AWS Cloud Formation Driver + +commit 00f62150b4cbac74cfb858547a666567b5ff1ad5 +Author: David Gageot +Date: Tue Nov 24 17:57:42 2015 +0100 + + FIX nil pointer dereference in machine ls + + Signed-off-by: David Gageot + +commit 6a1993664db12284ddc76446d2c45dceaf07f429 +Author: David Gageot +Date: Tue Nov 24 17:50:15 2015 +0100 + + FIX #1619 Timeout test for machine ls + + Signed-off-by: David Gageot + +commit 89fcca2879549301d1171c6887dd54bfc4a1568b +Author: David Gageot +Date: Tue Nov 24 17:25:06 2015 +0100 + + Increase coverage of machine ls tests + + Signed-off-by: David Gageot + +commit 64a3a2f80419a233b3c4367cb7e351e0c9aaa1e7 +Author: Nathan LeClaire +Date: Wed Nov 25 23:01:47 2015 -0800 + + Update DRIVER checking to universal function + + Signed-off-by: Nathan LeClaire + +commit 3a8061221c767e9045180b74967e03583f05d2cf +Author: Nathan LeClaire +Date: Wed Nov 25 20:08:33 2015 -0800 + + Remove RawDriver from persistence on disk + + Signed-off-by: Nathan LeClaire + +commit 08565fd1985edbc71c9eb27646a69aeb492377a9 +Merge: 1acde29ebe c4a72491ec +Author: Nathan LeClaire +Date: Wed Nov 25 22:03:29 2015 -0800 + + Merge pull request #2396 from allingeek/master + + Decoupled RPC Types from API + +commit 56e90a56dc99f8a6896ab1961074378795b8ad18 +Merge: 088ad94a61 b85c2a65c6 +Author: Alexandre Beslic +Date: Wed Nov 25 19:07:46 2015 -0800 + + Merge pull request #1453 from jimmyxian/fix-integration-test + + Fix CI + +commit 14f29c07d7b5b3975b4f112460e88eeb5ec33f61 +Author: jellin +Date: Wed Nov 25 21:57:35 2015 -0500 + + Add link to AWS Cloud Formation Driver + + Signed-off-by: Jeffrey Ellin + +commit 8ad771c898bfe3ba9ff4539533a09cdc67de76ff +Merge: adc1f170f5 0fed4fd0e5 +Author: Sven Dowideit +Date: Thu Nov 26 12:57:13 2015 +1000 + + Merge pull request #1247 from SvenDowideit/test-jenkins-checker + + Docs validation checker fixes + +commit b0705e56ee15d6b60afd2262d649de674fd668fd +Author: Sven Dowideit +Date: Thu Nov 26 12:56:23 2015 +1000 + + Use FROM docs/base:latest again + + Signed-off-by: Sven Dowideit + +commit b85c2a65c656b0a273fe36897db960fc55a2cf5e +Author: Xian Chaobo +Date: Thu Nov 26 09:33:09 2015 +0800 + + fix CI + + Signed-off-by: Xian Chaobo + +commit 9ebf7dfae324d8fad524c9578ed850bf3b116d32 +Merge: 3e51aff852 21278efaee +Author: Brian Goff +Date: Wed Nov 25 21:35:21 2015 -0500 + + Merge pull request #18252 from aaronlehmann/tarstream-readcloser + + Make TarStream return an io.ReadCloser + +commit 478b773fe5aa7b9bdfc571d3e8f8bc3bc47826ea +Author: mqliang +Date: Wed Nov 25 17:30:13 2015 +0800 + + remove unnecessary temporary variable + + Signed-off-by: mqliang + +commit 7bb9fc415ac50abf5f754005264bfe152eeca7d6 +Author: Doug Davis +Date: Mon Nov 23 17:20:44 2015 -0800 + + Fix for zero-sized layers + + Moved a defer up to a better spot. + + Fixed TestUntarPathWithInvalidDest to actually fail for the right reason + + Closes #18170 + + Signed-off-by: Doug Davis + +commit 0bbc9f1d2d0effcf33d82d24bbf97f30b90619de +Author: Lei Jitang +Date: Thu Nov 26 09:57:20 2015 +0800 + + Fix docker rmi trying to remove a being used parent + + Signed-off-by: Lei Jitang + +commit df4707d7a592feb8c8914a64a0b07346cb1be883 +Author: Jeffrey Morgan +Date: Wed Nov 25 20:47:46 2015 -0500 + + CI: Mac builds + + Signed-off-by: Jeffrey Morgan + +commit 3e51aff852a7e014dee770c02b40f90a2ef07503 +Merge: 8339c892e8 dd3634b3c1 +Author: David Calavera +Date: Wed Nov 25 17:37:04 2015 -0800 + + Merge pull request #18234 from thaJeztah/revert-vendor-changes + + docs: revert README changes in vendored files + +commit 8339c892e803c88a5269be29f76f5d74e30d5816 +Merge: 49088b0b89 20e759ab56 +Author: David Calavera +Date: Wed Nov 25 17:36:33 2015 -0800 + + Merge pull request #18245 from tonistiigi/tagstore-digest-adder + + Validate adding digests to tagstore with go types + +commit 088ad94a6159979ae69bfe3019015578f575c05b +Merge: 24fc1b6909 59a1f2427b +Author: Victor Vieux +Date: Wed Nov 25 16:57:48 2015 -0800 + + Merge pull request #1447 from dongluochen/eventsConnection + + Close tcp connection when client stops '/events' request. + +commit 21278efaee563b356851a530b08b0537fee095d7 +Author: Aaron Lehmann +Date: Wed Nov 25 16:39:54 2015 -0800 + + Make TarStream return an io.ReadCloser + + Currently, the resources associated with the io.Reader returned by + TarStream are only freed when it is read until EOF. This means that + partial uploads or exports (for example, in the case of a full disk or + severed connection) can leak a goroutine and open file. This commit + changes TarStream to return an io.ReadCloser. Resources are freed when + Close is called. + + Signed-off-by: Aaron Lehmann + +commit adc1f170f5992e758ad3cb52c6e52d048b431232 +Author: Jeffrey Morgan +Date: Wed Nov 25 19:38:57 2015 -0500 + + CI: do not cache homebrew + + Signed-off-by: Jeffrey Morgan + +commit ec92514207ef81340504ee457658dbee1aa4db2a +Author: Jeffrey Morgan +Date: Wed Nov 25 19:26:59 2015 -0500 + + CI: add quotes to circle yml + + Signed-off-by: Jeffrey Morgan + +commit d8de60d612337cf58899d35e8b596a996b314f17 +Author: Jeffrey Morgan +Date: Wed Nov 25 18:52:18 2015 -0500 + + Bump electron to 0.33.9 + + Signed-off-by: Jeffrey Morgan + +commit 252049115e6ad64936d2dd867bdc93e01707680f +Author: Jeffrey Morgan +Date: Wed Nov 25 18:45:24 2015 -0500 + + Put zip files in release dir + + Signed-off-by: Jeffrey Morgan + +commit 241b354c662722fbe3e828e9a81bb0732dc908ec +Author: Jeffrey Morgan +Date: Wed Nov 25 18:38:57 2015 -0500 + + CI: cache cellar + + Signed-off-by: Jeffrey Morgan + +commit 1acde29ebe586e54ffad8a8a20bc2c73a7c96a96 +Merge: 3ddea9f53f 79efe19887 +Author: Nathan LeClaire +Date: Wed Nov 25 15:28:10 2015 -0800 + + Merge pull request #2413 from dgageot/simpler-code + + Simpler code + +commit 574e980625a1db4f080e73ce9dbd6469e4e99e72 +Merge: 65cea9e82a c5c9fc34bc +Author: Jeffrey Morgan +Date: Wed Nov 25 18:23:24 2015 -0500 + + Merge branch 'master' of github.com:docker/kitematic + +commit 65cea9e82a0238cd57021ba82a9583d16f0ed8be +Author: Jeffrey Morgan +Date: Wed Nov 25 18:23:19 2015 -0500 + + CI: proper circle cache syntax + + Signed-off-by: Jeffrey Morgan + +commit 24fc1b69095feeb6c9a4e918203eb7453e05b794 +Merge: e82752cace 905a8c8e5a +Author: Victor Vieux +Date: Wed Nov 25 15:19:58 2015 -0800 + + Merge pull request #1451 from aluzzardi/parallel-affinity-fix + + Set labels for pending containers + +commit c5c9fc34bc7f839bc8e333e92728a8c8bd37bcbe +Author: Jeffrey Morgan +Date: Wed Nov 25 18:13:01 2015 -0500 + + Update README.md + +commit 15b2891a036fe8f0e0b5f2f313bfb48fbf6a9230 +Author: Jeffrey Morgan +Date: Wed Nov 25 18:07:48 2015 -0500 + + CI: Remove unused sign script + + Signed-off-by: Jeffrey Morgan + +commit 20e759ab56e9c17cfe0fbe839cdd4ac9ee6f0752 +Author: Tonis Tiigi +Date: Wed Nov 25 12:42:40 2015 -0800 + + Validate adding digests to tagstore with go types + + Signed-off-by: Tonis Tiigi + +commit 332cf7374717948ad4435d35c1707d93f51d332e +Author: Jeffrey Morgan +Date: Wed Nov 25 17:43:50 2015 -0500 + + Travis: cache + + Signed-off-by: Jeffrey Morgan + +commit e82752cace9905d4749cdf66e92a3257ac778795 +Merge: 58ee815ec2 a150a0d521 +Author: Alexandre Beslic +Date: Wed Nov 25 14:30:16 2015 -0800 + + Merge pull request #1363 from dongluochen/refreshConfiguration + + add engine options for refresh interval + +commit 4b888a2d87cc04718ad72a47cb8c4138734a0e4e +Author: Jeffrey Morgan +Date: Wed Nov 25 17:28:42 2015 -0500 + + CI: Travis sudo: false + + Signed-off-by: Jeffrey Morgan + +commit b43fc78a6399c587ee7ae62f26b793daeb024945 +Author: Jeffrey Morgan +Date: Wed Nov 25 17:26:03 2015 -0500 + + CI: Fix circleci + + Signed-off-by: Jeffrey Morgan + +commit 8975f8e61be56b92155791d4619fb807edcc283b +Author: Jeffrey Morgan +Date: Wed Nov 25 17:08:08 2015 -0500 + + CI: only use travis for tests + + Signed-off-by: Jeffrey Morgan + +commit 49088b0b8947485dc8f639b1bb9e81b07b865516 +Merge: 3422858653 f91115e3a2 +Author: Jess Frazelle +Date: Wed Nov 25 17:07:17 2015 -0500 + + Merge pull request #18243 from jfrazelle/fix-test + + fix consistetly failing TestContainerRestartSuccess + +commit 604ed015dc08e007eab14fbfa3cfb20f0688c8b3 +Author: Jeffrey Morgan +Date: Wed Nov 25 17:06:44 2015 -0500 + + CI: Remove unused install + + Signed-off-by: Jeffrey Morgan + +commit f91115e3a26f612001bde5f55cd59c69f7243104 +Author: Jessica Frazelle +Date: Wed Nov 25 12:58:41 2015 -0800 + + fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things + + Signed-off-by: Jessica Frazelle + +commit c4a72491ece09e823a27cedd56de7790daf68a8f +Author: Jeff Nickoloff +Date: Mon Nov 23 15:42:27 2015 -0700 + + Decoupled RPC Types from API + + Added compatibility for both 5.0 and 5.1 RPC plugins. + Addresses #2325 + + Signed-off-by: Jeff Nickoloff + + modified: libmachine/drivers/plugin/register_driver.go + modified: libmachine/drivers/rpc/client_driver.go + +commit e8f8f4034ec41c0c0382d8f9b704be1ac96c0f74 +Author: Troels Thomsen +Date: Wed Nov 25 21:16:28 2015 +0100 + + Remove name verification + + Signed-off-by: Troels Thomsen + +commit ca9f0451a6f1d3a3a618f53d8ad33b7583805ca8 +Author: Troels Thomsen +Date: Thu Oct 22 20:55:51 2015 +0200 + + Use case of type name + + Signed-off-by: Troels Thomsen + +commit 68c9ebdf1f4691a7d5bf5fb9f40021f977ca8f3f +Author: Jessica Frazelle +Date: Wed Nov 25 11:32:00 2015 -0800 + + Remove ipc rule in docker-engine apparmor profile + + On a ubuntu 15.04 machine with apparmor_parser version 2.10 I get + ``` + Syntax Error: Unknown line found in file: + /etc/apparmor.d/docker-engine line: 26 + ``` + when running `aa-complain /etc/apparmor.d/docker-engine`. + + It's super weird because ipc is documented in the apparmor manual, but it + doesnt seem to be working at all. Tested on a few servers. + + Signed-off-by: Jessica Frazelle + +commit 4874f111eafb04fb9c7a9ba56cdd13a5ddaf8f48 +Merge: 7647f7fe76 8acf5a4d63 +Author: Richard Scothern +Date: Wed Nov 25 11:25:25 2015 -0800 + + Merge pull request #1208 from farmerworking/fix-oss-doc-error + + Oss secure option default to true, Fix doc error + +commit 7647f7fe76772fdb0c713b549207d3abfe53aecd +Merge: d7a4f6cb6a 17d4e82944 +Author: Richard Scothern +Date: Wed Nov 25 11:24:06 2015 -0800 + + Merge pull request #1204 from MHBauer/gh1197 + + Formatting content digest calculation to avoid copyright symbols + +commit 34228586530fb3c51c4faa8ec73b9e15926893ea +Merge: ad67f324cc a8b84cd8fb +Author: Michael Crosby +Date: Wed Nov 25 10:49:31 2015 -0800 + + Merge pull request #18213 from crawford/18212-fix-api-server + + Revert "Return listenbuffer behavior" + +commit c0f7fdc025da69283eb00d80bf47f4d47eeb0a65 +Author: Jessica Frazelle +Date: Wed Nov 25 10:38:18 2015 -0800 + + Fix parsing of apparmor pcre syntax + + Signed-off-by: Jessica Frazelle + +commit 3ddea9f53f4baf77cf3e695865bebd71900c0c63 +Merge: 20f789a203 742cdb958b +Author: Nathan LeClaire +Date: Wed Nov 25 10:25:09 2015 -0800 + + Merge pull request #2409 from dgageot/more-commands-tests + + Add more command tests + +commit 79efe19887c1537fd9077fa99b1c2d2d8d5b79e9 +Author: David Gageot +Date: Wed Nov 25 19:01:12 2015 +0100 + + Simpler code + + Signed-off-by: David Gageot + +commit 20f789a2037adc6e95680214cfe66fd84a137498 +Merge: 05c5ff5a16 67b83f518f +Author: Nathan LeClaire +Date: Wed Nov 25 09:52:59 2015 -0800 + + Merge pull request #2412 from jeanlaurent/fix-2410 + + Fix #2410 - regression in docker-machine inspect payload + +commit 67b83f518f423749d045824c3d8dfb636fb9666c +Author: Jean-Laurent de Morlhon +Date: Wed Nov 25 18:27:35 2015 +0100 + + Fix #2410 + + Signed-off-by: Jean-Laurent de Morlhon + Reviewed-by: David Gageot + +commit bcd0f0cdc48180307d15c854f75e000b72f12ac8 +Author: Michal Gebauer +Date: Thu Nov 19 23:30:29 2015 +0100 + + Check if CertsDir is not empty + + Signed-off-by: Michal Gebauer + +commit ad67f324cc59807918eea747cc110d39a2bc1ca2 +Merge: 9bd5fd8926 3e7405aea8 +Author: David Calavera +Date: Wed Nov 25 09:11:12 2015 -0800 + + Merge pull request #17799 from runcom/deprecate-hc-cont-start + + Deprecate HostConfig at API container start + +commit 7b893164a44fd3e51afba762deb0d6cab6ef74ba +Merge: cfb1b37da2 e67bc2569c +Author: Aanand Prasad +Date: Wed Nov 25 16:35:40 2015 +0000 + + Merge pull request #2450 from dnephin/fix_env_file_ordering + + Fix env_file overrides with extends + +commit e67bc2569ccc3c811d16cea284eca1f65a227c33 +Author: Daniel Nephin +Date: Mon Nov 23 13:24:57 2015 -0500 + + Properly resolve environment from all sources. + + Split env resolving into two phases. The first phase is to expand the paths + of env_files, which is done before merging extends. Once all files are merged + together, the final phase is to read the env_files and use them as the base + for environment variables. + + Signed-off-by: Daniel Nephin + +commit 9bd5fd892617c589606efda5e209e2400c6946d7 +Merge: 1beb450fa6 bfdd94b0a8 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 16:26:53 2015 +0100 + + Merge pull request #18223 from thaJeztah/fix-table-markup + + Fix markup for markdown table + +commit cfb1b37da22242dc67d5123772b3fa4518458504 +Merge: 8930fa25d6 533f33271a +Author: Aanand Prasad +Date: Wed Nov 25 15:16:21 2015 +0000 + + Merge pull request #2405 from dnephin/move_all_validation_to_config + + Move all validation to config + +commit 1beb450fa68dd32e2ef6cab539f39ad86ea5e192 +Merge: aa4fa98ed7 8819b530db +Author: Brian Goff +Date: Wed Nov 25 10:14:09 2015 -0500 + + Merge pull request #18215 from mountkin/test-for-18181 + + add a test to make sure port is allowed in images filter + +commit aa4fa98ed77f80a9db5e8f7c23ef58a4537a72e1 +Merge: 1892556375 20f1a7b496 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 16:12:05 2015 +0100 + + Merge pull request #18233 from moxiegirl/carry-17231 + + Moving prerequisite from #17231 + +commit dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 16:07:43 2015 +0100 + + revert README changes in vendored files + + PR https://github.com/docker/docker/pull/17986 + inadvertently included changes to some vendored files. + + This reverts those changes. + + Signed-off-by: Sebastiaan van Stijn + +commit 1892556375ee4425e7c0a8e3e3cfb5f5e7a2c49c +Merge: afaf288316 3e5ac74241 +Author: Vincent Demeester +Date: Wed Nov 25 16:02:36 2015 +0100 + + Merge pull request #18209 from martingkelly/18207-deb-multiarch + + install.sh: fix for multiarch deb/ubuntu + +commit 905a8c8e5a7b035266e1258e7def63c58d7a1bb1 +Author: Andrea Luzzardi +Date: Wed Nov 25 06:58:06 2015 -0800 + + Add parallel label affinity integration tests. + + Signed-off-by: Andrea Luzzardi + +commit 0961c1e48a51acaff1bb7b1eaca98ba9427005e9 +Author: Andrea Luzzardi +Date: Wed Nov 25 06:57:51 2015 -0800 + + Add parallel to integration test environment. + + Signed-off-by: Andrea Luzzardi + +commit afaf288316d0cce4a2d02a51aaab0b8017bdac27 +Merge: 06e4da9c5d 41a36529a7 +Author: moxiegirl +Date: Wed Nov 25 06:57:05 2015 -0800 + + Merge pull request #17926 from HackToday/15896-fix-volume-options + + Fixing the volume options doc + +commit 9310a385af8628d7958066b62f7e95b24c2347c1 +Author: Andrea Luzzardi +Date: Wed Nov 25 06:56:57 2015 -0800 + + Set labels for pending containers. + + Fixes docker/compose#2447 + + Signed-off-by: Andrea Luzzardi + +commit 06e4da9c5d6af18fe7e92482f5629dbcbdf56897 +Merge: 1c3e4c5b9f 899caaca9c +Author: Vincent Demeester +Date: Wed Nov 25 15:52:17 2015 +0100 + + Merge pull request #18228 from bboreham/existent-spelling + + Fix spelling 'non-existant' -> 'non-existent' + +commit 2efdb8cbf519f55836b0703e47c907e24a20eff6 +Author: Madhu Venugopal +Date: Wed Nov 11 16:18:06 2015 -0800 + + Make discovery ttl and heartbeat configurable + + Docker daemon uses kv-store as the host-discovery backend. + Discovery module tracks the liveness of a node through a simple + keepalive mechanism. The keepalive mechanism depends on every + node performing heartbeat by registering itself with the discovery + module (via KV-Store Put operation). And for every Put operation, + the discovery module in all other nodes will receive a Watch + notification. That keeps the node alive. + Any node that fails to register itself within the TTL timer is + considered dead and removed from the discovery database. + + The default timer (heartbeat = 20 seconds & ttl = 60 seconds) + works fine for small clusters. But for large clusters, these + default timers are extremely aggressive and that causes high CPU + & most of the processing is spent managing the node discovery + and that impacts normal daemon operation. + + Hence we need a way to make the discovery ttl and heartbeat + configurable. As the cluster size grows, the user can change + these timers to make sure the daemon scales. + + Signed-off-by: Madhu Venugopal + +commit 20f1a7b496fad1556ccc61f35d58533f885e0ab2 +Author: Mary Anthony +Date: Wed Nov 25 06:51:23 2015 -0800 + + Moving prerquisite from #17231 + + Signed-off-by: Mary Anthony + +commit 1c3e4c5b9f53917998d94afb3e53bdbea16472c4 +Merge: 9cbfa7b00b 0480da4d8c +Author: moxiegirl +Date: Wed Nov 25 06:45:42 2015 -0800 + + Merge pull request #17231 from zelahi/9745-addapparmor-note + + Adding note about apparmor install on Ubuntu + +commit 302325a3aaaae030f58c84bdaf88a5c8266af12c +Author: mqliang +Date: Wed Nov 25 22:33:15 2015 +0800 + + move defer statement for readability + + Signed-off-by: mqliang + +commit 58ee815ec2712e2414d9023ca203f7925d4130e0 +Merge: 1b2afce425 c4f85c531a +Author: Andrea Luzzardi +Date: Wed Nov 25 15:23:53 2015 +0100 + + Merge pull request #1432 from abronan/fix_ci + + Update docker version for swarm-test-env + +commit 899caaca9c990067d541231c6d288de89dbb79e7 +Author: Bryan Boreham +Date: Wed Nov 25 13:45:37 2015 +0000 + + Fix spelling of 'existent' + + Signed-off-by: Bryan Boreham + +commit 742cdb958b6bf32b48f812b74f8866d24850b0d9 +Author: David Gageot +Date: Wed Nov 25 13:41:04 2015 +0100 + + Add more command tests + + Signed-off-by: David Gageot + +commit 05c5ff5a1628c8e697a93f0e62d11f25704aba21 +Merge: d65e23600e 47da7f8314 +Author: David Gageot +Date: Wed Nov 25 14:22:27 2015 +0100 + + Merge pull request #2406 from nathanleclaire/testable_interfaces_env_test + + Add interfaces for command testing, and unit test for `docker-machine env` + +commit 9cbfa7b00bd3b542632b40c5726316923d90cd18 +Merge: e6a491fa8f a06d5273b3 +Author: James Turnbull +Date: Wed Nov 25 08:20:13 2015 -0500 + + Merge pull request #18227 from thaJeztah/fix-api-changes + + docs: move API changes to the correct API version + +commit a06d5273b3cb72f68fc32da26955842287314970 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 14:10:18 2015 +0100 + + docs: move API changes to the correct API version + + These changes were made as part of https://github.com/docker/docker/pull/17478 + but inadvertently added to the v1.21 API version. + + Also added a short description to the API changelog. + + Signed-off-by: Sebastiaan van Stijn + +commit e6a491fa8fe3fa09be3f803da97e7d6efc3162e5 +Merge: 900c8f5847 0a7e45e95c +Author: James Turnbull +Date: Wed Nov 25 08:03:35 2015 -0500 + + Merge pull request #18225 from thaJeztah/fixup-tabs + + docs: fixups for plugin drivers in docker info + +commit 0a7e45e95c9e554c73581def80881534800a2b28 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 13:54:54 2015 +0100 + + docs: fixups for plugin drivers in docker info + + Plugin drivers were added to docker info in + https://github.com/docker/docker/pull/17300 + + but not added to the example output in the online + docs. + + Also fixed mixed tabs/spaces in the API documentation. + + Signed-off-by: Sebastiaan van Stijn + +commit bfdd94b0a8f0641f7bced9d3089a78e9550a7b04 +Author: Sebastiaan van Stijn +Date: Wed Nov 25 12:38:15 2015 +0100 + + Fix markup for markdown table + + Our tooling used to convert Markdown to HTML doesn't + properly handle '|' symbols embeded in code blocks + inside a table. + + Changed the table to a plain HTML table as a workaround. + + Also fixed indentation levels of two code examples. + + Signed-off-by: Sebastiaan van Stijn + +commit 41a36529a71d96a9ed9d334a6efa72b4616c2abd +Author: Kai Qiang Wu(Kennan) +Date: Wed Nov 11 20:23:49 2015 -0600 + + Fixing the volume options doc + Fixes #15896 + Signed-off-by: Kai Qiang Wu(Kennan) + +commit 185a46481a4535ca01189d84a3cabf835379e4a7 +Author: Isabel Jimenez +Date: Wed Nov 25 04:40:03 2015 -0500 + + Enabling glog for mesos + + Signed-off-by: Isabel Jimenez + +commit e71bda76f87509c4caad55f281b6ffb5c0348ee3 +Author: Isabel Jimenez +Date: Wed Nov 25 04:23:56 2015 -0500 + + Improving error output for bad swarm mesos user + + Signed-off-by: Isabel Jimenez + +commit 484edd33cd7912e21770676a8f1d73a8421c8dc5 +Author: Isabel Jimenez +Date: Wed Nov 25 04:01:30 2015 -0500 + + Changing offers timeout default to prevent other frameworks starvation + + Signed-off-by: Isabel Jimenez + +commit 0480da4d8cbd330732f005ea7ec1be93cc00e617 +Author: Zuhayr Elahi +Date: Tue Oct 20 22:24:23 2015 -0700 + + 1. Adding note about apparmor install on Ubuntu + 2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu + 3. moved note to under prerequisites section + + Signed-off-by: Zuhayr Elahi + +commit b1fcc307cc08d24681d913c84a67f33fbafd53e0 +Author: Mika Andrianarijaona +Date: Wed Nov 25 09:29:36 2015 +0300 + + Changed accelerator + +commit 8acf5a4d63c5ce81e257bf61e882bd7275adcdca +Author: farmerworking +Date: Wed Nov 25 12:29:38 2015 +0800 + + Oss secure option default to true, Fix doc error + + Signed-off-by: farmerworking + +commit 8819b530dbb692de6eac5cf0e67700374f14aa09 +Author: Shijiang Wei +Date: Wed Nov 25 10:43:14 2015 +0800 + + add a test to make sure port is allowed in images filter + + Signed-off-by: Shijiang Wei + +commit a8b84cd8fb63d237b488f8b137b45187a6efaa5a +Author: Alex Crawford +Date: Tue Nov 24 18:17:37 2015 -0800 + + Revert "Return listenbuffer behavior" + + This reverts commit 281a48d092fa84500c63b984ad45c59a06f301c4. + + Signed-off-by: Alex Crawford + +commit 47da7f8314cf5fa49e5ec270db01fdcf94b655e2 +Author: Nathan LeClaire +Date: Fri Nov 13 13:26:31 2015 -0800 + + Add interfaces for CLI unit testing and env test + + Signed-off-by: Nathan LeClaire + +commit 0fed4fd0e59e854a299b6e2f53bd5383a36ce32a +Author: Sven Dowideit +Date: Wed Nov 25 11:14:08 2015 +1000 + + Docs validation checker fixes + + Signed-off-by: Sven Dowideit + +commit ecd6b4bf17f998b304871455ee0a9059d6ddb6c7 +Author: Jeffrey Morgan +Date: Tue Nov 24 20:16:52 2015 -0500 + + Delete .jshintrc + +commit 3e5ac742417dc9461dd090c29ee9971ff0974adb +Author: Martin Kelly +Date: Tue Nov 24 10:25:57 2015 -0800 + + install.sh: fix for multiarch deb/ubuntu + + Currently, the Docker repos will trigger apt-get errors on a + multiarch-configured deb system because the repos don't contain all + architectures. For example, on a multiarch system supporting amd64 and + armhf, apt-get will look for armhf Docker packages, fail to find them, + and error out. + + Fix this by qualifying the repo line with the currently active + architecture. + + This fixes issue #18207. + + Signed-off-by: Martin Kelly + +commit 09b7af9095246434c38ed1a9cc3a3ce6801ab180 +Author: Avi Miller +Date: Wed Nov 25 11:53:01 2015 +1100 + + Updated LICENSE file to match selinux-policy and the license in the docker-engine-selinux.spec file. + + Signed-off-by: Avi Miller + +commit 59a1f2427b80ab717b3dcbce4c0b774f0d65e008 +Author: Dong Chen +Date: Tue Nov 24 16:18:18 2015 -0800 + + Close tcp connection when client stops '/events' request. + + Signed-off-by: Dong Chen + +commit d7a4f6cb6a830e6836608a4af019774a27a0540a +Merge: 9c3c50faff a7199f5d7c +Author: Olivier Gambier +Date: Tue Nov 24 15:49:58 2015 -0800 + + Merge pull request #1207 from Djelibeybi/master + + Adding additional command to enable the shared system certificates + +commit a7199f5d7c82a759219df6415409450170bbea38 +Author: Avi Miller +Date: Wed Nov 25 10:41:40 2015 +1100 + + Fixed whitespace and made the command consistent with the other examples. + + Signed-off-by: Avi Miller + +commit b27d479ad53bd62626228199b4f5a0c0fe0cd69f +Author: Avi Miller +Date: Wed Nov 25 10:30:12 2015 +1100 + + Adding additional comment to enable the shared system certificates store. + + Signed-off-by: Avi Miller + +commit 900c8f5847b9f6a51a4a1a3d03631bad7b3149db +Merge: 87e7ee9142 cbf55b924f +Author: Alexander Morozov +Date: Tue Nov 24 14:53:10 2015 -0800 + + Merge pull request #18202 from aidanhs/aphs-content-addressability-layerstore + + Rearrange layerstore locking + +commit 9c3d87d5eb7460cba5c9e2d0f0bbab48fdccd69a +Author: Ying Li +Date: Tue Nov 24 17:47:00 2015 -0500 + + When validating root.json on the server, timestamp threshold must be 1. + + This is because the server handles the timestamp key and timestamp signing. + So there can only ever be 1 key. Thanks @mtrmac for pointing this out. + + This change also refactors some of the test code somewhat. + + Signed-off-by: Ying Li + +commit 87e7ee914261efd2580accae98569466f42cd003 +Merge: 5463e26570 85c3c6865e +Author: Brian Goff +Date: Tue Nov 24 17:07:04 2015 -0500 + + Merge pull request #18201 from calavera/split_container_router + + [Carry 17736] Container router and backend. + +commit cbf55b924f05a918c9b95795f6c69aa89d180530 +Author: Aidan Hobson Sayers +Date: Fri Nov 20 12:35:01 2015 +0000 + + Rearrange layerstore locking + + Signed-off-by: Aidan Hobson Sayers + +commit 99c43f8dfb6dcd6a7956fb956f0d8ee6a728b3c4 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:45:38 2015 -0500 + + Travis: build only on mac + + Signed-off-by: Jeffrey Morgan + +commit c9d94f99014e7488b49c1e1ba999abcb2eb81d63 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:41:55 2015 -0500 + + Travis: apt-get update + + Signed-off-by: Jeffrey Morgan + +commit 5463e2657009ee904e83f5df256dae9d12168f1a +Merge: a2ab05098d a4d768538a +Author: Alexander Morozov +Date: Tue Nov 24 13:41:42 2015 -0800 + + Merge pull request #18203 from aidanhs/aphs-content-addressability-layerstore-releaselayer + + Make releaseLayers iterative rather than recursive, remove useless func + +commit 53ef34a13dd03aa7b81e1b5b8e6cc6d4cccbea69 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:39:02 2015 -0500 + + Travis: add sudo to apt-get + + Signed-off-by: Jeffrey Morgan + +commit f50a846d2692e96807ff907e332c1392af2b566f +Author: Jeffrey Morgan +Date: Tue Nov 24 16:36:50 2015 -0500 + + Travis: install wine on linux + + Signed-off-by: Jeffrey Morgan + +commit 94a55bc87ea827120b79141ac7461eb8dd7d920d +Author: Jeffrey Morgan +Date: Tue Nov 24 16:33:53 2015 -0500 + + Travis: lint .travis.yml + + Signed-off-by: Jeffrey Morgan + +commit 5191e30d86b928e51b5ffaf7bf65e75c30678829 +Merge: dbdbee24cc dcb4fbf5a9 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:29:33 2015 -0500 + + Merge branch 'master' of github.com:kitematic/kitematic + +commit dbdbee24cc84ef7b6577791abe90cab7ca7a97e3 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:29:29 2015 -0500 + + Travis: install on new line + + Signed-off-by: Jeffrey Morgan + +commit dcb4fbf5a9503e9c43af368cb395e40035b9241b +Author: Jeffrey Morgan +Date: Tue Nov 24 16:27:55 2015 -0500 + + Update README.md + +commit 637306b03c466d75a087ee5aba8b40b3574cecaf +Author: Jeffrey Morgan +Date: Tue Nov 24 16:26:08 2015 -0500 + + Remove circle.yml + + Signed-off-by: Jeffrey Morgan + +commit 30118cfd7fe59f06af003b8d733412ab74ab5583 +Author: Jeffrey Morgan +Date: Tue Nov 24 16:19:58 2015 -0500 + + Travis: release script + + Signed-off-by: Jeffrey Morgan + +commit 179f437c35f61fcc1e0fc19b65bc2db1c8b08b09 +Author: Jeffrey Morgan +Date: Tue Nov 24 15:55:19 2015 -0500 + + Travis: fix node version + + Signed-off-by: Jeffrey Morgan + +commit f03f307b5787fa9352e8b2f1733da7c77dfa1533 +Author: Jeffrey Morgan +Date: Tue Nov 24 15:45:08 2015 -0500 + + Travis: use build matrix for dual os + +commit d804a20527fc156018213f81f61d1e7d199c7c76 +Author: Jeffrey Morgan +Date: Tue Nov 24 15:41:32 2015 -0500 + + Travis: add linux build + + Signed-off-by: Jeffrey Morgan + +commit 80f01815a8668076392da894fa5279a029eee80b +Author: Jeffrey Morgan +Date: Tue Nov 24 15:28:59 2015 -0500 + + Travis: run release-mac + + Signed-off-by: Jeffrey Morgan + +commit d060ef4d2a203f074915495b8fc56c0b9c72e363 +Merge: 71780b947e 7b79874a8a +Author: Alexandre Vazquez +Date: Tue Nov 24 21:24:39 2015 +0100 + + Merge remote-tracking branch 'refs/remotes/kitematic/master' + +commit 7b79874a8a4268b4f57cf24608306d93d56a66dc +Author: Jeffrey Morgan +Date: Tue Nov 24 15:15:41 2015 -0500 + + Temporary release-mac task + + Signed-off-by: Jeffrey Morgan + +commit 750af65ffcb31868a4cf6b61588ff7857531f59d +Author: Jeffrey Morgan +Date: Tue Nov 24 15:03:00 2015 -0500 + + Fix release command + + Signed-off-by: Jeffrey Morgan + +commit 875144508522fbdb6c4449bf87d620f0f48375cd +Author: Jeffrey Morgan +Date: Tue Nov 24 14:50:03 2015 -0500 + + Chmod +x release script + + Signed-off-by: Jeffrey Morgan + +commit 52dbf1a91d63a5c30aa0c3b26bc59af13898081d +Author: Jeffrey Morgan +Date: Tue Nov 24 14:49:40 2015 -0500 + + Move release script to ci directory + + Signed-off-by: Jeffrey Morgan + +commit a4d768538afb2f14e270509343c67b13ba3f6ddf +Author: Aidan Hobson Sayers +Date: Fri Nov 20 13:35:43 2015 +0000 + + Make releaseLayers iterative rather than recursive, remove useless func + + Signed-off-by: Aidan Hobson Sayers + +commit 11e766b23deac83dae4311d7d6369e200bffec92 +Author: Jeffrey Morgan +Date: Tue Nov 24 14:29:30 2015 -0500 + + Travis: temporarily remove wine + + Signed-off-by: Jeffrey Morgan + +commit 85c3c6865ef4eb334f9fbdec6dd270d525b68914 +Author: David Calavera +Date: Tue Nov 24 13:35:02 2015 -0500 + + Split container backend into several specialized interfaces. + + Signed-off-by: David Calavera + +commit 38abba9e2c8f7ac27bd26bf98685b51585922317 +Author: David Calavera +Date: Tue Nov 24 12:55:45 2015 -0500 + + Move versioned references of inspect functions to the daemon. + + Leaving only one versioned main function that a backend must implement. + + Signed-off-by: David Calavera + +commit fa8d96ebe21f5bb83e4d2da8e59234e701a8ee70 +Author: Dong Chen +Date: Wed Nov 4 17:38:05 2015 -0800 + + Add container package for container APIs. + + Signed-off-by: Dong Chen + +commit a5bf10f37e150873fe5c0a6b5bccd8ac145bee58 +Author: Dong Chen +Date: Wed Nov 4 17:27:21 2015 -0800 + + move container files to a separate folder. Following changes will update them. + + Signed-off-by: Dong Chen + +commit a2ab05098d1033f6b282ccaf7301f2a31eda1a9c +Merge: 0dec4403b0 ed4d236e04 +Author: David Calavera +Date: Tue Nov 24 11:01:33 2015 -0800 + + Merge pull request #17924 from aaronlehmann/content-addressability + + Content addressability + +commit bd84f3cce1a13af2c609f3bb3c7b7f65f6fddb0c +Author: Ying Li +Date: Tue Nov 24 13:45:02 2015 -0500 + + Address review comments. + Thanks @mtrmac! + + Signed-off-by: Ying Li + +commit de0b2efd2afa6594baa0e536ea601bad6fb6c5a5 +Author: Guillaume Hain +Date: Sat Jun 20 12:28:00 2015 +0200 + + Implement Linux support + +commit 2d8de479ce0c59cbebec0fdf7946f7fc60827c1b +Author: Jeffrey Morgan +Date: Tue Nov 24 13:33:50 2015 -0500 + + Add wine to travis ci + + Signed-off-by: Jeffrey Morgan + +commit 0dec4403b0a6f5f56d37e22565bf060da8f399df +Merge: ac055a7d54 92756bdcdd +Author: Alexander Morozov +Date: Tue Nov 24 10:31:52 2015 -0800 + + Merge pull request #18150 from unclejack/add_python_dev + + Dockerfile: add python-dev to fix Python.h errors + +commit ebf4db144228285fd58faadddcf4827821e4c8a6 +Author: Carol Fager-Higgins +Date: Tue Nov 17 12:43:13 2015 -0800 + + added missing code to upgrade to Enable the Docker daemon as a service and then start it + + edited link on emergency access to DTR in adminguide + added message in RN regarding LDAP accepting only lowercase names + added note in accts doc that expanded on RN about first creating a repo before pushing + edits based on convo with mary on RN and accts + added to the RNs about namespace workaround and LDAP auth + release notes for 1.4.1 + fixed small typos to RNs + changed word in RN + corrected date in RN to tomorrow + fixed errant numbering + + tiny typo in RN--good to go + + Signed-off-by: Carol Fager-Higgins + +commit 11c5c223ef2efe841b894cfa27728dd700cb84d1 +Author: Jeffrey Morgan +Date: Tue Nov 24 13:26:02 2015 -0500 + + Add npm release and fix travis build + + Signed-off-by: Jeffrey Morgan + +commit 8930fa25d6f4a94abb4605ac4c2c936a77b9be05 +Merge: c1c1dceb59 6e89a5708f +Author: Daniel Nephin +Date: Tue Nov 24 13:25:21 2015 -0500 + + Merge pull request #2387 from dnephin/update_release_notes + + cherry-pick release notes from 1.5.1 + +commit 6e89a5708fab417b54d8b5b498abe38e621afde9 +Author: Daniel Nephin +Date: Thu Nov 12 13:23:04 2015 -0500 + + cherry-pick release notes from 1.5.1 + + Signed-off-by: Daniel Nephin + +commit 0ed907553bc056767594bd4dd4b2e1c5a38430a2 +Merge: b384833401 c365db437b +Author: Guillaume Hain +Date: Tue Nov 24 19:18:30 2015 +0100 + + Merge remote-tracking branch 'upstream/master' + +commit 17d4e829441a76e31d4c9ed2cec37e154f6e4661 +Author: Morgan Bauer +Date: Mon Nov 23 12:59:51 2015 -0800 + + Formatting content digest calculation to avoid copyright symbols + + - resolves #1197 + + Signed-off-by: Morgan Bauer + +commit 1d8d198037661b9d00ab3a2ea2c87ffb6f2609eb +Author: Jeffrey Morgan +Date: Tue Nov 24 13:12:57 2015 -0500 + + Remove unused logos, bump version + + Signed-off-by: Jeffrey Morgan + +commit c365db437b185ab3e97c35fd86e184c82aeeee67 +Author: Jeffrey Morgan +Date: Tue Nov 24 13:11:31 2015 -0500 + + Fix after_script + + Signed-off-by: Jeffrey Morgan + +commit 7b483fe0ee7037d494a7c6e497fd879362c7b71b +Author: Nathan LeClaire +Date: Fri Nov 13 13:26:31 2015 -0800 + + Revise CommandLine interface to contain libmachine client and store + + Signed-off-by: Nathan LeClaire + +commit ac055a7d54dfec1763ea67ba037e689638c59762 +Merge: 48c7a1618d 985175fd8f +Author: Alexander Morozov +Date: Tue Nov 24 09:54:59 2015 -0800 + + Merge pull request #18196 from cpuguy83/18190_on_your_marks + + Fix race in locker call to `dec()` + +commit bc2682badc029c142d5053f6d7b6fec90de79b6e +Author: Aditi Rajagopal +Date: Tue Nov 24 12:47:35 2015 -0500 + + Checkers on docker_cli_pull_local_test.go + + Applying #16756 to integration-cli/docker_cli_pull_local_test.go + + Signed-off-by: Aditi Rajagopal + +commit 55f0bbe16484a217095a77e3b021c1ee0a58b8c4 +Author: Jeffrey Morgan +Date: Tue Nov 24 12:51:15 2015 -0500 + + Add proper release command to Travis + + Signed-off-by: Jeffrey Morgan + +commit ed4d236e04e1a5724de578654939e3a42f7466cc +Author: Tonis Tiigi +Date: Wed Nov 18 14:21:23 2015 -0800 + + Remove graph package + + The graph package is no longer used for tag, image, or layer storage. + + Signed-off-by: Tonis Tiigi + +commit 4352da7803d182a6013a5238ce20a7c749db979a +Author: Tonis Tiigi +Date: Wed Nov 18 14:20:54 2015 -0800 + + Update daemon and docker core to use new content addressable storage + + Add distribution package for managing pulls and pushes. This is based on + the old code in the graph package, with major changes to work with the + new image/layer model. + + Add v1 migration code. + + Update registry, api/*, and daemon packages to use the reference + package's types where applicable. + + Update daemon package to use image/layer/tag stores instead of the graph + package + + Signed-off-by: Aaron Lehmann + Signed-off-by: Tonis Tiigi + +commit 5fc0e1f324b05ce8cc7536cd807995c629e0843d +Author: Tonis Tiigi +Date: Wed Nov 18 14:19:45 2015 -0800 + + Add migratev1 package + + Signed-off-by: Tonis Tiigi + +commit 694df3ff9f0f6b6acd4f3d866d443c740cce3f3f +Author: Aaron Lehmann +Date: Wed Nov 18 14:18:44 2015 -0800 + + Add distribution package + + Signed-off-by: Aaron Lehmann + +commit 01ba0a935b9227583ec05a96e85273cc2276bb93 +Author: Tonis Tiigi +Date: Wed Nov 18 14:18:07 2015 -0800 + + Add image store + + The image store abstracts image handling. It keeps track of the + available images, and makes it possible to delete existing images or + register new ones. The image store holds references to the underlying + layers for each image. + + The image/v1 package provides compatibility functions for interoperating + with older (non-content-addressable) image structures. + + Signed-off-by: Tonis Tiigi + +commit 7de380c5c673411639d84e07c29830eb81cb1c8d +Author: Aaron Lehmann +Date: Wed Nov 18 14:16:21 2015 -0800 + + Add tag store + + The tag store associates tags and digests with image IDs. This + functionality used to be part of graph package. This commit splits it + off into a self-contained package with a simple interface. + + Signed-off-by: Aaron Lehmann + +commit 500e77bad0b19b3b1c8e6ac195485adcb70daef1 +Author: Derek McGowan +Date: Wed Nov 18 14:15:00 2015 -0800 + + Add layer store + + Layer store manages read-only and read-write layers on a union file system. + Read only layers are always referenced by content addresses. + Read-write layer identifiers are handled by the caller but upon registering + its difference, the committed read-only layer will be referenced by content + hash. + + Signed-off-by: Derek McGowan (github: dmcgowan) + Signed-off-by: Tonis Tiigi + +commit 1c183201445e2aef71c16421e558f31bb841a0b6 +Author: Jeffrey Morgan +Date: Tue Nov 24 12:31:40 2015 -0500 + + Sign + + Signed-off-by: Jeffrey Morgan + +commit 48c7a1618db26568a8841632565f651cea2a8b39 +Merge: 56305adf4a ad179e0e95 +Author: moxiegirl +Date: Tue Nov 24 09:30:15 2015 -0800 + + Merge pull request #18195 from tophj-ibm/doc-link-fixes + + Fixed broken links, and updated some to https + +commit d65e23600e032e4e48acd5a916abe5962e6702c1 +Merge: 56665a82e4 b7745d7bc4 +Author: David Gageot +Date: Tue Nov 24 18:02:17 2015 +0100 + + Merge pull request #2402 from jeanlaurent/os-specific + + Add test on os specific code + +commit 985175fd8f8f662d5067bd62a89330e9a437375c +Author: Brian Goff +Date: Tue Nov 24 11:52:18 2015 -0500 + + Fix race in locker call to `dec()` + + Can't safely use uint32 for locker since we need to decrement the count, + which requires loading the unit and doing some math, which is inherintly + racey. + Instead use Int32 which we can safely use with atomic and AddInt32 with + `-1` + + Signed-off-by: Brian Goff + +commit c1c1dceb59c340fca0998a2ec3134385a48c8e57 +Merge: 88e9c1ccd9 e40670207f +Author: Aanand Prasad +Date: Tue Nov 24 16:45:04 2015 +0000 + + Merge pull request #2453 from dnephin/fix_test_assertion + + Add missing assert and autospec + +commit 88e9c1ccd93f568dbc7e08e7faa1454716c73165 +Merge: 689f040c97 2351e11cc8 +Author: Aanand Prasad +Date: Tue Nov 24 16:44:53 2015 +0000 + + Merge pull request #2438 from dnephin/fix_flaky_pull_test + + Fix `build --pull` test flakes + +commit b7745d7bc493601700c58b8a9973de459f5a715a +Author: Jean-Laurent de Morlhon +Date: Tue Nov 24 16:00:43 2015 +0100 + + Add Test on VTX Detection + + Signed-off-by: Jean-Laurent de Morlhon + +commit 689f040c97ed5500b066dd187bd386b22e47619b +Merge: 50bc734492 6224b6edd9 +Author: Aanand Prasad +Date: Tue Nov 24 15:56:05 2015 +0000 + + Merge pull request #2429 from dnephin/fix_links_in_readme + + Fix use case link in readme + +commit e40670207f358622e7e2b3f7b73f389dc2bbf63e +Author: Daniel Nephin +Date: Tue Nov 24 10:40:36 2015 -0500 + + Add missing assert and autospec. + + Signed-off-by: Daniel Nephin + +commit ad179e0e957a58181d71838eb0c2c7c019b4b2fb +Author: Christopher Jones +Date: Tue Nov 24 10:32:43 2015 -0500 + + Fixed broken links, and updated some to https + + Signed-off-by: Christopher Jones + +commit 1b58372fa7a8e225b763207319033761adc56a97 +Author: Jeffrey Morgan +Date: Tue Nov 24 10:38:57 2015 -0500 + + Run integration tests on travis + + Signed-off-by: Jeffrey Morgan + +commit 29ad1d3de277af3c942846f01b50185361bea016 +Author: Jeffrey Morgan +Date: Tue Nov 24 10:28:46 2015 -0500 + + Brew tap repair + + Signed-off-by: Jeffrey Morgan + +commit 56665a82e4ec22906452733920c023025704f570 +Merge: f82ae1c252 9039cbba3d +Author: David Gageot +Date: Tue Nov 24 16:23:22 2015 +0100 + + Merge pull request #2385 from dgageot/2086-add-error-column-to-ls + + Add an errors column to docker-machine ls + +commit 50bc7344920bff747145eb8b771cf7fd0020aed8 +Merge: 83ddec8df7 3fdf0f43be +Author: Aanand Prasad +Date: Tue Nov 24 15:21:37 2015 +0000 + + Merge pull request #2427 from dnephin/note_about_pip_version + + Add note about required pip version. + +commit 42a583b2eb8356acd9574e5ecfc546ff5050f6f9 +Author: Jeffrey Morgan +Date: Tue Nov 24 10:19:24 2015 -0500 + + Speed up travis build + + Signed-off-by: Jeffrey Morgan + +commit f82ae1c252bc9e7300c06fa0eeebf3852588d455 +Merge: 2beb59fdff 5941ac8cfe +Author: David Gageot +Date: Tue Nov 24 16:07:02 2015 +0100 + + Merge pull request #2399 from dgageot/update-dependencies + + Update dependencies + +commit 2beb59fdff02667ee9989946c8f6411d9f33e328 +Merge: 798217fb10 acbab1f83b +Author: David Gageot +Date: Tue Nov 24 16:06:08 2015 +0100 + + Merge pull request #2401 from betawaffle/packet-driver-link + + Add Packet driver + +commit 84a40bcc06b00ed846b212da2614105e9431a501 +Author: Jean-Laurent de Morlhon +Date: Tue Nov 24 16:00:19 2015 +0100 + + Refactor OS Specific code + + And introduce Per-OS testing + + Signed-off-by: Jean-Laurent de Morlhon + +commit acbab1f83bd137154fa00021e92b87ed27df78d4 +Author: Andrew Hodges +Date: Tue Nov 24 09:05:19 2015 -0500 + + Add Packet driver + + Signed-off-by: Andrew Hodges + +commit 798217fb100f63ac790e490ebc0a94baf142c2f0 +Merge: aa0b9ea478 84199a12e3 +Author: David Gageot +Date: Tue Nov 24 15:05:25 2015 +0100 + + Merge pull request #2398 from dgageot/virtual-box-tests + + Improve VirtualBox driver test coverage + +commit 5941ac8cfefe31b54200e0397046d30da164cf67 +Author: David Gageot +Date: Tue Nov 24 11:40:48 2015 +0100 + + Update github.com/skarademir/naturalsort dependency + + Signed-off-by: David Gageot + +commit aa0b9ea478cd506f182cb1b7080645a91f6f4f53 +Merge: f9979c285d 3a332c8d47 +Author: Jean-Laurent de Morlhon +Date: Tue Nov 24 12:26:11 2015 +0100 + + Merge pull request #2397 from dave-tucker/bashfix2 + + Only run integration tests on Bash 4.1 or later + +commit 56305adf4a40d3e52fad8aa74db6be4d641dc8f6 +Merge: 3a109fcfa2 4d66f18be0 +Author: Sebastiaan van Stijn +Date: Tue Nov 24 12:01:17 2015 +0100 + + Merge pull request #18188 from wenchma/doc_update + + Correct some typos for docs + +commit 84199a12e33432e81b41990c1affe7c5485e44e0 +Author: David Gageot +Date: Tue Nov 24 10:22:34 2015 +0100 + + Improve test coverage + + Signed-off-by: David Gageot + +commit 3a332c8d47d7337dbc3366db534986410c5afcc6 +Author: Dave Tucker +Date: Tue Nov 24 09:58:43 2015 +0000 + + Only run integration tests on Bash 4.1 or later + + Fixes #2200 + + Signed-off-by: Dave Tucker + +commit 3a109fcfa2d5915f47d1ce7d98db2053b1bc3f74 +Merge: ae1fadeb96 d53a9bcb13 +Author: Vincent Demeester +Date: Tue Nov 24 10:18:31 2015 +0100 + + Merge pull request #18186 from aditirajagopal/16756-docker_api_inspect_unix_test + + Checkers on docker_api_inspect_unix_test.go + +commit 9039cbba3d13f2d672edc30e74f33e9a43e3061e +Author: David Gageot +Date: Mon Nov 23 10:53:47 2015 +0100 + + FIX #2086 Add an error column to ls + + Signed-off-by: David Gageot + +commit f9979c285d0d8d271b483928d779a0561aa92d58 +Merge: 3affe5ec25 19ce7b79bd +Author: David Gageot +Date: Tue Nov 24 09:13:54 2015 +0100 + + Merge pull request #2295 from nathanleclaire/more_testable_interfaces + + Move to using more testable interfaces + +commit 4d66f18be07b13cf41c48190d813fc045bb46678 +Author: Wen Cheng Ma +Date: Tue Nov 24 15:13:05 2015 +0800 + + Correct some typos for docs + + Signed-off-by: Wen Cheng Ma + +commit ae1fadeb96c8f64f1eebe2b729c07048398de013 +Merge: 919a068fb6 a15b67b1af +Author: Tianon Gravi +Date: Mon Nov 23 19:47:10 2015 -0800 + + Merge pull request #17714 from mikedougherty/cs-release-fixes + + Fixes for release scripts + +commit 19ce7b79bd8f8f2c6bc46beae3a71cda45fbfd73 +Author: Nathan LeClaire +Date: Fri Nov 13 13:26:31 2015 -0800 + + Revise CommandLine interface to contain libmachine client and store + + Signed-off-by: Nathan LeClaire + +commit d53a9bcb13f7a37c8735c9ff4c336b7f021c6137 +Author: Aditi Rajagopal +Date: Mon Nov 23 22:01:23 2015 -0500 + + Checkers on docker_api_inspect_unix_test.go + + Applying #16756 to integration-cli/docker_api_inspect_unix_test.go + + Signed-off-by: Aditi Rajagopal + +commit a15b67b1affb2eac5365614e55703f43b6f73e9b +Author: Mike Dougherty +Date: Wed Nov 4 17:17:37 2015 -0800 + + Fixes for release scripts: + + Add a flag to allow keeping bundles around (helps with CI) + + Fix several problems in repo make targets + + * quote DOCKER_EXPERIMENTAL variable + * pass-through arguments for gpg provided to dpkg-sig are now quoted + properly, so passphrases with shell-interpolated symbols can be used + * when determining deb suites, don't rely on 'origin' to be + github.com/docker/docker + + Fix some issues with deb repository creation from scratch + + * Don't add empty components to the repository configuration as they + will cause failure when generating. + + Add old docker-engine-cs name to package conflicts + + Signed-off-by: Mike Dougherty + +commit 1b2afce425d859d640b64f669282133cca32a079 +Merge: 11582f5008 d71978a4ba +Author: Alexandre Beslic +Date: Mon Nov 23 17:08:11 2015 -0800 + + Merge pull request #1016 from dreilly1982/clarifyports + + Clairify port usage in multi-manager-setup.md + +commit 11582f50084b5c564c3e2d8b647ffe69765b514a +Merge: 8400fa1b1e 30b8491180 +Author: Victor Vieux +Date: Mon Nov 23 16:33:29 2015 -0800 + + Merge pull request #1358 from kynrai/patch-1 + + Update for new nsqio image + +commit 919a068fb6e38e480baaba80194b08054ae54bf1 +Merge: 4cb9d298c6 e28e4c7840 +Author: Sebastiaan van Stijn +Date: Tue Nov 24 01:30:15 2015 +0100 + + Merge pull request #18171 from MHBauer/gh7205 + + update 'top' api endpoint documentation + +commit 4cb9d298c61ce0382aebaf9806b43f79c7084efb +Merge: 18c9fe0cec 2bc57578c6 +Author: David Calavera +Date: Mon Nov 23 15:55:28 2015 -0800 + + Merge pull request #18147 from DieterReuter/sort-make-targets + + Sorting make targets and DOCKER_ENV vars in alphabetical order + +commit e28e4c7840455e97ac277a121a429f99a0c079df +Author: Morgan Bauer +Date: Mon Nov 23 09:23:52 2015 -0800 + + update 'top' api endpoint documentation + + - update example based on '-ef' behavior + - new example specifying ps args 'aux' + - resolves #7205 + + Signed-off-by: Morgan Bauer + +commit 67fcfbb90ac3a551f31bbda59bf94a921c8c2a80 +Merge: d79662f5d2 946ae12145 +Author: Victoria +Date: Mon Nov 23 18:35:31 2015 -0500 + + Merge pull request #27 from londoncalling/kitematic-contrib-guide + + Adding articles for Kitematic Contributors Guide + +commit 5cd6b3eca236df06e66777b15932b1a7fbb2e954 +Author: Stefan Berger +Date: Mon Oct 12 10:41:18 2015 -0400 + + Adjust docker-default profile when docker daemon is confined + + Adjust the docker-default profile for when the docker daemon is running in + AppArmor confinement. To enable 'docker kill' we need to allow the container + to receive kill signals from the daemon. + + Signed-off-by: Stefan Berger + +commit 6079d9d6a3b63fa8d9aa7a3981c6c37cc435bccb +Author: Stefan Berger +Date: Mon Oct 12 10:41:18 2015 -0400 + + Policy extensions for user namespaces and docker exec + + A few additions to the policy when running with user namespaces enabled + and when running 'docker exec'. + + Signed-off-by: Stefan Berger + +commit 6ebb1fc7a8dffb300b8b7203171d47eaec285b77 +Author: Ying Li +Date: Mon Nov 23 18:05:10 2015 -0500 + + Just connect to mysql as root, rather than as dockerdemo user with password. + + Signed-off-by: Ying Li + +commit dbcb56b3bf6ed1b30bda8ae52763d627a3c6c829 +Author: Ying Li +Date: Fri Nov 20 15:47:35 2015 -0800 + + Renamed keystoremanager to certs, and KeyStoreManager to Manager. + + Since it no longer depends upon KeyStore, nor does it manipulate keys + in any way. + + Signed-off-by: Ying Li + +commit 18c9fe0cecda1d8eafe2b8be732fd08640140617 +Merge: aa22191093 ffd36a14e7 +Author: Alexander Morozov +Date: Mon Nov 23 13:57:42 2015 -0800 + + Merge pull request #18175 from crosbymichael/arm-doc + + Change and move ARM.md doc to project + +commit ffd36a14e7a2d0eef2e3b20b42045ae1c6c90957 +Author: Michael Crosby +Date: Mon Nov 23 13:54:17 2015 -0800 + + Move arm info to project/ + + Signed-off-by: Michael Crosby + +commit 2ec186377eef75efafb58c56ea4ebb673e60b9fd +Author: Michael Crosby +Date: Mon Nov 23 13:53:54 2015 -0800 + + Remove scaleway info + + Signed-off-by: Michael Crosby + +commit aa22191093e5becfa8167e4961b617f15a81894a +Merge: 9687008378 3aa70c1948 +Author: David Calavera +Date: Mon Nov 23 12:43:04 2015 -0800 + + Merge pull request #17356 from HuKeping/warn-on-oom + + Warning out when disalbe oom killer but not set the memory limit + +commit 3affe5ec2564d7c217b2183dc23a356866a0d82e +Merge: 4f4f20fd4f 865133aa40 +Author: Nathan LeClaire +Date: Mon Nov 23 12:15:19 2015 -0800 + + Merge pull request #2391 from dgageot/update-dependencies-google + + Update Google Driver dependencies + +commit 4f4f20fd4f90c1fc0bfa4f3783b3cbc82e820c42 +Merge: 480051c1f7 198ab07be0 +Author: Nathan LeClaire +Date: Mon Nov 23 11:33:29 2015 -0800 + + Merge pull request #2394 from dgageot/update-digitalocean-deps + + Update digital ocean driver dependencies + +commit 5cfa13ae486ec2305ee31eaf89e3ec17dd84610b +Author: Aditi Rajagopal +Date: Thu Nov 19 02:15:38 2015 +0100 + + Checkers on integration-cli/docker_api_info_test + + Applying #16756 to integration-cli/docker_api_info_test.go + + Signed-off-by: Aditi Rajagopal + +commit 8400fa1b1eb2ebe5fbf9065571f72e1c3a275a74 +Merge: 3cc7a426e3 94d84a618c +Author: moxiegirl +Date: Mon Nov 23 10:58:52 2015 -0800 + + Merge pull request #1371 from pwnall/image_docs + + Document filter usage in image building + +commit 4db8fe5c48789c28850ea6b5f13f7bcd99e0fd33 +Author: Jeffrey Morgan +Date: Mon Nov 23 13:48:45 2015 -0500 + + Remove after script for now + + Signed-off-by: Jeffrey Morgan + +commit 968700837890c2a5d1dc41aa871f3c94aca07640 +Merge: 05d1a5aed6 6f6f10a75f +Author: Alexander Morozov +Date: Mon Nov 23 10:38:45 2015 -0800 + + Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM + + remove journald to fix dynbinary build on ARM + +commit 94d84a618cbef52d7989fc579fbf38afd4034450 +Author: Victor Costan +Date: Tue Nov 3 02:44:09 2015 -0500 + + Document filter usage in image building. + + Signed-off-by: Victor Costan + +commit 05d1a5aed6ba27ba5f03ba798beb4fb4f11de9e2 +Merge: 804d2f73c8 ca94adc7c1 +Author: Tianon Gravi +Date: Mon Nov 23 10:35:15 2015 -0800 + + Merge pull request #18152 from rgl/master + + mkimage-arch: remove the test container after run + +commit eeaf2d1f7ad85be0b4b5d562f9a5d49bfadf498a +Author: Jeffrey Morgan +Date: Mon Nov 23 13:33:55 2015 -0500 + + Run after script + + Signed-off-by: Jeffrey Morgan + +commit 533f33271a9be73546673aa9aacd823ca8ea9c38 +Author: Daniel Nephin +Date: Tue Nov 17 13:35:28 2015 -0500 + + Move service sorting to config package. + + Signed-off-by: Daniel Nephin + +commit effa9834a5722d2f5f5738087f0207c1eca9fd0b +Author: Daniel Nephin +Date: Fri Nov 13 19:49:14 2015 -0500 + + Remove unnecessary intermediate variables in get_container_host_config. + + Signed-off-by: Daniel Nephin + +commit dac75b07dc16d9b6f08654301dd9ddd5d0b48393 +Author: Daniel Nephin +Date: Fri Nov 13 19:40:10 2015 -0500 + + Move volume parsing to config.types module + + This removes the last of the old service.ConfigError + + Signed-off-by: Daniel Nephin + +commit efec2aae6c86b6577f30451d54ac7030dbf39b13 +Author: Daniel Nephin +Date: Fri Nov 13 18:58:24 2015 -0500 + + Fixes #2008 - re-use list_or_dict schema for all the types + + At the same time, moves extra_hosts validation to the config module. + + Signed-off-by: Daniel Nephin + +commit 12b82a20ff331f420c040dbb9cf1ea44fd74d7d5 +Author: Daniel Nephin +Date: Fri Nov 13 18:29:25 2015 -0500 + + Move restart spec to the config.types module. + + Signed-off-by: Daniel Nephin + +commit 068edfa31345760d334b952d27e546077b077388 +Author: Daniel Nephin +Date: Fri Nov 13 18:20:09 2015 -0500 + + Move parsing of volumes_from to the last step of config parsing. + + Includes creating a new compose.config.types module for all the domain objects. + + Signed-off-by: Daniel Nephin + +commit c9ca5e86b0e8e0e1c8cd2345da5a55739b430242 +Author: Daniel Nephin +Date: Fri Nov 13 17:39:02 2015 -0500 + + Remove project name validation + + project name is already normalized to a valid name before creating a service. + + Signed-off-by: Daniel Nephin + +commit 804d2f73c8996600b3d57c69267c3131da2d3b37 +Merge: 86377e541d 463c53c715 +Author: Alexander Morozov +Date: Mon Nov 23 10:21:52 2015 -0800 + + Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test + + Checkers on integration-cli/docker_api_images_test + +commit 9c3c50faff29a79f3131b3cf019f4fcd0672e27d +Merge: 54f9743402 23b1b12b10 +Author: Richard Scothern +Date: Mon Nov 23 10:14:31 2015 -0800 + + Merge pull request #1198 from jonboulle/master + + README: fix formatting of docker-registry link + +commit 83ddec8df763a20927bae374c5c3556ba05568d3 +Merge: 665de9a494 13081d4516 +Author: Aanand Prasad +Date: Mon Nov 23 18:01:22 2015 +0000 + + Merge pull request #2439 from solarce/sol-matrix-trusty-fix + + Fixing matrix include so `os: linux` goes to trusty + +commit 3cc7a426e3921decccacf3a6c820505da851f98c +Merge: 62c5d4b47a 76f35282cb +Author: Alexandre Beslic +Date: Mon Nov 23 09:55:43 2015 -0800 + + Merge pull request #1376 from bfirsh/fix-typo-in-docs + + Fix first sentence in docs + +commit 62c5d4b47af858c29ab051d19e899a7a6963cb6f +Merge: 08502d37fa 99846a0b85 +Author: Alexandre Beslic +Date: Mon Nov 23 09:54:00 2015 -0800 + + Merge pull request #1392 from MHBauer/issue1367 + + add newline to event json to match docker + +commit 665de9a49467267c98bdd803ad13193d3932717c +Merge: aafacd3495 b4edf0c454 +Author: Aanand Prasad +Date: Mon Nov 23 17:51:54 2015 +0000 + + Merge pull request #2436 from dnephin/reduce_cyclomatic_complexity + + Reduce cyclomatic complexity + +commit 86377e541db6acb8a3a175b9e4805e5a08792e0d +Merge: 097bc4881f bb50f25b35 +Author: Sebastiaan van Stijn +Date: Mon Nov 23 18:42:38 2015 +0100 + + Merge pull request #18157 from Djelibeybi/master + + Fix CHANGELOG.md + +commit 198ab07be0d4a249e6d83f5eda5d42b21e43a8f6 +Author: David Gageot +Date: Mon Nov 23 17:52:42 2015 +0100 + + Update digital ocean dependencies + + Signed-off-by: David Gageot + +commit 480051c1f707c14906e6b182fc207681cb21e4b5 +Merge: 2b55e22eed 9abe8d9848 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 18:13:19 2015 +0100 + + Merge pull request #2393 from afscrome/patch-1 + + Clarifying description of hyperv-disk-size + +commit 097bc4881f37d4154c88874ee16fbaf1e346a193 +Merge: 2bc792e3bb a70079ea23 +Author: James Turnbull +Date: Mon Nov 23 11:59:22 2015 -0500 + + Merge pull request #18167 from duglin/FixTagHelp + + Add more to tag's -f flag's help + +commit 2bc792e3bb0f444ce25f112f604149da26a217b4 +Merge: 5017a5dd69 bfe711bed3 +Author: James Turnbull +Date: Mon Nov 23 11:57:46 2015 -0500 + + Merge pull request #18132 from WeiZhang555/api-changelog + + Add API change to docs + +commit 5017a5dd69bae79368fb82e80b85a8cd5ac73d34 +Merge: 1d1de645fd 5bf4766fca +Author: Sebastiaan van Stijn +Date: Mon Nov 23 17:57:28 2015 +0100 + + Merge pull request #18161 from duglin/Issue18017 + + Add some docs about build-arg's impact on the cache + +commit 5bf4766fcaae80b80d53cce88987a8d3a9ac357e +Author: Doug Davis +Date: Mon Nov 23 03:08:21 2015 -0800 + + Add some docs about build-arg's impact on the cache + + Closes #18017 + + Signed-off-by: Doug Davis + +commit 865133aa400ce89244827539a488e13c0f8af866 +Author: David Gageot +Date: Mon Nov 23 16:43:05 2015 +0100 + + Update Google Driver dependencies + + Signed-off-by: David Gageot + +commit 9abe8d98487ca1da79c9c99bcc8cd94b53070bdb +Author: Alex Crome +Date: Mon Nov 23 16:35:40 2015 +0000 + + Clarifying description of hyperv-disk-size + + Making clear the value is a maximum for a dynamic disk not the actual size of a fixed size disk. + + Signed-off-by: Alex Crome + +commit b4edf0c45481acb8d780de9ff73156fb7c581337 +Author: Daniel Nephin +Date: Mon Nov 23 11:34:48 2015 -0500 + + Move parallel_execute to a new module. + + Signed-off-by: Daniel Nephin + +commit d68f80ee6af245d6a4f4c610a2a79222ecdebc1e +Author: Jeffrey Morgan +Date: Mon Nov 23 11:03:50 2015 -0500 + + Add tests to .travis.yml + + Signed-off-by: Jeffrey Morgan + +commit 99ee78906d74c3e0ea748891337d3c4e06ae7411 +Author: Jeffrey Morgan +Date: Mon Nov 23 10:56:08 2015 -0500 + + Dont update + + Signed-off-by: Jeffrey Morgan + +commit c87f44b6df7a63d57937d3720582008832097d2b +Author: Jeffrey Morgan +Date: Mon Nov 23 10:52:06 2015 -0500 + + Brew install nodejs + + Signed-off-by: Jeffrey Morgan + +commit 7348ce48e2f1ad51711f6537617e56b6b6aa8dd1 +Author: Jeffrey Morgan +Date: Mon Nov 23 10:49:30 2015 -0500 + + Remove linux env in travis ci + + Signed-off-by: Jeffrey Morgan + +commit b88b9861a3b3ca534dbacaa14f0ec935d42081a5 +Author: Jeffrey Morgan +Date: Mon Nov 23 10:45:55 2015 -0500 + + Add OS X build environment + + Signed-off-by: Jeffrey Morgan + +commit 463c53c71556861c5bf6a59ce7ae2a3a90865606 +Author: Aditi Rajagopal +Date: Wed Nov 18 14:06:29 2015 +0100 + + Checkers on integration-cli/docker_api_images_test + + Applying #16756 to integration-cli/docker_api_images_test.go + + Signed-off-by: Aditi Rajagopal + +commit 08502d37fa2909db57ef0aa4bf37f67e2afddfa9 +Merge: d64a7a5f95 0b171c699a +Author: Andrea Luzzardi +Date: Mon Nov 23 16:30:27 2015 +0100 + + Merge pull request #1433 from flx42/flx42-patch-1 + + Fix typo in discovery documentation + +commit 2b55e22eed9c032baefcc4dbaa344cfe4bf8958d +Merge: a3194a2679 77d0198ec5 +Author: David Gageot +Date: Mon Nov 23 16:28:59 2015 +0100 + + Merge pull request #2390 from jeanlaurent/xhyve-driver + + Add xhyve driver + +commit a70079ea23e8a36f9b3b517f7e7e87b8e24f3526 +Author: Doug Davis +Date: Mon Nov 23 07:20:10 2015 -0800 + + Add more to tag's -f flag's help + + Was noticed in #9798 + + Signed-off-by: Doug Davis + +commit 77d0198ec5a4cfd2e89563898a4ce9961431c07a +Author: Koichi Shiraishi +Date: Sun Nov 22 04:54:19 2015 +0900 + + Add xhyve driver + + Signed-off-by: Koichi Shiraishi + +commit a3194a26795e7963c8c118006cbe88759f649f98 +Merge: e7714a4981 c2be96eac8 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 16:10:55 2015 +0100 + + Merge pull request #2389 from dgageot/regenerate-certs + + Make user supplied input more obvious + +commit c2be96eac831c9ac617a2e7e363abee61872ee6a +Author: David Gageot +Date: Mon Nov 23 15:52:39 2015 +0100 + + Make user supplied input more obvious + + Signed-off-by: David Gageot + +commit e7714a4981f6c9a0c95cd7066c6097d84db57b0c +Merge: 11f973953f cefb237cc3 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 15:50:35 2015 +0100 + + Merge pull request #2379 from wenlock/master + + Add reference for HPE OneView plugin + +commit 11f973953f1240c4017f9253a91df272e2ecf57a +Merge: 5de73f28d4 b041af0d64 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 15:50:11 2015 +0100 + + Merge pull request #2382 from janeczku/link-to-vultr-driver + + Add VULTR to available driver plugins list + +commit aafacd3495d774b522251de8c6362e2209329a45 +Merge: c4096525c2 1e8f76767f +Author: Aanand Prasad +Date: Mon Nov 23 14:48:04 2015 +0000 + + Merge pull request #2418 from dnephin/fix_env_with_extends + + Fix env_file and environment when used with extends + +commit bfe711bed342202ed0918a309b2000bb158c4eb7 +Author: Zhang Wei +Date: Fri Nov 20 19:41:25 2015 +0800 + + Add API change to docs + + Add API change description to docs due to `docker network inspect` + returns different data structure. + + Signed-off-by: Zhang Wei + +commit 3243e504d01ea1efa141f3e3cc296903d7d62ca4 +Author: Aidan Hobson Sayers +Date: Fri Nov 20 16:49:33 2015 +0000 + + Ensure adding a broken tar doesn't silently fail + + Signed-off-by: Aidan Hobson Sayers + +commit 5de73f28d4f1b132a9e312351bd0e16b5e31af25 +Merge: 9a7414fc80 978c2e2a2b +Author: David Gageot +Date: Mon Nov 23 14:25:26 2015 +0100 + + Merge pull request #2387 from jeanlaurent/contributing + + Fix #2178 - add `go get lint` to contributing guide + +commit 9a7414fc80f40b985099edc49138b05dfd2c3161 +Merge: fc1c140c6e f4cada3867 +Author: David Gageot +Date: Mon Nov 23 14:20:03 2015 +0100 + + Merge pull request #2375 from jeanlaurent/vbox-test + + Move vbox integration test to core + +commit 978c2e2a2b527a58bd1b095b391ed00ea12718ff +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 13:57:55 2015 +0100 + + Fix #2178 - add go get lint to contributing guide + + Signed-off-by: Jean-Laurent de Morlhon + +commit fc1c140c6edb1279a245dfaeddc3b877faa6a014 +Merge: de6a9633ee a55bba3ed2 +Author: David Gageot +Date: Mon Nov 23 13:59:47 2015 +0100 + + Merge pull request #2356 from jeanlaurent/samalba-tls-san + + Rebase + fixes of '--tls-san' PR #1228 + +commit a55bba3ed2b34ecc3e4f4270ff358268eb029791 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 12:26:46 2015 +0100 + + Move tls-san flag to a local flag for create + + Signed-off-by: Jean-Laurent de Morlhon + +commit b6519d43e921755caefcdb54fd6faf3c79d9febd +Author: Jean-Laurent de Morlhon +Date: Thu Nov 19 17:15:11 2015 +0100 + + More readable code + + Signed-off-by: Jean-Laurent de Morlhon + +commit b82f9a850926cdc8cd66b1e3309ee830aefa40ef +Author: Sam Alba +Date: Wed May 27 17:59:51 2015 -0700 + + Implemented integration tests for --tls-san option + + Signed-off-by: Sam Alba + +commit 5b453e6305ab962b6fb1c9a38ccb262e91034ce8 +Author: Sam Alba +Date: Sun May 24 23:59:02 2015 -0700 + + Implemented '--tls-san' global arg for adding extra SANs (subject alt names) to server-side certificates + + Signed-off-by: Sam Alba + +commit f4cada3867e3b5d3f46a5a611620c1d0268cb887 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 10:37:59 2015 +0100 + + Unused hierarchy + + Signed-off-by: Jean-Laurent de Morlhon + +commit 975faf57b39021f84fd1e0a9795d5830c518cdd1 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 10:36:53 2015 +0100 + + Unused file + + Signed-off-by: Jean-Laurent de Morlhon + +commit 164bb015402e9c0cfc6e9b51b0b37ad5caabf045 +Author: Jean-Laurent de Morlhon +Date: Mon Nov 23 10:36:43 2015 +0100 + + Unused file + + Signed-off-by: Jean-Laurent de Morlhon + +commit 690215b7eca5490b979de9d69082bb388226cfe5 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 20 18:31:25 2015 +0100 + + move vbox test to core + + Signed-off-by: Jean-Laurent de Morlhon + +commit 1d1de645fd52dd2f886ca650b645c960f2cb219c +Merge: a600bf4eab f5343a039b +Author: Sebastiaan van Stijn +Date: Mon Nov 23 09:31:13 2015 +0100 + + Merge pull request #18137 from vanpire110/master + + Update understanding-docker.md again + +commit de6a9633eee855c85dac83815165cf5d7fb5be9d +Merge: 36f61732a1 42b6249a8c +Author: David Gageot +Date: Mon Nov 23 08:53:44 2015 +0100 + + Merge pull request #2377 from nathanleclaire/revendor_codegangsta_cli + + Revendor codegangsta cli + +commit a600bf4eab48a19ea9d1919f95f612cdb229c893 +Merge: 0f58421901 e7eb6687ef +Author: Vincent Demeester +Date: Mon Nov 23 08:25:33 2015 +0100 + + Merge pull request #17489 from WeiZhang555/network-rm-multi + + Enhance `docker network rm` to delete multi net + +commit bb50f25b35b5fdfc7b13cdc17f4039b92e2e6ea1 +Author: Avi Miller +Date: Mon Nov 23 15:29:07 2015 +1100 + + Fix CHANGELOG.md so that RPM changelog generation has a date value for the 1.9.1 release. + + Signed-off-by: Avi Miller + +commit d719ceb3df3cf0f836d8e93dc9cf161935421989 +Author: Sven Dowideit +Date: Fri Nov 20 10:05:53 2015 +1000 + + Fixes found by the docs-validation jenkins job + + Signed-off-by: Sven Dowideit + +commit 0f584219017d0fa9d224f1ca582f281a54e6db2b +Merge: f4b2da0145 043f447e2e +Author: moxiegirl +Date: Sun Nov 22 19:39:09 2015 -0800 + + Merge pull request #18155 from SvenDowideit/docs-validation-fixes + + Fixes found by docs validation tool + +commit 54f9743402202a7b211ccc4b95f1a57c181aba95 +Merge: 0a3acb2625 64bc8af1b9 +Author: Sven Dowideit +Date: Mon Nov 23 12:17:22 2015 +1000 + + Merge pull request #1193 from SvenDowideit/docs-validation-changes + + Doc fixes found by validation job + +commit f4b2da0145a6f530bc02a893055cc8b7e237fd87 +Merge: 49f982b7ba 414c8565be +Author: Sven Dowideit +Date: Mon Nov 23 12:09:00 2015 +1000 + + Merge pull request #18149 from jeffdm/master + + Mark Windows 10 as supported in installation docs + +commit 043f447e2e9ecb9d6f34bcee6c11f20f263baf66 +Author: Sven Dowideit +Date: Mon Nov 23 11:15:39 2015 +1000 + + Fixes found by docs validation tool + + Signed-off-by: Sven Dowideit + +commit c4f85c531a8344c401744c7c89fa27c761307144 +Author: Alexandre Beslic +Date: Sun Nov 22 15:31:57 2015 -0800 + + upgrade integration environment + + Signed-off-by: Alexandre Beslic + +commit d79662f5d2f366904077245aaebc12f5b1500249 +Merge: 00cf8fbc2c be29590197 +Author: Sebastiaan van Stijn +Date: Mon Nov 23 00:09:22 2015 +0100 + + Merge pull request #31 from SvenDowideit/use-the-build-cache + + Use the build cache for the svn checkouts of the other projects + +commit bb26c7c1649c55748dad4ccb375266f5b1b795c3 +Author: Alexandre Beslic +Date: Sun Nov 22 14:58:44 2015 -0800 + + replace deprecated --daemon flag by daemon when starting docker in test runner + + Signed-off-by: Alexandre Beslic + +commit 49f982b7bae91823c39a4f2c73d992f8ad75bd2c +Merge: 692bfdaee3 196bd38fdb +Author: Sebastiaan van Stijn +Date: Sun Nov 22 21:19:19 2015 +0100 + + Merge pull request #18029 from mmckinst/stop_hardcode_el_version + + use variable instead of hardcoding version in repo + +commit 196bd38fdbd05701294eb924755fd551b977d87c +Author: Mark McKinstry +Date: Sat Nov 21 21:51:55 2015 -0500 + + use variable instead of hardcoding version in repo + + Signed-off-by: Mark McKinstry + +commit b70a7255ff4bc5386e88322eb9d17547912302b8 +Author: Pavel Sorokin +Date: Sun Nov 22 16:51:34 2015 +0100 + + #310: Don't set Git checkbox to readonly + + Signed-off-by: Pavel Sorokin + +commit ca94adc7c1ff7719be704282fe6daf1fb57161e0 +Author: Rui Lopes +Date: Sun Nov 22 11:46:13 2015 +0000 + + mkimage-arch: remove the test container after run + + Signed-off-by: Rui Lopes + +commit 92756bdcdddc75bcf5aa7dab2c8238abdb18ab75 +Author: unclejack +Date: Sun Nov 22 12:32:10 2015 +0200 + + Dockerfile: add python-dev to fix Python.h errors + + Signed-off-by: Cristian Staretu + +commit b041af0d64170d8fa804a61405157a76b37df909 +Author: Jan Broer +Date: Sat Nov 21 23:25:40 2015 +0100 + + Adds link to VULTR driver repository + + Signed-off-by: Jan Broer + +commit e7eb6687ef7da34cd69b27cfbaf3fd8112073530 +Author: Zhang Wei +Date: Fri Oct 30 00:10:20 2015 +0800 + + Enhance `docker network rm` to delete multi net + + This commit enhance `docker network rm` command to allow user to delete + multi networks at the same time. + + Signed-off-by: Zhang Wei + +commit 414c8565be6c7edf02880ab1d64f7da4515ce593 +Author: Jeffrey Morgan +Date: Sat Nov 21 13:41:07 2015 -0500 + + Mark Windows 10 as supported in install docs + + Signed-off-by: Jeffrey Morgan + +commit 692bfdaee3b48f4e5174bb80098692a0ded1aecf +Merge: 3ff9bb5332 f8a6726dad +Author: Brian Goff +Date: Sat Nov 21 13:18:09 2015 -0500 + + Merge pull request #18146 from JamesKyburz/random-additions + + Random additions + +commit 2bc57578c604818514101fe643494b238902e49a +Author: Dieter Reuter +Date: Sat Nov 21 17:31:25 2015 +0100 + + Sort make targets and DOCKER_ENV vars in alphabetical order + + Signed-off-by: Dieter Reuter + +commit cefb237cc3b69e4b63642cf0d35d2832d7a96994 +Author: Edward Raigosa +Date: Sat Nov 21 08:04:01 2015 -0800 + + Add refrence for HPE OneView plugin + + HPE OneView plugin allows you to manage docker on + composable infrastructure using HPE OneView. + Creating a bare metal cloud is now super simple. + + Signed-off-by: Edward Raigosa + +commit 3ff9bb53326312a66fee19bc56dd2ad9c642b133 +Merge: afe6c1f30c 92600bdec1 +Author: Antonio Murdaca +Date: Sat Nov 21 17:03:24 2015 +0100 + + Merge pull request #16613 from WeiZhang555/docker-cp-symlink + + Add option `-L` to allow `docker cp` follow symbol link + +commit f8a6726daddedd33c9e14db2133b0f5321c5ff5f +Author: James Kyburz +Date: Sat Nov 21 16:00:26 2015 +0100 + + Add nauseous and pedantic + + Signed-off-by: James Kyburz + +commit 6f6f10a75f8b447637e8a89d685452871899e9c0 +Author: Stefan Scherer +Date: Thu Nov 19 17:09:20 2015 +0100 + + prevent journald from being built on ARM + + Signed-off-by: Govinda Fichtner + +commit 5c329633d7ce7adfa390e70b91c3e87c5d05ef93 +Author: Elvir Kuric +Date: Sat Nov 21 13:06:27 2015 +0100 + + mkimage-yum.sh to support dnf + included changes @tianon proposed in #17362 + + Signed-off-by: Elvir Kuric + +commit 36f61732a16feb12047cf6a53e8e8a57f019b2f2 +Merge: 863e51709a e207ae1a19 +Author: Nathan LeClaire +Date: Fri Nov 20 18:50:21 2015 -0800 + + Merge pull request #2224 from davidstosik/patch-1 + + Document command-line completion installation + +commit f5343a039bc28b5c290c72b5305436f526e81eba +Author: Jeremy Qian +Date: Sat Nov 21 10:39:46 2015 +0800 + + update docs/introduction/understanding-docker.md + + Signed-off-by: Jeremy Qian + +commit 42b6249a8c9e314afe116b0bb375647cea8db7f6 +Author: Nathan LeClaire +Date: Fri Nov 20 16:22:04 2015 -0800 + + Vendor codegangsta/cli properly + + Signed-off-by: Nathan LeClaire + +commit 23b1b12b10f538cee6b8e522eb68b329ef235bea +Author: Jonathan Boulle +Date: Fri Nov 20 17:18:25 2015 -0800 + + README: fix formatting of docker-registry link + + Signed-off-by: Jonathan Boulle + +commit f2944386dfa513db20437dcf854cf4ea786476f5 +Author: Alexandre Beslic +Date: Fri Nov 20 16:53:54 2015 -0800 + + Update Docker version in swarm-test-env Dockerfile + + Update the version of docker to 1.9.0 because of helpers + removal in hack/dind script that was mounting the cgroups. + + It's now done automatically inside the containers as of + 1.8.0. + + Signed-off-by: Alexandre Beslic + +commit afe6c1f30c9563c0f142ef56067b0afcad4512ef +Merge: 048280ca42 9ca2e4e81c +Author: Alexander Morozov +Date: Fri Nov 20 16:36:18 2015 -0800 + + Merge pull request #18135 from calavera/exec_store + + Move exec store to its own package inside the daemon. + +commit 13081d4516d6d6b8ebfebc045e78e9be6bd96b74 +Author: Brandon Burton +Date: Fri Nov 20 16:02:37 2015 -0800 + + Fixing matrix include so `os: linux` goes to trusty + + Signed-off-by: Brandon Burton + +commit 863e51709a269cb207fed0e7519b7e5a1c631f7a +Merge: c2496593fe bf52eceed5 +Author: Nathan LeClaire +Date: Fri Nov 20 15:23:38 2015 -0800 + + Merge pull request #2369 from dgageot/detect-multiple-host-only + + Detect multiple host only + +commit 048280ca42e5855bfe7850f4f30843d2ad675861 +Merge: 7caa313c82 88c1bc10c4 +Author: Michael Crosby +Date: Fri Nov 20 15:05:26 2015 -0800 + + Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm + + Increase timeouts to fix integration-cli tests on ARM + +commit 2351e11cc8410cee9472cda38b685204e6252084 +Author: Daniel Nephin +Date: Fri Nov 20 17:51:36 2015 -0500 + + Make sure we always have the latest busybox image, so that build --pull tests don't flake. + + Signed-off-by: Daniel Nephin + +commit 9ca2e4e81cdb950f2b5958a7712153d1a6dd6e4c +Author: David Calavera +Date: Fri Nov 20 17:35:16 2015 -0500 + + Move exec store to its own package inside the daemon. + + Remove double reference between containers and exec configurations by + keeping only the container id. + + Signed-off-by: David Calavera + +commit 7caa313c821a06af4f1423dbbf17d0b77ff17c31 +Merge: 6653f82796 836d0127fd +Author: David Calavera +Date: Fri Nov 20 14:39:25 2015 -0800 + + Merge pull request #18127 from KostyaSha/patch-1 + + Add Dead state to Container Inspect 1.21 API + +commit 6653f827965b431139af141fa2cc68a6513abe71 +Merge: 8022e6292e 430d8ff611 +Author: Antonio Murdaca +Date: Fri Nov 20 23:37:44 2015 +0100 + + Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates + + modifying docker --since and --until to support nanoseconds and time … + +commit 8022e6292ed8e4676fdc65ad80ee3b68629493e7 +Merge: b5c507750f aef344dcf8 +Author: Michael Crosby +Date: Fri Nov 20 14:20:12 2015 -0800 + + Merge pull request #18131 from hypriot/18124-use-startwithbusybox + + Fix integration-cli tests + +commit 88c1bc10c4c2490789953e4d6065cab6e9b1585b +Author: Stefan Scherer +Date: Fri Nov 20 23:12:12 2015 +0100 + + Increase timeouts to fix test on ARM + + Signed-off-by: Stefan Scherer + +commit 64447879d2f5a2fe5b8b50819b6620b759715a9d +Author: Daniel Nephin +Date: Tue Nov 17 12:21:47 2015 -0500 + + Reduce complexity of merge_service_dicts + + Signed-off-by: Daniel Nephin + +commit d1adbb9b259c4582b77ac90a96fe2d071fb408aa +Author: Daniel Nephin +Date: Thu Nov 12 20:44:05 2015 -0500 + + Refactor parallel_execute. + + Signed-off-by: Daniel Nephin + +commit b5c507750f2c7f616ed94ad502f5f6904cad4eac +Merge: d395134b3d 3f5b8f712d +Author: Michael Crosby +Date: Fri Nov 20 13:45:13 2015 -0800 + + Merge pull request #18051 from calavera/extract_streams + + Extract StreamConfig struct out of the daemon package. + +commit aef344dcf801b1af67bc7ce6219e636e48c28a1f +Author: Stefan Scherer +Date: Fri Nov 20 21:55:19 2015 +0100 + + Replace s.d.Start() with s.d.StartWithBusybox() + + Signed-off-by: Stefan Scherer + +commit 836d0127fdf39d5e5978bc27f54a99aea636061b +Author: Kanstantsin Shautsou +Date: Fri Nov 20 22:08:34 2015 +0300 + + Add Dead state to Container Inspect 1.21 API + + Signed-off-by: Kanstantsin Shautsou + +commit b1eea914d022d2d0e2227686ebdb43c3efbca849 +Merge: ad38e79c4f 2fd411d964 +Author: Jeffrey Morgan +Date: Fri Nov 20 15:57:55 2015 -0500 + + Merge branch 'master' of github.com:docker/toolbox + +commit ad38e79c4f4ec1f5df2978f05fe2f58d1e915c0a +Author: Jeffrey Morgan +Date: Fri Nov 20 15:57:27 2015 -0500 + + Bump versions + + Signed-off-by: Jeffrey Morgan + +commit d395134b3df59cf9377c78255c56867f126c7674 +Merge: f064b9941c 1f0dc72d4a +Author: moxiegirl +Date: Fri Nov 20 12:13:07 2015 -0800 + + Merge pull request #18094 from tophj-ibm/faq-link-fix + + Fixed docker network link in faq + +commit 3f5b8f712d693188b41b3d9b55e5e5213be48ef5 +Author: David Calavera +Date: Tue Nov 17 19:21:44 2015 -0500 + + Extract StreamConfig struct out of the daemon package. + + This is a small configuration struct used in two scenarios: + + 1. To attach I/O pipes to a running containers. + 2. To attach to execution processes inside running containers. + + Although they are similar, keeping the struct in the same package + than exec and container can generate cycled dependencies if we + move any of them outside the daemon, like we want to do + with the container. + + Signed-off-by: David Calavera + +commit 2fd411d964c4ef2235f207a3d572f726ccfea6bf +Merge: 8b5876470a 2ba581d469 +Author: Jeffrey Morgan +Date: Fri Nov 20 14:54:12 2015 -0500 + + Merge pull request #283 from sirkkalap/master + + Fail fast in case we are run without a terminal + +commit 8b5876470a506963fe427336b88aa69c8b1e1cb5 +Merge: 8be50805d9 2b28473d34 +Author: Jeffrey Morgan +Date: Fri Nov 20 14:53:18 2015 -0500 + + Merge pull request #308 from jeanlaurent/docker-machine-0.5.1 + + Bump docker-machine to 0.5.1 + +commit 3e7405aea8589f4b6b0713640596f7dee9cf7193 +Author: Antonio Murdaca +Date: Sun Nov 8 12:08:35 2015 +0100 + + Deprecate HostConfig at API container start + + Signed-off-by: Antonio Murdaca + +commit f064b9941c0c6070740339971a0bb59b4fe6195f +Merge: 8fa09749fb 1a0b483e02 +Author: Vincent Demeester +Date: Fri Nov 20 20:29:44 2015 +0100 + + Merge pull request #18073 from runcom/hostconfig-resources + + runconfig: split resources into a struct + +commit 8fa09749fb7b5560ffc7f0a73005302f99d89d01 +Merge: 6e49343202 1921c62938 +Author: David Calavera +Date: Fri Nov 20 11:24:19 2015 -0800 + + Merge pull request #17718 from wenchma/17716_before_filter_doc + + Re-implement --before and --since as options for --filter + +commit 6e49343202d77ef103eb2b4e33658b8bb18d7716 +Merge: 6980113d10 44d3f2f71a +Author: Michael Crosby +Date: Fri Nov 20 10:51:21 2015 -0800 + + Merge pull request #18067 from cpuguy83/fix_pull_space_test + + Make TestDaemonNoSpaceleftOnDeviceError linux only + +commit 6980113d104725f42f69c2ce4ce1be40b6d5bf65 +Merge: c1f11f8144 75cb2dfe91 +Author: Alexander Morozov +Date: Fri Nov 20 10:45:59 2015 -0800 + + Merge pull request #18126 from tiborvass/merge_release_v1.9.1 + + Merge release v1.9.1 + +commit c2496593fe8e8fbaa082386fea9f7a548b75de9f +Merge: 5918bd1817 8d47fe746e +Author: Nathan LeClaire +Date: Fri Nov 20 10:42:33 2015 -0800 + + Merge pull request #2359 from dgageot/test-vbox-version + + Reject VirtualBox version<=3 + +commit 75cb2dfe911c39a084b78a5b0d79d11b0792dbed +Author: Tibor Vass +Date: Fri Nov 20 13:40:25 2015 -0500 + + Bump version back to 1.10.0-dev + + Signed-off-by: Tibor Vass + +commit 1a0b483e02aff72c16871fb2f74644e091bda93c +Author: Antonio Murdaca +Date: Wed Nov 18 20:03:08 2015 +0100 + + runconfig: split resources into a struct + + Signed-off-by: Antonio Murdaca + +commit fefbb507a9c78f947e333b2e5eaf5923fc8709a8 +Author: Tibor Vass +Date: Mon Nov 9 12:36:27 2015 -0500 + + Bump version to v1.9.1 + + Signed-off-by: Tibor Vass + + Conflicts: + VERSION + +commit 5918bd1817c0664009221b34865ee392547ea1a8 +Merge: 35b2b042e1 2d8c9eeeae +Author: David Gageot +Date: Fri Nov 20 19:19:43 2015 +0100 + + Merge pull request #2313 from nathanleclaire/release_process + + Start documenting release process + +commit c1f11f81441fffc556ec0a45cb299d16ffe04947 +Merge: a76bdea21b 3cbccccb37 +Author: Jess Frazelle +Date: Fri Nov 20 13:10:55 2015 -0500 + + Merge pull request #18109 from phemmer/yum-docs-fix + + remove unnecessary echo from yum docs + +commit a76bdea21ba204b1cdc6648a182ae82355350a5f +Merge: f9a4751eeb 5aeaf2a0c4 +Author: Alexander Morozov +Date: Fri Nov 20 10:01:48 2015 -0800 + + Merge pull request #16168 from NIWAHideyuki/16164-shm-size + + Addition of "--shm-size" to which size of /dev/shm is changed + +commit 2d8c9eeeaefc600acf88c66b0d9477cdf4c915ae +Author: Nathan LeClaire +Date: Mon Nov 16 14:59:49 2015 -0800 + + Start documenting release process + + Signed-off-by: Nathan LeClaire + +commit 8d47fe746e730083de9e3ecca983d6027faf0ba3 +Author: David Gageot +Date: Thu Nov 19 19:29:15 2015 +0100 + + Reject VirtualBox version<=3 + + Signed-off-by: David Gageot + +commit bf52eceed5313a96dd165c341e06219f48e14c7f +Author: David Gageot +Date: Fri Nov 20 14:40:55 2015 +0100 + + FIX #2231 - Detect duplicate interfaces + + Signed-off-by: David Gageot + +commit 35b2b042e1bb24e929a36b5d782de1df26eedabe +Merge: 076bbf8bce 308f9d025c +Author: David Gageot +Date: Fri Nov 20 18:47:20 2015 +0100 + + Merge pull request #2374 from dgageot/more-vb-tests + + Add more tests to the VirtualBox driver + +commit 44d3f2f71a9a522597655b7c8733422fe70c39a0 +Author: Brian Goff +Date: Wed Nov 18 14:20:49 2015 +0100 + + Make TestDaemonNoSpaceleftOnDeviceError linux only + + Adds SameHostDaemon and DaemonIsLinux req's to + TestDaemonNoSpaceleftOnDeviceError + + Signed-off-by: Brian Goff + +commit 076bbf8bcef1f48647020d68406e1bab060c0845 +Merge: a8d9b498a4 ade5911b32 +Author: David Gageot +Date: Fri Nov 20 18:19:14 2015 +0100 + + Merge pull request #2373 from jeanlaurent/paused + + Fixes #2372, add test for #2356 ( stop and remove paused vm ) + +commit f9a4751eebaf1bce78be55dc2fa66d8fc45211d3 +Merge: 6e727a4c80 1814a1dac5 +Author: Vincent Demeester +Date: Fri Nov 20 18:14:21 2015 +0100 + + Merge pull request #18115 from wenchma/16756-docker_api_exec_test + + Use checker Assert for integration-cli/docker_api_exec_test.go + +commit 6e727a4c8037d3ea43913ee23f34c9babaf420eb +Merge: 7a1b05ccce 318ad1cb43 +Author: Tibor Vass +Date: Fri Nov 20 18:07:09 2015 +0100 + + Merge pull request #17456 from Microsoft/TestChtimesFix + + Fix ChTimes to prevent setting times past the Unix Max Time + +commit c4096525c206b8e3abc79de8dfafbb0a128915dd +Merge: 8bc84c74e7 6236bb0019 +Author: Daniel Nephin +Date: Fri Nov 20 11:58:04 2015 -0500 + + Merge pull request #2364 from dnephin/handle_signals_properly + + Handle SIGTERM/SIGINT properly for up and run + +commit ade5911b32120c73ee950519d1668025ba57279e +Author: Jean-Laurent de Morlhon +Date: Fri Nov 20 17:48:34 2015 +0100 + + Fixes #2372, add test for #2356 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 8bc84c74e7bc498b7a6977cd4fe4fa046ed0d470 +Merge: 331450dace d4b9845201 +Author: Daniel Nephin +Date: Fri Nov 20 11:39:38 2015 -0500 + + Merge pull request #2417 from dnephin/inlude_git_sha_in_version + + Add the git sha to version output + +commit 331450dacecf2993021254b662db8e3070c47cd6 +Merge: 91fb6156c6 e1308a8329 +Author: Daniel Nephin +Date: Fri Nov 20 11:37:54 2015 -0500 + + Merge pull request #2390 from dnephin/fix_extra_warnings_on_masked_volumes + + Fix extra warnings on masked volumes + +commit 92600bdec1284f9031868751f61bef476d2e1dbd +Author: Zhang Wei +Date: Thu Oct 1 15:56:39 2015 +0800 + + Add '-L' option for `cp` + + Fixes #16555 + + Original docker `cp` always copy symbol link itself instead of target, + now we provide '-L' option to allow docker to follow symbol link to real + target. + + Signed-off-by: Zhang Wei + +commit 91fb6156c6d0e35738b69f31f36b18942a0c498a +Merge: 46446111e5 61f91ebff7 +Author: Daniel Nephin +Date: Fri Nov 20 11:35:24 2015 -0500 + + Merge pull request #2393 from seguins/1814-restart-stopped-containers + + Fix restart with stopped containers. + +commit 46446111e5b03f7e52d9bb4f1031353bf48da59f +Merge: dd1a2b36fa c78c32c2e8 +Author: Daniel Nephin +Date: Fri Nov 20 11:33:45 2015 -0500 + + Merge pull request #2400 from dnephin/fix_stream_with_empty_object + + Fix a bug in progress_stream when an `ADD ` was used + +commit 1814a1dac54eba86616a73b9430788a8c587d4cb +Author: Wen Cheng Ma +Date: Fri Nov 20 15:03:34 2015 +0800 + + Use checker Assert for integration-cli/docker_api_exec_test.go + + Partially fix issue #16756 + + Signed-off-by: Wen Cheng Ma + +commit a8d9b498a42a36d5d72c97b51e3111c82e7fdc8b +Merge: 83a97f36ce 02da868c08 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 20 16:05:37 2015 +0100 + + Merge pull request #2365 from daehyeok/remove_paused_virtualbox + + VirtualBox: Delete machine in 'PAUSED' state + +commit 308f9d025c04e80a9d3955950faef98613967fd7 +Author: David Gageot +Date: Fri Nov 20 14:11:44 2015 +0100 + + Add more tests to virtualbox driver + + Signed-off-by: David Gageot + +commit bbe59b8020fb6d0ce5d0d3830dd451565c3ee6c4 +Author: David Gageot +Date: Fri Nov 20 13:41:18 2015 +0100 + + Don't rely on empty lines + + It could lead to creating multiple host only + interfaces + + Signed-off-by: David Gageot + +commit e812df723c081ec9d8e361376e6daecce5c206d7 +Author: David Gageot +Date: Fri Nov 20 13:38:35 2015 +0100 + + Add somes tests to virtualbox driver + + Signed-off-by: David Gageot + +commit 53c5198a5a561babd5af50df73d70c3bb23e35c0 +Author: David Gageot +Date: Thu Nov 19 19:39:02 2015 +0100 + + Use the passed VBoxManager + + This makes the code easier to test. + + Signed-off-by: David Gageot + +commit 83a97f36ce8d5b47d9b6d9e0792530277ce26824 +Merge: 854493e355 b8c9ad071d +Author: David Gageot +Date: Fri Nov 20 15:00:54 2015 +0100 + + Merge pull request #2368 from dgageot/dead-code-virtualbox + + Remove dead code in virtualbox + +commit 854493e355205beb49e848d80c80cfa54d2b7fef +Merge: e537a51926 7910dda4c1 +Author: David Gageot +Date: Fri Nov 20 14:37:39 2015 +0100 + + Merge pull request #2367 from dgageot/fix-virtualbox-doc + + Add missing env variables to VBox driver doc + +commit b8c9ad071dfee4cb318c4282a818beddcf219da3 +Author: David Gageot +Date: Fri Nov 20 14:27:59 2015 +0100 + + Remove dead code in virtualbox + + Signed-off-by: David Gageot + +commit 7910dda4c17fb69b2ce862563c02846b133efc9e +Author: David Gageot +Date: Fri Nov 20 10:02:17 2015 +0100 + + Add missing env variables to VBox driver doc + + Signed-off-by: David Gageot + +commit 7a1b05ccce18cbec4742c0a766f3424f817837df +Merge: d8ea32caa8 ad7696a787 +Author: Sebastiaan van Stijn +Date: Fri Nov 20 11:43:42 2015 +0100 + + Merge pull request #18101 from IanLee1521/patch-1 + + Fix minor grammar mistake. + +commit d8ea32caa8b312d5b3b01b4e72b8e0e56d958653 +Merge: 20905ec452 ac526193af +Author: Sebastiaan van Stijn +Date: Fri Nov 20 10:46:00 2015 +0100 + + Merge pull request #18026 from woodvi/doc-network-tutorial + + change "Web" to "web" to match case-sensitive name used for creation;… + +commit 02da868c08a5886511e356f7ff5dec0c394dc578 +Author: Daehyeok Mun +Date: Thu Nov 19 23:50:50 2015 -0700 + + VirtualBox: Delete machine in 'PAUSED' state + + Signed-off-by: Daehyeok Mun + +commit 20905ec452ef0139027c6b0e193dda0d83a59f69 +Merge: 3dac1fb189 741246d69f +Author: Sebastiaan van Stijn +Date: Fri Nov 20 10:06:13 2015 +0100 + + Merge pull request #17861 from gissehel/apt-source-doc + + explicit way to express that docker.list are different choices and not just one big file + +commit 3dac1fb18915f3aee1fcdeeb0688340fe6809143 +Merge: ee03a05595 9941d5bc33 +Author: Sebastiaan van Stijn +Date: Fri Nov 20 09:22:04 2015 +0100 + + Merge pull request #18079 from moxiegirl/fix-bad-markdown + + Small Markdown Fixes to storage driver/commands ref + +commit ff75aefc846a8efd6abc35c91abd5fa336a40e84 +Merge: e63af87b25 844daf465c +Author: Ying Li +Date: Thu Nov 19 21:27:01 2015 -0800 + + Merge pull request #303 from SvenDowideit/docs-validation-changes + + Docs fixes for docs validation + +commit 1921c629381d25ebff7b8b8c8348a0a81525f264 +Author: Wen Cheng Ma +Date: Thu Nov 5 15:08:00 2015 +0800 + + Re-implement --before and --since as options for --filter + + * This commit will mark --before and --since as deprecated, but leave their behavior + unchanged until they are removed, then re-implement them as options for --filter. + + * And update the related docs. + + * Update the integration tests. + + Fixes issue #17716 + + Signed-off-by: Wen Cheng Ma + +commit 844daf465cdbb5bbc5533d77784c7ac20958d696 +Author: Sven Dowideit +Date: Fri Nov 20 13:35:38 2015 +1000 + + Docs fixes for docs validation + + Signed-off-by: Sven Dowideit + +commit be295901979f6f08be9bda0349cbd663673fbb70 +Author: Sven Dowideit +Date: Fri Nov 20 12:56:49 2015 +1000 + + Use the build cache for the svn checkouts of the other projects + + Signed-off-by: Sven Dowideit + +commit 64bc8af1b93bd849f2cce82d868c70354416d404 +Author: Sven Dowideit +Date: Fri Nov 20 12:21:03 2015 +1000 + + Doc fixes found by validation job + + Signed-off-by: Sven Dowideit + +commit 3cbccccb37f6f50ebb49e9738af09a0d7d79549a +Author: Patrick Hemmer +Date: Thu Nov 19 20:49:58 2015 -0500 + + remove unnecessary echo from yum docs + + Signed-off-by: Patrick Hemmer + +commit 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082 +Author: Mary Anthony +Date: Wed Nov 18 16:32:23 2015 -0800 + + Small changes to storage driver/commands ref + Entering V's comments + + Signed-off-by: Mary Anthony + +commit ee03a05595e6ecd373553d33a01aff4d18bcc63c +Merge: 249b3a9479 be9b7a2459 +Author: Michael Crosby +Date: Thu Nov 19 17:01:34 2015 -0800 + + Merge pull request #17005 from mavenugo/restart + + Adding a restart test to make sure #16887 doesnt happens again + +commit 5aeaf2a0c4236711e0981515d8627b30e22a1637 +Author: NIWA Hideyuki +Date: Wed Sep 9 15:30:56 2015 +0900 + + Addition of "--shm-size" to which size of /dev/shm is changed. + + - Optional "--shm-size=" was added to the sub-command(run, create,and build). + - The size of /dev/shm in the container can be changed + when container is made. + - Being able to specify is a numerical value that applies number, + b, k, m, and g. + - The default value is 64MB, when this option is not set. + - It deals with both native and lxc drivers. + + Signed-off-by: NIWA Hideyuki + +commit 249b3a9479048bcec8da0666c2e224dddcfc3de8 +Merge: 9c21e852b2 b1cc78b8f5 +Author: Michael Crosby +Date: Thu Nov 19 15:50:07 2015 -0800 + + Merge pull request #17459 from brahmaroutu/Power_Z_CI + + Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po… + +commit 9c21e852b2674a68d9b0fbbada368f5b7818b494 +Merge: 0d98e2470f 48718a3c77 +Author: Alexander Morozov +Date: Thu Nov 19 15:06:21 2015 -0800 + + Merge pull request #18082 from MHBauer/gh9406 + + Remove defaults for flags/options that expect no value + +commit 0d98e2470fd985f3c113f44a93084d87e1a167f9 +Merge: da969aac5a 38a58a4a1c +Author: Alexander Morozov +Date: Thu Nov 19 14:09:43 2015 -0800 + + Merge pull request #18103 from crosbymichael/image-link + + Remove alt from markdown image + +commit 38a58a4a1c92e6efa4bcf2a809883cef8c391f05 +Author: Michael Crosby +Date: Thu Nov 19 14:06:16 2015 -0800 + + Remove alt from markdown image + + Signed-off-by: Michael Crosby + +commit da969aac5ab0b1376615ed54fb54a909c98f05f8 +Merge: 8e6e38990c 423b55c4b4 +Author: Michael Crosby +Date: Thu Nov 19 13:55:28 2015 -0800 + + Merge pull request #18102 from mavenugo/sb_ep_race + + Fixed an endpoint delete issue with a possible stale sbox + +commit 8e6e38990cb09eca2575263240d45a2a55db292e +Merge: 24fb3659df 01b86d612c +Author: Alexander Morozov +Date: Thu Nov 19 13:51:46 2015 -0800 + + Merge pull request #18084 from wenchma/18054_exec_start_fix + + Update docs and test of exec create api return codes + +commit 24fb3659dfe1b4f4dfa4592699fb53d0868a95fe +Merge: 37f64ded44 b9e701b203 +Author: Alexander Morozov +Date: Thu Nov 19 13:46:48 2015 -0800 + + Merge pull request #18076 from rhvgoyal/unmount-recursive + + Unmount recursively to unmount volumes + +commit 37f64ded44249fb174ba1797d6f6183575375300 +Merge: b205b06d3e 2a07b19fd8 +Author: Alexander Morozov +Date: Thu Nov 19 13:24:43 2015 -0800 + + Merge pull request #17908 from calavera/carry_17059 + + [Carry 17059] allow filtering containers by any status + +commit b205b06d3e4ec4d1850f1a2d7eebb43f13e9ef46 +Merge: aade9536b6 37d2a70038 +Author: Vincent Demeester +Date: Thu Nov 19 21:48:02 2015 +0100 + + Merge pull request #18096 from Microsoft/jjh/dockerinfoav + + Windows: [TP4] docker info crashes + +commit 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea +Author: Madhu Venugopal +Date: Thu Nov 19 12:46:37 2015 -0800 + + Fixed an endpoint delete issue with a possible stale sbox + + Stale sandbox could be a result of stress tests on ungraceful + restarts such as #17984 + + Signed-off-by: Madhu Venugopal + +commit b9e701b203ff49966aac00e058feb5d46bbb97f0 +Author: Vivek Goyal +Date: Thu Nov 19 20:46:07 2015 +0000 + + Use lazy unmount to unmount volumes + + Volumes can have more mount points beneath them and unmount will fail. This + is the case when a bind mounted directory on host already had a mount point + underneath it. So use lazy unmount instead. + + Signed-off-by: Vivek Goyal + +commit ad7696a78775df7cc671113b29fb34ca66b3ace5 +Author: Ian Lee +Date: Thu Nov 19 12:14:03 2015 -0800 + + Fix minor grammar mistake. + + Signed-off-by: Ian Lee + +commit 6224b6edd9b776fbeaf4526152e323c0538be8f2 +Author: Daniel Nephin +Date: Thu Nov 19 14:52:50 2015 -0500 + + Fix use case link in readme. + + Signed-off-by: Daniel Nephin + +commit 2a07b19fd8fd402b4ec7b7814f85d099c8b8efca +Author: David Calavera +Date: Wed Nov 11 12:51:36 2015 -0500 + + Test that paused containers show up filtering by status. + + Signed-off-by: David Calavera + +commit 9c1ccf708497c1c2009561090b60f150d1b1876b +Author: Brian Torres-Gil +Date: Thu Nov 19 11:04:02 2015 -0800 + + Add support for installation on Kali Linux 2.0 + + Signed-off-by: Brian Torres-Gil + +commit f30364c5835452598e58781f360681f2d77fa16c +Author: Kamil Domański +Date: Thu Oct 15 13:04:13 2015 +0200 + + allow filtering containers by any status + + Signed-off-by: Kamil Domański + (cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1) + +commit 318ad1cb43bcf01f03d790ae258506121f30f117 +Author: Darren Stahl +Date: Tue Nov 3 14:49:50 2015 -0800 + + This fixes Chtimes on systems with 32 bit Timespec + + Signed-off-by: Darren Stahl + +commit 37d2a7003864f8bdb5d8f6e3d9dcb4367fc94a6a +Author: John Howard +Date: Thu Nov 19 11:02:25 2015 -0800 + + Windows: [TP4] docker info crashes + + Signed-off-by: John Howard + +commit aade9536b6b64f6db385f38078b20bff846aec54 +Merge: 758fae5f6b 0ff3c10aa8 +Author: David Calavera +Date: Thu Nov 19 14:00:23 2015 -0500 + + Merge pull request #18090 from vdemeester/17478-follow-up-cleanup-pkg-platform + + Follow-up of 17478, unexport runtimeArchitecture method + +commit 758fae5f6b079b0125a657854e7e853d638dc569 +Merge: 43cf875633 8d4c0ba274 +Author: Antonio Murdaca +Date: Thu Nov 19 19:44:18 2015 +0100 + + Merge pull request #18083 from Mashimiao/opt-weightdevice-fix-typo + + opts/weightdevice: fix typo + +commit 43cf875633b63983bbbb7829102183242404eef7 +Merge: c32f8bb36a 7c1d49d90c +Author: Antonio Murdaca +Date: Thu Nov 19 19:42:20 2015 +0100 + + Merge pull request #18064 from hypriot/17478-fix-for-arm + + Change casting of utsname.Machine to fix make binary for ARM + +commit dd1a2b36faabe12a7c6c3f1b9e0f51fda03c19e3 +Merge: 449cdcc966 c99f2f8efd +Author: Joffrey F +Date: Thu Nov 19 10:36:33 2015 -0800 + + Merge pull request #2389 from hypriot/use-uname-for-target + + Use uname to build target name for different platforms + +commit 449cdcc966ecbf2e698795823531c934f892f097 +Merge: 21a72e350b efbfa9e38f +Author: Joffrey F +Date: Thu Nov 19 10:35:28 2015 -0800 + + Merge pull request #2420 from simonvanderveldt/fix-script-runsh-env-vars + + run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH env vars to compose container + +commit 3fdf0f43bef4a881b65de871b26ec6feffd98059 +Author: Daniel Nephin +Date: Thu Nov 19 12:55:03 2015 -0500 + + Add note about required pip version. + + Signed-off-by: Daniel Nephin + +commit 21a72e350bb770b293d2ea4d8edb5399785f3ce8 +Merge: 2f20dfe508 acf31181e8 +Author: Daniel Nephin +Date: Thu Nov 19 12:52:43 2015 -0500 + + Merge pull request #2413 from SvenDowideit/stop-docs-validation-errors + + 2 small changes to clear up docs-validation complaints + +commit e63af87b251c95c6003c0d525286e4d8176b4a89 +Merge: 378888f6d7 a05fee7469 +Author: Ying Li +Date: Thu Nov 19 09:16:48 2015 -0800 + + Merge pull request #290 from docker/vet-filenames + + Make vet target now also checks for filenames with _test_ in the middle. + +commit 7c1d49d90cbd91d7cc06d92686e2d09dd3dcac27 +Author: Stefan Scherer +Date: Wed Nov 18 11:13:04 2015 +0100 + + Move charsToString to architecture dependent source to fix casting problem + + Signed-off-by: Stefan Scherer + +commit 1f0dc72d4abd1ddc7e348934c6a1bc59f6937678 +Author: Christopher Jones +Date: Thu Nov 19 11:08:04 2015 -0600 + + Fixed docker network link in faq + + Signed-off-by: Christopher Jones + +commit 48718a3c772681b4a3644ba304d37fb9382e6f73 +Author: Morgan Bauer +Date: Wed Nov 18 18:27:59 2015 -0800 + + Remove defaults for flags/options that expect no value + + - isZeroValue function from upstream go + - covers booleans, strings and numbers + - change integration to reflect new behavior + - resolves #9406 + + Signed-off-by: Morgan Bauer + +commit 01b86d612cba22602509b436aad36d41135f14ce +Author: Wen Cheng Ma +Date: Thu Nov 19 13:51:26 2015 +0800 + + Update docs and test of exec create api return codes + + Fixes issue #18054 + + Signed-off-by: Wen Cheng Ma + +commit 0ff3c10aa8328c1f574ae6dd8caf5e20c3b97dfa +Author: Vincent Demeester +Date: Thu Nov 19 14:55:57 2015 +0100 + + Follow-up of 17478, unexport private method + + Signed-off-by: Vincent Demeester + +commit c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610 +Merge: 877fe61f75 419fd7449f +Author: Vincent Demeester +Date: Thu Nov 19 14:01:13 2015 +0100 + + Merge pull request #17704 from LK4D4/default_cgroupfs + + Use fs cgroups by default + +commit e537a519262b492a3cf3464236d70984a4928120 +Merge: 4cab744d5c 91b64ff913 +Author: David Gageot +Date: Thu Nov 19 13:39:02 2015 +0100 + + Merge pull request #2352 from jeanlaurent/better-cli + + Fix create usage & description in cli + +commit 4cab744d5c54dd36e1f4d93575199277f8b30954 +Merge: acac5f146a 1521fed1ed +Author: David Gageot +Date: Thu Nov 19 13:38:50 2015 +0100 + + Merge pull request #2350 from jeanlaurent/version-command + + Add a version command + +commit 1521fed1edb7d0c9aec11ec5a000e156f1f586fa +Author: Jean-Laurent de Morlhon +Date: Thu Nov 19 12:16:06 2015 +0100 + + Add a version command + + Signed-off-by: Jean-Laurent de Morlhon + +commit acac5f146a18efd4d9c8ad1d8784c22a159d0903 +Merge: 33c71d6a8f 9d2ebb630a +Author: Jean-Laurent de Morlhon +Date: Thu Nov 19 12:35:47 2015 +0100 + + Merge pull request #2197 from jviide/2196-vmwarefusion-no-share + + Add a --vmwarefusion-no-share flag to disable the mounting of the /Users directory + +commit 33c71d6a8f4b6b43eb8102ee4c0d58652af32b61 +Merge: 8c276e8cf8 71f82e86b1 +Author: David Gageot +Date: Thu Nov 19 12:35:21 2015 +0100 + + Merge pull request #2351 from dgageot/improve-google + + Improve google driver + +commit 8c276e8cf8b4c54d4d71612391d7a87e4e52b4b2 +Merge: 43d9df3216 79563b1972 +Author: Jean-Laurent de Morlhon +Date: Thu Nov 19 12:33:51 2015 +0100 + + Merge pull request #2348 from dgageot/improve-virtualbox + + Improve virtualbox driver + +commit 91b64ff913b1f64c1b76e81a28bfa3252e303852 +Author: Jean-Laurent de Morlhon +Date: Thu Nov 19 12:19:04 2015 +0100 + + Fix create usage & description in cli + + Signed-off-by: Jean-Laurent de Morlhon + +commit 9d2ebb630ae28e6332e2645e154abe6df809459f +Author: jviide +Date: Fri Nov 6 01:46:14 2015 +0200 + + Add --vmwarefusion-no-share option + + Add a vmwarefusion driver flag to disable the mounting of the /Users + directory. Name it --vmwarefusion-no-share to reflect the pre-existing + virtualbox driver option --virtualbox-no-share. + + Also add a corresponding environment variable FUSION_NO_SHARE. + + The code is basically identical to the virtualbox driver's + implementation. + + Signed-off-by: Joachim Viide + +commit 71f82e86b1ee97aacebec3d33e254e83d225c1aa +Author: David Gageot +Date: Thu Nov 19 11:48:29 2015 +0100 + + Fix Typo + + Signed-off-by: David Gageot + +commit 79563b197298ea6f01c9956dffa3d52200041976 +Author: David Gageot +Date: Thu Nov 19 11:04:55 2015 +0100 + + Move VT-X check to PreCreateCheck + + Signed-off-by: David Gageot + +commit b586b94b134354807d684c3f6d3463e200fe9ec7 +Author: David Gageot +Date: Thu Nov 19 10:55:25 2015 +0100 + + Cosmetics + + Signed-off-by: David Gageot + +commit 620b2ed41803c4ba4a28172b944127ce325af95c +Author: David Gageot +Date: Thu Nov 19 10:55:11 2015 +0100 + + Add missing ENV for import-boot2docker-vm flag + + Signed-off-by: David Gageot + +commit df7212df950db5f2e05d6aac3a01c38a89a60d2f +Author: David Gageot +Date: Thu Nov 19 10:53:20 2015 +0100 + + Add missing ENV for no-share flag + + Signed-off-by: David Gageot + +commit 5aa2179807e9cf63718777dc06e5cc2abe9bbffa +Author: David Gageot +Date: Thu Nov 19 11:23:55 2015 +0100 + + GetURL() should fail is the machine is stopped + + Signed-off-by: David Gageot + +commit 01f3a455301c04d8cc64de3f996140c5d3509526 +Author: David Gageot +Date: Thu Nov 19 11:18:36 2015 +0100 + + Update default google image + + Signed-off-by: David Gageot + +commit d56d0dc495c446b9da93ad65016af87669fe96d1 +Author: David Gageot +Date: Thu Nov 19 10:52:02 2015 +0100 + + Remove unused constants + + Signed-off-by: David Gageot + +commit 43d9df3216a99c02ef45d59ead941c2ab61a2c83 +Merge: 9f48e4727d 5baab2fae5 +Author: David Gageot +Date: Thu Nov 19 11:09:49 2015 +0100 + + Merge pull request #2347 from dgageot/improve-its + + Improve its + +commit 9f48e4727d62625ba25cb4f667db5a5ba8d9a182 +Merge: b9b7b6fe54 f81870e4f1 +Author: David Gageot +Date: Thu Nov 19 10:28:53 2015 +0100 + + Merge pull request #2340 from rcoedo/fish-global-env + + Global set for fish env + +commit 5baab2fae5f1cd58af4fad9c4d817194c9ce9646 +Author: David Gageot +Date: Thu Nov 19 10:18:58 2015 +0100 + + This test seems more stable this way + + Otherwise it sometimes hangs + + Signed-off-by: David Gageot + +commit 5eebd0be159aceb19b83dace91efb40cfa8caad4 +Author: David Gageot +Date: Thu Nov 19 10:16:39 2015 +0100 + + Cleaning up a few thing in the ITs script + + Signed-off-by: David Gageot + +commit b9b7b6fe54798a8a3fa18067eedcdeffd9527bfc +Merge: 92d473f90b fc0981bd0f +Author: David Gageot +Date: Thu Nov 19 10:10:54 2015 +0100 + + Merge pull request #2343 from nathanleclaire/systemd_remove_duplication + + Remove systemd-related driver duplication + +commit 92d473f90b14f3d95f709f9148687d572aba2d8d +Merge: ffbfb443c2 f6d5c03d76 +Author: David Gageot +Date: Thu Nov 19 10:10:32 2015 +0100 + + Merge pull request #2345 from nathanleclaire/inspect_log_driver + + Change log driver check to be more future-safe + +commit 8d4c0ba27489b51bfce01bc37fa3fe88612bd390 +Author: Ma Shimiao +Date: Thu Nov 19 13:01:58 2015 +0800 + + opts/weightdevice: fix typo + + Signed-off-by: Ma Shimiao + +commit 7ec68bfe7df68ecc57c0250d49badcf853789c5e +Author: Mika Andrianarijaona +Date: Thu Nov 19 11:44:51 2015 +0300 + + Cmd + 0 to reopen closed window + +commit e207ae1a1950a356a49f5a9aa1dee47bbcbc4958 +Author: David Stosik +Date: Mon Nov 9 21:08:53 2015 +0900 + + Document command-line completion installation + + This is a draft based on [the same doc for docker-compose](https://github.com/docker/compose/blob/master/docs/completion.md). It still needs changes, but will get the thing moving. + + Signed-off-by: David Stosik + +commit be9b7a2459fef01e0f5cd3a8d1ad2dc822a5b1dd +Author: Madhu Venugopal +Date: Tue Oct 13 21:08:47 2015 -0700 + + Adding a restart test to make sure #16887 doesnt happens again + + Signed-off-by: Madhu Venugopal + +commit acf31181e8bff0481703c8f17f93c17ebec59506 +Author: Sven Dowideit +Date: Wed Nov 18 20:17:23 2015 +1000 + + Some small changes to clear up docs-validation complaints + + Signed-off-by: Sven Dowideit + +commit 0b171c699afa01434f15fe5b3a465d054c79cda7 +Author: Felix Abecassis +Date: Wed Nov 18 16:45:49 2015 -0800 + + Fix typo in discovery documentation + + Signed-off-by: Felix Abecassis + +commit d64a7a5f9541678c59841c11fbdb38d9c034f924 +Merge: 7504c5b866 9ff2197596 +Author: Xian Chaobo +Date: Thu Nov 19 08:43:28 2015 +0800 + + Merge pull request #1414 from vieux/event_delete + + fix event deletion under lock + +commit f6d5c03d76a2d93983a12a02560bb1721f23574d +Author: Nathan LeClaire +Date: Wed Nov 18 16:26:56 2015 -0800 + + Change log driver check to be more future-safe + + Signed-off-by: Nathan LeClaire + +commit ffbfb443c279dbea5696b1f3f02b7e4bacf95de1 +Merge: 299d4f6a07 f0740fe8ad +Author: Nathan LeClaire +Date: Wed Nov 18 16:17:45 2015 -0800 + + Merge pull request #2337 from dgageot/fix-its + + Fix its + +commit 419fd7449fe1a984f582731fcd4d9455000846b0 +Author: Alexander Morozov +Date: Wed Nov 4 13:51:46 2015 -0800 + + Use fs cgroups by default + + Our implementation of systemd cgroups is mixture of systemd api and + plain filesystem api. It's hard to keep it up to date with systemd and + it already contains some nasty bugs with new versions. Ideally it should + be replaced with some daemon flag which will allow to set parent systemd + slice. + + Signed-off-by: Alexander Morozov + +commit b4fb4ac173c28125b2f62a6aa6f0a4c2791159d8 +Author: Ying Li +Date: Wed Nov 18 14:53:28 2015 -0800 + + Change the error message on the client, if the server returns 400. + + Previously it was "fatal: Unable to reach trust server at this time: 400." + and now it is "fatal: Trust server rejected operation." + + Signed-off-by: Ying Li + +commit fc0981bd0f0755ce604d3509bf09bb0158104eb8 +Author: Nathan LeClaire +Date: Tue Nov 17 19:47:10 2015 -0800 + + Remove systemd-related driver duplication + + Signed-off-by: Nathan LeClaire + +commit 877fe61f7538a36c5fe312221356f13b83abbf64 +Merge: 0d2ea52f03 060f4ae617 +Author: Michael Crosby +Date: Wed Nov 18 14:06:47 2015 -0800 + + Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all + + Remove the container initializers per platform. + +commit a150a0d521cf65127d247f9c5dfa9b7ed30885a3 +Author: Dong Chen +Date: Thu Nov 5 17:14:50 2015 -0800 + + Add cli test for engine refresh options + + Signed-off-by: Dong Chen + +commit 299d4f6a0729e39491ed4992cb168fbb8cd9b3b5 +Merge: 06fc443626 96f519b36f +Author: Nathan LeClaire +Date: Wed Nov 18 13:43:17 2015 -0800 + + Merge pull request #2332 from jeanlaurent/it-copy-boot2docker.iso + + IT: Bootstrap test quicker by caching boot2docker iso if present + +commit 1e8f76767f80ecb4b7aa546eeb787102aff311e4 +Author: Daniel Nephin +Date: Wed Nov 18 14:51:01 2015 -0500 + + Fix env_file and environment when used with extends. + + Signed-off-by: Daniel Nephin + +commit c78c32c2e819cdbf83f9e9ed2dc16ff9e62b78dc +Author: Daniel Nephin +Date: Mon Nov 16 12:35:26 2015 -0500 + + Fixes #2398 - the build progress stream can contain empty json objects. + + Previously these empty objects would hit a bug in splitting objects causing it crash. + With this fix the empty objects are returned properly. + + Signed-off-by: Daniel Nephin + +commit efbfa9e38fb4565953d608e504e2bdc79737d408 +Author: Simon van der Veldt +Date: Wed Nov 18 21:38:58 2015 +0100 + + run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH + env vars to compose container + + Signed-off-by: Simon van der Veldt + +commit f81870e4f123106317721b18f92640e5305abb4a +Author: Roman Coedo +Date: Wed Nov 18 19:15:14 2015 +0100 + + Global set for fish env + + Using "set -x" only exports the variable in the local scope. + This is a limitation when an user needs to invoke "docker-machine" in a fish script. + + Using "set -gx" instead exports the variable globally. + + Signed-off-by: Roman Coedo + +commit 0d2ea52f03f2b62e5053ed056fc4db6ab305a6bc +Merge: ec72163949 d860ff79a0 +Author: Michael Crosby +Date: Wed Nov 18 11:08:13 2015 -0800 + + Merge pull request #18030 from Microsoft/sjw/pull_id_hack + + [TP4] Windows: hacking around content addressable IDs for temporary fix. + +commit 7504c5b8665cb2f7c5e728f9be6cf87f8f5d8fa5 +Merge: 5b714bd00a bb661212f9 +Author: moxiegirl +Date: Wed Nov 18 10:41:15 2015 -0800 + + Merge pull request #1431 from julienvey/typo_fix + + Fix typo in networking documentation + +commit d4b98452012d930121231f3b7be9c2c1db8b8208 +Author: Daniel Nephin +Date: Thu Nov 12 17:29:58 2015 -0500 + + Add the git sha to version output + + Signed-off-by: Daniel Nephin + +commit ec721639492cd4a2feb3f7a843429a923262734d +Merge: 0780ad4857 a96be2930a +Author: moxiegirl +Date: Wed Nov 18 10:14:15 2015 -0800 + + Merge pull request #18069 from vdemeester/fix-volume-doc-typo + + Fix a small typo in volume_inspect.md + +commit 5b714bd00aaaea383a2b07423da1da64324a52a9 +Merge: 4dc83cc71b bea12ab8ab +Author: Alexandre Beslic +Date: Wed Nov 18 09:38:24 2015 -0800 + + Merge pull request #1395 from jimmyxian/add-support-image-digest + + Add support do with image digest + +commit f0740fe8adff6bab31148157c692e07c68c50ce5 +Author: David Gageot +Date: Wed Nov 18 16:27:13 2015 +0100 + + FIX #2190 no need killing docker-machine processes + + Signed-off-by: David Gageot + +commit 93f94d9521b757b4aa2d49978fb5ac84584aaff6 +Author: David Gageot +Date: Wed Nov 18 15:54:49 2015 +0100 + + Fix an integration test + + Signed-off-by: David Gageot + +commit 36cf498fb2b788242dd4321a94699751c3ca1cea +Author: David Gageot +Date: Wed Nov 18 14:54:12 2015 +0100 + + Use a different machine name for each time + + This makes ITs more isolated and more robust + + Signed-off-by: David Gageot + +commit 65d04ea6c7b2ed04ca515b55b425d11f40c1c7d5 +Author: David Gageot +Date: Wed Nov 18 14:36:02 2015 +0100 + + Fix test because the error was changed + + Signed-off-by: David Gageot + +commit a9741f109092af48b15254ab1aee3ba9321e2fa7 +Author: David Gageot +Date: Wed Nov 18 14:13:15 2015 +0100 + + build before ITs + + Signed-off-by: David Gageot + +commit 06fc443626541707b82f963f391345c8bb9fe2b8 +Merge: ffbcd35993 b00e30c38f +Author: David Gageot +Date: Wed Nov 18 18:09:05 2015 +0100 + + Merge pull request #2338 from dgageot/rollback-provisionner + + Revert "Remove systemd-related driver duplication" + +commit bb661212f997a11bd0f7cdac59ff6d38ca9948b8 +Author: Julien Vey +Date: Wed Nov 18 17:50:44 2015 +0100 + + Fix typo in networking documentation + + "use may use" => "you may use" + add missing s + + Signed-off-by: Julien Vey + +commit b00e30c38feb8d31c0d3e94eea7013adf7501db8 +Author: David Gageot +Date: Wed Nov 18 17:34:10 2015 +0100 + + Revert "Remove systemd-related driver duplication" + + This reverts commit fda08f5e15627facb3e2cfe8ff7b0a891ba2c876. + + Signed-off-by: David Gageot + +commit ffbcd3599338e4415b6ebf2bf4e652fd50fd797d +Merge: cee5c0ce15 6de1fd13d3 +Author: David Gageot +Date: Wed Nov 18 17:03:34 2015 +0100 + + Merge pull request #2336 from dgageot/better-logs + + Plugin's stdout shouldn't show `OUT` + +commit 6de1fd13d37ff58466b1b2f6237dd0e9212aa7ab +Author: David Gageot +Date: Wed Nov 18 14:54:46 2015 +0100 + + Plugin's stdout shouldn't show `OUT` + + Signed-off-by: David Gageot + +commit a96be2930a64be88a5e8bf0e3b0283c657f73844 +Author: Vincent Demeester +Date: Wed Nov 18 16:02:24 2015 +0100 + + Fix a small typo in volume_inspect.md + + Signed-off-by: Vincent Demeester + +commit 2b28473d34d15d6c3d6df524975ef7cdcd0fbedd +Author: Jean-Laurent de Morlhon +Date: Wed Nov 18 16:00:42 2015 +0100 + + Bump docker-machine to 0.5.1 + + Signed-off-by: Jean-Laurent de Morlhon + +commit cee5c0ce15f88db9f9df1d1602c93e7b53bd0593 +Merge: 1c43b5e106 97fadf48b0 +Author: Jean-Laurent de Morlhon +Date: Wed Nov 18 15:36:20 2015 +0100 + + Merge pull request #2334 from yamamoto-febc/change_driversmd + + Update AVAILABLE_DRIVER_PLUGINS.md + +commit 97fadf48b0a662a2703d1958efb03772698192c4 +Author: Kazumichi Yamamoto +Date: Wed Nov 18 22:10:44 2015 +0900 + + Update AVAILABLE_DRIVER_PLUGINS.md + + Signed-off-by: Kazumichi Yamamoto + +commit 1c43b5e10639ba94eb322c370a295fa05163cd5b +Merge: acebb0bd09 cab3af3960 +Author: David Gageot +Date: Wed Nov 18 15:20:23 2015 +0100 + + Merge pull request #2329 from SvenDowideit/reduce-docs-validation-errors + + fix docs validation errors + +commit 060f4ae6179b10aeafa883670826159fdae8204a +Author: David Calavera +Date: Wed Nov 18 05:04:23 2015 -0500 + + Remove the container initializers per platform. + + By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform. + + Signed-off-by: David Calavera + +commit 96f519b36ff3870aa8a50ba6a0e43547d19d9d99 +Author: Jean-Laurent de Morlhon +Date: Wed Nov 18 12:01:00 2015 +0100 + + Copy once b2d iso prior to testing + + Signed-off-by: Jean-Laurent de Morlhon + +commit acebb0bd09e1e3af637157a9d811fdde939bfd82 +Merge: cda0c5c2d6 e252b32841 +Author: Evan Hazlett +Date: Wed Nov 18 13:15:09 2015 +0100 + + Merge pull request #2333 from dmp42/16-maintainer + + Adding Jean-Laurent to the team + +commit e252b32841fd9d1cfb5837364a12659cc1113a5b +Author: Olivier Gambier +Date: Wed Nov 18 13:08:19 2015 +0100 + + Adding Jean-Laurent to the team + + Signed-off-by: Olivier Gambier + +commit 0780ad4857bb7db1caaf6c4c1d60970d5695c464 +Merge: 3f5e5b8f57 0a31647780 +Author: David Calavera +Date: Wed Nov 18 12:49:11 2015 +0100 + + Merge pull request #17973 from moxiegirl/fix-networking-issue + + Fixing issue noted by user + +commit 3f5e5b8f57f5b4c1eb4ead9327f9d071f8fd5b8a +Merge: 1b1af308da d9ef4f2986 +Author: David Calavera +Date: Wed Nov 18 12:48:41 2015 +0100 + + Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd + + Fix invalid proxy setting example + +commit 1b1af308da301fbcc950c27d1245aff485f26855 +Merge: 080b3e7527 25cfa80119 +Author: David Calavera +Date: Wed Nov 18 12:46:19 2015 +0100 + + Merge pull request #18059 from QuentinPerez/typo + + Fix typo in ARM.md + +commit 080b3e7527cc7c116376970d14a31f5cb6ac250b +Merge: 927d0be4d8 4cef3477b5 +Author: David Calavera +Date: Wed Nov 18 12:45:24 2015 +0100 + + Merge pull request #18062 from svetlyak40wt/patch-1 + + Fix header levels for 1.9 release notes + +commit cda0c5c2d67769226bf3c9dcde4318b5b98c3b62 +Merge: ad5fd0f976 f2fe553280 +Author: David Gageot +Date: Wed Nov 18 12:42:34 2015 +0100 + + Merge pull request #2331 from jeanlaurent/it-fresh-start + + IT: cleanup properly before starting + +commit cab3af3960dd6f99cbe615e032ffce17bd2bdaad +Author: Sven Dowideit +Date: Wed Nov 18 21:08:36 2015 +1000 + + Add hugo frontmatter to docs that should not be published, and fix a link + + Signed-off-by: Sven Dowideit + +commit 4c414a719afd1541b298c6f8f588d44489c5c6fd +Author: Sven Dowideit +Date: Wed Nov 18 21:01:55 2015 +1000 + + fix link which when published leads to the root of all the docs.docker.com site + + Signed-off-by: Sven Dowideit + +commit 927d0be4d8a9568486251a62e25a444cd19ff4ee +Merge: 7179c89943 90e2459ecb +Author: Antonio Murdaca +Date: Wed Nov 18 11:51:55 2015 +0100 + + Merge pull request #18050 from LK4D4/simple_err_registry + + registry/registry.go: simplify logical expression + +commit f2fe5532801482858415641c1f45ee505db5f71f +Author: Jean-Laurent de Morlhon +Date: Wed Nov 18 11:48:27 2015 +0100 + + IT: cleanup properly before starting + + Signed-off-by: Jean-Laurent de Morlhon + +commit 4cef3477b528162053a53ac05eabebf524be8be0 +Author: Alexander Artemenko +Date: Wed Nov 18 12:46:39 2015 +0300 + + Fix header levels for 1.9 release notes + + This way, parsers like allmychanges.com will be able to extract structured information about release + + Signed-off-by: Alexander Artemenko + +commit ad5fd0f976fa6cfe5e2a66404d47760353e611d1 +Merge: 88c48196ef 5707b38a9e +Author: David Gageot +Date: Wed Nov 18 10:52:49 2015 +0100 + + Merge pull request #2319 from benhamill/fix_bash_completion + + Dashes not allowed in Bash identifiers. + +commit 88c48196efde4331d41b08cd55328c0e79c9769c +Merge: eb42133a06 fda08f5e15 +Author: David Gageot +Date: Wed Nov 18 10:46:35 2015 +0100 + + Merge pull request #2326 from nathanleclaire/systemd_remove_duplication + + Remove systemd-related driver duplication + +commit 7179c89943d0447066bdac30d06e8a8054d2f6d3 +Merge: 33d9ae358c 70ce2d9b10 +Author: David Calavera +Date: Wed Nov 18 10:37:53 2015 +0100 + + Merge pull request #18046 from LK4D4/carry_16822 + + Revert AppArmor skip tests + +commit 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1 +Merge: 5d53e39c02 61564bcb5f +Author: David Calavera +Date: Wed Nov 18 10:36:32 2015 +0100 + + Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache + + zsh: ensure we have enough commands to store in the cache + +commit 5d53e39c02abcc768db9f504d02dcb2474b4c7d7 +Merge: 57b42250ce 8105a3a366 +Author: David Calavera +Date: Wed Nov 18 10:35:59 2015 +0100 + + Merge pull request #18056 from vincentbernat/fix/zsh-no-lxc + + zsh: remove lxc-related completion + +commit 57b42250ce2afb9a0a082f02fe52c9179bee6bb4 +Merge: db08adb5cb 84781a5df7 +Author: David Calavera +Date: Wed Nov 18 10:35:06 2015 +0100 + + Merge pull request #17991 from nak3/proxy-env + + docker info suppports case-insensitive proxy env settings + +commit db08adb5cbeefeba5c0c094f267863cb145c25f9 +Merge: c00c64c20e c16dd88c5e +Author: David Calavera +Date: Wed Nov 18 10:32:28 2015 +0100 + + Merge pull request #18004 from Gobella/master + + update docker_cli_pull_trusted_test.go + +commit eb42133a064e0b523fcaa61fd18a2b1a22f10f3b +Merge: fa24554871 f9b11d7139 +Author: David Gageot +Date: Wed Nov 18 10:12:56 2015 +0100 + + Merge pull request #2122 from chantra/mount_linux + + Add shared folder and virtualization check for Linux. + +commit 4f8c1a8ef405004e2c72ff944143ef2ffd96a42d +Author: Ying Li +Date: Wed Nov 18 00:29:18 2015 -0800 + + Server check that the root.json's timestamp key ID is valid. + + If the client sends a root.json with an invalid timestamp key ID, + possibly because they are pushing an existing repo to a new server, + then the server should reject the update. + + Signed-off-by: Ying Li + +commit 25cfa80119df7e2859729bdac4bae4a753b82d62 +Author: Quentin Perez +Date: Wed Nov 18 09:46:39 2015 +0100 + + Fix typo in ARM.md + + Signed-off-by: Quentin Perez + +commit fa245548716201023f3ddd53330d2892b9a5cdff +Merge: 0c296783be a8e3ee868f +Author: David Gageot +Date: Wed Nov 18 09:40:25 2015 +0100 + + Merge pull request #2290 from dgageot/quality-03-simpler-test + + Quality 03 simpler test + +commit 0c296783bea0b159691a648d6e96dcdc59932a64 +Merge: a618a029cf eb39f098d5 +Author: David Gageot +Date: Wed Nov 18 09:40:01 2015 +0100 + + Merge pull request #2289 from dgageot/quality-02-move-code + + Quality 02 move code + +commit a618a029cf3429696c55a159d779a587d05e351f +Merge: f3025e6d17 1bdedc6ea2 +Author: David Gageot +Date: Wed Nov 18 09:27:10 2015 +0100 + + Merge pull request #2327 from nathanleclaire/netstat_add_flga + + Add -n to get port number for netstat + +commit f3025e6d1767a912f8472bacd5cc3fc583db6205 +Merge: 41dd8c5878 736e485782 +Author: David Gageot +Date: Wed Nov 18 09:25:36 2015 +0100 + + Merge pull request #2328 from nathanleclaire/add_driversmd + + Update some driver/plugin-related documentation + +commit 41dd8c58784fd90ae974969d3f3d6e9099cfa226 +Merge: d8da062f73 0735f3f447 +Author: David Gageot +Date: Wed Nov 18 09:23:11 2015 +0100 + + Merge pull request #2281 from narqo/fix-dirvers-geturl + + More accurate way to calculate drivers' urls with IPv6 support + +commit d8da062f73f9dcab82074814e2dbcf9a06c84d83 +Merge: a0b75d1645 40d153145f +Author: David Gageot +Date: Wed Nov 18 09:21:58 2015 +0100 + + Merge pull request #2245 from jeanlaurent/2204-make-fail-with-https + + Fix for #2244 - make fails with https remote url + +commit 8105a3a366bb22d1df843c828a16b6cae26e9531 +Author: Vincent Bernat +Date: Wed Nov 18 08:13:03 2015 +0100 + + zsh: remove lxc-related completion + + LXC support has been deprecated and the related completion has been + removed in #17700 but was added back in #17334. + + Signed-off-by: Vincent Bernat + +commit 61564bcb5f79754cf4e17a707731d9f78169c150 +Author: Vincent Bernat +Date: Wed Nov 18 08:08:43 2015 +0100 + + zsh: ensure we have enough commands to store in the cache + + Otherwise, the cache would be invalid and won't be refreshed soon. This + can happen when the user has the completion installed before docker is + installed. + + Signed-off-by: Vincent Bernat + +commit fda08f5e15627facb3e2cfe8ff7b0a891ba2c876 +Author: Nathan LeClaire +Date: Tue Nov 17 19:47:10 2015 -0800 + + Remove systemd-related driver duplication + + Signed-off-by: Nathan LeClaire + +commit 736e485782abda2fd046692cbd03310f62dc45a9 +Author: Nathan LeClaire +Date: Tue Nov 17 19:00:34 2015 -0800 + + Update some driver/plugin-related documentation + + Signed-off-by: Nathan LeClaire + +commit 1bdedc6ea2f09061802a2b048009a5663419d8a2 +Author: Nathan LeClaire +Date: Tue Nov 17 18:24:44 2015 -0800 + + Add -n to get port number for netstat + + Signed-off-by: Nathan LeClaire + +commit 84781a5df753f5ba127538e8542fcb7c94bb56fa +Author: Kenjiro Nakayama +Date: Sun Nov 15 16:56:11 2015 +0900 + + docker info suppports case-insensitive proxy env settings + + Signed-off-by: Kenjiro Nakayama + +commit 2f20dfe508382a124b9b2d2986076c5668d3314d +Merge: 9f6a5a964a 265828f4eb +Author: Daniel Nephin +Date: Tue Nov 17 20:06:40 2015 -0500 + + Merge pull request #2409 from dnephin/fix_the_build + + Fix texttable dep. 0.8.2 was removed from pypi. + +commit c00c64c20eb65152b8f379e7efaf9e014656bcdd +Merge: c83373112c 0ab6b1d922 +Author: Alexander Morozov +Date: Tue Nov 17 17:03:13 2015 -0800 + + Merge pull request #18047 from aaronlehmann/push-fix + + Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent + +commit a0b75d164569ed755ea5fd406659f3d8eb880b5f +Merge: 96404cba4e a020c3eac7 +Author: Nathan LeClaire +Date: Tue Nov 17 16:56:35 2015 -0800 + + Merge pull request #2214 from nathanleclaire/delete_bridge + + Delete bridge after powering daemon down + +commit c83373112c908f7c5afc85fc6b08640817920a6d +Merge: 2ee56ce1e1 d1e72baa15 +Author: moxiegirl +Date: Tue Nov 17 16:45:38 2015 -0800 + + Merge pull request #17986 from bogdangrigg/master + + Fix small typos in documentation files + +commit 2ee56ce1e1b3f8f6ab72b4235ad28387fe81b675 +Merge: 3f508f08de fe123edb08 +Author: moxiegirl +Date: Tue Nov 17 16:44:33 2015 -0800 + + Merge pull request #18011 from lrkwz/patch-1 + + Update ubuntulinux.md + +commit 96404cba4ecebb4d36685d5de08f905bcd7a7853 +Merge: 8d19826c38 a34a394810 +Author: Nathan LeClaire +Date: Tue Nov 17 16:40:51 2015 -0800 + + Merge pull request #2306 from ngauthier/fix-host-nil-swarm-options + + skip printing swarm info when host options swarm info is nil + +commit 3f508f08deca82536b4e1ef6d591335e98e3f5d1 +Merge: 662b9623c1 76992f3e23 +Author: Michael Crosby +Date: Tue Nov 17 16:33:11 2015 -0800 + + Merge pull request #17261 from mountkin/remove-unused-daemon-config + + remove the unused DefaultNetwork member from daemon.Config + +commit 662b9623c1e47676f40b5dccd150475d54cd88a0 +Merge: e2417e3e92 4e4a68415c +Author: Alexander Morozov +Date: Tue Nov 17 16:15:15 2015 -0800 + + Merge pull request #17866 from shekhargulati/patch-1 + + added rx-docker-client library + +commit 90e2459ecb82c9cd0f231a04776272c6ffe435e4 +Author: Alexander Morozov +Date: Tue Nov 17 16:12:11 2015 -0800 + + registry/registry.go: simplify logical expression + + Signed-off-by: Alexander Morozov + +commit e2417e3e926d2b45049a663bc62828a70fbfab2a +Merge: a935359ec7 4699ef8f87 +Author: Alexander Morozov +Date: Tue Nov 17 16:10:44 2015 -0800 + + Merge pull request #17617 from askb/17168_pull_error_fix + + Fix for #17168 issue + +commit 0ab6b1d9221f7a2a65c6565fed8f3d6f29fcec2d +Author: Aaron Lehmann +Date: Tue Nov 17 10:39:51 2015 -0800 + + Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent + + This fixes an issue where two images with the same filesystem contents + and configuration but different remote IDs could share a v1Compatibility + file, resulting in corrupted manifests. + + Signed-off-by: Aaron Lehmann + +commit a935359ec7c2c7f0ae4c1c389c959387c01e725e +Merge: 92ea146790 f26a31e80c +Author: Alexander Morozov +Date: Tue Nov 17 16:00:00 2015 -0800 + + Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp + + Use checker assert for integration-cli/docker_cli_cp_* four files. + +commit 92ea146790accdf4a07cc311a69a74f840d053ce +Merge: 346d195f6a 1c9a5d7be7 +Author: Alexander Morozov +Date: Tue Nov 17 15:58:05 2015 -0800 + + Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test + + Checkers on docker_cli_by_digest_test + +commit 346d195f6a8ed5217cb859ed1a6673eeb840e21d +Merge: 53556183c7 76fe00c859 +Author: Alexander Morozov +Date: Tue Nov 17 15:53:31 2015 -0800 + + Merge pull request #17334 from sdurrheimer/zsh-completion-log-options + + Add zsh completion for log options + +commit 53556183c7649480852d13d168a28dcfe92ac7f1 +Merge: 104dab87ea e98b8e0857 +Author: Michael Crosby +Date: Tue Nov 17 15:52:31 2015 -0800 + + Merge pull request #17434 from little-arhat/fix/newlines-in-json-status + + Add newlines to FormatProgress for JSON as well + +commit 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe +Merge: adce1981f4 49779b674a +Author: Michael Crosby +Date: Tue Nov 17 15:44:57 2015 -0800 + + Merge pull request #17478 from vdemeester/pr-13921 + + Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH) + +commit adce1981f4c7fe653ae76cdd1f84d75f88b273cd +Merge: ca0b41e337 086c0b4a66 +Author: Alexander Morozov +Date: Tue Nov 17 15:38:52 2015 -0800 + + Merge pull request #17593 from daehyeok/refactoring_json_log + + Refactoring json log driver + +commit 265828f4ebc383c18b251b153805ea084eaccf4d +Author: Daniel Nephin +Date: Mon Nov 16 12:55:35 2015 -0500 + + Fix texttable dep. 0.8.2 was removed from pypi. + + Signed-off-by: Daniel Nephin + +commit ca0b41e3373013c06fb7c23428d7cf0616a57824 +Merge: 7147ac6ce7 a9afebae62 +Author: Michael Crosby +Date: Tue Nov 17 15:15:09 2015 -0800 + + Merge pull request #18000 from daehyeok/fix_dry_run_test + + Modified cpuset test for unicore test environment + +commit 7147ac6ce730fee150caeb627b426fb9f45daf80 +Merge: aeccd45e5b 81aa1b507f +Author: Michael Crosby +Date: Tue Nov 17 15:12:08 2015 -0800 + + Merge pull request #18023 from LK4D4/goodbye_dind + + Remove cgroup mounting in dind + +commit 8d19826c3831d643ea8a771291dcfde5c32ccd26 +Merge: 537f89e775 4457dce51d +Author: Nathan LeClaire +Date: Tue Nov 17 14:49:59 2015 -0800 + + Merge pull request #2311 from trecloux/1891-support_ubuntu_15.04_and_higher + + Introduce support for ubuntu 15.04 and higher + +commit d860ff79a0df4f406578b0a206769f4239072d86 +Author: Stefan J. Wernli +Date: Mon Nov 16 16:55:47 2015 -0800 + + Windows: hacking around content addressable IDs for temporary fix. + + Signed-off-by: Stefan J. Wernli + +commit 5707b38a9ef35a21f55b1390f4ac476c3d4b84e1 +Author: Ben Hamill +Date: Tue Nov 17 15:15:00 2015 -0600 + + Replace - with _ in bash completion identifiers. + + Signed-off-by: Ben Hamill + +commit a9afebae6240cfd48a93c182cbbdff4f09d6a6a0 +Author: Daehyeok Mun +Date: Sun Nov 15 15:00:39 2015 -0700 + + Modified cpuset test for unicore test environment + Modified TestInspectApiCpusetInConfigPre120 and + TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu + environment. + + Signed-off-by: Daehyeok Mun + +commit aeccd45e5b4074cebb1cbe3bb51b6bde4111048a +Merge: d3744fbeb1 258bbdb57e +Author: Jess Frazelle +Date: Tue Nov 17 20:57:15 2015 +0100 + + Merge pull request #17419 from nathwill/cent-install-docs + + fix yum install docs + +commit 70ce2d9b10e7119218ccf10a9b83d86acd2b1ed6 +Author: Alexander Morozov +Date: Tue Nov 17 11:49:31 2015 -0800 + + Skip apparmor tests on User Namespace + + Signed-off-by: Alexander Morozov + +commit d3744fbeb109bffbaeba35c94858afe3bf50376c +Merge: e58b0bba7f b2771b4456 +Author: Alexander Morozov +Date: Tue Nov 17 11:48:53 2015 -0800 + + Merge pull request #18002 from Microsoft/10662-registerlinks + + Windows: Disable links + +commit 0df0b6b44300896d82127fac628a1021c25ef861 +Author: Eric Windisch +Date: Wed Oct 7 14:54:40 2015 -0400 + + Revert "Skip TestAppArmorDeniesChmodProc" + + This reverts commit 04e1015aa06785210dc6a3e4d4ad66700a8d51b0. + + Signed-off-by: Eric Windisch + +commit 1bf5fcd911a7f773a1f6c7511e977d87cca5b391 +Author: Eric Windisch +Date: Wed Oct 7 14:54:39 2015 -0400 + + Revert "Skip TestRunUnshareProc" + + This reverts commit 03dce24137c82caa04c215d983eac06a3edc084c. + + Signed-off-by: Eric Windisch + +commit e58b0bba7fac16e2bab57ad66caeed1663e2c27c +Merge: 1ecb9a40db 25b37e2f04 +Author: Michael Crosby +Date: Tue Nov 17 11:45:24 2015 -0800 + + Merge pull request #18024 from LK4D4/simple_byparent + + graph/graph.go: simplify appending to slice in map in byParent + +commit 1ecb9a40db176489ac8760251abe56e560bc848d +Merge: 9187656305 fdc2641c2b +Author: Michael Crosby +Date: Tue Nov 17 11:44:48 2015 -0800 + + Merge pull request #17974 from anusha-ragunathan/fsMagic + + Fix devmapper backend in docker info + +commit 91876563052a1d84902e365cbe8b9eaf96846e91 +Merge: 19debeb255 4911b58862 +Author: Alexander Morozov +Date: Tue Nov 17 11:36:00 2015 -0800 + + Merge pull request #16639 from mrunalp/skip_dev_setup + + Skip /dev setup in container when it is bind mounted in + +commit 19debeb255c0676148a0efeb2cd7f0f3f38e9edd +Merge: d0696ab7f6 a25988cf76 +Author: Michael Crosby +Date: Tue Nov 17 11:34:40 2015 -0800 + + Merge pull request #18027 from tpounds/fix-err-message-typo + + Fix error typo when --expose and --net are specified + +commit d0696ab7f6ff33f072e5b77ef54a6c64a3227741 +Merge: 68336bc832 292a15e40a +Author: Michael Crosby +Date: Tue Nov 17 11:26:24 2015 -0800 + + Merge pull request #18028 from LK4D4/carry_17174 + + Use /usr/lib/os-release if /etc/os-release is missing. + +commit 68336bc8327232e6a165ab33e6dc9fc25a7872e7 +Merge: 4dda67b801 e54c4517a7 +Author: Michael Crosby +Date: Tue Nov 17 11:17:26 2015 -0800 + + Merge pull request #18043 from tianon/freebsd-package-name + + Fix "./docker" package name on freebsd + +commit 4dda67b8014e71508e992c736febc5c45c53c095 +Merge: 8fff64fe4f 1716d497a4 +Author: Alexander Morozov +Date: Tue Nov 17 11:03:40 2015 -0800 + + Merge pull request #16452 from rhatdan/btrfs-selinux + + Relabel BTRFS Content on container Creation + +commit 8fff64fe4fd0fd06fec2334e131d1260462f4ef6 +Merge: f18d5da6a7 7f608c391d +Author: Antonio Murdaca +Date: Tue Nov 17 20:00:07 2015 +0100 + + Merge pull request #18044 from tianon/a.out + + Prevent the creation of "a.out" at the repo root + +commit f18d5da6a7d148581f8de041ada62b1724839957 +Merge: e55274e3fe aa7fd884e6 +Author: Alexander Morozov +Date: Tue Nov 17 10:46:29 2015 -0800 + + Merge pull request #17300 from kunalkushwaha/plugin-info + + Patch for Plugin drivers in docker info + +commit e55274e3fe44f8f793443c9c689c1be77fe94f7f +Merge: 71f422435e b665730d2c +Author: Alexander Morozov +Date: Tue Nov 17 10:23:41 2015 -0800 + + Merge pull request #18014 from calavera/make_normalize_local_name_local + + Make NormalizeLocalName to not reach the network to normalize names. + +commit 7f608c391dc62a712cf0d641698ed1cdc38a4e6c +Author: Tianon Gravi +Date: Tue Nov 17 09:44:36 2015 -0800 + + Prevent the creation of "a.out" at the repo root + + Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner). + + Signed-off-by: Andrew "Tianon" Page + +commit e54c4517a78ea87e6611784f9900e82f60a23303 +Author: Tianon Gravi +Date: Tue Nov 17 09:38:19 2015 -0800 + + Fix "./docker" package name on freebsd + + This fixes "can't load package: package ./docker: found packages client.go (main) and daemon_freebsd.go (docker)" + + Signed-off-by: Andrew "Tianon" Page + +commit 741246d69f7708941ee86a706c6e93d20275904f +Author: gissehel +Date: Tue Nov 17 18:24:17 2015 +0100 + + Remove redundent lines + + Signed-off-by: gissehel + +commit 71f422435ed0ea645355f1375e2a778822416302 +Merge: 1c8d8b3012 927e1e98b7 +Author: Alexander Morozov +Date: Tue Nov 17 08:33:32 2015 -0800 + + Merge pull request #17999 from tianon/linkmode-external + + Remove "-linkmode external" + +commit 1c8d8b301259ae18cfdb56043c000e8353987a3a +Merge: d507acb175 b74fd0628a +Author: Jess Frazelle +Date: Tue Nov 17 16:52:54 2015 +0100 + + Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm + + Add initial support for Docker on ARM + +commit d507acb17564986af17f653d8fa1b774993451b4 +Merge: af9757576c 7929888214 +Author: David Calavera +Date: Tue Nov 17 16:40:06 2015 +0100 + + Merge pull request #17724 from runcom/remove-depreciated-cli-flags + + Remove depreciated cli flags + +commit c16dd88c5ef35ee5fc508d1f4cef0aacd3ed58a1 +Author: GoBella +Date: Mon Nov 16 16:24:11 2015 +0800 + + "Assert change" + + Signed-off-by: GoBella + +commit 4457dce51da0277906f71cd7ca54a3ff9f31191d +Author: Thomas Recloux +Date: Mon Nov 16 22:01:06 2015 +0100 + + Introduce support for ubuntu 15.04 and higher + + Starting with version 15.04, ubuntu is based on systemd. The existing + ubuntu provider did not support systemd. + + This commit introduce a new provider dedicated to systemd based + versions. + + The previous provider is renamed to ubuntu_upstart. + + Provider detection uses the /etc/os=release VERSION_ID. + Version ID is converted to a float value and then used to choose between + providers. + + Unit tests are validating the provisioner compatibility. + + Fixes #1891 + + Signed-off-by: Thomas Recloux + +commit af9757576c69159078a1ed8e1d61049a173eafa1 +Merge: 6f1bc096a6 8ceded6d03 +Author: David Calavera +Date: Tue Nov 17 11:19:34 2015 +0100 + + Merge pull request #17556 from donhcd/testForStatsVersioning + + Test for stats versioning + +commit 6f1bc096a64efb592b56dbdefc5bfce1fa7935d3 +Merge: a2d87d14ac d7692b02bd +Author: David Calavera +Date: Tue Nov 17 11:14:54 2015 +0100 + + Merge pull request #18025 from Microsoft/10662-ArgumentEscaping + + Windows: Fix docker exec + +commit a2d87d14ac663da1ebb243736f226a071991b47f +Merge: ef424c108a ea04764059 +Author: David Calavera +Date: Tue Nov 17 11:13:01 2015 +0100 + + Merge pull request #18037 from dm4/fix-aufs-markdown-syntax + + Fix Markdown syntax error in aufs-driver.md + +commit ea047640597929436f13099fb3dc1e52f98f685b +Author: Lee, Meng-Han +Date: Tue Nov 17 17:25:57 2015 +0800 + + Fix Markdown syntax error in aufs-driver + + Signed-off-by: dm4 + +commit b665730d2c76cf991c123ad3387d6ba736a7515a +Author: David Calavera +Date: Mon Nov 16 10:27:22 2015 -0500 + + Make NormalizeLocalName to not reach the network to normalize names. + + Signed-off-by: David Calavera + +commit a25988cf760b96c855b3e1442547ea9d763c7cd1 +Author: Trevor Pounds +Date: Mon Nov 16 14:45:08 2015 -0800 + + Fix typo when --expose and --net are specified. + + Signed-off-by: Trevor Pounds + +commit 537f89e775e18991c7e7e8a74b2cb2aeff641a51 +Merge: 405d2179c1 d9946fdc6b +Author: Nathan LeClaire +Date: Mon Nov 16 18:38:43 2015 -0800 + + Merge pull request #2315 from nathanleclaire/changelog + + Update CHANGELOG.md + +commit 405d2179c1e73945dbfa65f725fd966c8eeb54ca +Merge: 7e8e38e148 746b3cc9b6 +Author: Nathan LeClaire +Date: Mon Nov 16 18:38:27 2015 -0800 + + Merge pull request #2309 from nathanleclaire/bump_0.5.1-dev + + Bump 0.5.2 dev + +commit 81aa1b507f51901eafcfaad70a656da376cf937d +Author: Alexander Morozov +Date: Mon Nov 16 17:10:53 2015 -0800 + + Remove cgroups mounting in dind + + Signed-off-by: Alexander Morozov + +commit 746b3cc9b681c613a103c8def0233314adb7978a +Author: Nathan LeClaire +Date: Mon Nov 16 10:23:41 2015 -0800 + + Bump version to 0.5.2-dev + + Signed-off-by: Nathan LeClaire + +commit d9946fdc6b60e6c7d54b83702992397df4dad026 +Author: Nathan LeClaire +Date: Mon Nov 16 16:45:49 2015 -0800 + + Update CHANGELOG.md + + Signed-off-by: Nathan LeClaire + +commit ef424c108a90a04e9c5b0bd48b9047054a6a798b +Merge: a3065fa48f 7e5e29e415 +Author: Tibor Vass +Date: Tue Nov 17 01:28:34 2015 +0100 + + Merge pull request #17988 from Microsoft/jjh/pushv2 + + Windows [TP4] Fix push to not kill daemon + +commit 292a15e40a7201801fb9b0abd81175fd0a09a814 +Author: Alexander Morozov +Date: Mon Nov 16 16:19:14 2015 -0800 + + Use /usr/lib/os-release if /etc/os-release is missing. + + As per os-release spec, /usr/lib/os-release file should be tried if + /etc/os-release is missing. + + http://www.freedesktop.org/software/systemd/man/os-release.html + + Thanks James Hunt and + Dimitri John Ledkov for contribution. + + Close #17174 + + Signed-off-by: Alexander Morozov + +commit ac526193afca9cb529d6c61f88bbdde11e2382aa +Author: Victor I. Wood +Date: Mon Nov 16 12:41:06 2015 -0800 + + change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example + + Signed-off-by: Victor I. Wood + +commit 25b37e2f0481e5e71e0c9c89827823affd50dd77 +Author: Alexander Morozov +Date: Mon Nov 16 12:02:35 2015 -0800 + + graph/graph.go: simplify appending to slice in map in byParent + + Signed-off-by: Alexander Morozov + +commit d7692b02bdeafc2837bf4269527c2eaa8be254b1 +Author: Darren Stahl +Date: Mon Nov 16 11:56:01 2015 -0800 + + Typo in previous PR processConfig, not c.ProcessConfig + + Signed-off-by: Darren Stahl + +commit 7e8e38e1485187c0064e054029bb1cc68c87d39a +Merge: 15fecaec59 7e8949a8ea +Author: Nathan LeClaire +Date: Mon Nov 16 11:12:17 2015 -0800 + + Merge pull request #2308 from nathanleclaire/bump_0.5.1 + + Bump version to 0.5.1 + +commit 7e8949a8eaea0a7d092b774b200f5375286ab5c3 +Author: Nathan LeClaire +Date: Mon Nov 16 10:23:02 2015 -0800 + + Bump version to 0.5.1 + + Signed-off-by: Nathan LeClaire + +commit a3065fa48f889ef438a7d7339ebc8fe01aca10dd +Merge: 4b706195d2 26855c7801 +Author: Alexander Morozov +Date: Mon Nov 16 10:11:27 2015 -0800 + + Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels + + Allow configurable metadata for Splunk log driver + +commit 4b706195d2e5b551ce08620862fdc4a8f8c8489f +Merge: e88ffba2ec 82ba25bea9 +Author: moxiegirl +Date: Mon Nov 16 09:15:50 2015 -0800 + + Merge pull request #17515 from azurezk/fixdoc + + fix doc of volume name conflict + +commit e88ffba2ecc01f1185523013b54479dfc58f971a +Merge: 7c5cdda74e be2152116c +Author: Sebastiaan van Stijn +Date: Mon Nov 16 17:35:04 2015 +0100 + + Merge pull request #18016 from moxiegirl/carry-17453 + + docs: modifying volumes guide to remove ambiguity. Signed-off-by: And… + +commit 7c5cdda74eaf27a31ec1a7b6e4d79ff0f0bbae4d +Merge: 92487d7fb4 e222c61594 +Author: Sebastiaan van Stijn +Date: Mon Nov 16 17:26:29 2015 +0100 + + Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh + + fix the bug: cpu percent will extremely high + +commit be2152116cd719b65d4b58c3b8fb7f63d7655f4b +Author: Andre Granovsky +Date: Wed Oct 28 17:14:49 2015 -0400 + + docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky + Adjusted as per comment. + Rebase and squash by moxigirl + + Signed-off-by: Andre Granovsky + +commit a34a39481096be8259b4ced683829d65e5acdb56 +Author: Nick Gauthier +Date: Mon Nov 16 15:54:16 2015 +0100 + + skip printing swarm info when host options swarm info is nil + + Fixes #2252 #2280 + + Signed-off-by: Nick Gauthier + +commit fe123edb080a2e60ce4d34fb0cf72d06c80cba79 +Author: Luca Orlandi +Date: Mon Nov 16 13:24:00 2015 +0100 + + Update ubuntulinux.md + + Remove '*' for purge + + Signed-off-by: Luca Orlandi + +commit 92487d7fb4963c0333c409d053ff694e619c538d +Merge: 3b1acde99b 8da449055f +Author: Tibor Vass +Date: Mon Nov 16 10:03:46 2015 +0100 + + Merge pull request #17985 from Microsoft/jjh/firstboot + + Windows: [TP4] Fix regression on second or later container starts + +commit 15fecaec5967dceb3de5a94e3b0dda364d367bd1 +Merge: 717965784d 4a5e8efc59 +Author: Olivier Gambier +Date: Mon Nov 16 09:13:14 2015 +0100 + + Merge pull request #2301 from skatsuta/doc-inactive-hyphen + + docs: show "-" for "inactive" machines + +commit 717965784d0338da206af9c07fb9b6fee9e1b71a +Merge: d8d57b845d 3363a49ffc +Author: Olivier Gambier +Date: Mon Nov 16 09:12:06 2015 +0100 + + Merge pull request #2297 from yamamoto-febc/fix_call_godep + + Change godep command call to use the GODEP variable + +commit aa7fd884e609d3d13df628600a1799e0e76444e9 +Author: Kunal Kushwaha +Date: Fri Oct 23 15:08:26 2015 +0900 + + Supported added for reterving Plugin list for Network and Volume. + Also, plugin information in docker info output. + + Signed-off-by: Kunal Kushwaha + +commit 4a5e8efc59a93858d56a753929532668f2898f6c +Author: Soshi Katsuta +Date: Mon Nov 16 15:13:39 2015 +0900 + + docs: show "-" for "inactive" machines + + Signed-off-by: Soshi Katsuta + +commit b2771b4456f12c0f55ee0f1e70d620fe1a77ca4f +Author: John Howard +Date: Sun Nov 15 21:32:31 2015 -0800 + + Windows: Disable links + + Signed-off-by: John Howard + +commit 3b1acde99b3f509302ad51caa241b750b4496af3 +Merge: 59fe485f0d d411c47139 +Author: Vincent Demeester +Date: Mon Nov 16 04:40:20 2015 +0100 + + Merge pull request #17995 from albers/completion--volume-driver + + bash completion for `docker {run,create} --volume-driver` + +commit 927e1e98b7d37bf0593651d4b639e19277e775ca +Author: Tianon Gravi +Date: Sun Nov 15 14:47:48 2015 -0800 + + Remove "-linkmode external" + + We're having to override it in so many places that it no longer seems worthwhile to bother. On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself). + + Signed-off-by: Andrew "Tianon" Page + +commit 99846a0b854178a663c8dab7a133221915d2c890 +Author: Morgan Bauer +Date: Mon Nov 9 14:32:52 2015 -0800 + + add newline to event json to match docker + + - docker server has a newline separating individual json entries + - create const string for format + - resolves #1367 + + Signed-off-by: Morgan Bauer + +commit b38483340129dadcb75c9b9fe6f249d1225abc54 +Merge: 7c3ad48210 71780b947e +Author: Guillaume Hain +Date: Sun Nov 15 18:56:57 2015 +0100 + + Merge pull request #4 from kitematic/master + + Merge master + +commit d411c47139e9a6d94c54bfb4052e7d12bf4295f0 +Author: Harald Albers +Date: Sun Nov 15 09:35:40 2015 -0800 + + bash completion for `docker {run,create} --volume-driver` + + Signed-off-by: Harald Albers + +commit 7e5e29e415f20eeb75f548ec9c5a2b5c38403600 +Author: John Howard +Date: Sat Nov 14 17:23:33 2015 -0800 + + Windows [TP4] Fix push to not kill daemon + + Signed-off-by: John Howard + +commit 82ba25bea9ae8412186e4cd1d3ba30e6a2072a26 +Author: Zhang Kun +Date: Fri Oct 30 10:48:56 2015 +0800 + + fix doc + + Signed-off-by: Zhang Kun + + fix doc + + Signed-off-by: Zhang Kun + +commit b74fd0628aefbca3b77ffa5d52995c7af2f38d04 +Author: Govinda Fichtner +Date: Thu Nov 5 15:38:41 2015 +0100 + + Add initial support for Docker on ARM + + Signed-off-by: Govinda Fichtner + +commit 378888f6d719aaf6354b3cae2aa9ae8945ecfaaf +Merge: 4f347a1303 238ee32c78 +Author: Diogo Mónica +Date: Sun Nov 15 13:12:36 2015 +0100 + + Merge pull request #295 from docker/no-stderr-for-cmds + + Set the default output for all cobra commands to be STDOUT + +commit 4f347a1303159363b8976f77169ecf91bfb23d2b +Merge: ebc41c8154 d0b3bd2860 +Author: Diogo Mónica +Date: Sun Nov 15 13:12:29 2015 +0100 + + Merge pull request #296 from endophage/pretty_print_targets + + headers were still printing when no targets were found + +commit 59fe485f0d33bbcc7b35b5c3ec650cf53a16339d +Merge: cf824d9749 18c7c34d4b +Author: Tibor Vass +Date: Sun Nov 15 12:32:25 2015 +0100 + + Merge pull request #17945 from tonistiigi/fix-windows-pull + + Fix docker pull on windows + +commit d0b3bd286086575db22431bbde43cb2916a4787a +Author: David Lawrence +Date: Sun Nov 15 02:48:33 2015 -0800 + + headers were still printing when no targets were found + Signed-off-by: David Lawrence (github: endophage) + +commit 238ee32c785fe8bd7307406cec3f96aa81ad66a4 +Author: Ying Li +Date: Sun Nov 15 02:46:29 2015 -0800 + + Set the default output for all cobra commands to be STDOUT + + Signed-off-by: Ying Li + +commit a05fee746963ba65ea6888710da5c2d2d7ea1691 +Author: Ying Li +Date: Sat Nov 14 14:49:31 2015 -0800 + + Make vet target now also checks for filenames with _test_ in the middle. + + Since if they are generic test helpers that should be exported, + they should probably go into their own package. If they are used + during testing, they should end in _test. + + Signed-off-by: Ying Li + +commit ebc41c8154270d37f1d3f69e5b3e32b02f43b1c6 +Merge: 04941d90a0 204a4f1534 +Author: Diogo Mónica +Date: Sun Nov 15 11:33:32 2015 +0100 + + Merge pull request #292 from docker/fix-signer-sign + + The NotarySigner cryptoservice now implements GetPrivateKey. + +commit 04941d90a0ce4287ee6eb2888a98685b822f0b7f +Merge: e638f0a4d6 0088d16bba +Author: Diogo Mónica +Date: Sun Nov 15 11:32:02 2015 +0100 + + Merge pull request #289 from endophage/pretty_print_targets + + pretty printing targets + +commit e638f0a4d668adf9b06d730c266b754a518998c2 +Merge: 53626b6fe6 0d7df87805 +Author: Diogo Mónica +Date: Sun Nov 15 11:31:41 2015 +0100 + + Merge pull request #285 from docker/delete-key-is-back + + Add an interactive command to delete a key from any keystore. + +commit 204a4f1534ede87cbebe82161e82e63f82101573 +Author: Ying Li +Date: Sun Nov 15 01:08:51 2015 -0800 + + The NotarySigner cryptoservice now implements GetPrivateKey. + + Previously, because it's a CryptoService wrapper around a remote signer + service, it returned nil all the time. Now, because signing is done + via private key more than CryptoService, it has to return a PrivateKey. + + The key doesn't have private bytes, but can be used for signing. + + Signed-off-by: Ying Li + +commit 7929888214741c4ab194c44e0b14ac08aca06556 +Author: Antonio Murdaca +Date: Mon Nov 9 15:37:24 2015 +0100 + + Remove deprecated cli flags + + Signed-off-by: Antonio Murdaca + +commit d9ef4f2986b93b64289d858c55b3bee67804c444 +Author: Kenjiro Nakayama +Date: Sun Nov 15 17:11:27 2015 +0900 + + Fix invalid proxy setting example + + Signed-off-by: Kenjiro Nakayama + +commit cf824d974922ae7ad55548b3f0050a2bb0e29aa2 +Merge: 586152523d e035d27223 +Author: Sebastiaan van Stijn +Date: Sun Nov 15 08:51:33 2015 +0100 + + Merge pull request #17479 from coolljt0725/show_warning + + Show warning when user specify dm.basesize for already initialized devicemapper driver + +commit 586152523d3c10624156eee485d54de80eeb7fc7 +Merge: 31a6e01f47 38724c80ab +Author: Tibor Vass +Date: Sun Nov 15 03:46:23 2015 +0100 + + Merge pull request #17987 from jfrazelle/correct-ltdl + + Correct ltdl and fix experimental macro for rpms + +commit 086c0b4a6616e8db8009a5d72411bcc6774adaf1 +Author: daehyeok mun +Date: Sat Nov 14 16:02:06 2015 -0700 + + Extract rotate file writer from json log driver + + Signed-off-by: Daehyeok Mun + +commit d1e72baa15fb81a6dcf80e6727b884fc8ff67335 +Author: Luca-Bogdan Grigorescu +Date: Sun Nov 15 00:44:18 2015 +0200 + + Fix small typos in documentation files + + Signed-off-by: Luca-Bogdan Grigorescu + +commit 38724c80ab32d5d578029f19a1b443341ff3aaf4 +Author: Jessica Frazelle +Date: Sat Nov 14 14:47:13 2015 -0800 + + fix experimental boolean macro + + Signed-off-by: Jessica Frazelle + +commit 0d7df87805408d40a13234dcad881f40e3f491d9 +Author: Ying Li +Date: Sat Nov 14 01:44:20 2015 -0800 + + Add an interactive command to delete a key from any keystore. + + This lists any matching keys, and requires the user to pick which one + to choose, if there is more than 1 matching key. Also requires the + user to confirm before deleting. + + Signed-off-by: Ying Li + +commit 49779b674af09b46c165c8dfe2e76054336b0595 +Author: Vincent Demeester +Date: Sat Nov 14 23:03:02 2015 +0100 + + Add pkg/parsers/architecture and pkg/platform + + Signed-off-by: Vincent Demeester + +commit 4e8fcd40028ed09b139b6f86954e676a1839be9c +Author: Olle Jonsson +Date: Sat Jun 13 09:39:19 2015 +0200 + + /info: Add keys Architecture, OSType + + - introduces Swarm-relevant keys, see #13634 + - docs updated + + Signed-off-by: Olle Jonsson + +commit 8be50805d970d4ba0a7af456af524c53b3cbbc24 +Merge: 257dd38a96 0c8379517e +Author: Jeffrey Morgan +Date: Sat Nov 14 21:01:57 2015 +0100 + + Merge pull request #297 from bfirsh/add-compose-for-windows-to-readme + + Update readme to reflect Compose for Windows + +commit 31a6e01f4772bb9f385254e0731a9f06c7e6ef49 +Merge: fb77b822ad 83b03b0057 +Author: Vincent Demeester +Date: Sat Nov 14 20:22:15 2015 +0100 + + Merge pull request #17009 from azurezk/user-checkers + + add c.Assert in docker_cli_ps_test.go + +commit 8da449055fd2fb60e45391c8482865dca3d0232f +Author: John Howard +Date: Sat Nov 14 11:06:19 2015 -0800 + + Windows: Fix regresion on first boot + + Signed-off-by: John Howard + +commit fb77b822ad2bb5d097ebd19a6ad4825b967a52ab +Merge: ad8a66573c 0d47b74a7f +Author: Alexander Morozov +Date: Sat Nov 14 10:54:03 2015 -0800 + + Merge pull request #17758 from rhatdan/dynbinary + + Since default is dynbinary we should test with dynbinary + +commit 9ff2197596eca0742731043a789738928f0eb7c2 +Author: Victor Vieux +Date: Sat Nov 14 19:35:15 2015 +0100 + + fix event deletion under lock + + Signed-off-by: Victor Vieux + +commit 0088d16bba795e3a7edf89324823b6cb16f75555 +Author: David Lawrence +Date: Sat Nov 14 10:11:48 2015 -0800 + + pretty printing targets + Signed-off-by: David Lawrence (github: endophage) + +commit 41619f4a902927767d149524b45d23ab9569636b +Author: Jessica Frazelle +Date: Sat Nov 14 08:04:41 2015 -0800 + + correct ltdl for centos + + Signed-off-by: Jessica Frazelle + +commit ad8a66573c61483b9a0721470438dfc8bd01993f +Merge: 7a6f2cdeeb 9db5db1b94 +Author: Antonio Murdaca +Date: Sat Nov 14 17:25:53 2015 +0100 + + Merge pull request #17851 from Microsoft/10662-ArgumentEscaping + + Prevent double escaping of Dockerfile commands on Windows + +commit 53626b6fe6b27c02c9ea7e574a924480592bff88 +Merge: 2c451909db cb6fd71848 +Author: Diogo Mónica +Date: Sat Nov 14 13:49:53 2015 +0100 + + Merge pull request #284 from docker/key-command-renaming + + Rename command line options from export/import key to backup/restore. + +commit 2c451909db2b63c1f408d4fbd7a26858867dc0fa +Author: Diogo Monica +Date: Sat Nov 14 12:51:31 2015 +0100 + + Fixing wrongly named file that led to test init deleting keys + +commit 61f91ebff7c2158c4d2d51abc88c0e35e84cf256 +Author: Stéphane Seguin +Date: Sat Nov 14 12:19:57 2015 +0100 + + Fix restart with stopped containers. + Fixes #1814 + + Signed-off-by: Stéphane Seguin + +commit 7a6f2cdeeb88f340649a459697f79548759767dd +Merge: 1448cd3ec2 52021ac2a4 +Author: Arnaud Porterie +Date: Sat Nov 14 12:03:29 2015 +0100 + + Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration + + New version of notary with pkcs11 client integration + +commit 0d47b74a7f3f42640d0714b651417415461b1b8c +Author: Dan Walsh +Date: Fri Nov 6 08:35:47 2015 +0100 + + Since default is dynbinary we should test with dynbinary + + Signed-off-by: Dan Walsh + +commit 4699ef8f87cc270fdf9e18bad5582b6696d56fe4 +Author: Anil Belur +Date: Fri Nov 13 11:23:35 2015 +0530 + + Adding test for the fix #17168. + + The test case creates a mount point, starts the daemon with the + graph dir pointing to the mount and initates a pull request. We should + be able to check for the error message when the mount point gets filled + during pull. + + Signed-off-by: Anil Belur + +commit 31cdc63419a29badad2d79590db83fe617ee8e03 +Author: Anil Belur +Date: Mon Nov 2 13:38:02 2015 +0530 + + Fix for #17168 misleading pull error + + This fix avoids overwritting the previous error messages, ensures the client gets the correct error messages and not just the most recent message during the pull request. + For this `var lastErr` replaced with a slice which acts as a temp place holder for the list of returned error messages for every attempt. + The slice is later joined and returned to the caller function after searching for the image with diffirent versions(v2,v1,v0). + + Updated the code with check for no space left on device error occurance and prevent the + daemon on falling back to v1,v0. + + Incorporated the comments from @calavera, @RichardScothern, @cpuguy83 + + Signed-off-by: Anil Belur + +commit cb6fd71848c7deaaa00a717cfd77f250b15225bd +Author: Ying Li +Date: Fri Nov 13 17:37:15 2015 -0800 + + Rename command line options from export/import key to backup/restore. + import-root/export-root have been renamed to import/export. + + Signed-off-by: Ying Li + +commit daa844079fe4996c214e51a3f57a531a01fc351c +Merge: 517763a26d eb9de9f0e8 +Author: Diogo Mónica +Date: Sat Nov 14 10:55:33 2015 +0100 + + Merge pull request #279 from docker/pretty-print + + Pretty print output of `notary key list`. + +commit 1448cd3ec26ba98d4a0d53ff02a987ddab80939d +Merge: dc136b710b 3830359745 +Author: Antonio Murdaca +Date: Sat Nov 14 08:38:09 2015 +0100 + + Merge pull request #17971 from narqo/simplify-addr-formating + + Simplify final address formatting in parser.ParseTCPAddr + +commit dc136b710b70a51510726576761f7bf9aa2455e2 +Merge: 1f53bf9097 0f2b3191d9 +Author: Antonio Murdaca +Date: Sat Nov 14 08:36:54 2015 +0100 + + Merge pull request #17211 from endocode/kayrus/docker_fd_https + + Added possibility to use TLS with systemd socket activation + +commit 3363a49ffc34b298647440b7d527a260e54b3df7 +Author: Kazumichi Yamamoto +Date: Sat Nov 14 15:54:31 2015 +0900 + + Change godep command call to use the GODEP variable + + Signed-off-by: Kazumichi Yamamoto + +commit fdc2641c2b329c48cf1d1c8c0b806bec8784b3e0 +Author: Anusha Ragunathan +Date: Fri Nov 13 10:56:21 2015 -0800 + + Fix devmapper backend in docker info + + Signed-off-by: Anusha Ragunathan + +commit b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6 +Author: Srini Brahmaroutu +Date: Tue Feb 24 18:33:18 2015 +0000 + + Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z. + Signed-off-by: Srini Brahmaroutu + +commit 1f53bf90972141bc6f5888fb3520dbc68ff9ed14 +Merge: 7e0a5398af 343e15fa3f +Author: Michael Crosby +Date: Fri Nov 13 16:45:30 2015 -0800 + + Merge pull request #17859 from liusdu/remove-rebundent + + remove unnecessary logs from daemon + +commit 7e0a5398af780669684b3c879542df0cc9126114 +Merge: 9b307fe369 32b905d90f +Author: Michael Crosby +Date: Fri Nov 13 16:26:17 2015 -0800 + + Merge pull request #17976 from Microsoft/jjh/store-test-unit + + Windows: Pass store test-unit + +commit 9b307fe369884220fdbd3540562ede9050754e6b +Merge: 439633cee6 b1da9fcc84 +Author: Alexander Morozov +Date: Fri Nov 13 16:22:30 2015 -0800 + + Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories + + putting in support for rmi id for legacy docker.io/name images in loc… + +commit 439633cee63dd77c45348b57b4ec7e1332c6206f +Merge: 28612c5587 e5261d6e4a +Author: Michael Crosby +Date: Fri Nov 13 16:00:14 2015 -0800 + + Merge pull request #17977 from Microsoft/jjh/archivewindowscomment + + Windows: Fixes comment in archive_windows.go + +commit 28612c558729a01f6d57d648436913a7055bbc14 +Merge: 58244392e5 8209571982 +Author: Michael Crosby +Date: Fri Nov 13 15:59:41 2015 -0800 + + Merge pull request #17978 from Microsoft/jjh/removevolumecheck + + Windows: Remove check for volume support + +commit 58244392e5e42bfa13114ff2cec60ef176ec173f +Merge: 13963957eb 208ad80605 +Author: Michael Crosby +Date: Fri Nov 13 15:59:06 2015 -0800 + + Merge pull request #17979 from Microsoft/jjh/tidytodowindows + + Remove 'TODO Windows' unnecessary comment + +commit 517763a26da816970ed91d3cd62a3c390394fe61 +Merge: 68962ce0f7 edf0520c9b +Author: Ying Li +Date: Fri Nov 13 15:51:42 2015 -0800 + + Merge pull request #280 from docker/remove-get-root + + Remove KeyStoreManager's dependency on a KeyStore. + +commit 68962ce0f79ac88096c56f414b139d030813d38c +Merge: 142da6ccd3 f9bd60701f +Author: Ying Li +Date: Fri Nov 13 15:51:11 2015 -0800 + + Merge pull request #281 from docker/better-pkcs11-logging + + Log whether a pkcs11 library was found and if it was loadable. + + This unfortunately prints out every time any operation is done on the Yubikey, producing a lot of log output, but perhaps that is better because an operation might fail at any given time. + + Output if no Yubikey: + DEBU[0000] Failed to initialize PKCS11 environment: loaded library /usr/local/lib/libykcs11.dylib, but no HSM slots found + + If there is a Yubikey: + DEBU[0000] Initialized PKCS11 library /usr/local/lib/libykcs11.dylib and started HSM session + +commit 142da6ccd3548bcc77cc82181253dd84b03a6254 +Merge: f0ca498474 8432f9db07 +Author: Ying Li +Date: Fri Nov 13 15:49:48 2015 -0800 + + Merge pull request #282 from docker/report-http-error + + Fixes client to report problems contacting the remote server. + +commit eb9de9f0e89844c60a5ea8e0123656cd02c4d470 +Author: Ying Li +Date: Fri Nov 13 15:44:56 2015 -0800 + + Print out a different message for list keys if no keys are found. + + Signed-off-by: Ying Li + +commit edf0520c9b56869a73f4e1fb17f3b95c039f4b3f +Author: Ying Li +Date: Fri Nov 13 02:17:58 2015 -0800 + + Remove KeyStoreManager's dependency on a KeyStore. + + The root generation code is handled by CryptoService now. + + Signed-off-by: Ying Li + +commit 13963957ebadc663915aed8c61451a93db41c27c +Merge: 5e2d4aaec2 64f8ee444d +Author: unclejack +Date: Sat Nov 14 00:51:11 2015 +0200 + + Merge pull request #17877 from aaronlehmann/capped-bytespipe + + Cap the amount of buffering done by BytesPipe + +commit 5e2d4aaec22cd09e823ee976202515ac992dec20 +Merge: f5e318a17b 2648655a4a +Author: Alexander Morozov +Date: Fri Nov 13 14:30:03 2015 -0800 + + Merge pull request #17980 from Microsoft/jjh/configuresysinit + + Remove uncalled configureSysInit + +commit f5e318a17b8bd3126281add5e82dfb09be5b8f11 +Merge: a5f3ed4801 eddb14a44e +Author: Alexander Morozov +Date: Fri Nov 13 14:29:34 2015 -0800 + + Merge pull request #17090 from duglin/dockerignoreWildcards + + Support multi-dir wildcards in .dockerignore + +commit a5f3ed4801dd48bec96d96f63a1c5099bd75a2a6 +Merge: 4302c14a64 5b6c4dd3df +Author: Doug Davis +Date: Fri Nov 13 16:53:59 2015 -0500 + + Merge pull request #17599 from perhapszzy/master + + Add line information in the parsed Dockerfile. + +commit eddb14a44eb3ca6ba0b5e6906e21d767eba1af86 +Author: Doug Davis +Date: Wed Oct 14 14:42:21 2015 -0700 + + Support multi-dir wildcards in .dockerignore + + Closes #13113 + + Signed-off-by: Doug Davis + +commit 2648655a4a0aaf41e02dec4064c5b6e68fa7b9fe +Author: John Howard +Date: Fri Nov 13 13:20:11 2015 -0800 + + Remove uncalled configureSysInit + + Signed-off-by: John Howard + +commit 52021ac2a4f2b32a6ad7444b182b569c616e500e +Author: David Lawrence +Date: Thu Nov 12 12:09:31 2015 -0800 + + fixing tests for updated CLI output + Signed-off-by: David Lawrence (github: endophage) + +commit 6c818f3e5f1bb4966c8fb54aa0c412360c9094fe +Author: Jessica Frazelle +Date: Sun Nov 8 17:59:09 2015 -0800 + + update for mac + + Signed-off-by: Jessica Frazelle + +commit cf4c3da725e5c923b637a0dbea3d20064286f008 +Author: Jessica Frazelle +Date: Fri Oct 30 18:16:29 2015 -0700 + + update debs/rpms for pkcs11 yubikey things + + Signed-off-by: Jessica Frazelle + +commit 141369457ffaeee79154f4b649525f5c8b3d5f2e +Author: Jessica Frazelle +Date: Fri Oct 30 18:14:10 2015 -0700 + + add buildtag pkcs11 to experimental + + Signed-off-by: Jessica Frazelle + +commit 94ea6af8cd1cd1d4106579ecf972a74f144e43c8 +Author: Jessica Frazelle +Date: Fri Oct 30 17:37:08 2015 -0700 + + update vendor.sh and notary api for vendored changes + + Signed-off-by: Jessica Frazelle + +commit a52a7a6991427f7f1db63755bf5a1cc09b105bd5 +Author: Jessica Frazelle +Date: Fri Oct 30 17:31:02 2015 -0700 + + update notary vendors + + Signed-off-by: Jessica Frazelle + +commit 208ad80605e5c8c48f77f1b89b25951767135224 +Author: John Howard +Date: Fri Nov 13 13:07:27 2015 -0800 + + Remove TODO Windows + + Signed-off-by: John Howard + +commit 820957198299a9fa7cbb019b2b0d3dc8c3b375d0 +Author: John Howard +Date: Fri Nov 13 13:02:30 2015 -0800 + + Windows: Remove check for volume support + + Signed-off-by: John Howard + +commit e5261d6e4a1e96d4c0fa4b4480042046b695eda1 +Author: John Howard +Date: Fri Nov 13 12:51:05 2015 -0800 + + Windows: Fixes comment + + Signed-off-by: John Howard + +commit 5b6c4dd3df4d501018268d5c32bf78380923c292 +Author: perhapszzy@sina.com +Date: Sun Nov 1 16:28:30 2015 -0500 + + Add line information in the parsed Dockerfile + + Signed-off-by: perhapszzy@sina.com + +commit 32b905d90ff133c92bb0dd89207a68c45fc81bbd +Author: John Howard +Date: Fri Nov 13 12:30:13 2015 -0800 + + Windows: Pass store test-unit + + Signed-off-by: John Howard + +commit 0c8379517e4ea3fd92d174a9a2ad423a88b45cbc +Author: Ben Firshman +Date: Fri Nov 13 20:18:34 2015 +0000 + + Update readme to reflect Compose for Windows + + Signed-off-by: Ben Firshman + +commit 4302c14a647570ec4e037ecacc920e59fdeec41a +Merge: a4acb1db4a 4f6f46a11d +Author: Alexander Morozov +Date: Fri Nov 13 12:05:22 2015 -0800 + + Merge pull request #16920 from mountkin/fix-attach-test + + fix the flaws in the test of the attach API + +commit a4acb1db4ae899e5b331b4b2724bda990e6f1371 +Merge: 42fa8e3128 fbed26297d +Author: Alexander Morozov +Date: Fri Nov 13 11:54:59 2015 -0800 + + Merge pull request #17615 from WeiZhang555/17404-net-inspect-name + + Include container names in `network inspect` + +commit 42fa8e31284c76f485bed81ed2e1327d60e5cb13 +Merge: f49fb07086 c136a33c5b +Author: Alexander Morozov +Date: Fri Nov 13 11:49:54 2015 -0800 + + Merge pull request #17417 from cpuguy83/15815_add_log_file_poller + + Fallback to file polling for jsonlog reader on err + +commit 9db5db1b94bc1000d151315851096dcc6cd3512d +Author: Darren Stahl +Date: Mon Nov 9 11:49:16 2015 -0800 + + This fixes the case where arguments are escaped twice from Dockerfiles on + Windows + + Signed-off-by: Darren Stahl + +commit 0a316477802466c50a66d165f3f9c2e4c827675e +Author: Mary Anthony +Date: Fri Nov 13 10:28:51 2015 -0800 + + Fixing issue noted by user + + Signed-off-by: Mary Anthony + +commit f49fb0708629c175d19c14558b9f9c091c71a291 +Merge: cccf674943 f57073c72b +Author: moxiegirl +Date: Fri Nov 13 10:12:58 2015 -0800 + + Merge pull request #17961 from pidster/add-weave-network-plugin + + Add Weave Network Plugin to docs/extend/plugins.md + +commit d8d57b845d1a89638df089f05bbb8206b2c4585a +Merge: 579860056b 8bbfc6ef2a +Author: Nathan LeClaire +Date: Fri Nov 13 10:11:33 2015 -0800 + + Merge pull request #2288 from dgageot/quality-01-unused-code + + Quality01 - Remove unused code + +commit cccf6749431b5055e01f824f1d479ab517e1f812 +Merge: c705be8e22 458ec418cd +Author: Alexander Morozov +Date: Fri Nov 13 09:37:06 2015 -0800 + + Merge pull request #16873 from coolljt0725/expand_docker_info + + Add more cgroup config to docker info + +commit 38303597452719fe4942c45a03783a9299235e1b +Author: Vladimir Varankin +Date: Fri Nov 13 20:32:32 2015 +0300 + + Simplify address formating + + Use `net.JoinHostPort()` which count IPv6 literals in `host`, + instead of relying on `net.ParseIP(host).To4()` side effects. + + Signed-off-by: Vladimir Varankin + +commit c705be8e229463caf466c5e6b7df9c9826ac6848 +Merge: 59a341ed2a f6a037d474 +Author: Antonio Murdaca +Date: Fri Nov 13 18:26:32 2015 +0100 + + Merge pull request #17955 from twhiteman/issue_17952 + + integration-cli: support remote docker host that uses TLS - fixes #17952 + +commit 59a341ed2a875d3c46325f34abba59facc29f1f9 +Merge: 02bc514fb8 d1ae13b0b0 +Author: Alexander Morozov +Date: Fri Nov 13 09:03:51 2015 -0800 + + Merge pull request #17833 from rhatdan/signals + + Define all of the signals defined by kill -l + +commit 0f2b3191d9e4f48b1915e2da4acc4f28b0d71494 +Author: kayrus +Date: Tue Nov 3 11:03:35 2015 +0100 + + Added possibility to use TLS with systemd socket activation + + Signed-off-by: kayrus + +commit f0ca498474ca0c052ccc1f36af8c389bea07459f +Merge: 45de2828b5 587906e6c6 +Author: Diogo Mónica +Date: Fri Nov 13 08:01:06 2015 -0800 + + Merge pull request #278 from docker/bail-if-no-cert + + More defensive coding around listing our keys in the yubikey. + +commit 430d8ff6113e41edc4605267081fa424a9bfe19f +Author: Mike Brown +Date: Thu Oct 29 12:51:36 2015 -0500 + + modifying docker --since and --until to support nanoseconds and time zones + + Signed-off-by: Mike Brown + +commit e1308a8329de0ce12e4405677a1911a5db3bd33b +Author: Daniel Nephin +Date: Fri Nov 13 10:49:17 2015 -0500 + + Fix extra warnings on masked volumes. + + Signed-off-by: Daniel Nephin + +commit a8e3ee868f670a50d00fe3d8b4f9d5284159c433 +Author: David Gageot +Date: Thu Nov 12 17:41:41 2015 +0100 + + Simpler test code + + Signed-off-by: David Gageot + +commit eb39f098d529d984d6ec9ac61adf855138396fbf +Author: David Gageot +Date: Thu Nov 12 17:20:40 2015 +0100 + + Move code where it's used + + Signed-off-by: David Gageot + +commit 8bbfc6ef2acf2e3d06a2f2728890eb26b066fddc +Author: David Gageot +Date: Thu Nov 12 17:23:52 2015 +0100 + + Remove unused code + + Signed-off-by: David Gageot + +commit 579860056b54cfaa78145f4061f1448ed07dca2d +Merge: 45d38fd31b c6d19dfb34 +Author: David Gageot +Date: Fri Nov 13 16:14:09 2015 +0100 + + Merge pull request #2284 from jeanlaurent/typo-in-changelog + + Fix for #2242 - Typo in changelog + +commit c6d19dfb34a0cf61cb70aa452a8268abe9b1efa3 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 13 15:22:01 2015 +0100 + + Fix for #2242 - Typo in changelog + + Signed-off-by: Jean-Laurent de Morlhon + +commit 8432f9db07a6b1b7b6fdf3ec3683023c03b4a5c5 +Author: Ying Li +Date: Fri Nov 13 05:26:00 2015 -0800 + + Fixes client to report problems contacting the remote server. + + Currently, when listing, publishing, or getting a particular target, + if the remote server errors, the client attempts to load it from a + local cache. However, if there is no local cache, it just returns + Metadata Not Found for listing and getting. Have it report the + remote the original remote error instead of Metadata Not Found + locally. + + Signed-off-by: Ying Li + +commit 54e375c62e50c14b178be1fbac79dfef0363ec1b +Author: Ying Li +Date: Fri Nov 13 04:18:50 2015 -0800 + + Add tests to ensure that the TUF httpstore returns the right error on 5XX. + + Signed-off-by: Ying Li + +commit f9bd60701f705e68fe519046ea288edb0fd7d7a7 +Author: Ying Li +Date: Fri Nov 13 02:50:32 2015 -0800 + + Log whether a pkcs11 library was found and if it was loadable. + + Signed-off-by: Ying Li + +commit 0735f3f447ad4b08db99dcc56b6b1745c223deee +Author: Vladimir Varankin +Date: Fri Nov 13 12:52:12 2015 +0300 + + fix drivers GetUrl to build propper IPv6 addr + + Signed-off-by: Vladimir Varankin + +commit f57073c72bfb30b083730be0623210ad5381ec58 +Author: pidster +Date: Fri Nov 13 10:06:04 2015 +0000 + + Add Weave Network Plugin to docs/extend/plugins.md + + Signed-off-by: pidster + +commit 51cb6e7296deaa187e16d061736f8f8d0f4df5ff +Author: Ying Li +Date: Fri Nov 13 01:08:00 2015 -0800 + + Add github.com/olekukonko/tablewriter dependency to Godeps. + + Signed-off-by: Ying Li + +commit 39c682327ecb5a8a2b30ac9d6951dd3247631d06 +Author: Ying Li +Date: Fri Nov 13 01:01:05 2015 -0800 + + Pretty-print the key list in a deterministic sorted order. + + Signed-off-by: Ying Li + +commit 587906e6c6ea2673171bfe70e4d256894392795e +Author: Ying Li +Date: Fri Nov 13 00:08:53 2015 -0800 + + More defensive coding around listing our keys in the yubikey. + + Signed-off-by: Ying Li + +commit c99f2f8efd2927b01c1acdb990a83df8206a96f8 +Author: Stefan Scherer +Date: Fri Nov 13 08:33:51 2015 +0100 + + Use uname to build target name for different platforms + + Signed-off-by: Stefan Scherer + +commit 02bc514fb8f41c8e8815c835241d114a6d6fdbd2 +Merge: 6c27605df6 3e9543fc61 +Author: Sebastiaan van Stijn +Date: Fri Nov 13 07:37:47 2015 +0100 + + Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs + + docs: update supported drivers for docker logs + +commit f9b11d7139c4272d05377abf1d04c089a454da4f +Author: Emmanuel Bretelle +Date: Thu Nov 12 23:42:28 2015 -0500 + + [linux] virtualization detection + + Use ioutil and also check for smd flag + + Signed-off-by: Emmanuel Bretelle + +commit 257dd38a9628e48dc524bd99c6947d6fb10784b7 +Author: Jeffrey Morgan +Date: Thu Nov 12 20:50:01 2015 -0800 + + Bump version + + Signed-off-by: Jeffrey Morgan + +commit 4e4a68415cc2a85a77241a0e63d7ea2a5d4e6090 +Author: Shekhar Gulati +Date: Tue Nov 10 19:09:59 2015 +0530 + + added rx-docker-client library + + Signed-off-by: Shekhar Gulati + +commit 946ae12145e527a29efb78606ae933f5aa1f44a6 +Author: Victoria Bialas +Date: Mon Nov 2 10:39:46 2015 -0800 + + added issue number to git commit example, same as on cheatsheet + + Signed-off-by: Victoria Bialas + +commit 8bf0587f1e08658ed78e0b123442e28c1bafcd83 +Author: Jeffrey Morgan +Date: Thu Nov 12 17:24:03 2015 -0800 + + Bump compose to 1.5.1 + + Signed-off-by: Jeffrey Morgan + +commit 6c27605df6af842da3308f2bf4f9d1a987ee6b2e +Merge: c5a10b1d27 f9daecc880 +Author: Brian Goff +Date: Thu Nov 12 20:06:21 2015 -0500 + + Merge pull request #17954 from LK4D4/move_utils_selinux + + Rename daemon/utils_*.go to selinux + +commit c5a10b1d2702937042e36e062016e1b5a868ad3c +Merge: c8399630ca 5935867213 +Author: moxiegirl +Date: Thu Nov 12 16:34:18 2015 -0800 + + Merge pull request #17941 from s093294/patch-1 + + updated instruction to correct file path + +commit c8399630ca5c85ab3020a3d621e11f536d9ac6ee +Merge: 588fedef4a 06a4e5f981 +Author: moxiegirl +Date: Thu Nov 12 16:33:41 2015 -0800 + + Merge pull request #17942 from thaJeztah/speedy-boarding + + Docs: improve caching for make docs + +commit f6a037d474d87cfa2a66bb0292c34ebc9e0bb275 +Author: Todd Whiteman +Date: Thu Nov 12 15:55:48 2015 -0800 + + integration-cli: support remote docker host that uses TLS - fixes #17952 + + Signed-off-by: Todd Whiteman + +commit f9daecc880f371cf652fd64095d65f0fe35fb2f7 +Author: Alexander Morozov +Date: Thu Nov 12 15:48:41 2015 -0800 + + Rename daemon/utils_*.go to selinux + + Signed-off-by: Alexander Morozov + +commit 6236bb0019de51fe482e2ba6be8a99de471a6861 +Author: Daniel Nephin +Date: Tue Nov 10 19:43:05 2015 -0500 + + Handle both SIGINT and SIGTERM for docker-compose run. + + Signed-off-by: Daniel Nephin + +commit ea4230e7a2f53a116c22dce20632cb5355cf4c07 +Author: Daniel Nephin +Date: Tue Nov 10 18:52:21 2015 -0500 + + Handle both SIGINT and SIGTERM for docker-compose up. + + Signed-off-by: Daniel Nephin + +commit fae20305ec5ca13f59c93093bb300cee91863e9c +Merge: 9c8173dbfd 4628e93fb2 +Author: Daniel Nephin +Date: Thu Nov 12 17:29:43 2015 -0500 + + Merge pull request #2384 from dnephin/bump-1.5.1 + + **WIP** Bump 1.5.1 + +commit b986cefc25f88c1d1a250945b23fb4cfa50c84b7 +Author: Carol Fager-Higgins +Date: Thu Nov 12 12:52:42 2015 -0800 + + edits for CSengine and index.md + + Signed-off-by: Carol Fager-Higgins + +commit ac53cc42c483afa6dba5f9e611d26ecba9fad92b +Author: Viktor Stanchev +Date: Thu Nov 12 09:59:51 2015 -0800 + + DTR API docs 1.4.0 in the docs chrome + menu + +commit 45d38fd31bba9764a644bcfef02c4e69755b2bee +Merge: 7a4915e999 89675067eb +Author: David Gageot +Date: Thu Nov 12 21:34:34 2015 +0100 + + Merge pull request #2276 from dgageot/cleanup + + Clean-up dependencies + +commit 588fedef4af1550f631a71ef1bd98998bc031613 +Merge: 318a13b0af 90eac6b48b +Author: Vincent Demeester +Date: Thu Nov 12 21:13:09 2015 +0100 + + Merge pull request #17949 from Microsoft/jjh/cpuweighttp4 + + Windows: TP4 fix cpu weight + +commit 4628e93fb2ee8e09f9410016574be58a5c2973ed +Author: Daniel Nephin +Date: Thu Nov 12 13:23:04 2015 -0500 + + Bump 1.5.1 + + Signed-off-by: Daniel Nephin + +commit 82086a4e92aada343cf656e7c5c1e9f88d13533e +Author: Daniel Nephin +Date: Thu Nov 12 13:26:13 2015 -0500 + + Remove name field from the list of ALLOWED_KEYS + + Signed-off-by: Daniel Nephin + +commit 96e9b470597594beaade8e1851cbb2b3f5c3b37c +Author: Daniel Nephin +Date: Mon Nov 9 20:01:20 2015 -0500 + + Inclide the filename in validation errors. + + Signed-off-by: Daniel Nephin + +commit 34166ef5a4a64cfd0cd13acb607fbd1b36412232 +Author: Daniel Nephin +Date: Thu Nov 12 12:43:29 2015 -0500 + + Refactor process_errors into smaller functions + + So that it passed new max-complexity requirement + + Signed-off-by: Daniel Nephin + +commit 285e52cc7c17764b54a683e849787ee20c476349 +Author: Daniel Nephin +Date: Thu Nov 12 12:40:36 2015 -0500 + + Add ids to config schemas + + Also enforce a max complexity for functions and add some new tests for config. + + Signed-off-by: Daniel Nephin + +commit 9f6a5a964a75942b4828db89b6aad69891879f48 +Merge: 0a35fd93cd 9c305ac10f +Author: Daniel Nephin +Date: Thu Nov 12 15:01:32 2015 -0500 + + Merge pull request #2355 from dnephin/refactor_handle_error + + Refactor process_error and include a filename as part of the validation error messages + +commit 318a13b0afbfe652c7b6de660caa6bbbf884e95d +Merge: 812a1c149a 705b50850c +Author: Vincent Demeester +Date: Thu Nov 12 20:44:31 2015 +0100 + + Merge pull request #17948 from LK4D4/splunk_windows + + Enable Splunk logdriver for windows + +commit 812a1c149a4a6db09eb59af29bed2713821e696e +Merge: ef6cb749f0 0fbfa1449d +Author: Vincent Demeester +Date: Thu Nov 12 20:42:13 2015 +0100 + + Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device + + Add support for blkio.weight_device + +commit 90eac6b48baac2b74b4721456fee4b3f2a0527b8 +Author: John Howard +Date: Thu Nov 12 10:58:20 2015 -0800 + + Windows: TP4 fix cpu weight + + Signed-off-by: John Howard + +commit ef6cb749f0788813717c5f8522713dcdbeaa1915 +Merge: b99b23ba93 6b02876362 +Author: James Turnbull +Date: Thu Nov 12 14:05:44 2015 -0500 + + Merge pull request #17947 from Blaisorblade/patch-1 + + Replace now broken link with a "permalink" + +commit 705b50850c47e44d82fb40b7f86ddb56a43c20f4 +Author: Alexander Morozov +Date: Thu Nov 12 10:57:21 2015 -0800 + + Enable Splunk logdriver for windows + + Signed-off-by: Alexander Morozov + +commit 89675067eb2010a1789766228d1ca6539241ff6f +Author: David Gageot +Date: Thu Nov 12 19:16:27 2015 +0100 + + Clean-up dependencies + + Signed-off-by: David Gageot + +commit b99b23ba93d5f9f9eda97c020274994173419c88 +Merge: 8b9856dbd7 644471bac8 +Author: Vincent Demeester +Date: Thu Nov 12 19:56:09 2015 +0100 + + Merge pull request #17929 from mqliang/hardCode + + Removing TODO in pkg/term/windows + +commit d52c969f947750efb85e10b7a598f3c7b92d3996 +Author: Joffrey F +Date: Wed Nov 11 12:52:30 2015 -0800 + + Add test for environment variable dashes support + + Signed-off-by: Joffrey F + +commit 63c3e6f58c124d757705711dfc56b50130136615 +Author: Joffrey F +Date: Wed Nov 11 12:45:02 2015 -0800 + + Allow dashes in environment variable names + + See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html + Environment variable names used by the utilities in the Shell and + Utilities volume of POSIX.1-2008 consist solely of uppercase letters, + digits, and the ( '_' ) from the characters defined in + Portable Character Set and do not begin with a digit. Other characters may + be permitted by an implementation; applications shall tolerate the + presence of such names. + + Signed-off-by: Joffrey F + +commit 0ab76bb8bccf507dc17b2b016d5ecabc1fcb5dc6 +Author: Daniel Nephin +Date: Mon Nov 9 15:39:55 2015 -0500 + + Add a test for invalid field 'name', and fix an existing test for invalid service names. + + Signed-off-by: Daniel Nephin + +commit 7fc577c31de5f316de543576609c675b177291a7 +Author: Daniel Nephin +Date: Fri Nov 6 11:57:27 2015 -0500 + + Remove name from config schema. + + Refactors config validation of a service to use a ServiceConfig data object. + Instead of passing around a bunch of related scalars, we can use the + ServiceConfig object as a parameter to most of the service validation functions. + + This allows for a fix to the config schema, where the name is a field in the + schema, but not actually in the configuration. My passing the name around as + part of the ServiceConfig object, we don't need to add it to the config options. + Fixes #2299 + + validate_against_service_schema() is moved from a conditional branch in + ServiceExtendsResolver() to happen as one of the last steps after all + configuration is merged. This schema only contains constraints which only need + to be true at the very end of merging. + + Signed-off-by: Daniel Nephin + +commit 3a43110f062a00b7e1256d7594f0dd345447c6fc +Author: Daniel Nephin +Date: Mon Nov 9 14:24:44 2015 -0500 + + Fix a bug in ExtendsResolver where the service name of the extended service was wrong. + + This bug can be seen by the change to the test case. When the extended service + uses a different name, the error was reported incorrectly. + + By fixing this bug we can simplify self.signature and self.detect_cycles to + always use self.service_name. + + Signed-off-by: Daniel Nephin + +commit 87d79d4d993bc06c16ae19aba71aadd88292abb3 +Author: Daniel Nephin +Date: Fri Nov 6 17:18:47 2015 -0500 + + Rename ServiceLoader to ServiceExtendsResolver + + ServiceLoader has evolved to be not really all that related to "loading" a + service. It's responsibility is more to do with handling the `extends` + field, which is only part of loading. The class and its primary method + (make_service_dict()) were renamed to better reflect their responsibility. + + As part of that change process_container_options() was removed from + make_service_dict() and renamed to process_service(). It contains logic for + handling the non-extends options. + + This change allows us to remove the hacks from testcase.py and only call + the functions we need to format a service dict correctly for integration tests. + + Signed-off-by: Daniel Nephin + +commit 83581c3a0ff393af4529734f079afcf26e5c6191 +Author: Daniel Nephin +Date: Fri Nov 6 16:38:38 2015 -0500 + + Validate additional files before merging them. + + Consolidates all the top level config handling into `process_config_file` which + is now used for both files and merge sources. + + Signed-off-by: Daniel Nephin + +commit ba90f55075a5e07ec23874707206260eb372734c +Author: Joffrey F +Date: Wed Nov 11 11:21:24 2015 -0800 + + Reorganize conditional branches to improve readability + + Signed-off-by: Joffrey F + +commit 3313dcb1ce7306fc6936e547c86f6cf53af08a31 +Author: Yves Peter +Date: Wed Nov 4 23:40:57 2015 +0100 + + Fixes #1490 progress_stream would print a lot of new lines on "docker-compose pull" if there's no tty. + + Signed-off-by: Yves Peter + +commit 92d56fab475256a732ba4e98b993c5a5d626d0d5 +Author: Daniel Nephin +Date: Wed Nov 4 18:00:24 2015 -0500 + + Add a warning when the host volume config is being ignored. + + Signed-off-by: Daniel Nephin + +commit 1208f92d9cca35f378d8d5c497710e5481e7d7b1 +Author: Daniel Nephin +Date: Tue Nov 10 13:37:07 2015 -0500 + + Update doc wording for ulimits. + + and move tests to the correct module + + Signed-off-by: Daniel Nephin + +commit 8444551373670035544edf7bc09fc870521884e6 +Author: Kevin Greene +Date: Mon Oct 26 17:39:50 2015 -0400 + + Added ulimits functionality to docker compose + + Signed-off-by: Kevin Greene + +commit 73ebd7e560d6ec9ce3473ed77a91336bbf379af6 +Author: Daniel Nephin +Date: Fri Nov 6 13:56:25 2015 -0500 + + Only create the default network if at least one service needs it. + + Signed-off-by: Daniel Nephin + +commit 0a96f86f7444841017c4fcd7063d6d22a2488a0b +Author: Daniel Nephin +Date: Fri Nov 6 14:30:27 2015 -0500 + + Cleanup workaround in testcase.py + + Signed-off-by: Daniel Nephin + +commit 36176befb0ef4a16ef24b09234238363756689e5 +Author: Daniel Nephin +Date: Thu Nov 5 15:33:42 2015 -0500 + + Fix #1549 - flush after each line of logs. + + Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function. + + Signed-off-by: Daniel Nephin + +commit de08da278dcc9051d9b1040240cd9433f2266502 +Author: Daniel Nephin +Date: Tue Nov 10 13:11:59 2015 -0500 + + Re-order flags in bash completion + + and remove unnecessary variables from build command. + + Signed-off-by: Daniel Nephin + +commit 4c2eb17ccd04e5da00366de2650acf20becf0200 +Author: Adrian Budau +Date: Tue Oct 27 02:00:51 2015 -0700 + + Added --force-rm to compose build. + + It's a flag passed to docker build that removes the intermediate + containers left behind on fail builds. + + Signed-off-by: Adrian Budau + +commit 8fb44db92bd35c0ab9145401a0a560bc0391761f +Author: Daniel Nephin +Date: Tue Oct 20 13:10:32 2015 -0400 + + Cleanup some unit tests and whitespace. + + Remove some unnecessary newlines. + Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything. + Updated some unit tests to use mocks instead of a custom fake. + + Signed-off-by: Daniel Nephin + +commit 4105c3017c9a75b6044298daffe4a56d7409c2d5 +Author: Daniel Nephin +Date: Mon Nov 2 17:52:37 2015 -0500 + + Move cli tests to a new testing package. + + These cli tests are now a different kind of that that run the compose binary. They are not the same as integration tests that test some internal interface. + + Signed-off-by: Daniel Nephin + +commit 7f2f4eef48c2cec4f8cf8337c4a9076820cc9e3e +Author: Daniel Nephin +Date: Mon Nov 2 16:46:49 2015 -0500 + + Update cli tests to use subprocess. + + Signed-off-by: Daniel Nephin + +commit 666c3cb1c76e6d69075337e523effce0d93b9e4d +Author: Joffrey F +Date: Tue Nov 10 10:11:20 2015 -0800 + + Use exit code 1 when encountering a ReadTimeout + + Signed-off-by: Joffrey F + +commit 886134c1f3ca27f6bb849551a5e5a31e3efc6e07 +Author: Daniel Nephin +Date: Fri Nov 6 12:29:52 2015 -0500 + + Recreate dependents when a dependency is created (not just when it's recreated). + + Signed-off-by: Daniel Nephin + +commit ba61a6c5fbad38a6fc157f7c19003feea0be32e4 +Author: Daniel Nephin +Date: Thu Nov 5 17:50:32 2015 -0500 + + Don't set the hostname to the service name with networking. + + Signed-off-by: Daniel Nephin + +commit 3f14df374fa5e47558de2d376f69194033817407 +Author: Daniel Nephin +Date: Wed Nov 4 15:54:59 2015 -0500 + + Handle non-utf8 unicode without raising an error. + + Signed-off-by: Daniel Nephin + +commit e6755d1e7c548ebc5f011fd623c3bba53a3bf4b4 +Author: Daniel Nephin +Date: Wed Nov 4 16:46:19 2015 -0500 + + Use VolumeSpec instead of re-parsing the volume string. + + Signed-off-by: Daniel Nephin + +commit c4f59e731d540780a767d105bcb8d7d164ba4cd5 +Author: Daniel Nephin +Date: Wed Nov 4 16:37:44 2015 -0500 + + Make working_dir consistent in the config package. + + - make it a positional arg, since it's required + - make it the first argument for all functions that require it + - remove an unnecessary one-line function that was only called in one place + + Signed-off-by: Daniel Nephin + +commit 805ed344c010df3a0aa82acfd7c15beec7fbdbc3 +Author: Daniel Nephin +Date: Mon Oct 19 13:40:13 2015 -0400 + + Refactor ServiceLoader to be immutable. + + Mutable objects are harder to debug and harder to reason about. ServiceLoader was almost immutable. There was just a single function which set fields for a second function. Instead of mutating the object, we can pass those values as parameters to the next function. + + Signed-off-by: Daniel Nephin + +commit a5959d9be2167b5a9d671ca5611955eb34c20549 +Author: Daniel Nephin +Date: Mon Oct 19 12:52:38 2015 -0400 + + Some minor style cleanup + + - fixed a docstring to make it PEP257 compliant + - wrapped some long lines + - used a more specific error + + Signed-off-by: Daniel Nephin + +commit 0375dccf640c1f94482da4f3f8f7acfc6a924700 +Author: Mazz Mosley +Date: Tue Oct 27 17:37:48 2015 +0000 + + Handle non-ascii chars in volume directories + + Signed-off-by: Mazz Mosley + +commit 3c4bb5358e5ebee180c62a7d4d7cfa329a607f59 +Author: Daniel Nephin +Date: Thu Nov 5 10:26:54 2015 -0500 + + Upgrade pyyaml to 3.11 + + Signed-off-by: Daniel Nephin + +commit e317d2db9dbe4a6fea5ceda4d5c0bc67a88b9d3e +Author: Daniel Nephin +Date: Mon Nov 2 13:33:13 2015 -0500 + + Remove service.start_container() + + It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly. + + Signed-off-by: Daniel Nephin + +commit 3daecfa8e434966b00214aade861aafdb0236c3b +Author: Joffrey F +Date: Mon Nov 9 13:07:26 2015 -0800 + + Update service config_dict computation to include volumes_from mode + + Ensure config_hash is updated when volumes_from mode is changed, and + service is recreated on next up as a result. + + Signed-off-by: Joffrey F + +commit cf933623682f5483ea41fbbb7cab5bca2402b996 +Author: Aanand Prasad +Date: Mon Nov 9 17:24:21 2015 +0000 + + Fix parallel output + + We were outputting an extra line, which in *some* cases, on *some* + terminals, was causing the output of parallel actions to get messed up. + + In particular, it would happen when the terminal had just been cleared + or hadn't yet filled up with a screen's worth of text. + + Signed-off-by: Aanand Prasad + +commit 23d4eda2a5de23a72842132f606e545811c93a85 +Author: Daniel Nephin +Date: Tue Nov 3 20:00:54 2015 -0500 + + Fix service recreate when image changes to build. + + Signed-off-by: Daniel Nephin + +commit 718ae13ae1702ca5766a79b395c939023b7c15db +Author: Daniel Nephin +Date: Wed Oct 28 13:16:19 2015 -0400 + + Move config hash tests to service_test.py + + Signed-off-by: Daniel Nephin + +commit 7a4915e999e9538cad2ad7867d98ba599fc0635a +Merge: 34cd4fd898 2fe390babc +Author: David Gageot +Date: Thu Nov 12 19:40:53 2015 +0100 + + Merge pull request #2249 from nathanleclaire/create_help_docs_and_nits + + Update flag help explanation and VirtualBox version line + +commit 9c305ac10f6c6900e432602ccefa5e0bdd83f9e1 +Author: Daniel Nephin +Date: Thu Nov 12 13:26:13 2015 -0500 + + Remove name field from the list of ALLOWED_KEYS + + Signed-off-by: Daniel Nephin + +commit 6b02876362680a1acd2c0fb1fdd85183cee03f20 +Author: Paolo G. Giarrusso +Date: Thu Nov 12 19:15:49 2015 +0100 + + Replace now broken link with a "permalink" + + Fix #17927. + + Instead of pointing to a file in Docker's GitHub repo on `master` + (which got renamed, breaking the link), point to a specific version + (the current latest). As a bonus, we now highlight the most + relevant lines, without becoming more fragile. + + Signed-off-by: Paolo G. Giarrusso + +commit 64f8ee444d23ae29a236f169f1d7faf7042b524a +Author: Aaron Lehmann +Date: Tue Sep 29 10:58:08 2015 -0700 + + Cap the amount of buffering done by BytesPipe + + Turn BytesPipe's Read and Write functions into blocking, goroutine-safe + functions. Add a CloseWithError function to propagate an error code to + the Read function. + + Adjust tests to work with the blocking Read and Write functions. + + Remove BufReader, since now its users can use BytesPipe directly. + + Signed-off-by: Aaron Lehmann + +commit 18c7c34d4be593110a1c3df3f00c40eec4603dea +Author: Tonis Tiigi +Date: Thu Nov 12 09:33:43 2015 -0800 + + Fix docker pull on windows + + Exceptions for the windows base layer handling. + + + Signed-off-by: Tonis Tiigi + +commit cddbe9fbf1b6a107dce34c345ad9d94f17635834 +Merge: 77ff37a853 9c8173dbfd +Author: Daniel Nephin +Date: Thu Nov 12 13:03:47 2015 -0500 + + Merge remote-tracking branch 'docker/release' into bump-1.5.1 + +commit 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af +Merge: ce29a8cc37 d0a4b216a6 +Author: Tianon Gravi +Date: Thu Nov 12 09:51:36 2015 -0800 + + Merge pull request #17699 from jfrazelle/update-release-script-to-new-process + + update release script and release process + +commit 589755d03448b04dff441895949116d647b64bc1 +Author: Daniel Nephin +Date: Mon Nov 9 20:01:20 2015 -0500 + + Inclide the filename in validation errors. + + Signed-off-by: Daniel Nephin + +commit fa96484d2835b8711e560d0c22626c67b99b2407 +Author: Daniel Nephin +Date: Thu Nov 12 12:43:29 2015 -0500 + + Refactor process_errors into smaller functions + + So that it passed new max-complexity requirement + + Signed-off-by: Daniel Nephin + +commit f7d808769405e52e4c84acdcf15875614cb71993 +Author: Daniel Nephin +Date: Thu Nov 12 12:40:36 2015 -0500 + + Add ids to config schemas + + Also enforce a max complexity for functions and add some new tests for config. + + Signed-off-by: Daniel Nephin + +commit 34cd4fd8983daef296d99b4d0bbbc962a43a5d5f +Merge: 9dd438e1f6 fe37f1fb0d +Author: Jean-Laurent de Morlhon +Date: Thu Nov 12 18:05:05 2015 +0100 + + Merge pull request #2250 from jeanlaurent/2204-broken-env-unset + + Fix for docker-machine env unset + +commit fe37f1fb0dcf488f3847e7c22bac07006a177741 +Author: Jean-Laurent de Morlhon +Date: Tue Nov 10 14:41:07 2015 +0100 + + Fix #2204 broken env unset + + Signed-off-by: Jean-Laurent de Morlhon + +commit ce29a8cc377f9918b71975ffaaa0c314d9977149 +Merge: fc36475184 2910f1101d +Author: Vincent Demeester +Date: Thu Nov 12 16:43:12 2015 +0100 + + Merge pull request #17200 from maaquib/16756-integration-cli-events-test + + Using checkers assert for integration-cli/docker_cli_events_test.go + +commit fc364751840e2e54e358d0b46efc9790c6fd9d19 +Merge: 8cf38b6a8b 91041884f8 +Author: David Calavera +Date: Thu Nov 12 07:37:29 2015 -0800 + + Merge pull request #17898 from zelahi/16756-createtest-dockercli + + changed if else statements to c.Asserts in docker_cli_create_test.go. + +commit 06a4e5f9815d55a91b17cc1eb6556bf029057ec6 +Author: Sebastiaan van Stijn +Date: Thu Nov 12 16:30:40 2015 +0100 + + Docs: improve caching for make docs + + Use caching for all other repositories, instead + of doing a svn checkout each time. + + This may result in showing outdated docs + for other repositories, but --no-cache can be + used if the latest docs are needed. + + Signed-off-by: Sebastiaan van Stijn + +commit 8cf38b6a8b031bd0d39d80d0a1d1b6e860a43acb +Merge: eed704f7d9 5fa2e4d4f2 +Author: David Calavera +Date: Thu Nov 12 07:28:32 2015 -0800 + + Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig + + Refactor ProcessConfig + +commit 9dd438e1f67b55f03cd228a03db03b23e802b699 +Merge: f38d8efb3b 3d72f50c61 +Author: David Gageot +Date: Thu Nov 12 16:20:21 2015 +0100 + + Merge pull request #2264 from dgageot/2255-fix-in-container-build + + FIX #2255 - make cross should copy binaries + +commit f38d8efb3b33c7917da69fd3e287902cc130f774 +Merge: 065b6976da 98abeddf3b +Author: David Gageot +Date: Thu Nov 12 16:17:06 2015 +0100 + + Merge pull request #2268 from dgageot/ci + + Build linux/darwin/windows on Travis + +commit eed704f7d933364e68cf29bcd4ed0e3591fd4b6b +Merge: 9c6e3396ef dc41fff56e +Author: David Calavera +Date: Thu Nov 12 07:16:43 2015 -0800 + + Merge pull request #17901 from runcom/remove-not-needed-func + + hack: make.sh: remove not used function + +commit 593586721341c9e0acb00b55d1c3f283ac162697 +Author: Poul Kjeldager Sørensen +Date: Thu Nov 12 15:58:23 2015 +0100 + + updated instruction to correct file path + + Signed-off-by: Poul Kjeldager Sørensen + Signed-off-by: Poul Kjeldager Sørensen + +commit d1ae13b0b06c109fb7c62bf86f3a9337bca630b5 +Author: Dan Walsh +Date: Sat Nov 7 11:53:10 2015 +0100 + + Define all of the signals defined by kill -l + + 1) SIGHUP 2) SIGINT 3) SIGQUIT 4) SIGILL 5) SIGTRAP + 6) SIGABRT 7) SIGBUS 8) SIGFPE 9) SIGKILL 10) SIGUSR1 + 11) SIGSEGV 12) SIGUSR2 13) SIGPIPE 14) SIGALRM 15) SIGTERM + 16) SIGSTKFLT 17) SIGCHLD 18) SIGCONT 19) SIGSTOP 20) SIGTSTP + 21) SIGTTIN 22) SIGTTOU 23) SIGURG 24) SIGXCPU 25) SIGXFSZ + 26) SIGVTALRM 27) SIGPROF 28) SIGWINCH 29) SIGIO 30) SIGPWR + 31) SIGSYS 34) SIGRTMIN 35) SIGRTMIN+1 36) SIGRTMIN+2 37) SIGRTMIN+3 + 38) SIGRTMIN+4 39) SIGRTMIN+5 40) SIGRTMIN+6 41) SIGRTMIN+7 42) SIGRTMIN+8 + 43) SIGRTMIN+9 44) SIGRTMIN+10 45) SIGRTMIN+11 46) SIGRTMIN+12 47) SIGRTMIN+13 + 48) SIGRTMIN+14 49) SIGRTMIN+15 50) SIGRTMAX-14 51) SIGRTMAX-13 52) SIGRTMAX-12 + 53) SIGRTMAX-11 54) SIGRTMAX-10 55) SIGRTMAX-9 56) SIGRTMAX-8 57) SIGRTMAX-7 + 58) SIGRTMAX-6 59) SIGRTMAX-5 60) SIGRTMAX-4 61) SIGRTMAX-3 62) SIGRTMAX-2 + 63) SIGRTMAX-1 64) SIGRTMAX + + This will allow users to specify signals by name. Needed to make docker run --stop-signal + work as defined by systemd. + + man systemd + + defines the proper way to shutdown a systemd running as pid 1 in a container as + + SIGRTMIN+4 + + Signed-off-by: Dan Walsh + +commit 26855c780184c528446957bd77821c6f4c74b343 +Author: Denis Gladkikh +Date: Tue Nov 10 16:42:27 2015 -0800 + + Allow configurable metadata for Splunk log driver + + Add support of `tag`, `env` and `labels` for Splunk logging driver. + Removed from message `containerId` as it is the same as `tag`. + + Signed-off-by: Denis Gladkikh + +commit 2ba581d46939504e4c722e96d5a35312bf763a76 +Merge: 4c345be02a 953f2868b1 +Author: Petri Sirkkala +Date: Thu Nov 12 16:06:37 2015 +0200 + + Merge remote-tracking branch 'docker/master' + + Signed-off-by: Petri Sirkkala + +commit 98abeddf3be980483a6da71a382245f54f2ef4e1 +Author: David Gageot +Date: Thu Nov 12 15:07:14 2015 +0100 + + Fix cross-platform CI + + Signed-off-by: David Gageot + +commit 8f7ceb1c4845512a0132e3c078ea0eadf9f900f9 +Author: David Gageot +Date: Thu Nov 12 15:04:36 2015 +0100 + + Add missing golang.org/x/sys dep. + + Signed-off-by: David Gageot + +commit 466d59d6347e7639173a6c4f1f8ba56811fbe795 +Author: David Gageot +Date: Thu Nov 12 14:43:41 2015 +0100 + + Simplify dep-restore target + + Signed-off-by: David Gageot + +commit 40d153145fe28be8167b878962bd98956be4b4a3 +Author: Jean-Laurent de Morlhon +Date: Tue Nov 10 20:59:15 2015 +0100 + + Fix for #2244 + + Signed-off-by: Jean-Laurent de Morlhon + +commit 9c6e3396ef7ba44837ffaede0345ab3a105e8116 +Merge: 715ddd6ee5 f9657819cd +Author: Sven Dowideit +Date: Thu Nov 12 22:39:35 2015 +1000 + + Merge pull request #17631 from sallyom/docker-login-non-root + + clarify docker login + +commit f9657819cdd9ea2a9327887db1c5a4aa405ffae9 +Author: Sally O'Malley +Date: Mon Nov 2 17:20:38 2015 -0500 + + docker-login man/doc add security info + + Signed-off-by: Sally O'Malley + +commit 715ddd6ee579378a50b8d646c5fbbf381db5b20f +Merge: 7d783ea5eb f2705fa6ed +Author: Sven Dowideit +Date: Thu Nov 12 22:09:56 2015 +1000 + + Merge pull request #17938 from thaJeztah/fix-docs-run-reference-link + + docs: fix link to "run reference" + +commit f2705fa6ede76ad8b307ca184d3e146f5d69f7e6 +Author: Sebastiaan van Stijn +Date: Thu Nov 12 12:38:46 2015 +0100 + + docs: fix link to "run reference" + + Signed-off-by: Sebastiaan van Stijn + +commit 065b6976da117ba56be38ba6a8a0189e52488efc +Merge: b90ffae460 e2410d435c +Author: David Gageot +Date: Thu Nov 12 11:47:04 2015 +0100 + + Merge pull request #2265 from dgageot/2262-ci-build-all-targets + + Build on all platforms + +commit 7d783ea5eb4c31be85a9b21bfac0c462d3d2d4f3 +Merge: b6899ad56f 8446a5c88b +Author: Brian Goff +Date: Thu Nov 12 05:41:41 2015 -0500 + + Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver + + Add zsh completion for 'docker {run,create} --volume-driver' + +commit b6899ad56fd4cd1636642c58fb7f7bc161fddef6 +Merge: 40ed821d2e fa7ec908c4 +Author: Brian Goff +Date: Thu Nov 12 05:36:40 2015 -0500 + + Merge pull request #17923 from LK4D4/simple_ckill + + daemon/kill.go: simplify if statement + +commit e2410d435cf8c10c11395958cedb6781fa448aa2 +Author: David Gageot +Date: Thu Nov 12 10:24:50 2015 +0100 + + Run CI for linux/osx/windows + + Signed-off-by: David Gageot + +commit 45de2828b5e0083bfb4e9a5a781eddb05e2ef9d0 +Merge: a9fda578ee d2f69fe5bc +Author: David Lawrence +Date: Thu Nov 12 01:40:38 2015 -0800 + + Merge pull request #271 from docker/adding-pkcs11-signed + + Adding pkcs11 signed + +commit d2f69fe5bc9db96674e2e5aba8e4c60d9fc1a840 +Author: Diogo Monica +Date: Thu Nov 12 01:22:40 2015 -0800 + + Adding another path to search for ykcs libs + + Signed-off-by: Diogo Monica + +commit 42cc828865befb2a055be5e4823ee294bb2ae0b2 +Merge: a51f380418 5d0893ef2a +Author: Diogo Mónica +Date: Wed Nov 11 23:05:37 2015 -0800 + + Merge pull request #56 from docker/last-stuff + + Some more tests, one minor change + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 5d0893ef2ac4ef6e3f27a33ecc24ecf1ccc41a9e +Author: Ying Li +Date: Wed Nov 11 22:48:00 2015 -0800 + + Oops, it'd be helpful if we actually ran the new CryptoService tests. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 87231d9a5d9fbeea3a3f5696229783a055aa2c06 +Author: Ying Li +Date: Wed Nov 11 22:25:27 2015 -0800 + + Fix new bug where adding a duplicate key to a yubikey added to the backup. + + Added a test for this case as well - thanks @endophage! + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 43f2d40e43408850e1f17158495a4770ef202c9b +Author: Ying Li +Date: Wed Nov 11 22:07:49 2015 -0800 + + Make our CI pick up trustmanager/yubikey again + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit efff7219555934db7c3e42919350a872efb43fd1 +Author: Ying Li +Date: Wed Nov 11 21:46:48 2015 -0800 + + Add tests for multi-keystore crypto services. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 6cf0643d7d1fa6446c0ebf6a6fdc45bcf1885e7e +Author: Ying Li +Date: Wed Nov 11 21:13:35 2015 -0800 + + Roll back an add key to the yubikey if we can't back it up. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 96bfaac05f9373c39fb8f0e9432d2a2be0d96d18 +Author: Ying Li +Date: Wed Nov 11 21:03:07 2015 -0800 + + Add tests for verifying signatures before returning a signature. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit a51f380418c006fa95a4ce7e4b3fbd33685d6541 +Merge: f6ecd1c1ca 4b7fefd5ef +Author: Diogo Mónica +Date: Wed Nov 11 21:17:57 2015 -0800 + + Merge pull request #51 from docker/more-yubikey-tests + + more yubikey tests + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 4b7fefd5ef65f7823bd4484c3fe165d43ef94d20 +Author: Ying Li +Date: Wed Nov 11 19:51:57 2015 -0800 + + Do not clean up a session if there is no session. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit cee92fa36336071da217e0f224afc8f37af464a9 +Author: Ying Li +Date: Wed Nov 11 16:52:15 2015 -0800 + + Undo some changes from a bad stash pop that were unintentional. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 38a5b5a342cf7963bef1c9beac77179c63917c20 +Author: Ying Li +Date: Wed Nov 11 16:37:58 2015 -0800 + + Add FindObjectsFinalize to getNextEmptySlot. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 10057562d8f11259178169e159fdd4684538019f +Author: Ying Li +Date: Wed Nov 11 16:28:23 2015 -0800 + + Add fixes for Sign (do not continue if SignInit fails). + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 73a26d59ac6d5e59ac9a4204de0b2b01f8941d55 +Author: Ying Li +Date: Wed Nov 11 11:31:35 2015 -0800 + + Inject errors into pkcs11 in order to test that the yubikey code cleans up. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 09c0f9d05bbf3752f6515036309450ca5705e074 +Author: Ying Li +Date: Tue Nov 10 00:53:11 2015 -0800 + + Replace the pkcs11 library with interfaces for easier testing. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 7108450a21578e435c6e0912e9d998bcf937dddb +Author: Ying Li +Date: Mon Nov 9 19:32:55 2015 -0800 + + Add more unit tests for the YubiKeyStore. + + Including how it interacts with the backup key store, and with more + assertions against a new YubiKeyStore so that we won't get false + positives or negatives from the cache. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit f6ecd1c1caadbd12aac1cf96330b847359331bcc +Merge: b894d98392 cf85394b4c +Author: Diogo Mónica +Date: Wed Nov 11 19:09:46 2015 -0800 + + Merge pull request #53 from docker/non-pkcs-in-ci + + Start running without the pkcs11 buildtag in CI, and generate coverage. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit cf85394b4c67b366338f25a8a73e55aa764e081e +Author: Ying Li +Date: Wed Nov 11 18:04:28 2015 -0800 + + Start running without the pkcs11 buildtag in CI, and generate coverage. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit b894d983924004e048cef2a1787790cf90885fd7 +Merge: b830dda0f5 9b8645c39f +Author: Diogo Mónica +Date: Wed Nov 11 19:09:25 2015 -0800 + + Merge pull request #54 from docker/verify_hw_sigs + + add verification to yubikey signatures. Attempt to generate sig up to… + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 9b8645c39f2c315f54a8adc7c04445921b46edf4 +Author: David Lawrence +Date: Wed Nov 11 18:27:26 2015 -0800 + + add verification to yubikey signatures. Attempt to generate sig up to 5 times, fail if all 5 are invalid + Signed-off-by: David Lawrence (github: endophage) + +commit b830dda0f538eccde0906812c4f3efdf562bf8b6 +Merge: 1d1e2483a1 ca7e4c8d38 +Author: Diogo Mónica +Date: Wed Nov 11 18:59:57 2015 -0800 + + Merge pull request #55 from docker/no_export_hw + + set withHardware flag to false for export commands. We can never expo… + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit ca7e4c8d382c8003328079ef5c7ff3c3c1f62fda +Author: David Lawrence +Date: Wed Nov 11 18:44:31 2015 -0800 + + set withHardware flag to false for export commands. We can never export from hardware + Signed-off-by: David Lawrence (github: endophage) + +commit 1d1e2483a1ddf7ea96f99c6c7f3ee5df00a4f5a0 +Merge: b9d0f15745 8628b57a96 +Author: Ying Li +Date: Wed Nov 11 17:43:19 2015 -0800 + + Merge pull request #52 from docker/cleanup_privdir + + private subdir should be added by keyfilestore, rather than all over … + + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 8628b57a963a6e90485a615a14a6f05906464fdd +Author: David Lawrence +Date: Wed Nov 11 15:48:12 2015 -0800 + + private subdir should be added by keyfilestore, rather than all over the place + Signed-off-by: David Lawrence (github: endophage) + +commit b9d0f157454922692cc03057486d6d71cbf3cdce +Merge: 189118164d 4c2fcda620 +Author: Diogo Mónica +Date: Wed Nov 11 11:53:59 2015 -0800 + + Merge pull request #50 from docker/configurable-trust-dir-rebase + + Configurable trust dir rebase + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 4c2fcda62072e9183b235b2397184361ef343e45 +Author: Diogo Monica +Date: Wed Nov 11 11:50:18 2015 -0800 + + Addressing small nits + + Signed-off-by: Diogo Monica + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 0344dfc03882f3a6a7a9ad224300745a1406543a +Author: Diogo Monica +Date: Tue Nov 10 22:48:30 2015 -0800 + + Making tests pass + + Signed-off-by: Diogo Monica + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 5b7480f599f97817f015475e770ad9e8241cf6c8 +Author: Diogo Monica +Date: Mon Nov 9 19:42:50 2015 -0800 + + Adding default to notary key generate and configurable trust dir from + config + + Signed-off-by: Diogo Monica + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 189118164dc5def5431284621ab74264a7fac09e +Merge: 7f341a1e20 ee270b6a2b +Author: David Lawrence +Date: Wed Nov 11 11:20:17 2015 -0800 + + Merge pull request #49 from docker/key_locations + + Key locations + + Signed-off-by: David Lawrence + + Signed-off-by: David Lawrence (github: endophage) + +commit ee270b6a2bada1931db54c9435c6d13a7f54e854 +Author: David Lawrence +Date: Tue Nov 10 16:39:01 2015 -0800 + + fixing integrations tests for new list keys layout + Signed-off-by: David Lawrence (github: endophage) + +commit 5c064e204b66d0e9a8172d3c5070f457c5b3ab21 +Author: David Lawrence +Date: Tue Nov 10 15:49:41 2015 -0800 + + fixing lint/vet + Signed-off-by: David Lawrence (github: endophage) + +commit a21287c0d15c6d9fa7a2f88275a5a903b73390d4 +Author: David Lawrence +Date: Tue Nov 10 14:39:33 2015 -0800 + + taking out message when yubikey not found + Signed-off-by: David Lawrence (github: endophage) + +commit 6acc130e17f56dc0de06d9a2dd81e914b03e21ac +Author: David Lawrence +Date: Tue Nov 10 12:55:18 2015 -0800 + + list shows where the key is stored + Signed-off-by: David Lawrence (github: endophage) + +commit 7f341a1e208a7f4114b2db55ca221711d0ddce0c +Merge: 15154384cd 8ffbf116cc +Author: David Lawrence +Date: Wed Nov 11 10:58:00 2015 -0800 + + Merge pull request #48 from docker/config_touch_msg + + make touch to sign message configurable + + Signed-off-by: David Lawrence + + Signed-off-by: David Lawrence (github: endophage) + +commit 8ffbf116cc38b5097ec7bf047500e7955fba87e5 +Author: David Lawrence +Date: Tue Nov 10 12:59:29 2015 -0800 + + only tell user to touch when mode is enabled + Signed-off-by: David Lawrence (github: endophage) + +commit b0354762d15d02b4c6dae132b1bf20e9bbce7785 +Author: David Lawrence +Date: Mon Nov 9 23:27:01 2015 -0800 + + make touch to sign message configurable + Signed-off-by: David Lawrence (github: endophage) + +commit 15154384cd24ece0c1fb01674cbc6a0170eecc55 +Merge: a2ff9a771c 05c5615187 +Author: David Lawrence +Date: Wed Nov 11 10:17:40 2015 -0800 + + Merge pull request #47 from docker/no_keys_error + + fixing error message and moving signing operations up a level + + Signed-off-by: David Lawrence + + Signed-off-by: David Lawrence (github: endophage) + +commit 05c5615187703b281f02c86663c4cb7a2cc22778 +Author: David Lawrence +Date: Tue Nov 10 11:01:54 2015 -0800 + + updating per Diogo's comments + Signed-off-by: David Lawrence (github: endophage) + +commit c08e732f9faf717953dcc2a645af4e42b698670d +Author: David Lawrence +Date: Mon Nov 9 23:16:09 2015 -0800 + + fixing error message and moving signing operations up a level + Signed-off-by: David Lawrence (github: endophage) + +commit a2ff9a771ca318afaba0157fa784bc9c7595c1bf +Merge: 3cd74fce6d f9f118d088 +Author: Diogo Mónica +Date: Tue Nov 10 10:08:10 2015 -0800 + + Merge pull request #46 from docker/change-env-targets + + Changing env to be TARGETS + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit f9f118d08826fa27e2dcbd32a45c5005d39b0302 +Author: Diogo Monica +Date: Mon Nov 9 17:29:53 2015 -0800 + + Changing env to be TARGETS + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 3cd74fce6d3bf2dc68c03d005da6a785a2447410 +Merge: 5aaf4fa8a5 e0c5bb7b83 +Author: Diogo Mónica +Date: Mon Nov 9 17:35:20 2015 -0800 + + Merge pull request #44 from docker/use_9a_last + + use the slots on the yubikey in the following order: 9c, 9e, 9d, 9a + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit e0c5bb7b83e0e2a0e1af47ae7cd77db421228fc7 +Author: David Lawrence +Date: Mon Nov 9 16:53:32 2015 -0800 + + comment about token location ordering + Signed-off-by: David Lawrence (github: endophage) + +commit d2ca58bbf48ba0b27ccc66d306e2f340ade60cca +Author: David Lawrence +Date: Mon Nov 9 16:46:42 2015 -0800 + + use the slots on the yubikey in the following order: 9c, 9e, 9d, 9a + Signed-off-by: David Lawrence (github: endophage) + +commit 5aaf4fa8a5fc0184b1354bd3c8b92da72e5d8e65 +Merge: 91b7d87a7b 397adb4291 +Author: Diogo Mónica +Date: Mon Nov 9 14:25:39 2015 -0800 + + Merge pull request #41 from docker/pad-ecdsa-key-for-yubikey + + Pad the ECDSA key that gets put into the Yubikey so it has 32 bytes. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 397adb42916f4a13d5a5b8c13676ef8e97c031df +Author: Ying Li +Date: Mon Nov 9 13:05:52 2015 -0800 + + Pad the ECDSA key that gets put into the Yubikey so it has 32 bytes. + + Apparently that is required by the template, and will error if it + does not. Sometimes, ECDSA keys are generated which when encoded + seems to only have 31 bytes. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 91b7d87a7b5d5112aa307bc10ed959e6ea22fc53 +Merge: a8fceb6401 0280a82ae0 +Author: Diogo Mónica +Date: Mon Nov 9 11:06:19 2015 -0800 + + Merge pull request #39 from docker/fix-import + + Do not back up a root key that is imported into Yubikey. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 0280a82ae09463a576a6463c79ed93126b0dd5af +Author: Ying Li +Date: Sun Nov 8 22:54:25 2015 -0800 + + Do not back up a root key that is imported into Yubikey. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit a8fceb6401e44b1ef1a710dc2738f7f535f91311 +Merge: 94b6269521 9ae2c80309 +Author: Diogo Mónica +Date: Mon Nov 9 09:32:19 2015 -0800 + + Merge pull request #40 from docker/fix-creating-multiple-keys + + Fix bug with finding new slots to put keys. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 9ae2c80309d8a143c9721ef08cab8e4d6e0bdd46 +Author: Ying Li +Date: Sun Nov 8 23:01:16 2015 -0800 + + Fix bug with finding new slots to put keys. + Previously it was just overwritting one slot over and over. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 94b62695217017fc16ba179095c3348e55d34320 +Merge: 61f9466ddf baa92cefa3 +Author: Diogo Mónica +Date: Sun Nov 8 18:18:02 2015 -0800 + + Merge pull request #38 from docker/fixing-alias-panic + + Fixed panic on listKeys with invalid keys, added tests + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit baa92cefa3a90f7fbc33b7b920b758658f0067a3 +Author: Diogo Monica +Date: Sun Nov 8 17:20:11 2015 -0800 + + Fixed panic on listKeys with invalid keys, added tests + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 61f9466ddf538f31b19d5d7e9d545fb71c597bb1 +Merge: 3398994ae0 53114aabdc +Author: Diogo Mónica +Date: Sun Nov 8 17:33:46 2015 -0800 + + Merge pull request #36 from docker/moar-coverage + + Moar coverage + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 53114aabdcac2adba3d1cafcd204e07df8551e05 +Author: Ying Li +Date: Sun Nov 8 16:36:35 2015 -0800 + + Add a test to test adding multiple keys to a yubikey. + + If there are existing keys on the Yubikey, the YubiKeyStore should add + a key to the next available slot. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 9a01cf091d8fde7519ac202bd55d9f1a8d21a2b8 +Author: Ying Li +Date: Sun Nov 8 16:12:59 2015 -0800 + + Add "notary lookup" to the integration tests. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit ef1d5caa1ae2bf49c787c13ce3e8e5e7a04ad0f0 +Author: Ying Li +Date: Sun Nov 8 16:09:52 2015 -0800 + + Fix an error message when there are insufficient signatures. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 3398994ae0067a233a1394070b916eef9aad514c +Merge: 6d82d14ef3 5fe09ad8e1 +Author: Diogo Mónica +Date: Sun Nov 8 15:56:50 2015 -0800 + + Merge pull request #35 from docker/move-ecdsa + + Move ecdsa_hardware_crypto_service to trustmanager/yubikeystore + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 5fe09ad8e12273ff0fbe107dc50200e30b10b2b1 +Author: Ying Li +Date: Sun Nov 8 14:31:27 2015 -0800 + + Remove softhsm keys and tests. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit c82802b800c5cf4d31073a5fc5b442e3cbc62732 +Author: Ying Li +Date: Sun Nov 8 12:29:16 2015 -0800 + + Move ecdsa_hardware_crypto_service to trustmanager/yubikeystore + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 6d82d14ef3757b6e013c9867b8987084f92f067d +Merge: 030fa4800b 30224f27ae +Author: Diogo Mónica +Date: Sun Nov 8 14:27:54 2015 -0800 + + Merge pull request #33 from docker/yubilibrary-search-paths + + Search a list of possible paths for the Yubico pkcs11 library. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 30224f27ae1923be725c3c1366137ce989e91df1 +Author: Ying Li +Date: Sat Nov 7 23:17:07 2015 -0800 + + Search a list of possible paths for the Yubico pkcs11 library. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 030fa4800b1be3654b05da57fecf75c6bf479926 +Merge: 580303c219 d9d7b2639e +Author: Diogo Mónica +Date: Sun Nov 8 11:41:59 2015 -0800 + + Merge pull request #34 from docker/remove-integration-script + + Removing integration script + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit d9d7b2639ebf10d5e8f926cc3e18eec2e7c997c4 +Author: Diogo Monica +Date: Sun Nov 8 11:19:35 2015 -0800 + + Removing integration script + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 580303c2199c3dcc44bd3c4f4bd9788523c5d40d +Merge: 29c6b63c81 4867410e98 +Author: Diogo Mónica +Date: Sun Nov 8 11:10:35 2015 -0800 + + Merge pull request #31 from docker/non-pkcs11 + + Ensure that tests pass and binaries build without the pkcs11 build tag. + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 4867410e989606a20c46c9e51c32946ef63e83c2 +Author: Ying Li +Date: Sat Nov 7 21:17:40 2015 -0800 + + Ensure that tests pass and binaries build without the pkcs11 build tag. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 29c6b63c817d25464373e0b5fe697ff8d340a83a +Merge: 4698ad69f2 14c5d2e05a +Author: Diogo Mónica +Date: Sun Nov 8 10:43:28 2015 -0800 + + Merge pull request #32 from docker/cli-cleanup + + Minor CLI cleanups + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 14c5d2e05a3871bd10aad405b802edc1a240e75f +Author: Ying Li +Date: Sat Nov 7 23:26:01 2015 -0800 + + Normalize how the key IDs are displayed in the password prompts. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 087f13ae7d513735f2fda9017ac207d9ef1d1bfb +Author: Ying Li +Date: Sat Nov 7 22:41:47 2015 -0800 + + Normalize and elaborate on the command line help. + + Ensures that the notary command line help text start with capital + letters, and add information about hardware keys and online/offline operation. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 313ae803456753cd7e2821693a07b345b41dccca +Author: Ying Li +Date: Sat Nov 7 22:06:11 2015 -0800 + + Remove unused rawOutput option in notary CLI. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit e4e099ae00c628e059a23877f5dfd804e3e509d3 +Author: Ying Li +Date: Sat Nov 7 22:04:23 2015 -0800 + + Just ignore the `-s` notary CLI option instead of erroring. + + Currently commands that do not require online access will error if + this option is passed. Do not error anymore, just ignore. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 4698ad69f25071cf8c61ccb9b063e4c70d0e8e81 +Merge: 28c3eca478 1f1868d3ee +Author: Ying Li +Date: Sat Nov 7 21:05:49 2015 -0800 + + Merge pull request #30 from docker/client-integration-tests + + Adding integration tests for notary client. + + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 1f1868d3ee03fcd95f5b759e87be676a6a320f80 +Author: Ying Li +Date: Fri Nov 6 11:00:50 2015 -0800 + + Adding integration tests for notary client. + + This runs through the basic notary init/add/publish/etc. workflow, + and some basic key workflows. + + Note that this does work with the Yubikey, in that created keys while + testing do not require touch. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 107489704015f96fdd02ca214273021b0233a81e +Author: David Lawrence +Date: Tue Nov 3 10:47:14 2015 -0800 + + delete non-root keys from cryptoservice when they get rotated out + Signed-off-by: David Lawrence (github: endophage) + +commit 28c3eca478034954a02283f634982270816c18a0 +Merge: 6f1fd28a19 91e8b9bcdb +Author: David Lawrence +Date: Sat Nov 7 20:22:28 2015 -0800 + + Merge pull request #28 from docker/import_to_yubikey + + Import to yubikey + + Signed-off-by: David Lawrence + + Signed-off-by: David Lawrence (github: endophage) + +commit 91e8b9bcdba54772a0e7e61ca83aea6af69362bf +Author: David Lawrence +Date: Sat Nov 7 18:03:45 2015 -0800 + + backup to a KeyFileStore and take out key remove + Signed-off-by: David Lawrence (github: endophage) + +commit 542c4a6d32a11487f01f6e7e98aa08367b544319 +Author: David Lawrence +Date: Sat Nov 7 16:31:34 2015 -0800 + + removing role from backup key path + Signed-off-by: David Lawrence (github: endophage) + +commit 2d4612c7031680b6a9428434d7ad70947f952ca7 +Author: David Lawrence +Date: Sat Nov 7 16:13:34 2015 -0800 + + removekey is going to be best effort + Signed-off-by: David Lawrence (github: endophage) + +commit 72cd24ac134e045dce995fdb41cc065201946b21 +Author: David Lawrence +Date: Sat Nov 7 16:10:01 2015 -0800 + + explicit return in yubikeystore.AddKey to see if interface typing is causing weird behaviour + Signed-off-by: David Lawrence (github: endophage) + +commit a3336e696ec0ef2ffbb39df9f84258ef09aa630b +Author: David Lawrence +Date: Sat Nov 7 16:04:38 2015 -0800 + + removekey had an errant return + Signed-off-by: David Lawrence (github: endophage) + +commit de9f6514942c7f34c5a68c058816c1bba6aae68d +Author: David Lawrence +Date: Sat Nov 7 15:14:07 2015 -0800 + + fixing lint comments + Signed-off-by: David Lawrence (github: endophage) + +commit f9cf7bcca593b82293fc1265a7c14b1e55d62360 +Author: David Lawrence +Date: Sat Nov 7 15:07:23 2015 -0800 + + remove needs to list keys to find guns + Signed-off-by: David Lawrence (github: endophage) + +commit 51a99a4127c385c7cd63fc20243b95d592c68f2a +Author: David Lawrence +Date: Sat Nov 7 14:58:55 2015 -0800 + + generate should instantiate a yubikeystore + Signed-off-by: David Lawrence (github: endophage) + +commit e8d2240c796675a9d4b5697f05ed89993c154041 +Author: David Lawrence +Date: Sat Nov 7 12:03:02 2015 -0800 + + write private key to a backup dir when creating keys on yubikey + Signed-off-by: David Lawrence (github: endophage) + +commit 705587b0b5ec5c1fe46a53743e9620a0788d0c35 +Author: David Lawrence +Date: Sat Nov 7 08:29:38 2015 -0800 + + update yubikeystore keys cache when adding + Signed-off-by: David Lawrence (github: endophage) + +commit beca50909d2cd0555bd07065d68d0b74ef9ffe13 +Author: David Lawrence +Date: Sat Nov 7 08:26:27 2015 -0800 + + update to only use slots 0-3 + Signed-off-by: David Lawrence (github: endophage) + +commit b7c38f0287d03960ed7fec3cfebba9a471855221 +Author: David Lawrence +Date: Thu Nov 5 16:05:09 2015 -0800 + + fixing tests + Signed-off-by: David Lawrence (github: endophage) + +commit 0fd1fa6ada02500da2dc3d5f3c50cb48680cb15b +Author: David Lawrence +Date: Thu Nov 5 13:48:03 2015 -0800 + + arbitrary slots working + Signed-off-by: David Lawrence (github: endophage) + +commit fea898bd349e851473e7ce392b7198edfe46805b +Author: David Lawrence +Date: Thu Nov 5 12:20:24 2015 -0800 + + listing all keys in the yubikey works + Signed-off-by: David Lawrence (github: endophage) + +commit da18f546992bb37071b9bb7ae563a5edceb9f0e5 +Author: David Lawrence +Date: Thu Nov 5 11:01:31 2015 -0800 + + import-root, list, and remove working with yubikey + Signed-off-by: David Lawrence (github: endophage) + +commit 6ba733579313238fa640adee7080bac0f8a5c9ef +Author: David Lawrence +Date: Wed Nov 4 15:37:02 2015 -0800 + + fill in implementation of removeKey for yubikey + Signed-off-by: David Lawrence (github: endophage) + +commit be4c0669c18eb526512b9f4d4931685729259b10 +Author: David Lawrence +Date: Wed Nov 4 17:39:46 2015 -0800 + + move import/export to cryptoservice and add import to yubikey + Signed-off-by: David Lawrence (github: endophage) + +commit 6f1fd28a19576fba5d063d4e9ec0c4a353d3a862 +Merge: 52ac579b45 cf50ffcd33 +Author: David Lawrence +Date: Sat Nov 7 16:00:23 2015 -0800 + + Merge pull request #25 from docker/touch_to_sign + + add message when user is required to touch yubikey to sign. + + Signed-off-by: David Lawrence + + Signed-off-by: David Lawrence (github: endophage) + +commit cf50ffcd3324a7eb9d3c5b4cab56a911ffc0ba37 +Author: David Lawrence +Date: Wed Nov 4 14:32:41 2015 -0800 + + add message when user is required to touch yubikey to sign. N.B. touch is required during Sign, not SignInit + Signed-off-by: David Lawrence (github: endophage) + +commit 52ac579b4575a184cbe9e1292f7a53bbaeb0f846 +Merge: 7576793c8d 24cca5d6cc +Author: Diogo Mónica +Date: Fri Nov 6 14:26:34 2015 +0000 + + Merge pull request #27 from docker/update-cobra + + Update the cobra and pflags dependencies + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 24cca5d6ccebde4e6633d18aea5e54f30e741c99 +Author: Ying Li +Date: Wed Nov 4 16:43:51 2015 -0800 + + Update the cobra dependency and its subdependencies (pflag, blackfriday, sanitized_anchor_name, and go-md2man). + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 7576793c8d3eac0f36a37907e416c921912b75da +Merge: 2cb072667c 5b6f64de4b +Author: Diogo Mónica +Date: Fri Nov 6 14:23:10 2015 +0000 + + Merge pull request #29 from docker/client-test-refactor + + Notary-client test refactor + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 5b6f64de4bd3a381246100f1f53c99f899aac98c +Author: Ying Li +Date: Thu Nov 5 10:46:02 2015 -0800 + + Refactor notary client tests. + + Move common code out into helper functions, and split up the bigger tests + into tests that specifically test adding targets, getting changelists, + publishing, and listing, as opposed to having two giant tests instead. + + Also depend more on existing functions in the code (such as + NotaryRepository.GetChangelists and the server ServerMux), rather than + reimplementing them in the tests. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 2cb072667c1225a9bca31930e41501f9b9f33668 +Merge: 1230f5a41d 2a9e163bd2 +Author: Ying Li +Date: Thu Nov 5 13:56:09 2015 -0800 + + Merge pull request #24 from docker/fix-cryptoservice-create-get-key + + Fix the problem where root was being searched for in root_keys/repo/####_root.key + + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 2a9e163bd28f90368fd54a38ccdc0ee126f149c1 +Author: Ying Li +Date: Wed Nov 4 13:39:23 2015 -0800 + + Fixed cryptoservice.Create to call keyStore.AddKey with a GUN only if + it is not a root role. + + Updated the cryptoservice tests to test all key algorithms, all roles, + and cryptoservices without a GUN. This then also found bugs in + cryptoservice.GetKey, cryptoservice.RemoveKey, and + cryptoservice.GetPrivateKey, which weren't really being exercised + previously. + + Signed-off-by: Ying Li + Signed-off-by: David Lawrence + + Signed-off-by: Ying Li (github: endophage) + +commit 1230f5a41d3c1871d51efec43b1dff90a43d7109 +Merge: 7c6cc7d34c 519a2ccbe8 +Author: Diogo Mónica +Date: Tue Nov 3 22:03:42 2015 +0000 + + Merge pull request #16 from docker/error_cleanup + + lots of errors cleanup + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit 519a2ccbe8e24136a2b2a9803a716659fc6acd85 +Author: David Lawrence +Date: Mon Nov 2 14:18:30 2015 -0800 + + removing all errors that aren't in use, fixing one place in memorystore that was using a different errorcode to all other stores, pushing errors into appropriate packages + Signed-off-by: David Lawrence (github: endophage) + +commit 7c6cc7d34c7c9df4f4feb70554daea877997462d +Merge: bc0c0d4ea1 22244fff65 +Author: Diogo Mónica +Date: Tue Nov 3 22:01:55 2015 +0000 + + Merge pull request #20 from docker/passphrase_messaging + + improve password challenge messaging when using yubikey + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Mónica (github: endophage) + +commit bc0c0d4ea1d2dc36a696ada0b460b946044f165f +Author: David Lawrence +Date: Tue Nov 3 10:28:56 2015 -0800 + + health check will never be able to get auth token so remove RootHandler wrapper + Signed-off-by: David Lawrence (github: endophage) + +commit 22244fff659886ca7f68b41d8f694b163ef4cddb +Author: David Lawrence +Date: Tue Nov 3 10:57:56 2015 -0800 + + improve password challenge messaging when using yubikey + Signed-off-by: David Lawrence (github: endophage) + +commit 68992ddaf5bca3f0123eab6c2ae302eb727f6c2c +Author: Diogo Monica +Date: Sun Nov 1 11:57:56 2015 -0800 + + Resolving rebase conflicts + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 8902c8c0e99125ea08a10befbc5cf3ac2c0f4ab5 +Author: Jessica Frazelle +Date: Fri Oct 30 21:23:55 2015 -0700 + + fix go lint + + Signed-off-by: Jessica Frazelle + Signed-off-by: David Lawrence + + Signed-off-by: Jessica Frazelle (github: endophage) + +commit 5f21ebd1853d293c5cf328188331627612e2e114 +Author: Jessica Frazelle +Date: Fri Oct 30 20:53:10 2015 -0700 + + Add pkcs11 build tags + + Add build tags and a check in Makefile to be sure you do not import + pkcs11 lib somewhere where it should not be. This will ensure docker + import and integration will continue to work. + + Signed-off-by: Jessica Frazelle + Signed-off-by: David Lawrence + + Signed-off-by: Jessica Frazelle (github: endophage) + +commit 913c5ef0336fddc2656555749268eeb9856964a6 +Author: Jessica Frazelle +Date: Fri Oct 30 20:15:31 2015 -0700 + + add build tag files for pkcs11 dlopen lib + + Signed-off-by: Jessica Frazelle + Signed-off-by: David Lawrence + + Signed-off-by: Jessica Frazelle (github: endophage) + +commit af1bf0c1d5bbebf97517cd1357a3a763af3e5c20 +Author: Diogo Monica +Date: Fri Oct 30 18:09:13 2015 -0700 + + Removing debug adding pcs11 to makefiles + + Signed-off-by: Diogo Monica + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit b59225297a2c70ab190fea63c1186011d4e3a113 +Author: Diogo Monica +Date: Fri Oct 30 17:05:33 2015 -0700 + + Fixing makefile + + Signed-off-by: Diogo Monica + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 07f00651522a7eea97f7f0836b1ae194291bdde2 +Author: David Lawrence +Date: Fri Oct 30 16:23:56 2015 -0700 + + ask for pin when signing + Signed-off-by: David Lawrence (github: endophage) + +commit 53ed60ed897ab9d3fcdbeb5c68497643786f6d43 +Author: Diogo Monica +Date: Fri Oct 30 15:38:57 2015 -0700 + + Adding mandatory touch for signatures + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 4648666b7cfd50f419e1acc40313e19a9e540652 +Author: Jessica Frazelle +Date: Fri Oct 30 15:07:39 2015 -0700 + + add pkcs11 build tags + + Signed-off-by: Jessica Frazelle + Signed-off-by: David Lawrence + + Signed-off-by: Jessica Frazelle (github: endophage) + +commit 21138e6badd7639528a0ca20e95e9e11bfe480c1 +Author: Diogo Monica +Date: Wed Oct 21 12:21:03 2015 -0700 + + Working version of Notary and Yubikey + + Signed-off-by: Diogo Monica + + Remove symlinks from notary-client repo creation + + Signed-off-by: Ying Li + Signed-off-by: Diogo Monica + + WIP + + Signed-off-by: Diogo Monica + + working yubikey integration + Signed-off-by: David Lawrence (github: endophage) + + Fixing small colon bug + + Signed-off-by: Diogo Monica + + Added things. Ship it. + + Signed-off-by: Diogo Monica + + Bringing ecdsahwcryptosigner to 2015 + + Signed-off-by: Diogo Monica + + Working version of notary and yubikey + + Signed-off-by: Diogo Monica + +commit ae11483a7b856d94c057dab00754320d00295aa9 +Author: Diogo Monica +Date: Mon Oct 19 16:02:50 2015 -0700 + + initial work on pkcs11 support + + Signed-off-by: David Lawrence + + Signed-off-by: Diogo Monica (github: endophage) + +commit 3d72f50c61f9c388770e3782683f95862bca21e6 +Author: David Gageot +Date: Thu Nov 12 09:53:03 2015 +0100 + + FIX #2255 - make cross should copy binaries + + Signed-off-by: David Gageot + +commit 76fe00c859745bfc9c128b951ab7575fe370b7f2 +Author: Steve Durrheimer +Date: Sat Oct 24 16:35:21 2015 +0200 + + Add zsh completion for log options + + Signed-off-by: Steve Durrheimer + +commit 644471bac85ca0d03645013767a5961504419d7c +Author: mqliang +Date: Thu Nov 12 11:53:58 2015 +0800 + + kill TODO + + Signed-off-by: mqliang + +commit b90ffae460a7d865f7f9bb075b2f8d19a1f37628 +Merge: 5c5a004a77 23b5f8c99f +Author: David Gageot +Date: Thu Nov 12 08:51:51 2015 +0100 + + Merge pull request #2261 from kunalkushwaha/master + + BugFix: nil returned for string. + +commit 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9 +Author: Steve Durrheimer +Date: Thu Nov 12 08:35:32 2015 +0100 + + Add zsh completion for 'docker {run,create} --volume-driver' + + Signed-off-by: Steve Durrheimer + +commit 23b5f8c99f252b2d4d576b6cbe79a6cfa9277862 +Author: Kunal Kushwaha +Date: Thu Nov 12 16:00:32 2015 +0900 + + BugFix: nil retured for string. + + Build break on windows. introduced with PR #2207 + + Signed-off-by: Kunal Kushwaha + +commit 00cf8fbc2c9bb03ad82efc0f04000ebef0c91400 +Merge: 5e303c1579 d6517b5dab +Author: moxiegirl +Date: Wed Nov 11 20:50:55 2015 -0800 + + Merge pull request #29 from SvenDowideit/fix-up-moved-links + + Some broken links due to pages moving. + +commit 00d6f01906fef47724540d59575fb080b797d854 +Author: Mary Anthony +Date: Wed Nov 11 20:33:08 2015 -0800 + + Updating links which were build breaking + + Signed-off-by: Mary Anthony + +commit 5b59ac40536ae4d5e78821a5a8f9030e1296630c +Merge: 11d55516b3 bb81745efb +Author: moxiegirl +Date: Wed Nov 11 20:09:39 2015 -0800 + + Merge pull request #1120 from moxiegirl/azure-installation + + New install on Microsoft Azure + +commit 40ed821d2ebd9abb5cb9cf5c11c7b67c905ee3be +Merge: 2337db8205 e869e8aa3d +Author: moxiegirl +Date: Wed Nov 11 20:07:55 2015 -0800 + + Merge pull request #17388 from vikstrous/notary_docs + + more notary documentation + +commit e869e8aa3d0671394f83d0b6ea7d90cb310e5b61 +Author: Viktor Stanchev +Date: Mon Oct 26 16:54:47 2015 -0700 + + more notary documentation + + Signed-off-by: Viktor Stanchev + +commit d6517b5dabe03eb39dcaed3c1cc345771556a1e1 +Author: Sven Dowideit +Date: Thu Nov 12 12:58:50 2015 +1000 + + Some broken links due to pages moving. + + Due to the way s3 redirects work, urls need to have a '/' at the end for the redirect to work :( + + Signed-off-by: Sven Dowideit + +commit 2337db8205f72b190f46a73dd28a25cee0f968f9 +Merge: 87de5fdd59 fd672d5926 +Author: Alexander Morozov +Date: Wed Nov 11 18:46:52 2015 -0800 + + Merge pull request #17925 from cpuguy83/fix_locker_unit_tests + + Use timeouts instead of relying on runtime.GoSched + +commit 11d55516b38953c2d74fa4a25ba082a4368404c5 +Author: Sven Dowideit +Date: Tue Nov 10 13:00:31 2015 +1000 + + Fixes for things found by linkchecker + + Signed-off-by: Sven Dowideit + +commit fd672d59269d100acbb36abef4e4eddc1d30bdc7 +Author: Brian Goff +Date: Wed Nov 11 20:49:06 2015 -0500 + + Use timeouts instead of relying on runtime.GoSched + + Signed-off-by: Brian Goff + +commit c4939e8ca7bb4a0114493a1ada0c3702cc99a51d +Author: Carol Fager-Higgins +Date: Sun Oct 25 23:37:07 2015 -0700 + + feedback from josh to ldap config + + Signed-off-by: Carol Fager-Higgins + +commit fa7ec908c493161892ebdd7c51b440367f527805 +Author: Alexander Morozov +Date: Wed Nov 11 17:19:39 2015 -0800 + + daemon/kill.go: simplify if statement + + Signed-off-by: Alexander Morozov + +commit 0a3acb2625f553a71392ed9dc6ba1dde2cf3e3a8 +Merge: 9577d3053a fddbf73a57 +Author: Stephen Day +Date: Wed Nov 11 17:18:25 2015 -0800 + + Merge pull request #1166 from treed/master + + De-obfuscate error message + +commit bb81745efb6efa678fe28dded97979ffbd7465e4 +Author: Mary Anthony +Date: Tue Nov 10 19:51:28 2015 -0800 + + New install on Microsoft Azure + This is in support of the TP4 project + Fixing some stacked heads and broken links + Updating with Betty's comment + + Signed-off-by: Mary Anthony + +commit bf25e58bfe67707abb561597146004d54d9631b9 +Merge: b71fe432a5 e3366a42e5 +Author: moxiegirl +Date: Wed Nov 11 16:38:42 2015 -0800 + + Merge pull request #1112 from carolfh/configuration + + updated configuration.md + +commit 87de5fdd5972343a11847922e0f41d9898b5cff7 +Merge: 5b046c71d8 122568b314 +Author: Brian Goff +Date: Wed Nov 11 19:36:13 2015 -0500 + + Merge pull request #17919 from Microsoft/jjh/tp4 + + Windows [TP4] Require build 10586+ + +commit 5b046c71d8ab944ad88baf9f92ae6b3b78a28cdd +Merge: 6c31b17dfd 3a852d8442 +Author: Brian Goff +Date: Wed Nov 11 19:35:05 2015 -0500 + + Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes + + Windows [TP4] Fix docker cp when volumes + +commit 9577d3053a88dcee1ff497045054516dbdec43db +Merge: bb745757de c3c932f4e1 +Author: Richard Scothern +Date: Wed Nov 11 16:31:28 2015 -0800 + + Merge pull request #910 from RichardScothern/go-1.5 + + Use go 1.5 on the build machine + +commit b71fe432a5146b5c63fc0aec534acc8edb302020 +Merge: f7abd92b29 f3af225118 +Author: moxiegirl +Date: Wed Nov 11 16:18:28 2015 -0800 + + Merge pull request #1037 from carolfh/upgrade + + Upgrade + +commit 6c31b17dfdd08b437ebff0deb696f50c90dc4416 +Merge: b664a8825e a4b2de674c +Author: Sebastiaan van Stijn +Date: Thu Nov 12 00:09:46 2015 +0000 + + Merge pull request #17921 from thaJeztah/thou-shalt-not-use-we + + Fix find and replace typo in dockerimages + +commit f7abd92b297f799f00174e759c20eaa5e9210e0c +Merge: 3f53939f93 dcc12591f0 +Author: carol fager-higgins +Date: Wed Nov 11 16:03:49 2015 -0800 + + Merge pull request #994 from carolfh/releasenotes + + updated, Dockerfile, moved old RNs to prior file and added new featur… + +commit 3f53939f933321c8db5c09dfd88195ef99a29859 +Merge: 43737a3c06 5c75150de8 +Author: carol fager-higgins +Date: Wed Nov 11 15:54:35 2015 -0800 + + Merge pull request #913 from carolfh/dtr-1-4 + + new material for garbage collection + +commit a4b2de674c7030e70f671d5d6dcedb0c7ca5b0cd +Author: Sebastiaan van Stijn +Date: Thu Nov 12 00:52:31 2015 +0100 + + Fix find and replace typo in dockerimages + + Signed-off-by: Sebastiaan van Stijn + +commit f3af2251180365dc36f4aa1560ce5fcde7c73601 +Author: Carol Fager-Higgins +Date: Tue Nov 3 17:31:09 2015 -0800 + + added LDAP config changes to Upgrade + + Signed-off-by: Carol Fager-Higgins + +commit b664a8825ea20a729f14a49dcc0fc51ca4e01d8b +Merge: 9d4e2f3992 2b766a455c +Author: Michael Crosby +Date: Wed Nov 11 15:43:52 2015 -0800 + + Merge pull request #17918 from anusha-ragunathan/fsMagic + + Include xfsprogs in build environment. + +commit dcc12591f07335dc24e30825618683def11e8c1a +Author: Carol Fager-Higgins +Date: Wed Oct 14 13:33:45 2015 -0700 + + last edits on RN + + Signed-off-by: Carol Fager-Higgins + +commit 4dc83cc71b3a76a5d9f1fe2ce8d5865a5989b6d2 +Merge: fe360978ac 8a2897e141 +Author: Alexandre Beslic +Date: Wed Nov 11 15:32:05 2015 -0800 + + Merge pull request #1368 from abronan/configurable_discovery_path + + Add configurable discovery path option + +commit 43737a3c06d2190920403c851b605448127c247d +Author: Carol Fager-Higgins +Date: Wed Oct 21 18:19:36 2015 -0700 + + added jon's feedback to account.md. Merge ready. + + Signed-off-by: Carol Fager-Higgins + +commit 2910f1101df088c20d22c1adf00c1c3ceb382ddf +Author: Mohammed Aaqib Ansari +Date: Mon Oct 19 22:56:29 2015 -0400 + + Using checkers assert for integration-cli/docker_cli_events_test.go + + Signed-off-by: Mohammed Aaqib Ansari + +commit 122568b31465127537197cf6d9575b00bdd02045 +Author: John Howard +Date: Wed Nov 11 14:47:02 2015 -0800 + + Windows [TP4] Require build 10586+ + + Signed-off-by: John Howard + +commit 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1 +Author: Anusha Ragunathan +Date: Wed Nov 11 14:29:02 2015 -0800 + + Include xfsprogs in build environment. + + devmapper uses xfs by default now. So include xfsprogs in build + environment. Also update docs to reflect the new default. + + Signed-off-by: Anusha Ragunathan + +commit 9d4e2f3992553b660d690093a0a294d1633b7dc6 +Merge: 6c82fba2b3 e86b79fccc +Author: Antonio Murdaca +Date: Wed Nov 11 23:24:10 2015 +0100 + + Merge pull request #17913 from clnperez/oom-test-requires + + Add the memoryLimitSupport requirement to Events OOM tests + +commit 6c82fba2b32781e6cef4fda71e7b35c3dcdcb9da +Merge: adb14543fd d71eeb1c05 +Author: Alexander Morozov +Date: Wed Nov 11 14:03:48 2015 -0800 + + Merge pull request #17894 from mqliang/deferMove + + move defer statement for readability + +commit 3a852d8442f31651f0e776430432e5dda44455e0 +Author: John Howard +Date: Wed Nov 11 13:53:38 2015 -0800 + + Windows [TP4] Fix docker cp when volumes + + Signed-off-by: John Howard + +commit adb14543fd2a550a3b9a8cb12637e376cd398be4 +Merge: 6c5395360f 07ff17fb85 +Author: Tibor Vass +Date: Wed Nov 11 16:42:58 2015 -0500 + + Merge pull request #17903 from rhvgoyal/default-to-xfs-v2 + + Devicemapper: Default to xfs instead of ext4 + +commit 0a35fd93cd8b16b7c0a65600b32ceec98f54dfb6 +Merge: a746d673b1 d6b44905f2 +Author: Joffrey F +Date: Wed Nov 11 13:20:22 2015 -0800 + + Merge pull request #2373 from shin-/2370-env_vars_with_dashes + + Allow dashes in environment variable names + +commit 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe +Merge: e49e6b7bfd 44a527d877 +Author: moxiegirl +Date: Wed Nov 11 13:10:22 2015 -0800 + + Merge pull request #17883 from dave-tucker/bug/17709 + + Add required ports for Overlay to docs + +commit e49e6b7bfdf0e731aa0e846d1c29ab9d96a2a1d9 +Merge: f74c423255 40fc3a8bcf +Author: Sebastiaan van Stijn +Date: Wed Nov 11 20:56:57 2015 +0000 + + Merge pull request #17915 from moxiegirl/17764-fix + + Adding in Contiv plugins + +commit 40fc3a8bcf39e52e45c2aac3808987a5499094d8 +Author: Mary Anthony +Date: Wed Nov 11 12:49:54 2015 -0800 + + Adding in Contiv plugins + Fixes #17764 + Also fixed problem where the menu ordering was off + Fix the wrap + + Signed-off-by: Mary Anthony + +commit d6b44905f25d8d03a5057c942bc9a955da40be23 +Author: Joffrey F +Date: Wed Nov 11 12:52:30 2015 -0800 + + Add test for environment variable dashes support + + Signed-off-by: Joffrey F + +commit 5c75150de85eabda4015cfbb1120448ef6d53452 +Author: Carol Fager-Higgins +Date: Tue Nov 10 13:28:55 2015 -0800 + + edited per viktors and jon's comments + + Signed-off-by: Carol Fager-Higgins + +commit 513dfda218a96f89de69788db9fb39f007656356 +Author: Joffrey F +Date: Wed Nov 11 12:45:02 2015 -0800 + + Allow dashes in environment variable names + + See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html + Environment variable names used by the utilities in the Shell and + Utilities volume of POSIX.1-2008 consist solely of uppercase letters, + digits, and the ( '_' ) from the characters defined in + Portable Character Set and do not begin with a digit. Other characters may + be permitted by an implementation; applications shall tolerate the + presence of such names. + + Signed-off-by: Joffrey F + +commit f74c423255d8b61b4a9a609449bc389f616eb637 +Merge: 37dfae3cde f16dceb632 +Author: moxiegirl +Date: Wed Nov 11 12:43:45 2015 -0800 + + Merge pull request #17813 from davidcurrie/mhn-updates + + Updates to Get started with multi-host networking + +commit a746d673b14acdbcd9fbd5e4b86c8c5b80c1a5a5 +Merge: 76f3c9c739 19b2c41c7e +Author: Daniel Nephin +Date: Wed Nov 11 15:43:03 2015 -0500 + + Merge pull request #2350 from dnephin/remove_name_from_schema + + Remove name field from the config schema + +commit f16dceb63233bd2c1fd327b92d7112e8012347ac +Author: David Currie +Date: Sun Nov 8 22:58:10 2015 +0000 + + Updates to Get started with multi-host networking + + Updates primarily to expand usage of Swarm cluster and make Compose + section more verbose plus other minor corrections. + + Signed-off-by: David Currie + +commit 76f3c9c739a7eb0b67cc9a9663d1df16049f06bd +Merge: 08bd2a318f 5e97b806d5 +Author: Daniel Nephin +Date: Wed Nov 11 15:27:47 2015 -0500 + + Merge pull request #2349 from dnephin/validate_all_files + + Validate all files before merging them + +commit 08bd2a318fc6718f13d5632c69a1297d19e9d4b3 +Merge: 2063b39868 c573fcc70a +Author: Daniel Nephin +Date: Wed Nov 11 15:20:31 2015 -0500 + + Merge pull request #2371 from shin-/yvespp-master + + Removed unneeded newlines on docker-compose pull with no tty (#2311 update) + +commit 37dfae3cde79966734c72a57ed2b2d4c653d61b6 +Merge: ee8aadbdd9 1df0bb5a13 +Author: Arnaud Porterie +Date: Wed Nov 11 21:15:13 2015 +0100 + + Merge pull request #17909 from LK4D4/info_simple + + daemon/info.go: assign proxy fields directly + +commit ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e +Merge: 0b566566c6 8311db14fc +Author: Sebastiaan van Stijn +Date: Wed Nov 11 20:01:27 2015 +0000 + + Merge pull request #17807 from albers/completion-network-yes + + Align configuration of bash completion with existing values + +commit 1716d497a420f0cd4e53a99535704c6d215e38c7 +Author: Dan Walsh +Date: Wed Oct 28 09:19:51 2015 -0400 + + Relabel BTRFS Content on container Creation + + This change will allow us to run SELinux in a container with + BTRFS back end. We continue to work on fixing the kernel/BTRFS + but this change will allow SELinux Security separation on BTRFS. + + It basically relabels the content on container creation. + + Just relabling -init directory in BTRFS use case. Everything looks like it + works. I don't believe tar/achive stores the SELinux labels, so we are good + as far as docker commit. + + Tested Speed on startup with BTRFS on top of loopback directory. BTRFS + not on loopback should get even better perfomance on startup time. The + more inodes inside of the container image will increase the relabel time. + + This patch will give people who care more about security the option of + runnin BTRFS with SELinux. Those who don't want to take the slow down + can disable SELinux either in individual containers or for all containers + by continuing to disable SELinux in the daemon. + + Without relabel: + + > time docker run --security-opt label:disable fedora echo test + test + + real 0m0.918s + user 0m0.009s + sys 0m0.026s + + With Relabel + + test + + real 0m1.942s + user 0m0.007s + sys 0m0.030s + + Signed-off-by: Dan Walsh + + Signed-off-by: Dan Walsh + +commit 3e9543fc61cbcfd4847be30699dfcd664bc0bfce +Author: Sebastiaan van Stijn +Date: Wed Nov 11 20:47:42 2015 +0100 + + docs: update supported drivers for docker logs + + The journald driver also supports docker logs. + + Signed-off-by: Sebastiaan van Stijn + +commit c573fcc70a297dbc8d971ad13a81bbaa88262dec +Author: Joffrey F +Date: Wed Nov 11 11:21:24 2015 -0800 + + Reorganize conditional branches to improve readability + + Signed-off-by: Joffrey F + +commit b8b4c84573ec7d20524b7d2715d956fcc9f897a8 +Author: Yves Peter +Date: Wed Nov 4 23:40:57 2015 +0100 + + Fixes #1490 + progress_stream would print a lot of new lines on "docker-compose pull" if there's no tty. + + Signed-off-by: Yves Peter + +commit 1df0bb5a1309af0402d83061d4404afe7396e657 +Author: Alexander Morozov +Date: Wed Nov 11 11:03:53 2015 -0800 + + daemon/info.go: assign proxy fields directly + + Signed-off-by: Alexander Morozov + +commit 0b566566c66832ea7d78b6468fb960dd2d4975f9 +Merge: 2bb1c530d7 451b79d691 +Author: David Calavera +Date: Wed Nov 11 11:00:31 2015 -0800 + + Merge pull request #17858 from sanimej/libn + + Allow port mapping only for endpoint created on docker run + +commit 5e303c157964003c4404afca8d0b0949f0e93b1d +Merge: 5d92da1805 0605aafe37 +Author: moxiegirl +Date: Wed Nov 11 10:59:47 2015 -0800 + + Merge pull request #25 from askb/24_fix_windows_ref + + Fix for #24 missing reference to 'Windows' platform on the "Organize the issues" page. + +commit 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930 +Merge: 7a985cfafc 43012fe842 +Author: Alexander Morozov +Date: Wed Nov 11 10:25:00 2015 -0800 + + Merge pull request #17193 from cpuguy83/refactor_store_errors + + Refactor volume store's error usage + +commit 44a527d877faf0ef62bc9b0221f656041833ae66 +Author: Dave Tucker +Date: Tue Nov 10 22:03:52 2015 +0000 + + Add required ports for Overlay to docs + + Fixes #17709 + + Signed-off-by: Dave Tucker + +commit c3c932f4e182c52a64fe99eb4b51b00e9d6ca9cb +Author: Richard Scothern +Date: Tue Nov 10 17:01:43 2015 -0800 + + Use go 1.5 on the build machine + Signed-off-by: Richard Scothern + +commit 7a985cfafc211c8cc302e4c1e14059fc513663ba +Merge: 2a7b5f6657 095a8ac545 +Author: Tibor Vass +Date: Wed Nov 11 12:42:08 2015 -0500 + + Merge pull request #17890 from aboch/b6 + + Restore deterministic IPv6 from MAC behavior on default bridge network + +commit 2063b398689d70f4af21233984156efa84d0a7f7 +Merge: 7466d14826 a8ac6e6f93 +Author: Aanand Prasad +Date: Wed Nov 11 17:21:29 2015 +0000 + + Merge pull request #2336 from dnephin/warn_on_volume_masking + + Add a warning when the host volume in the compose file is masked by a data volume + +commit 07ff17fb850e5ddae6f38cc21776ebb9b1690f3e +Author: Vivek Goyal +Date: Wed Nov 11 12:07:35 2015 -0500 + + devmapper: Switch to xfs as default filesystem if supported + + If platform supports xfs filesystem then use xfs as default filesystem + for container rootfs instead of ext4. Reason being that ext4 is pre-allcating + lot of metadata (around 1.8GB on 100G thin volume) and that can take long + enough on AWS storage that systemd times out and docker fails to start. + + If one disables pre-allocation of ext4 metadata, then it will be allocated + when containers are mounted and we will have multiple copies of metadata + per container. For a 100G thin device, it was around 1.5GB of metadata + per container. + + ext4 has an optimization to skip zeroing if discards are issued and + underlying device guarantees that zero will be returned when discarded + blocks are read back. devicemapper thin devices don't offer that guarantee + so ext4 optimization does not kick in. In fact given discards are optional + and can be dropped on the floor if need be, it looks like it might not be + possible to guarantee that all the blocks got discarded and if read back + zero will be returned. + + Signed-off-by: Anusha Ragunathan + Signed-off-by: Vivek Goyal + +commit 83a34e000b2332d9a1b4214a77fae021ed144acb +Author: Vivek Goyal +Date: Wed Nov 11 12:07:35 2015 -0500 + + devmapper: Warn if user specified a filesytem and base device already has fs + + If user wants to use a filesystem it can be specified using dm.fs= + option. It is possible that docker already had base image and a filesystem + on that. Later if user wants to change file system using dm.fs= option + and restarts docker, that's not possible. Warn user about it. + + Signed-off-by: Vivek Goyal + +commit 095a8ac5451de25a91fc569a6633fdd8d4cabb3f +Author: Alessandro Boch +Date: Tue Nov 10 21:14:05 2015 -0800 + + Restore IPv6 from MAC on default bridge network + + Signed-off-by: Alessandro Boch + +commit 19b2c41c7ee7887468d04ceb1fc90f05b232432a +Author: Daniel Nephin +Date: Mon Nov 9 15:39:55 2015 -0500 + + Add a test for invalid field 'name', and fix an existing test for invalid service names. + + Signed-off-by: Daniel Nephin + +commit 1f7faadc7712f5bf734e6254d2a8d6f1427f5029 +Author: Daniel Nephin +Date: Fri Nov 6 11:57:27 2015 -0500 + + Remove name from config schema. + + Refactors config validation of a service to use a ServiceConfig data object. + Instead of passing around a bunch of related scalars, we can use the + ServiceConfig object as a parameter to most of the service validation functions. + + This allows for a fix to the config schema, where the name is a field in the + schema, but not actually in the configuration. My passing the name around as + part of the ServiceConfig object, we don't need to add it to the config options. + Fixes #2299 + + validate_against_service_schema() is moved from a conditional branch in + ServiceExtendsResolver() to happen as one of the last steps after all + configuration is merged. This schema only contains constraints which only need + to be true at the very end of merging. + + Signed-off-by: Daniel Nephin + +commit 5e97b806d51e72f282046231af417b4d647cf64f +Author: Daniel Nephin +Date: Mon Nov 9 14:24:44 2015 -0500 + + Fix a bug in ExtendsResolver where the service name of the extended service was wrong. + + This bug can be seen by the change to the test case. When the extended service + uses a different name, the error was reported incorrectly. + + By fixing this bug we can simplify self.signature and self.detect_cycles to + always use self.service_name. + + Signed-off-by: Daniel Nephin + +commit a92d86308f7bc3e571f06df4990e609ec370bfc5 +Author: Daniel Nephin +Date: Fri Nov 6 17:18:47 2015 -0500 + + Rename ServiceLoader to ServiceExtendsResolver + + ServiceLoader has evolved to be not really all that related to "loading" a + service. It's responsibility is more to do with handling the `extends` + field, which is only part of loading. The class and its primary method + (make_service_dict()) were renamed to better reflect their responsibility. + + As part of that change process_container_options() was removed from + make_service_dict() and renamed to process_service(). It contains logic for + handling the non-extends options. + + This change allows us to remove the hacks from testcase.py and only call + the functions we need to format a service dict correctly for integration tests. + + Signed-off-by: Daniel Nephin + +commit 98ad5a05e4fb342ba4deed92754da51ca98973b3 +Author: Daniel Nephin +Date: Fri Nov 6 16:38:38 2015 -0500 + + Validate additional files before merging them. + + Consolidates all the top level config handling into `process_config_file` which + is now used for both files and merge sources. + + Signed-off-by: Daniel Nephin + +commit 7466d14826e2b35bc73777273b335982e35e3431 +Merge: c006c6ea09 7365a398b3 +Author: Aanand Prasad +Date: Wed Nov 11 15:48:28 2015 +0000 + + Merge pull request #2363 from dnephin/pr-2261 + + Rebase of PR 2261 + +commit c006c6ea09b30e36042ddf9b09f96e9daca5c5e0 +Merge: 7d6c63d1b7 45724fc667 +Author: Daniel Nephin +Date: Wed Nov 11 10:48:08 2015 -0500 + + Merge pull request #2341 from dnephin/dont_create_default_network_sometimes + + Only create the default network if at least one service needs it + +commit 0fbfa1449d917ee0778266139d6035fb0782f7c2 +Author: Ma Shimiao +Date: Fri Jun 12 08:34:20 2015 +0800 + + Add support for blkio.weight_device + + Signed-off-by: Ma Shimiao + +commit 2a7b5f66574f626610f6bfcca86c15263f57c3cc +Merge: 9498e9b732 fbdce2547f +Author: Vincent Demeester +Date: Wed Nov 11 13:49:50 2015 +0100 + + Merge pull request #17880 from duglin/TweakMap + + convert map value from struct to bool + +commit 9498e9b732234e103c41be0c91d64c46057e6fe0 +Merge: d6856db128 641c739fc1 +Author: Sebastiaan van Stijn +Date: Wed Nov 11 09:56:40 2015 +0000 + + Merge pull request #17800 from Starefossen/patch-1 + + Utillize build cache for Node.js web app example + +commit d6856db128212020e7d21f5121b3f0b4778910cb +Merge: 1066725395 e8da75d4a1 +Author: Vincent Demeester +Date: Wed Nov 11 10:42:13 2015 +0100 + + Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip + + Test to ensure that the bridge ip is excluded from the allocator pool + +commit dc41fff56eb85552c38716533b2cd982d6e02f40 +Author: Antonio Murdaca +Date: Wed Nov 11 10:19:03 2015 +0100 + + hack: make.sh: remove not used function + + Signed-off-by: Antonio Murdaca + +commit 91041884f858087aafbf02fc456d9d1488e03c30 +Author: Zuhayr Elahi +Date: Mon Nov 2 20:24:12 2015 -0800 + + changed if else statements to c.Asserts in docker_cli_create_test.go. + + Signed-off-by: Zuhayr Elahi + +commit 10667253951a783785d3236192428a5decca3fef +Merge: 09980ef7ac ef05b83417 +Author: Vincent Batts +Date: Wed Nov 11 07:59:41 2015 +0100 + + Merge pull request #16774 from tonistiigi/15643-aufs-plnk + + Copy aufs hardlinks to top layer + +commit 43b3b6ecb4f838023478c484d32957386b7dd666 +Author: Alessandro Boch +Date: Tue Nov 10 21:13:25 2015 -0800 + + Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9 + + Signed-off-by: Alessandro Boch + +commit 09980ef7ac2510cc67e160657f0829a47f5b5b28 +Merge: 69f73252e9 c7cd659624 +Author: Tibor Vass +Date: Tue Nov 10 23:38:33 2015 -0500 + + Merge pull request #17853 from aboch/ipr + + Fix fixed-cidr daemon option + +commit bea12ab8ab83274de545b4e68a92c835bb289a27 +Author: Xian Chaobo +Date: Wed Nov 11 12:11:08 2015 +0800 + + add support do with image digest + + Signed-off-by: Xian Chaobo + +commit d71eeb1c057cdb7ffdb0b5a2aac537671578b676 +Author: mqliang +Date: Wed Nov 11 11:28:23 2015 +0800 + + move defer statement for readability + + Signed-off-by: mqliang + +commit 43012fe8425650930a21703d9468ab0e777e053a +Author: Brian Goff +Date: Mon Oct 19 20:41:22 2015 -0400 + + Refactor volume store's error usage + + Uses an errors API similar the `net` package. + + Signed-off-by: Brian Goff + +commit bb745757de5302dadc7d4639e4f4a7134ad98836 +Merge: a33095af80 5f2205981b +Author: Richard Scothern +Date: Tue Nov 10 16:50:55 2015 -0800 + + Merge pull request #1125 from rustyconover/fix-url-path-escaping + + Fix failing test case for URL escaping problem. + +commit e86b79fcccb23040feea079652fd9a7bf3458f1d +Author: Christy Perez +Date: Tue Nov 10 18:06:13 2015 -0600 + + Add the memoryLimitSupport requirement to OOM tests + + The docker run commands in these tests uses the -m flag, + so the tests should require that it's supported to run. + + Fixes 17215 (maybe) + + Signed-off-by: Christy Perez + +commit 69f73252e96ad4c70023783b4a4f575e5457562e +Merge: 75c0cc2f10 77cd22ea73 +Author: David Calavera +Date: Tue Nov 10 15:48:02 2015 -0800 + + Merge pull request #17881 from aaronlehmann/import-logging + + Correct import event logging + +commit a9fda578ee292a4b36584fd38fc4a972d1d34e48 +Merge: 0f3a194cf2 3f33c86d98 +Author: Sven Dowideit +Date: Wed Nov 11 09:39:49 2015 +1000 + + Merge pull request #268 from moxiegirl/docs-structure + + Adding in Docs infrastructure + +commit 75c0cc2f10e322ad95c801820254b5cf9423cffd +Merge: 877df6bd38 86faf1e165 +Author: Antonio Murdaca +Date: Wed Nov 11 00:20:25 2015 +0100 + + Merge pull request #17875 from tonistiigi/17827-builder-root-source + + Add test for builder cache with root source path + +commit 877df6bd3803de5bf3bac55e68ed30b71815350c +Merge: d575d1e094 2d87dd5c6e +Author: Sebastiaan van Stijn +Date: Tue Nov 10 23:15:45 2015 +0000 + + Merge pull request #17884 from Microsoft/jjh/proxify + + Removing made up word from docs + +commit 953f2868b1b1364020aa407b05c56aeea2cdbf37 +Author: Jeffrey Morgan +Date: Tue Nov 10 15:04:48 2015 -0800 + + Fix startup and winpty errors + + Signed-off-by: Jeffrey Morgan + +commit 2d87dd5c6e5fd67020311dd5743dbb718d4a75e9 +Author: John Howard +Date: Tue Nov 10 14:36:02 2015 -0800 + + Removing made up word + + Signed-off-by: John Howard + +commit 71780b947ebcccdbd7de42fa185fac32cc17ac79 +Merge: dd19fbeaf5 73f29a2b49 +Author: French Ben +Date: Tue Nov 10 14:24:43 2015 -0800 + + Merge pull request #1201 from FrenchBen/344-udp + + Added port type support - fixes #344 + +commit 73f29a2b490c4613f1c4548b8cf65e0c0394148d +Author: French Ben +Date: Mon Nov 9 15:14:38 2015 -0800 + + Added port type support - fixes #344 + + Signed-off-by: French Ben + +commit 641c739fc1352aab8937ea8f0280082fa8e67ff8 +Author: Hans Kristian Flaatten +Date: Sun Nov 8 14:11:48 2015 +0100 + + Utillize build cache for Node.js web app example + + Signed-off-by: Hans Kristian Flaatten + +commit e3366a42e5ba18f432475c06b48b8a568de67cec +Author: Carol Fager-Higgins +Date: Sun Oct 25 23:37:07 2015 -0700 + + adding file back but removed from conf doc + + Signed-off-by: Carol Fager-Higgins + +commit 77cd22ea73f83491d0e7e0fd084b6c6a2b1dc9cb +Author: Aaron Lehmann +Date: Tue Nov 10 13:34:53 2015 -0800 + + Correct import event logging + + Importing an image currently logs an event with id:tag. This format is + strange and nonstandard - possibly a mistake. Just log the ID instead. + + Signed-off-by: Aaron Lehmann + +commit d575d1e0944d5b245b7b21f46015346209f4a70e +Merge: 35d9bcdb57 211e3b0df6 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 21:32:23 2015 +0000 + + Merge pull request #17806 from albers/fix-17768 + + Fix bash completion on systems where extglob is not set + +commit 35d9bcdb5778f04b76f781dc56e0668c9383b96c +Merge: 3d23fdaf97 37ba67bf63 +Author: David Calavera +Date: Tue Nov 10 13:17:03 2015 -0800 + + Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix + + Fixing last access time on Windows to unblock python. + +commit fbdce2547f43fdd8184cd906790cd107562734ca +Author: Doug Davis +Date: Tue Nov 10 12:57:51 2015 -0800 + + convert map value from struct to bool + + Just for @calavera !! :-) + Per: https://github.com/docker/docker/pull/17789#discussion_r44333133 + + Signed-off-by: Doug Davis + +commit 3d23fdaf97fe8c2ad252a8376ca18161eda8a8de +Merge: 5b718bdee2 4fca870212 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 21:08:56 2015 +0000 + + Merge pull request #17754 from justincormack/gpg-server + + Add an alternate gpg server to the documentation for Ubuntu and Debian. + +commit 5b718bdee288134e9a0cfc12d0ed655a3858747f +Merge: d4c4557b1a 8f311f4d8c +Author: David Calavera +Date: Tue Nov 10 12:52:52 2015 -0800 + + Merge pull request #17874 from LK4D4/nocheck_nil_map + + daemon/info.go: remove check for map nilness + +commit 4fca870212ea11010e9dc5ecc802d076dcc1c683 +Author: Justin Cormack +Date: Fri Nov 6 11:16:57 2015 +0000 + + Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server + + Signed-off-by: Justin Cormack + +commit 7365a398b327ecee9de01da5deab83275a87d779 +Author: Daniel Nephin +Date: Tue Nov 10 13:37:07 2015 -0500 + + Update doc wording for ulimits. + + and move tests to the correct module + + Signed-off-by: Daniel Nephin + +commit d4c4557b1af794c4d7e4a9833b20119c0a4c091c +Merge: d27e802bc5 a429ad1e35 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 19:55:46 2015 +0000 + + Merge pull request #17613 from Microsoft/10662-isolationexecopt + + Windows: Add default isolation exec driver option + +commit a429ad1e35691fb01f3f80461964030d2197a0eb +Author: John Howard +Date: Sat Oct 31 19:16:58 2015 -0700 + + Windows: Add default isolation exec driver option + + Signed-off-by: John Howard + +commit d27e802bc54922b3e4465d7ae2e06074489796c6 +Merge: 2f1865ae0e 1a8cd193f9 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 19:21:43 2015 +0000 + + Merge pull request #17641 from libopenstorage/plugins-md + + Add OpenStorage to plugins.md + +commit 2f1865ae0e8326e5f4e63a5c11f8e2a29377d087 +Merge: 2aa9d85c92 93939c3f9f +Author: Sebastiaan van Stijn +Date: Tue Nov 10 19:17:17 2015 +0000 + + Merge pull request #17778 from tophj-ibm/link-fixes + + Fixed broken links in docker_remote_api + +commit 22d90d21800bd5bf5c695f09cd3c98928781db9e +Author: Kevin Greene +Date: Mon Oct 26 17:39:50 2015 -0400 + + Added ulimits functionality to docker compose + + Signed-off-by: Kevin Greene + +commit 2aa9d85c92803e7b4918694ac5009597fa3fc34b +Merge: 9739aa056e a874ce08f3 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 19:03:09 2015 +0000 + + Merge pull request #17821 from HackToday/17820-fix-volume-doc + + Fixing wrong volume doc format + +commit a8ac6e6f93be89ba82f60e7136a2ccd8fdec4798 +Author: Daniel Nephin +Date: Wed Nov 4 18:00:24 2015 -0500 + + Add a warning when the host volume config is being ignored. + + Signed-off-by: Daniel Nephin + +commit 7d6c63d1b75bf8a9c8bbde32d238d5c851327bba +Merge: 2c2b8a8322 338bbb5063 +Author: Daniel Nephin +Date: Tue Nov 10 13:42:08 2015 -0500 + + Merge pull request #2361 from dnephin/pr-2262 + + Rebase of PR 2262 + +commit a33095af80fa2dfeac65be78185428f31bef190a +Merge: 00aeb6ece7 3ff8af326b +Author: Richard Scothern +Date: Tue Nov 10 10:39:43 2015 -0800 + + Merge pull request #1141 from lebauce/swift-no-missing-segment + + Ensure read after write for segments + +commit 00aeb6ece7106697e47c2352b623fff9d576e930 +Merge: 362ae9cc41 6664a1384e +Author: Richard Scothern +Date: Tue Nov 10 10:36:19 2015 -0800 + + Merge pull request #1172 from aaronlehmann/swift-empty-delete-request + + Fix empty delete requests with Swift fs driver + +commit 2c2b8a832225d004043039f11daee8b900ad9fb0 +Merge: 0017f43d7f 133d213e78 +Author: Joffrey F +Date: Tue Nov 10 10:31:58 2015 -0800 + + Merge pull request #2360 from shin-/2357-http_timeout_exit_1 + + Use exit code 1 when encountering a ReadTimeout + +commit 9739aa056e11661a9637d38c588eeac28470dea7 +Merge: 470fc94f38 850f7841f7 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 18:31:09 2015 +0000 + + Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link + + Fix broken links in CONTRIBUTING.md + +commit 86faf1e165b8ffa0cb2394b1f5504caa1fa8f718 +Author: Tonis Tiigi +Date: Tue Nov 10 10:14:05 2015 -0800 + + Add test for builder cache with root source path + + Fixes #17827 + + Signed-off-by: Tonis Tiigi + +commit 338bbb5063d882bb751cae3a25651bcf6e61b679 +Author: Daniel Nephin +Date: Tue Nov 10 13:11:59 2015 -0500 + + Re-order flags in bash completion + + and remove unnecessary variables from build command. + + Signed-off-by: Daniel Nephin + +commit 133d213e78c060ad0e1448fb52086c120ffdd15d +Author: Joffrey F +Date: Tue Nov 10 10:11:20 2015 -0800 + + Use exit code 1 when encountering a ReadTimeout + + Signed-off-by: Joffrey F + +commit c5c36d8b006d9694c34b06e434e08bb17b025250 +Author: Adrian Budau +Date: Tue Oct 27 02:00:51 2015 -0700 + + Added --force-rm to compose build. + + It's a flag passed to docker build that removes the intermediate + containers left behind on fail builds. + + Signed-off-by: Adrian Budau + +commit 470fc94f3856640d1c85c90c62a78396a4d55d66 +Merge: 4aaebec1bc a2d8c93fc6 +Author: David Calavera +Date: Tue Nov 10 09:48:33 2015 -0800 + + Merge pull request #17476 from coolljt0725/prevent_connect_to_host + + Fix connect to host and prevent disconnect from host for host network + +commit 3f33c86d98e3161b067d7f3ffcd35ed175f25c0a +Author: Mary Anthony +Date: Tue Nov 10 09:44:45 2015 -0800 + + Adding in Docs infrastructure + + Signed-off-by: Mary Anthony + +commit 45724fc667ff54f2ae26e00c27f76d43556b9239 +Author: Daniel Nephin +Date: Fri Nov 6 13:56:25 2015 -0500 + + Only create the default network if at least one service needs it. + + Signed-off-by: Daniel Nephin + +commit 3474bb6cf5c1961deb20cd186cd2a2dbf3224f0c +Author: Daniel Nephin +Date: Fri Nov 6 14:30:27 2015 -0500 + + Cleanup workaround in testcase.py + + Signed-off-by: Daniel Nephin + +commit 5c5a004a7752fe698eee5a96acb605863f178636 +Merge: ae027c355d 72de87593b +Author: David Gageot +Date: Tue Nov 10 18:43:38 2015 +0100 + + Merge pull request #2239 from dgageot/faster-ci + + Faster CI + +commit 0017f43d7fd4fa0066e8ce830be26a09c02871d3 +Merge: c8fa0a902a 7c2a16234f +Author: Aanand Prasad +Date: Tue Nov 10 17:36:23 2015 +0000 + + Merge pull request #2339 from dnephin/recreate_deps_on_create + + Recreate dependents when a dependency is created + +commit fe360978acbaf14421ad0d85eeeee12e804cdaf8 +Merge: 9ddb3c474c 374370e39d +Author: Alexandre Beslic +Date: Tue Nov 10 09:36:16 2015 -0800 + + Merge pull request #1394 from abronan/fix_integration + + Fix integration tests, --exec-driver has been removed in docker master + +commit c8fa0a902a4b340bfd986ac58cbdea4f8a9542ef +Merge: 917b885a44 d32bb8efee +Author: Daniel Nephin +Date: Tue Nov 10 12:34:42 2015 -0500 + + Merge pull request #2331 from dnephin/flush_log_buffer_when_printing_logs + + Flush the log stream after writing each line + +commit 917b885a440c943c80685e9bcc05f1b9547bd6b0 +Merge: b09cf86dd6 3456002aef +Author: Aanand Prasad +Date: Tue Nov 10 17:34:02 2015 +0000 + + Merge pull request #2334 from dnephin/dont_set_hostname + + Don't set the hostname to the service name with networking. + +commit 4aaebec1bcaf104f89cf3bd9b1c6b3be0807eb42 +Merge: a6a3c42b58 c5f24c7902 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 17:32:21 2015 +0000 + + Merge pull request #17873 from Blaisorblade/patch-1 + + Fix link to installation instructions + +commit b09cf86dd61a634122b52a32a4a2e693b92cea98 +Merge: 774d852f93 26c7dd3712 +Author: Daniel Nephin +Date: Tue Nov 10 12:29:52 2015 -0500 + + Merge pull request #2326 from dnephin/unicode_decode_error + + Unicode decode error + +commit 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17 +Author: Alexander Morozov +Date: Tue Nov 10 09:20:59 2015 -0800 + + daemon/info.go: remove check for map nilness + + Signed-off-by: Alexander Morozov + +commit c5f24c7902df5a48258056e799952200f250c5f2 +Author: Paolo G. Giarrusso +Date: Tue Nov 10 18:02:02 2015 +0100 + + Fix link to installation instructions + + Fix #17872: + + > The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/, which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/. + + Signed-off-by: Paolo G. Giarrusso + +commit a6a3c42b5869d4ef25240223db44fa1527d75346 +Merge: 014bab03ef 51cf074e77 +Author: David Calavera +Date: Tue Nov 10 08:57:05 2015 -0800 + + Merge pull request #17848 from Microsoft/jjh/tidyconfigstructs2 + + Tidy hostconfig struct + +commit 014bab03efd67367d13231c08cc43e2e73578824 +Merge: fb2bae5e16 6990f8c616 +Author: David Calavera +Date: Tue Nov 10 08:55:11 2015 -0800 + + Merge pull request #17789 from duglin/Issue17781 + + Allow for env vars to have spaces in some cases + +commit ae027c355db630b7cda4ed2397df64d45182059a +Merge: fb986b23e0 89d9854943 +Author: David Gageot +Date: Tue Nov 10 17:43:58 2015 +0100 + + Merge pull request #2241 from dgageot/linting + + Another pass at linting + +commit 89d9854943dfade25abd9135d7065c5b0ae04353 +Author: Olivier Gambier +Date: Thu Nov 5 18:04:40 2015 -0800 + + Another pass at linting + + Signed-off-by: Olivier Gambier + +commit 850f7841f7e132460be44b9a9c5e5581368c296b +Author: Sebastiaan van Stijn +Date: Tue Nov 10 16:49:07 2015 +0100 + + Fix broken links in CONTRIBUTING.md + + Signed-off-by: Sebastiaan van Stijn + +commit 72de87593b75e0e61f6d97fb8014ba08ee4a2e2b +Author: David Gageot +Date: Tue Nov 10 14:26:49 2015 +0100 + + test-long does run short tests + + Signed-off-by: David Gageot + +commit 1b7cfb0ce68bcc874fdf0474bba1242c35bffbb3 +Author: David Gageot +Date: Tue Nov 10 12:09:45 2015 +0100 + + Faster in-container build. + + Start the container only once + + Signed-off-by: David Gageot + +commit e036bf6c0742ef4f3c7caab3ad6960fc27977a1d +Author: gissehel +Date: Tue Nov 10 11:17:53 2015 +0100 + + explicit way to express that those are different choice and not just one big file to create + + Signed-off-by: gissehel + +commit fb2bae5e162c91175f7cbc654de8e0fd132a0998 +Merge: 34916dcc4b ba2a5a420d +Author: Vincent Demeester +Date: Tue Nov 10 11:06:32 2015 +0100 + + Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all + + Add zsh completion for 'docker stats --all -a' + +commit 34916dcc4b11b03f5532dacc8c73ef9d0598133e +Merge: 6f2c6111d4 d790469681 +Author: Sebastiaan van Stijn +Date: Tue Nov 10 09:50:31 2015 +0000 + + Merge pull request #17467 from WeiZhang555/fix-doc + + fix format of man page + +commit 343e15fa3f3e6838a6cf6ebd2dd02e4e627fffcc +Author: Liu Hua +Date: Tue Nov 10 17:11:00 2015 +0800 + + remove unnecessary logs from daemon + + if daemon encounters removing-file error. It will record two + similar logs as following . The later is meaningful for client, But not for + daemon. So remove it. + + Signed-off-by: Liu Hua + +commit fb986b23e0e473c8bfcb8e99caccbc30ae7902f2 +Merge: 7179139e16 b6ca1035bd +Author: David Gageot +Date: Tue Nov 10 10:02:38 2015 +0100 + + Merge pull request #2207 from jeanlaurent/1737-virtualbox-installation-path + + Fix #1737 - Detect non default VirtualBox Installation Path + +commit b6ca1035bd17992aa6ff6c3473f58cd28b4d3091 +Author: Jean-Laurent de Morlhon +Date: Fri Nov 6 15:34:25 2015 +0100 + + Fix for #1737 - Better detect non default VirtualBox Installation Path + + Signed-off-by: Jean-Laurent de Morlhon + +commit 7179139e1629a58956d59c3b4e4201dc79ce1f98 +Merge: f3065ae771 a43d13843b +Author: David Gageot +Date: Tue Nov 10 09:18:04 2015 +0100 + + Merge pull request #2233 from natemcmaster/patch-1 + + Update command-line arguments for hyper-v driver + +commit f3065ae771ce3ed96d0d9466ca9df97dbb76b679 +Merge: bc7da2b0fa 2a63a0ef53 +Author: Jean-Laurent de Morlhon +Date: Tue Nov 10 09:16:11 2015 +0100 + + Merge pull request #2235 from anthonydahanne/master + + Fix typo : info, not version + +commit dd19fbeaf568268a49c50b0c387930b7d333ed5f +Merge: e84a26af15 8bb8146367 +Author: Jeffrey Morgan +Date: Mon Nov 9 23:54:43 2015 -0800 + + Merge branch 'master' of github.com:kitematic/kitematic + +commit e84a26af1544a5074f6c069d39d4f709d159e558 +Author: Jeffrey Morgan +Date: Mon Nov 9 23:54:35 2015 -0800 + + Add Creating Container message when container is finished downloading + + Signed-off-by: Jeffrey Morgan + +commit ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773 +Author: Steve Durrheimer +Date: Tue Nov 10 08:47:46 2015 +0100 + + Add zsh completion for 'docker stats --all -a' + + Signed-off-by: Steve Durrheimer + +commit 2fe390babcd32d5839ef68c72cff7b0af4a20358 +Author: Nathan LeClaire +Date: Mon Nov 9 23:26:40 2015 -0800 + + Update flag help explanation + + Signed-off-by: Nathan LeClaire + +commit e035d272232890cd01b5eabc1081041032affdc0 +Author: Lei Jitang +Date: Tue Nov 10 14:50:19 2015 +0800 + + Show warning when user specify dm.basesize for already initialized devicemapper drive + + Signed-off-by: Lei Jitang + +commit 6f2c6111d42f823142fc26bc519417b82ffed56b +Merge: 70579bd558 d83b5dc177 +Author: Antonio Murdaca +Date: Tue Nov 10 07:34:11 2015 +0100 + + Merge pull request #17843 from LK4D4/discovery_refactor + + Refactoring in daemon/discovery.go + +commit 70579bd558e08fc88c06d8925e0be288692d1eac +Merge: c97ac4daf0 445675e808 +Author: Doug Davis +Date: Mon Nov 9 23:32:38 2015 -0600 + + Merge pull request #17847 from LK4D4/exec_unnec_var + + Remove unnecessary var block in monitorExec + +commit 8bb81463679c641fc7d5f92ca6b2a70944fe125c +Merge: e03fece4a5 50dbf5ee31 +Author: Michael Chiang +Date: Mon Nov 9 21:25:58 2015 -0800 + + Merge pull request #1198 from kitematic/change-width + + Increasing width by 70px to have 3 columns of the AppStore. + +commit 50dbf5ee31c82077f379d22ff54b14288b341662 +Author: Michael Chiang +Date: Mon Nov 9 21:09:01 2015 -0800 + + Increasing width by 70px to have 3 columns of the AppStore. + + Increasing width by 70px to have 3 columns of the AppStore. + +commit 76992f3e230458eb3d48678321cef5b54e3374c9 +Author: Shijiang Wei +Date: Thu Oct 22 18:16:53 2015 +0800 + + remove the unused DefaultNetwork member from daemon.Config + + Signed-off-by: Shijiang Wei + +commit d790469681b65d55e64750fd18d596db90a541df +Author: Zhang Wei +Date: Tue Nov 10 09:33:55 2015 +0800 + + Fix man pages + + Add contents and fix format problem for man pages. + + Signed-off-by: Zhang Wei + +commit c97ac4daf0f47e66a5a4ca0011722fdbd7efe16a +Merge: 95903ece60 d2d40c2d9c +Author: Sebastiaan van Stijn +Date: Tue Nov 10 00:56:41 2015 +0000 + + Merge pull request #17279 from someara/articles-chef + + Documenation update - articles/chef + +commit 95903ece6043bdd180867cc46548c01d75b53c28 +Merge: fa210a01be 4efe0def0a +Author: David Calavera +Date: Mon Nov 9 16:10:19 2015 -0800 + + Merge pull request #17844 from anthonydahanne/master + + Implicitly use swarm:latest + +commit c7cd65962448888ceb1cec6a355fc7fd04f3be53 +Author: Alessandro Boch +Date: Mon Nov 9 15:30:30 2015 -0800 + + Fix fixed-cidr daemon option + + - Logic is broken when gateway ip falls in ip-range + and ip-range is not the first block in the network + + Signed-off-by: Alessandro Boch + +commit 2a63a0ef530747f033d0f7339054524bc54e77cd +Author: Anthony Dahanne +Date: Mon Nov 9 15:51:28 2015 -0800 + + Fix typo : info, not version + To retrieve the engine configuration + + Signed-off-by: Anthony Dahanne + +commit a902a738ff9e9d63b0141874acec8dfddcb0fccf +Author: Donald Huang +Date: Mon Nov 9 23:39:50 2015 +0000 + + remove openstack swift from docs + +commit 6664a1384ec04f711672ba70ade5a491b394172c +Author: Aaron Lehmann +Date: Mon Nov 9 15:33:05 2015 -0800 + + Fix empty delete requests with Swift fs driver + + The Delete method lists objects under the given path and tries to delete + all of them with a bulk delete request. If the path has no objects + underneath it, the body of this request will be empty, which causes + HTTP-level issues. Specifically, Go's HTTP client senses the empty + request buffer and doesn't include a Content-Length, which causes the + Swift server to fail the request. + + This commit fixes the problem by avoiding sending empty bulk delete + requests. This is the correct thing to do anyway, since there's no + reason to request deletion of zero objects. + + Signed-off-by: Aaron Lehmann + +commit 9c395537bce1e787ae34d90b2de81df3a47c5ff9 +Author: Alessandro Boch +Date: Mon Nov 9 15:29:54 2015 -0800 + + Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae + + - To bring in ip-range fix + + Signed-off-by: Alessandro Boch + +commit 51cf074e77020ab45b84c22259488b7a0eddc36a +Author: John Howard +Date: Mon Nov 9 15:24:23 2015 -0800 + + Tidy hostconfig struct + + Signed-off-by: John Howard + +commit d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60 +Author: Alexander Morozov +Date: Mon Nov 9 14:03:29 2015 -0800 + + Refactoring in daemon/discovery.go + + Replace time.Sleep with time.Tick and remove unnecessary var block. + Use Warn log-level instead of error. + + Signed-off-by: Alexander Morozov + +commit fa210a01be7927e8332c20da0770de0d855caf51 +Merge: 62b484411e 3a1200f9f1 +Author: David Calavera +Date: Mon Nov 9 15:21:26 2015 -0800 + + Merge pull request #17838 from calavera/revert_17579 + + Revert "Tidy config/hostconfig structures" + +commit 445675e8081ae1e911db2ebd57efd51329574cdf +Author: Alexander Morozov +Date: Mon Nov 9 15:14:20 2015 -0800 + + Remove unnecessary var block in monitorExec + + Signed-off-by: Alexander Morozov + +commit 62b484411e851542cdc05ef36fb287c2245ec70c +Merge: 143f3579b0 f1a74a89f8 +Author: Tibor Vass +Date: Mon Nov 9 18:07:07 2015 -0500 + + Merge pull request #17779 from calavera/fix_dns_regression + + Use an empty slice as default value for DNS, DNSSearch and DNSOptions. + +commit 4efe0def0ac2a8b6b74a818d23864f62abfaa521 +Author: Anthony Dahanne +Date: Mon Nov 9 15:05:17 2015 -0800 + + Implicitly use swarm:latest so that master and agent use the same version of swarm + + Signed-off-by: Anthony Dahanne + +commit a43d13843b8fd3ab346d0fa821410cb7d81178fd +Author: Nate McMaster +Date: Mon Nov 9 14:51:56 2015 -0800 + + Update command-line arguments for hyper-v driver + + Signed-off-by: Nate McMaster + +commit 774d852f930c689ac8d84d731179d4b87dff105c +Merge: e5fbf35ce1 ec22d98377 +Author: Joffrey F +Date: Mon Nov 9 14:05:52 2015 -0800 + + Merge pull request #2335 from dnephin/volumes_refactoring + + Some small refactoring around volumes + +commit e5fbf35ce1c834837ca0993257ab2fc3f317d847 +Merge: b7fe86b99a a1e140f5a3 +Author: Daniel Nephin +Date: Mon Nov 9 16:26:47 2015 -0500 + + Merge pull request #2351 from shin-/2322_config_hash_volumes_from + + Update service config_dict computation to include volumes_from mode + +commit 143f3579b0553b50b03438aef76d908a5d327863 +Merge: 58b270c338 d9011b3617 +Author: David Calavera +Date: Mon Nov 9 13:19:28 2015 -0800 + + Merge pull request #17450 from rhatdan/selinux + + Fix relabel for SELinux + +commit 58b270c338e831ac6668a29788c72d202f9fc251 +Merge: 69bc4ebe7a 8054a30387 +Author: David Calavera +Date: Mon Nov 9 13:15:50 2015 -0800 + + Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again + + Another try at dockerversion placeholder for library import + +commit a1e140f5a3376812d3d13b011ac93760dfd4f1c2 +Author: Joffrey F +Date: Mon Nov 9 13:07:26 2015 -0800 + + Update service config_dict computation to include volumes_from mode + + Ensure config_hash is updated when volumes_from mode is changed, and + service is recreated on next up as a result. + + Signed-off-by: Joffrey F + +commit 3a1200f9f11a016abd75588fa3812fb5505b2c3a +Author: David Calavera +Date: Mon Nov 9 15:28:14 2015 -0500 + + Revert "Tidy config/hostconfig structures" + + This reverts commit ad5052df234e4f48a93e22694f91fda36bb9e95d. + + Signed-off-by: David Calavera + +commit 6990f8c6162b5b05118ab54f155eb5d86c85f2d4 +Author: Doug Davis +Date: Sat Nov 7 12:05:55 2015 -0800 + + Allow for env vars to have spaces in some cases + + Closes #17781 + + This allows for env vars in EXPOSE to be parsed for spaces so that each + "word" is then treated independently instead of as a single word/arg. + + Signed-off-by: Doug Davis + +commit bc7da2b0fadb9de5ba69131ca82fdd719279e177 +Merge: 93376828af 68092b3524 +Author: Nathan LeClaire +Date: Mon Nov 9 12:00:03 2015 -0800 + + Merge pull request #2172 from dgageot/2154-query-virtualbox-serially + + FIX #2154 query virtualbox serially + +commit 69bc4ebe7a7d05a07929cb2d63f27b4ccf87c905 +Merge: e509fe604c db3070ab1b +Author: David Calavera +Date: Mon Nov 9 11:08:31 2015 -0800 + + Merge pull request #17819 from tonistiigi/17766-fix-opq-dot + + Fix opq whiteouts problems for files with dot prefix + +commit d9011b36176d6245bdc25401633c213d73e14ea0 +Author: Dan Walsh +Date: Wed Oct 28 15:41:46 2015 -0400 + + Fix relabel for SELinux + + With the changes merged into runc/libcontainer, are now causing + SELinux to attempt a relabel always, even if the user did not + request the relabel. + + If the user does not specify Z or z on the volume mount we should + not attempt a relabel. + + Signed-off-by: Dan Walsh + +commit e509fe604c51cffb480098c4377c60bea1261fb1 +Merge: 56c8d4aaef 3c4dab51d3 +Author: Vincent Demeester +Date: Mon Nov 9 19:59:18 2015 +0100 + + Merge pull request #17816 from coolljt0725/remove_execdriver_env + + Remove DOCKER_EXECDRIVER env + +commit 56c8d4aaeff688ca5dc1f8f4c558d2e0110c3638 +Merge: 2786af3add 00bcc924fa +Author: David Calavera +Date: Mon Nov 9 10:58:54 2015 -0800 + + Merge pull request #17834 from LK4D4/update_runc + + Update runc to introduce RelabelNeeded function + +commit 2786af3add53a4224c5bb7e0cd8e097cad45314f +Merge: 0631ec6ca0 7a82429b3d +Author: Alexander Morozov +Date: Mon Nov 9 10:44:32 2015 -0800 + + Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix + + Use checker for docker_cli_run_unix_test.go + +commit 8054a303870b81eebe05e38261c1b68197b68558 +Author: Vincent Demeester +Date: Mon Nov 9 19:32:46 2015 +0100 + + dockerversion placeholder for library import + + - Add a *version* file placeholder. + - Update autogen and builds to use it and an autogen build flag + + Signed-off-by: Vincent Demeester + +commit 0631ec6ca00da93576c215b939583b597ae8c110 +Merge: e1910a8e23 d7a41325fa +Author: David Calavera +Date: Mon Nov 9 10:30:13 2015 -0800 + + Merge pull request #17810 from cpuguy83/graph_cleanup + + Graph: Un-export non-externally used functions + +commit e1910a8e231f55c92c765c7869bf874a1ca14106 +Merge: 427dcb7f82 ee13fc5b2f +Author: David Calavera +Date: Mon Nov 9 10:29:33 2015 -0800 + + Merge pull request #17829 from albers/completion-stats--all + + bash completion for `docker stats --all` + +commit 94bebc80188f3c485f0c0332a7cb848aab2f21e0 +Merge: fc14ce23f4 d503c59505 +Author: Michael Chiang +Date: Mon Nov 9 10:22:59 2015 -0800 + + Merge pull request #287 from leepa/fixtypo + + Fix typo in anonymous + +commit 427dcb7f825830bf66402cdb577dcd520499c1b0 +Merge: 7adfb3221e ad5052df23 +Author: David Calavera +Date: Mon Nov 9 10:14:58 2015 -0800 + + Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs + + Tidy config/hostconfig structures + +commit b7fe86b99af93dd5c17b24bc744571ab660653ff +Merge: 67dc90ec0e 1bfb710326 +Author: Daniel Nephin +Date: Mon Nov 9 13:09:50 2015 -0500 + + Merge pull request #2348 from aanand/fix-parallel-output + + Fix parallel output + +commit 00bcc924fa64b16484beeeabbd2969572d03d30d +Author: Alexander Morozov +Date: Mon Nov 9 10:01:48 2015 -0800 + + Update runc to introduce RelabelNeeded function + + Signed-off-by: Alexander Morozov + +commit 5fa2e4d4f2be7787ad29b1e6ffd9c026ea0c1925 +Author: John Howard +Date: Sun Nov 1 07:53:15 2015 -0800 + + Refactor ProcessConfig + + Signed-off-by: John Howard + +commit f1a74a89f89affcfbe311e89aa752b3d551e0340 +Author: David Calavera +Date: Fri Nov 6 17:22:48 2015 -0500 + + Use an empty slice as default value for DNS, DNSSearch and DNSOptions + + So we don't print those in the client and we don't fail + executing inspect templates with API field names. + + Make sure those fields are initialized as empty slices when + a container is loaded from disk and their values are nil. + + Signed-off-by: David Calavera + +commit 374370e39d3eb468bfe72f98e577d57c7a8b7d47 +Author: Alexandre Beslic +Date: Mon Nov 9 09:34:37 2015 -0800 + + fix integration tests, --exec-driver has been removed in docker master + + Signed-off-by: Alexandre Beslic + +commit 1bfb71032650b9a8b4184316af906df382807d9d +Author: Aanand Prasad +Date: Mon Nov 9 17:24:21 2015 +0000 + + Fix parallel output + + We were outputting an extra line, which in *some* cases, on *some* + terminals, was causing the output of parallel actions to get messed up. + + In particular, it would happen when the terminal had just been cleared + or hadn't yet filled up with a screen's worth of text. + + Signed-off-by: Aanand Prasad + +commit 7adfb3221efe7b97d00d1baacb74bed0013e6f76 +Merge: 28588efb47 77af7d1067 +Author: Alexander Morozov +Date: Mon Nov 9 09:23:08 2015 -0800 + + Merge pull request #17584 from Microsoft/10662-OOMKilled + + Windows: Refactor exitStatus structure + +commit 77af7d1067b83cf683745e3f15ce19425beb34e0 +Author: John Howard +Date: Sat Oct 31 19:31:24 2015 -0700 + + Refactor exitStatus structure + + Signed-off-by: John Howard + +commit 28588efb47bc22c409f14ea4a534a01c53c6e1bd +Merge: 944dc7fa8f 805dd0eeed +Author: Alexander Morozov +Date: Mon Nov 9 08:05:08 2015 -0800 + + Merge pull request #17089 from Microsoft/10662-ansi + + Windows: Native ANSI console support + +commit ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48 +Author: Harald Albers +Date: Mon Nov 9 16:27:13 2015 +0100 + + bash completion for `docker stats --all` + + Signed-off-by: Harald Albers + +commit d503c5950538e68195769abfc3f11e97b4525066 +Author: Lee Packham +Date: Mon Nov 9 10:20:32 2015 +0000 + + Fix typo in anonymous + + Signed-off-by: Lee Packham + +commit a874ce08f3742d219f105a8b3d5cb7f37544824b +Author: Kai Qiang Wu(Kennan) +Date: Mon Nov 9 02:17:50 2015 -0600 + + Fixing wrong volume doc format + + Signed-off-by: Kai Qiang Wu(Kennan) + +commit db3070ab1b9e394e45b1db22b8ed8352272d4410 +Author: Tonis Tiigi +Date: Sun Nov 8 23:00:01 2015 -0800 + + Fix opq whiteouts problems for files with dot prefix + + Fixes #17766 + + Previously, opaque directory whiteouts on non-native + graphdrivers depended on the file order, meaning + files added with the same layer before the whiteout + file `.wh..wh..opq` were also removed. + + If that file happened to have subdirs, then calling + chtimes on those dirs after unpack would fail the pull. + + Signed-off-by: Tonis Tiigi + +commit 944dc7fa8f2a91fef664e858d53d6bb7d3796266 +Merge: c13ca529d3 93405dd037 +Author: Vincent Demeester +Date: Mon Nov 9 07:58:03 2015 +0100 + + Merge pull request #17808 from bboreham/ipc-errormsg + + Fix typo in container-start error message + +commit c13ca529d3f4ba23f4eb143a29cde01db688afca +Merge: e357be4abe 2ff68910e2 +Author: Vincent Demeester +Date: Mon Nov 9 07:55:44 2015 +0100 + + Merge pull request #17817 from Microsoft/jjh/contained + + Typo s/contained/container + +commit 211e3b0df67d17989c7aff63d1a0098ad61f07a3 +Author: Harald Albers +Date: Sun Nov 8 09:04:35 2015 -0800 + + Fix bash completion on systems where extglob is not set + + Signed-off-by: Harald Albers + +commit 2ff68910e2ac3e16d47de2b95a412e07586a7c60 +Author: John Howard +Date: Sun Nov 8 18:29:34 2015 -0800 + + Typo s/contained/container + + Signed-off-by: John Howard + +commit a2d8c93fc690c2244a3bed32a2bbeb8dae449f90 +Author: Lei Jitang +Date: Mon Nov 9 10:19:53 2015 +0800 + + Prevent connecting to host and prevent disconnecting from host + + Container has private network namespace can not to connect to host + and container with host network can not be disconnected from host. + + Signed-off-by: Lei Jitang + +commit 3c4dab51d33f6e90c45de83c01474bc60aee3766 +Author: Lei Jitang +Date: Mon Nov 9 09:17:32 2015 +0800 + + Remove DOCKER_EXECDRIVER env + + Since --exec-driver flag has been removed, we don't need environment + DOCKER_EXECDRIVER in integration-cli and Makefile any more. + + Signed-off-by: Lei Jitang + +commit d7a41325fab570b223ef55f31a30fd9ecce75bc1 +Author: Brian Goff +Date: Sun Nov 8 15:30:31 2015 -0500 + + Un-export non-externally used functions + + Signed-off-by: Brian Goff + +commit 93405dd037ffb54e7e72d9d36be4a16d1d76fa50 +Author: Bryan Boreham +Date: Sun Nov 8 18:05:34 2015 +0000 + + Fix typo in error message + + Signed-off-by: Bryan Boreham + +commit 8311db14fc2b71b5fd67f23527c3fd09a3addc85 +Author: Harald Albers +Date: Sun Nov 8 09:35:48 2015 -0800 + + Align configuration of bash completion with existing values + + Signed-off-by: Harald Albers + +commit e357be4abe271f338d544e2ce8917ef3892ccfa3 +Merge: 343c8547df 8c08002a10 +Author: Doug Davis +Date: Sun Nov 8 12:33:27 2015 -0500 + + Merge pull request #17801 from cpuguy83/remove_dead_graph_code + + Remove dead graph code + +commit 343c8547df8154a0e6772fb3acc881e03dc86452 +Merge: 70b3ce17b7 38e34cf6da +Author: Antonio Murdaca +Date: Sun Nov 8 15:57:13 2015 +0100 + + Merge pull request #17762 from LK4D4/builder_commit + + Use name instead of container in Commit + +commit 8c08002a10ddd7745ff1df196618c64b8275d102 +Author: Brian Goff +Date: Sun Nov 8 08:57:54 2015 -0500 + + Remove dead graph code + + Signed-off-by: Brian Goff + +commit 70b3ce17b750487ce9b28e093f1f05e7c00efc28 +Merge: e4d8ea0087 6efa10f668 +Author: Brian Goff +Date: Sun Nov 8 07:24:48 2015 -0500 + + Merge pull request #17793 from haoshuwei/modify-improper-comments-on-volume-file + + Modify improper comments in api/server/router/volume/volume.go + +commit e4d8ea0087eaab16eda4bb017ff68c67a61ee538 +Merge: ea59233eb1 2764839ae1 +Author: Antonio Murdaca +Date: Sun Nov 8 12:11:20 2015 +0100 + + Merge pull request #17792 from cpuguy83/graph_use_locker_pkg + + Replace `imageMutex` with `Locker` pkg + +commit ea59233eb1fda209d48e11bab10f4cfd2ffe9914 +Merge: e2a9eede28 9728269424 +Author: Jess Frazelle +Date: Sun Nov 8 02:28:11 2015 -0800 + + Merge pull request #16533 from justsml/LMDEv2 + + LMDE check added to `check_forked()` function - See #16498 + +commit e2a9eede2800144651dd2efe335e4bf386b9fd83 +Merge: 342e6bb99f 7268f767e6 +Author: Vincent Demeester +Date: Sun Nov 8 11:12:09 2015 +0100 + + Merge pull request #17786 from Microsoft/10662-nativetestunit + + Windows: Native make test-unit + +commit 6efa10f6687d78f15ee0a3a192b5b41f215c84a9 +Author: Shuwei Hao +Date: Sun Nov 8 04:05:59 2015 +0000 + + Modify improper comments in api/server/router/volume/volume.go + + Signed-off-by: Shuwei Hao + +commit 342e6bb99fd965dad51a79de3886e89f4ca336e4 +Merge: bf5a6d2a83 910e4ba7ed +Author: Brian Goff +Date: Sat Nov 7 22:11:26 2015 -0500 + + Merge pull request #17581 from Microsoft/10662-factoroutexecuser + + Windows: Factor out user in execdriver\driver + +commit 2764839ae1ccc55e08d6290ecbf7b58d837bbdd2 +Author: Brian Goff +Date: Sat Nov 7 21:23:12 2015 -0500 + + Replace `imageMutex` with `Locker` pkg + + Signed-off-by: Brian Goff + +commit e03fece4a58196e2e3ae1548545b8382b40766ed +Author: Jeffrey Morgan +Date: Sat Nov 7 18:17:42 2015 -0800 + + Properly return rejected promise + + Signed-off-by: Jeffrey Morgan + +commit 93376828af9aa9bc7734fcf0440e2baedf3aca4f +Merge: a5a53bfbdd b92a6fd3ce +Author: Olivier Gambier +Date: Sat Nov 7 14:00:12 2015 -0800 + + Merge pull request #2216 from nathanleclaire/plugin_stdout + + Allow plugins to write to STDOUT + +commit bf5a6d2a83cafd6f56224cdabd8692890472950a +Merge: 98054a8b5c 47da59f7ec +Author: Brian Goff +Date: Sat Nov 7 16:32:07 2015 -0500 + + Merge pull request #17710 from tonistiigi/fix-builder-symlinks + + Fix symlink handling in builder ADD/COPY commands + +commit 98054a8b5cdad069d3b029d6b92788485766a6bd +Merge: fdc8cce070 b10dd17e06 +Author: Antonio Murdaca +Date: Sat Nov 7 21:27:32 2015 +0100 + + Merge pull request #17787 from Microsoft/jjh/execdriverutils + + Don't build utils on Windows + +commit fdc8cce0704c72dc54f95504fe371f5621d89af7 +Merge: efc7b9bbf7 ae818a820f +Author: Sebastiaan van Stijn +Date: Sat Nov 7 19:41:03 2015 +0000 + + Merge pull request #16742 from runcom/10772-docker-stats-all + + Allow docker stats without arguments + +commit b10dd17e066614dce1bcaafebf6e902ce9ea169d +Author: John Howard +Date: Sat Nov 7 08:46:36 2015 -0800 + + Don't build utils on Windows + + Signed-off-by: John Howard + +commit 7268f767e6d7d1067c896a959654cf493bc5b073 +Author: John Howard +Date: Sat Nov 7 08:23:10 2015 -0800 + + Windows: Native make test-unit + + Signed-off-by: John Howard + +commit efc7b9bbf7434aef067ad27cb6ba47f8f14ddf5d +Merge: 10df5647bd d92f7f42b2 +Author: David Calavera +Date: Sat Nov 7 08:22:35 2015 -0800 + + Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild + + Windows: Native build without link errors + +commit ae818a820f49a9bd7ea8b753f124747fc548e501 +Author: Antonio Murdaca +Date: Sat Oct 3 14:53:25 2015 +0200 + + Allow docker stats without arguments + + This patch adds the ability to run `docker stats` w/o arguments and get + statistics for all running containers by default. Also add a new + `--all` flag to list statistics for all containers (like `docker ps`). + New running containers are added to the list as they show up also. + Add integration tests for this new behavior. + Docs updated accordingly. Fix missing stuff in man/commandline + reference for `docker stats`. + + Signed-off-by: Antonio Murdaca + +commit 68092b352412c62283b1a96b296b88fbebf07286 +Author: David Gageot +Date: Thu Nov 5 10:47:57 2015 +0100 + + FIX #2154 query virtualbox serially + + Signed-off-by: David Gageot + Signed-off-by: Nathan LeClaire + +commit a5a53bfbdd9aa1bdaabed2c38c815b50fb1e9e40 +Merge: 3577ccda54 ad757310fb +Author: David Gageot +Date: Sat Nov 7 16:13:11 2015 +0100 + + Merge pull request #2212 from nathanleclaire/b2d_regression + + Fix boot2docker import regression + +commit 10df5647bd5c9e5946412bd58fefb5323f67bc49 +Merge: e71cbc337f 2c8b7c597a +Author: Vincent Batts +Date: Sat Nov 7 09:16:14 2015 -0500 + + Merge pull request #17757 from rhvgoyal/log-blkid-failure + + devmapper: Provide more error information if blkid fails + +commit e71cbc337fd0e2411cab542fde588b91bb960698 +Merge: 98a1141db9 33faea576f +Author: Vincent Demeester +Date: Sat Nov 7 09:21:16 2015 +0100 + + Merge pull request #17600 from Microsoft/jjh/fix-test-unit + + Windows: Fix test-unit for local run + +commit 98a1141db96a3b1125471cb14f132b6341db9172 +Merge: 62619a118f 864e892e2a +Author: Vincent Demeester +Date: Sat Nov 7 09:12:43 2015 +0100 + + Merge pull request #17616 from Microsoft/10662-fix-dockerfile-parser + + Windows: Fix dockerfile\parser TestTestData unit test + +commit 3577ccda54a2df9f7dd4e42168e41f96d04db53a +Merge: b0f687b1b8 a31808d07e +Author: Olivier Gambier +Date: Fri Nov 6 20:22:58 2015 -0800 + + Merge pull request #2215 from nathanleclaire/newline_nit + + Remove newline + +commit 62619a118f02e09b76a236ba07c9ac2fede51173 +Merge: ad55d29c91 ee6c3580c9 +Author: Brian Goff +Date: Fri Nov 6 22:21:10 2015 -0500 + + Merge pull request #17580 from Microsoft/jjh/move-validation-functions + + Move validation functions in runconfig + +commit b92a6fd3ce8519764b93c02225b4672b0c8ce0e5 +Author: Nathan LeClaire +Date: Fri Nov 6 18:21:38 2015 -0800 + + Allow plugins to write to STDOUT + + Signed-off-by: Nathan LeClaire + +commit a31808d07e0683251d265241bfac9095c05cb889 +Author: Nathan LeClaire +Date: Fri Nov 6 18:18:06 2015 -0800 + + Remove newline + + Infof adds it automatically. + + Signed-off-by: Nathan LeClaire + +commit b0f687b1b804cb9748cd1db8bd421eceb421e5c5 +Merge: 6a646aeedf 1f0de8f84e +Author: Nathan LeClaire +Date: Fri Nov 6 18:16:52 2015 -0800 + + Merge pull request #2168 from dgageot/2167-b2d-upgrade + + FIX #2167 b2d download timeout during upgrade + +commit ad5052df234e4f48a93e22694f91fda36bb9e95d +Author: John Howard +Date: Sat Oct 31 18:40:39 2015 -0700 + + Tidy config/hostconfig structures + + Signed-off-by: John Howard + +commit 6a646aeedf6b7cccd79576a565d771c4b77fdd86 +Merge: 9775f9ec04 a6c44f5d4e +Author: Olivier Gambier +Date: Fri Nov 6 17:51:29 2015 -0800 + + Merge pull request #2208 from amir/master + + Use rackspace's specialized client + +commit a020c3eac7d9c487abb3a460e8475e5d254162f9 +Author: Nathan LeClaire +Date: Fri Nov 6 17:49:33 2015 -0800 + + Delete bridge after powering daemon down + + Signed-off-by: Nathan LeClaire + +commit ad757310fb8a8b918a8ea9d3cfb630666d043be6 +Author: Nathan LeClaire +Date: Fri Nov 6 17:10:41 2015 -0800 + + Fix boot2docker import regression + + Signed-off-by: Nathan LeClaire + +commit fddbf73a57dd5cf980d2eb32e025591a8e0e33cc +Author: Ted Reed +Date: Fri Nov 6 17:10:28 2015 -0800 + + De-obfuscate error message + + Previously, this error message would stringify as a pointer address, + which isn't particularly helpful. + + This change breaks out the elements of the challenge object such that + the error is appropriately represented. + + Signed-off-by: Ted Reed + +commit ad55d29c91fc9ce4851cb0d8456bd5517a5eb0cd +Merge: 1ba280a8db be2f53ece8 +Author: Alexander Morozov +Date: Fri Nov 6 16:14:44 2015 -0800 + + Merge pull request #17575 from Microsoft/10662-nativetemplate + + Windows: Fix native exec template + +commit d92f7f42b22e2cfd1ca751824f907357d8143a3d +Author: John Howard +Date: Fri Oct 30 14:26:33 2015 -0700 + + Windows: Native daemon build + + Signed-off-by: John Howard + +commit ee6c3580c95014b404ec9400fdc0575f27e91b80 +Author: John Howard +Date: Sat Oct 31 18:49:14 2015 -0700 + + Move validation functions + + Signed-off-by: John Howard + +commit 33faea576ffbd0e86d1f0f53876620f9e4d9b63f +Author: John Howard +Date: Sun Nov 1 18:21:17 2015 -0800 + + Windows: Fix test-unit for local run + + Signed-off-by: John Howard + +commit 1ba280a8db8456649b661e292d687f1be7ed3468 +Merge: 1228103563 8764967381 +Author: David Calavera +Date: Fri Nov 6 15:13:31 2015 -0800 + + Merge pull request #17576 from Microsoft/10662-graphtest + + Windows: Fix daemon\graphdriver\graphtest + +commit 12281035631c6955a6294737ba1bfc9212516651 +Merge: 2fff6b15fe 1847641b7b +Author: David Calavera +Date: Fri Nov 6 15:09:03 2015 -0800 + + Merge pull request #17511 from Microsoft/jjh/fix-test-paths + + Fix test file paths + +commit 2fff6b15fe863ecd92f5e8ebd9239c3eb2788442 +Merge: f198334400 eb2acb8f0e +Author: David Calavera +Date: Fri Nov 6 15:06:27 2015 -0800 + + Merge pull request #17777 from Microsoft/10662-tp4locahost + + Windows [TP4] localhost mitigation for 2-second perf regression + +commit f1983344001df0f598e75cc68367899191421ea9 +Merge: 754c2e08b7 9c765040a5 +Author: David Calavera +Date: Fri Nov 6 15:02:42 2015 -0800 + + Merge pull request #17738 from Microsoft/jjh/login + + Windows: [TP4] Fix docker login + +commit 754c2e08b774ab7a468e85ef654d34b2c5d925e6 +Merge: 2d87403704 4a3cd88172 +Author: David Calavera +Date: Fri Nov 6 14:59:30 2015 -0800 + + Merge pull request #17751 from guilhem/patch-1 + + Fix missing `-d` flag in docker.fish + +commit 451b79d69102ad95f1b91a52bb4b17c240f41e56 +Author: Lei Jitang +Date: Tue Nov 10 17:47:32 2015 +0800 + + Test to verify --mac-address doesn't get applied to new endpoint + created on network connect. + + Signed-off-by: Lei Jitang + Signed-off-by: Santhosh Manohar + +commit 2d87403704f78ceec9c2eed10bbaa82cffb2bd86 +Merge: 8aa8d51610 e37e329074 +Author: Vincent Demeester +Date: Fri Nov 6 23:51:05 2015 +0100 + + Merge pull request #17767 from LK4D4/nice_logs_message + + Return nice client-side message for docker logs + +commit 1c9a5d7be73e4ec861dd88ffd0b1e43769fd363a +Author: Aditi Rajagopal +Date: Tue Oct 27 15:59:13 2015 -0500 + + Checkers on docker_cli_by_digest_test + + Applying #16756 to integration-cli/docker_cli_by_digest_test.go + + Signed-off-by: Aditi Rajagopal + +commit 93939c3f9fda70930ec2d3af4c6231ccfbc6b8ef +Author: Christopher Jones +Date: Fri Nov 6 16:12:51 2015 -0600 + + Fixed broken links in docker_remote_api + + Signed-off-by: Christopher Jones + +commit dedcf6a6ff6d3aa75efaeb31c197b1c3a19305be +Author: Santhosh Manohar +Date: Fri Nov 6 05:34:49 2015 -0800 + + Allow port mapping only for endpoint created on docker run + + Signed-off-by: Santhosh Manohar + +commit eb2acb8f0e58a0007434341e9e011010594b288e +Author: John Howard +Date: Fri Nov 6 13:52:59 2015 -0800 + + Windows [TP4] localhost mitigation + + Signed-off-by: John Howard + +commit 7a82429b3d0fc7a93f61406117c170aaf9a4f9be +Author: Vincent Demeester +Date: Fri Nov 6 22:49:16 2015 +0100 + + Use checker for docker_cli_run_unix_test.go + + Signed-off-by: Vincent Demeester + +commit 8aa8d51610f509bbdbbe8409523da575d4907d28 +Merge: cc207aa136 6326e6732d +Author: moxiegirl +Date: Fri Nov 6 13:04:43 2015 -0800 + + Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo + + Revise commands in Compose section of multi-host quickstart + +commit 1c383af6ae9551320719d56c2f059cbe5e5f1a35 +Author: Tianon Gravi +Date: Tue Jun 23 14:41:53 2015 -0700 + + Fix Windows support in .vendor-helpers.sh + + Signed-off-by: Andrew "Tianon" Page + +commit e37e329074517f48db8468affc62beb595ab090e +Author: Alexander Morozov +Date: Fri Nov 6 11:40:48 2015 -0800 + + Return nice client-side message for docker logs + + Signed-off-by: Alexander Morozov + +commit e4c5e99103cc0fd854dff5bc37699f7ac4e25b3b +Merge: 7c3ad48210 16fa660e35 +Author: French Ben +Date: Fri Nov 6 11:34:09 2015 -0800 + + Merge pull request #1181 from FrenchBen/1175-pull-count + + Added pull count to images - Fixes 1175 + +commit 47da59f7ec4ee0f49d47a9b32abb137bb30b2c48 +Author: Tonis Tiigi +Date: Wed Nov 4 13:42:08 2015 -0800 + + Fix symlink handling in builder ADD/COPY commands + + Fixes #17290 + + Fixes following issues: + + - Cache checksums turning off while walking a broken symlink. + + - Cache checksums were taken from symlinks while targets were actually copied. + + - Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink. + + + Signed-off-by: Tonis Tiigi + +commit a6c44f5d4e11b5aa65380ba0b0cf1a4af02439a2 +Author: Amir Mohammad Saied +Date: Fri Nov 6 18:16:15 2015 +0000 + + Use rackspace's specialized client + + `openstack.NewDerivedDriver` sets client to `openstack.GenericClient` + therefore `rackspace.Client` is getting ignored. + + `rackspace.Client.Authenticate` has different semantics than + `openstack.GenericClient.Authenticate`, thus almost all operations with + `rackspace` driver fail at the moment. + + Signed-off-by: Amir Mohammad Saied + +commit 38e34cf6da505ad38f0c4cc2b830becdcf67c58a +Author: Alexander Morozov +Date: Fri Nov 6 10:05:00 2015 -0800 + + Use name instead of container in Commit + + It will make daemon interface separation easier later. + + Signed-off-by: Alexander Morozov + +commit 7c2a16234f333102dfc21c0597f58c030b4a222e +Author: Daniel Nephin +Date: Fri Nov 6 12:29:52 2015 -0500 + + Recreate dependents when a dependency is created (not just when it's recreated). + + Signed-off-by: Daniel Nephin + +commit fc14ce23f4423a60c14d61955e4e8acea1a991a4 +Author: Jeffrey Morgan +Date: Fri Nov 6 09:13:55 2015 -0800 + + Bump to 1.9.0b + + Signed-off-by: Jeffrey Morgan + +commit dd885a8d8a5f037cd77b0c6f06ee10860bb25422 +Author: Jeffrey Morgan +Date: Fri Nov 6 09:11:38 2015 -0800 + + Fix initial page positioning + + Signed-off-by: Jeffrey Morgan + +commit cc207aa136fd5e01164d245de94fb900ca7212a2 +Merge: 6ba7d04d16 fe66fdd18c +Author: Alexander Morozov +Date: Fri Nov 6 08:48:12 2015 -0800 + + Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store + + Fix potential races in the volume store + +commit 2c8b7c597ae43e28887a52a9fcb12273fe7d8797 +Author: Vivek Goyal +Date: Fri Nov 6 08:21:20 2015 -0500 + + devmapper: Provide more error information if blkid fails + + Right now if blkid fails we are just logging a debug message and don;t return + the actual error to caller. Caller gets the error message that thin pool + base device UUID verification failed and it might give impression that thin + pool changed. But that's not the case. Thin pool is in such a state that we + could not even query the thin device UUID. Retrun error message appropriately + to make situation more clear. + + Signed-off-by: Vivek Goyal + +commit 6ba7d04d1610472371b4c6a5a572119ffb10f6e9 +Merge: 7dda44004d 313b85fa47 +Author: Doug Davis +Date: Fri Nov 6 07:02:51 2015 -0500 + + Merge pull request #17753 from runcom/fix-typo-tests-reqs + + integration-cli: requirements: fix typo + +commit 7dda44004d9943b669f12f3d79456806110d974b +Merge: f1834153de 00d00b429f +Author: Antonio Murdaca +Date: Fri Nov 6 12:21:33 2015 +0100 + + Merge pull request #17746 from coolljt0725/remove_lxcconfig + + Remove LxcConf in daemon_test.go and fix a typo + +commit 313b85fa47c0080feb0d5887903df9b74f0701bf +Author: Antonio Murdaca +Date: Fri Nov 6 12:15:42 2015 +0100 + + integration-cli: requirements: fix typo + + Signed-off-by: Antonio Murdaca + +commit 4a3cd881721ff7986fcdc3544e67b66a259c2ca6 +Author: Guilhem Lettron +Date: Fri Nov 6 11:44:54 2015 +0100 + + Fix missing `-d` flag in docker.fish + + Signed-off-by: Guilhem Lettron + +commit 4c345be02a646a618ec7bec7a376d0b6821a3e91 +Author: Petri Sirkkala +Date: Fri Nov 6 09:44:21 2015 +0200 + + Fail fast in case we are run without terminal + +commit 9775f9ec04e493584f8e22ef725e1d3490873b16 +Merge: 4ac76457f9 055de5f276 +Author: Olivier Gambier +Date: Thu Nov 5 23:05:13 2015 -0800 + + Merge pull request #2202 from kunalkushwaha/master + + BugFix: IP in template need as per Structure + +commit 4ac76457f9d27628894dbd77a661306de02d02d9 +Merge: 34f818527d ac6a18ba25 +Author: David Gageot +Date: Fri Nov 6 07:59:49 2015 +0100 + + Merge pull request #2199 from nathanleclaire/none_running + + Change default state of none driver to state.Running + +commit 055de5f27647e3a23b8f36a2c541a59f139b26a1 +Author: Kunal Kushwaha +Date: Fri Nov 6 15:41:42 2015 +0900 + + BugFix: IP in template need as per Struct + + Lint changes in SwarmCommandOptions chnaged `Ip` to `IP`. + It required change in template code also. + + Signed-off-by: Kunal Kushwaha + +commit 1a8cd193f908609df92b074042542b1bc61318bc +Author: Gou Rao +Date: Thu Nov 5 21:16:26 2015 -0800 + + Update plugins.md + + Signed-off-by: Gou Rao + +commit f1834153de196361e14c86b12c98d6b118cd4f56 +Merge: 5e2f31e992 5f4cb33a51 +Author: Brian Goff +Date: Thu Nov 5 21:58:03 2015 -0500 + + Merge pull request #17383 from Microsoft/10662-volumeerrors + + Fix volume error messages + +commit ac6a18ba251458bc2fa174d3f92048a5e8539c69 +Author: Nathan LeClaire +Date: Thu Nov 5 18:17:12 2015 -0800 + + Change none default state to Running + + Signed-off-by: Nathan LeClaire + +commit 00d00b429ff6f5cecf6789d6b6773b8e979ad0ae +Author: Lei Jitang +Date: Fri Nov 6 09:58:06 2015 +0800 + + Remove LxcConf in daemon_test.go and fix a typo + + Signed-off-by: Lei Jitang + +commit 5e2f31e99220536bc0d845bfbfedde59a007a276 +Merge: 7a2669f596 8e2b20580b +Author: Sebastiaan van Stijn +Date: Fri Nov 6 02:04:05 2015 +0100 + + Merge pull request #17696 from thaJeztah/update-ubuntu-install + + Docs: add "Linux kernel extra" to manual install + +commit d5dca184b54b60359c097729ee62b370bccebde5 +Author: Jeffrey Morgan +Date: Thu Nov 5 16:55:45 2015 -0800 + + Fix metrics bugs on Windows + + Signed-off-by: Jeffrey Morgan + +commit 5d92da18054836c75f6321e3b04f51f1fe92524c +Merge: 0cd99bcdd8 1711a8f437 +Author: moxiegirl +Date: Thu Nov 5 16:23:59 2015 -0800 + + Merge pull request #23 from vdemeester/commit-sign + + Added additional guidance for signing off git commits when contributing. + +commit 7a2669f59683c9d286494fa1360c792cc501e98f +Merge: a1ecd8e68c e41de3e631 +Author: Sebastiaan van Stijn +Date: Fri Nov 6 01:19:58 2015 +0100 + + Merge pull request #17610 from thaJeztah/add-env-example + + Add examples for ENV vars in API + +commit a1ecd8e68cb373af2b02d75a222ac9ce07517665 +Merge: 2519f46550 f48f850a24 +Author: Sven Dowideit +Date: Fri Nov 6 09:57:07 2015 +1000 + + Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link + + Fixed link to contribution page in docs/README.md. + +commit 34f818527debef02f5a3102f198e44fb911433ae +Merge: 436e85c150 d2ada6488c +Author: Nathan LeClaire +Date: Thu Nov 5 15:25:10 2015 -0800 + + Merge pull request #2181 from dmp42/14-lint-harder + + Lint, second pass + +commit 2519f465501657c24ecd13b8e53964b6c2f1a78d +Merge: 98ec6bc14c 157b66ad39 +Author: Solomon Hykes +Date: Thu Nov 5 15:22:37 2015 -0800 + + Merge pull request #17700 from calavera/remove_lxc + + Remove LXC support. + +commit ec22d98377eb5c12ba3bf5fac0eb4bff379e3242 +Author: Daniel Nephin +Date: Wed Nov 4 16:46:19 2015 -0500 + + Use VolumeSpec instead of re-parsing the volume string. + + Signed-off-by: Daniel Nephin + +commit 0e19c92e82c75f821c231367b5cda88eefdf1427 +Author: Daniel Nephin +Date: Wed Nov 4 16:37:44 2015 -0500 + + Make working_dir consistent in the config package. + + - make it a positional arg, since it's required + - make it the first argument for all functions that require it + - remove an unnecessary one-line function that was only called in one place + + Signed-off-by: Daniel Nephin + +commit 98ec6bc14c165a06cf510ca5714ce4e831d405e6 +Merge: b232362310 7b102dc114 +Author: David Calavera +Date: Thu Nov 5 15:11:02 2015 -0800 + + Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic + + Fix panic in parsing /etc/os-release + +commit b232362310c24a74c01741bb43ec3052ffe49f83 +Merge: 6417c53c5a bb0e7eb196 +Author: David Calavera +Date: Thu Nov 5 15:00:48 2015 -0800 + + Merge pull request #17735 from LK4D4/errcode_resize + + Move errcode handling for resize upper + +commit 3456002aef26fd025819349f29e46d0062f9040a +Author: Daniel Nephin +Date: Thu Nov 5 17:50:32 2015 -0500 + + Don't set the hostname to the service name with networking. + + Signed-off-by: Daniel Nephin + +commit 16fa660e35453afc147aed501bcc4048083764d6 +Author: French Ben +Date: Wed Nov 4 17:40:11 2015 -0800 + + Added pull count to images - Fixes #1175 + + Signed-off-by: French Ben + +commit 9c765040a5638429384b56a1b77139c6d4049c75 +Author: John Howard +Date: Thu Nov 5 14:19:48 2015 -0800 + + Windows: Fix docker login + + Signed-off-by: John Howard + +commit 157b66ad390902ef6f5b51b3f76d5177eacac81b +Author: David Calavera +Date: Wed Nov 4 19:40:58 2015 -0500 + + Remove exec-driver global daemon option. + + Each platform has only a driver now. + + Signed-off-by: David Calavera + +commit 3b5fac462d21ca164b3778647420016315289034 +Author: David Calavera +Date: Wed Nov 4 14:39:12 2015 -0500 + + Remove LXC support. + + The LXC driver was deprecated in Docker 1.8. + Following the deprecation rules, we can remove a deprecated feature + after two major releases. LXC won't be supported anymore starting on Docker 1.10. + + Signed-off-by: David Calavera + +commit 6417c53c5ac4a066a0743c595e53c599a21c1e7e +Merge: 31fa27d47e 6f83dd22a3 +Author: Tianon Gravi +Date: Thu Nov 5 13:51:07 2015 -0800 + + Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem + + Update upstart init script to start on filesystem (not only on local ones). + +commit 31fa27d47ead9d3be08338a748ee9cc21c085183 +Merge: b52bedbd48 d8aaf96216 +Author: Jess Frazelle +Date: Thu Nov 5 13:46:27 2015 -0800 + + Merge pull request #17496 from chasebolt/centos-rpm-dep + + setting device-mapper-libs version dependency for centos 7 rpm + +commit 436e85c15023b3116e8cd82ee91b8ef32bfdcf93 +Merge: 24da8ad7a8 4b6455d395 +Author: Olivier Gambier +Date: Thu Nov 5 13:43:02 2015 -0800 + + Merge pull request #2191 from jviide/patch-1 + + Fix the local development environment instructions + +commit bb0e7eb196c65972ea66154461b7e654d776f92a +Author: Alexander Morozov +Date: Thu Nov 5 13:40:42 2015 -0800 + + Move errcode handling for resize upper + + It'll allow to separate daemon layer more cleanly later. + + Signed-off-by: Alexander Morozov + +commit d2ada6488cf12462b4b2d94f3fec23afa8f5f29e +Author: Olivier Gambier +Date: Wed Nov 4 17:28:31 2015 -0800 + + Lint + + Signed-off-by: Olivier Gambier + +commit b52bedbd480b5029656733a449bd3596b8561e5a +Merge: 8de3d630ad 77826333fe +Author: David Calavera +Date: Thu Nov 5 13:30:57 2015 -0800 + + Merge pull request #17726 from runcom/fix-errors-format + + Fix errors format + +commit 8de3d630add946e97d2a1e4895de1b7691b0b842 +Merge: c7b65288e4 8d74591407 +Author: Brian Goff +Date: Thu Nov 5 16:30:19 2015 -0500 + + Merge pull request #17678 from asbjornenge/tm_syntax_updates + + Added ARG instruction and aligned with src repo + +commit c7b65288e458f51ea2d5adcb8692c279726a8292 +Merge: 9465d6ee6a 0ebdac8bee +Author: David Calavera +Date: Thu Nov 5 13:21:52 2015 -0800 + + Merge pull request #17685 from WeiZhang555/cluster-parser + + Fix `--cluster-store` option parser + +commit 4b6455d39533c8b8610144c1aac9038ea92a336f +Author: jviide +Date: Thu Nov 5 23:21:45 2015 +0200 + + Fix the local development environment instructions + + Omit the docker-machine/ path prefix from the last cd command. Having followed the instructions the user should already be in the docker-machine directory. + + Signed-off-by: Joachim Viide + +commit 9465d6ee6a669e4978ce746f16280910db7b1359 +Merge: 3c6962f22d 9c5814171c +Author: Brian Goff +Date: Thu Nov 5 15:55:47 2015 -0500 + + Merge pull request #17534 from Microsoft/10662-filterhyperv + + Windows: Add isolation to ps filter + +commit d32bb8efeea1e265d54f7cd7415db202d854f1f2 +Author: Daniel Nephin +Date: Thu Nov 5 15:33:42 2015 -0500 + + Fix #1549 - flush after each line of logs. + + Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function. + + Signed-off-by: Daniel Nephin + +commit 37ba67bf636b34dc5c0c0265d62a089d0492088f +Author: Stefan J. Wernli +Date: Thu Nov 5 11:47:18 2015 -0800 + + Fixing last access time on Windows to unblock python. + + Signed-off-by: Stefan J. Wernli + +commit 6f83dd22a36b57fdc75bd2b6cbce7572b0695f99 +Author: Julien Pervillé +Date: Thu Nov 5 20:35:45 2015 +0100 + + Update upstart init script to start on filesystem (not only on local ones). + + Signed-off-by: Julien Pervillé + +commit 3c6962f22d60e1afd43ebbf87ff5586f16131011 +Merge: 5353ccb05c 3e9fc478ae +Author: Jess Frazelle +Date: Thu Nov 5 11:16:40 2015 -0800 + + Merge pull request #17677 from fboudra/master + + Remove yum cache to reduce image size + +commit 7b102dc11486539bc661a4d858e2de3ce3f46493 +Author: Vincent Demeester +Date: Thu Oct 29 09:16:21 2015 +0100 + + Fix panic in parsing /etc/os-release + + Signed-off-by: Vincent Demeester + +commit b09a452c1f89e84b513ed7eaf567437291e0e50d +Author: Vincent Demeester +Date: Mon Oct 5 00:17:44 2015 +0200 + + Vendor mattn/go-shellwords + + Signed-off-by: Vincent Demeester + +commit 5353ccb05c440f2961438f13d5812a844a501c28 +Merge: 336dea3e50 02411987ff +Author: Jess Frazelle +Date: Thu Nov 5 10:52:43 2015 -0800 + + Merge pull request #17273 from stefanberger/apparmor_policy_1.9 + + More Rules for AppArmor + +commit 24da8ad7a83ccc9010b6f56854180fb5c9892ef5 +Merge: d07e4e259a 11922080a1 +Author: Olivier Gambier +Date: Thu Nov 5 10:36:32 2015 -0800 + + Merge pull request #2185 from dgageot/2171-fix-flags + + FIX #2171 issue with amazonec2-private-address-only + +commit 9c5814171ce7ab3af48867da36f4d374f804c4a6 +Author: John Howard +Date: Mon Oct 19 09:33:43 2015 -0700 + + Windows: Add isolation to ps filter + + Signed-off-by: John Howard + +commit 7c3ad48210ffe4cffb8a837eefda3cf8f961577a +Merge: ea0f607965 736673776b +Author: French Ben +Date: Thu Nov 5 09:58:11 2015 -0800 + + Merge pull request #1180 from FrenchBen/1158-tags + + Added larger set for org and user repo - fixes 1158 + +commit 11922080a1757a3c7096ffca625f29c2b685ab60 +Author: David Gageot +Date: Thu Nov 5 12:57:43 2015 +0100 + + FIX #2171 Fix faulty flag and add tests for SetConfigFromFlags + + Signed-off-by: David Gageot + +commit 26c7dd37126cca09b149d3de7f134d5c8a766fdd +Author: Daniel Nephin +Date: Wed Nov 4 15:54:59 2015 -0500 + + Handle non-utf8 unicode without raising an error. + + Signed-off-by: Daniel Nephin + +commit d07e4e259af379b6f604505a2a9b6bc8ee506581 +Merge: 29a0ef6853 d07d443466 +Author: David Gageot +Date: Thu Nov 5 18:29:56 2015 +0100 + + Merge pull request #2184 from legal90/fix-integration-tests + + test/integration: Remove machine forcibly, without stopping + +commit 77826333fe12fb444ac536e115f23f8e00db24a8 +Author: Antonio Murdaca +Date: Thu Nov 5 18:01:18 2015 +0100 + + Fix errors format + + Signed-off-by: Antonio Murdaca + +commit 336dea3e50144c5410ff693eb72bdc04ef40e914 +Merge: c05e1b7d57 3f331eaa40 +Author: Sebastiaan van Stijn +Date: Thu Nov 5 17:40:45 2015 +0100 + + Merge pull request #17725 from polonskiy/patch-1 + + fix typo + +commit 3f331eaa4092ff3a612a275351b82b44c778d9fa +Author: Anton Polonskiy +Date: Thu Nov 5 18:30:47 2015 +0200 + + fix typo + + Signed-off-by: Anton Polonskiy + +commit 02411987ffc696e867ac202e79c82ac97b3ae69a +Author: Stefan Berger +Date: Sat Oct 10 20:06:16 2015 -0400 + + More Rules for AppArmor + + This patch addresses the following AppArmor complains: + + type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount" + info="failed srcname match" error=-13 profile="/usr/bin/docker" + name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate" + + type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED" + operation="file_lock" profile="/usr/bin/docker" + name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker" + requested_mask="k" denied_mask="k" fsuid=0 ouid=0 + + Signed-off-by: Stefan Berger + +commit 67dc90ec0e71282bbf3ec27f30d2b1232406b76d +Merge: 97dee9d54a 8ff960afd1 +Author: Aanand Prasad +Date: Thu Nov 5 15:52:56 2015 +0000 + + Merge pull request #2314 from dnephin/fix_up_require_build_error + + Fix `up` "requires build" error + +commit 97dee9d54a8b4e499ad1a91cc97e1a221445b722 +Merge: 50f06c6ba2 0227b3adbd +Author: Aanand Prasad +Date: Thu Nov 5 15:52:41 2015 +0000 + + Merge pull request #2310 from dnephin/update_release_notes + + Update release notes + +commit 8ff960afd13b71bbe84fb7bef2120cc8f958de93 +Author: Daniel Nephin +Date: Tue Nov 3 20:00:54 2015 -0500 + + Fix service recreate when image changes to build. + + Signed-off-by: Daniel Nephin + +commit ce322047a052d96cf9a6f1dd65df66385b215e50 +Author: Daniel Nephin +Date: Wed Oct 28 13:16:19 2015 -0400 + + Move config hash tests to service_test.py + + Signed-off-by: Daniel Nephin + +commit 0227b3adbdec8595d013ce70364dff08a691ef4e +Author: Daniel Nephin +Date: Thu Nov 5 10:26:54 2015 -0500 + + Upgrade pyyaml to 3.11 + + Signed-off-by: Daniel Nephin + +commit d18ad4c81221e13346b8840a35a3defb71d86378 +Author: Daniel Nephin +Date: Tue Nov 3 16:58:30 2015 -0500 + + Fix rebase-bump-commit script when used with a final release. + + Previously it would find commits for RC releases, which broke the rebase. + + Signed-off-by: Daniel Nephin + +commit 6b002fb9225907f1c9b48523879b1263b607bdeb +Author: Daniel Nephin +Date: Tue Nov 3 11:30:34 2015 -0500 + + Cherry-pick release notes froim 1.5.0 + + And bump version to 1.6.0dev + + Signed-off-by: Daniel Nephin + +commit c05e1b7d57c31e2490676370428544a06e2ba636 +Merge: 22ef779db9 75602d4930 +Author: Vincent Demeester +Date: Thu Nov 5 16:22:32 2015 +0100 + + Merge pull request #17722 from jeroenj/patch-1 + + Fixes typo in docs/userguide/dockervolumes.md + +commit f48f850a241fbfbf726b22756227f3fbb0db01a7 +Author: Christopher Jones +Date: Thu Nov 5 09:20:20 2015 -0600 + + Updated link to https. + + Signed-off-by: Christopher Jones + +commit 75602d4930e7b7fa7c958329b544401756991d88 +Author: Jeroen Jacobs +Date: Thu Nov 5 16:03:35 2015 +0100 + + Fixes typo in docs/userguide/dockervolumes.md + + Signed-off-by: Jeroen Jacobs + +commit c136a33c5bf233f4ce108a8a8481d78aeaec93cc +Author: Brian Goff +Date: Thu Oct 8 16:55:28 2015 -0400 + + Fallback to file polling for jsonlog reader on err + + Signed-off-by: Brian Goff + +commit 22ef779db97362bbb8122933e32d87d92c7a0489 +Merge: bb9eca9036 8845259f49 +Author: Antonio Murdaca +Date: Thu Nov 5 15:15:52 2015 +0100 + + Merge pull request #17207 from azurezk/assert_docker_cli_help_test + + update docker_cli_help_test.go + +commit bb9eca90363eec052e101bb8ef3351d0218dccf9 +Merge: 71db33738d 9112d90b27 +Author: Brian Goff +Date: Thu Nov 5 09:15:28 2015 -0500 + + Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create + + Optimize Create Container to skip extra mount on Windows. + +commit 71db33738d681ab7855998e414d426fcc26f16ea +Merge: f267e4be54 96b45e9216 +Author: Antonio Murdaca +Date: Thu Nov 5 13:05:28 2015 +0100 + + Merge pull request #17574 from Microsoft/10662-devicetool + + Windows: Fix docker device tool + +commit fbed26297dca2adc59d891c661548302ec848984 +Author: Zhang Wei +Date: Tue Nov 3 00:29:58 2015 +0800 + + Include container names in `network inspect` + + This commit makes `docker network inspect` print container names as + service discovery is based on container name. + + Signed-off-by: Zhang Wei + +commit f267e4be54170855693d240e605ff9a4ee8e891d +Merge: 5baf56ca00 3f27479435 +Author: Vincent Demeester +Date: Thu Nov 5 12:11:57 2015 +0100 + + Merge pull request #17697 from jfrazelle/test-old-apt-repo + + add script to test the old apt-repo + +commit 5baf56ca008fb221c45714a21cc3eca6db66c475 +Merge: 1eafc7264c 725b7c9d43 +Author: Vincent Demeester +Date: Thu Nov 5 11:35:33 2015 +0100 + + Merge pull request #17717 from WeiZhang555/docsAndTypo + + Fix docs typo and wrong word + +commit d07d443466e2d4a00cbffa438335fc647f2e2d74 +Author: Mikhail Zholobov +Date: Thu Nov 5 12:27:54 2015 +0200 + + test/integration: Remove machine forcibly, without stopping + + Unlikely "rm -f", commands "stop" and "rm" will be failed if machine doesn't exist. + Forced removing guarantees that integration tests won't fail on the cleanup step. + + Signed-off-by: Mikhail Zholobov + +commit 8d7459140701006fb8e3a0550872ce55c43bcec0 +Author: Asbjørn Enge +Date: Wed Nov 4 10:03:39 2015 +0100 + + Added ARG instruction and aligned with src repo + + Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) + +commit 1f0de8f84e444ffce7845b2596515496915aff67 +Author: David Gageot +Date: Tue Nov 3 13:28:47 2015 +0100 + + FIX #2167 b2d download timeout during upgrade + + + Download boot2docker before we stop the machine. + + Use default(longer) timeout + + Show b2d download progress + + Fix typo + + Add log before stop + + Signed-off-by: David Gageot + +commit 9ddb3c474c25b313d0097406b092c98b1aea72fc +Merge: 229b742570 95c95812a6 +Author: Victor Vieux +Date: Thu Nov 5 00:28:26 2015 -0800 + + Merge pull request #1381 from auzias/master + + Fixed typos + +commit 95c95812a6c1ed798a3de453d7e5bfc740d230cc +Author: auzias +Date: Thu Nov 5 08:35:04 2015 +0100 + + Typos correction + + Signed-off-by: auzias + +commit 1eafc7264cd4e2d4acd9944683326234f06ec9ef +Merge: f18c5e9714 72aeb63a47 +Author: Alexander Morozov +Date: Wed Nov 4 22:43:02 2015 -0800 + + Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error + + Reutrn immediately when inspect connection failed + +commit 725b7c9d4332aee7bac0fa1bedacbabc6d2a2426 +Author: Zhang Wei +Date: Thu Nov 5 14:17:37 2015 +0800 + + Fix docs typo and wrong word + + Signed-off-by: Zhang Wei + +commit 29a0ef685356fd9ff90e842afdd66af195596e63 +Merge: ede8f2a32f 99d6fe134d +Author: David Gageot +Date: Thu Nov 5 06:20:36 2015 +0100 + + Merge pull request #2115 from dgageot/more-cleanup-for-more-tests + + Add CommandLine interface for commands + +commit 99d6fe134d9f82527502153a529b1c239fe34f6b +Author: David Gageot +Date: Thu Oct 29 11:50:51 2015 +0100 + + Introduce CommandLine interface + + Signed-off-by: David Gageot + +commit 0ebdac8bee0c587a8a10e3bcdec46e9d8360e2fb +Author: Zhang Wei +Date: Wed Nov 4 22:27:23 2015 +0800 + + Fix `--cluster-store` option parser + + `--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes + sure that KV-URL contains no "://" + + Signed-off-by: Zhang Wei + +commit ede8f2a32f03f4aa4e9b6cfc427c85a6ba7dfe13 +Merge: 6be950f1c0 8d2ae162b7 +Author: Nathan LeClaire +Date: Wed Nov 4 18:50:41 2015 -0800 + + Merge pull request #2166 from kunalkushwaha/swarm-proxy + + Environment variables passed to provision machine, will be passed to … + +commit 0f3a194cf28ed94ec0ac31b36d8ead408a3a5012 +Merge: 0b3377a86c f8a665cd82 +Author: Ying Li +Date: Wed Nov 4 18:33:23 2015 -0800 + + Merge pull request #265 from HuKeping/master + + Replace tab with space on script + +commit ea0f607965e5911c69d8b1d2dc5468d9a07afb03 +Merge: e533ed35d2 ee819f8725 +Author: Jeffrey Morgan +Date: Wed Nov 4 18:31:40 2015 -0800 + + Merge pull request #1179 from kitematic/unified-build + + Ability to build windows binaries on Mac + +commit 8d2ae162b7f8c9afaa8aa22a671fd2604242ac67 +Author: Kunal Kushwaha +Date: Wed Nov 4 17:08:44 2015 +0900 + + Environment variables passed to provision machine, will be passed to containers for swarm also. + + Signed-off-by: Kunal Kushwaha + +commit 72aeb63a47bcdffe15380302ff09ab3f0447e476 +Author: Brian Goff +Date: Wed Nov 4 21:17:05 2015 -0500 + + Reutrn immediately when inspect connection failed + + Signed-off-by: Brian Goff + +commit 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5 +Author: Nathan LeClaire +Date: Wed Nov 4 17:44:01 2015 -0800 + + Revise commands in Compose section of multi-host quickstart + + Signed-off-by: Nathan LeClaire + +commit 6be950f1c0541ae269731aca02972acb2d537645 +Merge: 828cb12e2c ae2d344c2b +Author: Nathan LeClaire +Date: Wed Nov 4 16:41:40 2015 -0800 + + Merge pull request #2117 from dmp42/08-carry-on-2033 + + Carry on commits from #2033 + +commit f18c5e9714face6eaa4ff63a32ecd6f01444ef4b +Merge: 1ef3b1f857 54d22cbd9a +Author: Brian Goff +Date: Wed Nov 4 19:23:11 2015 -0500 + + Merge pull request #17703 from aboch/np + + Verify Endpoint.Info() before accessing it + +commit d0a4b216a68d0ea27b4604330ed779fa5ed96c35 +Author: Jessica Frazelle +Date: Sun Jul 19 12:43:28 2015 -0700 + + update release script and release process + + Signed-off-by: Jessica Frazelle + Signed-off-by: Jessica Frazelle + +commit 1ef3b1f857859d8407155f88c86b9e2aee20955d +Merge: 236913f4e8 f67da614e9 +Author: Sebastiaan van Stijn +Date: Thu Nov 5 01:16:09 2015 +0100 + + Merge pull request #17694 from hrldcpr/patch-1 + + fix documentation inconsistency for volume create + +commit 3f2747943583c06dc3ee1744a5ffa4ce7c099c7c +Author: Jessica Frazelle +Date: Wed Nov 4 16:01:19 2015 -0800 + + add script to test the old apt-repo + + Signed-off-by: Jessica Frazelle + +commit 236913f4e825d747b091e8eda07b48f8d62a41a9 +Merge: 9c1006c8bf 41de7a18d8 +Author: Sebastiaan van Stijn +Date: Thu Nov 5 00:50:08 2015 +0100 + + Merge pull request #14012 from sallyom/exitCodes + + Change 'docker run' exit codes to distinguish docker/contained errors + +commit 736673776b45003d269973579b406d0b3198c965 +Author: French Ben +Date: Wed Nov 4 15:43:48 2015 -0800 + + Added larger set for org and user repo - fixes 1158 + + Signed-off-by: French Ben + +commit 9c1006c8bf2efc71659ec3b5412ce987661decca +Merge: fa0ee3fb89 d4a8d09d1a +Author: Jess Frazelle +Date: Wed Nov 4 15:39:19 2015 -0800 + + Merge pull request #17673 from LK4D4/elim_str_comparison + + Do not rely on string comparison in truncindex + +commit 828cb12e2c647a6076b42aceb4c1f53c79a1db65 +Merge: 47aa16cff4 19fc49b58a +Author: Nathan LeClaire +Date: Wed Nov 4 15:29:52 2015 -0800 + + Merge pull request #2177 from dmp42/13-lint-attempt-again + + Lint, step 1 + +commit 1711a8f43710fa6ee13e39b6131052747e9f172d +Author: Vincent Demeester +Date: Tue Nov 3 22:29:11 2015 +0100 + + Added additional guidance for signing off git commits when contributing. + + From docker/docker#17565, @pmalmgren (Peter Malmgren ) + + Signed-off-by: Vincent Demeester + +commit ee819f8725fcee429d50cd3ce6a417e5ab1ab489 +Author: Jeffrey Morgan +Date: Wed Nov 4 14:46:33 2015 -0800 + + Ability to build windows binaries on Mac + + Signed-off-by: Jeffrey Morgan + +commit 9112d90b27c3bf13b8d1c41eb288c63868c53747 +Author: Stefan J. Wernli +Date: Tue Nov 3 16:57:16 2015 -0800 + + Optimize Create Container to skip extra mount on Windows. + + Signed-off-by: Stefan J. Wernli + +commit 47aa16cff46e624d938a8c4a45933bc973e6b91c +Merge: ab4b09bfb2 66ca5b07a2 +Author: Nathan LeClaire +Date: Wed Nov 4 14:40:54 2015 -0800 + + Merge pull request #2135 from janeczku/plugin-versioning + + Fail gracefully when plugin binary implements outdated API + +commit fa0ee3fb89289049a506376fb1356797e07d0932 +Merge: b2f14f9bec 40dc0c4861 +Author: David Calavera +Date: Wed Nov 4 14:26:47 2015 -0800 + + Merge pull request #17705 from alexwlchan/patch-1 + + Fix typo in dockervolumes.md + +commit 50f06c6ba223fee1a8673ac7d5f15b1b123d131b +Merge: 6a8806fe8d 385b4280a1 +Author: Daniel Nephin +Date: Wed Nov 4 17:25:17 2015 -0500 + + Merge pull request #2325 from dnephin/fix_jenkins_build + + Fix jenkins CI + +commit 19fc49b58acb3abeb53d36218637f829100be602 +Author: Olivier Gambier +Date: Wed Nov 4 14:11:36 2015 -0800 + + Lint, step 1 + + The easy stuff + + Signed-off-by: Olivier Gambier + +commit 40dc0c4861df0e087ffe43c416176a58f574e641 +Author: Alex Chan +Date: Wed Nov 4 22:13:35 2015 +0000 + + Fix typo in dockervolumes.md + + Signed-off-by: Alex Chan + +commit 362ae9cc41afc88ef80b2ca2fa33cc5e8bd38106 +Merge: 7ed02ea1db dd32fbe615 +Author: Richard Scothern +Date: Wed Nov 4 14:09:12 2015 -0800 + + Merge pull request #1156 from RichardScothern/manifest-verification + + Manifest Verification + +commit 7ed02ea1db366442d5f77d80cd2c10a9cd8de06c +Merge: 603ffd58e1 5882b97ef2 +Author: Richard Scothern +Date: Wed Nov 4 14:08:46 2015 -0800 + + Merge pull request #1161 from stevvooe/add-status-badges + + Add nice status badges to README + +commit fe66fdd18c0307cc02e6aeff8625c179452b8436 +Author: Brian Goff +Date: Mon Oct 19 16:43:56 2015 -0400 + + Fix potential races in the volume store + + Uses finer grained locking so that each volume name gets its own lock + rather than only being protected by the global lock, which itself needs + to be unlocked during cetain operations (`create` especially`) + + Signed-off-by: Brian Goff + +commit b2f14f9bec0c4c8f14e9ac5446fbb49d88310bae +Merge: 92132a7841 79cffa5ce4 +Author: Alexander Morozov +Date: Wed Nov 4 13:37:45 2015 -0800 + + Merge pull request #17639 from mrjana/restart + + Fix a corner case issue when daemon panics + +commit 54d22cbd9a04a965c935a693bf403d2c87109b5a +Author: Alessandro Boch +Date: Tue Nov 3 14:15:34 2015 -0800 + + Verify Endpoint.Info() before accessing it + + - During concurrent operations in multihost environment, + it is possible that the implementer of `EndpointInfo` + is nil. It simply means the endpoint is no longer + available in the datastore. + + Signed-off-by: Alessandro Boch + +commit 92132a7841883d912ab2003dc2aa956ceaa05bdb +Merge: 37849ce1fb 90e16ab8f9 +Author: Sebastiaan van Stijn +Date: Wed Nov 4 22:05:27 2015 +0100 + + Merge pull request #17698 from moxiegirl/nigel-fixes + + Fixing BTRFS > Btrfs + +commit 5882b97ef2179f405bd5a3fa07c1fa1340d5927b +Author: Stephen J Day +Date: Wed Nov 4 12:48:18 2015 -0800 + + Add nice status badges to README + + Signed-off-by: Stephen J Day + +commit 07d75d534e108b26825bc80afd85af5904807fe5 +Author: Jeffrey Morgan +Date: Wed Nov 4 12:35:34 2015 -0800 + + Fix bug where upgrade would fail if fish is the default shell + + Signed-off-by: Jeffrey Morgan + +commit 385b4280a1f6d2b36dccb43a0f99858693ff673f +Author: Daniel Nephin +Date: Wed Nov 4 15:33:37 2015 -0500 + + Fix jenkins CI by using an older docker version to match the host. + + Signed-off-by: Daniel Nephin + +commit 41de7a18d8f231568977e66bb58a6a02545d49d9 +Author: Sally O'Malley +Date: Wed Jul 29 08:21:16 2015 -0400 + + Change 'docker run' exit codes to distinguish docker/contained errors + + The purpose of this PR is for users to distinguish Docker errors from + contained command errors. + This PR modifies 'docker run' exit codes to follow the chroot standard + for exit codes. + Exit status: + 125 if 'docker run' itself fails + 126 if contained command cannot be invoked + 127 if contained command cannot be found + the exit status otherwise + + Signed-off-by: Sally O'Malley + +commit 37849ce1fbba7dd32110d78c0d7db0074afd67e9 +Merge: 0cdc96cd8f 9f19cbc2c4 +Author: David Calavera +Date: Wed Nov 4 12:08:11 2015 -0800 + + Merge pull request #17184 from cpuguy83/fix_external_volume_tests + + Fix bug in volume driver test implementation + +commit 0cdc96cd8f04c3e34eae0712c81e4d4129ae8029 +Merge: d718388df7 eaa4047792 +Author: David Calavera +Date: Wed Nov 4 11:45:44 2015 -0800 + + Merge pull request #17695 from runcom/restore-images-log + + graph: do not error out if images can't be restored + +commit d718388df71b3b56d71564f706ffde7c625dde02 +Merge: 55711a22e0 81b3d2eec9 +Author: Vincent Demeester +Date: Wed Nov 4 20:35:17 2015 +0100 + + Merge pull request #17578 from brahmaroutu/fix_unit_tests_gccgo + + after the changes to unit test framework, fixing gccgo to run unit tests + +commit d4a8d09d1a7ced5c711fcc7a939986d22a0554eb +Author: Alexander Morozov +Date: Tue Nov 3 17:19:18 2015 -0800 + + Do not rely on string comparison in truncindex + + Signed-off-by: Alexander Morozov + +commit 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32 +Author: Mary Anthony +Date: Wed Nov 4 11:23:16 2015 -0800 + + Fixing BTRFS > Btrfs + + Signed-off-by: Mary Anthony + +commit 8e2b20580b82c3d63d4dbbff1d6bee5640a46a8b +Author: Sebastiaan van Stijn +Date: Wed Nov 4 19:49:47 2015 +0100 + + Docs: add "Linux kernel extra" to manual install + + Signed-off-by: Sebastiaan van Stijn + +commit eaa4047792d2495276383332c4ad4c573e5e8275 +Author: Antonio Murdaca +Date: Wed Nov 4 19:20:12 2015 +0100 + + graph: do not error out if images can't be restored + + Signed-off-by: Antonio Murdaca + +commit f67da614e9963e626d4ec12fd624249947b97d6a +Author: harold cooper +Date: Wed Nov 4 13:18:42 2015 -0500 + + fix documentation inconsistency for volume create + + the example command uses `/world` but the description refers to `/src` + + Signed-off-by: Harold Cooper + +commit 55711a22e0fdd339ef5196d9ecf282b93cd2b8bb +Merge: 7e5f904830 63efc12070 +Author: Jess Frazelle +Date: Wed Nov 4 10:21:58 2015 -0800 + + Merge pull request #17662 from calavera/decouple_container_and_daemon + + Remove daemon field from within container. + +commit 63efc12070b2aff0f062ad62cc577cf2ffb66ef6 +Author: David Calavera +Date: Tue Nov 3 14:25:22 2015 -0500 + + Remove further references to the daemon within containers. + + Signed-off-by: David Calavera + +commit 444c82d19d3c8ee51f313c879d434ac5b8be6a6f +Author: David Calavera +Date: Tue Nov 3 14:07:47 2015 -0500 + + Remove daemon field from container. + + Signed-off-by: David Calavera + +commit 5dc3a9a6da6ce6e3eee791251293cf045a4754f9 +Author: David Calavera +Date: Tue Nov 3 14:06:16 2015 -0500 + + Decouple daemon and container from the stats collector. + + Signed-off-by: David Calavera + +commit c412300dd9f85301e2922ccc7c954eaa37fadcab +Author: David Calavera +Date: Tue Nov 3 13:45:12 2015 -0500 + + Decouple daemon and container to configure logging drivers. + + Signed-off-by: David Calavera + +commit 669949d6b436d2fc182b427a5e2b38b3bd77c743 +Author: David Calavera +Date: Tue Nov 3 13:25:09 2015 -0500 + + Decouple daemon and container to manage networks. + + Signed-off-by: David Calavera + +commit 019c337b93d5e068fa7c701d8b70750052503188 +Author: David Calavera +Date: Tue Nov 3 12:43:36 2015 -0500 + + Decouple daemon and container to cleanup containers. + + Signed-off-by: David Calavera + +commit ca5ede2d0a23cb84cac3b863c363d0269e6438df +Author: David Calavera +Date: Tue Nov 3 12:33:13 2015 -0500 + + Decouple daemon and container to log events. + + Create a supervisor interface to let the container monitor to emit events. + + Signed-off-by: David Calavera + +commit 2c72015ce3b78b45e33529368fb1c5a724415d87 +Author: David Calavera +Date: Tue Nov 3 11:42:08 2015 -0500 + + Decouple daemon and container to manage volumes. + + Signed-off-by: David Calavera + +commit c1c42db060362e400a475dfb2884f89b86fce317 +Author: David Calavera +Date: Mon Nov 2 20:49:36 2015 -0500 + + Decouple daemon and container to execute processes. + + Signed-off-by: David Calavera + +commit ebf707ec5fc9e942b89f6405df35cd6c0fabb15b +Author: David Calavera +Date: Mon Nov 2 20:19:17 2015 -0500 + + Move `Daemon.containerCopy` to daemon/archive.go + + It's the only place where it's used. + + Signed-off-by: David Calavera + +commit 89decc4446ad01a5595de1b93c17c37232f8a9aa +Author: David Calavera +Date: Mon Nov 2 20:15:25 2015 -0500 + + Remove unused function `Container.getImage`. + + Signed-off-by: David Calavera + +commit 6ea9a880dc434446c072ac23b1cab89ec3652140 +Author: David Calavera +Date: Mon Nov 2 20:14:09 2015 -0500 + + Remove unnecessary `Container.changes` function. + + Signed-off-by: David Calavera + +commit 3a497650464b40191bd2cde348e676acf4efe270 +Author: David Calavera +Date: Mon Nov 2 20:06:09 2015 -0500 + + Decouple daemon and container to mount and unmount filesystems. + + Side effects: + - Decouple daemon and container to start containers. + - Decouple daemon and container to copy files. + + Signed-off-by: David Calavera + +commit 1c94f5f53a47997f76cafb633092fce9dbdab3ea +Author: David Calavera +Date: Mon Nov 2 18:53:26 2015 -0500 + + Decouple daemon and container to export containers. + + Signed-off-by: David Calavera + +commit 9f79cfdb2f1f6aeb64c84e7cb877fc38d052d187 +Author: David Calavera +Date: Mon Nov 2 18:39:39 2015 -0500 + + Decouple daemon and container to pause and unpause containers. + + Signed-off-by: David Calavera + +commit 4f2a5ba360d0b00213d31f50a5be074c89124c52 +Author: David Calavera +Date: Mon Nov 2 18:25:26 2015 -0500 + + Decouple daemon and container to stop and kill containers. + + Signed-off-by: David Calavera + +commit 581380cc6cd26f43fe5e69965873769d8dc739ef +Author: David Calavera +Date: Mon Nov 2 17:37:45 2015 -0500 + + Move `exportContainerRw` to the daemon. + + Signed-off-by: David Calavera + +commit 836fa1c1e5ef98e498df9da02049255a0e9b3d0d +Author: Christopher Jones +Date: Wed Nov 4 11:24:03 2015 -0600 + + Fixed link to contribution page in docs/README.md. + + Signed-off-by: Christopher Jones + +commit ab4b09bfb2a17b3f762d60a31c25698a702a400e +Merge: 34ee11e51d afb1411608 +Author: Olivier Gambier +Date: Wed Nov 4 09:23:09 2015 -0800 + + Merge pull request #2164 from dmp42/12-make-helper + + Dependencies make helper + +commit 34ee11e51d5241998e1251e18bb77109a2829bfe +Merge: 0836929470 f3c5f05425 +Author: Olivier Gambier +Date: Wed Nov 4 08:54:20 2015 -0800 + + Merge pull request #2116 from dgageot/1628-oauth2 + + Move `goauth2/oauth` dependency to `golang.org/x/oauth2` + +commit 0836929470edbe52230a6b73d24d94621a193a29 +Merge: 8ac6adc13b bcf4767937 +Author: Olivier Gambier +Date: Wed Nov 4 08:52:19 2015 -0800 + + Merge pull request #2165 from dgageot/maintainers + + Add David to maintainers + +commit afb1411608526338d594918328c17f3cbceace24 +Author: Olivier Gambier +Date: Tue Nov 3 21:28:40 2015 -0800 + + Make updates + + Added and documented two simple helpers to ease managing deps. + Removed now obsolete references to `grep -v Godeps` + + Signed-off-by: Olivier Gambier + +commit 7e5f90483039eeaa5a4b6d17ec0f688e68f7d768 +Merge: fbd18cbce7 45788bb62d +Author: Tianon Gravi +Date: Wed Nov 4 08:27:54 2015 -0800 + + Merge pull request #17664 from jfrazelle/fedora-23 + + add fedora 23 + +commit fbd18cbce75d3e77db45f3eefaed0237cdb43ed4 +Merge: 0f41761290 11062ea177 +Author: Vincent Demeester +Date: Wed Nov 4 16:02:08 2015 +0100 + + Merge pull request #17683 from haoshuwei/fix-wordspelling-in-network + + Fixing wrong word spelling in api/client/network.go + +commit 0605aafe37336c7d3139e993b4122d97076d4ab8 +Author: Anil Belur +Date: Wed Nov 4 19:21:27 2015 +0530 + + Fix for #24 missing reference to 'Windows' platform on the "Organize the + issues" page. + + Signed-off-by: Anil Belur + +commit 11062ea17787b66e27978dc8a3d5a69ea318dc61 +Author: Shuwei Hao +Date: Wed Nov 4 12:52:29 2015 +0000 + + Fixing wrong word spelling in api/client/network.go + + Signed-off-by: Shuwei Hao + +commit 66ca5b07a2e3b5c027470f5e3e85e4aff7159521 +Author: Jan Broer +Date: Sat Oct 31 02:09:08 2015 +0100 + + Fail gracefully when plugin binary implements outdated API + + Signed-off-by: Jan Broer + +commit 0f41761290160fbce38b6db62916d3009967954c +Merge: c9208953fa cec31abfea +Author: Antonio Murdaca +Date: Wed Nov 4 12:24:52 2015 +0100 + + Merge pull request #17672 from LK4D4/unn_var + + Remove unnecessary var decls + +commit 6a8806fe8d4262cb42d84709256cdd4dbf7381ab +Merge: 4ebe68e612 3d9e3d0877 +Author: Aanand Prasad +Date: Wed Nov 4 10:19:33 2015 +0000 + + Merge pull request #2304 from dnephin/remove_start_container + + Remove service.start_container() + +commit 8ac6adc13b93e4a9597291d15e213c4697234e72 +Merge: e7d595373c d1712e0cd3 +Author: David Gageot +Date: Wed Nov 4 10:38:03 2015 +0100 + + Merge pull request #1879 from emsi/google-use-internal-ip + + New option for create: --google-use-internal-ip + +commit 83b03b00578a27f24dc80bb110d36b1f6eed7684 +Author: Zhang Kun +Date: Wed Oct 14 15:03:09 2015 +0800 + + add c.Assert in docker_cli_ps_test.go + + Signed-off-by: Zhang Kun + +commit f3c5f05425e9676f2eb5a2c70a1712617957348c +Author: David Gageot +Date: Wed Nov 4 10:21:58 2015 +0100 + + FIX #1628 Move to `golang.org/x/oauth2` + + Signed-off-by: David Gageot + +commit 840ed7cc15ea380df0e8b38734318d9445fda773 +Author: David Gageot +Date: Thu Oct 29 18:24:09 2015 +0100 + + Migrate Digital Ocean driver to oauth2 + + Signed-off-by: David Gageot + +commit d1712e0cd3d9777dc7bab0278658311d721f83ef +Author: root +Date: Wed Nov 4 09:09:37 2015 +0000 + + Introduced a new flag for google driver: + --google-use-internal-ip + + Signed-off-by: Mariusz Woloszyn + +commit e7d595373c2d78e170689eee0463294793beb09d +Merge: 10b94b5e3e 8a452a9629 +Author: David Gageot +Date: Wed Nov 4 09:57:52 2015 +0100 + + Merge pull request #2066 from dgageot/2064-support-colons-in-scp-paths + + Support colons in scp paths + +commit 8a452a9629969b5368aace64df8e296a506c5156 +Author: David Gageot +Date: Fri Oct 23 13:17:12 2015 +0200 + + FIX #2064 Support local windows path + + + Use assert in tests + + Improve parsing + + Simplify code and tests + + Signed-off-by: David Gageot + +commit 10b94b5e3ec6e8d153b9b1b82d475ef8daf9e7db +Merge: 7f5983b703 c9117af080 +Author: David Gageot +Date: Wed Nov 4 09:46:00 2015 +0100 + + Merge pull request #2163 from dmp42/11-move-to-vendor + + Move to vendor + +commit 7f5983b70334875b8e8a10b6419236ebaac6c05a +Merge: 04cfa58445 914ccb6968 +Author: David Gageot +Date: Wed Nov 4 09:00:20 2015 +0100 + + Merge pull request #2113 from dgageot/gce-custom-images + + Fixes #1243 Custom GCE images support + +commit bcf4767937600a35f1f488ab357214180d96093e +Author: David Gageot +Date: Wed Nov 4 08:54:32 2015 +0100 + + Add David to maintainers + + Signed-off-by: David Gageot + +commit 3e9fc478aebee8d4c3dd96e150e6af450dfe9350 +Author: Fathi Boudra +Date: Wed Nov 4 06:33:48 2015 +0200 + + Remove yum cache to reduce image size + + mkimage-yum.sh has a lot in common with mkimage-rinse.sh, including extra + files clean up. Sync with mkimage-rinse.sh by removing yum cache to reduce + the image size. + + Minor changes to reduce also the delta/diff and make it easier to sync with + mkimage-rinse.sh script. + + Signed-off-by: Fathi Boudra + +commit c9117af080dd85978c730ed6c07dceccf3d179ab +Author: Olivier Gambier +Date: Tue Nov 3 21:14:39 2015 -0800 + + Move to vendor + + As we walk away from 1.4, godep no longer requires to have stuff into workspace and we no longer need the symlink. + + Signed-off-by: Olivier Gambier + +commit b3e83da3e6b238c20b98a18160b2bbd31436325a +Author: Olivier Gambier +Date: Tue Nov 3 20:26:17 2015 -0800 + + Cleanup and fix deps + + Signed-off-by: Olivier Gambier + +commit f8a665cd826bc061d163f3d40d22292bc708cb94 +Author: Hu Keping +Date: Wed Nov 4 10:46:10 2015 +0800 + + Replace tab with space on script + + It may inconsistent on different hosts(8/4 spaces per tab). + + Signed-off-by: Hu Keping + +commit 229b742570a8d450b3ac14b8bc8dd899387ff96e +Merge: 087e2452f3 f3bffb2dd9 +Author: Alexandre Beslic +Date: Tue Nov 3 17:14:58 2015 -0800 + + Merge pull request #1377 from vieux/compose_1.5 + + update compose to 1.5.0 + +commit cec31abfea0576a9899b861a239ddf9dc1d7672a +Author: Alexander Morozov +Date: Tue Nov 3 17:03:40 2015 -0800 + + Remove unnecessary var decls + + Signed-off-by: Alexander Morozov + +commit a60128c6a1912b8bedb443fb7a055bad5f5c82bb +Author: Jeffrey Morgan +Date: Tue Nov 3 17:00:09 2015 -0800 + + Reduce size of VM for windows quickstart to avoid hanging + + Signed-off-by: Jeffrey Morgan + +commit c9208953fac6174bb205bd1b3705f81a602869c2 +Merge: 562a1263f2 3f10bdf100 +Author: Brian Goff +Date: Tue Nov 3 19:58:19 2015 -0500 + + Merge pull request #17630 from LK4D4/syscall_umount_warn + + Do not ignore error from syscall.Unmount + +commit f3bffb2dd99060a2badbb075c6b085252cccf966 +Author: Victor Vieux +Date: Tue Nov 3 16:45:09 2015 -0800 + + update compose to 1.5.0 + + Signed-off-by: Victor Vieux + +commit f6896b61ff8142ce22d06ab447f0efdc0addc326 +Author: Peter Malmgren +Date: Wed Oct 28 02:00:07 2015 +0000 + + Fix docker status incorrectly reports containerized. Fixes #17037 + + Signed-off-by: Peter Malmgren + +commit 562a1263f2ce93b649a09803659be40c61b51b35 +Merge: e704182c9c bb66c16871 +Author: Jess Frazelle +Date: Tue Nov 3 15:56:10 2015 -0800 + + Merge pull request #17665 from LK4D4/setupwd_refactor + + Reorder code slightly in setupWorkingDirectory + +commit e704182c9c5bea1655791d11d13878b6a5ec949c +Merge: 67630bef47 c70d1bde63 +Author: Jess Frazelle +Date: Tue Nov 3 15:32:12 2015 -0800 + + Merge pull request #17614 from LK4D4/fix_golint + + Update linting tools to latest versions + +commit dd32fbe6152f18a6a4593c48af73d2c357fd339d +Author: Richard Scothern +Date: Tue Nov 3 11:03:17 2015 -0800 + + Before allowing a schema1 manifest to be stored in the registry, ensure that it + contains equal length History and FSLayer arrays. + + This is required to prevent malformed manifests being put to the registry and + failing external verification checks. + + Signed-off-by: Richard Scothern + +commit 603ffd58e18a9744679f741f2672dd9aea6babe0 +Merge: a9da0e5100 bc6e4cdceb +Author: Richard Scothern +Date: Tue Nov 3 15:15:48 2015 -0800 + + Merge pull request #1150 from RichardScothern/carry-1070 + + Add Storage Driver Context. + +commit bb66c168719f19a84909446dc177a6cf2f19eb23 +Author: Alexander Morozov +Date: Tue Nov 3 14:33:31 2015 -0800 + + Reorder code slightly in setupWorkingDirectory + + Signed-off-by: Alexander Morozov + +commit 67630bef478dd6818e6e02f0c67b60ab935025c0 +Merge: 65ffd917c6 4d9b8bae25 +Author: Sebastiaan van Stijn +Date: Tue Nov 3 23:33:20 2015 +0100 + + Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1 + + volume plugin doc update + +commit 45788bb62d6dcdc5b429b5ba10216d2af0402119 +Author: Jessica Frazelle +Date: Tue Nov 3 14:01:55 2015 -0800 + + add fedora 23 for all the crazies who already want it + + Signed-off-by: Jessica Frazelle + +commit b6f08f43f07ee9ac2c9a9fb7c19e62657afab163 +Author: Jeffrey Morgan +Date: Tue Nov 3 13:51:56 2015 -0800 + + Bump versions + + Signed-off-by: Jeffrey Morgan + +commit 76f35282cbd34ab7b5523de3d7818971f3b5028b +Author: Ben Firshman +Date: Tue Nov 3 13:43:03 2015 -0800 + + Fix first sentence in docs + + Signed-off-by: Ben Firshman + +commit 65ffd917c644d792b9400efbd62eb380e1d9e6eb +Merge: 474b16af8e 78f8a1224c +Author: David Calavera +Date: Tue Nov 3 13:40:37 2015 -0800 + + Merge pull request #17663 from tiborvass/merge_release_v1.9.0 + + Merge release v1.9.0 + +commit 78f8a1224ce9adc994fb6d355a294e8e6fa9d455 +Author: Tibor Vass +Date: Tue Nov 3 16:17:07 2015 -0500 + + Change version to 1.10.0-dev + + Signed-off-by: Tibor Vass + +commit 04cfa58445f063509699cdde41080a410330c4df +Merge: c6d6eb863a 8153d432ce +Author: Nathan LeClaire +Date: Tue Nov 3 12:20:26 2015 -0800 + + Merge pull request #2152 from nathanleclaire/bump_0.5.0 + + Bump to v0.5.0 + +commit 8153d432ce5bd993a38430297894503c31c9df76 +Author: Nathan LeClaire +Date: Tue Nov 3 12:10:04 2015 -0800 + + Bump to v0.5.0 + + Signed-off-by: Nathan LeClaire + +commit 8b0e32b151e1043ef569f8877d213f89a930fa0f +Author: Tibor Vass +Date: Tue Oct 13 17:25:59 2015 -0700 + + Bump version to v1.9.0 + + Signed-off-by: Tibor Vass + +commit c6d6eb863a9b6c9ba8843e3ccc8ec55d444fe6a3 +Merge: 786437901c 36ca9c6063 +Author: Nathan LeClaire +Date: Tue Nov 3 12:06:26 2015 -0800 + + Merge pull request #2151 from todorez/fix-ip-clash + + Fix DHCP server and host-only adapter IP address clash + +commit 786437901c0c883ecb59c1e0531654c1d89b326d +Merge: bccbe19a86 9a4bc9a20d +Author: Nathan LeClaire +Date: Tue Nov 3 11:58:14 2015 -0800 + + Merge pull request #2148 from nathanleclaire/no_driver_ls + + Ensure that ls will still work when plugin cannot be found + +commit 9a4bc9a20dc63d61accd4e8af02087f3be43510d +Author: Nathan LeClaire +Date: Mon Nov 2 22:07:54 2015 -0800 + + Ensure that ls will still work when plugin cannot be found + + Signed-off-by: Nathan LeClaire + +commit 36ca9c6063cb4319d8e32ae14662c26c2f336a22 +Author: Todor Minchev +Date: Tue Nov 3 11:12:52 2015 -0800 + + Fix DHCP server and host-only adapter IP address clash + + When setting up a host-only network we need to pass the IP address + of the host adapter (e.g 192.168.99.1) to the getRandomIPinSubnet function. + Passing the network address (e.g 192.168.1.0) can result in bypassing the IP + clash check and having the same address assigned to both the DHCP server + and the host-only network interface. + + Signed-off-by: Todor Minchev + +commit 474b16af8ecfe94ec635dfac60025348d3186aa3 +Merge: c30b9e590c 3564895e84 +Author: Antonio Murdaca +Date: Tue Nov 3 20:25:01 2015 +0100 + + Merge pull request #17659 from cpuguy83/17646_keep_em_running + + Fix network settings inspect tests + +commit bc6e4cdceb5a9c40ddcf33d6cb2699a3c5257153 +Author: Richard Scothern +Date: Mon Nov 2 13:23:53 2015 -0800 + + Add a generic error type to capture non-typed errors + + Signed-off-by: Richard Scothern + +commit 9637cb40cd791af1613ea62cc248180b36b9f208 +Author: amitshukla +Date: Fri Oct 2 16:19:06 2015 -0700 + + Fix for issue 664: https://github.com/docker/distribution/issues/664 + Errors thrown by storage drivers don't have the name of the driver, causing user + confusion about whether the error is coming from Docker or from a storage driver. + This change adds the storage driver name to each error message. + + This required changing ErrUnsupportedDriver to a type, leading to code changes + whenever ErrUnsupportedDriver is used. The tests check whether the driver name + appears in the error message. + + Signed-off-by: Amit Shukla + +commit c30b9e590c69a01ee6ea0510142fb9f965b62f7a +Merge: aff8bd178c a82f9ac819 +Author: Brian Goff +Date: Tue Nov 3 13:45:45 2015 -0500 + + Merge pull request #17606 from mountkin/increase-max-retries + + increase the maxJSONDecodeRetry in json log reader + +commit c2f2f536ffe84af7adf517fe8e7b150960511c34 +Author: Jeffrey Morgan +Date: Tue Nov 3 10:43:06 2015 -0800 + + Temporary disable boot2docker migration + + Signed-off-by: Jeffrey Morgan + +commit 44d08567d9e83f24aee9bfae98cf43756660aee1 +Merge: a27fb2ff0d 42f08cd522 +Author: Viktor Stanchev +Date: Tue Nov 3 10:40:57 2015 -0800 + + Merge pull request #941 from vikstrous/notary_docs + + update dockerfile, notary docs + +commit 9c8173dbfda93baef214359991b6a8a54172f6ae +Merge: d59c759cdd 77ff37a853 +Author: Aanand Prasad +Date: Tue Nov 3 18:31:56 2015 +0000 + + Merge pull request #2309 from dnephin/bump-1.5.0 + + WIP: Bump 1.5.0 + +commit aff8bd178c048780fa221e65a9dcce28b9c96df9 +Merge: 49f55b273b 453473d6a9 +Author: Michael Crosby +Date: Tue Nov 3 10:31:40 2015 -0800 + + Merge pull request #17638 from calavera/move_net_stats_collector + + Make the stats collector to collect network stats. + +commit 499253898bd0a942b635a22409228fd4723c2887 +Author: Jeffrey Morgan +Date: Tue Nov 3 10:09:45 2015 -0800 + + Bump Kitematic & fix checkbox bugs + + Signed-off-by: Jeffrey Morgan + +commit 81b3d2eec9d107e7bb6e839ca3506f0bf9dee9db +Author: Srini Brahmaroutu +Date: Sat Oct 31 20:22:44 2015 +0000 + + after the changes to unit test framework, fixing gccgo to run unit tests + Signed-off-by: Srini Brahmaroutu + +commit 77ff37a853b36e83de377cc83e7ff59eee11fc9c +Author: Daniel Nephin +Date: Tue Nov 3 11:30:34 2015 -0500 + + Bump 1.5.0 + + Signed-off-by: Daniel Nephin + +commit 40341674bd406c74eab83099cdc50684da3f45d4 +Author: Daniel Nephin +Date: Tue Nov 3 11:52:44 2015 -0500 + + Re-order extends docs. + + Signed-off-by: Daniel Nephin + +commit 62ebdce5a90ced63c27affcdf286189c11ea7885 +Author: Daniel Nephin +Date: Mon Nov 2 15:14:42 2015 -0500 + + Replace composition with Compose app. + + Signed-off-by: Daniel Nephin + +commit 58de4e0c267ebf34d053bf30e68acd1600544b68 +Author: Daniel Nephin +Date: Fri Oct 9 12:56:59 2015 -0400 + + Document using multiple Compose files use cases. + + Signed-off-by: Daniel Nephin + +commit dbd6c62b70c451897178f6e56392947acafebea3 +Author: Daniel Nephin +Date: Wed Oct 21 17:17:38 2015 -0400 + + Changes to production.md for working with multiple Compose files. + + Signed-off-by: Daniel Nephin + +commit 887c6753f800f1b11a49f17fe42559cf95c6ae61 +Author: Daniel Nephin +Date: Thu Oct 29 15:21:06 2015 -0400 + + Support a volume to the docs directory and add --watch, so docs can be refreshed. + + Signed-off-by: Daniel Nephin + +commit bd3589689221af154f9b321c41f2d69b89aeb268 +Author: Daniel Nephin +Date: Fri Oct 9 12:34:55 2015 -0400 + + Remove duplication from extends docs. + + Start restructuring extends docs in preparation for adding documentation about using multiple compose files. + + Signed-off-by: Daniel Nephin + +commit a9da0e510032314910b5405acc50873ab2fa2e5a +Merge: 5fc31de717 7c3281861f +Author: Richard Scothern +Date: Tue Nov 3 09:34:01 2015 -0800 + + Merge pull request #1114 from lebauce/swift-temp-url + + Redirect support in Swift driver + +commit 4ebe68e612d70383501379dc61db4c3f3df6ab23 +Merge: 767a13f771 e503e085ac +Author: Aanand Prasad +Date: Tue Nov 3 17:14:57 2015 +0000 + + Merge pull request #2290 from dnephin/docs_multi_file_compose + + Docs for using multiple compose files + +commit 3564895e84278311ecafaab923f5f753aba32aba +Author: Brian Goff +Date: Tue Nov 3 12:12:19 2015 -0500 + + Fix network settings inspect tests + + Makes sure the containers are actually running when inspecting so the + ip info is actually populated. + + Signed-off-by: Brian Goff + +commit 9286e62449da0322336728fc2035201939f6a903 +Author: Daniel Nephin +Date: Mon Nov 2 13:43:29 2015 -0500 + + On a test failure only show the last 100 lines of daemon output. + + Signed-off-by: Daniel Nephin + +commit 621d1a51679e42a4fed2a1462332e03e6577d3f3 +Author: Daniel Nephin +Date: Fri Oct 30 15:26:56 2015 -0400 + + Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) + + Signed-off-by: Daniel Nephin + +commit e503e085ac98e6e744020f5068be40412f443f67 +Author: Daniel Nephin +Date: Tue Nov 3 11:52:44 2015 -0500 + + Re-order extends docs. + + Signed-off-by: Daniel Nephin + +commit 0b3377a86cbd933cc7874d901b2916a37da08155 +Merge: 2d8ebb9d4a 8e8c2977da +Author: Diogo Mónica +Date: Tue Nov 3 16:52:32 2015 +0000 + + Merge pull request #263 from jfrazelle/update-canonical + + rebased canonical/json off go 1.5.1 + +commit 49f55b273b3ff0d0661f0707d6d9b6c9a98eebdd +Merge: 8d5695470a 39dfc536d4 +Author: moxiegirl +Date: Tue Nov 3 08:44:07 2015 -0800 + + Merge pull request #17658 from moxiegirl/incorporate-madhu-comments + + Updating networking docs with technical information + +commit 39dfc536d444df8745124ffa38504241a0a985f7 +Author: Madhu Venugopal +Date: Tue Nov 3 06:15:56 2015 -0800 + + Updating networking docs with technical information + + - the /etc/hosts read caveat due to dynamic update + - information about docker_gwbridge + - Carries and closes #17654 + - Updating with last change by Madhu + - Updating with the IPAM api 1.22 + + Signed-off-by: Mary Anthony + +commit 83714fbac26cad2c1fa0b0add01eb04042f29758 +Author: Daniel Nephin +Date: Fri Oct 30 13:27:06 2015 -0400 + + Touch up intro paragraph with feedback from @moxiegirl. + + Signed-off-by: Daniel Nephin + +commit 413921a287a55e62e9b6ed4f25f419fb7a7b7b1c +Author: Daniel Nephin +Date: Tue Oct 27 16:51:49 2015 -0400 + + Add another feature to the docs - multiple environments per host. + + Signed-off-by: Daniel Nephin + +commit 7ee36829ac87f6e02d14b09c00a63498832d12d3 +Author: Daniel Nephin +Date: Fri Oct 23 16:51:03 2015 -0400 + + Update intro docs based on feedback. + + Signed-off-by: Daniel Nephin + +commit bfb46b37d318eb7f07c031e59840e50bec1e14a2 +Author: Daniel Nephin +Date: Wed Oct 21 16:28:47 2015 -0400 + + Updates to gettingstarted guide from PR feedback. + + Signed-off-by: Daniel Nephin + +commit 09d2bdbb21135ef88b8eb296f2b6fcd4e6dc03f0 +Author: Daniel Nephin +Date: Fri Oct 9 11:08:23 2015 -0400 + + Flush out features and use cases. + + Signed-off-by: Daniel Nephin + +commit 8733d09a9c7b3a53fa7eef0d13d58c9dde7a4b30 +Author: Daniel Nephin +Date: Fri Oct 9 10:49:41 2015 -0400 + + Extract the getting started guide from the index page. + + Signed-off-by: Daniel Nephin + +commit e524cce222440f21740925a6e247b7d122f7c4c6 +Author: Daniel Nephin +Date: Tue Oct 27 16:29:36 2015 -0400 + + Add missing title to compose file reference. + + Signed-off-by: Daniel Nephin + +commit 8bdde9a7313fbaf5221dff20b314aa0fed0dd66a +Author: Daniel Nephin +Date: Mon Nov 2 15:14:42 2015 -0500 + + Replace composition with Compose app. + + Signed-off-by: Daniel Nephin + +commit eab265befaa6c48d44ad2b9314ccc97ad6630f7b +Author: Daniel Nephin +Date: Fri Oct 9 12:56:59 2015 -0400 + + Document using multiple Compose files use cases. + + Signed-off-by: Daniel Nephin + +commit c5cf5cfad45afb66f6b47fd6b7a0937e1e82f7f3 +Author: Daniel Nephin +Date: Wed Oct 21 17:17:38 2015 -0400 + + Changes to production.md for working with multiple Compose files. + + Signed-off-by: Daniel Nephin + +commit 1c4c7ccface1e71e462b1ff3d840c0d0804d230d +Author: Daniel Nephin +Date: Thu Oct 29 15:21:06 2015 -0400 + + Support a volume to the docs directory and add --watch, so docs can be refreshed. + + Signed-off-by: Daniel Nephin + +commit 7014cabb04fed3e31fe65c034604f1224195a2fa +Author: Daniel Nephin +Date: Fri Oct 9 12:34:55 2015 -0400 + + Remove duplication from extends docs. + + Start restructuring extends docs in preparation for adding documentation about using multiple compose files. + + Signed-off-by: Daniel Nephin + +commit 8d5695470ae909d0abb62e10f41c6e5f342520cd +Merge: 43ae13742d b8aaa4b07c +Author: David Calavera +Date: Tue Nov 3 08:24:11 2015 -0800 + + Merge pull request #17629 from tonistiigi/kill-autorestart-fix + + Fix race causing autorestart turning off on restart + +commit 767a13f7719dfedcfec6c32cabd1a2073e8214e1 +Merge: 19a41997c2 c58cf036e3 +Author: Aanand Prasad +Date: Tue Nov 3 16:22:28 2015 +0000 + + Merge pull request #2165 from dnephin/more_user_docs + + Restructure intro docs + +commit 3ff8af326b4f941987142496dcbeaacd901806fb +Author: Sylvain Baubeau +Date: Thu Oct 29 12:24:56 2015 +0100 + + Ensure read after write for segments + + Signed-off-by: Sylvain Baubeau + +commit 0737bb71753b2691f025506fa8a3e62040b9c093 +Author: Sylvain Baubeau +Date: Tue Nov 3 09:57:39 2015 +0100 + + Update Swift bindings + + Signed-off-by: Sylvain Baubeau + +commit 3d9e3d08779c38e52f9892eea20f05afb115ffa1 +Author: Daniel Nephin +Date: Mon Nov 2 13:33:13 2015 -0500 + + Remove service.start_container() + + It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly. + + Signed-off-by: Daniel Nephin + +commit 43ae13742d88cdbe9f512f83347533e0ae143c0c +Merge: d3b2e7dcf4 286fe69d53 +Author: Sebastiaan van Stijn +Date: Tue Nov 3 16:09:01 2015 +0100 + + Merge pull request #17650 from thaJeztah/fix-api-network-output + + docs: update remote API responses and minor fixes + +commit 19a41997c2be1d7216f56388280a94ecfd576ef6 +Merge: 3738da09e2 45635f7097 +Author: Aanand Prasad +Date: Tue Nov 3 15:05:47 2015 +0000 + + Merge pull request #2306 from dnephin/cli_tests_use_cli + + Update cli test suite to run the executable in a child process + +commit d3b2e7dcf4991bf812cb329119420f03356aaa1a +Merge: 43ad218293 7b978cc378 +Author: Sebastiaan van Stijn +Date: Tue Nov 3 15:35:53 2015 +0100 + + Merge pull request #17652 from moxiegirl/nigel-credits + + Nigel acknowledgement + +commit 286fe69d5376add77dc31833dc3c2fcc9639dd17 +Author: Sebastiaan van Stijn +Date: Tue Nov 3 14:03:18 2015 +0100 + + docs: update remote API responses and minor fixes + + Add back the "old" networksettings fields that were removed, + but added back to maintain backward compatibility, in + https://github.com/docker/docker/pull/17538 + + Update network endpoint responses, with updated response + introduced in; + https://github.com/docker/docker/pull/17536 + + Added changes to v1.22 that were applied to the v1.21 / v1.20 docs + after the API bump(s); + + https://github.com/docker/docker/pull/17085 + https://github.com/docker/docker/pull/17127 + https://github.com/docker/docker/pull/13707 + + Also fixed some mixed tab/spaces indentation + and Markdown formatting issues (causing code-blocks to + be rendered incorrectly) + + Signed-off-by: Sebastiaan van Stijn + +commit 7b978cc3781758cfc12259a5259665ba5e822a84 +Author: Mary Anthony +Date: Tue Nov 3 05:52:33 2015 -0800 + + Nigel acknowledgement + + Signed-off-by: Mary Anthony + +commit 43ad21829304ed2bb9a63b8fc86a83f01a18d5d5 +Merge: 578f4e129e 0f1083c8da +Author: Sebastiaan van Stijn +Date: Tue Nov 3 14:40:11 2015 +0100 + + Merge pull request #17651 from moxiegirl/nathans-tweaks + + Fixing ZooKeeper and some other nits Nathan found + +commit 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b +Author: Mary Anthony +Date: Tue Nov 3 05:34:54 2015 -0800 + + Fixing ZooKeeper and some other nits Nathan found + + Signed-off-by: Mary Anthony + +commit a27fb2ff0de52fb7d111134b39c861641f592ecd +Author: Mary Anthony +Date: Tue Oct 20 19:51:18 2015 -0700 + + Updating per Betty's verbal comments. + Entering Betty's second round comment + Fix awkward code blips + Merging JChu's comments from outdated material + Fixing problems in Dockerfile + pdating with the comments from John + Updating for DTR + Updating for fix + Updating with the comments from Betty and Jon + + Signed-off-by: Mary Anthony + +commit 578f4e129e9879cea6c6fc6885b7b47a6c462030 +Merge: 05a4cb2221 4d41fe0b80 +Author: Sebastiaan van Stijn +Date: Tue Nov 3 13:10:31 2015 +0100 + + Merge pull request #17242 from jlebon/pr/makefile-no-tty + + Makefile: don't allocate pseudo-tty if not interactive + +commit 4d9b8bae25a89e3def7166d260b45f9c9e78ba9a +Author: rsmoorthy +Date: Tue Nov 3 16:14:38 2015 +0530 + + multiple mount/unmount req with same volume name + + Updating docs to handle mount/unmount requests with same volume name. Issue #17585 + + Signed-off-by: Moorthy RS + +commit 8845259f49c8176cb0944e594dff5eda25646e2f +Author: Kun Zhang +Date: Tue Oct 20 17:40:24 2015 +0800 + + update docker_cli_help_test.go + + Signed-off-by: Kun Zhang + +commit 0a6acbede31702f541c6caf801e6f5421bfed989 +Author: kayrus +Date: Tue Oct 20 17:30:22 2015 +0200 + + Updated vendor go-systemd with enabled TLS activation + + Signed-off-by: kayrus + +commit 7c3281861f24b8cb8c480f9525ee60ca602f3c0c +Author: Sylvain Baubeau +Date: Tue Nov 3 09:59:50 2015 +0100 + + Add support for temporary URL for Swift driver + + Signed-off-by: Sylvain Baubeau + +commit 7759153f2f7a55399159fa99a65da18ca9713a84 +Author: Sylvain Baubeau +Date: Tue Nov 3 09:57:39 2015 +0100 + + Update Swift bindings + + Signed-off-by: Sylvain Baubeau + +commit 087e2452f3ec474f112b4e5b8c52b8dacb5751be +Merge: 830c612933 c286a183b3 +Author: Victor Vieux +Date: Tue Nov 3 00:35:11 2015 -0800 + + Merge pull request #1369 from vieux/fix_various_issues + + Fix various issues + +commit 2d8ebb9d4a01a14dd5a86963ac5ad945a64bcb72 +Merge: ab6637934d 412679084a +Author: Ying Li +Date: Mon Nov 2 22:41:32 2015 -0800 + + Merge pull request #264 from jfrazelle/fix-makefile + + Fix version in makefile + +commit e533ed35d2eab31ce528675b0665f97516b4147b +Merge: b3129844dd 38ca2bef8d +Author: Jeffrey Morgan +Date: Mon Nov 2 22:30:43 2015 -0800 + + Merge pull request #1170 from kitematic/remove-escape + + Don't escape volume paths + +commit 0385b9b65d3f68afe861d2dc52e1bcc9f856a007 +Author: Gou Rao +Date: Mon Nov 2 22:23:13 2015 -0800 + + Update plugins.md + + Add OpenStorage to Docker plugin list. + + Signed-off-by: Gou Rao + +commit 38ca2bef8d0fdc14bf66a190b555cf9c188427ed +Author: Jeffrey Morgan +Date: Mon Nov 2 22:22:23 2015 -0800 + + Don't escape volume paths + +commit bccbe19a8631e27ec5ef7df8ca7456a2d5dcfd4b +Merge: f3122dd853 f5b6c87e7c +Author: Nathan LeClaire +Date: Mon Nov 2 22:14:22 2015 -0800 + + Merge pull request #2146 from nathanleclaire/rm_automatic_cert_regeneration + + Remove automatic certificate regeneration + +commit f3122dd85320aaf0014dea4698709d7a70287e31 +Merge: 721f39d4af 060f0a0db2 +Author: Nathan LeClaire +Date: Mon Nov 2 22:14:06 2015 -0800 + + Merge pull request #2099 from nathanleclaire/help_foobar + + Smooth rough edges around create help text + +commit 05a4cb22211063adbe68f63b61a19e39ebda8302 +Merge: 43077f9b64 950fbf99b1 +Author: moxiegirl +Date: Mon Nov 2 21:42:03 2015 -0800 + + Merge pull request #17486 from moxiegirl/16286-storage-drivers + + Improved Storage Driver Documentation + +commit 950fbf99b1214e77c0dcc27e8f9a16e01b2c630a +Author: Mary Anthony +Date: Wed Sep 16 10:09:10 2015 -0700 + + Add special memory management file + updating after assignment for Nigel + Adding in some notes from Nigel work + Updating with the storage driver content Nigel added + Updating with Nigel's polishing tech + Adding in Nigel graphics + First pass of aufs material + Capturing Nigel's latest + Comments back to Nigel on devicemapper + Incorporating Nigel's comments v3 + Converting images for dm + Entering comments into aufs page + Adding the btfs storage driver + Moving to userguide + Adding in two new driver articles from Nigel + Optimized images + Updating with comments + + Signed-off-by: Mary Anthony + +commit b3129844dd5e0ab09086c71439e3dd18a6338f99 +Merge: 191045351b f9c9d94a1c +Author: Jeffrey Morgan +Date: Mon Nov 2 21:22:52 2015 -0800 + + Merge pull request #1169 from kitematic/better-reports + + Better docker-machine error reports + +commit 43077f9b6406e3d5e401a361b4c9742c00be528b +Merge: 3c695d7ed7 9ef855f9e5 +Author: moxiegirl +Date: Mon Nov 2 21:16:41 2015 -0800 + + Merge pull request #17340 from moxiegirl/new-networking-docs + + Network docs for release + +commit f9c9d94a1c9d59b9ab8b48f1d1a5d62b6fbe0ebc +Merge: 7b7f1d3870 3b09f1fe83 +Author: Jeffrey Morgan +Date: Mon Nov 2 19:58:47 2015 -0800 + + Merge branch 'master' into better-reports + + Signed-off-by: Jeffrey Morgan + +commit 9ef855f9e5fa8077468bda5ce43155318c58e60e +Author: Mary Anthony +Date: Wed Sep 30 13:11:36 2015 -0700 + + First pass at consolidating + Removing old networking.md + Updating dockernetworks.md with images + Adding information on network plugins + Adding blurb about links to docker networking + Updating the working documentation + Adding Overlay Getting Started + Downplaying links by removing refs/examples, adding refs/examples for network. + Updating getting started to reflect networks not links + Pulling out old network material + Updating per discussion with Madhu to add Default docs section + Updating with bridge default + Fix bad merge + Updating with new cluster-advertise behavior + Update working and NetworkSettings examples + Correcting example for default bridge discovery behavior + Entering comments + Fixing broken Markdown Syntax + Updating with comments + Updating all the links + + Signed-off-by: Mary Anthony + +commit 3c695d7ed73e9992fba51a9d4bfa745763230c79 +Merge: 4eac6d4529 ec2289b2d9 +Author: Alexander Morozov +Date: Mon Nov 2 21:11:52 2015 -0800 + + Merge pull request #17634 from stevvooe/avoid-panic-on-flush + + Avoid panic on write after close in http + +commit 7b7f1d38702952b46b1bf7b4e9c0135c9b36bcdb +Author: Jeffrey Morgan +Date: Mon Nov 2 19:23:41 2015 -0800 + + Better error reports around docker-machine + + Signed-off-by: Jeffrey Morgan + +commit 5426eeaafd167a86f2ff0455da3df63c719007de +Author: Jeffrey Morgan +Date: Mon Nov 2 18:33:49 2015 -0800 + + Better error & retry tracking in Kitematic + + Signed-off-by: Jeffrey Morgan + +commit f5b6c87e7ca06921a8e0bc17ba1c3c172f9c0590 +Author: Nathan LeClaire +Date: Mon Nov 2 19:31:29 2015 -0800 + + Remove automatic certificate regeneration + + Signed-off-by: Nathan LeClaire + +commit 3b09f1fe834b1a796fe291b102d35358ba9f1a05 +Merge: 37146d79b4 191045351b +Author: Jeffrey Morgan +Date: Mon Nov 2 19:24:06 2015 -0800 + + Merge branch 'master' of github.com:kitematic/kitematic + +commit e222c61594e86e3c4728e6ba65ce8762fd640bd8 +Author: RyanDeng +Date: Mon Nov 2 14:51:05 2015 +0800 + + fix the bug: cpu percent will extremely high + + Signed-off-by: Chao Deng + +commit 191045351bea5bf1fd37071808a93ca08ed857eb +Merge: 14658306ba 3dd9e720aa +Author: Michael Chiang +Date: Mon Nov 2 18:43:33 2015 -0800 + + Merge pull request #1168 from kitematic/better-tracking + + Better error & retry metrics in Kitematic + +commit b8aaa4b07c100a338136be82292289a37b09b5e7 +Author: Tonis Tiigi +Date: Mon Nov 2 13:51:55 2015 -0800 + + Fix race causing autorestart turning off on restart + + Signed-off-by: Tonis Tiigi + +commit 79cffa5ce4a71b29eed66e26c1fb7f153be5c045 +Author: Jana Radhakrishnan +Date: Mon Nov 2 18:37:35 2015 -0800 + + Fix a corner case issue when daemon panics + + There is an extreme corner case where when the daemon + panics at the same time as a container is stopping + and cleaning up the sandbox and the sandbox may have been + left with an inconsistent state. This libnetwork vendoring + fixes that case. + + Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678 + + Signed-off-by: Jana Radhakrishnan + +commit 37146d79b4dd1e977155c63447893ba17ce2c3d0 +Author: Jeffrey Morgan +Date: Mon Nov 2 18:33:49 2015 -0800 + + Better error & retry tracking in Kitematic + + Signed-off-by: Jeffrey Morgan + +commit 3dd9e720aa08c27c8c8763f79355ec357a17f390 +Author: Jeffrey Morgan +Date: Mon Nov 2 18:33:49 2015 -0800 + + Better error & retry tracking in Kitematic + + Signed-off-by: Jeffrey Morgan + +commit ec2289b2d9ac79fd5e0f69f56f023dfe8ee78bf8 +Author: Stephen J Day +Date: Mon Nov 2 16:11:28 2015 -0800 + + Avoid panic on write after close in http + + By adding a (*WriteFlusher).Close, we limit the Write calls to possibly + deallocated http response buffers to the lifetime of an http request. + Typically, this is seen as a very confusing panic, the cause is usually a + situation where an http.ResponseWriter is held after request completion. We + avoid the panic by disallowing further writes to the response writer after the + request is completed. + + Signed-off-by: Stephen J Day + +commit 4eac6d4529961e0937a9e1478dd70bdc90e78260 +Merge: c90125dc8a 27c2368599 +Author: Tibor Vass +Date: Mon Nov 2 21:10:27 2015 -0500 + + Merge pull request #17633 from tiborvass/skip-loadimage-error-onrestore + + Do not stop daemon from booting if io.EOF on loading image + +commit 27c23685993ba4252d2d0f8f7ffa6455fb6235c5 +Author: Tibor Vass +Date: Mon Nov 2 19:05:45 2015 -0500 + + Do not stop daemon from booting if io.EOF on loading image + + Signed-off-by: Tibor Vass + +commit 453473d6a964e58f4a61599bd90d62d0088f0cc2 +Author: David Calavera +Date: Mon Nov 2 21:06:44 2015 -0500 + + Make the stats collector to collect network stats. + + Currently, we get the network stats each time per subscriber, causing a + high load of cpu when there are several subscribers per container. + + This change makes the daemon to collect once and publish N times, where N is the + number of subscribers per container. + + Signed-off-by: David Calavera + +commit c286a183b37a0f032a96a9f1120708d0be602d14 +Author: Victor Vieux +Date: Mon Nov 2 18:03:29 2015 -0800 + + fix diff test + + Signed-off-by: Victor Vieux + +commit c90125dc8aef413a21792804748754abb2785229 +Merge: c6c7d5870c 701e5dfe8a +Author: Doug Davis +Date: Mon Nov 2 20:42:36 2015 -0500 + + Merge pull request #17637 from aaronlehmann/network-test-name-typo + + Fix typo in name of integration test TestInspectApiMultipeNetworks + +commit 412679084aee7583e9ff0c613cd9cfdfc0e27472 +Author: Jessica Frazelle +Date: Mon Nov 2 17:33:01 2015 -0800 + + Fix version in makefile + + OLD: + ``` + jessie at debian in ~/notary on fix-makefile + $ ./bin/notary version + notary + Version: '1.0-rc1' + Git commit: 'ab66379' + ``` + + WITH PATCH: + ``` + jessie at debian in ~/notary on fix-makefile + $ ./bin/notary version + notary + Version: 1.0-rc1 + Git commit: ab66379 + ``` + + Signed-off-by: Jessica Frazelle + +commit c6c7d5870c8fcc9c569455e6fe340c5db070a4a5 +Merge: 79d47c5b96 836df9c446 +Author: Brian Goff +Date: Mon Nov 2 20:31:46 2015 -0500 + + Merge pull request #17635 from MHBauer/volume-backend + + create generic backend to cut dependency on daemon + +commit 701e5dfe8aa4d3d964e375911a334674c5e5480a +Author: Aaron Lehmann +Date: Mon Nov 2 17:30:16 2015 -0800 + + Fix typo in name of integration test TestInspectApiMultipeNetworks + + Signed-off-by: Aaron Lehmann + +commit 5fc31de71773572e41b33ec55ee8e81ed47a4df7 +Merge: 9316c2c3bc 34754f20d8 +Author: Richard Scothern +Date: Mon Nov 2 17:14:35 2015 -0800 + + Merge pull request #1152 from RichardScothern/credit2 + + Add github IDs to maintainers + +commit 3b6d9b68209e95da777290877d9e18c60442ae89 +Author: Victor Vieux +Date: Mon Nov 2 17:04:01 2015 -0800 + + monitor events just after the info + + Signed-off-by: Victor Vieux + +commit 34754f20d831a9d37c921c610419b2e4c796559e +Author: Richard Scothern +Date: Mon Nov 2 16:05:25 2015 -0800 + + Update authors + Signed-off-by: Richard Scothern + +commit 3c397e5b963c68c72dc9defdf28e7a82250d16b9 +Author: Victor Vieux +Date: Mon Nov 2 16:32:43 2015 -0800 + + update test name + + Signed-off-by: Victor Vieux + +commit 3f29299afdeb364b552da8f13508650499fd2cf4 +Author: Victor Vieux +Date: Mon Nov 2 16:31:57 2015 -0800 + + refresh volumes after creating a container + + Signed-off-by: Victor Vieux + +commit 836df9c4469db89ba2fecfe512ce67003a61cc1e +Author: Morgan Bauer +Date: Mon Nov 2 16:26:45 2015 -0800 + + create generic backend to cut dependency on daemon + + - create a volume-specific interface that for the methods of daemon + that are used + - remove dependency on daemon package by volume package of server + - like 5087977fc1a4279be55f25e0b8782c9cf9bc65f3 + + Signed-off-by: Morgan Bauer + +commit 45635f709781f4fccec15af19fb60e8c96cf6639 +Author: Daniel Nephin +Date: Mon Nov 2 17:52:37 2015 -0500 + + Move cli tests to a new testing package. + + These cli tests are now a different kind of that that run the compose binary. They are not the same as integration tests that test some internal interface. + + Signed-off-by: Daniel Nephin + +commit 0fa9b97f4ed10526a151f6a134142c584e0907a2 +Author: Victor Vieux +Date: Mon Nov 2 16:20:24 2015 -0800 + + refresh images after a rmi + + Signed-off-by: Victor Vieux + +commit 51d92d4b695820f05ed8d05295b420ffa06d4822 +Author: Dong Chen +Date: Mon Nov 2 16:13:50 2015 -0800 + + fix time duration in EngineOpts + + Signed-off-by: Dong Chen + +commit 9316c2c3bc60b010a802ff694253ab0cd5c21f53 +Merge: 222e6e91c4 b313f011e3 +Author: Olivier Gambier +Date: Mon Nov 2 16:07:21 2015 -0800 + + Merge pull request #1151 from RichardScothern/credit + + Update AUTHORS and MAINTAINERS + +commit b313f011e3363e21082c724b93d5ff70b559d0f0 +Author: Richard Scothern +Date: Mon Nov 2 16:05:25 2015 -0800 + + Update authors + Signed-off-by: Richard Scothern + +commit e7601118038bdf6426d104aa97c3585f76ab7d34 +Author: Richard Scothern +Date: Mon Nov 2 16:05:06 2015 -0800 + + Update maintainers + Signed-off-by: Richard Scothern + +commit 79d47c5b96c18c4497c0669c343fa05517ea3caa +Merge: 65cbf37bf7 a20fea1823 +Author: David Calavera +Date: Mon Nov 2 15:38:32 2015 -0800 + + Merge pull request #17628 from LK4D4/umount_log_err + + Log error from unmountVolumes on cleanup + +commit 65cbf37bf7cfb824d6b090c78fd1d3e48af9e8d2 +Merge: 6d5e47a690 b323e3df8b +Author: David Calavera +Date: Mon Nov 2 15:38:14 2015 -0800 + + Merge pull request #17626 from mavenugo/ith + + IT for ungraceful daemon restart with multiple host-mode containers + +commit 6d5e47a690fe6da233bf4b76a84a728024e3794f +Merge: 6964f42350 5087977fc1 +Author: Doug Davis +Date: Mon Nov 2 17:54:28 2015 -0500 + + Merge pull request #17517 from MHBauer/network-impl + + create generic backend to cut dependency on daemon + +commit 68fbfe0cac665ba5dcc07b4e454bc534c70a0266 +Author: Dong Chen +Date: Mon Nov 2 14:42:30 2015 -0800 + + change refresh retry count to IntFlag + + Signed-off-by: Dong Chen + +commit 3f10bdf100067580c35e27524b10ad06fadd0527 +Author: Alexander Morozov +Date: Mon Nov 2 14:40:29 2015 -0800 + + Do not ignore error from syscall.Unmount + + Signed-off-by: Alexander Morozov + +commit 6964f4235035c5e94f6a0c35149783e910fed313 +Merge: 642a1f67b6 257c59251b +Author: Derek McGowan +Date: Mon Nov 2 14:37:04 2015 -0800 + + Merge pull request #17557 from aaronlehmann/update-distribution + + Vendor updated version of docker/distribution + +commit 8057bb3fcce2c99126db365671753bc0af003d8c +Author: Daniel Nephin +Date: Mon Nov 2 16:46:49 2015 -0500 + + Update cli tests to use subprocess. + + Signed-off-by: Daniel Nephin + +commit 642a1f67b6ec449110c52e3b57f968c868e91950 +Merge: 944ea3134d a40c828040 +Author: David Calavera +Date: Mon Nov 2 14:31:09 2015 -0800 + + Merge pull request #17573 from Microsoft/10662-parsersos + + Windows: Fix unit tests parsers\os + +commit 944ea3134d6fd68ff33f9bdd2f5b87d458824079 +Merge: beeec6d103 a54d5932e3 +Author: Alexander Morozov +Date: Mon Nov 2 14:25:39 2015 -0800 + + Merge pull request #17554 from calavera/warm_ipc_unmounts + + Turn IPC unmount errors into warnings. + +commit d8a4ada541d7ddad2112f9ad1c78cad1cf8372a4 +Merge: 10d50a0959 5da80098c9 +Author: Jeffrey Morgan +Date: Mon Nov 2 14:11:56 2015 -0800 + + Merge pull request #266 from yoerayo/master + + Verify boot2docker VM is not running before starting it + +commit a20fea1823ccfb40d235607e8f7ce7ceff1b5afe +Author: Alexander Morozov +Date: Mon Nov 2 13:18:07 2015 -0800 + + Log error from unmountVolumes on cleanup + + Signed-off-by: Alexander Morozov + +commit b323e3df8bcb52607e57d5f49dcb7a93edafa84a +Author: Madhu Venugopal +Date: Mon Nov 2 10:38:10 2015 -0800 + + IT for ungraceful daemon restart with multiple host-mode containers + + Signed-off-by: Madhu Venugopal + +commit 222e6e91c4748f612f3a380997d6a8a3fa2e2b83 +Merge: c6c9194e9c 46dd057f5c +Author: Richard Scothern +Date: Mon Nov 2 13:22:32 2015 -0800 + + Merge pull request #1149 from stevvooe/close-filereader + + registry/storage: close filereader after allocation + +commit 5da80098c9b1c4d9f904cb4295a0c719d68a2cb9 +Author: Keith Starling +Date: Mon Nov 2 15:23:08 2015 -0500 + + check to see if the boot2docker vm is running before starting it as + docker-machine now seems to throw an error when starting a running VM + + Signed-off-by: Keith Starling + +commit 257c59251bd9a03aea4f3188a8160c54f37950ae +Author: Aaron Lehmann +Date: Fri Oct 30 17:46:25 2015 -0700 + + Vendor updated version of docker/distribution + + This updates the vendored docker/distribution to the current master + branch. + + Note the following changes: + + - The manifest package was split into manifest/schema1. Most references + to the manifest package in the engine needed to be updated to use + schema1 instead. + + - Validation functions in api/v2 were replaced by the + distribution/reference package. The engine code has been updated to + use the reference package for validation where necessary. A future PR + will change the engine to use the types defined in + distribution/reference more comprehensively. + + - The reference package explicitly allows double _ characters in + repository names. registry_test.go was updated for this. + + - TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now + that the schema1 package unmarshals the correct payload. The test is + being changed to modify the JSON without affecting its length, which + allows the pull to succeed to the point where digest validation + happens. + + Signed-off-by: Aaron Lehmann + +commit 5087977fc1a4279be55f25e0b8782c9cf9bc65f3 +Author: Morgan Bauer +Date: Mon Oct 26 14:47:48 2015 -0700 + + create generic backend to cut dependency on daemon + + - create a network-specific interface that for the methods of daemon + that are used + - remove dependency on daemon package + + Signed-off-by: Morgan Bauer + +commit c58cf036e34b34a7c435f0c4c80b13f058788d70 +Author: Daniel Nephin +Date: Fri Oct 30 13:27:06 2015 -0400 + + Touch up intro paragraph with feedback from @moxiegirl. + + Signed-off-by: Daniel Nephin + +commit a3fb13e14195835d08006f23a9f26f6907f77262 +Author: Daniel Nephin +Date: Tue Oct 27 16:51:49 2015 -0400 + + Add another feature to the docs - multiple environments per host. + + Signed-off-by: Daniel Nephin + +commit d9bc91b7cc0a8cc867caaac1bf36c1eab2b6cb4b +Author: Daniel Nephin +Date: Fri Oct 23 16:51:03 2015 -0400 + + Update intro docs based on feedback. + + Signed-off-by: Daniel Nephin + +commit db3b90b84efa1ddd39b282e67f775f75609d14a3 +Author: Daniel Nephin +Date: Wed Oct 21 16:28:47 2015 -0400 + + Updates to gettingstarted guide from PR feedback. + + Signed-off-by: Daniel Nephin + +commit 86d845fde3ec63d762a2dbd0dbcfc21eb8011f52 +Author: Daniel Nephin +Date: Fri Oct 9 11:08:23 2015 -0400 + + Flush out features and use cases. + + Signed-off-by: Daniel Nephin + +commit 186d43c59f82e4210b379885368eb73a4162003d +Author: Daniel Nephin +Date: Fri Oct 9 10:49:41 2015 -0400 + + Extract the getting started guide from the index page. + + Signed-off-by: Daniel Nephin + +commit 53a0de7cf2231da88c7501bb367eb4e7f1c4d425 +Author: Daniel Nephin +Date: Tue Oct 27 16:29:36 2015 -0400 + + Add missing title to compose file reference. + + Signed-off-by: Daniel Nephin + +commit beeec6d103cadb037ccd5f9bc4c6647ae74a6b45 +Merge: 920ab75bd5 45e71a7984 +Author: David Calavera +Date: Mon Nov 2 12:15:41 2015 -0800 + + Merge pull request #17558 from aboch/nw + + Fix bug in initializeNetwork() + +commit 3738da09e2fdd366c48095bf05bfa2988f9bb455 +Merge: 77e1fe1915 abde64d610 +Author: Daniel Nephin +Date: Mon Nov 2 15:10:17 2015 -0500 + + Merge pull request #2298 from dnephin/update_networking_test_for_rc4 + + Fix networking tests to work with new API in engine rc4 + +commit 46dd057f5cf2e2f52601fe1f32f96fbae9c791db +Author: Stephen J Day +Date: Mon Nov 2 11:52:14 2015 -0800 + + registry/storage: close filereader after allocation + + Signed-off-by: Stephen J Day + +commit c6c9194e9c6097f84b0ff468a741086ff7704aa3 +Merge: ef17db8d73 073bd89262 +Author: Richard Scothern +Date: Mon Nov 2 11:54:34 2015 -0800 + + Merge pull request #1148 from aaronlehmann/withname-check-length + + Check length of input in WithName + +commit 920ab75bd5969fc4d387c530043115974fae8c79 +Merge: b95048758a 6694326d5d +Author: David Calavera +Date: Mon Nov 2 11:43:20 2015 -0800 + + Merge pull request #17598 from zelahi/16756-dockercli-createtest + + Added c.Assert statements to docker_api_create_test.go + +commit b95048758a06097469901590e68f40bafb5d1762 +Merge: f962c0715f 0d881349e8 +Author: David Calavera +Date: Mon Nov 2 11:42:26 2015 -0800 + + Merge pull request #17619 from jfrazelle/canonical-update + + rebased canonical/json off go 1.5.1 + +commit f962c0715f153b806742cefaa6e9c9adf4e25273 +Merge: 6c31a9a50d 4a54ab387f +Author: David Calavera +Date: Mon Nov 2 11:41:19 2015 -0800 + + Merge pull request #17620 from vdemeester/unit-test-TESTDIRS + + Bring TESTDIRS back for unit-tests + +commit a40c82804038fdc8b7051aa0b4ba27974c895e36 +Author: John Howard +Date: Sat Oct 31 11:26:11 2015 -0700 + + Windows: Fix unit tests parsers\os + + Signed-off-by: John Howard + +commit 45e71a79840887b7974387bedba0544015ab4e3b +Author: Alessandro Boch +Date: Fri Oct 30 20:32:03 2015 -0700 + + Fix bug in initializeNetwork() + + - On `docker run --net ...` + the bug would cause the container to attempt + to connect to the network two times + - Also made sure endpoint creation rollback will + be executed on failures in `func (container *Container) connectToNetwork()` + + Signed-off-by: Alessandro Boch + +commit abde64d610135e957aeb76958fdf384882fcc717 +Author: Daniel Nephin +Date: Mon Nov 2 13:43:29 2015 -0500 + + On a test failure only show the last 100 lines of daemon output. + + Signed-off-by: Daniel Nephin + +commit ab6637934ddc7f145b68d7745bd79f5875b68c17 +Merge: dfaa8daf9b 29ae808472 +Author: David Lawrence +Date: Mon Nov 2 11:12:39 2015 -0800 + + Merge pull request #258 from mtrmac/unused-sha256 + + Don't compute an unnecessary cryptographic hash + +commit 6c31a9a50d032f7276c63e23de452eb2cd07335b +Merge: 6563b7d2e8 10e1b9f02e +Author: Tibor Vass +Date: Mon Nov 2 13:46:43 2015 -0500 + + Merge pull request #17594 from mrjana/restart + + Fix race with host networking causing `invalid argument` errors + +commit 4a54ab387f4b11310476414f575fb2502970b65d +Author: Vincent Demeester +Date: Mon Nov 2 19:44:09 2015 +0100 + + Add TESTDIRS back + + Makes it simpler to test only one package. + Was removed by #17491. + + Signed-off-by: Vincent Demeester + +commit 1b5b40761943bf9e358f7f70859d62097cdb4f1b +Author: Daniel Nephin +Date: Fri Oct 30 15:26:56 2015 -0400 + + Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) + + Signed-off-by: Daniel Nephin + +commit 8e8c2977da53c75361a9e23d90a43cc070fa0bbd +Author: Jessica Frazelle +Date: Mon Nov 2 10:26:42 2015 -0800 + + rebased canonical/json off go 1.5.1 + + Signed-off-by: Jessica Frazelle + +commit 0d881349e88b55a3ea4e15eef1c464b2ca64a441 +Author: Jessica Frazelle +Date: Mon Nov 2 10:23:02 2015 -0800 + + rebased canonical/json off go 1.5.1 + + Signed-off-by: Jessica Frazelle + +commit 6563b7d2e8a5c1ebef978e2ad8a1f7971b385abc +Merge: ca1e2d5782 0c57b9f5b3 +Author: Alexander Morozov +Date: Mon Nov 2 09:50:12 2015 -0800 + + Merge pull request #17542 from estesp/restart-root-dir-cleanup + + Fix integration-cli daemon restart with user namespaces enabled + +commit 10d50a09594d6712fc31f5794e29a0c2e006a700 +Author: Jeffrey Morgan +Date: Mon Nov 2 09:40:25 2015 -0800 + + Bump for 1.9.0 rc4 + + Signed-off-by: Jeffrey Morgan + +commit 073bd8926224a9a4cc7c7fc90fdd3828046c381b +Author: Aaron Lehmann +Date: Mon Nov 2 09:12:21 2015 -0800 + + Check length of input in WithName + + There is a constraint on the length of the name in a reference, so + WithName should be checking this instead of potentially creating a + reference that doesn't comply with the rules. + + Signed-off-by: Aaron Lehmann + +commit ca1e2d5782b90b98a4659de77d849014fe2abcc1 +Merge: ca0a9913c3 f5fc832b6e +Author: Alexander Morozov +Date: Mon Nov 2 08:49:43 2015 -0800 + + Merge pull request #17605 from runcom/enhance-err-msg + + graph: enhance err message on failed image restore + +commit e41de3e6318ad4cb30eabab9bec60f9fb9d7a76b +Author: Sebastiaan van Stijn +Date: Mon Nov 2 15:53:34 2015 +0100 + + Add examples for ENV vars in API + + As discussed in https://github.com/docker/docker/issues/16623, + the API calls for setting ENV-vars lacked an actual example. + + This PR adds some examples to the API calls. + + Signed-off-by: Sebastiaan van Stijn + +commit 10e1b9f02ee633349bc45631dac18cb4cc5baa61 +Author: Jana Radhakrishnan +Date: Sun Nov 1 10:32:37 2015 -0800 + + Vendoring libnetwork + + Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089 + + Signed-off-by: Jana Radhakrishnan + +commit c70d1bde63a1370d86ea8af17cda17920fdc9fb7 +Author: Alexander Morozov +Date: Mon Nov 2 08:32:49 2015 -0800 + + Update linting tools + + Signed-off-by: Alexander Morozov + +commit 7aa28b6bdd86b0ad8ca119fb8fc2f864f219a0dd +Author: Alexander Morozov +Date: Mon Nov 2 08:28:34 2015 -0800 + + Fix go vet warnings + + Signed-off-by: Alexander Morozov + +commit 270e8cf64dee586240968900fb1cf8e36ed641a5 +Author: Alexander Morozov +Date: Mon Nov 2 08:02:25 2015 -0800 + + Fix golint warnings + + Signed-off-by: Alexander Morozov + +commit ca0a9913c3a930ecf8b1680c5655fb8f4a92df26 +Merge: 38d3fc00d3 b087846c0e +Author: Doug Davis +Date: Mon Nov 2 10:34:29 2015 -0500 + + Merge pull request #17609 from LK4D4/fix_format + + Fix error formatting + +commit b087846c0e087fac24681148997582d4eb890fba +Author: Alexander Morozov +Date: Mon Nov 2 06:51:48 2015 -0800 + + Fix error formatting + + Signed-off-by: Alexander Morozov + +commit 29ae808472ab903a494f840c924337588cb04bec +Author: Miloslav Trmač +Date: Fri Oct 30 20:46:51 2015 +0100 + + Don't compute an unnecessary cryptographic hash + + Signed-off-by: Miloslav Trmač + +commit 8a2897e141f0fea20beb9bdebfc6bb287c31aad2 +Author: Alexandre Beslic +Date: Mon Nov 2 06:10:50 2015 -0800 + + Add configurable discovery + + This PR allows to configure the discovery path using the + --discovery-opt flag (with "kv.path=path/to/nodes"). We + can point to "docker/nodes" and use the docker discovery. + + If docker instances are advertising to the cluster using + the `--cluster-advertise` flag, the swarm join command + becomes unnecessary. + + Signed-off-by: Alexandre Beslic + +commit 38d3fc00d3e3f8f8eb87558b0a2f688711125fd3 +Merge: c6fd886db3 5a3236d9e8 +Author: Vincent Demeester +Date: Mon Nov 2 13:55:32 2015 +0100 + + Merge pull request #17602 from HuKeping/update-history + + Update logic of history + +commit a82f9ac81956c6b63772c9c720878d377dd9ee02 +Author: Shijiang Wei +Date: Mon Nov 2 17:51:17 2015 +0800 + + increase the maxJSONDecodeRetry in json log reader + + Signed-off-by: Shijiang Wei + +commit f5fc832b6e786bbcd7dfe98b1ec04b8b8d1935ae +Author: Antonio Murdaca +Date: Mon Nov 2 10:10:23 2015 +0100 + + graph: enhance err message on failed image restore + + Signed-off-by: Antonio Murdaca + +commit 864e892e2a310c5b67dfd842e39634dd0d99da73 +Author: John Howard +Date: Sun Nov 1 20:08:37 2015 -0800 + + Windows: Fix dockerfile\parser unit test + + Signed-off-by: John Howard + +commit 6694326d5d23ab866d1fccf1f9cbcedfd8a31e85 +Author: Zuhayr Elahi +Date: Wed Oct 21 20:30:54 2015 -0700 + + Added c.Assert statements to docker_api_create_test.go + + removed the if/else statements and added c.Assert statements for docker_api_create_test.go. + + Removed check.commentf in c.Assert statements + + Signed-off-by: Zuhayr Elahi + +commit 0cd99bcdd876ca0293d8944980c79f32064b6354 +Merge: d442961887 6b9623db37 +Author: Sven Dowideit +Date: Mon Nov 2 12:57:14 2015 +1000 + + Merge pull request #22 from moxiegirl/fixed + + Fixing the build + +commit 6b9623db37bc018ac41603d0b87a0a47f51c20ca +Author: Mary Anthony +Date: Sun Nov 1 18:53:54 2015 -0800 + + Fixing the build + + Signed-off-by: Mary Anthony + +commit d44296188712af909690a11fcfcfbd2a2e33e865 +Merge: cbee953f0d cd7c2b6195 +Author: Sven Dowideit +Date: Mon Nov 2 12:44:56 2015 +1000 + + Merge pull request #21 from moxiegirl/moving-project + + Moving how to contribute files into opensource + +commit c6fd886db3de7378615d09e749030a70a7c85b07 +Merge: e2e2ea401a e400125b66 +Author: Sven Dowideit +Date: Mon Nov 2 12:44:41 2015 +1000 + + Merge pull request #17601 from moxiegirl/moving-project + + Moving project to docker/opensource + +commit e400125b662e6ea8605e05772ed79ea2781f6d17 +Author: Mary Anthony +Date: Sat Oct 31 19:50:19 2015 -0700 + + Moving project to docker/opensource + + Signed-off-by: Mary Anthony + +commit 5a3236d9e8ee8c0051c0cc758ec359fa089b3291 +Author: Hu Keping +Date: Mon Nov 2 10:27:54 2015 +0800 + + Update logic of history + + Signed-off-by: Hu Keping + +commit e2e2ea401a6e1095064bd8f5731f012cee45797b +Merge: 1340d456ad d2382f7b96 +Author: moxiegirl +Date: Sun Nov 1 12:30:58 2015 -0800 + + Merge pull request #17591 from moxiegirl/remove-old-api + + Remove old api docs that are no-longer appearing on docs-docker.com + +commit 1340d456adf246a6a3482587a24913ade5a635db +Merge: e2a879bedd 670fd201de +Author: Alexander Morozov +Date: Sun Nov 1 10:37:22 2015 -0800 + + Merge pull request #17572 from Microsoft/10662-parserskernel + + Windows: Fix parsers kernel test + +commit d2382f7b96a58f141a83928f53930e9d946d6d04 +Author: Mary Anthony +Date: Sun Nov 1 08:22:10 2015 -0800 + + Remove old api docs that are no-longer appearing on docs-docker.com + + Signed-off-by: Mary Anthony + +commit e2a879bedd79ad929d8362aa8f9014f32b8cd02e +Merge: d4bf773d27 e4d86c2c38 +Author: Sebastiaan van Stijn +Date: Sun Nov 1 17:06:44 2015 +0100 + + Merge pull request #17590 from moxiegirl/fix-122-link + + Update to hide the 1.10 material + +commit e4d86c2c38f4c99660da8ed65a8103e283e07e23 +Author: Mary Anthony +Date: Sun Nov 1 08:03:08 2015 -0800 + + Update to hide the 1.10 material + + Signed-off-by: Mary Anthony + +commit d4bf773d2722713fd1b8ee5f15284c05ea306acd +Merge: 29c9717cac 5ce093e945 +Author: Sebastiaan van Stijn +Date: Sun Nov 1 16:44:15 2015 +0100 + + Merge pull request #17583 from moxiegirl/link-fixes + + Fixing broken links + +commit 670fd201dea0396d90127a30d96bb25ae757026f +Author: John Howard +Date: Sat Oct 31 11:22:31 2015 -0700 + + Windows: Fix parsers kernel test + + Signed-off-by: John Howard + +commit dfaa8daf9bdd8e31607ea97901955d1bcf4beddf +Merge: fd0775e1dc 40bfc3f890 +Author: Diogo Mónica +Date: Sun Nov 1 10:32:03 2015 +0000 + + Merge pull request #255 from mtrmac/no-P224 + + Don't use elliptic.P224() + +commit fd0775e1dcb0d9d5c969ab2193cb75544e4d8d36 +Merge: 75c1b48a58 93c28ccb1b +Author: Diogo Mónica +Date: Sun Nov 1 10:31:29 2015 +0000 + + Merge pull request #257 from mtrmac/fix-export-root + + Fix (notary key export-root) + +commit 75c1b48a58fd6e1b838336345fd70e9ca2b5d207 +Merge: fa5c4e608d 07ae585485 +Author: Diogo Mónica +Date: Sun Nov 1 10:21:13 2015 +0000 + + Merge pull request #260 from cyli/document-require-1.5.1 + + Update README to reflect go 1.5.1 requirement + +commit 29c9717cac9d8da8c6327d742deb514fc7ab152b +Merge: 4468e1e74e a9c7c48cca +Author: Antonio Murdaca +Date: Sun Nov 1 11:07:54 2015 +0100 + + Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test + + refactor docker_cli_netmode_test .go with Assert statement + +commit 07ae5854851e34942963a0184bd4dc49ed2a4002 +Author: Ying Li +Date: Sun Nov 1 01:47:51 2015 -0700 + + Fix dockerfiles to no longer have the "-X ...GitCommit" deprecation warning + + Signed-off-by: Ying Li + +commit 301c0892f33d1e69365cc8ae395395220cb7072c +Author: Ying Li +Date: Sun Nov 1 01:36:38 2015 -0700 + + Update README to reflect go 1.5.1 requirement and add an endpoint + to the makefile to check the go version + + Signed-off-by: Ying Li + +commit 830c612933c66b60a2506f09ac03244fc323ab8c +Merge: d395fa59a1 5aae69fc58 +Author: Victor Vieux +Date: Sun Nov 1 00:20:36 2015 -0700 + + Merge pull request #1362 from jimmyxian/add-integraion-test + + Add integraion test for rmi -f with image tag + +commit cd7c2b6195a45d5780259f13b0876e0a80434973 +Author: Mary Anthony +Date: Sat Oct 31 19:55:00 2015 -0700 + + Adding project + Moving files around + Cleaning up from linters + Adding in index.md to each dir + + Signed-off-by: Mary Anthony + +commit 876496738116611d350a3ce196ad836291beb1fd +Author: John Howard +Date: Sat Oct 31 11:49:03 2015 -0700 + + Windows: Fix daemon\graphdriver\graphtest + + Signed-off-by: John Howard + +commit 5ce093e94565a5f32df9adf78dcdb6deeda75f79 +Author: Mary Anthony +Date: Sat Oct 31 19:27:21 2015 -0700 + + Fixing broken links + Fixing the weight + + Signed-off-by: Mary Anthony + +commit 910e4ba7ed3b686b549b09bfb2e5f860a4a52923 +Author: John Howard +Date: Sat Oct 31 19:19:24 2015 -0700 + + Windows: Factor out user in execdriver\driver + + Signed-off-by: John Howard + +commit 5365cfa8c66906b45553f25da809e2fc8857f27e +Author: Jeffrey Morgan +Date: Sat Oct 31 16:59:16 2015 -0700 + + Remove caching for now + + Signed-off-by: Jeffrey Morgan + +commit 0c57b9f5b3cb72df47578a3f0e505db2bec5ccf1 +Author: Phil Estes +Date: Fri Oct 30 16:39:04 2015 -0400 + + Fix integration-cli daemon restart with user namespaces enabled + + The `d.root` dir is resolved to the full path to the graph dir after the + daemon starts, but on restart, should be set back to the parent (without + the "." ending) so that it uses/resolves to the same graphdir + on restart. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit be2f53ece8a57907ec9a1855f4d0c06a086c206b +Author: John Howard +Date: Sat Oct 31 11:39:19 2015 -0700 + + Windows: Fix native exec template + + Signed-off-by: John Howard + +commit 96b45e9216252863f1a4c89218877e8354030aba +Author: John Howard +Date: Sat Oct 31 11:32:37 2015 -0700 + + Windows: Fix docker device tool + + Signed-off-by: John Howard + +commit 4468e1e74e225f38b251fbcfdce633b619ea2e7a +Merge: 8d584da96e 30ab497e17 +Author: Alexander Morozov +Date: Sat Oct 31 09:40:19 2015 -0700 + + Merge pull request #17567 from Microsoft/10662-lxcunittest + + Windows: Fix go test in execdriver\lxc + +commit 8d584da96e71691d2d70c493818c2b056f7553c5 +Merge: 5719d01066 5452954d89 +Author: Alexander Morozov +Date: Sat Oct 31 09:35:39 2015 -0700 + + Merge pull request #17568 from Microsoft/10662-journald + + Windows: Fix journald compile error + +commit 5452954d89160985d4d896f4241f1838b4114413 +Author: John Howard +Date: Sat Oct 31 08:31:25 2015 -0700 + + Windows: Fix journald compile error + + Signed-off-by: John Howard + +commit 30ab497e174cdf788b8e7864c2e2e4019a119978 +Author: John Howard +Date: Sat Oct 31 08:25:30 2015 -0700 + + Windows: Fix go test in execdriver\lxc + + Signed-off-by: John Howard + +commit 5719d010665377c0696e36b894e742399deb30ed +Merge: ed6e3cf704 de1d611990 +Author: Arnaud Porterie +Date: Sat Oct 31 07:43:22 2015 -0700 + + Merge pull request #16579 from coolljt0725/fix_attach_paused_container + + Add show error when attach to a paused container + +commit ed6e3cf7043e7454e10e390bc1a33343e3615c5d +Merge: f87082f08e e41eae8b42 +Author: Alexander Morozov +Date: Fri Oct 30 23:00:17 2015 -0700 + + Merge pull request #17537 from mountkin/fix-logger-race + + fix a race in json logger reader + +commit 5aae69fc58a480827d3c84bf471d1e33cce08aa0 +Author: Xian Chaobo +Date: Sat Oct 31 10:36:02 2015 +0800 + + add integraion test for rmi -f with image tag + + Signed-off-by: Xian Chaobo + +commit f87082f08e6b91a33e251215040350faa0d78d71 +Merge: cccb6bce7d cf1a6c08fa +Author: Brian Goff +Date: Fri Oct 30 21:11:15 2015 -0400 + + Merge pull request #17545 from LK4D4/writehs_encode + + Use json.Encoder for container.writeHostConfig + +commit cccb6bce7d76672a41e683d19063a4c12a0ced08 +Merge: 2e466bafda 5970e94072 +Author: Brian Goff +Date: Fri Oct 30 20:59:57 2015 -0400 + + Merge pull request #17524 from mountkin/fix-teardown + + dont try to remove builtin networks in teardown + +commit 8ceded6d0384bef32dfddf800057fa08d910e95e +Author: Donald Huang +Date: Fri Oct 30 23:32:09 2015 +0000 + + add tests for docker stats versioning + + testing for #17549 + + Signed-off-by: Donald Huang + +commit 2e466bafda752c3f51adc6ad7e862d65f4c43deb +Merge: 09cb1f1121 e16e794805 +Author: David Calavera +Date: Fri Oct 30 17:13:40 2015 -0700 + + Merge pull request #17548 from mavenugo/ugr + + Vendoring libnetwork to fix #17526 & #17527 + +commit 09cb1f112134670561d33533ecee85aceedfb31c +Merge: 6d8aff07ac d5c85897f4 +Author: David Calavera +Date: Fri Oct 30 17:10:04 2015 -0700 + + Merge pull request #17529 from Microsoft/10662-builderisolation + + Windows: [TP4] Allows --isolation on docker build + +commit 6d8aff07ac18f0a2469bf5ce3e47ddb7d0539f60 +Merge: 9bf20c6847 36a69bbc60 +Author: David Calavera +Date: Fri Oct 30 16:56:11 2015 -0700 + + Merge pull request #17547 from LK4D4/unn_stat + + Remove unnecessary Stat check from readHostConfig + +commit 9bf20c68474c7f982100d2529f61eecc1732f4c5 +Merge: 33f5429786 d2c04f844b +Author: David Calavera +Date: Fri Oct 30 16:45:41 2015 -0700 + + Merge pull request #17549 from donhcd/fixPre122Stats + + fix pre-1.21 docker stats + +commit ae2d344c2b60f3e06b5e7d20640559afa23f44a4 +Author: Olivier Gambier +Date: Thu Oct 29 11:14:09 2015 -0700 + + Carry on commits from #2033 + + A couple of small cleanup and enhancements that were dropped after the revert. + + Signed-off-by: Olivier Gambier + +commit e16e794805ec1e578951f271af7993d9619a4ede +Author: Alessandro Boch +Date: Fri Oct 30 14:51:02 2015 -0700 + + IT for daemon restarts when container connected to multiple networks + + Signed-off-by: Alessandro Boch + +commit 401632c7568408ee9689adc1da855cfb1409e906 +Author: Madhu Venugopal +Date: Fri Oct 30 15:06:44 2015 -0700 + + fixing ungraceful daemon restart case where nw connect is not persisted + + For graceful restart case it was done when the container was brought + down. But for ungraceful cases, the persistence is missing for nw + connect + + Signed-off-by: Madhu Venugopal + +commit 2361edbcea22113aea639a3d74edb35791fd8aef +Author: Madhu Venugopal +Date: Fri Oct 30 15:05:01 2015 -0700 + + Vendoring in libnetwork to fix an ungraceful restart case + + Also picked up a minor typo fix + + Signed-off-by: Madhu Venugopal + +commit 9952fe76b47ed65be0afa24bcfcb4c7506028f2e +Author: Jeffrey Morgan +Date: Fri Oct 30 16:22:46 2015 -0700 + + Dont prompt user for migrate now that migrate checkbox exists + + Signed-off-by: Jeffrey Morgan + +commit 060f0a0db2b952c3fadcb481705dea295f8098f5 +Author: Nathan LeClaire +Date: Fri Oct 30 14:57:57 2015 -0700 + + Fix issues with create and ssh command help text + + Signed-off-by: Nathan LeClaire + +commit a54d5932e3a644317c77d59bc5aee562841d5c20 +Author: David Calavera +Date: Fri Oct 30 19:00:01 2015 -0400 + + Turn IPC unmount errors into warnings. + + And do not try to unmount empty paths. + + Because nobody should be woken up in the middle of the night for them. + + Signed-off-by: David Calavera + +commit 33f54297865984bba0a37cefb110af70cc0135b4 +Merge: 0c991f3d68 f301c5765a +Author: Alexandre Beslic +Date: Fri Oct 30 16:03:51 2015 -0700 + + Merge pull request #17538 from calavera/deprecated_bridge_interface + + Fix network inspect for default networks. + +commit 1c977f64602739fc2d70d90a80d796e1f341d060 +Author: Jeffrey Morgan +Date: Fri Oct 30 16:01:03 2015 -0700 + + Cache after build + + Signed-off-by: Jeffrey Morgan + +commit bc3af641cca2988a2be6c4d4cc9e2c3edcd4f654 +Author: Jeffrey Morgan +Date: Fri Oct 30 15:58:39 2015 -0700 + + CircleCI artifacts + + Signed-off-by: Jeffrey Morgan + +commit 70e01635551f54af504c36a0a2fd883e601a05b6 +Author: Jeffrey Morgan +Date: Fri Oct 30 15:48:29 2015 -0700 + + Create cache directory + + Signed-off-by: Jeffrey Morgan + +commit 884feeef10c8c4b3fd1b95bf7fbd1778c9961032 +Merge: 359729d48c 1170f6708a +Author: Jeffrey Morgan +Date: Fri Oct 30 15:44:06 2015 -0700 + + Merge branch 'master' of github.com:docker/toolbox + +commit 359729d48ce4f2e8e2b5c3a5d853ec7ca9c9cc30 +Author: Jeffrey Morgan +Date: Fri Oct 30 15:44:02 2015 -0700 + + Add compose to windows + + Signed-off-by: Jeffrey Morgan + +commit 1170f6708af30ab51d43c8d8b11e4d9b257332d7 +Author: Jeffrey Morgan +Date: Fri Oct 30 15:43:00 2015 -0700 + + Update README.md + +commit d2c04f844b8258d712da4b8feac25df7590b037c +Author: Donald Huang +Date: Fri Oct 30 22:04:21 2015 +0000 + + fix pre-1.22 docker stats + + This fixes a bug introduced in #15786: + + * if a pre-v1.20 client requested docker stats, the daemon + would return both an API-compatible JSON blob *and* an API-incompatible JSON + blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629 + + Signed-off-by: Donald Huang + +commit 721f39d4af3670d9d4515ee9e373fe0bfc6ca221 +Merge: be5fce87b6 0176f05db8 +Author: Nathan LeClaire +Date: Fri Oct 30 15:24:59 2015 -0700 + + Merge pull request #2128 from dgageot/2127-detect-hw-virtualization-issue-on-linux + + FIX #2127 Detect that HW virtualization is not supported + +commit d395fa59a1210d155034b8c66ec772f93d20b64f +Merge: cb7ddd1fcb 1c1a99038e +Author: Alexandre Beslic +Date: Fri Oct 30 15:19:13 2015 -0700 + + Merge pull request #1361 from vieux/improve_network_inspect_test + + ensure docker network inspect is the same as the engine one + +commit 0c991f3d68227a57225552e0c5237a72e5177da2 +Merge: 23a0fe9627 9d14866d71 +Author: David Calavera +Date: Fri Oct 30 14:59:59 2015 -0700 + + Merge pull request #16779 from Microsoft/10662-execdrivercommand + + Windows: Refactor execdriver.Command + +commit be5fce87b682c8f4f12013a1ed05b9f942432736 +Merge: 952539dd8a 70e137991d +Author: Nathan LeClaire +Date: Fri Oct 30 14:54:10 2015 -0700 + + Merge pull request #2133 from nathanleclaire/dgageot-2129-Driver-name-is-lost-in-migration + + Fix DriverName missing in 0.3.1 => 0.5.0 migration + +commit 36a69bbc6050c5916f7267679ff7d61b5dfc5b8e +Author: Alexander Morozov +Date: Fri Oct 30 14:54:09 2015 -0700 + + Remove unnecessary Stat check from readHostConfig + + Signed-off-by: Alexander Morozov + +commit cb7ddd1fcb455d33c54530d9932caf8873d012e6 +Merge: 0a8cf2cf06 a36a9b416c +Author: Alexandre Beslic +Date: Fri Oct 30 14:51:15 2015 -0700 + + Merge pull request #1359 from vieux/update_network_types + + update network types + +commit cf1a6c08fa03aa7020f8f5b414bb9349a9c8371a +Author: Alexander Morozov +Date: Fri Oct 30 14:45:35 2015 -0700 + + Use json.Encoder for container.writeHostConfig + + Signed-off-by: Alexander Morozov + +commit 23a0fe9627e6056826c7c3bf55cb0c1bfdde52bc +Merge: 85d7bbf7aa 78bd17e805 +Author: Alexander Morozov +Date: Fri Oct 30 14:40:42 2015 -0700 + + Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling + + Force IPC mount to unmount on daemon shutdown/init + +commit 85d7bbf7aab301026741693f034b799b01f58394 +Merge: 74362e8392 cf02b369e0 +Author: David Calavera +Date: Fri Oct 30 14:36:42 2015 -0700 + + Merge pull request #17528 from LK4D4/todisk_encode + + Use json.Encoder for container.toDisk + +commit 70e137991da434eb593c5d0f8bd33cd4dae19342 +Author: Nathan LeClaire +Date: Fri Oct 30 14:22:29 2015 -0700 + + Fix DriverName missing in 0.3.1 => 0.5.0 migration + + Signed-off-by: Nathan LeClaire + Signed-off-by: David Gageot + +commit 74362e8392bc60081c6083ab022ca5c6e6496134 +Merge: 8d7d51190d ecb87ed0a5 +Author: Tibor Vass +Date: Fri Oct 30 17:01:36 2015 -0400 + + Merge pull request #17531 from crosbymichael/no-set-reservation + + Don't set mem soft limit if not specifiecd + +commit 8d7d51190d43ca61b5af855374044f51d6a9fa9d +Merge: a154b95d06 d795bc7d53 +Author: Alexandre Beslic +Date: Fri Oct 30 14:01:13 2015 -0700 + + Merge pull request #17541 from aboch/uc + + Modify IPAMConfig structure json tags + +commit f301c5765a0d7f4b6866cedfdface6f87874ff53 +Author: David Calavera +Date: Fri Oct 30 14:57:15 2015 -0400 + + Fix network inspect for default networks. + + - Keep old fields in NetworkSetting to respect the deprecation policy. + + Signed-off-by: David Calavera + +commit 9d14866d7173e974b9eff34e251b16083647f056 +Author: John Howard +Date: Mon Oct 5 14:27:39 2015 -0700 + + Windows: Refactor execdriver.Command + + Signed-off-by: John Howard + +commit 805dd0eeed1824c9f3dcdb3108ea15686ae15223 +Author: John Howard +Date: Thu Oct 15 11:40:14 2015 -0700 + + Windows: Native ANSI console support + + Signed-off-by: John Howard + +commit ef17db8d73304f4dd3d2b943376025315c4a5df7 +Merge: 326ec6c121 33428c37e1 +Author: Richard Scothern +Date: Fri Oct 30 13:43:07 2015 -0700 + + Merge pull request #1122 from RichardScothern/scheduler-coalesce + + Buffer writes to scheduler state file. + +commit b1da9fcc841a175776697ad64d2c6b22f27d097d +Author: Mike Brown +Date: Thu Oct 29 15:40:50 2015 -0500 + + putting in support for rmi id for legacy docker.io/name images in local repositories + + Signed-off-by: Mike Brown + +commit fa5c4e608d3ad64ccfd7e3a11974776141503abe +Merge: e2c6e989e9 62dc66e936 +Author: Ying Li +Date: Fri Oct 30 13:23:33 2015 -0700 + + Merge pull request #256 from mtrmac/fix-import-root + + Remove key ID from (notary key import-root) + +commit e2c6e989e93654c8cd5822e1e8a346c8bed8db65 +Merge: 29f5a4523c c2d560c789 +Author: Ying Li +Date: Fri Oct 30 13:15:49 2015 -0700 + + Merge pull request #259 from mtrmac/drop-debug-print + + Remove a left-over debugging Println + +commit d795bc7d53db4b9e9194d0570d65e22d39f58384 +Author: Alessandro Boch +Date: Fri Oct 30 12:54:13 2015 -0700 + + Modify IPAMConfig structure json tags + + - So that it complies with docker convention for inspect + + Signed-off-by: Alessandro Boch + +commit be6b811c4e9a1e8f22f2216c128b9bc91f4ebfdd +Author: Daniel Nephin +Date: Thu Oct 29 12:51:57 2015 -0400 + + Bump 1.5.0rc3 + + Signed-off-by: Daniel Nephin + +commit bdb9a280bc8e42ac79dc453c44b4ceb74f1aaee6 +Author: Daniel Nephin +Date: Wed Oct 21 15:26:44 2015 -0400 + + Make storage driver configurable in CI + + Signed-off-by: Daniel Nephin + +commit 73ca4eb5991dda6986d4970635a2f6aea463f8e4 +Author: Daniel Nephin +Date: Wed Oct 28 12:40:59 2015 -0400 + + On error print daemon logs + + Signed-off-by: Daniel Nephin + +commit 569ccbadec9edb396135ec991417e340d2bd56ee +Author: Daniel Nephin +Date: Wed Oct 28 12:11:29 2015 -0400 + + Convert the README to rst and fix the logo url before packaging it up for pypi. + + Signed-off-by: Daniel Nephin + +commit ed1b584c42c5acd6f33278df48939957720319b4 +Author: Daniel Nephin +Date: Wed Oct 28 12:01:34 2015 -0400 + + Fix release script notes about software and typos. + + Signed-off-by: Daniel Nephin + +commit 40bfc3f89002a3d6c6f1d4f97cec8779ba6de383 +Author: Miloslav Trmač +Date: Fri Oct 30 20:44:05 2015 +0100 + + Don't use elliptic.P224() + + This curve is not available on Fedora and RHEL systems, so removing the + reference allows tests to pass there. Vast majority of the + curve-specific work is done in the golang crypto/elliptic package, so + this does not weaken the tests noticeably. + + Signed-off-by: Miloslav Trmač + +commit 78bd17e805b7514505455b10f2fd90962505a3ff +Author: Brian Goff +Date: Fri Oct 30 14:55:52 2015 -0400 + + Force IPC mount to unmount on daemon shutdown/init + + Instead of using `MNT_DETACH` to unmount the container's mqueue/shm + mounts, force it... but only on daemon init and shutdown. + + This makes sure that these IPC mounts are cleaned up even when the + daemon is killed. + + Signed-off-by: Brian Goff + +commit 62dc66e93667ff21ff0eb891ebd8d0d35d2df5a6 +Author: Miloslav Trmač +Date: Fri Oct 30 16:24:42 2015 +0100 + + Remove key ID from (notary key import-root) + + PR #242 has started requiring a passphrase for the imported key, and + recomputes the key ID, making the command-line argument redundant. So, + remove it from the command line and from the KeyStoreManager API. + + Also updates the comment for KeyStoreManager.ImportRootKey, and changes + (notary key import-root) to refuse unexpected arguments instead of + silently ignoring them. + + Signed-off-by: Miloslav Trmač + +commit 93c28ccb1ba7f4214040051a086903ee420d68aa +Author: Miloslav Trmač +Date: Fri Oct 30 16:12:27 2015 +0100 + + Fix (notary key export-root) + + -c was recently taken over by --configFile; using it for + --change-passphrase as well results in + + panic: shorthand redefinition + + So, move --change-passphrase to -p. + + Signed-off-by: Miloslav Trmač + +commit c2d560c789d2e53e526724b30f54d55c5cb6ef8d +Author: Miloslav Trmač +Date: Fri Oct 30 19:55:59 2015 +0100 + + Remove a left-over debugging Println + + Signed-off-by: Miloslav Trmač + +commit 2f2e946907e463404e36525e91ec90f05b606e29 +Author: Daniel Nephin +Date: Fri Oct 30 11:53:36 2015 -0400 + + Don't set a default network driver, let the server decide. + + Signed-off-by: Daniel Nephin + +commit d392f70cc6aa88f60f40cf2e58d9603ebac847ac +Author: Daniel Nephin +Date: Tue Oct 27 15:04:35 2015 -0400 + + Fixes #1843, #1936 - chown files back to host user in django example. + + Also add a missing 'touch Gemfile.lock' to fix the rails tutorial. + + Signed-off-by: Daniel Nephin + +commit db164cefd336e152b12e3088aa92d274d852b157 +Author: Daniel Nephin +Date: Thu Oct 29 14:15:08 2015 -0400 + + Remove the duplicate 'Warning' prefix now that the logger adds the prefix. + + Signed-off-by: Daniel Nephin + +commit 4d613d3ba780f46c46669e829eadad1daf5e0cb4 +Author: Daniel Nephin +Date: Thu Oct 29 14:06:50 2015 -0400 + + Use colors when logging warnings or errors, so they are more obvious. + + Signed-off-by: Daniel Nephin + +commit 1f26841e238e4d1f005d194cae6f076b93a3d8a2 +Author: Joffrey F +Date: Fri Oct 30 14:15:47 2015 +0100 + + Integration test for run command with networking enabled + + Signed-off-by: Joffrey F + +commit 9370cb033cc7a51e55144085d2e76795c64982af +Author: Joffrey F +Date: Thu Oct 29 17:56:01 2015 +0100 + + Ensure network exists when calling run before up + + Otherwise the daemon will error out because the network doesn't exist + yet. + + Signed-off-by: Joffrey F + +commit 77e1fe1915a2ab6ae30fefa4de6a80ed9959bed2 +Merge: 66ef2519d3 491d052088 +Author: Daniel Nephin +Date: Fri Oct 30 15:29:30 2015 -0400 + + Merge pull request #2295 from dnephin/default_network_should_be_none + + Don't set a default network driver, let the server decide + +commit a154b95d06869ab6d76059114a18b3e672e73603 +Merge: 0aa3bff482 b2d0b75018 +Author: Tibor Vass +Date: Fri Oct 30 15:28:38 2015 -0400 + + Merge pull request #17536 from aboch/uc + + Modify Network structures json tags + +commit e41eae8b42052d07432405cca113ffcf8cf49c06 +Author: Shijiang Wei +Date: Sat Oct 31 02:15:49 2015 +0800 + + fix a race in json logger reader + + The json decoder starts to decode immediately an inotify event is + received. + But at the time the inotify event is trigged, the json log + entry might haven't been fully written to the disk. + In this case the decoder will return an "io.UnexpectedEOF" error, but + there is still data remaining in the decoder's buffer. And the data + should be passed to the decoder when the next inotify event is + triggered. + + Signed-off-by: Shijiang Wei + +commit b2d0b75018c5be5c671a15950546a79cda307cf2 +Author: Alessandro Boch +Date: Fri Oct 30 10:54:16 2015 -0700 + + Modify Network structure json tags + + - So that they comply with docker inspect convention + Which is allowing camel case for json field names + + Signed-off-by: Alessandro Boch + +commit 29f5a4523c9a4258681636e5311b7ed890139761 +Merge: e5c388d470 9428beea50 +Author: Diogo Mónica +Date: Fri Oct 30 11:21:52 2015 -0700 + + Merge pull request #254 from endophage/cryptoservice_multiple_keystores + + cryptoservices can abstract multiple keystores + +commit d5c85897f43b1956f874c6c93d10c30b5b82a726 +Author: John Howard +Date: Thu Oct 29 17:58:00 2015 -0700 + + Windows: Allows --isolation on docker build + + Signed-off-by: John Howard + +commit 9428beea505924b778c2831d3b9340238ba3d64b +Author: David Lawrence +Date: Fri Oct 30 11:08:35 2015 -0700 + + expose cryptoservice in NotarySigner + Signed-off-by: David Lawrence (github: endophage) + +commit f791c019741b728f5ea3015a26b29d3be3d89fd8 +Author: David Lawrence +Date: Fri Oct 30 11:04:37 2015 -0700 + + cryptoservices can abstract multiple keystores + Signed-off-by: David Lawrence (github: endophage) + +commit 0aa3bff482bc5a1f330667fb1174dbae5490af34 +Merge: 17a8fbeaeb 2716e3964d +Author: Jess Frazelle +Date: Fri Oct 30 10:39:48 2015 -0700 + + Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild + + Build broken on master (awslogs) + +commit 17a8fbeaebf1991fa8d97adb3f217edbecd651ea +Merge: aa832d0197 0c07096b7d +Author: Brian Goff +Date: Fri Oct 30 13:38:27 2015 -0400 + + Merge pull request #17514 from mavenugo/ugr + + Fixing a case of dangling endpoint during ungraceful daemon restart + +commit ecb87ed0a5128a3d9ab3b0a620463b7b56e82bab +Author: Michael Crosby +Date: Fri Oct 30 10:34:01 2015 -0700 + + Don't set mem soft limit if not specifiecd + + You cannot do this for individual cgroups for all the containers. Only + set the reservation if the user requested it. The error you will + receive is an EINTVAL when you try to set a large limit like we were in + the memory limit. + + Signed-off-by: Michael Crosby + +commit e5c388d4709494a8c768813de0dec84dd6b3a891 +Merge: 7e5cc048b7 06990fd5a1 +Author: Ying Li +Date: Fri Oct 30 10:33:46 2015 -0700 + + Merge pull request #246 from endophage/private_signer + + Private keys implement crypto.Signer + +commit 66ef2519d31298f96cecbcbec5f46063845d88e2 +Merge: c439e056a0 c7d164d01c +Author: Daniel Nephin +Date: Fri Oct 30 13:30:00 2015 -0400 + + Merge pull request #2265 from dnephin/volumes_in_guides_doc + + Update tutorials and small fix with rails tutorial + +commit 30b84911804104eadf34119b1ece12350929f77f +Author: Steven Lee +Date: Fri Oct 30 17:11:52 2015 +0000 + + Update for new nsqio image + + nsqio have changed they way the package the binaries into docker. There is now one image with all the binaries in it and each one is called on run. + This should fix the docker compose as per http://nsq.io/deployment/docker.html + + Signed-off-by: Steven Lee + +commit 06990fd5a1006c05f8ab63cdbe2e7db7caf42c52 +Author: David Lawrence +Date: Thu Oct 29 19:31:55 2015 -0700 + + integreating with @cyli's improvements + Signed-off-by: David Lawrence (github: endophage) + +commit aa832d019725160481b90204c317dd50f13e16c4 +Merge: f714118439 eb0a208f4b +Author: moxiegirl +Date: Fri Oct 30 10:10:04 2015 -0700 + + Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions + + Fix ubuntu installation instructions page + +commit f714118439394a8e2af8121bb3538e007549843b +Merge: c545dce004 c1a5ee53c1 +Author: moxiegirl +Date: Fri Oct 30 10:07:44 2015 -0700 + + Merge pull request #17447 from ehaydenr/master + + Update kill.md + +commit 2716e3964d7e30e924e7f5da3d7923c9f286cff2 +Author: John Howard +Date: Fri Oct 30 09:51:27 2015 -0700 + + Windows build broken on master (awslogs) + + Signed-off-by: John Howard + +commit c7d164d01c82e1349a1d9ef2beae1754dbc3500a +Author: Daniel Nephin +Date: Tue Oct 27 15:04:35 2015 -0400 + + Fixes #1843, #1936 - chown files back to host user in django example. + + Also add a missing 'touch Gemfile.lock' to fix the rails tutorial. + + Signed-off-by: Daniel Nephin + +commit c545dce004a4b833994478a2fc993ee8e2b3b2cd +Merge: aadae4b503 8a6dfb26f3 +Author: Tibor Vass +Date: Fri Oct 30 12:38:40 2015 -0400 + + Merge pull request #16640 from samuelkarp/awslogs-logging-driver + + [awslogs] Auto-detect region and set user-agent + +commit aadae4b503fbf21db788e12785cdc8844679bebc +Merge: 05534b6f80 15e35c4470 +Author: Michael Crosby +Date: Fri Oct 30 09:34:16 2015 -0700 + + Merge pull request #16412 from Microsoft/10662-hyper-v-containers + + Windows [TP4]: Adds support for Hyper-V Containers + +commit cf02b369e077022335f01b2f78ebd759129de82a +Author: Alexander Morozov +Date: Fri Oct 30 09:04:25 2015 -0700 + + Use json.Encoder for container.toDisk + + * for simmetry with fromDisk + * it might be slightly better for GC because of internal sync.Pool + + Signed-off-by: Alexander Morozov + +commit 05534b6f8007e1f614cccdf9467e07a8cc38ae3d +Merge: 2c6351a4a5 8f53edae3b +Author: Vincent Demeester +Date: Fri Oct 30 16:56:35 2015 +0100 + + Merge pull request #17518 from WeiZhang555/integration-test-bug + + bug fix for test cases + +commit 491d052088c3c5d66dba0bde175047748c44c73f +Author: Daniel Nephin +Date: Fri Oct 30 11:53:36 2015 -0400 + + Don't set a default network driver, let the server decide. + + Signed-off-by: Daniel Nephin + +commit 0176f05db877d2df5cfce7ff2cdcdf412e0a0202 +Author: David Gageot +Date: Fri Oct 30 16:19:38 2015 +0100 + + FIX #2127 Detect that HW virtualization is not supported + + Signed-off-by: David Gageot + +commit 5970e94072b922b4c5e4ef12fb1b11391ba36d6b +Author: Shijiang Wei +Date: Fri Oct 30 23:05:33 2015 +0800 + + dont try to remove builtin networks in teardown + + Signed-off-by: Shijiang Wei + +commit c439e056a0aaa96efe7b2d1471bfbc9df850f384 +Merge: 04a76dc284 841ed4ed21 +Author: Daniel Nephin +Date: Fri Oct 30 10:58:00 2015 -0400 + + Merge pull request #2288 from dnephin/warning_about_vars + + Add console color to warnings and errors so they are more obvious + +commit eb0a208f4bad5623e360fa936bfd230cd72414c4 +Author: evalle +Date: Fri Oct 30 15:46:34 2015 +0100 + + Fix ubuntu installation instructions page + + Signed-off-by: evalle + +commit 04a76dc284ff5630b8ce5e2ecc7ad42bd5b8920b +Merge: eb9b8dc592 072e7687ae +Author: Daniel Nephin +Date: Fri Oct 30 10:41:55 2015 -0400 + + Merge pull request #2287 from shin-/2284-ensure-network-exists-run + + Ensure network exists when calling run before up + +commit 2c6351a4a51d1090658c55b33fbbec28c635c97b +Merge: 0598ff46ac 483abbb313 +Author: Brian Goff +Date: Fri Oct 30 10:36:41 2015 -0400 + + Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test + + Checkers on integration-cli/docker_cli_commit_test + +commit 072e7687ae1e710ee8b82b44f5baba8f20caa4cb +Author: Joffrey F +Date: Fri Oct 30 14:15:47 2015 +0100 + + Integration test for run command with networking enabled + + Signed-off-by: Joffrey F + +commit 0598ff46ac0d4e485ff8109f9d287990d5d54256 +Merge: 77488b90c5 d0762a60e0 +Author: Vincent Demeester +Date: Fri Oct 30 12:56:52 2015 +0100 + + Merge pull request #17427 from zelahi/16756-dockercli-killtest + + modified docker_cli_kill_test.go to use c.Asserts + +commit 77488b90c5dbc4d3e5237aa856fdd042ff8d9f42 +Merge: e990eca1e5 f4abc6406e +Author: Antonio Murdaca +Date: Fri Oct 30 12:41:14 2015 +0100 + + Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test + + Using checkers assert for integration-cli/docker_cli_attach_unix_test.go + +commit e990eca1e5b73c4e87f2e3b18f52f3d9630a988b +Merge: 855487b379 ace5854f65 +Author: Antonio Murdaca +Date: Fri Oct 30 12:24:03 2015 +0100 + + Merge pull request #17510 from LK4D4/refactor_shutdown + + Refactor Shutdown a little to reduce indentation + +commit 855487b37926f64ad456c430fb4eb51606d5b256 +Merge: 6b9de7342f 09eedc35b2 +Author: Sebastiaan van Stijn +Date: Fri Oct 30 10:33:16 2015 +0100 + + Merge pull request #17365 from HuKeping/rework-history + + Rework docker cli history + +commit 6b9de7342ff79d9dbf889dd2d66a9b7dc6523c28 +Merge: 81c5b1ce4a 134772f91e +Author: Antonio Murdaca +Date: Fri Oct 30 09:48:16 2015 +0100 + + Merge pull request #17498 from LK4D4/fix_graph_comment + + Fix Graph() docstring + +commit 81c5b1ce4a5db623b04b5cce254b4e2ef7ef2c5b +Merge: 4f3dd3db5a 164d0bca63 +Author: Vincent Demeester +Date: Fri Oct 30 08:50:54 2015 +0100 + + Merge pull request #17492 from aidanhs/aphs-remove-dead-code + + Remove dead code + +commit 1c1a99038e344d7b18c0cfa83f2109a24cb7742e +Author: Victor Vieux +Date: Fri Oct 30 00:38:42 2015 -0700 + + ensure docker network inspect is the same as the engine one + + Signed-off-by: Victor Vieux + +commit 4f3dd3db5abc5a6044ce6eb1a762bb9e7d327b1f +Merge: 1795eb9545 9862a4b43e +Author: Vincent Demeester +Date: Fri Oct 30 08:33:43 2015 +0100 + + Merge pull request #17463 from dongluochen/volumeRouter + + extract docker volume API from local + +commit 8f53edae3bd628e00f052182a3a5e84ee578f018 +Author: Zhang Wei +Date: Fri Oct 30 15:07:17 2015 +0800 + + bug fix for test cases + + Fix bug that `isNwPresent` can't distinguish network names with same + prefix. + + Signed-off-by: Zhang Wei + +commit a36a9b416c3f81e3e097c7612eae18d2a06bf874 +Author: Victor Vieux +Date: Fri Oct 30 00:03:08 2015 -0700 + + update network types + + Signed-off-by: Victor Vieux + +commit 7e5cc048b75ccec580c907cbaab16a8c13680b87 +Merge: 3bd4637b09 5ea5b40d3f +Author: Diogo Mónica +Date: Thu Oct 29 22:22:24 2015 -0700 + + Merge pull request #253 from cyli/prometheus-server + + Add prometheus stats to server http handlers + +commit 0a8cf2cf066dc8ec7235b4dc0f2c21c9e9863f8e +Merge: d2c5446ea0 5d1fd77aea +Author: Victor Vieux +Date: Thu Oct 29 22:00:24 2015 -0700 + + Merge pull request #1355 from jimmyxian/fix-push-image + + fix push image + +commit 5ea5b40d3fd030c867d68b5966a3c19187682019 +Author: Ying Li +Date: Thu Oct 29 21:04:35 2015 -0700 + + Add prometheus stats to server http handlers + + Signed-off-by: Ying Li + +commit 42f1dbb9643dd681a1de9c58b49c2dc1056a450e +Author: Emmanuel Bretelle +Date: Tue Oct 27 22:13:30 2015 -0700 + + virtualbox: support linux host + + Fixes #2110 + + Signed-off-by: Emmanuel Bretelle + +commit 3bd4637b09eb1871af255686abec9e77b49b645e +Merge: 4c195db439 169d67169c +Author: Ying Li +Date: Thu Oct 29 20:03:49 2015 -0700 + + Merge pull request #251 from HuKeping/fix-list + + Fix broken list + +commit 483abbb313a35696a9c1b7ff72407b0a0118a22b +Author: Aditi Rajagopal +Date: Fri Oct 16 16:48:51 2015 -0500 + + Checkers on integration-cli/docker_cli_commit_test + + Applying #16756 to integration-cli/docker_cli_commit_test.go + + Signed-off-by: Aditi Rajagopal + +commit 169d67169c9a32d309eb75ab610a071a62cccb2c +Author: HuKeping +Date: Fri Oct 30 10:37:17 2015 +0800 + + Fix broken list + + Signed-off-by: Hu Keping + +commit 8c128e746d2f28b4a722b198d28cb3f0e6002683 +Author: Jeffrey Morgan +Date: Thu Oct 29 19:06:15 2015 -0700 + + Fix bug where upgrade would fail if VM is stopped. + + Signed-off-by: Jeffrey Morgan + +commit 4c195db439e0a1ce61fc3a23e545e6363c181467 +Merge: e904675043 4e59ed05bc +Author: Ying Li +Date: Thu Oct 29 19:04:11 2015 -0700 + + Merge pull request #249 from jfrazelle/dockerfile-cleanup + + better named dockerfiles and upgrade to go 1.5.1 + +commit 0c07096b7da6dc28df10df21283fc21b3b052e1a +Author: Madhu Venugopal +Date: Thu Oct 29 18:56:56 2015 -0700 + + Fixes a case of dangling endpoint during ungraceful daemon restart + + When a container restarts after a ungraceful daemon restart, first + cleanup any unclean sandbox before trying to allocate network resources. + + Signed-off-by: Madhu Venugopal + +commit ebf76171f6d63938558cdd5bef33565b48d664b7 +Author: Madhu Venugopal +Date: Thu Oct 29 18:56:17 2015 -0700 + + Vendoring libnetwork to solve an ungraceful restart condition + + Signed-off-by: Madhu Venugopal + +commit 1795eb9545011699feef2d2497ab23ef18664398 +Merge: d7bdbdf564 985fe8857d +Author: Tianon Gravi +Date: Thu Oct 29 18:56:06 2015 -0700 + + Merge pull request #17512 from jfrazelle/update-go-deb-rpm + + update go version for debs and rpms + +commit 1f04b1ea02da67eddd3789bf4acc06ce46f14433 +Merge: 2d3a95a0e8 60db63d38c +Author: Jeffrey Morgan +Date: Thu Oct 29 18:48:48 2015 -0700 + + Merge branch 'master' of github.com:docker/toolbox + +commit 2d3a95a0e86cbc5cf841b85ce605309ebb5c61a1 +Author: Jeffrey Morgan +Date: Thu Oct 29 18:48:44 2015 -0700 + + Bump versions for rc3 + + Signed-off-by: Jeffrey Morgan + +commit 7a24fbf32fcbe048afbc8362586c51b406865c61 +Author: David Lawrence +Date: Thu Oct 29 10:04:16 2015 -0700 + + adding singer interfaces to private keys: + Signed-off-by: David Lawrence (github: endophage) + +commit e904675043c1cfe7289098c31d3ee68a936c87b5 +Merge: f9019873a6 91d54899d7 +Author: David Lawrence +Date: Thu Oct 29 17:47:31 2015 -0700 + + Merge pull request #247 from cyli/remove-unlocked-cryptoservice + + Remove unlocked_cryptoservice and GetRootCryptoService + +commit d7bdbdf564d58b6f5d47c8114b720c96eaee80df +Merge: 82203d06eb 34668ad68b +Author: Tibor Vass +Date: Thu Oct 29 20:37:21 2015 -0400 + + Merge pull request #17504 from calavera/default_network_driver + + Let the api to choose the default network driver. + +commit ace5854f654d58e821bb3d47c4e3255ae49619e5 +Author: Alexander Morozov +Date: Thu Oct 29 15:11:35 2015 -0700 + + Refactor Shutdown a little to reduce indentation + + Also make daemon.netController.Stop() regardless of container existance. + + Signed-off-by: Alexander Morozov + +commit 4e59ed05bc38fbd525be6471106fac8442714117 +Author: Jessica Frazelle +Date: Thu Oct 29 17:18:43 2015 -0700 + + better named dockerfiles and upgrade to go 1.5.1 + + Signed-off-by: Jessica Frazelle + +commit 985fe8857d6670e5a484237a8c8ccdde66a39013 +Author: Jessica Frazelle +Date: Thu Oct 29 17:04:38 2015 -0700 + + update go version for debs and rpms + + Signed-off-by: Jessica Frazelle + +commit 14658306ba24576f26b65c2756562939c32810e8 +Merge: 6325b07b5c df9e18240f +Author: French Ben +Date: Thu Oct 29 17:02:09 2015 -0700 + + Merge pull request #1157 from kitematic/revert-1155-1061-VM-name + + Revert "Added selector for VM fixes #1061" + +commit df9e18240fa26d1e68345d248ace8cb349351b75 +Author: French Ben +Date: Thu Oct 29 16:52:13 2015 -0700 + + Revert "Added selector for VM fixes #1061" + +commit 34668ad68bb42d7488649e41b32818f3f1a7cff2 +Author: David Calavera +Date: Thu Oct 29 16:48:25 2015 -0400 + + Let the api to choose the default network driver. + + That way swarm can understand the user's intention. + + Signed-off-by: David Calavera + +commit c1a5ee53c19d62918f5ef245b5d2268fb9c89ca8 +Author: Eric Rosenberg +Date: Wed Oct 28 13:06:21 2015 -0500 + + Update kill.md + + Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used. + + Signed-off-by: Eric Rosenberg + +commit 82203d06ebbd7e205cf620c2e8555914f3c86d8f +Merge: 6c80fd2468 ac4b290552 +Author: Brian Goff +Date: Thu Oct 29 19:37:10 2015 -0400 + + Merge pull request #17497 from LK4D4/put_err + + Do not ignore errors from graphdriver.Put + +commit 91d54899d77e5f475fb7b919085f94dfb1ed520a +Author: Ying Li +Date: Thu Oct 29 16:34:40 2015 -0700 + + Add a GetPrivateKey method to cryptoservice so that we can future-proof + cryptoservice having multiple keystores + + Signed-off-by: Ying Li + +commit 7dc0dbec84537cf85488bcf88510d9669687c848 +Author: Ying Li +Date: Thu Oct 29 16:34:21 2015 -0700 + + Remove the cryptoservice argument to sign + + Signed-off-by: Ying Li + +commit 6c80fd24687bed12b394e35cc59742e75a19376a +Merge: d30caedbf8 834f8b132b +Author: Brian Goff +Date: Thu Oct 29 19:29:38 2015 -0400 + + Merge pull request #17228 from ecnahc515/patch-1 + + cliconfig: Do not rely on platform dependent code + +commit d30caedbf8860b0cc07aa2429ca20dafb5e918e2 +Merge: 2eaa25d355 1c23de0e64 +Author: Jess Frazelle +Date: Thu Oct 29 16:29:24 2015 -0700 + + Merge pull request #17491 from LK4D4/seq_tests + + Run unit tests as single command + +commit 60db63d38c02132a8d7d99c501e8130b354c7e2f +Author: Jeffrey Morgan +Date: Thu Oct 29 16:22:23 2015 -0700 + + Update circle.yml + +commit 15e35c447058851850155f90292e51decb482956 +Author: John Howard +Date: Fri Sep 18 18:21:57 2015 -0700 + + Windows: Adds support for Hyper-V Containers + + Signed-off-by: John Howard + +commit a3e9558b0387c30b3b0d718a10577a0e6b641606 +Author: Ying Li +Date: Thu Oct 29 16:13:23 2015 -0700 + + 1. Add docstring as to why we are trying a key ID with a GUN and one without - thanks @diogo! + 2. Call NotaryRepository.cryptoService.GetKey rather than + NotaryRepository.KeyStoreManager.KeyStore.GetKey + + Signed-off-by: Ying Li + +commit 1847641b7b6985e7fe06cb09adf5c9f6237b5931 +Author: John Howard +Date: Thu Oct 29 15:51:04 2015 -0700 + + Fix test file paths + + Signed-off-by: John Howard + +commit 326ec6c12139486da44b392b5269baf4efa663b2 +Merge: 9e8aaf7b40 985ee759e7 +Author: Richard Scothern +Date: Thu Oct 29 15:25:18 2015 -0700 + + Merge pull request #1139 from aaronlehmann/reference-withtag-fix + + Use correct regexp in reference.WithTag + +commit d8aaf962169e2c6070d178bb754b0171b45e2328 +Author: Chase Bolt +Date: Thu Oct 29 15:23:44 2015 -0700 + + expand the list a bit more + + Signed-off-by: Chase Bolt + +commit 6325b07b5c7b81635f2abc950bbe2bde87bbab8f +Merge: f15c523080 e137c150da +Author: Michael Chiang +Date: Thu Oct 29 15:20:20 2015 -0700 + + Merge pull request #1155 from FrenchBen/1061-VM-name + + Added selector for VM fixes #1061 + +commit a0b8fa4957ba43564f903d5cee098cfef1f942d6 +Author: Ying Li +Date: Thu Oct 29 15:17:08 2015 -0700 + + Rename unlocked_crypto_service files + + Signed-off-by: Ying Li + +commit e137c150da8e4abb12ac3cfd6b18f326ac9613f1 +Author: French Ben +Date: Thu Oct 29 15:11:54 2015 -0700 + + Added selector for VM fixes #1061 + + Signed-off-by: French Ben + +commit b9a4175ea98b7aa4738cff026334b169aae8c713 +Author: Ying Li +Date: Thu Oct 29 12:00:10 2015 -0700 + + Update the client NotaryRepository to initialize with a root key ID + + Signed-off-by: Ying Li + +commit 2eaa25d3554dbe9f6d5c4f66a97c8eb83a463880 +Merge: 7f7950aa18 aaa134ea0e +Author: David Calavera +Date: Thu Oct 29 15:08:13 2015 -0700 + + Merge pull request #17499 from jfrazelle/fix-lxc-tests + + lxc does not support exec + +commit 9d2585ea8a279054337debe7b8996b7f3f610dfb +Author: Ying Li +Date: Thu Oct 29 11:52:51 2015 -0700 + + Remove unlocked crypto service and get root crypto service. + Generate key is now just a function. + + Signed-off-by: Ying Li + +commit 952539dd8abde648f68a9c476cf5bb7742b975ed +Merge: 92d67ff13f 670d03a1b4 +Author: Nathan LeClaire +Date: Thu Oct 29 14:45:32 2015 -0700 + + Merge pull request #2120 from nathanleclaire/bump_0.5.0_rc4 + + Bump to RC4 + +commit 670d03a1b46f383d13ddbf23cdbd128dfb7d162e +Author: Nathan LeClaire +Date: Thu Oct 29 14:23:06 2015 -0700 + + Bump to RC4 + + Signed-off-by: Nathan LeClaire + +commit f9019873a6c5aa18bf9dd8e4a23b2d193955861d +Merge: 0e5ebb984a b7ce16ab6f +Author: Ying Li +Date: Thu Oct 29 14:21:33 2015 -0700 + + Merge pull request #243 from endophage/key_types + + creating concrete types for the various key ciphers + +commit 0e5ebb984ade5a9184eef59a2ea5ac6531a048db +Merge: 570ef86584 8696c64d12 +Author: Diogo Mónica +Date: Thu Oct 29 14:18:31 2015 -0700 + + Merge pull request #245 from cyli/prometheus + + Add prometheus as a dependency + +commit 7f7950aa187e551bdc4d6128523207c2b8343250 +Merge: cdfd9846f4 e03daebb48 +Author: Alexander Morozov +Date: Thu Oct 29 13:45:19 2015 -0700 + + Merge pull request #17490 from aboch/pm + + Libnetwork vendoring & overlay networking fixes + +commit cdfd9846f480b54dc6207b578c29ecfe2cdeed34 +Merge: 8d62f243c7 48e7f7963e +Author: David Calavera +Date: Thu Oct 29 13:01:06 2015 -0700 + + Merge pull request #17460 from dmcgowan/fix-rmi-force-tag + + Fix rmi -f removing multiple tags + +commit 92d67ff13f2584d4ecade4f16b05dfb96e9b1a99 +Merge: fe94b4c44f f9e40c2ce2 +Author: Nathan LeClaire +Date: Thu Oct 29 12:33:43 2015 -0700 + + Merge pull request #850 from dudymas/feat/openstack-nova-ip-pools + + feature to fix #737 - openstack driver can use nova to allocate floating ips + +commit fe94b4c44fcccad92d519d64a853955632110591 +Merge: d855c35059 86c52ec3e7 +Author: Nathan LeClaire +Date: Thu Oct 29 12:30:15 2015 -0700 + + Merge pull request #2068 from dgageot/cleanup-for-more-tests + + Make commands code easier to test + +commit ab0ddb593f8a6a98c3bb85b8487574179f8f2262 +Author: Mazz Mosley +Date: Thu Oct 29 16:52:00 2015 +0000 + + Clarify the command is an example + + Signed-off-by: Mazz Mosley + +commit f67503d9fd2864fc16cf64811b1b38b6a58ff5e4 +Author: Daniel Nephin +Date: Thu Oct 29 11:28:17 2015 -0400 + + Logs are available for all log drivers except for none. + + Signed-off-by: Daniel Nephin + +commit ce729b07216bd3f6e903829818e946282dbd7e51 +Author: Daniel Nephin +Date: Wed Oct 28 15:17:11 2015 -0400 + + Update docs about networking for current release. + + Signed-off-by: Daniel Nephin + +commit 8156cdc56e5b5b1f440b9abbf54faaad14558c23 +Author: Daniel Nephin +Date: Wed Oct 28 17:54:38 2015 -0400 + + Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. + + Signed-off-by: Daniel Nephin + +commit eb9b8dc592b0dbd87bb70f619f6310f27683716e +Merge: 057b8e291c eab9d86a3d +Author: Daniel Nephin +Date: Thu Oct 29 15:01:05 2015 -0400 + + Merge pull request #2283 from dnephin/fix_not_none_log_driver + + Logs are available for all log drivers except for none. + +commit aaa134ea0e12781c7e1f19562544826274263a4b +Author: Jessica Frazelle +Date: Thu Oct 29 11:51:59 2015 -0700 + + lxc does not support exec + + Signed-off-by: Jessica Frazelle + +commit e03daebb48221bae84bfc48b0f9b652ced6d93f3 +Author: Alessandro Boch +Date: Thu Oct 29 09:25:29 2015 -0700 + + Execute buildPortMapInfo after Endpoint.Join() + + - As the retrieved info may not be available at + Endpoint creation time for certain network drivers + - Also retrieve the MAC address from Endpoint.Info().Iface() + + Signed-off-by: Alessandro Boch + +commit 134772f91ec40616d974e61388638495c8a126fb +Author: Alexander Morozov +Date: Thu Oct 29 11:41:39 2015 -0700 + + Fix Graph() docstring + + It's not true anymore, it used in builder for example. + + Signed-off-by: Alexander Morozov + +commit 33428c37e1075630825801591eb138de72acf0d3 +Author: Richard Scothern +Date: Fri Oct 23 15:25:42 2015 -0700 + + Buffer writing the scheduler entry state to disk by periodically checking for + changes to the entries index and saving it to the filesystem. + + Signed-off-by: Richard Scothern + +commit ac4b2905528457d9dba252c1590b9ac143372d0b +Author: Alexander Morozov +Date: Thu Oct 29 11:25:53 2015 -0700 + + Do not ignore errors from graphdriver.Put + + Signed-off-by: Alexander Morozov + +commit 841ed4ed218e9d281a10a098d5f2ca81a5d4c46c +Author: Daniel Nephin +Date: Thu Oct 29 14:15:08 2015 -0400 + + Remove the duplicate 'Warning' prefix now that the logger adds the prefix. + + Signed-off-by: Daniel Nephin + +commit 787d94626febc306f5f0340af40c085b9a41f614 +Author: Chase Bolt +Date: Thu Oct 29 11:11:19 2015 -0700 + + setting device-mapper-libs version dependency for centos 7 rpm + + Signed-off-by: Chase Bolt + +commit d836973a04fbba01e693e74c4124f2dbceb4b57b +Author: Daniel Nephin +Date: Thu Oct 29 14:06:50 2015 -0400 + + Use colors when logging warnings or errors, so they are more obvious. + + Signed-off-by: Daniel Nephin + +commit 9e8aaf7b4035960838e9793abb449a94a7e6cc74 +Merge: 987a69dd05 59784ecdd0 +Author: Richard Scothern +Date: Thu Oct 29 10:41:17 2015 -0700 + + Merge pull request #756 from aibaars/storage-gcs + + Storage driver for Google Cloud Storage + +commit 8d62f243c725c6eba43ca59ef17407e43004a238 +Merge: 8e144e6c50 1a6a860c14 +Author: Brian Goff +Date: Thu Oct 29 13:37:39 2015 -0400 + + Merge pull request #17488 from jfrazelle/skip-windows-test + + cant run volume on windows w remote daemon host + +commit 057b8e291c7644b8baa7b749a51d5ea73c94c092 +Merge: 6cd9bab35b 983dc12160 +Author: mnowster +Date: Thu Oct 29 17:20:59 2015 +0000 + + Merge pull request #2286 from mnowster/2281-docs-curl-command + + Clarify the command is an example + +commit 164d0bca63b74e6e0deeceee17b55c044f8d274e +Author: Aidan Hobson Sayers +Date: Thu Oct 29 16:54:32 2015 +0000 + + Remove dead code + + Signed-off-by: Aidan Hobson Sayers + +commit 596261e75985ffa7ed07c2dedfdc9d763e988db0 +Author: Joffrey F +Date: Thu Oct 29 17:56:01 2015 +0100 + + Ensure network exists when calling run before up + + Otherwise the daemon will error out because the network doesn't exist + yet. + + Signed-off-by: Joffrey F + +commit 983dc12160915f1148c35296712290702cb32338 +Author: Mazz Mosley +Date: Thu Oct 29 16:52:00 2015 +0000 + + Clarify the command is an example + + Signed-off-by: Mazz Mosley + +commit 1c23de0e64887f6c36b2156dd65717f723493775 +Author: Alexander Morozov +Date: Wed Oct 28 16:58:05 2015 -0700 + + Run unit tests as single command + + For me it increased speed of unit-tests tremendously, however this disabled + coverage profiles generation, which I think is pretty good tradeoff. + + Signed-off-by: Alexander Morozov + +commit 90744fe9432d988bae187a8dab7c606b2dc13895 +Author: Alessandro Boch +Date: Thu Oct 29 09:23:53 2015 -0700 + + Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6 + + Signed-off-by: Alessandro Boch + +commit 1a6a860c143487b96b8a6221768a73ed4cef6d7b +Author: Jessica Frazelle +Date: Thu Oct 29 08:55:48 2015 -0700 + + cant run volume on windows + + Signed-off-by: Jessica Frazelle + +commit eab9d86a3d016e7f846514ae81d7fd5b16c23257 +Author: Daniel Nephin +Date: Thu Oct 29 11:28:17 2015 -0400 + + Logs are available for all log drivers except for none. + + Signed-off-by: Daniel Nephin + +commit 6cd9bab35b1891a46fdf517cd423f1c8493c766b +Merge: 64a2713714 0ef3b47f74 +Author: mnowster +Date: Thu Oct 29 15:19:02 2015 +0000 + + Merge pull request #2276 from dnephin/update_networking_docs + + Update docs about networking for current release + +commit 64a2713714cd14c61ace8a864dbaaf2fcb69180b +Merge: 0b25014020 5dc14f3925 +Author: mnowster +Date: Thu Oct 29 14:42:29 2015 +0000 + + Merge pull request #2264 from mnowster/2259-unicode-error-volume-paths + + Handle non-ascii volume directories + +commit f4abc6406e5837cee33763b6784b89578045d4db +Author: Wen Cheng Ma +Date: Wed Oct 28 11:18:01 2015 +0800 + + Using checkers assert for integration-cli/docker_cli_attach_unix_test.go + + Fixes part of #16756 + + Signed-off-by: Wen Cheng Ma + +commit 5d1fd77aeac5acda7d98cd38dd727cd9802ea9d7 +Author: Xian Chaobo +Date: Thu Oct 29 20:41:28 2015 +0800 + + fix push image + + Signed-off-by: Xian Chaobo + +commit 5dc14f39254a25cf87b104c9f2577f37e48c6de4 +Author: Mazz Mosley +Date: Tue Oct 27 17:37:48 2015 +0000 + + Handle non-ascii chars in volume directories + + Signed-off-by: Mazz Mosley + +commit 0b25014020d233809344ca1515993af3d50ac98f +Merge: 3a2df57f3d a71d9af522 +Author: mnowster +Date: Thu Oct 29 12:04:54 2015 +0000 + + Merge pull request #2278 from dnephin/disable_flaky_test + + Disable flaky test against 1.8.3 + +commit 3a2df57f3de52b9ef87503fe40d8d5b7b6835a76 +Merge: 66f1c8e6c0 e13b8949b0 +Author: mnowster +Date: Thu Oct 29 12:04:10 2015 +0000 + + Merge pull request #2273 from mnowster/cross-ref-docs + + Add cross references for env/cli + +commit 86c52ec3e735900fc01412e3e5737bdf298a683b +Author: David Gageot +Date: Fri Oct 23 14:07:02 2015 +0200 + + Make commands code easier to test + + Signed-off-by: David Gageot + +commit 914ccb69681262b0882b235d03c8386399500d1a +Author: aperepel +Date: Mon Jun 8 19:46:44 2015 -0400 + + Fixes #1243 Custom GCE images support + + Signed-off-by: Andrew Grande + + Signed-off-by: David Gageot + +commit 09eedc35b2e309c4b9489e21a623ad72179a8ded +Author: Hu Keping +Date: Tue Oct 20 16:23:32 2015 +0800 + + Rework docker cli history + + The implementation of `history` is a little redundant espacially + when user set the `--human` and/or `--no-trunc` options. + + There are too many conditionals for `human`, `no-trunc` and `quiet` which + I think is useless and complicated. + + Since `quiet` will only display the container IDs so it could be not + nested with the other options. + + Signed-off-by: Hu Keping + +commit d855c350590840a9db9706e94ae782546eee2918 +Merge: c660130f17 b213da0961 +Author: David Gageot +Date: Thu Oct 29 10:17:50 2015 +0100 + + Merge pull request #2112 from dgageot/gce-driver-lost-commits + + Gce driver lost commits + +commit b213da0961ab08e2e697365f85500451e8d88a46 +Author: David Gageot +Date: Wed Oct 28 10:52:16 2015 +0100 + + Use PreCreateCheck to check the project/credentials + + Signed-off-by: David Gageot + +commit 8e7a85b8b9d307463af9fb49699ec36109194ebb +Author: David Gageot +Date: Wed Oct 28 10:51:39 2015 +0100 + + Fix the doc. It should be "Project ID" + + Signed-off-by: David Gageot + +commit e53b52de032e02fe2a1f27b9f9c6876803d3e4a0 +Author: David Gageot +Date: Tue Oct 27 10:17:30 2015 +0100 + + Improve documentation for google driver + + Signed-off-by: David Gageot + +commit 8e144e6c5090572176af3dec07424cefba1cbcc1 +Merge: 965706245b 44da86172a +Author: Jess Frazelle +Date: Thu Oct 29 00:10:08 2015 -0700 + + Merge pull request #17471 from jfrazelle/fix-userns + + fix experimental tests + +commit 44da86172aeb750d0ac46c000e32e51a12411ecd +Author: Jessica Frazelle +Date: Wed Oct 28 20:58:55 2015 -0700 + + fix experimental tests + + Signed-off-by: Jessica Frazelle + +commit 8696c64d1222be7512ab874b8e8b7960ce6d37ac +Author: Ying Li +Date: Wed Oct 28 20:21:45 2015 -0700 + + Add prometheus as a dependency + + Signed-off-by: Ying Li + +commit 42f08cd5226926e0adba7264843feb153956510a +Author: Viktor Stanchev +Date: Wed Oct 28 19:38:21 2015 -0700 + + documentation fixes + +commit b7ce16ab6f68e75ac96973939d40cce6a01762a0 +Author: David Lawrence +Date: Wed Oct 28 19:24:51 2015 -0700 + + fixes for Diogo's comments + Signed-off-by: David Lawrence (github: endophage) + +commit 965706245b702c08d23ce7da2e91440ccec74726 +Merge: 0e1618db19 584bdaf5d9 +Author: Jess Frazelle +Date: Wed Oct 28 18:56:54 2015 -0700 + + Merge pull request #17462 from LK4D4/fix_device_tool + + Fix docker-device-tool + +commit 985ee759e72258ebb8acec5d0f52cfa2249c3641 +Author: Aaron Lehmann +Date: Wed Oct 28 18:22:00 2015 -0700 + + Use correct regexp in reference.WithTag + + This was using a different regexp from the intended one. This meant that + tags with uppercase characters were not accepted. + + Signed-off-by: Aaron Lehmann + +commit de1d611990a80cf4a38ec501469c08c1aeee2d60 +Author: Lei Jitang +Date: Wed Oct 28 21:00:09 2015 -0400 + + Add show error when attach to a paused container + + Signed-off-by: Lei Jitang + +commit 0e1618db194388e7fe54332a7e192eb41ad9df89 +Merge: 7de2b49ac8 bc09eceaf4 +Author: David Calavera +Date: Wed Oct 28 17:32:03 2015 -0700 + + Merge pull request #17437 from LK4D4/put_error + + Do not ignore error from driver.Put + +commit 584bdaf5d92d1f8beda602493c90c389d6b82b47 +Author: Alexander Morozov +Date: Wed Oct 28 16:43:53 2015 -0700 + + Fix docker-device-tool + + Signed-off-by: Alexander Morozov + +commit 7de2b49ac86cf92fd2af34f671503118c3cc8b16 +Merge: b6e1f4dd69 990655448d +Author: David Calavera +Date: Wed Oct 28 16:25:40 2015 -0700 + + Merge pull request #17458 from LK4D4/unnec_err + + Remove unnecessary error returns + +commit ca7988d642a2cad81bf973f973ccd93650cde707 +Author: David Lawrence +Date: Wed Oct 28 16:20:08 2015 -0700 + + fixing lint + vet things + Signed-off-by: David Lawrence (github: endophage) + +commit 48e7f7963e142a0a45b583c5e65015d896c59433 +Author: Derek McGowan +Date: Wed Oct 28 16:07:02 2015 -0700 + + Fix rmi -f removing multiple tags + + When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed. + The current behavior is broken and removes all tags and the image. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit f73560d83950fce4d94f751f7d1ce468768f90c2 +Author: David Lawrence +Date: Wed Oct 28 16:02:55 2015 -0700 + + creating concrete types for the various key ciphers + Signed-off-by: David Lawrence (github: endophage) + +commit 570ef865844a124eda2948b562014f0514d5a782 +Merge: 6dcad7860f 408f1efee7 +Author: Diogo Mónica +Date: Wed Oct 28 15:55:33 2015 -0700 + + Merge pull request #233 from cyli/codecov + + Use make targets in circleci, more complete coverage + +commit 6dcad7860fa92ee3d80ef37747d530ac21793dd7 +Merge: 0a3025c959 aa5b621968 +Author: Diogo Mónica +Date: Wed Oct 28 15:55:24 2015 -0700 + + Merge pull request #237 from cyli/mutual-auth + + Support mutual authentication between the server and signer + +commit b6e1f4dd69a865df847dd4f6efe12df21f5c34dd +Merge: 54d42f4a10 a41917c2c8 +Author: Doug Davis +Date: Wed Oct 28 18:51:23 2015 -0400 + + Merge pull request #16898 from hqhq/hq_bump_bolt + + Bump bolt to v1.1.0 + +commit f15c52308029ced1dcdfaafaeda1d44453900c34 +Merge: c1b9dc5fce 9f05ce192e +Author: French Ben +Date: Wed Oct 28 15:47:56 2015 -0700 + + Merge pull request #1152 from FrenchBen/1151-pagination + + Added reset of pagination for new search. Fixes #1151 + +commit aa5b62196839359cb2afa688391ec713d1731bc0 +Author: Ying Li +Date: Wed Oct 28 15:43:48 2015 -0700 + + Fix import error after rebase + + Signed-off-by: Ying Li + +commit adda5776cba588e4d5c6c54833033306b58f5f69 +Author: Ying Li +Date: Tue Oct 27 10:38:06 2015 -0700 + + Use ListenAndServeTLS with blank args, since ListenAndServe doesn't actually set up TLS + + Signed-off-by: Ying Li + +commit 126691ac9ed8e1cafed0edbb909b0abed7baf705 +Author: Ying Li +Date: Mon Oct 19 18:58:05 2015 -0700 + + Update the notary server and signer configs to make use of client authentication. + + Signed-off-by: Ying Li + +commit 34aecae033f5d821484e511fa231d67e8c5c4d93 +Author: Ying Li +Date: Mon Oct 19 18:39:37 2015 -0700 + + Split out parsing the client TLS in notary-server. + + Signed-off-by: Ying Li + +commit 04a78e720f7977a6a71f7ec8f5f7f48cc552bb49 +Author: Ying Li +Date: Mon Oct 19 15:02:09 2015 -0700 + + Factor out and test TLS configuration in notary-server. + + Signed-off-by: Ying Li + +commit bbf941d198e7ad86abcdf5e8eb700df64fa0b308 +Author: Ying Li +Date: Mon Oct 19 11:27:34 2015 -0700 + + Allow client CAs to be provided to notary-signer. + + Signed-off-by: Ying Li + +commit 0a3025c95944dbe9e9ab9627e42930c2fecca28e +Merge: daa36b43b7 f8b9127181 +Author: Diogo Mónica +Date: Wed Oct 28 15:36:59 2015 -0700 + + Merge pull request #235 from HuKeping/update-readme + + Docs: update readme + +commit d2c5446ea0dfc6af5541f78b05dbb0a6829fbdf6 +Merge: e8dd274b65 588c29c3cc +Author: Victor Vieux +Date: Wed Oct 28 15:28:53 2015 -0700 + + Merge pull request #1340 from jimmyxian/volume-driver + + Move VolumeDriver to HostConfig + +commit c660130f176b8c2d20d888cba487217911974133 +Merge: 232c611464 c04eb43021 +Author: Nathan LeClaire +Date: Wed Oct 28 15:22:23 2015 -0700 + + Merge pull request #2109 from nathanleclaire/rm_redundant_errlog + + Remove redundant error log + +commit 232c611464e82a0a0d5066b0bea59c59baa02351 +Merge: cf83277557 77c2bbcdd2 +Author: Nathan LeClaire +Date: Wed Oct 28 15:18:24 2015 -0700 + + Merge pull request #2087 from dgageot/gce-default-auth + + Use Google default authentication + +commit 990655448dec63ef8add376becb1a20ae184a162 +Author: Alexander Morozov +Date: Wed Oct 28 15:15:22 2015 -0700 + + Remove unnecessary error returns + + Signed-off-by: Alexander Morozov + +commit cf83277557dbf07743df26d9cbbe6fd9657c03a5 +Merge: a512b907cf 970c630fd3 +Author: Nathan LeClaire +Date: Wed Oct 28 15:08:05 2015 -0700 + + Merge pull request #2107 from dgageot/2093-vtx-warning + + FIX #2093 warn in case we think VT-X is not enabled. + +commit a71d9af522611947a74ffd7e0d45b720e9b69f98 +Author: Daniel Nephin +Date: Wed Oct 28 17:54:38 2015 -0400 + + Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. + + Signed-off-by: Daniel Nephin + +commit 9f05ce192e5502c862b55638e09d970a822fdaa2 +Author: French Ben +Date: Wed Oct 28 14:37:02 2015 -0700 + + Added reset of pagination for new search. Fixes #1151 + + Signed-off-by: French Ben + +commit 970c630fd3686ae03ff9efd5ea41aefb55195a9e +Author: David Gageot +Date: Wed Oct 28 10:10:44 2015 +0100 + + FIX #2093 warn in case we think VT-X is not enabled. + + Signed-off-by: David Gageot + +commit 77c2bbcdd264ead7ee17f6f790c98a515bd8adaf +Author: David Gageot +Date: Mon Oct 26 19:00:47 2015 +0100 + + FIX #2023 and #1061 Use google default authentication + + Signed-off-by: David Gageot + +commit c04eb43021a07786b2e7592c7839e19d9b651d5c +Author: Nathan LeClaire +Date: Wed Oct 28 13:56:29 2015 -0700 + + Remove redundant error log + + Signed-off-by: Nathan LeClaire + +commit 54d42f4a107641c2755ea1d6e55ca41d8945f4f8 +Merge: 2fb442f145 7fa601adc7 +Author: David Calavera +Date: Wed Oct 28 13:39:59 2015 -0700 + + Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value + + Fix docker inspect display odd gateway value for none network mode + +commit c1b9dc5fcef7d4c7572db24138c379fe640849b1 +Author: Jeffrey Morgan +Date: Wed Oct 28 13:27:01 2015 -0700 + + Bump to 0.9.3 + + Signed-off-by: Jeffrey Morgan + +commit 583af26789ea95098a272c2a096fa6d0b499158f +Author: Jeffrey Morgan +Date: Wed Oct 28 13:24:09 2015 -0700 + + On upgrade, stop machine in debug mode + + Signed-off-by: Jeffrey Morgan + +commit 987a69dd0584d9df409e997b9f087b54cc5eab7d +Merge: 731c43e3db c56e8c2533 +Author: Richard Scothern +Date: Wed Oct 28 13:23:00 2015 -0700 + + Merge pull request #1096 from aaronlehmann/simplify-proxy-scheduler + + Simplify proxy scheduler + +commit 59784ecdd0a57f653843057b43e7e1b1a425e016 +Author: Arthur Baars +Date: Mon Jul 20 18:45:15 2015 +0100 + + Storage driver for: Google Cloud Storage (gcs) + + Signed-off-by: Arthur Baars + +commit daa36b43b7438fe0b0c0b0e565cdc7271aeb9cb4 +Merge: ccb2e1a8f4 6150c931dd +Author: David Lawrence +Date: Wed Oct 28 13:14:19 2015 -0700 + + Merge pull request #242 from docker/unify-root-nonroot-keystore + + Unify root nonroot keystore + +commit ccb2e1a8f480684610cba3f296436aa273c18276 +Merge: 4036910a6a 34cbbb270b +Author: David Lawrence +Date: Wed Oct 28 13:13:48 2015 -0700 + + Merge pull request #241 from endophage/include_gotuf + + Include gotuf in notary + +commit 3381ef1a5251208b6b73728e4025bd81bed44344 +Author: Viktor Stanchev +Date: Mon Oct 26 17:09:26 2015 -0700 + + update dockerfile, notary docs + +commit c9f3471dba4f909987b0aef26aa7dd72559a6c88 +Author: Dong Chen +Date: Tue Oct 27 00:01:11 2015 -0700 + + add engine options for refresh interval + + Signed-off-by: Dong Chen + +commit 6150c931ddad9ed296a82a6913c74737d4fdef33 +Author: Ying Li +Date: Wed Oct 28 12:47:42 2015 -0700 + + Make a keysMap rather than just declaring + + Signed-off-by: Ying Li + +commit 0ef3b47f74afe2a835ae0b9ad60c92b8c27612f2 +Author: Daniel Nephin +Date: Wed Oct 28 15:17:11 2015 -0400 + + Update docs about networking for current release. + + Signed-off-by: Daniel Nephin + +commit e8dd274b65cbef51b0a7af6acd9746f921cdbd38 +Merge: 86816e7d44 b924f7f8fa +Author: Alexandre Beslic +Date: Wed Oct 28 11:47:11 2015 -0700 + + Merge pull request #1342 from vieux/update_to_1.5.1 + + switch to go1.5.1 + +commit 2fb442f145813d5b66bdea558c422ced8d1fe8c2 +Merge: 96a6e810de 8db141049f +Author: David Calavera +Date: Wed Oct 28 11:16:41 2015 -0700 + + Merge pull request #17445 from tiborvass/fix-docker-py + + docker-py: upgrade and fix test script + +commit 66f1c8e6c0b7111d52f7d1c6a061040309badaba +Merge: dfaa18ebc5 8306405340 +Author: mnowster +Date: Wed Oct 28 17:54:48 2015 +0000 + + Merge pull request #2272 from dnephin/update_release_docs_and_scripts + + Another release, another round of fixes to the release scripts + +commit dfaa18ebc59592d6293cc003162acfcfa105e349 +Merge: 7e48b0b289 c341860d11 +Author: mnowster +Date: Wed Oct 28 17:45:27 2015 +0000 + + Merge pull request #2274 from mnowster/docs-key-dependency-clarification + + Clarify `dockerfile` requires `build` key + +commit e13b8949b0546a4c2028b3457f5934c2ae4c1f0b +Author: Mazz Mosley +Date: Wed Oct 28 16:27:14 2015 +0000 + + Add cross references for env/cli + + Signed-off-by: Mazz Mosley + +commit c341860d113e4ec042fa4d9bb7340fed9d9db66d +Author: Mazz Mosley +Date: Wed Oct 28 16:48:35 2015 +0000 + + Clarify `dockerfile` requires `build` key + + Credit to @funkyfuture for the first PR addressing the clarification. + https://github.com/docker/compose/pull/1767 + + Signed-off-by: Mazz Mosley + +commit 8db141049f5323d754584f265b267e52ee5d9e17 +Author: Tibor Vass +Date: Wed Oct 28 12:56:50 2015 -0400 + + docker-py: upgrade and fix test script + + Signed-off-by: Tibor Vass + +commit 830640534053df40d06e63e04b63c15d8929ae9c +Author: Daniel Nephin +Date: Wed Oct 28 12:40:59 2015 -0400 + + On error print daemon logs + + Signed-off-by: Daniel Nephin + +commit 5f4cb33a5186c7822dc718ba915f59979c598c28 +Author: John Howard +Date: Mon Oct 26 14:19:44 2015 -0700 + + Fix volume error messages + + Signed-off-by: John Howard + +commit bbc76e6034d426e75dba9f2c2517e7f82f7ea1f8 +Author: Daniel Nephin +Date: Wed Oct 28 12:11:29 2015 -0400 + + Convert the README to rst and fix the logo url before packaging it up for pypi. + + Signed-off-by: Daniel Nephin + +commit c4f0f24c57365a2bada4be295778bf93f506ece4 +Author: Daniel Nephin +Date: Wed Oct 28 12:01:34 2015 -0400 + + Fix release script notes about software and typos. + + Signed-off-by: Daniel Nephin + +commit 7e48b0b2896d22f1ad43fc308fa45e22cac6487a +Merge: b6b9b002e5 379af594da +Author: mnowster +Date: Wed Oct 28 15:30:07 2015 +0000 + + Merge pull request #2271 from mnowster/2270-pypi-page-info + + Include link to github for code & issues + +commit 379af594dab93e608d9589bb41c755429190a71d +Author: Mazz Mosley +Date: Wed Oct 28 14:59:43 2015 +0000 + + Include link to github for code&issues + + Signed-off-by: Mazz Mosley + +commit bc09eceaf401893275b6ec5508d523ec39357d78 +Author: Alexander Morozov +Date: Wed Oct 28 06:54:09 2015 -0700 + + Do not ignore error from driver.Put + + Signed-off-by: Alexander Morozov + +commit e98b8e08575d28e4cc15fbd64111c42b86841e4c +Author: Roma Sokolov +Date: Wed Oct 28 12:49:54 2015 +0000 + + Add newlines to FormatProgress for JSON as well + + Commit 060da572d20dfeee4fe02ce6b975a6cb33e50dbe has introduced newlines + to streamformatter to help parse Remote API responses. However, + FormatProgress method was omitted from the list of patched methods, + leaving progress messages in, say, /images/create without newlines. + + Signed-off-by: Roma Sokolov + +commit 41e71e9a461878a2cf0ff50428e8a5092dee3086 +Author: Arthur Baars +Date: Mon Jul 20 18:44:35 2015 +0100 + + Google Cloud Storage (gcs) dependencies (2) + + Add files of new dependencies to Godeps/_workspace + + Signed-off-by: Arthur Baars + +commit 95db61e97f69720d807329075196e89815890214 +Author: Arthur Baars +Date: Mon Jul 20 18:44:35 2015 +0100 + + Google Cloud Storage (gcs) dependencies (1) + + Add new dependencies to Godeps/Godeps.json + + Signed-off-by: Arthur Baars + +commit a512b907cfc5acc194b86bdcdd7acf861a66c127 +Merge: 52de03f64b 2339e548f6 +Author: David Gageot +Date: Wed Oct 28 09:31:02 2015 +0100 + + Merge pull request #2106 from flavio/fix-openstack-driver + + Fix panic when using openstack driver + +commit 2339e548f641fd4e64b367e5d3f42ee4167d7b8f +Author: Flavio Castelli +Date: Wed Oct 28 08:52:58 2015 +0100 + + Fix panic when using openstack driver + + The openstack driver was unusable because some cli flags were redifined. + + That caused a runtime error like: + + create flag redefined: openstack-ssh-user + panic: create flag redefined: openstack-ssh-user + + Signed-off-by: Flavio Castelli + +commit 34cbbb270b3eb877c84e5c528d0b218dbf7be904 +Author: David Lawrence +Date: Tue Oct 27 22:59:23 2015 -0700 + + updating maintainers and adding top level contributors, removing those files from tuf dir + Signed-off-by: David Lawrence (github: endophage) + +commit 86816e7d44d2a0b66c06e805d0377353827500ae +Merge: 0d0b99953e e001980b5c +Author: Victor Vieux +Date: Tue Oct 27 21:33:25 2015 -0700 + + Merge pull request #1287 from dnephin/fix_filter_images_by_repo + + Fix filter images by repo + +commit d0762a60e01339235917007fd48722ce5390ed71 +Author: Zuhayr Elahi +Date: Tue Oct 27 21:18:26 2015 -0700 + + modified docker_cli_kill_test.go to use c.Asserts + + Signed-off-by: Zuhayr Elahi + +commit 0d0b99953eb58c50e299db78993df2fe111db172 +Merge: 6db3956c4a 6e9362af50 +Author: Xian Chaobo +Date: Wed Oct 28 12:14:28 2015 +0800 + + Merge pull request #1349 from vieux/add_file_back_to_test_env + + add file back to test env + +commit 6e9362af507cb8126055cb7cedf9f410c90925eb +Author: Victor Vieux +Date: Tue Oct 27 21:13:12 2015 -0700 + + add file back to test env + + Signed-off-by: Victor Vieux + +commit 6db3956c4a303b5d0527ae9a9c2b5fe76c561657 +Merge: ae81ef652e 479db2904f +Author: Alexandre Beslic +Date: Tue Oct 27 21:12:20 2015 -0700 + + Merge pull request #1346 from vieux/fix_network_inspect + + fix network inspect via name for global scope + +commit 479db2904f3f485bf27935fb804d59b8fc173eac +Author: Victor Vieux +Date: Tue Oct 27 20:40:13 2015 -0700 + + fix network inspect via name for global scope + + Signed-off-by: Victor Vieux + +commit 731c43e3dbe30fb87b830bab3a46d940ed649a8a +Merge: 2d23e77284 183d144520 +Author: Olivier Gambier +Date: Tue Oct 27 20:39:52 2015 -0700 + + Merge pull request #1136 from RichardScothern/update-roadmap + + Update distribution roadmap. + +commit 52de03f64b57007ea9cc3e90ce5fde6b21a2d704 +Merge: 4cfcc3ba32 8e58932db5 +Author: Olivier Gambier +Date: Tue Oct 27 20:37:50 2015 -0700 + + Merge pull request #2105 from IanLee1521/patch-1 + + Fixed typo + +commit 96a6e810de0bfabe6cc59588f237470810703656 +Merge: b227d19cae 9bcbb39fa8 +Author: Jess Frazelle +Date: Tue Oct 27 20:12:43 2015 -0700 + + Merge pull request #17418 from diogomonica/bump-go-1.5 + + Bump go 1.5 + +commit 588c29c3cc39a7407ee583e37b9b711464197ce8 +Author: Xian Chaobo +Date: Wed Oct 28 10:58:24 2015 +0800 + + move VolumeDriver to HostConfig + + Signed-off-by: Xian Chaobo + +commit 8e58932db515c99b2fa54a9b80ea8e2b7a598a92 +Author: Ian Lee +Date: Tue Oct 27 19:26:17 2015 -0700 + + Fixed typo + + Signed-off-by: Ian Lee + +commit 7fa601adc7858606630dec5b037e60b8955e716d +Author: Lei Jitang +Date: Tue Oct 27 21:47:12 2015 -0400 + + Fix docker inspect display odd gateway value for none network mode + + Signed-off-by: Lei Jitang + +commit b227d19cae34d6d0ce92b72a53f02330b0be5992 +Merge: 94811ae814 b78ca243d9 +Author: Jess Frazelle +Date: Tue Oct 27 18:32:18 2015 -0700 + + Merge pull request #17423 from cpuguy83/so_sensitive + + Revert "dockerversion placeholder for library-import" + +commit 4cfcc3ba32833346739960069a16a424ff669aee +Merge: 9f01770d7e fb8d964966 +Author: Olivier Gambier +Date: Tue Oct 27 18:26:24 2015 -0700 + + Merge pull request #2103 from nathanleclaire/git_tag_mk + + Pipe error output from git line to /dev/null + +commit b78ca243d9fc25d81c1b50008ee69f3e71e940f6 +Author: Brian Goff +Date: Tue Oct 27 21:19:14 2015 -0400 + + Revert "dockerversion placeholder for library-import" + + This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4. + + Commit caused issues on systems with case-insensitive filesystems. + Revert for now + + Signed-off-by: Brian Goff + +commit a41917c2c88bd7f694d141ac67f4a194aaa16fa1 +Author: Qiang Huang +Date: Wed Oct 28 08:49:45 2015 +0800 + + Bump bolt to v1.1.0 + + It adds ARM64, ppc64le, s390x, solaris support, and a bunch of + bugfixs. + + Signed-off-by: Qiang Huang + +commit 9862a4b43ec6236305f6b57274c6edd61dad96b7 +Author: Dong Chen +Date: Tue Oct 27 12:06:35 2015 -0700 + + extract docker volume API from local + + Signed-off-by: Dong Chen + +commit fa70a79ed775823e982466b8c70ab3112deedf96 +Author: David Lawrence +Date: Tue Oct 27 16:45:55 2015 -0700 + + go fmt was complaining about import order after my sed replacement + Signed-off-by: David Lawrence (github: endophage) + +commit 183d1445203798a9c01ac4b292285a0d9ef8fd35 +Author: Richard Scothern +Date: Tue Oct 27 17:20:49 2015 -0700 + + Update distribution roadmap. + + Update pull through cache status. + Add section for metadata storage. + + Signed-off-by: Richard Scothern + +commit fb8d964966f214c350a6073abb7b905851e74a0c +Author: Nathan LeClaire +Date: Tue Oct 27 17:19:38 2015 -0700 + + Pipe error output from git line to /dev/null + + This will simply leave the tag empty if compiled independent of a source + repository. + + Signed-off-by: Nathan LeClaire + +commit 94811ae814ddce67b623d35ef44dcf276629442f +Merge: 9ab71b68af 9a7e632cf0 +Author: Tibor Vass +Date: Tue Oct 27 20:09:54 2015 -0400 + + Merge pull request #17422 from calavera/inspect_networks_docs + + Update inspect api examples with new network settings. + +commit 9ab71b68af5b340373411e26e679c6e7506ce167 +Merge: 2266462f72 25682577c9 +Author: David Calavera +Date: Tue Oct 27 17:00:41 2015 -0700 + + Merge pull request #17393 from tiborvass/carry-17360 + + Carry Fix docker inspect container only reports last assigned information + +commit 9a7e632cf097b71aab6e46ef010d038f602e03d3 +Author: David Calavera +Date: Tue Oct 27 19:54:37 2015 -0400 + + Update inspect api examples with new network settings. + + Signed-off-by: David Calavera + +commit 2266462f724492d3802d7043723347adeb18024e +Merge: b96e076af9 2af5034ce8 +Author: Brian Goff +Date: Tue Oct 27 19:52:11 2015 -0400 + + Merge pull request #17373 from Microsoft/10662-volumetests + + Windows: Volume integration tests + +commit 8cc8e614740a71234cb7d1d3d5456c2c316a022c +Author: Daniel Nephin +Date: Fri Oct 16 12:55:32 2015 -0400 + + Bump 1.5.0rc2 + + Signed-off-by: Daniel Nephin + + Fill out 1.5.0 release notes + + Signed-off-by: Aanand Prasad + +commit 8a6dfb26f30331231839c420f8cf8889c9ef35a8 +Author: Samuel Karp +Date: Mon Sep 28 06:40:44 2015 +0000 + + [awslogs] Auto-detect region on EC2 instances + + Signed-off-by: Samuel Karp + +commit 480c9c01784d65a46f6ba62e8176e9b2a6a3feab +Author: Samuel Karp +Date: Mon Sep 28 04:53:29 2015 +0000 + + [awslogs] Set User-Agent for Amazon CloudWatch Logs + + Signed-off-by: Samuel Karp + +commit 70083e6fc3a7f64755fcf4752e6d24758bdd0543 +Author: Samuel Karp +Date: Mon Sep 28 03:52:36 2015 +0000 + + Update vendored aws-sdk-go + + Signed-off-by: Samuel Karp + +commit 21ee24bc3092184fd198e5a06ce29f3715ed77e0 +Author: David Lawrence +Date: Tue Oct 27 16:37:41 2015 -0700 + + fixing vet error in existing notary code + Signed-off-by: David Lawrence (github: endophage) + +commit 57aaee1c1c06f95ffdcc8e82f4da7e60e6ed2650 +Author: Ying Li +Date: Tue Oct 27 16:36:53 2015 -0700 + + Remove unneeded contants from keystoremanager + + Signed-off-by: Ying Li + +commit 2833a88292d2d4e965afeb9fa93ddca8205292d4 +Author: David Lawrence +Date: Tue Oct 27 16:36:06 2015 -0700 + + adding gotuf to notary + Signed-off-by: David Lawrence (github: endophage) + +commit 29b0ffe5e99be0c49e750eb29b938972449c5bcc +Author: Sven Dowideit +Date: Thu Oct 22 17:17:11 2015 +1000 + + Possible link fixes + + Signed-off-by: Sven Dowideit + +commit a772a0d7d7c454fe35cb65b40a616df5413555c8 +Author: Mazz Mosley +Date: Tue Oct 27 11:59:09 2015 +0000 + + Remove redundant try/except + + Code cleanup. We no longer need this as the api returns a 304 for any + stopped containers, which doesn't raise an error. + + Signed-off-by: Mazz Mosley + +commit 6f0096c87b6a33895752f1a5f6b914e40c2ceee1 +Author: Mazz Mosley +Date: Tue Oct 27 11:55:35 2015 +0000 + + Move rename functionality into Container + + Signed-off-by: Mazz Mosley + +commit da41ed22f9358069daab28cb08ac55e0a31e4816 +Author: Mazz Mosley +Date: Mon Oct 26 10:27:57 2015 +0000 + + Fix tests + + Signed-off-by: Mazz Mosley + +commit d6fa8596d22c6a330449ae808d6bb2ddbb5c2534 +Author: Mazz Mosley +Date: Wed Oct 21 17:28:16 2015 +0100 + + Attach to a container's log_stream before they're started + + So we're not displaying output of all previous logs for a container, we attach, + if possible, to a container before the container is started. + + LogPrinter checks if a container has a log_stream already attached and + print from that rather than always attempting to attach one itself. + + Signed-off-by: Mazz Mosley + +commit a9b4fe768d1a49a6b6fad9b36e1e41cd6be3b756 +Author: Daniel Nephin +Date: Mon Oct 26 13:29:59 2015 -0400 + + Fix running one-off containers with --x-networking by disabling linking to self. + + docker create fails if networking and links are used together. + + Signed-off-by: Daniel Nephin + +commit 75b63b84cdcf8bd87db4db431865b361c9bf52ff +Author: Ying Li +Date: Tue Oct 27 16:19:14 2015 -0700 + + Add import/export to KeyStore interface so that the import_export code + makes use of this rather than mangle files manually to import/export + root keys. (Regular keys it just zips up the whole directory.) + + Signed-off-by: Ying Li + +commit 25682577c9d29b325b4b615c4b88c132a4640082 +Author: David Calavera +Date: Mon Oct 26 22:35:49 2015 -0400 + + Extract network settings types for inspect. + + Keeping backwards compatibility. + + Signed-off-by: David Calavera + Signed-off-by: Tibor Vass + +commit b6b9b002e5c0b1687fac3e5e1e5c095b1c97bf8d +Merge: ffa2b08dbb 76d52b1c5f +Author: Daniel Nephin +Date: Tue Oct 27 18:45:47 2015 -0400 + + Merge pull request #2254 from mnowster/1756-dont-display-output-from-previous-runs + + 1756 dont display output from previous runs + +commit b96e076af9478f37c5efd3f56e5f0aa42c846b66 +Merge: 1156b7ff66 2bd2893b92 +Author: Sebastiaan van Stijn +Date: Tue Oct 27 23:28:47 2015 +0100 + + Merge pull request #16017 from flowlo/master + + docs: Explain volume_name in POST /container Binds + +commit 1156b7ff66c749814535008e66149a6027dc9a36 +Merge: 1c8ee617d1 7f7953dcc2 +Author: David Calavera +Date: Tue Oct 27 15:16:27 2015 -0700 + + Merge pull request #17401 from hugomarisco/patch-1 + + update gpg add key command, without sudo it fails + +commit 258bbdb57e0388309491733fa135b041dd2f2f74 +Author: Nathan Williams +Date: Tue Oct 27 15:06:07 2015 -0700 + + fix oracle/rhel install docs + + Signed-off-by: Nathan Williams + +commit 6ff8b32bff5a7748cfa41618f7688856c29dd749 +Author: Nathan Williams +Date: Tue Oct 27 15:04:12 2015 -0700 + + fix fedora install docs + + Signed-off-by: Nathan Williams + +commit c6e1d982666bbf37da746975c5ba7511ea9c98a1 +Author: Nathan Williams +Date: Tue Oct 27 15:03:32 2015 -0700 + + fix docs for cent repo setup + + Signed-off-by: Nathan Williams + +commit 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b +Author: Jessica Frazelle +Date: Tue Oct 27 12:56:57 2015 -0700 + + update to binaries, fix parsers package, non-parallel test unit + + Signed-off-by: Jessica Frazelle + +commit 2d23e772840e111043739cc69fc8984d6c437668 +Merge: 6bcd8a1dec 0c7cd3fcf8 +Author: Stephen Day +Date: Tue Oct 27 14:29:08 2015 -0700 + + Merge pull request #1047 from mattmoor/expires_in_proposal + + Add `expires_in` and `issued_at` to the auth spec. + +commit 1c8ee617d164fec5da15d274516dc5131bcd41dd +Merge: 6276c676a8 5814d67f98 +Author: Brian Goff +Date: Tue Oct 27 17:25:45 2015 -0400 + + Merge pull request #17382 from jecarey/16765-docker_cli_images_test + + Use of checkers on docker_cli_images_test.go + +commit 6bcd8a1decb0923ae6d2ce2391f3b255888db59f +Merge: 1c5f8166e4 e569236f1e +Author: Stephen Day +Date: Tue Oct 27 14:19:43 2015 -0700 + + Merge pull request #1099 from RichardScothern/go-version + + Add go version to logger output + +commit 6276c676a897ab8a4c7fdcd78d18c8fc3a761707 +Merge: 85ae8b034a d5cd032a86 +Author: David Calavera +Date: Tue Oct 27 13:39:40 2015 -0700 + + Merge pull request #17350 from vdemeester/11699-auto-libraryimport + + dockerversion placeholder for library-import + +commit 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862 +Merge: 82f70677b9 3e7db73b99 +Author: Alexandre Beslic +Date: Tue Oct 27 13:29:18 2015 -0700 + + Merge pull request #17364 from mavenugo/advertise + + Enhancing --cluster-advertise to support + +commit 82f70677b99e7d30c63d40658b36b0c5373cadba +Merge: 2b1b7823e6 6d9bb99c97 +Author: David Calavera +Date: Tue Oct 27 13:27:10 2015 -0700 + + Merge pull request #17405 from LK4D4/cont_pointer + + Return pointer from newBaseContainer + +commit 5814d67f9850e5eff9d6beb24b2b9dde89ee7381 +Author: James Carey +Date: Mon Oct 26 13:47:21 2015 -0500 + + Use of checkers on docker_cli_images_test.go + + Signed-off-by: James Carey + +commit 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4 +Author: Lei Jitang +Date: Mon Oct 26 08:00:49 2015 -0400 + + Fix docker inspect container only reports last assigned information + + Signed-off-by: Lei Jitang + +commit 2b1b7823e61d9d14064708d37a56275ee7385bd2 +Merge: bf9f2691ca 5f6d27ceba +Author: David Calavera +Date: Tue Oct 27 13:24:59 2015 -0700 + + Merge pull request #17406 from LK4D4/ent_and_args_simple + + Simplify getEntrypointAndArgs + +commit bf9f2691ca6bf19d81b43c2faa37fbad89b68672 +Merge: 64854277f8 d5364c7114 +Author: moxiegirl +Date: Tue Oct 27 13:22:30 2015 -0700 + + Merge pull request #17161 from moxiegirl/commands-network + + Updating network commands: adding man pages + +commit 64854277f87d5f5d1f79db340ecb0b82d82f1865 +Merge: 194b64951a 1041f39670 +Author: David Calavera +Date: Tue Oct 27 13:21:15 2015 -0700 + + Merge pull request #17390 from sanimej/libn + + Vendor in libnetwork changes to support container rename + +commit 194b64951a19ef6254422891cc9ff191ed2567cd +Merge: eec5e67561 4f6f00e191 +Author: Tibor Vass +Date: Tue Oct 27 16:14:44 2015 -0400 + + Merge pull request #17230 from aboch/ae + + Do not update etc/hosts file for every container + +commit d5cd032a86617249eadd7142227c5355ba9164b4 +Author: Vincent Demeester +Date: Sun Oct 25 19:18:23 2015 +0100 + + dockerversion placeholder for library-import + + - Move autogen/dockerversion to version + - Update autogen and "builds" to use this package and a build flag + + Signed-off-by: Vincent Demeester + +commit 566bd3ce67a42af061fe89086c03b943f657b65c +Author: Ying Li +Date: Tue Oct 27 12:32:02 2015 -0700 + + Combine the nonRootKeyStore with the rootKeyStore, and move the abstracting + over the root keys directory from non-root keys directory from keystoremanager + to keystore, since we're eliminating keystoremanager. + + Maintain the two separate directories, though, because one can't tell whether + there is an old-style separate-directories structure, or if someone has a GUN + that starts with tuf_keys. + + Signed-off-by: Ying Li + +commit 9f01770d7e0a21ae7fda67619e321e91e98ed446 +Merge: 9a26a9fc04 2d1e6d0163 +Author: Nathan LeClaire +Date: Tue Oct 27 11:59:51 2015 -0700 + + Merge pull request #2084 from dgageot/simpler-env-hints + + Simpler code for env usage hints. + +commit 9a26a9fc04beec6b80cecbf5014f86cbba952331 +Merge: 104ebf58cf d316eb7e96 +Author: Nathan LeClaire +Date: Tue Oct 27 11:59:24 2015 -0700 + + Merge pull request #2097 from dgageot/better-vbox-error-message + + Print a better error when virtualbox fails + +commit 4036910a6ade7402cc8502e630ecdac47bccac98 +Merge: bcdd375ce5 b238d85159 +Author: Ying Li +Date: Tue Oct 27 11:47:53 2015 -0700 + + Merge pull request #240 from cyli/server-healthcheck-endpoint + + Add the health handler to the main server + +commit 104ebf58cf2306d47838257dd59342d15c1e3412 +Merge: 9fa2f73139 3dd578318a +Author: Olivier Gambier +Date: Tue Oct 27 11:41:40 2015 -0700 + + Merge pull request #2090 from nathanleclaire/heartbeat_disconnect + + Stop heartbeat when there is an issue connecting to the server + +commit 0c7cd3fcf8cae84953381c462d4b0e1e6e370488 +Author: Matt Moore +Date: Wed Sep 30 08:47:01 2015 -0700 + + Add `expires_in` and `issued_at` to the auth spec. + + This extends the specification for the Bearer token response to include + information pertaining to when an issued Bearer token will expire. + + This also allows the client to accept `access_token` as an alias for `token`. + + Signed-off-by: Matt Moore + +commit eec5e675615816138564b82a7b2ebbda69b67749 +Merge: b6fa541877 b8891a32d1 +Author: David Calavera +Date: Tue Oct 27 11:04:08 2015 -0700 + + Merge pull request #17408 from jfrazelle/dnf-fedora-builds + + update dockerfile to use dnf because i hate the warning + +commit 3e7db73b99498d037b43eb59972a6360cfbc971b +Author: Madhu Venugopal +Date: Sun Oct 25 17:12:22 2015 -0700 + + Enhancing --cluster-advertise to support + + --cluster-advertise daemon option is enahanced to support + in addition to in order to amke it automation friendly using + docker-machine. + + Signed-off-by: Madhu Venugopal + +commit 42dcc4f3b5e0ddd2042a75c5d3f3c610d7e839c1 +Author: unclejack +Date: Wed Aug 19 22:16:20 2015 +0300 + + Dockerfile: bump Go to 1.5 + + Signed-off-by: Cristian Staretu + +commit b8891a32d13724bb992d9e8aca4777a32334371e +Author: Jessica Frazelle +Date: Tue Oct 27 10:25:39 2015 -0700 + + update dockerfile to use dnf because i hate the warning + + Signed-off-by: Jessica Frazelle + +commit 76d52b1c5f02e526010468c22d5a438883ab4777 +Author: Mazz Mosley +Date: Tue Oct 27 11:59:09 2015 +0000 + + Remove redundant try/except + + Code cleanup. We no longer need this as the api returns a 304 for any + stopped containers, which doesn't raise an error. + + Signed-off-by: Mazz Mosley + +commit 30a84f1be6c68d1cbeaad865242f891f5cff82df +Author: Mazz Mosley +Date: Tue Oct 27 11:55:35 2015 +0000 + + Move rename functionality into Container + + Signed-off-by: Mazz Mosley + +commit bee063c07dd8ca8c7f0295a9a319c14b815c4422 +Author: Mazz Mosley +Date: Mon Oct 26 10:27:57 2015 +0000 + + Fix tests + + Signed-off-by: Mazz Mosley + +commit 7603ebea9b2f484f3cf8f193f64748fb91b67bf6 +Author: Mazz Mosley +Date: Wed Oct 21 17:28:16 2015 +0100 + + Attach to a container's log_stream before they're started + + So we're not displaying output of all previous logs for a container, we attach, + if possible, to a container before the container is started. + + LogPrinter checks if a container has a log_stream already attached and + print from that rather than always attempting to attach one itself. + + Signed-off-by: Mazz Mosley + +commit 5f6d27cebaec3d2e9e72579c91591aea5bcb6966 +Author: Alexander Morozov +Date: Tue Oct 27 09:36:08 2015 -0700 + + Simplify getEntrypointAndArgs + + Signed-off-by: Alexander Morozov + +commit 6d9bb99c97438edc996e51e13a0aca0feabc5d26 +Author: Alexander Morozov +Date: Tue Oct 27 09:05:25 2015 -0700 + + Return pointer from newBaseContainer + + It makes code more consistent. + + Signed-off-by: Alexander Morozov + +commit ffa2b08dbb41a28f4853b4195600a5f55c33b80d +Merge: a4b002a76e 7878d38dee +Author: mnowster +Date: Tue Oct 27 15:32:20 2015 +0000 + + Merge pull request #2258 from dnephin/dont_link_when_using_networking + + Fix running one-off containers with --x-networking + +commit d5364c71140208e1b861625e6394a5623e878e34 +Author: Mary Anthony +Date: Sun Oct 18 16:47:32 2015 -0700 + + Updating network commands: adding man pages + Adding Related information blocks + Final first draft pass: ready for review + Review comments + Entering comments from the gang + Updating connect to include paused + + Signed-off-by: Mary Anthony + +commit 7878d38deeac394e220cab294c3783eac63f17b5 +Author: Daniel Nephin +Date: Mon Oct 26 13:29:59 2015 -0400 + + Fix running one-off containers with --x-networking by disabling linking to self. + + docker create fails if networking and links are used together. + + Signed-off-by: Daniel Nephin + +commit e001980b5ce1e2683c3e0db7727f165f06ecc864 +Author: Daniel Nephin +Date: Mon Oct 5 18:33:37 2015 -0400 + + Add filter by image name support to /images/json + + Signed-off-by: Daniel Nephin + +commit b6fa541877bf9b0cedfb8861c0807d84146728df +Merge: ebf8ca9a67 9b0d0a64fa +Author: Sebastiaan van Stijn +Date: Tue Oct 27 15:41:43 2015 +0100 + + Merge pull request #17394 from azurezk/doc + + "docker --log-driver=XXX" in reference missing 'daemon' + +commit d316eb7e963244470b138d9169f8f30b4c496f0c +Author: David Gageot +Date: Tue Oct 27 15:22:38 2015 +0100 + + Print a better error when virtualbox fails + + Instead of printing `exit status 1` we'll print + the stderr output + + Signed-off-by: David Gageot + +commit 7f7953dcc27206acc31bfdef56f7471017640b70 +Author: Hugo Marisco <0x6875676f@gmail.com> +Date: Tue Oct 27 13:46:39 2015 +0000 + + update gpg add key command, without sudo it fails + + Signed-off-by: Hugo Marisco <0x6875676f@gmail.com> + +commit ebf8ca9a67bb5b3e54ac0fe4144c395f96f2f497 +Merge: b72a431928 e46445e844 +Author: Brian Goff +Date: Tue Oct 27 09:19:59 2015 -0400 + + Merge pull request #17396 from sdurrheimer/zsh-completion-fix-missing-double-quote + + Fix missing double quote in zsh completion + +commit a4b002a76ead00ab11f98563177f0706f03d8402 +Merge: f3d49e38c0 fe760a7b62 +Author: mnowster +Date: Tue Oct 27 11:12:38 2015 +0000 + + Merge pull request #2257 from mnowster/2226-additional-classifiers + + Include additional classifiers + +commit e46445e844bca26775f88b3075d227f8e867a22a +Author: Steve Durrheimer +Date: Tue Oct 27 10:50:45 2015 +0100 + + Fix missing double quote in zsh completion + + Signed-off-by: Steve Durrheimer + +commit 9b0d0a64fa92afc94617dbf38db980e415871d33 +Author: Kun Zhang +Date: Tue Oct 27 15:50:23 2015 +0800 + + command missing 'daemon' + + Signed-off-by: Kun Zhang + +commit 4f6f46a11d9a8588d1e21f5cb543bb9c7181fec3 +Author: Shijiang Wei +Date: Thu Oct 15 15:22:38 2015 +0800 + + refacter attach API tests to use checkers + + Signed-off-by: Shijiang Wei + +commit b72a431928d6389727d07235bc4d5a7b22403a53 +Merge: b92fd9ff04 aee5486374 +Author: Tibor Vass +Date: Tue Oct 27 02:42:50 2015 -0400 + + Merge pull request #17389 from tonistiigi/15995-duplicate-names + + Fix duplicate container names conflict + +commit 4f6f00e1916a8c58e67c8118d015988d86718d19 +Author: Alessandro Boch +Date: Wed Oct 21 09:08:19 2015 -0700 + + Do not update etc/hosts for every container + + - Only user named containers will be published into + other containers' etc/hosts file. + - Also block linking to containers which are not + connected to the default network + + Signed-off-by: Alessandro Boch + +commit b92fd9ff0499deb7303557ef8163f0661361a8c0 +Merge: 91de5ddf18 402caa94d2 +Author: Sebastiaan van Stijn +Date: Tue Oct 27 01:39:04 2015 +0100 + + Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking + + zsh: enable option stacking + +commit 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2 +Merge: fe1e04a84f 139d1e13e2 +Author: David Calavera +Date: Mon Oct 26 17:06:01 2015 -0700 + + Merge pull request #17381 from mavenugo/rc3v1 + + Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 + +commit aee54863741fc3f012c423d1a445d1a6b687966a +Author: Tonis Tiigi +Date: Mon Oct 26 16:57:50 2015 -0700 + + Fix duplicate container names conflict + + While creating multiple containers the second + container could remove the first one from graph + and not produce an error. + + Fixes #15995 + + Signed-off-by: Tonis Tiigi + +commit fe1e04a84f51b3abf5fd426a6a4ee0125683aa11 +Merge: 4cbe227db8 2e56e78caf +Author: David Calavera +Date: Mon Oct 26 16:47:51 2015 -0700 + + Merge pull request #17285 from Microsoft/10662-exectp4workaround + + Windows [TP4] Trap Hyper-V exec failure + +commit 8a5e2f79203969b86b3c95e2f70f8e994717217c +Merge: 25414e0771 fd9387a909 +Author: Jeffrey Morgan +Date: Mon Oct 26 16:39:02 2015 -0700 + + Merge pull request #1145 from kitematic/stopping-state + + Add stopping state to fix immediately killing containers + +commit 4cbe227db868f347a493ec611b1c8131dc5509df +Merge: 3f11360a54 853f2e9952 +Author: David Calavera +Date: Mon Oct 26 16:15:00 2015 -0700 + + Merge pull request #17378 from Microsoft/10662-unmountwithsyscall + + Windows: Volumes PR rename UnmountWithSyscall + +commit 3f11360a54499ad2d1c873c7e502b414d907528d +Merge: bffcb8226e 126d1b6ca1 +Author: Tibor Vass +Date: Mon Oct 26 19:11:56 2015 -0400 + + Merge pull request #17384 from mavenugo/42def + + Simple Info log to indicate the chosen IP Address for the default bridge + +commit fd9387a909298b5ae15a0a170997650ae778e806 +Author: Jeffrey Morgan +Date: Mon Oct 26 15:33:34 2015 -0700 + + Switching containers does not result in state being lost + + Signed-off-by: Jeffrey Morgan + +commit 25414e0771eb0a633c8eb5a774d1a0744ae6235a +Merge: 6c3784d06b 63959d9a37 +Author: French Ben +Date: Mon Oct 26 15:45:58 2015 -0700 + + Merge pull request #1144 from FrenchBen/remove-autoupdate + + removed auto-updater + +commit bffcb8226e400bf945bd233a7ecdf44cad2bb3ac +Merge: f3f63c6044 0dec8091a2 +Author: Vincent Demeester +Date: Mon Oct 26 23:45:20 2015 +0100 + + Merge pull request #17377 from LK4D4/remove_host_integration + + Remove contrib/host-integration + +commit 63959d9a3777553372eae9cda17132dca912b41f +Author: French Ben +Date: Mon Oct 26 15:19:01 2015 -0700 + + removed auto-updater + + Signed-off-by: French Ben + +commit f3f63c6044057637f3eadf78c2c939ef60556db7 +Merge: 0d963de867 9120a1fc3e +Author: Vincent Demeester +Date: Mon Oct 26 23:14:38 2015 +0100 + + Merge pull request #17257 from echo33/docker_cli_exec_test + + use of checkers on docker_cli_exec_test.go + +commit 6c3784d06b3ad34e3c63de6f0b19cc78a94cb11f +Merge: f347fad436 ac1395282c +Author: French Ben +Date: Mon Oct 26 15:12:24 2015 -0700 + + Merge pull request #1020 from FrenchBen/v2-pagination + + Added V2 search and pagination + +commit 0d963de867527d0792f6b9378805323f24bd76db +Merge: 0bd7aedc36 79804d271c +Author: Vincent Demeester +Date: Mon Oct 26 23:09:00 2015 +0100 + + Merge pull request #17331 from coolljt0725/fix_redundat_log + + Better daemon log on docker load + +commit 0bd7aedc365edd494a93f6fd3b2501d17195026d +Merge: 962243e387 b1220a763c +Author: Alexander Morozov +Date: Mon Oct 26 15:01:17 2015 -0700 + + Merge pull request #16772 from Microsoft/10662-refactorresources + + Windows: Refactor resources structure + +commit 962243e3878ba214f65fe7a9b88462644533c333 +Merge: 9312a738d8 d1ed5f62ad +Author: Vincent Demeester +Date: Mon Oct 26 23:00:04 2015 +0100 + + Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test + + Use of checkers on docker_cli_config_test.go + +commit 126d1b6ca195ed425a691a5f3faeba254ebff094 +Author: Madhu Venugopal +Date: Mon Oct 26 11:46:20 2015 -0700 + + Simple log to indicate the chosen IP Address for the default bridge + + Signed-off-by: Madhu Venugopal + +commit 9312a738d84e880bf4635ba4b7729b3c2e017fbc +Merge: 2dd822f322 14e85c8c55 +Author: Sebastiaan van Stijn +Date: Mon Oct 26 22:44:11 2015 +0100 + + Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install + + apparmor check version on deb install + +commit ac1395282c773392f8e2b4d2df928c42d2e7d11b +Author: FrenchBen +Date: Tue Sep 8 18:50:21 2015 -0400 + + Implemented V2 search, pagination and greater tag list for images + + Signed-off-by: FrenchBen + +commit 2af5034ce8faa1f93d81864aa25ec64527fac76b +Author: John Howard +Date: Wed Sep 23 16:04:51 2015 -0700 + + Windows: Volume integration tests + + Signed-off-by: John Howard + +commit b238d851592d0d0a120f1c940a538c722e3a674f +Author: Ying Li +Date: Wed Oct 21 10:57:55 2015 -0700 + + Add the health handler to the main server + + Signed-off-by: Ying Li + +commit 402caa94d23ea3ad47f814fc1414a93c5c8e7e58 +Author: Vincent Bernat +Date: Fri Oct 16 23:29:15 2015 +0200 + + zsh: allow option stacking for short options without arguments + + This enables Zsh to understand commands like "docker run -it + ubuntu". However, by enabling this, this also makes Zsh completes + "docker run -u" with "docker run -uapprox" which is not valid. The + users have to put the space or the equal sign themselves before trying + to complete. + + Therefore, this behavior is disabled by default. To enable it: + + zstyle ':completion:*:*:docker:*' option-stacking yes + zstyle ':completion:*:*:docker-*:*' option-stacking yes + + Signed-off-by: Vincent Bernat + +commit 8ac32d900a6d1cd20e9585d012b0be414507e727 +Author: Vincent Bernat +Date: Fri Oct 16 23:23:58 2015 +0200 + + zsh: allow short options to specify their arguments with "=" + + This is allowed by Docker and helps the completion to not get confused + when a user uses this notation. This will also help to enable stacking + of short options since Zsh needs that to not stack options with + arguments. + + Signed-off-by: Vincent Bernat + +commit 139d1e13e29ed987face1494471fdb6c986d6c4a +Author: Madhu Venugopal +Date: Mon Oct 26 13:56:56 2015 -0700 + + Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 + + Signed-off-by: Madhu Venugopal + +commit b1220a763c5046efe8caa3e245c84633a29c3684 +Author: John Howard +Date: Mon Oct 5 10:11:10 2015 -0700 + + Windows: Refactor resources structure + + Signed-off-by: John Howard + +commit 2dd822f3226393b5611364785793d38a44debd08 +Merge: e252fe288c 288214e5ae +Author: David Calavera +Date: Mon Oct 26 13:42:02 2015 -0700 + + Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test + + Use of checkers on docker_cli_import_test.go + +commit e252fe288cda563e10f70f55f934f1e05ee06729 +Merge: 8173acca95 37dbe07519 +Author: David Calavera +Date: Mon Oct 26 13:41:14 2015 -0700 + + Merge pull request #17266 from cpuguy83/dump_http_request_on_debug + + Dump request when daemon is set to debug + +commit 853f2e9952b94c52101d69003161b654a7cd4384 +Author: John Howard +Date: Mon Oct 26 13:34:49 2015 -0700 + + Windows: Volumes PR fix one of Tibors nits + + Signed-off-by: John Howard + +commit 8173acca9530dc3ff090f6025e6940e3f1f6f116 +Merge: 5cf028d3dd 2046ba3e3c +Author: Michael Crosby +Date: Mon Oct 26 13:33:59 2015 -0700 + + Merge pull request #17374 from brahmaroutu/fix_gccgo_ci + + GCCGO requires more memory and time to start containers, fixing GCCGO… + +commit 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2 +Merge: c52fdce2f2 0b5e628e14 +Author: Michael Crosby +Date: Mon Oct 26 13:32:32 2015 -0700 + + Merge pull request #17313 from calavera/version_exec_json_check + + Version exec json check. + +commit c52fdce2f2146a478623a33982758c1c89fd1dbb +Merge: 1b9d064b73 ac37d1f10a +Author: David Calavera +Date: Mon Oct 26 13:26:43 2015 -0700 + + Merge pull request #17286 from FeroVolar/namegenerator + + Add Heyrovsky + +commit 1b9d064b73428fe64b171d38c676e4dfefea7668 +Merge: 74a881c9e4 1477a3d7fd +Author: David Calavera +Date: Mon Oct 26 13:25:36 2015 -0700 + + Merge pull request #17376 from LK4D4/fix_dumper + + Fix dumper program to use proper import + +commit 74a881c9e4e4010d79799baec751e278864b5509 +Merge: 5087e8c2e8 f410d7e70f +Author: Michael Crosby +Date: Mon Oct 26 13:21:31 2015 -0700 + + Merge pull request #17368 from HuKeping/update-test + + Update docker_cli_build_unix_test + +commit 0dec8091a23dcb877b4a881face936fb0689420c +Author: Alexander Morozov +Date: Mon Oct 26 13:18:47 2015 -0700 + + Remove contrib/host-integration + + It's outdated and unused. + + Signed-off-by: Alexander Morozov + +commit 1477a3d7fda5e8b29d68ffd5c4d6edead9ba2c61 +Author: Alexander Morozov +Date: Mon Oct 26 13:09:07 2015 -0700 + + Fix dumper program to use proper import + + Signed-off-by: Alexander Morozov + +commit 3dd578318a33f4264326d9bda115879a6f5d60be +Author: Nathan LeClaire +Date: Mon Oct 26 12:55:48 2015 -0700 + + Stop heartbeat when there is an issue connecting to the server + + Signed-off-by: Nathan LeClaire + +commit 9fa2f73139a452d22d8d0f51f9b971b10aebd3a9 +Merge: ae973a96c0 ee4a357441 +Author: Nathan LeClaire +Date: Mon Oct 26 12:54:44 2015 -0700 + + Merge pull request #2032 from hairyhenderson/make-active-work-with-swarm-1311 + + Returning active host when swarm is active + +commit 5087e8c2e86ba61d7cec9abec00ee6bf64939d0d +Merge: b21f95c612 0c518b6ab2 +Author: Brian Goff +Date: Mon Oct 26 15:48:04 2015 -0400 + + Merge pull request #17180 from rhatdan/destroy + + Docker is calling cont.Destroy twice on success + +commit b21f95c6125cf183fe04bcb23f40f3bffbddca54 +Merge: 74b9d89648 7058ec278d +Author: Brian Goff +Date: Mon Oct 26 15:39:08 2015 -0400 + + Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker + + Use checker assert for docker_cli_external_graphdriver_unix_test.go + +commit 0b5e628e14a673cd1940876b2f3d091c2fe236d9 +Author: David Calavera +Date: Fri Oct 23 12:48:55 2015 -0400 + + Version exec json check. + + Keep backwards compatibility with old versions of the api. + + Signed-off-by: David Calavera + +commit 2046ba3e3ceee6c51f6e4c55f5d26af212d2dc3e +Author: Srini Brahmaroutu +Date: Mon Oct 26 15:46:49 2015 +0000 + + GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI + Signed-off-by: Srini Brahmaroutu + +commit b924f7f8fa4ec0e185fec8c31fdcc4458f13e1c6 +Author: Victor Vieux +Date: Mon Oct 26 11:49:48 2015 -0700 + + switch to go1.5.1 + + Signed-off-by: Victor Vieux + +commit ae973a96c0ffec93ae324a50c24f864eb5887cd9 +Merge: 99b564e804 6c5dc41e6d +Author: Nathan LeClaire +Date: Mon Oct 26 11:35:05 2015 -0700 + + Merge pull request #2088 from dgageot/fix-get-hostname + + Fix get hostname + +commit 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36 +Merge: 34439f3ecb cc77fc3cb2 +Author: Sebastiaan van Stijn +Date: Mon Oct 26 19:05:23 2015 +0100 + + Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag + + Add zsh completion for 'docker build' multi tags + +commit 6c5dc41e6dff6fe1ac46510ee304a9f7793757de +Author: David Gageot +Date: Mon Oct 26 18:47:09 2015 +0100 + + Revert "Remove useless duplication on GetSSHHostname" + + This reverts commit b6462eb6d0c11cef0380f055e7e67ad10dd45282. + + Signed-off-by: David Gageot + +commit 57dc1156de12532fa14f1d77a4a70f2943c33e5c +Author: David Gageot +Date: Mon Oct 26 18:46:58 2015 +0100 + + Revert "Remove duplication over GetIP" + + This reverts commit 99aacc7b79bf24fda123213bb0a84d8d7b59f28d. + + Signed-off-by: David Gageot + +commit a7559fd3a837bfac26cf7661a0a563cf804026df +Author: David Gageot +Date: Mon Oct 26 18:46:48 2015 +0100 + + Revert "Generic and Base slight cleanups" + + This reverts commit 19625def223355c51a19d6d82290c60c88023534. + + Signed-off-by: David Gageot + +commit ae81ef652e3bc6648c5ed5b731ca422978a8924a +Merge: da1f854462 2c2aa91f9f +Author: Alexandre Beslic +Date: Mon Oct 26 10:24:00 2015 -0700 + + Merge pull request #1338 from vieux/get_compiled_go + + fix test Dockerfile, use precompiled go + +commit fe760a7b62719f61fccf30e4b806ffae39b163ae +Author: Mazz Mosley +Date: Mon Oct 26 17:08:45 2015 +0000 + + Include additional classifiers + + I've included Python 2/3 as they are not parent classifiers but + sibling classifiers. They denote that this project will work with + *some* versions of python and by having them, they'll show up for + people searching for python 2 or 3 projects. + + According to the internet :) + + Signed-off-by: Mazz Mosley + +commit 99b564e8045a1f126e5ce4d944e7d2c30264de44 +Merge: 7ecb221444 956b0bb65c +Author: Olivier Gambier +Date: Mon Oct 26 10:08:18 2015 -0700 + + Merge pull request #2070 from dgageot/1985-build-with-docker-on-travis + + FIX #1985 Build with Docker on TravisCI + +commit 7ecb2214447925fb3363f1bcf80a5a4c8954c139 +Merge: f155bc9df9 ab1b0ca2e9 +Author: Olivier Gambier +Date: Mon Oct 26 10:07:27 2015 -0700 + + Merge pull request #2083 from dgageot/remove-dead-code + + Remove dead code + +commit 34439f3ecb5cbde2f733e162179dfbe57dbaabff +Merge: 7e275cf0e5 ead62b5952 +Author: Alexander Morozov +Date: Mon Oct 26 10:06:45 2015 -0700 + + Merge pull request #17351 from mavenugo/predefined + + Prevent user from deleting pre-defined networks + +commit 88e53e177dce3982f7106597bb0c431345a7099e +Author: Daniel Nephin +Date: Tue Sep 22 16:42:43 2015 -0400 + + Upgrade pyinstaller to 3.0 + + Signed-off-by: Daniel Nephin + +commit e168fd03ca9ea4cdb2843f706b28a864ae669174 +Author: Daniel Nephin +Date: Thu Oct 22 12:12:43 2015 -0400 + + Fix unicode in environment variables for python2. + + Signed-off-by: Daniel Nephin + +commit 95a23eb6829a48298f7db7fb806fc944f0c6cc18 +Author: Daniel Nephin +Date: Wed Oct 21 15:40:50 2015 -0400 + + Change version check from engine version to api version. + + Signed-off-by: Daniel Nephin + +commit f5ad36314387e2b97c2f1be3303da50ff5e4cfdb +Author: Daniel Nephin +Date: Wed Oct 21 13:05:14 2015 -0400 + + Use inspect network to query for an existing network. + + And more tests for get_network() + + Signed-off-by: Daniel Nephin + +commit 7e275cf0e5e1edff77ce9b159e995e03f6ac3371 +Merge: 9328fc7e62 7963807610 +Author: Tibor Vass +Date: Mon Oct 26 12:43:21 2015 -0400 + + Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options + + Fix repeatable options in zsh completion + +commit bcdd375ce512352801a57a87dec4ef61a42fe1c6 +Merge: 399df0a982 15c3bbeb9c +Author: Ying Li +Date: Mon Oct 26 09:33:41 2015 -0700 + + Merge pull request #229 from cyli/tls-config-refactor + + Factor out TLS configuration code for server and TLS + +commit 399df0a982744459f011c1c8187d57b612108d91 +Merge: efb71c9ef1 ed61974d10 +Author: Ying Li +Date: Mon Oct 26 08:23:35 2015 -0700 + + Merge pull request #234 from cyli/remove-symlinks + + Remove symlinking root keys + +commit f410d7e70f7196673ed63a7aa7dec25ad4475ef1 +Author: Hu Keping +Date: Mon Oct 26 21:00:16 2015 +0800 + + Update docker_cli_build_unix_test + + Signed-off-by: Hu Keping + +commit 9328fc7e62e703ac5bae7de5fdf9c02dbcccb034 +Merge: 75128c46c7 e72f92cb99 +Author: Antonio Murdaca +Date: Mon Oct 26 13:58:21 2015 +0100 + + Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test + + Using checkers assert for integration-cli/docker_cli_export_import_test.go + +commit f3d49e38c0e488194cd507b092111e0bce21e779 +Merge: 986036b6f9 0340361f56 +Author: mnowster +Date: Mon Oct 26 11:54:02 2015 +0000 + + Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3 + + Upgrade to pyinstaller 3 + +commit 2d1e6d01631b219f7a35623dd26610b8155e5197 +Author: David Gageot +Date: Mon Oct 26 09:55:41 2015 +0100 + + Simpler code for env usage hints. + + We can just output the original os.Args in the + eval call. + + Signed-off-by: David Gageot + +commit f8b912718162e2a5428bcfe6ace0e31091da95a2 +Author: Hu Keping +Date: Mon Oct 26 14:53:50 2015 +0800 + + Docs: update readme + + Two main things: + - Update the content + - Update broken links + + Signed-off-by: Hu Keping + +commit ab1b0ca2e97badb77c393cd7a60856092fcbbfcd +Author: David Gageot +Date: Mon Oct 26 09:34:31 2015 +0100 + + Remove dead code + + Signed-off-by: David Gageot + +commit f155bc9df99f0439cc7d3aa7198968d2b3072986 +Merge: e421a07336 b038ff4020 +Author: David Gageot +Date: Mon Oct 26 09:31:26 2015 +0100 + + Merge pull request #2073 from nathanleclaire/fix_cert_env + + Fix cert env + +commit 956b0bb65c6901b39c993ae5894b1a76e724469b +Author: David Gageot +Date: Fri Oct 23 18:32:22 2015 +0200 + + FIX #1985 Build with Docker on TravisCI + + Signed-off-by: David Gageot + +commit 7058ec278dcd27fce62c50b1e462aca8ade42439 +Author: Federico Gimenez +Date: Sun Oct 25 10:41:41 2015 +0100 + + Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go + + Signed-off-by: Federico Gimenez + +commit dbdff7a3da4ffdd741081764c188147019850c6b +Author: Carol Fager-Higgins +Date: Sun Oct 25 23:37:07 2015 -0700 + + added openstack swift settings to config doc + + Signed-off-by: Carol Fager-Higgins + +commit 3aa70c1948e44ab523db0be37a602b63e7eac882 +Author: Hu Keping +Date: Mon Oct 26 11:33:51 2015 +0800 + + Warning out when disalbe oom killer but not set the memory limit + + It is always the best practice that only disable the OOM Killer where + you also set the `-m/--memory` option, otherwise it's dangerous. + + Signed-off-by: Hu Keping + +commit d1ed5f62adadac202e34d11d513a9c7bc946ab27 +Author: liaoqingwei +Date: Thu Oct 22 07:32:16 2015 +0800 + + Use of checkers on docker_cli_config_test.go. + + Signed-off-by: liaoqingwei + +commit f26a31e80cfcc77daba0872ddb14bf03f4398311 +Author: Jian Zhang +Date: Fri Oct 23 09:19:33 2015 +0800 + + Use checker assert for integration-cli/docker_cli_cp_* four files. + + Signed-off-by: Jian Zhang + +commit 9120a1fc3ef929b18200b4f315bb7147889a0c36 +Author: weiyan +Date: Thu Oct 22 07:58:19 2015 +0800 + + use of checkers on docker_cli_exec_test.go + + Signed-off-by: weiyan + +commit 75128c46c7881325c87de8797b455534558784ed +Merge: c71e97fc12 bc478b453f +Author: Brian Goff +Date: Sun Oct 25 20:39:32 2015 -0400 + + Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test + + Using checkers assert for integration-cli/docker_cli_events_unix_test.go + +commit ead62b59522bba132b9a14712e4350439e7fa2a5 +Author: Madhu Venugopal +Date: Sun Oct 25 16:09:54 2015 -0700 + + Prevent user from deleting pre-defined networks + + Signed-off-by: Madhu Venugopal + +commit c71e97fc122d82c4bd99e47b38000d216bf360f2 +Merge: 029e7ae4e0 6d974ec19d +Author: Vincent Demeester +Date: Sun Oct 25 21:17:50 2015 +0100 + + Merge pull request #17332 from askb/17225_flakytest_TestExecEnv + + Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case. + +commit 029e7ae4e02683edda30255d3484e8009b121b2a +Merge: 5bcd6aba4b 2a5f04dcc9 +Author: Doug Davis +Date: Sun Oct 25 13:25:21 2015 -0400 + + Merge pull request #17348 from askb/17243_flaykytest_TestExecAfterContainerRestart + + Fix for #17243 DockerSuite.TestExecAfterContainerRestart. + +commit 5f2205981b2ed8599ff4939f4da18b6e9465e1ee +Author: Rusty Conover +Date: Sun Oct 25 13:01:45 2015 -0400 + + Fix failing test case + + When building a URL don't include path components in the host parameter. + + Closes #1124 + + Signed-off-by: Rusty Conover + +commit 2a5f04dcc900888ff706e36e6360d0b51d82bed1 +Author: Anil Belur +Date: Sun Oct 25 18:05:05 2015 +0530 + + Fix for #17243 DockerSuite.TestExecAfterContainerRestart. + Added waitRun(containerID) statement after docker run -d and docker restart + to ensure the container is restarted before issuing a exec cmd. + + Signed-off-by: Anil Belur + +commit 5bcd6aba4b59163564187edb1c3d4fc8265da95a +Merge: 271f85afac 5560e8a61c +Author: Sebastiaan van Stijn +Date: Sun Oct 25 16:45:04 2015 +0100 + + Merge pull request #17339 from moxiegirl/docs-readme-update + + Tweaking some things + +commit 271f85afac94b224a8e2d4dd99936bafba18a473 +Merge: c10ef20ed8 be1c77595e +Author: Tibor Vass +Date: Sun Oct 25 11:04:27 2015 -0400 + + Merge pull request #17325 from aboch/d0 + + Disable built-in SD on default bridge network + +commit e8da75d4a1f048bc449e225dd833d7d74cf69352 +Author: Federico Gimenez +Date: Sun Oct 25 09:36:18 2015 +0100 + + Integration test: bridge ip is excluded from the allocator pool + + Signed-off-by: Federico Gimenez + +commit c10ef20ed86befcf15b32d5081165bbd28b01c94 +Merge: 80439a4ce2 3dd50eaf05 +Author: moxiegirl +Date: Sat Oct 24 21:56:38 2015 -0700 + + Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax + + Update docker network inspect help syntax + +commit 5560e8a61cd1920f915274e6cd6618d31c698247 +Author: Mary Anthony +Date: Sat Oct 24 18:07:08 2015 -0700 + + Tweaking some things + + Signed-off-by: Mary Anthony + +commit 6d974ec19d2f484586ec57c2e2455a6de927cddf +Author: Anil Belur +Date: Sat Oct 24 18:52:23 2015 +0530 + + Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case. + This is done by calling waitRun() followed by the docker run, which ensures the container is loaded + before calling docker exec to obtain the env variable set previously. + + Incorporated the change as suggeted by duglin. + + Signed-off-by: Anil Belur + +commit ee4a3574411da874aab0c50af36546e98175ace4 +Author: Dave Henderson +Date: Tue Oct 20 21:00:03 2015 -0400 + + Returning active host when swarm is active + + Signed-off-by: Dave Henderson + +commit cc77fc3cb27c90568857c80d08787806d35aa5c8 +Author: Steve Durrheimer +Date: Sat Oct 17 14:40:22 2015 +0200 + + Add zsh completion for 'docker build' multi tags + + + Fix some others multi options + + Signed-off-by: Steve Durrheimer + +commit 796380761007a0d0087b41b1ee0d76fd6a7a6e20 +Author: Steve Durrheimer +Date: Sat Oct 24 16:38:41 2015 +0200 + + Fix repeatable options in zsh completion + + Signed-off-by: Steve Durrheimer + +commit 80439a4ce280777ded1b22842b7b6b3d4d6b574a +Merge: c3ea74f686 04b6b0b47f +Author: Brian Goff +Date: Sat Oct 24 08:14:08 2015 -0400 + + Merge pull request #17296 from jecarey/16756-docker_cli_history_test + + Use of checkers on docker_cli_history_test.go + +commit c3ea74f6869b179ee0803b94448d6af3164a6002 +Merge: e2d263d64e 230313b1c5 +Author: Brian Goff +Date: Sat Oct 24 08:00:12 2015 -0400 + + Merge pull request #17301 from sdurrheimer/zsh-completion-splunk-log-driver + + Add splunk log driver to zsh completion + +commit 230313b1c5cced44dd5ead776b2f62b55358222d +Author: Steve Durrheimer +Date: Fri Oct 23 08:17:42 2015 +0200 + + Add splunk log driver to zsh completion + + Signed-off-by: Steve Durrheimer + +commit 79804d271c0faa36dded113d65bff4796da54b7f +Author: Lei Jitang +Date: Sat Oct 24 06:33:15 2015 -0400 + + Better log on docker load + + Signed-off-by: Lei Jitang + +commit 408f1efee7e3c8aaebb223f1356205e8b376aa3c +Author: Ying Li +Date: Sat Oct 24 02:08:10 2015 -0700 + + Use -coverpkg to build multiple coverage outputs and use a tool + to merge them, to get more complete coverage information (so a package + can be tested by code outside the package). + + Signed-off-by: Ying Li + +commit 0eb76f405720561e6555a7a9d3c8f8b8cb14aefb +Author: Ying Li +Date: Fri Oct 23 21:55:53 2015 -0700 + + Remove option prefixing + + Signed-off-by: Ying Li + +commit ed61974d10116ed681827cb8d1b267b2b1df9732 +Author: Ying Li +Date: Fri Oct 23 21:19:47 2015 -0700 + + Remove linking from the filestore + + Signed-off-by: Ying Li + +commit d5bbaae9c94b3d1dc67449baa3b88bc12f55a8bd +Author: Ying Li +Date: Fri Oct 23 18:44:26 2015 -0700 + + Remove symlinking and symlink checking from key import-export. + + Signed-off-by: Ying Li + +commit 15c3bbeb9c3b7bb4d8e7d0116cb3e3c3bf98ee53 +Author: Ying Li +Date: Fri Oct 23 20:55:59 2015 -0700 + + Remove explicit test for parsing garbage in certs. + + Signed-off-by: Ying Li + +commit 04b6b0b47fab7751b716b0b6c8ce3b98a8c51e99 +Author: James Carey +Date: Thu Oct 22 13:50:58 2015 -0500 + + Use of checkers on docker_cli_history_test.go + + Signed-off-by: James Carey + +commit e2d263d64ee47cb79055bdcc9f903425125c50db +Merge: 8d4888df90 e50c8f67ea +Author: Sebastiaan van Stijn +Date: Fri Oct 23 19:49:29 2015 -0700 + + Merge pull request #17311 from lsiqueira/patch-1 + + Update CONTRIBUTING.md + +commit be1c77595eed1d9b22511faf64783e4c65f40c61 +Author: Alessandro Boch +Date: Fri Oct 23 19:37:35 2015 -0700 + + Disable built-in SD on docker0 network + + Signed-off-by: Alessandro Boch + +commit f961afe5c357350ab42df77bda0e35c63df24dca +Author: Ying Li +Date: Fri Oct 23 18:47:39 2015 -0700 + + Do not run shortened tests in CI, since some codepaths are just + unexercised. + + Signed-off-by: Ying Li + +commit 8d4888df90c30a189821699e444bd6587c035a20 +Merge: e74cf8acad 1f1dbf312d +Author: Sebastiaan van Stijn +Date: Fri Oct 23 18:22:14 2015 -0700 + + Merge pull request #16488 from splunk/splunk_log_driver + + Add Splunk logging driver #16207 + +commit e421a07336c65fe28177b8a6a2c979c2f66f4d8c +Merge: 8b9291de64 fd5f3ad0cc +Author: Olivier Gambier +Date: Fri Oct 23 17:43:43 2015 -0700 + + Merge pull request #2072 from nathanleclaire/mk_install + + Re-add make install to Makefile + +commit 18a773aa5ab1cc9fdc0906f5a05c5d2748a6989a +Author: Jeffrey Morgan +Date: Fri Oct 23 17:25:30 2015 -0700 + + Bump Kitematic to 0.9.2 + + Signed-off-by: Jeffrey Morgan + +commit f347fad43605fe1c87117d75172ec09defe26791 +Merge: 5858dbda52 40dff9914d +Author: Jeffrey Morgan +Date: Fri Oct 23 17:21:44 2015 -0700 + + Merge branch 'master' of github.com:kitematic/kitematic + +commit 5858dbda52e459966d24ea94ac53c6cc4a0f7ce3 +Author: Jeffrey Morgan +Date: Fri Oct 23 17:21:39 2015 -0700 + + Make default size bigger to avoid clipping ui + + Signed-off-by: Jeffrey Morgan + +commit 40dff9914d2dedb9a11324421cca3b3c3dfffb06 +Merge: 914bc6d154 0d49744158 +Author: French Ben +Date: Fri Oct 23 17:17:01 2015 -0700 + + Merge pull request #1135 from FrenchBen/machine-info + + Updated machine info for docker-machine changes + +commit 914bc6d154b81f5c7f3cb49addb312e357ebf301 +Author: Jeffrey Morgan +Date: Fri Oct 23 17:15:50 2015 -0700 + + Bump to 0.9.2 + + Signed-off-by: Jeffrey Morgan + +commit 0d497441588bd164251cad3e3a6a544d206efb72 +Author: French Ben +Date: Fri Oct 23 16:50:44 2015 -0700 + + Updated machine util for latest docker-machine bin + + Signed-off-by: French Ben + +commit 9ff311e41042500184654733518de34892e998a6 +Author: Jeffrey Morgan +Date: Fri Oct 23 16:49:46 2015 -0700 + + Fixed bug where windows upgrade would fail if VM was stopped + + Signed-off-by: Jeffrey Morgan + +commit fd5f3ad0cc763c0015905bfacfac9b2b9f64fa24 +Author: Nathan LeClaire +Date: Fri Oct 23 13:12:17 2015 -0700 + + Re-add make install to Makefile + + Signed-off-by: Nathan LeClaire + +commit 1041f3967086052438a3e34cee3db14e2277b629 +Author: Santhosh Manohar +Date: Fri Oct 23 08:11:57 2015 -0700 + + Vendor in libnetwork changes to support container rename + + Signed-off-by: Santhosh Manohar + +commit 3b16a8c91c77cbae99b04d641ae73693780f52ca +Author: Madhu Venugopal +Date: Mon Oct 26 17:49:50 2015 -0700 + + integration-cli test for active container rename and reuse + + Signed-off-by: Madhu Venugopal + Signed-off-by: Santhosh Manohar + +commit 8e0bbb28986c9aca5c51f546ba6fd0f1041ace14 +Author: Santhosh Manohar +Date: Fri Oct 23 08:01:07 2015 -0700 + + Add libnetwork call on daemon rename + + Signed-off-by: Santhosh Manohar + +commit fa50f7f2c6dc9f63255e455eb6672678f43081c3 +Author: JonChu +Date: Wed Oct 21 15:02:18 2015 -0700 + + Update index.md + + Removed and cut down on marketing speak. Devs are browsing through this quickly. We're already getting slammed in the docs on UX and having more marketing is just terrible. It's not our job to market in the docs. + +commit 09dc607bef96feafdd7cbce1194cc39614366b6d +Author: Ying Li +Date: Fri Oct 23 15:56:47 2015 -0700 + + Read multiple CA certs from a single PEM file - thanks @mtrmac! + + Signed-off-by: Ying Li + +commit e74cf8acad799aff39bf1b8ceffdef471aa0d242 +Merge: 448398c2a8 a7e686a779 +Author: Tibor Vass +Date: Fri Oct 23 18:43:07 2015 -0400 + + Merge pull request #16433 from Microsoft/10662-volumes5 + + Windows: [TP4] Add volume support + +commit da1f854462aae65b29dc940e59f5835fa4d2fa8a +Merge: a7a82bd1ae e32b3211ae +Author: Alexandre Beslic +Date: Fri Oct 23 14:54:33 2015 -0700 + + Merge pull request #1310 from pwnall/image_affinity + + Swarm filters support in image building + +commit a7a82bd1ae331c06f8cbf210ff569da10e3f2b77 +Merge: b68183aabc 10d232fe66 +Author: Alexandre Beslic +Date: Fri Oct 23 14:13:14 2015 -0700 + + Merge pull request #1330 from vieux/fix_mesos_timeout_issue + + fix issue with timeouts in mesos + +commit 7cca8f18bbf5607a2f0d2120e473f6f119738001 +Author: Jeffrey Morgan +Date: Fri Oct 23 14:09:58 2015 -0700 + + Bump to 1.9.0-rc2 + +commit b68183aabcb8e9cbc74aee397eae79de396f4b4a +Merge: 5146f07b83 21d6fc5378 +Author: Alexandre Beslic +Date: Fri Oct 23 14:05:33 2015 -0700 + + Merge pull request #1335 from vieux/fix_panic + + fix panic when createContainer returns nil,nil + +commit b038ff4020d043c224aaf49423519dd5fb261a1b +Author: Nathan LeClaire +Date: Fri Oct 23 13:56:53 2015 -0700 + + Fixes https://github.com/docker/machine/issues/2062 + + Signed-off-by: Nathan LeClaire + +commit 448398c2a8a41b6589dd7deb59fdc889e78db223 +Merge: a2e5bbe640 c2eb37f9ae +Author: Sebastiaan van Stijn +Date: Fri Oct 23 13:50:35 2015 -0700 + + Merge pull request #15780 from mountkin/build-multi-tags + + Add ability to add multiple tags with docker build + +commit 3dd50eaf054833280aad16e718bca4139d927532 +Author: Vincent Demeester +Date: Fri Oct 23 22:48:22 2015 +0200 + + Update docker network inspect help syntax + + Signed-off-by: Vincent Demeester + +commit 1f1dbf312ddc299bdad408ce3d6b71f4f5993652 +Author: Denis Gladkikh +Date: Thu Aug 27 16:03:46 2015 -0700 + + Add Splunk logging driver #16207 + + Allow to send Splunk logs using Http Event Collector + + Signed-off-by: Denis Gladkikh + +commit a2e5bbe6409d1e639ed18ea2679b44da6bcd7332 +Merge: f7bdcea529 d0c019850c +Author: Vincent Demeester +Date: Fri Oct 23 21:28:40 2015 +0200 + + Merge pull request #17306 from albers/completion-log-driver-options + + bash completion for log driver options `env` and `labels` + +commit 8b9291de645d4d13ce01f77e7266e2e52edbb869 +Merge: 4bd43d604f 19625def22 +Author: Nathan LeClaire +Date: Fri Oct 23 11:27:44 2015 -0700 + + Merge pull request #2033 from dmp42/03-cleanup + + Code cleanup + +commit e32b3211ae79c46178388d29adaa01a3b599377a +Author: Victor Costan +Date: Sat Oct 17 04:45:29 2015 -0400 + + Swarm filters support in image building. + + When building an image (POST /build), swarm will extract filters from + buildargs. This is similar to how container creation (POST + /containers/create) extracts filters from environment variables. + + Signed-off-by: Victor Costan + +commit f7bdcea529c6fa07133e594ec21f036ee901122f +Merge: cd5108b178 bb69f10df9 +Author: Tibor Vass +Date: Fri Oct 23 13:52:08 2015 -0400 + + Merge pull request #17291 from aaronlehmann/buffer-compression + + Add a buffered Writer between layer compression and layer upload + +commit 4bd43d604f01ba41f8d7848baac5be823167bba3 +Merge: 4e7f8ed7a6 76c7accda0 +Author: Olivier Gambier +Date: Fri Oct 23 10:40:45 2015 -0700 + + Merge pull request #2053 from nathanleclaire/rpc_heartbeat + + Add heartbeat / automatic server cleanup code + +commit 19625def223355c51a19d6d82290c60c88023534 +Author: Olivier Gambier +Date: Tue Oct 20 18:56:34 2015 -0700 + + Generic and Base slight cleanups + + - tests for GetIP + - extract default values into consts (user & port) + - better error handling (cert permissions change) + - unexport Driver for generic (linting) + - ordering of methods and variables for better readability + + Signed-off-by: Olivier Gambier + +commit 4e7f8ed7a65602e0d90f246f90dac859efc39b57 +Merge: c99bb22eeb 335811df0c +Author: Olivier Gambier +Date: Fri Oct 23 10:37:46 2015 -0700 + + Merge pull request #1856 from databus23/b2d_gh_enterprise_urls + + support github enterprise urls for b2d downloads + +commit 0340361f56e7bf80fe0961d387b7d58fb7098e06 +Author: Daniel Nephin +Date: Tue Sep 22 16:42:43 2015 -0400 + + Upgrade pyinstaller to 3.0 + + Signed-off-by: Daniel Nephin + +commit 5146f07b83ae99fc4cb3718597191b7190219542 +Merge: 7510c12122 40a22e5a13 +Author: Victor Vieux +Date: Fri Oct 23 10:20:18 2015 -0700 + + Merge pull request #1332 from riuvshin/master + + Fix log info message + +commit 986036b6f9605a8cccc7bee5fed80e50cd1bffa4 +Merge: 5d60fbe31e 4d8e667c3e +Author: mnowster +Date: Fri Oct 23 18:10:18 2015 +0100 + + Merge pull request #2223 from au-phiware/master + + Powershell script to run compose in a container. + +commit c2eb37f9aeb6215293483e02613514e49011cf2c +Author: Shijiang Wei +Date: Sun Aug 30 21:48:03 2015 +0800 + + Add ability to add multiple tags with docker build + + Signed-off-by: Shijiang Wei + +commit c99bb22eebfce738e19a613576b1101c50b32f5a +Merge: 8cfc28e37a d36fa5f9ff +Author: David Gageot +Date: Fri Oct 23 18:50:04 2015 +0200 + + Merge pull request #2028 from dmp42/02-build-fixes + + Minor cleanup and fix #2022 + +commit cd5108b1786461fbb2aecf251506e70e2683f3bc +Merge: b972a6e3f8 45a8a3796f +Author: Antonio Murdaca +Date: Fri Oct 23 18:24:45 2015 +0200 + + Merge pull request #17303 from coolljt0725/remove_unused_parameter + + Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go + +commit 5d60fbe31ec791a9adc4d77abe9242f1e86b4e25 +Merge: e6f3946c17 258c8bc54d +Author: mnowster +Date: Fri Oct 23 17:11:28 2015 +0100 + + Merge pull request #1659 from viranch/hostip-random-port + + Allow scaling services that have port binding of the form `host_ip::container_port` + +commit e50c8f67ea6bb28c1c42fbc3258014d4077c9c93 +Author: Leandro Siqueira +Date: Fri Oct 23 12:07:57 2015 -0400 + + Update CONTRIBUTING.md + + Fix typo and update number of questions + + Signed-off-by: Leandro Siqueira + +commit 8cfc28e37a14ce56e0972fcc4fa27d194727e694 +Merge: 768a044dad 1df80ba111 +Author: Olivier Gambier +Date: Fri Oct 23 09:07:54 2015 -0700 + + Merge pull request #2065 from dgageot/adding-localhost-to-alt_names + + Adding localhost to the list of alt_names + +commit 2e56e78caf4e7cfe026ebb549e4419f1c4434817 +Author: John Howard +Date: Fri Oct 23 08:42:24 2015 -0700 + + Windows [TP4] Trap Exec Hyper-V Cont error + + Signed-off-by: John Howard + +commit a3c43964cf994cc1315af1590155f63dc588e32c +Author: John Howard +Date: Thu Oct 22 14:01:26 2015 -0700 + + Windows [TP4] HCSShim Revendor + + Signed-off-by: John Howard + +commit 768a044dad0d0d2a520f8edbb40d7dd133a13126 +Merge: 0ac5c901d2 658a6bc1b3 +Author: David Gageot +Date: Fri Oct 23 16:45:08 2015 +0200 + + Merge pull request #2067 from brutasse/patch-1 + + Typo in EXOSCALE_IMAGE + +commit 40a22e5a1360789d41061ff7317f5319ddfbf7c1 +Author: Roman Iuvshin +Date: Fri Oct 23 17:12:15 2015 +0300 + + Fix log info message + + Signed-off-by: Roman Iuvshin + +commit b972a6e3f8087ae054633c70659c3597a0e10e18 +Merge: 60ea37d56f ff91c8ac1a +Author: Brian Goff +Date: Fri Oct 23 09:44:32 2015 -0400 + + Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test + + Using checkers assert for integration-cli/docker_cli_experimental_test.go + +commit 37dbe075196d638d6bd417716deaf067247ee966 +Author: Brian Goff +Date: Thu Oct 22 10:55:23 2015 -0400 + + Dump request when daemon is set to debug + + Uses a new middleware which calls httputils.DumpRequest which is output + to `logrus.Debug`. + This is implemented in a separate middleare so that we only have to + check the logging level when the router is instantiated rather than at + every request. + If this was just `logrus.Debug(httputil.DumpRequest(...))`, the + DumpRequest would be called on each request requardless of logging + level set on the daemon. + + Signed-off-by: Brian Goff + +commit 658a6bc1b3b0a066f57464645eebed9b098fc733 +Author: Bruno Renié +Date: Fri Oct 23 14:44:42 2015 +0200 + + Typo in EXOSCALE_IMAGE + + Signed-off-by: Bruno Renié + +commit e6f3946c17ae35795a3e5fb94641581d5b471447 +Merge: e2af02b158 ae47435425 +Author: mnowster +Date: Fri Oct 23 11:03:59 2015 +0100 + + Merge pull request #2239 from dnephin/fix_unicode_in_env + + Fix unicode in environment variables for python2 + +commit d0c019850c988735727723d04bfd82771fe650f8 +Author: Harald Albers +Date: Fri Oct 23 10:46:32 2015 +0200 + + bash completion for log driver options `env` and `labels` + + Signed-off-by: Harald Albers + +commit 60ea37d56f15d64961f0bc59dd2db1c968c80288 +Merge: d023d5a8a2 cb93fefa40 +Author: Vincent Demeester +Date: Fri Oct 23 10:49:02 2015 +0200 + + Merge pull request #17299 from sdurrheimer/zsh-completion-network-inspect-multi + + Zsh completion for 'docker network inspect' multiple networks + +commit 1df80ba111f0234686a1a35e2544ab7154ef3870 +Author: Dave Goehrig +Date: Tue Apr 28 12:37:25 2015 -0400 + + Adding localhost to the list of alt_names + + When attempting to connect to the docker api from the machine itself, + the TLS verification of the certificate checked against the public + IP address of the primary interface. This is undesirable on hosts + which have NAT rules that block access to that address by default. + + Adding "localhost" to the list of alt_names allows the cert to be + verified and connections to localhost (either 127.0.0.1 or [::1]) to + the port to pass verification. Otherwise one would need to disable + verification just to connect to the local docker instance. + + Signed-off-by: David Gageot + +commit 45a8a3796f2611b5170637fc49548ae79d063904 +Author: Lei Jitang +Date: Fri Oct 23 03:07:06 2015 -0400 + + Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go + + Signed-off-by: Lei Jitang + +commit cb93fefa402c57986567a2a16afe0f49a3338b82 +Author: Steve Durrheimer +Date: Fri Oct 23 08:13:33 2015 +0200 + + Zsh completion for 'docker network inspect' multiple networks + + Signed-off-by: Steve Durrheimer + +commit d023d5a8a24c18e912162c2f4c724cfb21028301 +Merge: 21aecf62a0 1f9332cd16 +Author: Sebastiaan van Stijn +Date: Thu Oct 22 22:10:33 2015 -0700 + + Merge pull request #17295 from SvenDowideit/two-more-links + + Two more links to fix + +commit 1f9332cd1684841d8b9ad9b3dcaee4d641ae1689 +Author: Sven Dowideit +Date: Fri Oct 23 14:10:43 2015 +1000 + + Two more links to fix + + Signed-off-by: Sven Dowideit + +commit 08d1f6c8ac0c90cb009bb7172be4a4c6b79c7df2 +Merge: 17c9b80f16 dfb77906b7 +Author: Jeffrey Morgan +Date: Thu Oct 22 21:04:56 2015 -0700 + + Merge branch 'master' of github.com:docker/toolbox + +commit 17c9b80f16d05aa52cb770b0dca3c118b4980dfa +Author: Jeffrey Morgan +Date: Thu Oct 22 21:04:51 2015 -0700 + + Bump versions of machine and kitematic + + Signed-off-by: Jeffrey Morgan + +commit bb69f10df91fe5ed044e7f0c81a118a2b666757d +Author: Aaron Lehmann +Date: Thu Oct 22 19:37:58 2015 -0700 + + Add a buffered Writer between layer compression and layer upload + + Without this buffering, the compressor was outputting 64 bytes at a + time to the HTTP stream, which was resulting in absurdly small chunk + sizes and a lot of extra overhead. The buffering restores the chunk size + to 32768 bytes, which matches the behavior with 1.8.2. + + Times pushing to a local registry: + + 1.8.2: 0m18.934s + master: 0m20.564s + master+this commit: 0m17.593s + + Fixes: #17038 + + Signed-off-by: Aaron Lehmann + +commit 76c7accda0cfeda9dec2f5734df7f3069e488d7a +Author: Nathan LeClaire +Date: Wed Oct 21 20:38:01 2015 -0700 + + Add heartbeat / automatic server cleanup code + + This replaces the previous method of attempting to clean up servers when + an unexpected exit occurs in the client (e.g. SIGINT or panic) by a + heartbeat protocol. If the server does not hear from the connecting + client within a certain interval of time (500ms in this commit), it will + de-activate itself. This prevents dangling Docker Machine server + processes from accumulating. + + Signed-off-by: Nathan LeClaire + +commit 7510c1212264d82879b5c4efd64438e1133c12c5 +Merge: 2eb39be3ee 95c1147b73 +Author: Xian Chaobo +Date: Fri Oct 23 09:10:42 2015 +0800 + + Merge pull request #1327 from vieux/return_200_image_create + + return 200 OK in /images/create + +commit ff91c8ac1ac35c2e2d68f78d1b972c97f6484342 +Author: Mohammed Aaqib Ansari +Date: Thu Oct 22 20:22:23 2015 -0400 + + Using checkers assert for integration-cli/docker_cli_experimental_test.go + + Signed-off-by: Mohammed Aaqib Ansari + +commit 1c5f8166e4ea5e97251a9d539acbd52f40955756 +Merge: a266f99418 bf6ca6cb53 +Author: Richard Scothern +Date: Thu Oct 22 17:13:33 2015 -0700 + + Merge pull request #1121 from thaJeztah/fix-doc-emoji + + Docs: replace emoji with regular warning + +commit 21aecf62a0064ead695e338f5dfcf8ecab5069f4 +Merge: 37da495d4c 3b9c13873a +Author: Michael Crosby +Date: Thu Oct 22 17:06:16 2015 -0700 + + Merge pull request #17284 from calavera/buffer_inspect_template + + Fail when there is an error executing an inspect template. + +commit 2eb39be3ee9aea14b3f6bcccafab41a2c8ffd473 +Merge: 756671ac66 a2a8596238 +Author: Victor Vieux +Date: Thu Oct 22 16:59:00 2015 -0700 + + Merge pull request #1329 from vieux/improve_mesos_error_message + + improve error message in mesos + +commit ac37d1f10a141024852ae63bb3cf04d15653d064 +Author: Fero Volar +Date: Fri Oct 23 01:32:47 2015 +0200 + + Add Bassi + + Signed-off-by: Fero Volar + +commit e2af02b15833227347bdf45e899af9ae2f22e5fe +Merge: 6f78271b82 cf197253cd +Author: moxiegirl +Date: Thu Oct 22 16:27:44 2015 -0700 + + Merge pull request #2238 from SvenDowideit/possible-link-fixes + + Possible link fixes + +commit 3b9c13873afdfe6c884e1265397d7c5cb9cd5c5c +Author: David Calavera +Date: Thu Oct 22 18:42:19 2015 -0400 + + Fail when there is an error executing an inspect template. + + - Do not execute the template directly in the cli outout, go is not atomic + in this operation and can send bytes before failing the execution. + - Fail after evaluating a raw interface if the typed execution also + failed, assuming there is a template parsing error. + + Signed-off-by: David Calavera + +commit 0ac5c901d259ffe5c9a5fdb1178b91df28d17acf +Merge: 9911019102 834c687226 +Author: Nathan LeClaire +Date: Thu Oct 22 16:16:47 2015 -0700 + + Merge pull request #2054 from SvenDowideit/fix-errant-links + + Fix some links found with linkchecker + +commit 834c687226caef52a534a1aa4d8bbb4d9cd76db5 +Author: Sven Dowideit +Date: Thu Oct 22 17:33:18 2015 +1000 + + Fix some links found with linkchecker + + Signed-off-by: Sven Dowideit + +commit 37da495d4cf30bebb17397dd9e103e6d3e74fe08 +Merge: 4c253ddf20 5b53839326 +Author: Tibor Vass +Date: Thu Oct 22 19:02:02 2015 -0400 + + Merge pull request #17278 from mavenugo/etchosts + + Vendoring libnetwork & libkv with fixes + +commit 685425bb2ba125282b6bef66e278ab59dd149832 +Author: Fero Volar +Date: Fri Oct 23 01:01:58 2015 +0200 + + Add Heyrovsky + + Signed-off-by: Fero Volar + +commit cf197253cdc10c2860c558412d4646d1795b7160 +Author: Sven Dowideit +Date: Thu Oct 22 17:17:11 2015 +1000 + + Possible link fixes + + Signed-off-by: Sven Dowideit + +commit bf6ca6cb53a231a444d5fe519c07cc02c80212be +Author: Sebastiaan van Stijn +Date: Thu Oct 22 15:21:02 2015 -0700 + + Docs: replace emoji with regular warning + + The docs don't render emoji, so replaced the `:warning:` with + a `**Warning**:` to keep the formatting consisten with + `**Note**:` used in other parts of the docs. + + Signed-off-by: Sebastiaan van Stijn + +commit 99110191021de878ecc7ba98dd116d200965fc63 +Merge: e80e448cd5 7180ddca87 +Author: Nathan LeClaire +Date: Thu Oct 22 15:06:27 2015 -0700 + + Merge pull request #1993 from leedm777/completion + + Adding bash completion and helper scripts + +commit e80e448cd5cd36a3c56669b9923c15e1e8b25123 +Merge: 07bcb9a7aa 987718f24d +Author: Nathan LeClaire +Date: Thu Oct 22 14:54:58 2015 -0700 + + Merge pull request #2035 from flavio/add_openSUSE_and_SUSE_provision + + Add SUSE Enterprise Linux and openSUSE provision + +commit d2d40c2d9cb93379494ab31d362d01fa691d6d5c +Author: Sean OMeara +Date: Thu Oct 22 17:49:25 2015 -0400 + + Documenation update - articles/chef + + Signed-off-by: Sean OMeara + +commit 003d6719ec0632dded7b6a0013547e13d37c4243 +Author: Jeffrey Morgan +Date: Thu Oct 22 14:51:44 2015 -0700 + + Removed unused docker machine stats method + + Signed-off-by: Jeffrey Morgan + +commit 32ae93dae7cabdd26da6e65f02d7512e798cb62c +Author: Jeffrey Morgan +Date: Thu Oct 22 14:49:16 2015 -0700 + + Use machine status subcommand + + Signed-off-by: Jeffrey Morgan + +commit 591ec5cbcd6ffc38cc05461fc0a8b03e99a24b87 +Author: Jeffrey Morgan +Date: Thu Oct 22 14:25:09 2015 -0700 + + Add transition to setup if creating new VM. + + Signed-off-by: Jeffrey Morgan + +commit 5d67f1f0a376c2db251af10cb6a05a88ac7a625d +Author: Jeffrey Morgan +Date: Thu Oct 22 14:22:12 2015 -0700 + + Only transition to setup if VM is starting + + Signed-off-by: Jeffrey Morgan + +commit 32323db556a155ba343ddbd7896474c76255109e +Merge: 49e5e55ec9 4be7a40320 +Author: Jeffrey Morgan +Date: Thu Oct 22 14:20:09 2015 -0700 + + Merge branch 'master' of github.com:kitematic/kitematic + +commit 49e5e55ec96f44c6373cccc88a41fcbca66f8880 +Author: Jeffrey Morgan +Date: Thu Oct 22 14:15:48 2015 -0700 + + Only show progress on starting or creating the VM + + Signed-off-by: Jeffrey Morgan + +commit 4be7a4032060fef21a8733ef5919a2bf9e83936e +Author: Jeffrey Morgan +Date: Thu Oct 22 14:15:48 2015 -0700 + + Only show progress on starting or creating the VM + + Signed-off-by: Jeffrey Morgan + +commit 4c253ddf204f0c8ebc58c1aa5796c689d623e16b +Merge: 4816626f3e f664f6e4b1 +Author: Tibor Vass +Date: Thu Oct 22 17:14:49 2015 -0400 + + Merge pull request #17275 from vdemeester/17246-tags-to-repotags + + Use RepoTags & RepoDigest in inspect + +commit 5b53839326621e8796fee88e376fc4ca42ed980f +Author: Alessandro Boch +Date: Thu Oct 22 13:51:52 2015 -0700 + + Add integ-test for fixed--cidr == bridge network + + Signed-off-by: Alessandro Boch + +commit 793b20ba093acedfb53ea2a3344601322e97893f +Author: Madhu Venugopal +Date: Thu Oct 22 14:12:04 2015 -0700 + + Vendoring in libkv to be aligned with libnetwork + + Signed-off-by: Madhu Venugopal + +commit 52df87ac2b83693a48efcdc7167575449f122e25 +Author: Madhu Venugopal +Date: Thu Oct 22 14:05:51 2015 -0700 + + Vendoring in Libnetwork + + This carries fixes for + - Internal racy /etc/hosts updates within container during SD + - Renable SD service record watch after cluster-store restarts + - Fix to allow remote IPAM driver to return no IP if the user prefers + - Fix to allow --fixed-cidr and --bip to be in same range + + Signed-off-by: Madhu Venugopal + +commit 4c502b0d7cfec4748f860416a74d4d2d1f9f83d7 +Author: Jeffrey Morgan +Date: Thu Oct 22 14:08:42 2015 -0700 + + Bump version + + Signed-off-by: Jeffrey Morgan + +commit a788166c2152ffda94cbeccd27adde24a433006a +Merge: 283276abec 232824cfb3 +Author: French Ben +Date: Thu Oct 22 14:05:02 2015 -0700 + + Merge pull request #1130 from kitematic/remove-machine + + Remove bundling of docker-machine, macsudo + +commit a266f99418758264347f78fc469e7c2823478b1b +Merge: 24a3f92616 0249cc9cb2 +Author: Richard Scothern +Date: Thu Oct 22 14:04:32 2015 -0700 + + Merge pull request #1095 from mrwacky42/api-version-annotated + + Add annotated example for adding header; +spelling + +commit f664f6e4b19d4e155d78af2eacddcd941dae4fce +Author: Vincent Demeester +Date: Thu Oct 22 12:34:12 2015 +0200 + + Use RepoTags & RepoDigest in inspect + + To be coherent with /images/json (images command) + + Signed-off-by: Vincent Demeester + +commit 4816626f3e84ef6452ecfed9d79ae537273bde31 +Merge: 2afdc6582b 1598500df8 +Author: David Calavera +Date: Thu Oct 22 13:37:38 2015 -0700 + + Merge pull request #17270 from albers/completion-network-ids + + bash completion can be configured to complete network IDs + +commit 232824cfb3400b122ff1d7a2ead909ae0145d712 +Author: Jeffrey Morgan +Date: Wed Oct 21 19:25:43 2015 -0700 + + Remove bundling of machine & macsudo + + Signed-off-by: Jeffrey Morgan + +commit 7180ddca87c222f8c717d8b288d5b43d85142252 +Author: David M. Lee +Date: Thu Oct 15 19:25:20 2015 -0400 + + Adding bash completion and helper scripts + + This patch adds some bash helper scripts. + + * docker-machine.bash - command completion for docker-machine + * docker-machine-prompt.bash - function for putting the active machine + name in PS1 + * docker-machine-wrapper.bash - function wrapper adding an `use` + command that runs `eval $(docker-machine env whatever)` in the + current shell. + + Signed-off-by: David M. Lee + +commit dfb77906b7c7099f2ca8f11633ea4674fe376b77 +Merge: 6d932bfa03 9d572c71af +Author: Michael Chiang +Date: Thu Oct 22 13:26:07 2015 -0700 + + Merge pull request #203 from tiangolo/disk-size + + Start default machine with dynamic disk size of max 200GB instead of 20 GB. (Note: Disk dynamically expands) + +commit 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9 +Merge: 09cd98462b 20faaaa872 +Author: David Calavera +Date: Thu Oct 22 13:08:31 2015 -0700 + + Merge pull request #17274 from aboch/ai + + Turn off discovery when icc == false + +commit 09cd98462b0b9bae38806c7615ee17dd7afd5714 +Merge: 8b198a3bfb dfdee41308 +Author: Antonio Murdaca +Date: Thu Oct 22 22:05:29 2015 +0200 + + Merge pull request #17269 from tonistiigi/trust-deprecation-warning + + Show trust variable deprecation warning only if used + +commit 9d572c71af4b43664076c254c18d8eadf8eb5ac4 +Author: Sebastián Ramírez +Date: Thu Oct 22 14:43:01 2015 -0500 + + Set default of default Docker machine to 200GB + + Signed-off-by: Sebastián Ramírez + +commit 8b198a3bfbba37bd772702683d25dfdfe5e7ee79 +Merge: bb19575d40 10e485b386 +Author: Vincent Demeester +Date: Thu Oct 22 21:18:10 2015 +0200 + + Merge pull request #17268 from albers/completion-network-inspect-args + + bash completion for `docker network inspect` supports multiple networks + +commit 20faaaa872444b6fffbc5a6d30310a782caafe0f +Author: Alessandro Boch +Date: Thu Oct 22 08:41:50 2015 -0700 + + Turn off service discovery when icc==false + + - Turn off built-in service discovery on docker0 bridge + when icc is false + + Signed-off-by: Alessandro Boch + +commit 07bcb9a7aadb30b3310e127e774b1e48227cc47d +Merge: f6bbbdce7f 1d3268d128 +Author: Nathan LeClaire +Date: Thu Oct 22 11:59:55 2015 -0700 + + Merge pull request #2058 from dgageot/improve-cmd-exe-support + + improve cmd shell support + +commit 6f832d3ca1516685368e7dd693d357268b7265f1 +Author: Sebastián Ramírez +Date: Thu Oct 22 13:33:09 2015 -0500 + + Set default size of the default docker machine to 250GB + + Signed-off-by: Sebastián Ramírez + +commit f6bbbdce7f5d30a14695e4942c97421d4f3e30f0 +Merge: c60b2cb2f9 27cdffe042 +Author: Nathan LeClaire +Date: Thu Oct 22 11:29:31 2015 -0700 + + Merge pull request #2056 from xiaohui/force-tty-allocation + + force tty allocation for ssh with multiple '-tt'. + +commit dfdee4130816cd5334330cc431d8200c1fa4e609 +Author: Tonis Tiigi +Date: Thu Oct 22 09:08:50 2015 -0700 + + Show trust variable deprecation warning only if used + + Signed-off-by: Tonis Tiigi + +commit a7e686a779523100a092acb2683b849126953931 +Author: John Howard +Date: Wed Sep 9 19:23:06 2015 -0700 + + Windows: Add volume support + + Signed-off-by: John Howard + +commit e569236f1e4f927f31c5ff622163430a32ffcb15 +Author: Richard Scothern +Date: Mon Oct 5 15:28:22 2015 -0700 + + Add go version to logger output + Signed-off-by: Richard Scothern + +commit 1598500df8337a1fdde7954a7b0fc5688ae2acac +Author: Harald Albers +Date: Thu Oct 22 18:50:41 2015 +0200 + + bash completion can be configured to complete network IDs + + Signed-off-by: Harald Albers + +commit c60b2cb2f902923fa8d17f94b6cd20a280288435 +Merge: 11fd9648ac f80dc360c7 +Author: Olivier Gambier +Date: Thu Oct 22 09:57:56 2015 -0700 + + Merge pull request #1910 from posita/posita/1880-ssl-cert-snafu + + READY FOR REVIEW - Work-around erroneous SSL: CERTIFICATE_VERIFY_FAILED error with some buggy versions of OpenSSL + +commit 11fd9648ac530db3824cfe6f0aafde08aad7f554 +Merge: 1bfb34afd3 6b7628a175 +Author: Olivier Gambier +Date: Thu Oct 22 09:52:18 2015 -0700 + + Merge pull request #1639 from feelobot/validate-ec2-vpc-id-matches-subnet-id + + Use SDK to Validate VpcID with SubnetId + +commit 1bfb34afd3d020a5a96837264148fc61c1a32037 +Merge: 1a6a9de6c7 035c0de9e5 +Author: Olivier Gambier +Date: Thu Oct 22 09:38:22 2015 -0700 + + Merge pull request #2057 from dgageot/remove-dead-code + + Remove dead code + +commit 1a6a9de6c7e0ecb5f44991fc56351b856f852a7b +Merge: a1e610bdd3 e2b6a832ac +Author: Olivier Gambier +Date: Thu Oct 22 09:36:11 2015 -0700 + + Merge pull request #2006 from dgageot/1954-certificate-always-regenerated + + Investigate 1954 certificate always regenerated + +commit 24a3f926167e82df5a29c8cf8fc61c6e0e7aea0a +Merge: e5d9837970 a5040860f2 +Author: Olivier Gambier +Date: Thu Oct 22 09:34:09 2015 -0700 + + Merge pull request #1118 from SvenDowideit/stop-linking-when-rendering-to-html + + Prevent md->html link generation + +commit 756671ac66d3af36019073b2c98b37eeb64e3d51 +Merge: 50475d5ad4 c1902e1222 +Author: moxiegirl +Date: Thu Oct 22 09:29:32 2015 -0700 + + Merge pull request #1324 from SvenDowideit/fix-errant-links + + Fix some non-relative links + +commit cbee953f0d194888d27e276f05729e8d12ceaaa3 +Merge: c1bbeb9ef7 4da56194a7 +Author: moxiegirl +Date: Thu Oct 22 09:28:55 2015 -0700 + + Merge pull request #19 from SvenDowideit/fix-errant-link + + Fix errant link + +commit ae47435425e3922fac0cf4faaa89269ea0efc6e3 +Author: Daniel Nephin +Date: Thu Oct 22 12:12:43 2015 -0400 + + Fix unicode in environment variables for python2. + + Signed-off-by: Daniel Nephin + +commit 95c1147b73b5ccc786fe177c2e680e0243dc1900 +Author: Victor Vieux +Date: Thu Oct 22 09:09:09 2015 -0700 + + return 200 OK in /images/create + + Signed-off-by: Victor Vieux + +commit 10e485b3860516c23bc3efa43c62dd11ee912b3e +Author: Harald Albers +Date: Thu Oct 22 17:53:17 2015 +0200 + + bash completion for `docker network inspect` supports multiple networks + + Signed-off-by: Harald Albers + +commit bb19575d40b3ec679acd2aadeea37e7bba12179c +Merge: 48fe12af0c 9ed6cec8ff +Author: Sebastiaan van Stijn +Date: Thu Oct 22 07:26:15 2015 -0700 + + Merge pull request #17259 from SvenDowideit/fix-some-errant-links + + Fix some errant links + +commit 335811df0cb926a8db4b0c98ae9f03369d9db052 +Author: Fabian Ruff +Date: Thu Sep 24 11:49:03 2015 +0200 + + support upgrading b2d from custom urls + + . + + Signed-off-by: Fabian Ruff + +commit 5021ffd2e7fea4f1d6891a9e083f1a40c7997c43 +Author: Fabian Ruff +Date: Tue Sep 15 10:24:50 2015 +0200 + + support github enterprise urls for b2d downloads + + This commit allows downloading boot2docker releases not only from the official releases url (https://api.github.com/repos/boot2docker/boot2docker/releases) but from arbitrary github repositories that publish releases with a boot2docker.iso artifact. It also supports downloading from github enterprise. + + Signed-off-by: Fabian Ruff + +commit 6f78271b826c59d7f58d03e68cca13438436bdbf +Merge: cf40a38820 f7100b2ef3 +Author: mnowster +Date: Thu Oct 22 13:37:27 2015 +0100 + + Merge pull request #2236 from dnephin/use_inspect_network + + Use inspect network to query for an existing network + +commit 9ed6cec8ff91ff100c268fa21817fdc111e77e43 +Author: Sven Dowideit +Date: Thu Oct 22 16:59:16 2015 +1000 + + Fix some errant links + + Signed-off-by: Sven Dowideit + +commit 1d3268d1289e774f54404ddf6c4efa3840749e8a +Author: Stefan Scherer +Date: Thu Jul 9 00:01:00 2015 +0200 + + improve cmd shell support + + Signed-off-by: Stefan Scherer + + Signed-off-by: David Gageot + +commit e2b6a832ac28614848c79346c9d66f087f6d901f +Author: David Gageot +Date: Mon Oct 19 09:27:11 2015 +0200 + + Add more debug during certificates validation + + Signed-off-by: David Gageot + +commit 035c0de9e5de28a87791f613ca0e414361164385 +Author: David Gageot +Date: Thu Oct 22 11:02:10 2015 +0200 + + Remove dead code + + Signed-off-by: David Gageot + +commit 27cdffe0426cd41de010b6ac10e546bb5b3130d2 +Author: Xiaohui Liu +Date: Thu Oct 22 16:14:47 2015 +0800 + + force tty allocation for ssh with multiple '-tt'. + + fix #2037: + when provision on CentOS 7.0, it needs to force tty allocation with multiple '-t' option. + Otherwise, the ssh command will failed with "sudo: sorry, you must have a tty to run sudo" + in SetHostname. + + Signed-off-by: Xiaohui Liu + +commit 4da56194a79482e131d37abc4288e7c1705477c5 +Author: Sven Dowideit +Date: Thu Oct 22 17:36:53 2015 +1000 + + Fix errant link + + Signed-off-by: Sven Dowideit + +commit a5040860f28e10b73ce6adc0d745f210800cc2d3 +Author: Sven Dowideit +Date: Thu Oct 22 17:27:21 2015 +1000 + + Prevent md->html link generation + + Signed-off-by: Sven Dowideit + +commit c1902e12228644af10b130eaf33573f269618a03 +Author: Sven Dowideit +Date: Thu Oct 22 17:22:25 2015 +1000 + + Fix some non-relative links + + Signed-off-by: Sven Dowideit + +commit 50475d5ad485c1c79185fd030ca40246a33b2cc0 +Merge: 975eaa9e73 c947d5be69 +Author: Alexandre Beslic +Date: Thu Oct 22 00:02:46 2015 -0700 + + Merge pull request #1318 from jimmyxian/add-support-some-run-options + + Add support some run options + +commit 48fe12af0c785d62ac852ea8428a9789a4e9d7fd +Merge: c6ec33ea8f eedeeaf49c +Author: Vincent Demeester +Date: Thu Oct 22 08:34:50 2015 +0200 + + Merge pull request #16784 from MHBauer/test-refactor + + use gocheck asserts instead of fatal + +commit 283276abece08ed0aaf6c63500e1856ab1f7c3e0 +Author: Jeffrey Morgan +Date: Wed Oct 21 20:46:15 2015 -0700 + + Update CONTRIBUTING.md + +commit 20bedf3245d11e4d6f21e7805943a766e1a2aa02 +Author: Jeffrey Morgan +Date: Wed Oct 21 20:45:58 2015 -0700 + + Update CONTRIBUTING.md + +commit 096f6b4d2cd02ed19dee0b1fc234869d7010fea6 +Author: Jeffrey Morgan +Date: Wed Oct 21 20:40:08 2015 -0700 + + Update CONTRIBUTING.md + +commit 907835a758b36c89012ddc0e7982b29f4b508804 +Author: Jeffrey Morgan +Date: Wed Oct 21 20:39:43 2015 -0700 + + Update CONTRIBUTING.md + +commit 4faeed2857b80b2c3335eda524ba03f5c3c8426d +Author: Jeffrey Morgan +Date: Wed Oct 21 20:38:00 2015 -0700 + + Update CONTRIBUTING.md + +commit 6d932bfa030276eb7180df1b0cb04852bb19ae5e +Author: Jeffrey Morgan +Date: Wed Oct 21 20:30:02 2015 -0700 + + Set global environment variable for kitematic and other tools + + Signed-off-by: Jeffrey Morgan + +commit 1b1d1e365c3f88de844f1c8c2f97cca812e1c1a7 +Author: Jeffrey Morgan +Date: Wed Oct 21 20:29:33 2015 -0700 + + Fix issue where upgrade would not work with rc versions + + Signed-off-by: Jeffrey Morgan + +commit c6ec33ea8f8a2691c9a43f02cc69fcd204e04b18 +Merge: fa2bf776a2 a263709a9b +Author: Sebastiaan van Stijn +Date: Wed Oct 21 19:24:32 2015 -0700 + + Merge pull request #17241 from gondor/docs-extend-plugins + + docs: Add Netshare volume plugin to extend/plugins + +commit c7bef046d5b2e0850e55cb7a7bafbde54f5dcd4a +Author: Ying Li +Date: Wed Oct 21 18:47:44 2015 -0700 + + Clean up the make targets for CircleCI some more. + + Signed-off-by: Ying Li + +commit 61f9f8425408559be2ed7bd3c1c9049c9ac3b6cc +Author: Ying Li +Date: Wed Oct 21 18:43:33 2015 -0700 + + Use configuration option structures to set up client TLS and server TLS. + Test for if client cert is passed without a client key and vice versa. + Fail in ConfigureClientTLS if only one of client cert/key is passed. + Lint fixes. + + Signed-off-by: Ying Li + +commit a263709a9bce010082399fc539c385de3a059dda +Author: Jeremy Unruh +Date: Wed Oct 21 18:42:17 2015 -0700 + + changes from review - which -> that + + Signed-off-by: Jeremy Unruh + +commit c947d5be69af305bc866440e25aaa9bd003c4251 +Author: Xian Chaobo +Date: Wed Oct 21 17:00:43 2015 +0800 + + add support some run options + + Signed-off-by: Xian Chaobo + +commit f8c0d4d0550836eaba0b41df560464f048c5fdfd +Author: Jeremy Unruh +Date: Wed Oct 21 18:07:55 2015 -0700 + + changes from review - move up to conform to alphabetical order + + Signed-off-by: Jeremy Unruh + +commit f80dc360c702e86d36c8af2cbceb60c13ce41eaf +Author: Matt Bogosian +Date: Sat Sep 26 02:49:40 2015 -0700 + + Inspired by #1880 (and docker/compose#890 et al.). Make sure `ca.pem` subject is different from `cert.pem` subject to work-around OpenSSL bug. + + Signed-off-by: Matt Bogosian + +commit fa2bf776a2fb5666531378699f826d24225f93ae +Merge: 4786ac1ffe 710817a71b +Author: Brian Goff +Date: Wed Oct 21 20:49:38 2015 -0400 + + Merge pull request #16971 from HuKeping/upgrade-test + + Use checker on integration test when possible + +commit 710817a71b40287acc546fe2e08367b2a02dae54 +Author: Hu Keping +Date: Tue Oct 13 20:01:58 2015 +0800 + + Use checker on integration test when possible + + Signed-off-by: Hu Keping + +commit 975eaa9e7394b43b693d8302c55552f21d6b23a0 +Merge: e5523c250a a7550e9e70 +Author: Alexandre Beslic +Date: Wed Oct 21 17:45:56 2015 -0700 + + Merge pull request #1320 from dnephin/support_filter_networks + + Support filtering networks by id or name + +commit a1e610bdd31c307a06a46d7ff6abf2c4b37ade34 +Merge: cb473ad0a7 8d78aed26c +Author: Nathan LeClaire +Date: Wed Oct 21 16:48:34 2015 -0700 + + Merge pull request #2049 from nathanleclaire/0.5.0-rc3 + + Bump version to rc3 + +commit cb473ad0a7994d13f4506659d4a05ef9b09cd028 +Merge: 19cb0d9b07 bd532747f1 +Author: Nathan LeClaire +Date: Wed Oct 21 16:44:33 2015 -0700 + + Merge pull request #2027 from dgageot/2019-fix-env-hints + + FIX #2019 invalid env hints + +commit 596d4caa87ef21528cd35cd9cf1668f283b74d6f +Author: Sven Dowideit +Date: Thu Oct 15 16:42:28 2015 -0700 + + Migrate to using github linking + + Signed-off-by: Sven Dowideit + +commit 8d78aed26c06d6d7a0e7bed64f6bca54bb4b87f3 +Author: Nathan LeClaire +Date: Wed Oct 21 16:36:27 2015 -0700 + + Bump version to rc3 + + Signed-off-by: Nathan LeClaire + +commit 19cb0d9b071b586aae959f250b657e474cd7378a +Merge: de5d052985 4157dff31c +Author: Nathan LeClaire +Date: Wed Oct 21 16:33:58 2015 -0700 + + Merge pull request #2048 from nathanleclaire/increase_ssh_timeout + + Increase SSH timeout back to five minutes + +commit e5523c250a29e9d3f481a1899b797995547d9ba0 +Merge: 1a744d6853 6643894063 +Author: Alexandre Beslic +Date: Wed Oct 21 16:17:50 2015 -0700 + + Merge pull request #1321 from vieux/update_endpoint_volume_create + + rename `POST /volumes` to `POST /volumes/create` + +commit 1a744d685376307ce24374432c8c8e8caf07c869 +Merge: 39a0a58e1c 50671ab6f3 +Author: Victor Vieux +Date: Wed Oct 21 15:50:47 2015 -0700 + + Merge pull request #1317 from abronan/add_concurrent_port_test + + Integration test for regression with parallel docker run when specifying a port + +commit 4157dff31c75f8fe4ff526ec70b8a57f55ac3c0a +Author: Nathan LeClaire +Date: Wed Oct 21 15:27:20 2015 -0700 + + Increase SSH timeout back to five minutes + + Signed-off-by: Nathan LeClaire + +commit 4786ac1ffe53c2229deb5fc14f1261fd33004afb +Merge: 697d4c9e72 c71c7f4b4f +Author: Tianon Gravi +Date: Wed Oct 21 14:58:11 2015 -0700 + + Merge pull request #17153 from albers/completion-cp-args + + [Fix 17029] docker cp completion not correct + +commit 39a0a58e1c95335436cf208ce41895b4aca77c6e +Merge: 93e78ce641 cd5de97a8d +Author: Victor Vieux +Date: Wed Oct 21 14:57:57 2015 -0700 + + Merge pull request #1322 from dnephin/update_api_version + + Update api version to match the version that swarm supports + +commit 697d4c9e7222a10995f46e6008137099da778402 +Merge: ab22fe0f7c 5f59f52c14 +Author: Jess Frazelle +Date: Wed Oct 21 14:57:05 2015 -0700 + + Merge pull request #17203 from hopkings2008/auth_token + + In NewV2Repository, check the suffix of endpoint.URL and append 'v2' … + +commit e5d98379701799dda78929550df915a9ab3310ad +Merge: e6bb0aa7c0 ad14545745 +Author: Stephen Day +Date: Wed Oct 21 14:50:18 2015 -0700 + + Merge pull request #1098 from denverdino/master + + Redundant digest verification in validateBlob when pushing a new layer + +commit ab22fe0f7ce0c6211396030431506c64e1a5d57f +Merge: af6743a6c6 bb79b7eb9e +Author: Vincent Demeester +Date: Wed Oct 21 23:42:50 2015 +0200 + + Merge pull request #17055 from daehyeok/parse_utf8 + + ProcessWord support UTF-8 + +commit 87e55241c47e86fbda7169fa4b16280efa667f51 +Author: Jeffrey Morgan +Date: Wed Oct 21 14:42:05 2015 -0700 + + Compression lzma + + Signed-off-by: Jeffrey Morgan + +commit ddaa10debf253068b8a64d7fe35bfa2113ce9790 +Merge: 3a8238e75c cf2e5d054b +Author: Jeffrey Morgan +Date: Wed Oct 21 14:41:12 2015 -0700 + + Merge branch 'upgrade' + +commit cf2e5d054bfeb075125749b79f9fbcf585763859 +Author: Jeffrey Morgan +Date: Wed Oct 21 14:40:53 2015 -0700 + + Bump virtualbox, include machine binaries + + Signed-off-by: Jeffrey Morgan + +commit 3a8238e75c5c0c4672d10e84a8c2e4fc7f458c48 +Merge: c6655ab033 23a0a9555f +Author: Jeffrey Morgan +Date: Wed Oct 21 14:38:11 2015 -0700 + + Merge pull request #251 from docker/update-message + + Update installer message to specify anonymous information is being collected. + +commit af6743a6c61b3c854d647975bca3f826ec654b20 +Merge: e319b122d3 fb372e66bb +Author: Jess Frazelle +Date: Wed Oct 21 14:36:50 2015 -0700 + + Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest + + RPM change install location of Fish completions + +commit 23a0a9555fe0daac73ecc435a572e441399f06eb +Author: Michael Chiang +Date: Wed Oct 21 14:34:53 2015 -0700 + + windows install message update. + + windows message update. + +commit e319b122d34b88c8c450225b23515751f4d58d1b +Merge: bf8ba3d0c9 4dce280d96 +Author: Tibor Vass +Date: Wed Oct 21 17:32:58 2015 -0400 + + Merge pull request #17227 from aaronlehmann/layer-compression + + Fix layer compression regression + +commit e409eb0dc3cc2e2e8c2960e63b91648ec51ac11f +Author: Ying Li +Date: Wed Oct 21 14:30:35 2015 -0700 + + Remove Link from the filestore + + Signed-off-by: Ying Li + +commit 3f7b826e9cf7ddb8d85a0c63780a85a83149e6f5 +Author: Michael Chiang +Date: Wed Oct 21 14:27:34 2015 -0700 + + update. + +commit 5fd552a8f6abd14cf39b2f1a861cd08227aabe97 +Author: Michael Chiang +Date: Wed Oct 21 14:26:05 2015 -0700 + + Update installer message to specify anonymous information is being collected. + + Update installer message to specify anonymous information is being + collected. + +commit 402c704798ca16ff2c14a284f34e493f573ea451 +Author: Ying Li +Date: Wed Oct 21 14:21:10 2015 -0700 + + Remove symlinks from notary-client repo creation + + Signed-off-by: Ying Li + +commit bf8ba3d0c970c53890924bd1bf65cb593329df6f +Merge: 08fb495975 dc813c7d13 +Author: Jess Frazelle +Date: Wed Oct 21 14:01:59 2015 -0700 + + Merge pull request #16908 from brahmaroutu/skip_oom_gccgo + + Skipping two tests when running with GCCGO (CI) + +commit 08fb49597563e66d708098b4391ad7e13d3e619d +Merge: 70af70aa0b 6b1a643ac8 +Author: Jess Frazelle +Date: Wed Oct 21 13:58:22 2015 -0700 + + Merge pull request #17145 from thaJeztah/deb-add-fish-completions + + deb: add fish completions + +commit 70af70aa0b448b49940f9971bc87ca9ed7cdd9c4 +Merge: f33678d1bf c4e49d1014 +Author: Jess Frazelle +Date: Wed Oct 21 13:57:16 2015 -0700 + + Merge pull request #17220 from calavera/fix_double_removal + + Do not fail when a container is being removed and we request its delete again. + +commit 99aacc7b79bf24fda123213bb0a84d8d7b59f28d +Author: Olivier Gambier +Date: Tue Oct 20 18:49:45 2015 -0700 + + Remove duplication over GetIP + + + ip address proper validation + + Signed-off-by: Olivier Gambier + +commit b6462eb6d0c11cef0380f055e7e67ad10dd45282 +Author: Olivier Gambier +Date: Tue Oct 20 18:43:57 2015 -0700 + + Remove useless duplication on GetSSHHostname + + Signed-off-by: Olivier Gambier + +commit c2589c8099f0f256ab51a26212e4448063d2565c +Author: Olivier Gambier +Date: Tue Oct 20 18:37:36 2015 -0700 + + Trivial cleanup / ordering / inline doc + + Signed-off-by: Olivier Gambier + +commit bf3cd8b8f4c331b420d56ecdb824b7ddda69bd9d +Author: Olivier Gambier +Date: Tue Oct 20 18:35:13 2015 -0700 + + Remove useless duplication on PreCreateCheck + + Signed-off-by: Olivier Gambier + +commit cf40a3882009ebc4577420fff7822ae047097451 +Merge: c34a9f165d 1bc3c97f2a +Author: Daniel Nephin +Date: Wed Oct 21 16:29:40 2015 -0400 + + Merge pull request #2237 from dnephin/env_ci_storage_graph + + Make storage driver configurable in CI + +commit de5d0529859fb3a16a75d79f75b282433d7c6483 +Merge: 20fa654a6b 70dfc1e4db +Author: Olivier Gambier +Date: Wed Oct 21 13:18:57 2015 -0700 + + Merge pull request #2044 from nathanleclaire/minor_docs_fix + + Fix ordered list numbering + +commit f33678d1bf8fcab91004f1a62cfc9453d82dd186 +Merge: 56ef47e881 420e07cc2c +Author: Jess Frazelle +Date: Wed Oct 21 13:08:50 2015 -0700 + + Merge pull request #17251 from tiborvass/fix-release-script + + release: fix bash bug in script + +commit f9e40c2ce2168b736b461e68f2b468efbe088c5e +Author: Jeremy White +Date: Wed Oct 21 13:45:01 2015 -0400 + + feat(openstack): add flag for using nova networks + + Signed-off-by: Jeremy White + +commit 420e07cc2c8189cb3c1f361aa0c1c1d1156b9eda +Author: Tibor Vass +Date: Wed Oct 21 15:57:05 2015 -0400 + + release: fix bash bug in script + + Signed-off-by: Tibor Vass + +commit 56ef47e881359776638903ef1636cb7030ca5eec +Merge: 94a16c81f4 f6577be1c9 +Author: Tibor Vass +Date: Wed Oct 21 16:00:25 2015 -0400 + + Merge pull request #16890 from runcom/perf-boost + + rmi and build cache miss performance improvements + +commit e6bb0aa7c01533b06916f1db0def181f4c2797c7 +Merge: 7e9c832524 39d47e8eea +Author: Stephen Day +Date: Wed Oct 21 12:56:14 2015 -0700 + + Merge pull request #1115 from tianon/fix-auth-servehttp-comment + + Update "type auth.Challenge" comment example code + +commit 70dfc1e4db80f6ef80f615701715a4f50518a22c +Author: Nathan LeClaire +Date: Wed Oct 21 12:51:28 2015 -0700 + + Fix ordered list numbering + + Signed-off-by: Nathan LeClaire + +commit 20fa654a6bcabfd158380c30f19fb1719fbbd6cf +Merge: a21e8f1892 0cf8b761d7 +Author: Nathan LeClaire +Date: Wed Oct 21 12:50:10 2015 -0700 + + Merge pull request #2042 from moxiegirl/carry-1352 + + AWS driver updates and to carry user's pr + +commit cd5de97a8d2490ae7d2254d3afd161919e44ba03 +Author: Daniel Nephin +Date: Wed Oct 21 15:44:02 2015 -0400 + + Update api version to match the version that swarm supports. + + Signed-off-by: Daniel Nephin + +commit f7100b2ef3cf7eb275548bf4c437653b266cf66d +Author: Daniel Nephin +Date: Wed Oct 21 15:40:50 2015 -0400 + + Change version check from engine version to api version. + + Signed-off-by: Daniel Nephin + +commit 1bc3c97f2a770d8268b817f0d8f17160e7b322b2 +Author: Daniel Nephin +Date: Wed Oct 21 15:26:44 2015 -0400 + + Make storage driver configurable in CI + + Signed-off-by: Daniel Nephin + +commit 94a16c81f4b6f44c8ffd8974f71c2975d524d32a +Merge: 8247eff8a8 10e7806984 +Author: Phil Estes +Date: Wed Oct 21 15:20:24 2015 -0400 + + Merge pull request #17245 from dhiltgen/discovery_tls + + Wire up libnetwork with TLS discovery options + +commit a21e8f1892e9bc69cb28293c6b0e11fcc0f837f8 +Merge: 97fcc446d7 6bbec2df68 +Author: Olivier Gambier +Date: Wed Oct 21 12:19:54 2015 -0700 + + Merge pull request #2043 from dgageot/report-virtual-box-errors + + Report VirtualBox errors + +commit efb71c9ef1c360895b888d180f328fe78b0f902a +Author: Diogo Monica +Date: Wed Oct 21 12:13:14 2015 -0700 + + Update gotuf + + Signed-off-by: Diogo Monica + +commit 4d41fe0b801fec7357d68d52b33a64593ac8efbb +Author: Jonathan Lebon +Date: Tue Oct 20 23:10:49 2015 -0400 + + Makefile: don't allocate pseudo-tty if not interactive + + In cases where we are running non-interactively (e.g. on Jenkins), we + shouldn't try to allocate a TTY, which would fail. This patch makes the + flag `-t` be dependent on whether the shell session is interactive or + not. + + When it is interactive, it's important to have `-t` so that the user can + pass signals through to the process. + + We also remove the DOCKER_RUN_DOCS and the GITCOMMIT variables, which + are no longer in use in this Makefile (seems like the related targets + that used it were migrated to docs/Makefile). + + Signed-off-by: Jonathan Lebon + +commit 6bbec2df68ee7071e5f566c488468d93e5416575 +Author: David Gageot +Date: Wed Oct 21 21:03:51 2015 +0200 + + Report VirtualBox errors + + Signed-off-by: David Gageot + +commit 97fcc446d7b8efa83ce42d2027fb27d42eba52cc +Merge: 56acdcf5ae 6a7c8c2a25 +Author: Nathan LeClaire +Date: Wed Oct 21 11:54:48 2015 -0700 + + Merge pull request #2038 from dgageot/brownoxford-validate-cidr + + Additional validation on virtualbox-hostonly-cidr + +commit 39d47e8eea0e1f007e6f2db98ae303a1871065e9 +Author: Tianon Gravi +Date: Tue Oct 20 06:57:15 2015 -0700 + + Update "type auth.Challenge" comment example code + + This interface was changed in a0fdfb9d4dd6e84703d155d9c1f3c72d52324814, but the comment wasn't ever updated to match. + + Signed-off-by: Andrew "Tianon" Page + +commit 0cf8b761d7749ab575d5f414ccaff9a075e4ed05 +Author: Mary Anthony +Date: Wed Oct 21 11:07:00 2015 -0700 + + Carrys and closes #1352 + Pull the chmod line per reviewers + + Signed-off-by: Mary Anthony + +commit 8247eff8a807d88bb683251bdbb16de6a52f0402 +Merge: 678acbcb3f d6d60287ee +Author: David Calavera +Date: Wed Oct 21 11:48:54 2015 -0700 + + Merge pull request #17213 from calavera/volume_driver_validate_name + + Validate volume names for the local driver. + +commit 6a7c8c2a2592e8bef585e72f1c31021179113baf +Author: Chris Abernethy +Date: Thu Jun 25 08:29:44 2015 -0400 + + Additional validation on virtualbox-hostonly-cidr + + Check that the CIDR provided for a virtualbox host only CIDR is specified as a host IP and netmask, e.g., 192.168.100.1/24, and not a network IP and netmask, e.g., 192.168.100.0/24. This will help prevent confusion like #1383 + + Signed-off-by: Chris Abernethy + + Signed-off-by: David Gageot + +commit 56acdcf5ae569876d00268cac60907d2eeb89eb6 +Merge: 62a28e1217 e2856e36f4 +Author: Nathan LeClaire +Date: Wed Oct 21 11:26:28 2015 -0700 + + Merge pull request #2031 from hairyhenderson/check-vtx-darwin-1983 + + Adding support for darwin to IsVTXDisabled + +commit 678acbcb3fc370e31f677c71a5f8615f2ad3a353 +Merge: 9f031f70ce fd955ce6ca +Author: David Calavera +Date: Wed Oct 21 11:25:37 2015 -0700 + + Merge pull request #16992 from burke/fix-mqueue + + Fix --ipc=host dependency on /dev/mqueue existing + +commit a7550e9e700d091af6a4896280f5e653753979b7 +Author: Daniel Nephin +Date: Wed Oct 21 14:23:26 2015 -0400 + + Support filtering networks by id or name. + + Signed-off-by: Daniel Nephin + +commit 9f031f70ce832a5f3fde7bd902e66abeb44f19a9 +Merge: 6a7c38a57d 7af9f988ac +Author: Sebastiaan van Stijn +Date: Wed Oct 21 11:09:02 2015 -0700 + + Merge pull request #17218 from vdemeester/17023-network-multiple-inspect + + Add support for multiple network in inspect + +commit 6a7c38a57d865afc89e4d6ec388bae3b9bedb870 +Merge: 10430fd334 fbb01b8162 +Author: Tibor Vass +Date: Wed Oct 21 14:02:22 2015 -0400 + + Merge pull request #16940 from coolljt0725/default_tls_host + + Make default tls host work + +commit dc813c7d137d3e673b68ad4a2996f254d195f1d9 +Author: Srini Brahmaroutu +Date: Sat Oct 10 04:35:09 2015 +0000 + + Skipping two tests when running with GCCGO (CI) + Signed-off-by: Srini Brahmaroutu + +commit 10430fd334b7d53146a05083beddfc8c6a8cac91 +Merge: 492945235b fb4a725692 +Author: Tibor Vass +Date: Wed Oct 21 13:42:59 2015 -0400 + + Merge pull request #17179 from tonistiigi/17178-dont-overwrite-layer-checksum + + Don’t overwrite layer checksum on push + +commit 412e0facc84af93307817a83bd9b4540cc88af06 +Author: Ying Li +Date: Wed Oct 21 10:38:48 2015 -0700 + + Explicitly check the skip tls verify boolean in notary client + + Signed-off-by: Ying Li + +commit 492945235b6be7f2f7ff8721de0c01a93d0b0f6f +Merge: bb5551746b 0c95eeb584 +Author: Sebastiaan van Stijn +Date: Wed Oct 21 10:21:27 2015 -0700 + + Merge pull request #17136 from gesellix/change-route-volume-create + + rename `POST /volumes` to `POST /volumes/create` + +commit 0fed5e686438aefd9968733fc3c480e7c1339568 +Author: Daniel Nephin +Date: Wed Oct 21 13:05:14 2015 -0400 + + Use inspect network to query for an existing network. + + And more tests for get_network() + + Signed-off-by: Daniel Nephin + +commit 10e7806984947304767690785b6fb329fd93283a +Author: Daniel Hiltgen +Date: Wed Oct 21 09:31:09 2015 -0700 + + Wire up libnetwork with TLS discovery options + + This change exposes the TLS configuration settings to libnetwork so it can + communicate with a key/value store that has been set up with mutual TLS. + + TLS options were introduced with https://github.com/docker/docker/pull/16644 + Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602 + + Signed-off-by: Daniel Hiltgen + +commit 1be540b99bdf7557d4c3183b822b5bea230b0141 +Author: Alessandro Boch +Date: Wed Oct 21 09:10:21 2015 -0700 + + Vendoring in libnetwork for the anonymous endpoint + + - commit f3c8ebf46b890d4612c5d98e792280d13abdb761 + + Signed-off-by: Alessandro Boch + +commit d6d60287ee3a8a064340582d65c131181ae77127 +Author: David Calavera +Date: Tue Oct 20 13:09:48 2015 -0400 + + Move volume name validation to the local driver. + + Delegate validation tasks to the volume drivers. It's up to them + to decide whether a name is valid or not. + Restrict volume names for the local driver to prevent creating + mount points outside docker's volumes directory. + + Signed-off-by: David Calavera + +commit 62a28e12172f68b7eb5d96f5a69bc7ddb2d09aa2 +Merge: c442690618 38b7fe5013 +Author: Olivier Gambier +Date: Wed Oct 21 09:27:09 2015 -0700 + + Merge pull request #2036 from dgageot/2020-better-message-when-vboxmanage-not-found + + FIX #2020 Better error when vboxmanage is missing + +commit 4dce280d96797b6a82e3eb54243e21bce7f55e5d +Author: Aaron Lehmann +Date: Tue Oct 20 16:05:21 2015 -0700 + + Fix layer compression regression + + PR #15493 removed compression of layers when pushing them to a V2 + registry. This this makes layer uploads larger than they should be. + + This commit restores the compression. It uses an io.Pipe to turn the + gzip compressor output Writer into a Reader, so the ReadFrom method can + be used on the BlobWriter (which is very important for avoiding many + PATCH requests per layer). + + Fixes #17209 + Fixes #17038 + + Signed-off-by: Aaron Lehmann + +commit c34a9f165dc154c9a861438c5173ea4510001ff5 +Merge: fb69391889 b500fa2351 +Author: mnowster +Date: Wed Oct 21 17:14:40 2015 +0100 + + Merge pull request #2207 from dnephin/make_config_loader_immutable + + Refactor of ServiceLoader to make it immutable + +commit bb79b7eb9e1db83fd80121b088aa2e5a4c084ace +Author: Daehyeok Mun +Date: Sun Oct 18 21:55:53 2015 -0600 + + ProcessWord support UTF-8 + modified PorcessWord to working normally for UTF-8 strings and added test cases + + Signed-off-by: Daehyeok Mun + +commit bb5551746bdccc1b032fbf8c32914c282ff94668 +Merge: 967e49bdbc 37627427a2 +Author: Tibor Vass +Date: Wed Oct 21 12:00:07 2015 -0400 + + Merge pull request #17229 from mavenugo/ds_fix + + Fixing bootup inconsistencies due to invalid cluster-store config + +commit f290faf4ba8e4b98126909a4181534ff1fa20f30 +Author: Daniel Nephin +Date: Tue Oct 20 11:49:10 2015 -0400 + + Minor refactor to use guard and replace instead of split+join + + Signed-off-by: Daniel Nephin + +commit 725088a18b81f0c1451006b5ea4999cae641aba6 +Author: Daniel Nephin +Date: Tue Oct 20 11:39:06 2015 -0400 + + Force windows drives to be lowercase. + + Signed-off-by: Daniel Nephin + +commit 95c053c56b8f8afffd7b2dac494b3cc2e71c4f6a +Author: Jeremy Unruh +Date: Wed Oct 21 08:28:37 2015 -0700 + + docs: Add Netshare volume plugin to extend/plugins + + Signed-off-by: Jeremy Unruh + +commit b500fa235128d56ea41a8c018f75d81e8722f74d +Author: Daniel Nephin +Date: Mon Oct 19 13:40:13 2015 -0400 + + Refactor ServiceLoader to be immutable. + + Mutable objects are harder to debug and harder to reason about. ServiceLoader was almost immutable. There was just a single function which set fields for a second function. Instead of mutating the object, we can pass those values as parameters to the next function. + + Signed-off-by: Daniel Nephin + +commit f6577be1c93150149c291f9d18375d7bcae9ebb1 +Author: Antonio Murdaca +Date: Sun Oct 11 09:32:52 2015 +0200 + + graph: ensure _tmp dir is always removed + + Also remove unused func `newTempFile` and prevent a possible deadlock + between pull_v2 `attemptIDReuse` and graph `register` + + Signed-off-by: Antonio Murdaca + +commit f9e81b40f4065e3d0851172759ef58fda6572cce +Author: Antonio Murdaca +Date: Fri Oct 9 19:14:45 2015 +0200 + + daemon: faster image cache miss detection + + Lookup the graph parent reference to detect a builder cache miss before + looping the whole graph image index to build a parent-children tree. + + Signed-off-by: Antonio Murdaca + +commit 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad +Author: Antonio Murdaca +Date: Fri Oct 9 19:13:45 2015 +0200 + + graph: add parent img refcount for faster rmi + + also fix a typo in pkg/truncindex package comment + + Signed-off-by: Antonio Murdaca + +commit 04ef69a1e963e0c9bc9b685188f2c584ef275e45 +Author: Antonio Murdaca +Date: Fri Oct 9 18:51:15 2015 +0200 + + integration-cli: docker_cli_build_test: check error before defer + + Signed-off-by: Antonio Murdaca + +commit 45056322748514cf66632409d7fe4ad12aeef533 +Author: Daniel Nephin +Date: Mon Oct 19 12:52:38 2015 -0400 + + Some minor style cleanup + + - fixed a docstring to make it PEP257 compliant + - wrapped some long lines + - used a more specific error + + Signed-off-by: Daniel Nephin + +commit e72f92cb99b73469909dbb28fb5eedaadba9022b +Author: Mohammed Aaqib Ansari +Date: Tue Oct 20 17:53:27 2015 -0400 + + Using checkers assert for integration-cli/docker_cli_export_import_test.go + + Signed-off-by: Mohammed Aaqib Ansari + +commit 50671ab6f3d6ef508c209d77126b3782fe753e73 +Author: Alexandre Beslic +Date: Wed Oct 21 02:59:04 2015 -0700 + + Integration test for regression with parallel docker run when specifying a port + + Signed-off-by: Alexandre Beslic + +commit fb693918893056f865cef7cd1006a038597baf0f +Merge: 44e1fc3a32 b1f8ed84a3 +Author: mnowster +Date: Wed Oct 21 10:39:28 2015 +0100 + + Merge pull request #2233 from dnephin/some_unit_test_cleanup + + Cleanup some unit tests and whitespace + +commit 44e1fc3a3261d42c9eb8a60019001f3def803611 +Merge: 5ed9f9bdf7 5523c3d745 +Author: mnowster +Date: Wed Oct 21 10:36:46 2015 +0100 + + Merge pull request #2230 from dnephin/lowercase_windows_drive + + Lowercase windows drive letter + +commit 38b7fe50130d6499e93652c705777efebb47effd +Author: David Gageot +Date: Wed Oct 21 09:35:33 2015 +0200 + + FIX #2020 Better error when vboxmanage is missing + + + Signed-off-by: David Gageot + +commit 9a8fbb5774f11e5a098b3ede10e17fb971136e14 +Author: Ying Li +Date: Wed Oct 21 00:21:15 2015 -0700 + + Exit the foreach loop if failure, so CI will fail on failed test + + Signed-off-by: Ying Li + +commit 987718f24d3c63d72bd2829f675e7c212ce8e05e +Author: Flavio Castelli +Date: Mon Jun 29 16:34:42 2015 +0200 + + Add SUSE Enterprise Linux and openSUSE provision + + Add support for SUSE Enterprise Linux and openSUSE. + + Code revised to build against current master. + + Signed-off-by: Flavio Castelli + +commit 7af9f988ac535e4ae2e87976db25d4f7047274db +Author: Vincent Demeester +Date: Wed Oct 21 08:57:29 2015 +0200 + + Add support for multiple network in inspect + + To be consistent with other inspect command (on container and images), + add the possiblity to pass multiple network to the network inspect + commands. + + `docker network inspect host bridge none` is possible now. + + Signed-off-by: Vincent Demeester + +commit 8a996f417abdd910538dfa9a76a1b5225ab330ce +Author: David Lawrence +Date: Tue Oct 20 23:56:35 2015 -0700 + + updating godeps and notary for some syntax changes in gotuf brought on by golint + Signed-off-by: David Lawrence (github: endophage) + +commit e6460330bdbef7d9a7a9a3dc51df2be83861c1b0 +Author: David Lawrence +Date: Tue Oct 20 21:36:48 2015 -0700 + + fixing camel casing of func + Signed-off-by: David Lawrence (github: endophage) + +commit 4e24d49ab20812caddbd7ba9cc71ff249b3320f8 +Author: Ying Li +Date: Tue Oct 20 14:20:41 2015 -0700 + + Use the makefile targets for running the test in CircleCI. Push + coverage output to codecov. + + Signed-off-by: Ying Li + +commit 208977b1ad9de49071af9400ef9f3e0a236111a6 +Author: Ying Li +Date: Tue Oct 20 20:57:18 2015 -0700 + + Add an extra test for ECDSAx509 keys + + Signed-off-by: Ying Li + +commit 5f59f52c1413087735852a038ee459833734d8a2 +Author: yuzou +Date: Tue Oct 20 11:53:44 2015 +0800 + + In NewV2Repository, check the suffix of endpoint.URL and append 'v2' correctly. + + Signed-off-by: yuzou + +commit 37627427a2ad9dcb06a2a6ea958670683a6c7934 +Author: Madhu Venugopal +Date: Tue Oct 20 19:17:18 2015 -0700 + + Integration test for default bridge init with invalid cluster config + + Signed-off-by: Madhu Venugopal + +commit 2de2192c27bf72e5036e9914b984ab6d71f70c60 +Author: Madhu Venugopal +Date: Tue Oct 20 19:49:08 2015 -0700 + + Vendoring in libnetwork to fix daemon bootup instabilities + + Signed-off-by: Madhu Venugopal + +commit ea7d621705f5dbd9066c291f8ea2a3460f2ed32f +Author: Ying Li +Date: Tue Oct 20 19:38:39 2015 -0700 + + Add a utility function to return a public key ID from a certificate. + + Signed-off-by: Ying Li + +commit c4426906182638a3e0e1fe39fdb14e192fcddaee +Merge: 2c6a671015 2b56c016b5 +Author: Olivier Gambier +Date: Tue Oct 20 19:35:41 2015 -0700 + + Merge pull request #2034 from docker/revert-1436-add_openSUSE_and_SUSE_provision + + Revert "Add SUSE Enterprise Linux and openSUSE provision" + +commit 2b56c016b5cd2851da42496000e922d696e77342 +Author: Olivier Gambier +Date: Tue Oct 20 19:35:09 2015 -0700 + + Revert "Add SUSE Enterprise Linux and openSUSE provision" + +commit 2c6a671015b2bcce9878c1fd322be3a2091a4194 +Merge: e4f0e66cb7 5de71f7e38 +Author: Olivier Gambier +Date: Tue Oct 20 19:32:30 2015 -0700 + + Merge pull request #1436 from flavio/add_openSUSE_and_SUSE_provision + + Add SUSE Enterprise Linux and openSUSE provision + +commit e4f0e66cb7a05f0a1056df6a73d0da0e2f9476ce +Merge: 4c5615c5e4 1b5bbaa494 +Author: Olivier Gambier +Date: Tue Oct 20 19:29:02 2015 -0700 + + Merge pull request #1449 from hairyhenderson/arch-provisioner-1293 + + Adding provisioner for Arch Linux + +commit d36fa5f9ff349ad8401b716940d25a3330734349 +Author: Olivier Gambier +Date: Tue Oct 20 13:18:02 2015 -0700 + + Minor cleanup and fix #2022 + + Signed-off-by: Olivier Gambier + +commit 834f8b132b43b9075c08eb6186b888f7a224168f +Author: Chance Zibolski +Date: Tue Oct 20 19:02:36 2015 -0700 + + cliconfig: Do not rely on platform dependent code + + The `github.com/docker/docker/pkg/system` import was only being used to call to os.MkdirAll so it seems unnecessary to pull in all of system/* when this is all that is necessary. + + Additionally, this was causing problems with attempting to vendor cliconfig using Godeps, as it would only vendor the necessary files based on the platform it's running on, this was seen when vendoring the package on a Mac, and then attempting to build on a Linux box due to `github.com/docker/docker/pkg/units/` not being properly included. + + Signed-off-by: Chance Zibolski + +commit e2856e36f4f7d8b018db1c46fd06d21baed8a67a +Author: Dave Henderson +Date: Tue Oct 20 19:24:10 2015 -0400 + + Adding support for darwin to IsVTXDisabled + + Signed-off-by: Dave Henderson + +commit 967e49bdbc1949381cfa0a46493bf1ee8acd4759 +Merge: 78e2167976 43ba8a0426 +Author: Jess Frazelle +Date: Tue Oct 20 18:13:19 2015 -0700 + + Merge pull request #17219 from endophage/gotuf_bugfixes + + some bugfixes on getting tuf files + +commit 78e21679761c4aa2ea6b1254bf66525088ff0460 +Merge: c516aa645e 27f908a051 +Author: Brian Goff +Date: Tue Oct 20 19:45:08 2015 -0400 + + Merge pull request #17202 from aboch/ipa + + Do not mask ipam driver if no ip config is passed + +commit c4e49d10143178c718178ff7ce857f4f8ed46a0b +Author: David Calavera +Date: Tue Oct 20 16:36:09 2015 -0400 + + Do not fail when a container is being removed and we request its delete again. + + Abort the process and return a success response, letting the original + request finish its job. + + Signed-off-by: David Calavera + +commit a858a4f3626492bfe8dcbf6c5b50e6436397d33b +Author: Ying Li +Date: Tue Oct 20 14:20:01 2015 -0700 + + Update Makefile with targets that can be used with CircleCI. Also + allow an option to run the short tests (without coverage) while + searching for race conditions. + + Signed-off-by: Ying Li + +commit c516aa645ee407c4b67033b20fcf5c2849b98f21 +Merge: 3957368eff 850bc0838a +Author: Brian Goff +Date: Tue Oct 20 16:39:53 2015 -0400 + + Merge pull request #17177 from runcom/bc-fixes + + Return empty Config fields, now omitempty, for API < 1.21 + +commit 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c +Author: David Lawrence +Date: Tue Oct 20 13:21:43 2015 -0700 + + some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf + Signed-off-by: David Lawrence (github: endophage) + +commit 1b5bbaa494fd016b8282e738d75065f7084837b5 +Author: Dave Henderson +Date: Tue Jun 30 07:32:02 2015 -0400 + + Adding provisioner for Arch Linux + + Signed-off-by: Dave Henderson + +commit 3957368eff19170dd4d454b83cb593c8420b9d08 +Merge: 081edfed32 5013a2fbd6 +Author: Tibor Vass +Date: Tue Oct 20 15:54:05 2015 -0400 + + Merge pull request #17149 from albers/completion-network-ipam + + bash completion for new `docker network create` options + +commit 081edfed3253ab315e1c0d2b60ffb72dcdc3a725 +Merge: a7868191d4 6447abfc35 +Author: Tibor Vass +Date: Tue Oct 20 15:48:12 2015 -0400 + + Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option + + Add zsh completion for 'docker network create -o --opt' + +commit 6b7628a175babb84cdc91abcc84a79f4742ab51b +Author: feelobot +Date: Mon Aug 10 09:13:14 2015 -0700 + + Use SDK to Validate VpcID with SubnetId + + Signed-off-by: feelobot + +commit ffa8fce6e94a04e17c497e783ad9ff5c5552e8c5 +Author: Carol Fager-Higgins +Date: Mon Sep 28 15:51:36 2015 -0700 + + new directory, 2 new files, 2 moved files + edits for review + new directory, 2 new files, 2 moved files + making changes in 4 files, more to come + moved 4 install docs to installguide + Moving everything under install for SEO + Updating the overview to index.md + renamed directory + edits for review + fixing install cs engine instructions and making index reappear + Mary did this update: fixed weight,index.md + Mary fixing install opts/license + moved upgrade cs engine material from install to upgrade docs + + Signed-off-by: Carol Fager-Higgins + +commit 93e78ce641a0b227dde5934b07101748ca0da490 +Merge: e64c5ee209 0399a3c60b +Author: Alexandre Beslic +Date: Tue Oct 20 12:14:06 2015 -0700 + + Merge pull request #1314 from aluzzardi/fix-nullptr-pendingcontainer + + Fix nullptr panic in pending containers. + +commit a7868191d43f4a0f73bf792973869f3df5dc8d37 +Merge: b7fcc71a3c f549b1c9ea +Author: David Calavera +Date: Tue Oct 20 11:31:35 2015 -0700 + + Merge pull request #17188 from jfrazelle/fix-release-rpm + + fix copy of multiple rpms + +commit b1f8ed84a303d5300d3b27a387799d582c55ae2d +Author: Daniel Nephin +Date: Tue Oct 20 13:10:32 2015 -0400 + + Cleanup some unit tests and whitespace. + + Remove some unnecessary newlines. + Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything. + Updated some unit tests to use mocks instead of a custom fake. + + Signed-off-by: Daniel Nephin + +commit 27f908a051eb835c7cab59e596b8dee7ca92873b +Author: Alessandro Boch +Date: Mon Oct 19 16:17:05 2015 -0700 + + Do not mask ipam driver if no ip config is passed + + Signed-off-by: Alessandro Boch + +commit ce01262e163ba08aaf932d6fd38536315ce00f34 +Author: Jeffrey Morgan +Date: Tue Oct 20 11:06:53 2015 -0700 + + 1.9 and upgrades on Mac OS X + + Signed-off-by: Jeffrey Morgan + +commit b7fcc71a3c1d63be6f1133d02b29f6298c4f02ff +Merge: a2d1ec06e6 08944cdef7 +Author: Vincent Demeester +Date: Tue Oct 20 19:51:15 2015 +0200 + + Merge pull request #16917 from WeiZhang555/start-inte + + use of checkers on `integration-cli/docker_cli_start_test.go` + +commit a2d1ec06e65f25f5e60ab550ac61ce46fb158505 +Merge: 7777c1be9b 414cfe9467 +Author: Jess Frazelle +Date: Tue Oct 20 10:35:31 2015 -0700 + + Merge pull request #16984 from estesp/update-busybox + + Update Dockerfile to use the correct busybox:latest identifier + +commit 4c5615c5e49cab280fad3ba53df1ed97c961e619 +Merge: 417cd8a9d3 94361315a8 +Author: Olivier Gambier +Date: Tue Oct 20 10:28:53 2015 -0700 + + Merge pull request #1976 from dgageot/add-tests-virtualbox-driver + + Add tests to virtualbox driver + +commit 417cd8a9d39a9992c007d935b803dd2e94a4b61e +Merge: 72fbf70899 9c8b4e0da3 +Author: Olivier Gambier +Date: Tue Oct 20 10:27:44 2015 -0700 + + Merge pull request #2021 from dgageot/1974-fix-makefile + + FIX #1974 in-container make test fails + +commit 7777c1be9bd5604014a0ac3f16e85960c4c0779a +Merge: ad861876e8 2f16895ee9 +Author: Brian Goff +Date: Tue Oct 20 13:08:29 2015 -0400 + + Merge pull request #17176 from rhvgoyal/fix-locking-issue + + devmapper: Drop devices lock before returning from function + +commit 94361315a812e06d80edd20a3a19e4ac3d5b392f +Author: David Gageot +Date: Mon Oct 12 18:48:49 2015 +0200 + + Add tests to virtualbox driver + + Signed-off-by: David Gageot + +commit 72fbf708990d9e20a1198b8e6f96025d9441def3 +Merge: e959f7f1df 4a33fabe8b +Author: Olivier Gambier +Date: Tue Oct 20 10:01:22 2015 -0700 + + Merge pull request #1990 from dgageot/1983-check-vtx-amdv + + Host needs VT-x/AMD-v enabled for docker-machine to work on virtualbox + +commit 7e9c832524cb027c428bc48d82a5f351eecb91ec +Merge: 21b6f54796 5608db616c +Author: Richard Scothern +Date: Tue Oct 20 09:53:14 2015 -0700 + + Merge pull request #1111 from aaronlehmann/golint-comments + + Correct two golint comment issues + +commit e959f7f1df5acb455f691c4e0af1be873bef1246 +Merge: 6cac8cc95f 3ab5520ea3 +Author: Olivier Gambier +Date: Tue Oct 20 09:47:23 2015 -0700 + + Merge pull request #2026 from dgageot/fix-integration-tests + + Fix Typos in integration tests + +commit 609961ddcc835422e51ef4f3fd6088b96180f72f +Author: xlgao-zju +Date: Tue Sep 29 17:00:08 2015 +0800 + + validate the name of named volume + + Signed-off-by: xlgao-zju + +commit 5523c3d7457f69732e269f7dc45eec9808ba2170 +Author: Daniel Nephin +Date: Tue Oct 20 11:49:10 2015 -0400 + + Minor refactor to use guard and replace instead of split+join + + Signed-off-by: Daniel Nephin + +commit 414cfe946719a0ba811c95486d523e003d44fcc1 +Author: Phil Estes +Date: Tue Oct 13 12:39:05 2015 -0400 + + Update Dockerfile to use the correct busybox:latest identifier + + Also requires some tests to be updated which relied on behavior + of a busybox image that wasn't actually "busybox:latest"; meaning these + tests were unable to be verified/run against a real busybox:latest image + on a daemon. + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit bd532747f11e18dab434eb3aa7662fbd2ce2fe00 +Author: David Gageot +Date: Tue Oct 20 17:28:00 2015 +0200 + + FIX #2019 invalid env hints + + Signed-off-by: David Gageot + +commit ad861876e8bb86091527f31fc944205743e5ce85 +Merge: aa8abf637a ae8c004dc1 +Author: Alexander Morozov +Date: Tue Oct 20 08:57:19 2015 -0700 + + Merge pull request #17035 from estesp/fix-build-dir-perms + + Correct build-time directory creation with user namespaced daemon + +commit 3ab5520ea3a2bc2874c0aedbabcca1330718c4ad +Author: David Gageot +Date: Tue Oct 20 17:06:33 2015 +0200 + + Fix Typos in integration tests + + Signed-off-by: David Gageot + +commit 3f0e0835850462b750167f708d17793b45dc9ef6 +Author: Daniel Nephin +Date: Tue Oct 20 11:39:06 2015 -0400 + + Force windows drives to be lowercase. + + Signed-off-by: Daniel Nephin + +commit bf672ec3405c31a4c9d64984876665c68128c7fe +Author: Daniel Nephin +Date: Fri Oct 16 11:18:07 2015 -0400 + + Fixes #2205 - extends must be copied from override file. + + Signed-off-by: Daniel Nephin + +commit 08944cdef7397752a686ea800e110a8fa14ce719 +Author: Zhang Wei +Date: Sun Oct 11 15:19:28 2015 +0800 + + use of checkers on Integration test + + Part of #16756 + + Use c.Assert instead of condition judgement in + integration-cli/docker_cli_start_test.go + + Signed-off-by: Zhang Wei + +commit aa8abf637ad1a2ccd44208ee0d59b24635c71555 +Merge: 566964bf73 37b3cd421f +Author: Brian Goff +Date: Tue Oct 20 10:48:20 2015 -0400 + + Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test + + Use of checkers on docker_cli_info_test.go + +commit 566964bf73475e994ca605bd2106de045509d23f +Merge: e92a735d70 8adfc7e2d2 +Author: Tibor Vass +Date: Tue Oct 20 10:32:33 2015 -0400 + + Merge pull request #17191 from mrjana/restart + + Fix docker startup failure due to dangling endpoints + +commit 9f19cbc2c4cb6e031b12b04ea33447d427870c29 +Author: Brian Goff +Date: Mon Oct 19 15:53:52 2015 -0400 + + Fix bug in volume driver test implementation + + Also cleans up some of the driver handlers and converts this to use + checkers everywhere. + + Signed-off-by: Brian Goff + +commit e92a735d7016ec79d0b0a91c0f003b2de2dabf9f +Merge: 89bfbb1516 969f1d9773 +Author: moxiegirl +Date: Tue Oct 20 06:15:58 2015 -0700 + + Merge pull request #17192 from HuKeping/docs-update + + Docs: update docs for API stats + +commit ae8c004dc18c59fec9cd67759a5e0087300e872d +Author: Phil Estes +Date: Wed Oct 14 14:35:48 2015 -0400 + + Correct build-time directory creation with user namespaced daemon + + This fixes errors in ownership on directory creation during build that + can cause inaccessible files depending on the paths in the Dockerfile + and non-existing directories in the starting image. + + Add tests for the mkdir variants in pkg/idtools + + Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) + +commit 9c8b4e0da3d482eab9b1e30e7268cede66922f06 +Author: David Gageot +Date: Tue Oct 20 14:54:32 2015 +0200 + + FIX #1974 in-container make test fails + + Signed-off-by: David Gageot + +commit 288214e5aecefd5477678e3dfb3f3fed0dcab23b +Author: liaoqingwei +Date: Tue Oct 20 18:27:52 2015 +0800 + + Use of checkers on docker_cli_import_test.go. + + Signed-off-by: liaoqingwei + +commit 89bfbb15162d3745cc871addcd74b2e5f464cfb9 +Merge: b826215c57 a91a874f73 +Author: Brian Goff +Date: Tue Oct 20 07:21:28 2015 -0400 + + Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test + + use of checkers on docker_cli_start_volume_driver_unix_test.go + +commit bc478b453f630dc47e558096fb5545735de86d2e +Author: Mohammed Aaqib Ansari +Date: Mon Oct 19 19:15:24 2015 -0400 + + Using checkers assert for integration-cli/docker_cli_events_unix_test.go + + Signed-off-by: Mohammed Aaqib Ansari + +commit e64c5ee209d9ed110c0e3f433ec3232533d0aaa9 +Merge: 6ee3420542 f9807f561c +Author: Chanwit Kaewkasi +Date: Tue Oct 20 17:12:38 2015 +0700 + + Merge pull request #1309 from vieux/improve_networks + + small improvment on network UX + +commit 5ed9f9bdf7699ea63d0585eaade0b87507566005 +Merge: 3725c3ab7e 938d49cbdc +Author: mnowster +Date: Tue Oct 20 10:22:58 2015 +0100 + + Merge pull request #2206 from dnephin/fix_extends_from_second_file + + extends must be copied from override file + +commit 969f1d9773509940666a87f8342168bd2a8cf06d +Author: Hu Keping +Date: Tue Oct 20 16:31:20 2015 +0800 + + Docs: update docs for API stats + + Signed-off-by: Hu Keping + +commit 4a33fabe8bf3eff38c1211bd236614318d1c071c +Author: David Gageot +Date: Thu Oct 15 16:42:23 2015 +0200 + + Check that VT-X/AMD-v is enabled + + Signed-off-by: David Gageot + +commit 37b3cd421fcad5513f22a27983167895f4a6cc8d +Author: liaoqingwei +Date: Tue Oct 20 13:38:55 2015 +0800 + + Use of checkers on docker_cli_info_test.go. + + Signed-off-by: liaoqingwei + +commit 8adfc7e2d2d158a08096f60ff9318db5bb0875bd +Author: Jana Radhakrishnan +Date: Mon Oct 19 15:24:26 2015 -0700 + + Fix docker startup failure due to dangling endpoints + + Fixes docker startup failure due to dangling endpoints + which makes docker to not come up. + + Signed-off-by: Jana Radhakrishnan + +commit 9750dd0088bbb23968a19a74f5ae8c58b56328fc +Author: Jana Radhakrishnan +Date: Mon Oct 19 15:22:58 2015 -0700 + + Vendoring libnetwork + + Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052 + + Has bug fixes for 1.9 + + Signed-off-by: Jana Radhakrishnan + +commit b826215c575e320f0cad7c07f8bfdf85437c1be9 +Merge: 310725c933 ac9c0f81df +Author: Sven Dowideit +Date: Tue Oct 20 14:24:25 2015 +1000 + + Merge pull request #16801 from aidanhs/aphs-add-socat-t + + Update ambassador image, use the socat -t option + +commit 310725c9331f6f294ab759698e707052efb7bf09 +Merge: 98c01c2c90 3c1db88290 +Author: Sebastiaan van Stijn +Date: Mon Oct 19 18:36:42 2015 -0700 + + Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes + + MINOR documentation fix. + +commit 6cac8cc95f3a021dc1cab346e20ef9403763b8d8 +Merge: 950aa5cad2 f8491c8140 +Author: Nathan LeClaire +Date: Mon Oct 19 17:51:24 2015 -0700 + + Merge pull request #2015 from nathanleclaire/bump_0.5.0_rc2 + + Bump version to 0.5.0-rc2 + +commit f8491c8140eb8a0e5c810fc65caee9ecb7bca272 +Author: Nathan LeClaire +Date: Mon Oct 19 17:44:31 2015 -0700 + + Bump version to 0.5.0-rc2 + + Signed-off-by: Nathan LeClaire + +commit 950aa5cad22bd5d0500657e764cfafdcd5c8e365 +Merge: 56f457c2ef c93b79abef +Author: Nathan LeClaire +Date: Mon Oct 19 17:43:36 2015 -0700 + + Merge pull request #2014 from nathanleclaire/print_app_err_msg + + Spit out at least some message when flag parsing etc. fails + +commit 56f457c2ef6e306fb1815b6b125f98c85a6e92ec +Merge: 5bba2b3a64 17f0a32b79 +Author: Nathan LeClaire +Date: Mon Oct 19 17:43:23 2015 -0700 + + Merge pull request #2013 from nathanleclaire/no_stdout_env_config + + Ensure log writes only to os.Stderr for env and config command + +commit 5bba2b3a649d4a1483bf4270efaea61d0a31ede9 +Merge: 95f626ce21 7400a77b32 +Author: Nathan LeClaire +Date: Mon Oct 19 17:43:03 2015 -0700 + + Merge pull request #2012 from nathanleclaire/forward_compat_configs + + Add some small support for forward compatible configuration mistakes + +commit 5cdb46a9da9be9802615e7cbf97a0a54314c6c33 +Author: Ying Li +Date: Mon Oct 19 16:18:12 2015 -0700 + + Accept the same ciphersuites in the client and server as docker. + + Signed-off-by: Ying Li + +commit fb81aaed10ded21ac0857fff88e5957ea42f4453 +Author: Ying Li +Date: Mon Oct 19 13:40:38 2015 -0700 + + Add test for if the client CA dir is empty + + Signed-off-by: Ying Li + +commit fc389b7bc3ba220df11e278bf356268acba8077a +Author: Ying Li +Date: Mon Oct 19 13:11:58 2015 -0700 + + Use tls client config utility in notary as well. + + Signed-off-by: Ying Li + +commit c93b79abef066d03b246de943d125920f46ca7ca +Author: Nathan LeClaire +Date: Mon Oct 19 17:30:59 2015 -0700 + + Spit out at least some message when flag parsing etc. fails + + Signed-off-by: Nathan LeClaire + +commit 17f0a32b7987e55c7171f9ee414338975d46b196 +Author: Nathan LeClaire +Date: Mon Oct 19 17:30:18 2015 -0700 + + Ensure log writes only to os.Stderr for env and config command + + Signed-off-by: Nathan LeClaire + +commit fb1013b997f9fcce7c80e1bcdc0c6b443d703c9d +Author: Ying Li +Date: Mon Oct 19 13:01:58 2015 -0700 + + Add servername to the client TLS config, and use it to build notary-server's + TLS connection to notary-signer. + + Signed-off-by: Ying Li + +commit b399783eeef9e5cb79cd0bb0fafc772d906cd800 +Author: Ying Li +Date: Fri Oct 16 18:31:03 2015 -0700 + + Slight refactoring of ConfigureServerTLS and added a ConfigureClientTLS + as well. + + Signed-off-by: Ying Li + +commit 8d96cf0c1fd7054d74ecf1e39c3e265dc304c089 +Author: Ying Li +Date: Fri Oct 16 15:09:40 2015 -0700 + + Use ConfigureServerTLS for notary-server and notary-signer + + Signed-off-by: Ying Li + +commit 7356dfd2732141f222595ee466784e70a45c16c7 +Author: Ying Li +Date: Fri Oct 16 14:13:05 2015 -0700 + + Change ConfigServerTLS to take a client CA directory instead of certs + + Signed-off-by: Ying Li + +commit e50cc2c9cda5813b1057746e7e05453b7db3b44d +Author: Ying Li +Date: Fri Oct 16 12:02:26 2015 -0700 + + Add test to ensure that x509filestore loads existing certs from the + directory without modifying/overwriting them. + + Signed-off-by: Ying Li + +commit 77dc081ead3a060128ddc63404ad92623b4916b2 +Author: Ying Li +Date: Thu Oct 15 13:35:34 2015 -0700 + + Add a utility which generates a tls configuration for you given the + requisite certs. + + Signed-off-by: Ying Li + +commit 7400a77b32f688afdecb5e168168a73951d54550 +Author: Nathan LeClaire +Date: Mon Oct 19 17:29:17 2015 -0700 + + Add some small support for forward compatible configuration mistakes + + Signed-off-by: Nathan LeClaire + +commit f417279d0d3cd81562e74e0c303dff93218dc707 +Merge: 1efacea48a d77d8f1ce8 +Author: Ying Li +Date: Mon Oct 19 17:29:02 2015 -0700 + + Merge pull request #228 from cyli/new-vipers + + Do not use the viper singleton instance everywhere + +commit 98c01c2c90c529ed3cbf219bea3f57ba1848e582 +Merge: 48147d287b a150eee308 +Author: Jess Frazelle +Date: Mon Oct 19 17:18:25 2015 -0700 + + Merge pull request #17088 from Microsoft/sjw/archive_hang_fix + + Fixing hang in archive.CopyFileWithTar with invalid dst + +commit 48147d287b85975a8235c8d49a9e3cacce1a1534 +Merge: b135f758d7 8755920d0d +Author: Jess Frazelle +Date: Mon Oct 19 17:12:07 2015 -0700 + + Merge pull request #17187 from mavenugo/dopts + + Fail the container start if the network has been removed + +commit 5608db616cc49d36e09d84dba1f3df47dd4e9d08 +Author: Aaron Lehmann +Date: Mon Oct 19 16:42:12 2015 -0700 + + Correct two golint comment issues + + Signed-off-by: Aaron Lehmann + +commit 14e85c8c556bae67584e71f5c4bb6322c77a3ef5 +Author: Jessica Frazelle +Date: Thu Oct 15 11:55:17 2015 -0700 + + add test script for built debs + + Signed-off-by: Jessica Frazelle + +commit 8369f00d30cc1d7823723dec6147f0419e67ad46 +Author: Jessica Frazelle +Date: Tue Oct 13 17:52:18 2015 -0700 + + add generate aa profile to deb install + + Signed-off-by: Jessica Frazelle + +commit c39689ca70193f9fdc60a3ae3dbfd0ef979966ba +Author: Jessica Frazelle +Date: Tue Oct 13 17:42:43 2015 -0700 + + add dh-apparmor & apparmor to deb builder dockerfiles + + Signed-off-by: Jessica Frazelle + +commit 8cf89245f5b5f9abb066f599cb69bfe0202bae5d +Author: Jessica Frazelle +Date: Tue Oct 13 17:37:54 2015 -0700 + + change default docker-engine profile to a template based on apparmor_parser version + + Signed-off-by: Jessica Frazelle + +commit f549b1c9ea7ff99f9f17e59d65f234d93e85c36c +Author: Jessica Frazelle +Date: Mon Oct 19 15:14:44 2015 -0700 + + fix copy of multiple rpms + + Signed-off-by: Jessica Frazelle + +commit b135f758d73e8fa1df5f331e866fb250235f3db4 +Merge: c766bcdc73 ab495ab0d0 +Author: Jess Frazelle +Date: Mon Oct 19 15:40:41 2015 -0700 + + Merge pull request #17186 from LK4D4/icc_clear + + Use more clear message for icc=false + iptables=false + +commit c766bcdc735fcedc9a95103082134e7744f23de3 +Merge: 6f4d7dfbf4 504d2a9212 +Author: Jess Frazelle +Date: Mon Oct 19 15:26:16 2015 -0700 + + Merge pull request #17135 from albers/completion-restart-unless-stopped + + Bash completion for restart policy `unless-stopped` + +commit 6f4d7dfbf450d95a5df104838aec7cfc59246d46 +Merge: 82a8a14c4d 2d44ed6d64 +Author: Jess Frazelle +Date: Mon Oct 19 15:25:27 2015 -0700 + + Merge pull request #17148 from albers/completion-dm-options + + bash completion: support for more devicemapper options + +commit 95f626ce212893c64efb381af9646757a3b3b2ef +Merge: 447d262c06 486e359e63 +Author: Nathan LeClaire +Date: Mon Oct 19 15:12:20 2015 -0700 + + Merge pull request #1999 from hairyhenderson/json-use-number-during-migrate-1998 + + Fixing JSON marshaling of large numbers during migration + +commit 486e359e6344a03356e192646740be71bfc48480 +Author: Dave Henderson +Date: Sat Oct 17 15:39:37 2015 -0400 + + Fixing JSON marshaling of large numbers during migration + + - Added some context to an error message - it's useful to know _which_ + plugin failed when invoking the binary failed + - Replaced `json.Umarshal` with a `json.Decoder`, so that the + `UseNumber` function can be called, which prevents large integers from + being interpreted as `float64`s. + - Fixed a couple `log.Warn` calls that should've been `log.Warnf` + + Signed-off-by: Dave Henderson + +commit 8755920d0d1b3ef0d094bd75b25018b06d19839a +Author: Madhu Venugopal +Date: Mon Oct 19 14:59:23 2015 -0700 + + Fail the container start if the network has been removed + + Signed-off-by: Madhu Venugopal + +commit 21b6f54796280abda9176eb95e1eb2ae39d8e6ba +Merge: d4910831a3 f9317483d3 +Author: Olivier Gambier +Date: Mon Oct 19 14:53:20 2015 -0700 + + Merge pull request #1110 from RichardScothern/env-var-clarification + + Clearer documentation around environment variable overrides + +commit f9317483d350d7d31ae57d482ce7cd1c66717d98 +Author: Richard Scothern +Date: Mon Oct 19 14:52:08 2015 -0700 + + Clearer documentation around environment variable overrides + Signed-off-by: Richard Scothern + +commit 2f16895ee94848e2d8ad72bc01968b4c88d84cb8 +Author: Vivek Goyal +Date: Mon Oct 19 17:51:17 2015 -0400 + + devmapper: Drop devices lock before returning from function + + cleanupDeleted() takes devices.Lock() but does not drop it if there are + no deleted devices. Hence docker deadlocks if one is using deferred + device deletion feature. (--storage-opt dm.use_deferred_deletion=true). + + Fix it. Drop the lock before returning. + + Also added a unit test case to make sure in future this can be easily + detected if somebody changes the function. + + Signed-off-by: Vivek Goyal + +commit ab495ab0d0a340dc45ce283dd7e2de6110485156 +Author: Alexander Morozov +Date: Mon Oct 19 14:19:21 2015 -0700 + + Use more clear message for icc=false + iptables=false + + Signed-off-by: Alexander Morozov + +commit 6ee3420542224cb79e1773d6ad1f33024307ee76 +Merge: 31cba69ac6 58558f5224 +Author: Alexandre Beslic +Date: Mon Oct 19 14:18:36 2015 -0700 + + Merge pull request #1315 from aluzzardi/golint-fix + + Fix various golint issues. + +commit 447d262c063cd0634fb91e0280b34db401a710e2 +Merge: b818d3f7e8 b01442c6bb +Author: Nathan LeClaire +Date: Mon Oct 19 14:17:51 2015 -0700 + + Merge pull request #1939 from gmacario/fix-issue-1692 + + fix IPV6NetworkMaskPrefixLength value parsing + +commit 58558f5224d8a0db7b0c1a69bc74973abb25d1c8 +Author: Andrea Luzzardi +Date: Mon Oct 19 13:54:45 2015 -0700 + + Fix various golint issues. + + Signed-off-by: Andrea Luzzardi + +commit 31cba69ac6705160a0ef800dbc1a3989fe0257e0 +Merge: 894d1abd63 135bee98c9 +Author: Andrea Luzzardi +Date: Mon Oct 19 13:56:49 2015 -0700 + + Merge pull request #1313 from denverdino/origin-master + + Fix the problem for the orders of filters + +commit 0399a3c60b6b055dda8711409ee26fb491e1fa70 +Author: Andrea Luzzardi +Date: Mon Oct 19 13:38:06 2015 -0700 + + Fix nullptr panic in pending containers. + + Fixes #1289 + + Signed-off-by: Andrea Luzzardi + +commit 82a8a14c4d039579f80b640b5f815964e99db746 +Merge: 1ab5ca2d5b eb982e7c00 +Author: Tibor Vass +Date: Mon Oct 19 16:13:31 2015 -0400 + + Merge pull request #17128 from calavera/network_controller_enabled + + Do not initialize the networking routes when netController is not enabled. + +commit 1ab5ca2d5bece1167f73aa7566202edabb0e969b +Merge: b27fa6c58e f8ea4ad16d +Author: Tibor Vass +Date: Mon Oct 19 16:10:01 2015 -0400 + + Merge pull request #17116 from dmcgowan/increase-ping-timeout + + Increase ping timeout for registries + +commit b818d3f7e80848ac22fabb5c46845c23871dca14 +Merge: aebd037c46 2a6e3dbf40 +Author: Nathan LeClaire +Date: Mon Oct 19 13:04:33 2015 -0700 + + Merge pull request #2000 from hairyhenderson/fix-non-logf-method-calls + + 💄Fix log.* method calls which meant to be log.*f + +commit eedeeaf49c49cc75ab30a01676736637224ddd8a +Author: Morgan Bauer +Date: Mon Oct 5 16:48:31 2015 -0700 + + use gocheck asserts instead of fatal + + - for #16756 + + Signed-off-by: Morgan Bauer + +commit 0e4f9c9a66f844cf725870c21cb5b5318b28ce16 +Author: Mazz Mosley +Date: Mon Oct 19 15:15:24 2015 +0100 + + Environment keys can contain empty values + + Environment keys that contain no value, get populated with values taken + from the environment not from the build phase but from running the command `up`. + + Signed-off-by: Mazz Mosley + +commit 5fdb75b541cee7a6a26e7b9e5a6483afebc88174 +Author: Mazz Mosley +Date: Mon Oct 19 14:36:56 2015 +0100 + + Improve error message for type constraints + + It was missing a space between the different types, when there + were 3 possible type values. + + Signed-off-by: Mazz Mosley + +commit 24d4a1045a6317a612f856af3cc99e1b301eae49 +Author: Daniel Nephin +Date: Fri Oct 16 15:45:56 2015 -0400 + + Fixes #2203 - properly validate files when multiple files are used. + + Remove the single-use decorators so the functionality can be used directly as a function. + + Signed-off-by: Daniel Nephin + +commit a150eee3085e2e1e4dbaecdd9668deb0ba3ab26b +Author: Stefan J. Wernli +Date: Wed Oct 14 16:25:03 2015 -0700 + + Fixing hang in archive.CopyWithTar with invalid dst + + Signed-off-by: Stefan J. Wernli + +commit 0c518b6ab2b2ed481f7f7da3e38f5f2becfc5b2f +Author: Dan Walsh +Date: Mon Oct 19 14:53:55 2015 -0400 + + Docker is calling cont.Destroy twice on success + + Signed-off-by: Dan Walsh + +commit d77d8f1ce87ce9b6f29bbadf954bcc0e6181d104 +Author: Ying Li +Date: Mon Oct 19 11:52:43 2015 -0700 + + Lint fix + + Signed-off-by: Ying Li + +commit a5e64ecf0358cd0aaa6abad339026e44f856ff48 +Author: Ying Li +Date: Fri Oct 16 16:19:30 2015 -0700 + + Do not use the viper singleton instance everywhere + + Signed-off-by: Ying Li + +commit b27fa6c58e020b35d725b89badb82dbbc5cb84bc +Merge: bb085b7661 2abf5d986e +Author: David Calavera +Date: Mon Oct 19 11:45:29 2015 -0700 + + Merge pull request #16957 from MHBauer/eventsservice-refactor + + refactor access to daemon member EventsService + +commit fb4a7256921b9863bd27079ec821b9612368fee8 +Author: Tonis Tiigi +Date: Mon Oct 19 11:27:56 2015 -0700 + + Don’t overwrite layer checksum on push + + After v1.8.3 layer checksum is used for image ID + validation. Rewriting the checksums on push would + mean that next pulls will get different image IDs + and pulls may fail if its detected that same + manifest digest can now point to new image ID. + + Fixes #17178 + + Signed-off-by: Tonis Tiigi + +commit eb982e7c00192c8306f9c420fb469f087c7b161d +Author: David Calavera +Date: Fri Oct 16 18:45:54 2015 -0400 + + Return 404 for all network operations without network controller. + + This will prevent the api from trying to serve network requests in + systems where libnetwork is not enabled, returning 404 responses in any + case. + + Signed-off-by: David Calavera + +commit aebd037c46c5e5cde7743c1048c9c974b11d3a91 +Merge: 43543d1579 ab79c4d9c1 +Author: Olivier Gambier +Date: Mon Oct 19 11:40:15 2015 -0700 + + Merge pull request #2003 from blaggacao/patch-1 + + Close #2001 / consistent hyperv internal naming + +commit 3725c3ab7e88f9d6b8c9cf08dc923e0ac21dd64e +Merge: f1f3acd070 08add665e9 +Author: Daniel Nephin +Date: Mon Oct 19 14:06:31 2015 -0400 + + Merge pull request #2225 from mnowster/2221-blank-env-vars + + 2221 allow empty environment keys + +commit 938d49cbdc81665de26c7148befc833b50e867e9 +Author: Daniel Nephin +Date: Fri Oct 16 11:18:07 2015 -0400 + + Fixes #2205 - extends must be copied from override file. + + Signed-off-by: Daniel Nephin + +commit f1f3acd070bf4fa4dc407656169c970727182f2d +Merge: cd0b63879b 937e087c6c +Author: mnowster +Date: Mon Oct 19 18:32:48 2015 +0100 + + Merge pull request #2210 from dnephin/fix_empty_override + + Properly validate files when multiple files are used + +commit 850bc0838a509d220bc78e47aa8203420aca22eb +Author: Antonio Murdaca +Date: Mon Oct 19 19:07:44 2015 +0200 + + Return empty Config fields, now omitempty, for API < 1.21 + + Signed-off-by: Antonio Murdaca + +commit 2c2aa91f9fd699518b8343f2721c85af297a37ea +Author: Victor Vieux +Date: Mon Oct 19 09:55:27 2015 -0700 + + fix test Dockerfile, use precompiled go + + Signed-off-by: Victor Vieux + +commit bb085b76619e8e73e39f68efb1b407e16da67822 +Merge: e62fd33d96 45dc57f229 +Author: Antonio Murdaca +Date: Mon Oct 19 18:44:42 2015 +0200 + + Merge pull request #17125 from calavera/check_exec_start_json + + Check the content type is json when calling exec start. + +commit 2abf5d986ec6779555ea615763d3ffccede6121a +Author: Morgan Bauer +Date: Mon Oct 12 11:54:46 2015 -0700 + + refactor access to daemon member EventsService + + Signed-off-by: Morgan Bauer + +commit 937e087c6cf78d3a12ce940ad96344fbb296b005 +Author: Daniel Nephin +Date: Fri Oct 16 15:45:56 2015 -0400 + + Fixes #2203 - properly validate files when multiple files are used. + + Remove the single-use decorators so the functionality can be used directly as a function. + + Signed-off-by: Daniel Nephin + +commit e62fd33d963cdba947a9ef5abe100a9d85c58f24 +Merge: 6e0f00ed0a 2968fa44eb +Author: Doug Davis +Date: Mon Oct 19 12:35:58 2015 -0400 + + Merge pull request #17115 from mountkin/tag-on-build + + Proposal: emit a "tag" event when building image with "-t" parameter + +commit cd0b63879b177f39d87345381384bc56b6b782ef +Merge: a75bdfe11c 129e2f9482 +Author: Daniel Nephin +Date: Mon Oct 19 12:34:25 2015 -0400 + + Merge pull request #2208 from dnephin/another_release_script_fix + + Fix check for tags in release script `make-branch` + +commit 129e2f94826ad01b559c5b0e7f1ebc70ec7c97d8 +Author: Daniel Nephin +Date: Fri Oct 16 12:54:31 2015 -0400 + + Fix check for tags. + + If there is a branch with the same name as a tag it fails without the + --tags. This was only a problem when we're branching from a git tag. + + Signed-off-by: Daniel Nephin + +commit 6e0f00ed0a28d8303197afbf418c32d408819992 +Merge: df15523745 c4c6d33bbc +Author: Vincent Demeester +Date: Mon Oct 19 18:24:24 2015 +0200 + + Merge pull request #16710 from gbarboza/sort_port_display + + Sort PORTS order in docker ps output + +commit a75bdfe11cfa87837fe60309855084315324ca36 +Merge: 159cddf563 37921b40dd +Author: mnowster +Date: Mon Oct 19 17:20:31 2015 +0100 + + Merge pull request #2220 from ticosax/trove-classifire + + Add trove classifier to declare supported python versions. + +commit df15523745756f2837b436f35621ae16e624fd86 +Merge: d0b4e7a064 97b9223a1f +Author: Brian Goff +Date: Mon Oct 19 12:10:31 2015 -0400 + + Merge pull request #16854 from WeiZhang555/inte-test + + use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go` + +commit 514f0650b2a857d6516d6ceb69aba6335d5618f2 +Author: Daniel Nephin +Date: Fri Oct 16 14:47:04 2015 -0400 + + Give the user a better error message (without a stack trace) when there is a yaml error. + + Signed-off-by: Daniel Nephin + +commit d0b4e7a0642b129f7b927c45b1e140372b28ac76 +Merge: 8005dbd748 ae29bd435b +Author: Brian Goff +Date: Mon Oct 19 11:54:28 2015 -0400 + + Merge pull request #16986 from clnperez/test-inspect-warn-fix + + Fix TestInspectInt64 for kernels without swap limit capability + +commit 45dc57f22931e6cb8ad522602da8aa985bddcfab +Author: David Calavera +Date: Fri Oct 16 17:45:07 2015 -0400 + + Check the content type is json when calling exec start. + + Signed-off-by: David Calavera + +commit c4c6d33bbcacab113f874b7407499c5f71cf72a0 +Author: Garrett Barboza +Date: Mon Oct 19 10:38:54 2015 -0500 + + Change sorting method and add test to DisplayablePorts + + Signed-off-by: Garrett Barboza + +commit 08add665e98044279ead90e093d40eb2161efb27 +Author: Mazz Mosley +Date: Mon Oct 19 15:15:24 2015 +0100 + + Environment keys can contain empty values + + Environment keys that contain no value, get populated with values taken + from the environment not from the build phase but from running the command `up`. + + Signed-off-by: Mazz Mosley + +commit 159cddf5639463916bbd298b7d6c57bcd074ccc8 +Merge: 076b5bc31c 26dc0b785b +Author: mnowster +Date: Mon Oct 19 16:29:36 2015 +0100 + + Merge pull request #2209 from dnephin/fix_error_on_invalid_yaml + + Give the user a better error message when the yaml file is invalid + +commit 135bee98c906bb28983a9b8ab2ff725bbf578608 +Author: Li Yi +Date: Mon Oct 19 23:07:20 2015 +0800 + + Fix the problem for the orders of filters + + Change-Id: I2dd652a1881cdaaff16e02f26c9f69f5df16419f + Signed-off-by: Li Yi + +commit 20d34c8b14113eb430c0d350c23f0088b6cd8047 +Author: Steve Durrheimer +Date: Thu Oct 15 23:02:40 2015 +0200 + + Add zsh completion for 'docker-compose --x-networking --x-network-driver' + + Signed-off-by: Steve Durrheimer + +commit 076b5bc31ce7d0415c6b947ff2df24f24056a84e +Merge: 1a97a8ef86 ac06366ef9 +Author: Daniel Nephin +Date: Mon Oct 19 10:37:57 2015 -0400 + + Merge pull request #2197 from sdurrheimer/zsh-completion-network-options + + Add zsh completion for 'docker-compose --x-networking --x-network-dri… + +commit 6f45eb795976c6a4a8b7014b250ecc583b121d40 +Author: Harald Albers +Date: Sat Oct 17 09:26:32 2015 -0700 + + bash completion for networking options + + Signed-off-by: Harald Albers + +commit ae29bd435bafad06f4701c4fbdf6aa8e106409e3 +Author: Christy Perez +Date: Tue Oct 13 10:42:25 2015 -0500 + + Fix TestInspectInt64 for run scenarios that return warnings + + Instead of returning only the container ID, starting a container may + also return a warning: + + "WARNING: Your kernel does not support swap + limit capabilities, memory limited without + swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061" + + The test assumes that only the container ID is returned and uses the + entire message as the name for the inspect command. To avoid the need to + parse the container ID from the output after the run command, give the + container a name and use that instead. + + Signed-off-by: Christy Perez + +commit 8005dbd748103357949e6ece5cad35fcb3f15018 +Merge: 8eba018b61 3e064371e7 +Author: Brian Goff +Date: Mon Oct 19 09:49:37 2015 -0400 + + Merge pull request #17127 from gesellix/docs-filters-query + + docs: fix description of `filters` param for /volumes and /networks. + +commit ff83c459d04491faedb69db9ef74f65e00c2d116 +Author: Mazz Mosley +Date: Mon Oct 19 14:36:56 2015 +0100 + + Improve error message for type constraints + + It was missing a space between the different types, when there + were 3 possible type values. + + Signed-off-by: Mazz Mosley + +commit fbb01b816288c5cf3eb79358c035072766b6e0f0 +Author: Lei Jitang +Date: Mon Oct 19 21:17:37 2015 +0800 + + Make default tls host work + + Signed-off-by: Lei Jitang + +commit 8eba018b610e425960ffb4620dd7a0bfde5238d9 +Merge: 1f9557ac66 ab31d9500e +Author: Phil Estes +Date: Mon Oct 19 08:26:55 2015 -0400 + + Merge pull request #17155 from janten/meitner + + Correct Lise Meitner's name, add Euler and Noether + +commit 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f +Merge: 1c783567c0 7be79767c1 +Author: Phil Estes +Date: Mon Oct 19 08:25:32 2015 -0400 + + Merge pull request #17166 from echo33/docker_cli_diff_test + + use of checkers on docker_cli_diff_test.go + +commit 1c783567c06e52288bbff73168ee3596e2d357e7 +Merge: eaa1fc41c6 f3b2b8700f +Author: Phil Estes +Date: Mon Oct 19 08:21:17 2015 -0400 + + Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go + + Use of checkers on docker_cli_inspect_experimental_test.go + +commit 2968fa44eb2a53c121ad2b27c519ae47ca7653c3 +Author: Shijiang Wei +Date: Fri Oct 16 23:54:05 2015 +0800 + + emit a "tag" event when building image with "-t" parameter + + This is useful for cluster systems such as swarm to sync the image + state when new images are successfully built. + + Signed-off-by: Shijiang Wei + +commit f3b2b8700f63654ff5c361dedfcf539eb6ee9ef6 +Author: liaoqingwei +Date: Mon Oct 19 18:25:35 2015 +0800 + + Use of checkers on docker_cli_inspect_experimental_test.go. + + Signed-off-by: liaoqingwei + +commit 4d8e667c3e475e811b8072647833067740c810c2 +Author: Corin Lawson +Date: Mon Oct 19 21:47:01 2015 +1100 + + Powershell script to run compose in a container. + + This script assumes the typical environment that Windows users operate, + namely, VirtualBox running the boot2docker ISO, managed by + docker-machine. I wrote this script for my Windows using colleagues and + first placed it in the public domain as a gist: + https://gist.github.com/au-phiware/25213e72c80040f398ba + In short, that script works for me. + + I have adapted that script to use the (yet to be) official image + (docker/compose:latest) and also added an extra environment variable to + provide additional options to docker run. + + Signed-off-by: Corin Lawson + +commit a91a874f73ac8da43b76d142c79bd68447afd9bf +Author: weiyan +Date: Thu Oct 15 19:12:56 2015 +0800 + + use of checkers on docker_cli_start_volume_driver_unix_test.go + + Signed-off-by: weiyan + +commit 1a97a8ef862a8c981a8e9f84273ad685f90d4565 +Merge: bca018c50a 07e9f6500c +Author: mnowster +Date: Mon Oct 19 12:08:20 2015 +0100 + + Merge pull request #2213 from viranch/trim-dockerfile + + Trim Dockerfile + +commit 7be79767c18a1643e9e8e9be1764f2c838152c0b +Author: weiyan +Date: Mon Oct 19 17:31:02 2015 +0800 + + use of checkers on docker_cli_diff_test.go + + Signed-off-by: weiyan + +commit ac06366ef9081fa83c8d1fef4c67e99f28bee8ea +Author: Steve Durrheimer +Date: Thu Oct 15 23:02:40 2015 +0200 + + Add zsh completion for 'docker-compose --x-networking --x-network-driver' + + Signed-off-by: Steve Durrheimer + +commit bca018c50a1b1d4c63574420d03335caad92b474 +Merge: 2516aa8e08 43a89e1702 +Author: mnowster +Date: Mon Oct 19 11:23:03 2015 +0100 + + Merge pull request #2211 from albers/completion-networking + + bash completion for networking options + +commit 2516aa8e089d9595299de97b31426cb4b8abe274 +Merge: ae3c66baed fa44a5fac2 +Author: mnowster +Date: Mon Oct 19 11:22:44 2015 +0100 + + Merge pull request #2212 from albers/completion-nospace + + fix problem with bash completion in old bash + +commit 37921b40dd9ca76d585af6613388fe9fdc6e147c +Author: Nicolas Delaby +Date: Mon Oct 19 10:43:30 2015 +0200 + + Add trove classifier to declare supported python versions. + + Signed-off-by: Nicolas Delaby + +commit eaa1fc41c6cbdf589831d607e86e0ee38c2d053f +Merge: cfdb954303 0780ddc498 +Author: Antonio Murdaca +Date: Mon Oct 19 09:14:23 2015 +0200 + + Merge pull request #16897 from sunyuan3/docker_cli_rm_test + + use of checkers on docker_cli_rm_test.go + +commit cfdb954303d031b85847483765b2ca98fc8d3f79 +Merge: bab701c143 d65ac42ca8 +Author: Vincent Demeester +Date: Mon Oct 19 08:54:42 2015 +0200 + + Merge pull request #17162 from echo33/docker_cli_exec_unix_test + + use of checkers on docker_cli_exec_unix_test.go + +commit d65ac42ca8ca368e0e6dc5ec9a26f8ec13b98ef4 +Author: weiyan +Date: Mon Oct 19 15:14:59 2015 +0800 + + use of checkers on docker_cli_exec_unix_test.go + + Signed-off-by: weiyan + +commit 21d6fc537891ac08a30772a92d6c8aac6bd5da1c +Author: Victor Vieux +Date: Sun Oct 18 21:22:59 2015 -0700 + + fix panic when createContainer returns nil,nil + + Signed-off-by: Victor Vieux + +commit 0780ddc498f093cec67edd358e00add82c5efd5a +Author: Yuan Sun +Date: Mon Oct 19 10:42:56 2015 +0800 + + use of checkers on docker_cli_rm_test.go + + Signed-off-by: Yuan Sun + +commit 3c0dfd1858d6d11c6d10b2ed27377b7f926dbb4c +Author: Jeffrey Morgan +Date: Sun Oct 18 16:54:41 2015 -0700 + + OSX Bump for 1.9 & changes for docker-machine 0.5.0 + + Signed-off-by: Jeffrey Morgan + +commit ab31d9500ebe0c3bf039321bb8c83c7b01c21e4e +Author: Jan-Gerd Tenberge +Date: Sun Oct 18 18:48:46 2015 +0200 + + Fix spelling error, add Noether and Euler + + Signed-off-by: Jan-Gerd Tenberge + +commit 85adeab8a82dfb73f7e108e2376058b4ff033226 +Author: Jeffrey Morgan +Date: Sun Oct 18 16:08:01 2015 -0700 + + In menu, rename devtools => Chromium Developer Tools + + Signed-off-by: Jeffrey Morgan + +commit 92e821cf47dbe15da73cb80b6682418dce22c287 +Author: Jeffrey Morgan +Date: Sun Oct 18 16:05:03 2015 -0700 + + Make default command bash + + Signed-off-by: Jeffrey Morgan + +commit dbe1f46d4b7d7199c2e8d537750ea704ea65fcb3 +Author: Jeffrey Morgan +Date: Sun Oct 18 15:57:03 2015 -0700 + + Fixed bug where user could not delete a container that failed to start + +commit 2f38e3f1883510c845e83d8e0bdc40002c0e0f35 +Author: Jeffrey Morgan +Date: Sun Oct 18 15:22:35 2015 -0700 + + Fix search input style + +commit 9aff619f48c6d0deff26efba6f1b3c480710086a +Author: Jeffrey Morgan +Date: Sun Oct 18 15:04:08 2015 -0700 + + Bump verison to 0.9 + + Signed-off-by: Jeffrey Morgan + +commit bab701c1438bb50072967c579c2d072a1c31cf5f +Merge: bece5b82a8 6a64865991 +Author: moxiegirl +Date: Sun Oct 18 14:41:07 2015 -0700 + + Merge pull request #17157 from ripcurld00d/fedora_doc + + Update fedora doc + +commit 10d232fe66d55388b07e6acd0cf3f12daef5cae4 +Author: Victor Vieux +Date: Sun Oct 18 11:39:04 2015 -0700 + + fix issue with timeouts in mesos + + Signed-off-by: Victor Vieux + +commit 1efacea48a854d738edc64ecb17f9ebb796d1ea1 +Merge: b42f9241a4 497bbb2410 +Author: moxiegirl +Date: Sun Oct 18 14:19:48 2015 -0700 + + Merge pull request #225 from moxiegirl/hugo-tooling-15 + + Retooling for Hugo 15 patch + +commit 6a648659915ad2be4b1e5841594279020821bec1 +Author: ripcurld00d +Date: Sun Oct 18 22:23:37 2015 +0300 + + Update fedora doc + + `service` is deprecated from Fedora v21. + It's important to enable and start the `docker` daemon using `systemctl`. + + Signed-off-by: Boaz Shuster + +commit a2a859623835c7915a1327a9f775b294ef010b46 +Author: Victor Vieux +Date: Sun Oct 18 10:41:02 2015 -0700 + + improve error message in mesos + + Signed-off-by: Victor Vieux + +commit ab79c4d9c10e7bc6a5fecb0d783ca861d66db2c2 +Author: David Arnold +Date: Sun Oct 18 11:24:41 2015 -0500 + + Close #2001 / consistent hyperv internal naming + + Signed-off-by: David Arnold + +commit bece5b82a89081816bc622d3c3e9178251013636 +Merge: ef49d127e3 26ae6d6b36 +Author: Vincent Demeester +Date: Sun Oct 18 18:11:02 2015 +0200 + + Merge pull request #17008 from liaoqingwei/dev1 + + Update testcases: use of checkers on docker_cli_nat_test.go + +commit c71c7f4b4f6fe95982c132c42c990e2d4085bb90 +Author: Harald Albers +Date: Sun Oct 18 08:16:15 2015 -0700 + + bash completion for `docker cp` supports copying both ways + + Signed-off-by: Harald Albers + +commit 6447abfc35e80eb05d1f4ae16577378dcbff61e6 +Author: Steve Durrheimer +Date: Sun Oct 18 15:01:59 2015 +0200 + + Add zsh completion for 'docker network create -o --opt' + + Signed-off-by: Steve Durrheimer + +commit 5013a2fbd68388a3a0843f26aba6d39c2d611a0a +Author: Harald Albers +Date: Sun Oct 18 05:42:23 2015 -0700 + + bash completion for new `docker network create` options + + Signed-off-by: Harald Albers + +commit 26ae6d6b36a40a42706e149a6d1c30c27b5b3355 +Author: liaoqingwei +Date: Wed Oct 14 20:31:37 2015 +0800 + + Use of checkers on docker_cli_nat_test.go. + + Signed-off-by: liaoqingwei + +commit 2d44ed6d64af79d167502edc2d8dab27b3224069 +Author: Harald Albers +Date: Sun Oct 18 04:39:52 2015 -0700 + + bash completion: support for dm.use_deferred_* options + + Signed-off-by: Harald Albers + +commit 6643894063eba16b53cdd2da722d37fbae282796 +Author: Victor Vieux +Date: Sat Oct 17 20:08:08 2015 -0700 + + rename `POST /volumes` to `POST /volumes/create` + + Signed-off-by: Victor Vieux + +commit 6b1a643ac8bf599d04510b26d6d5befefc30ccde +Author: Sebastiaan van Stijn +Date: Sat Oct 17 23:28:11 2015 -0700 + + deb: add fish completions + + This adds the Fish completions to the .deb package. + + Signed-off-by: Sebastiaan van Stijn + +commit fb372e66bb9b52bb57d15de04d8af4b94c9e0c14 +Author: Sebastiaan van Stijn +Date: Sat Oct 17 22:47:57 2015 -0700 + + RPM change install location of Fish completions + + External completions for fish should be installed + in /usr/local/share/fish/vendor_completions.d to + not conflict with built-in completions. + + for reference, see: + https://github.com/fish-shell/fish-shell/issues/1485 + + fixes #16668 + + Signed-off-by: Sebastiaan van Stijn + +commit ef49d127e318c694d5254dbe1557d97cafe684ca +Merge: 2726434f72 8f36ded5b1 +Author: moxiegirl +Date: Sat Oct 17 19:33:40 2015 -0700 + + Merge pull request #17141 from thaJeztah/fix-17140-storage-driver-formatting + + docs: fix storage driver options list + +commit 8f36ded5b13b896d493645b845a24f4129b3a5de +Author: Sebastiaan van Stijn +Date: Sat Oct 17 19:06:21 2015 -0700 + + docs: fix storage driver options list + + This fixes the indentation of the storage driver + options list. + + Also wraps/reformats some examples to prevent + horizontal scrollbars on the rendered HTML + + Fixes #17140 + + Signed-off-by: Sebastiaan van Stijn + +commit 97b9223a1f49e706929603a91f56a48b935ad966 +Author: Zhang Wei +Date: Thu Oct 8 23:56:51 2015 +0800 + + use of checkers on Integration test + + Part of #16756 + + Use c.Assert instead of condition judgement. + + Signed-off-by: Zhang Wei + +commit 2a6e3dbf40399aeca8c5fa3424086de2b1266bed +Author: Dave Henderson +Date: Sat Oct 17 15:59:25 2015 -0400 + + Fix log.* method calls which meant to be log.*f + + Stuff like `log.Debug("foo bar: %s", baz)` really wants to be + `log.Debugf("foo bar: %s", baz)`... + + Signed-off-by: Dave Henderson + +commit 07e9f6500ce2f695920d0a2786c308fba750cc2e +Author: Viranch Mehta +Date: Sun Oct 18 01:06:50 2015 +0530 + + Pipe curl's download directly to extract/execute program to reduce number of commands + + Signed-off-by: Viranch Mehta + +commit 258c8bc54d30622a8b731d1b8f50fdd5544d2da0 +Author: Viranch Mehta +Date: Sun Oct 18 00:40:51 2015 +0530 + + Fix specifies_host_port() to handle port binding with host IP but no host port + + Signed-off-by: Viranch Mehta + +commit 2726434f72d377aea5afe9c184e9a1e5d2387c6d +Merge: cffd50752c 4102537cfd +Author: Vincent Batts +Date: Sat Oct 17 14:22:33 2015 -0400 + + Merge pull request #16960 from pydima/9283_consider_hard_links_in_image_size + + Consider hardlinks in image size. + +commit fa44a5fac23e5b5685d355c033e12d07d2e7f0ef +Author: Harald Albers +Date: Sat Oct 17 09:51:37 2015 -0700 + + fix problem with bash completion in old bash + + Signed-off-by: Harald Albers + +commit 43a89e1702b15a3322b084bb9bcc390dd62ada7d +Author: Harald Albers +Date: Sat Oct 17 09:26:32 2015 -0700 + + bash completion for networking options + + Signed-off-by: Harald Albers + +commit cffd50752c2b2243519193a4ca458156291eb8af +Merge: 9b1fb0d45b 253f975fdb +Author: Sebastiaan van Stijn +Date: Sat Oct 17 08:50:51 2015 -0700 + + Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build + + Vendoring new go-check checkers and use checker for docker_api_build_test.go + +commit 504d2a921241c60c0078c946266e354ce12d1353 +Author: Harald Albers +Date: Sat Oct 17 07:24:17 2015 -0700 + + Bash completion for restart policy `unless-stopped` + + Signed-off-by: Harald Albers + +commit 253f975fdbc13bc8a84fba1a3f8a4e518cb86d8e +Author: Vincent Demeester +Date: Sat Oct 17 14:24:56 2015 +0200 + + Use checker assert for docker_api_build_test.go + + Signed-off-by: Vincent Demeester + +commit 9685b4767fc49c4a43ba762a5afbcd175f3d9245 +Author: Vincent Demeester +Date: Sat Oct 17 13:41:44 2015 +0200 + + Vendoring shakers library and update go-check + + The shakers library defines a bunch of go-check checkers to ease + writing tests. + + Signed-off-by: Vincent Demeester + +commit 0c95eeb584f5033e1f1cc8eb383306b87d3f133f +Author: Tobias Gesellchen +Date: Sat Oct 17 13:49:14 2015 +0200 + + rename `POST /volumes` to `POST /volumes/create` to be consistent with the other `POST /.../create` endpoints + + see #17132 + + Signed-off-by: Tobias Gesellchen + +commit 9b1fb0d45b09f72e368e4f5d025ea592ee002007 +Merge: ab1f03397e d4d0718ebf +Author: Brian Goff +Date: Sat Oct 17 08:02:18 2015 -0400 + + Merge pull request #16871 from ZJU-SEL/fix_version_test + + update docker_cli_version_test.go + +commit 4102537cfd305e37ef3ebfc291bd8521138c0e6c +Author: Dmitry Vorobev +Date: Mon Oct 12 21:11:22 2015 +0200 + + Fixes #9283. Consider hardlinks in image size. + + Based on #8984. This patch fixes behavior when image size calculation + didn't consider hardlinks. + + Signed-off-by: Dmitry Vorobev + +commit f9807f561c89fd424d21a5f60af0d5ec67ec2d61 +Author: Victor Vieux +Date: Sat Oct 17 01:32:44 2015 -0700 + + fix golint + + Signed-off-by: Victor Vieux + +commit 07a102adc805d89496770ca88158e8d1f3d842e2 +Author: Victor Vieux +Date: Mon Oct 19 15:46:38 2015 -0700 + + fix tests + + Signed-off-by: Victor Vieux + +commit 4e1ae773e21aa0f9e29c9e74ee160e8beddefe41 +Author: Victor Vieux +Date: Fri Oct 16 17:33:19 2015 -0700 + + improve docker network ls and rm + + Signed-off-by: Victor Vieux + +commit e9c486b0463329a8a81ccc363adc3505d30bd00c +Author: Victor Vieux +Date: Fri Oct 16 17:13:41 2015 -0700 + + refresh networks on whole cluster after create and rm + + Signed-off-by: Victor Vieux + +commit ab1f03397ed48440454332598fa707afa9187b42 +Merge: e3fabf3ea1 d1064bd441 +Author: Antonio Murdaca +Date: Sat Oct 17 10:22:46 2015 +0200 + + Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts + + Deprecate -c cli short variant flag in docker cli build & create + +commit b42f9241a4ea4d170de78ec971205aca7d2c97f5 +Merge: 089d8450d8 3c58f3cffc +Author: Ying Li +Date: Fri Oct 16 18:06:39 2015 -0700 + + Merge pull request #219 from cyli/server-healthcheck + + Healthchecks for notary-server + +commit 43543d1579f848509ffaec077d0653e06eb40c50 +Merge: 8aa1572e0d 581198de1b +Author: Nathan LeClaire +Date: Fri Oct 16 18:00:23 2015 -0700 + + Merge pull request #1997 from nathanleclaire/bump_for_rc + + Bump version for release candidate + +commit 581198de1bc8e9cbfd99f6f4180b5ebda6527216 +Author: Nathan LeClaire +Date: Fri Oct 16 17:53:58 2015 -0700 + + Bump version for release candidate + + Signed-off-by: Nathan LeClaire + +commit 894d1abd639eedb8234caf63fbc458a6791563bb +Merge: e22431bcb2 fe73803861 +Author: Chanwit Kaewkasi +Date: Sat Oct 17 07:42:39 2015 +0700 + + Merge pull request #1308 from pdevine/errorstrs + + Add error messages when pulling/loading images + +commit e22431bcb276afc484504ba4b6252a177e362652 +Merge: 38f5831d07 d7cb8baf09 +Author: Victor Vieux +Date: Fri Oct 16 17:41:18 2015 -0700 + + Merge pull request #1305 from cpuguy83/1297_fix_stuck_on_stdin_tls + + Fix issue where conn is stuck waiting for stdin + +commit d4910831a339fa96a21a4e473312c2155e2570d9 +Merge: f6d22717e7 515b9596e7 +Author: Richard Scothern +Date: Fri Oct 16 17:13:26 2015 -0700 + + Merge pull request #1006 from RichardScothern/proxy-serialize + + Fix a race condition in pull through cache population + +commit e3fabf3ea1548afa3d147eb6f41b8656a70569b7 +Merge: c3f42b29a8 96559aaef2 +Author: Sebastiaan van Stijn +Date: Fri Oct 16 16:57:10 2015 -0700 + + Merge pull request #16831 from jfrazelle/release-updates + + Release updates + +commit 8aa1572e0dcd75762a7627e1056ef104317f44b9 +Merge: a63f26f438 c8edb33ecd +Author: Nathan LeClaire +Date: Fri Oct 16 16:41:29 2015 -0700 + + Merge pull request #1902 from nathanleclaire/plugins + + Add Docker Machine driver plugins + +commit c8edb33ecd3951a7b5e87aea7a5548231f40e3ed +Author: Nathan LeClaire +Date: Wed Sep 2 13:42:13 2015 -0700 + + Move towards using external binaries / RPC plugins + + - First RPC steps + + - Work on some flaws in RPC model + + - Remove unused TLS settings from Engine and Swarm options + + - Add code to correctly encode data over the network + + - Add client driver for RPC + + - Rename server driver file + + - Start to make marshal make sense + + - Fix silly RPC method args and add client + + - Fix some issues with RPC calls, and marshaling + + - Simplify plugin main.go + + - Move towards 100% plugin in CLI + + - Ensure that plugin servers are cleaned up properly + + - Make flag parsing for driver flags work properly + + Includes some work carried from @dmp42 updating the build process and + tests to use the new method. + + Signed-off-by: Nathan LeClaire + +commit c3f42b29a805e41a1e518653a1855c4e2a7f8d43 +Merge: 365a0db0f0 98c1a412b4 +Author: David Calavera +Date: Fri Oct 16 16:32:11 2015 -0700 + + Merge pull request #17113 from mountkin/validate-filter + + make sure the value of the dangling filter is correct + +commit f8ea4ad16d51f6f062be2c250be26d731b92bd3c +Author: Derek McGowan +Date: Fri Oct 16 15:34:35 2015 -0700 + + Increase ping timeout + + Ensure v2 registries are given more than 5 seconds to return a ping and avoid an unnecessary fallback to v1. + Elevates log level about failed v2 ping to a warning to match the warning related to using v1 registries. + + Signed-off-by: Derek McGowan (github: dmcgowan) + +commit 3e064371e7ddec0de4dd2af75d5ac227b1080d53 +Author: Tobias Gesellchen +Date: Sat Oct 17 00:24:40 2015 +0200 + + docs: fix description of `filters` param for /volumes and /networks. + + fixes #17091 + + Signed-off-by: Tobias Gesellchen + +commit 365a0db0f0f105306a8553405fb68a207e8d7754 +Merge: ec7c368ff0 6f3eb994b5 +Author: Tibor Vass +Date: Fri Oct 16 15:23:59 2015 -0700 + + Merge pull request #17046 from mavenugo/dopts + + driver-opts for network create + +commit ec7c368ff01e2e79cb26a5afa2d2c7291cc1472d +Merge: d8b4471a59 c6b02ad73b +Author: David Calavera +Date: Fri Oct 16 15:23:00 2015 -0700 + + Merge pull request #16901 from WeiZhang555/rmi-inte + + Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert + +commit d8b4471a593f55a06ec77e6b3e8215a20b3f0f5f +Merge: 4fc97e40c9 a1d4b7dd0d +Author: Vincent Demeester +Date: Sat Oct 17 00:22:03 2015 +0200 + + Merge pull request #16977 from mountkin/refactor-test + + refactor integration test to use checkers + +commit 4fc97e40c971d712cb76d1f782ee221432b4ede2 +Merge: 8c1fa7f320 a82e3bc704 +Author: Antonio Murdaca +Date: Sat Oct 17 00:20:49 2015 +0200 + + Merge pull request #16950 from cpuguy83/support_ipv6_in_host_parser + + Allow API to bind to ipv6 addresses + +commit 8c1fa7f32028c7c2a631317b7b3112ca9a78cd19 +Merge: 475be776b8 69949df242 +Author: David Calavera +Date: Fri Oct 16 15:14:08 2015 -0700 + + Merge pull request #16994 from Microsoft/10662-copied + + Windows: Fix annoying bad log + +commit 475be776b877c787c7e679cfb0a60b888823ed86 +Merge: 258357857b 244d9c3370 +Author: David Calavera +Date: Fri Oct 16 15:11:48 2015 -0700 + + Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc + + remove incorrect "readonly" example + +commit 3c58f3cffc8f356628d20a80872801b84f2513a4 +Author: Ying Li +Date: Fri Oct 16 15:11:19 2015 -0700 + + Simplify server health check to only check only the key management client. + + Signed-off-by: Ying Li + +commit d1064bd441612244d7a560c6ceb3704ad12b23a6 +Author: Vincent Demeester +Date: Fri Oct 16 21:05:18 2015 +0200 + + Deprecate -c cli short variant flag in docker cli + + - build + - create + + Signed-off-by: Vincent Demeester + +commit 38f5831d07a472059fca49273b16bc2d61c927b7 +Merge: 4d13ce89f8 0afed486bb +Author: Victor Vieux +Date: Fri Oct 16 15:05:28 2015 -0700 + + Merge pull request #1294 from vieux/update_logo + + update swarm logo + +commit 258357857bc0bc184370e50cba6d20d5ec373666 +Merge: 3668be932e 7b6bca5af1 +Author: David Calavera +Date: Fri Oct 16 14:59:06 2015 -0700 + + Merge pull request #17065 from ZJaffee/api-exec-resize-test + + cleaned up integration-cli/docker_api_exec_resize_test.go + +commit fe73803861e232a9536381a6457bdd141afafdef +Author: Patrick Devine +Date: Fri Oct 16 14:42:14 2015 -0700 + + Add error messages when pulling/loading images + + This change adds error strings when there is an error while pulling or + loading an image. + + Signed-off-by: Patrick Devine + +commit 3668be932e0b3fccd3cde0cff20192c123227a98 +Merge: e23d834a01 1374ebcde0 +Author: David Calavera +Date: Fri Oct 16 14:55:39 2015 -0700 + + Merge pull request #16574 from Djelibeybi/rpm-changelog + + Generate a full RPM changelog from the existing CHANGELOG.md file + +commit 6db76a873ea67cec687543813592a627e7cffc68 +Author: Ying Li +Date: Fri Oct 16 14:48:05 2015 -0700 + + Small cleanup as per review comments + + Signed-off-by: Ying Li + +commit bdcd70eca786964c452f91c4c560d124fd748a87 +Author: Ying Li +Date: Fri Oct 16 14:40:33 2015 -0700 + + Remove -debug from signer/server Dockerfiles + + Signed-off-by: Ying Li + +commit 6f3eb994b52dac9e336db9fe9f204e120553e8a7 +Author: Madhu Venugopal +Date: Wed Oct 14 18:49:27 2015 -0700 + + Pass network driver option in docker network command + + Signed-off-by: Madhu Venugopal + +commit cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e +Author: Madhu Venugopal +Date: Wed Oct 14 20:11:53 2015 -0700 + + Vendoring libnetwork to Replace the label variable to DriverOpts + + Signed-off-by: Madhu Venugopal + +commit e23d834a01e76cafbc473b317331df88e62c1807 +Merge: b1bab9e1e7 b0315375f8 +Author: Tibor Vass +Date: Fri Oct 16 14:28:14 2015 -0700 + + Merge pull request #17106 from albers/completion-import + + Add missing options to bash completion for `docker import` + +commit b1bab9e1e70dd05b3a5a7296d7cd8c426bb52488 +Merge: c56b02b284 3a713d91ce +Author: Tibor Vass +Date: Fri Oct 16 14:27:51 2015 -0700 + + Merge pull request #17107 from albers/completion-build + + Add missing options to bash completion for `docker build` + +commit c56b02b284b6f5b1d59750a5fd087601d8919ecb +Merge: 8b90aefd14 7345050e4d +Author: Vincent Demeester +Date: Fri Oct 16 23:14:17 2015 +0200 + + Merge pull request #17081 from ZJaffee/api_network_test + + Cleaned up integration-cli/docker_api_network_test.go + +commit 8b90aefd14867748c0c7991bb9fe781b08546f44 +Merge: 84be89a273 b34aa69e8f +Author: Vincent Demeester +Date: Fri Oct 16 23:13:25 2015 +0200 + + Merge pull request #17121 from sdurrheimer/zsh-completion-fix-double-dash-option-arguments + + Zsh : all --