6 Commits

Author	SHA1	Message	Date
Ian Southam	9355dd7133	Corrected a hole in my logic	2015-03-16 11:35:05 +01:00
Ian Southam	0bf7d54722	1. Completed provider for ip rules (fwmark) ... 2. Added merge routine for guestnetwork config messages 3. Updated test script	2015-03-16 11:35:05 +01:00
Hugo Trippaers	0027db6cd1	Switch ip associations to new model and update the recipes	2015-03-16 11:35:04 +01:00
Ian Southam	bcb760e1e2	Can now read the ips out of the cmdline databag (if present)	2015-03-16 11:35:03 +01:00
Ian Southam	018b56385c	Added cs_ip module ... Corrected syntax error in merge.py	2015-03-16 11:35:02 +01:00
Ian Southam	a357e12943	Add the Python bits	2015-03-16 11:35:02 +01:00