14 Commits

Author	SHA1	Message	Date
rallytime	f20f3742cb	Merge branch '2017.7' into 'develop' ... Conflicts: - tests/unit/test_crypt.py	2017-08-07 10:43:06 -04:00
Anil Kabra	b77b2e2a05	Fix unit test signing with passphrase	2017-07-28 14:02:31 -05:00
Anil Kabra	2f3c50206b	Fix calls to files utility module method from open from fopen	2017-07-28 09:40:57 -05:00
Anil Kabra	7875ee9d34	Fixed error due to new files module in utils	2017-07-28 07:44:50 -05:00
Anil Kabra	acfc5fb710	Resolved merge conflict	2017-07-27 13:28:41 -05:00
Sigmon, Jeffrey	bb29afd022	Passphrase protect master private key	2017-07-27 13:17:26 -05:00
twangboy	102509029e	Remove chown mock, fix path seps	2017-07-21 16:36:07 -06:00
rallytime	ccf790a83f	Update all references for moved functions to use "files" util ... - fopen - flopen - fpopen - safe_rm - is_empty - is_fcntl_available	2017-07-18 10:31:01 -06:00
Mike Place	6e9e0714f0	Merge forward from 2016.11 to 2017	2017-06-21 14:51:02 -06:00
rallytime	58262608cd	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/config/__init__.py - salt/master.py - salt/modules/zypper.py - tests/unit/modules/timezone_test.py	2017-06-16 10:43:02 -06:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00