6 commits

Author	SHA1	Message	Date
Jana Radhakrishnan	8a225de00d	Merge pull request #1205 from allencloud/fix-typos ... use grep to find a/an misuse	2016-08-01 09:49:31 -07:00
allencloud	9f415d0cdb	use grep to find a/an misuse ... Signed-off-by: allencloud <allen.sun@daocloud.io>	2016-06-03 16:35:33 +08:00
Alessandro Boch	651f6ea0fa	Avoid persisting ipam data if it can be reconstructed ... - Also restore older behavior where overlap check is not run when preferred pool is specified. Got broken by recent changes Signed-off-by: Alessandro Boch <aboch@docker.com>	2016-05-12 10:27:10 -07:00
Jana Radhakrishnan	e026deb981	Fix up Godeps and update docker/docker packages ... Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>	2015-12-23 15:07:33 -08:00
Alessandro Boch	29299b73df	Allow remote IPAM driver to express capability ... - So that a DHCP based plugin can express it needs the endpoint MAC address when requested for an IP address. - In such case libnetwork will allocate one if not already provided by user Signed-off-by: Alessandro Boch <aboch@docker.com>	2015-12-17 15:41:47 -08:00
Alessandro Boch	8d56508190	Change in remote IPAM API payload ... - Avoid net.IP and net.IPNet types to ease marshalling/unmarshalling at client and server side Signed-off-by: Alessandro Boch <aboch@docker.com>	2015-10-12 13:03:28 -07:00