Commit Graph

13 Commits

Author SHA1 Message Date
Quan Tian 8059597722 Fix typo in IPAM doc
Signed-off-by: Quan Tian <tianquan@cloudin.cn>
2017-02-13 18:35:32 +08:00
Xianjie 32e713eca6 fix json
Signed-off-by: user.name <datastream@datastream-laptop.local>
Signed-off-by: datastream <guxianjie@gmail.com>
2017-01-05 01:52:37 +08:00
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
Lee Calcote dc4487dbb0 docs/ipam.md: spelling error
Changed "lifecyle" to "lifecycle".

Signed-off-by: Lee Calcote <leecalcote@gmail.com>
2016-07-01 11:03:54 -05: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
Bearice Ren e82b92182f typo fix
Signed-off-by: Bearice Ren <bearice@gmail.com>
2016-04-14 11:12:35 +08:00
Alessandro Boch 6b209991aa Fix IPAM driver documentation
- ipam.md should only describe the contract
  which is relevant to remote ipam plugins.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-02 15:56:46 -08:00
Bryan Boreham 81c586e0e5 Stop referring to requested IP address as "preferred",
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-26 15:09:29 +00:00
Ryan Belgrave 16ff947fb6 IpamOptions per network not per ipam subnet
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-07 21:28:54 -05: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
Alex Chan e5d280edac Tidy up the IPAM driver doc
Signed-off-by: Alex Chan <alex@alexwlchan.net>
2015-10-26 12:47:05 +00:00
Alessandro Boch 6b77f04e9b IPAM driver doc
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-12 16:39:24 -07:00