4 Commits

Author	SHA1	Message	Date
James Cammarata	86de1429e5	Cleaning up FIXMEs	2015-10-22 16:03:50 -04:00
Toshio Kuratomi	c1039de70c	Compatibility with six-1.3.0	2015-09-08 09:46:12 -07:00
James Cammarata	ff9f5d7dc8	Starting to add additional unit tests for VariableManager ... Required some rewiring in inventory code to make sure we're using the DataLoader class for some data file operations, which makes mocking them much easier. Also identified two corner cases not currently handled by the code, related to inventory variable sources and which one "wins". Also noticed we weren't properly merging variables from multiple group/host_var file locations (inventory directory vs. playbook directory locations) so fixed as well.	2015-09-04 16:41:38 -04:00
James Cammarata	ce3ef7f4c1	Making the switch to v2	2015-05-03 21:47:26 -05:00