10 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gregory Ballantine	b517dd7115	Fixed merging again in map.jinja	2018-04-01 00:19:01 -04:00
Gregory Ballantine	c81dec7460	Changed name of default_settings variable to defaults	2018-04-01 00:05:29 -04:00
Gregory Ballantine	bc3e34f409	Fixed merging again	2018-04-01 00:03:22 -04:00
Gregory Ballantine	cfbdfbaae8	Fixed merging of values from pillar, defaults and OS maps	2018-04-01 00:00:59 -04:00
Gregory Ballantine	5d7c995a03	Fixed merging dicts in map.jinja	2018-03-31 23:47:40 -04:00
Gregory Ballantine	7049998115	Updated map.jinja	2018-03-31 23:45:03 -04:00
Gregory Ballantine	153273cd56	Cleaned up map.jinja some more	2018-03-31 23:32:11 -04:00
Gregory Ballantine	6ea7f4867a	Fixed some variable names in map.jinja	2018-03-31 23:24:47 -04:00
Gregory Ballantine	8eae7150b7	Fixed merging default values into missing pillar values	2018-03-31 23:16:01 -04:00
Gregory Ballantine	3860426651	Fixed the user and group owners for some munin master files	2018-03-31 21:08:42 -04:00