13 Commits

Author	SHA1	Message	Date
Colton Myers	f00465a8a1	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/topics/event/index.rst salt/loader.py salt/modules/config.py salt/modules/cyg.py salt/modules/hg.py salt/modules/lxc.py salt/modules/upstart.py salt/states/hg.py salt/utils/cloud.py salt/utils/dictupdate.py salt/utils/schedule.py tests/integration/fileserver/gitfs_test.py tests/unit/pydsl_test.py	2015-02-18 11:55:29 -07:00
Erik Johnson	706ce858b4	Disable LXC integration tests for now	2015-02-10 15:06:47 -06:00
Pedro Algarvio	b54c02930f	Py3 compatibility fixes	2015-01-30 22:25:09 +00:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Pedro Algarvio	e739561728	Use the salttesting skip helpers	2014-10-08 01:02:10 +01:00
rallytime	b8db5ff56b	Change lxc skipIf message to be more helpful	2014-08-15 14:21:09 -06:00
rallytime	396a4de7c5	Make lxc tests run!	2014-08-15 11:09:20 -06:00
rallytime	7bb5ef3773	Skip lxc tests if no lxc and skip failing vt_test if running osx	2014-07-21 17:11:20 -06:00
Thomas S Hatch	7e54d0fa20	Revert "lxc refactor"	2014-07-12 11:38:03 -06:00
Matthew Williams	71e1522c08	WIP: continue restructure of modules.lxc	2014-07-11 19:17:55 +00:00
Matthew Williams	3a0263d551	WIP: lxc restructure	2014-07-11 18:28:37 +00:00
Matthew Williams	e102a95b84	use a faster template (sshd) for lxc integration tests	2014-07-10 14:38:28 -04:00
Matthew Williams	298d4e6eac	add lxc integration tests	2014-07-10 13:37:48 -04:00