82779 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
garethgreenaway	03caf66a27	Merge branch 'develop' into fix-41668	2017-06-09 11:00:02 -07:00
garethgreenaway	f7d1c96118	Merge pull request #41632 from shitler25oki/develop ... Add newline after cron comment	2017-06-09 10:50:32 -07:00
garethgreenaway	0717051885	Merge branch 'develop' into develop	2017-06-09 07:55:26 -07:00
Nicole Thomas	b58a8ac2a1	Merge pull request #41580 from garethgreenaway/develop_changes_from_41569 ... Update to mixins for Salt tests	2017-06-09 08:44:01 -06:00
Yann Jouanin	9b26abe242	fixes #41668 ntfs case problem in parted module	2017-06-09 12:02:49 +02:00
Gareth J. Greenaway	0086424787	Removing rogue file that shouldn't be referenced	2017-06-08 20:06:29 -07:00
Gareth J. Greenaway	17ddc9396c	Fixing the last text failure.	2017-06-08 20:03:05 -07:00
Gareth J. Greenaway	ace175edae	Couple more typos, assert not asset.	2017-06-08 15:30:44 -07:00
Art Schneider	42927f0548	Merge branch 'develop' of https://github.com/shitler25oki/salt into develop	2017-06-08 16:16:02 -06:00
Art Schneider	1b568a7c7a	Fixed cron tests	2017-06-08 16:15:49 -06:00
Gareth J. Greenaway	e39d05060e	Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn.	2017-06-08 14:18:05 -07:00
Gareth J. Greenaway	207dc61405	Updating the assert tests for develop based on changes from 41569.	2017-06-08 14:18:04 -07:00
Art Schneider	3c2a7ae6d6	Merge remote-tracking branch 'origin/develop' into develop	2017-06-08 14:33:33 -06:00
Mike Place	7aaaf6a8d9	Merge pull request #41576 from m03/issue-41062-ext-http ... Pass grains in http_json and http_yaml external pillar URLs	2017-06-08 13:10:49 -05:00
Mike Place	6e0f151690	Merge pull request #41622 from TheRhino04/therhino04/encryption_key_aws ... Adding ability to specify an encryption key for KMS	2017-06-08 12:58:08 -05:00
Mike Place	bd971d7a3d	Merge pull request #41649 from cetanu/patch-4 ... Allowing salted annotation stamp on VMWare VM #35568	2017-06-08 12:44:07 -05:00
Mike Place	787161c17f	Merge pull request #41648 from markuskramerIgitt/develop ... Use dump instead of dumps for json files	2017-06-08 12:04:05 -05:00
Vasili Syrakis	27a49edd34	explicitly cast annotation to string	2017-06-09 01:27:44 +10:00
Vasili Syrakis	d655cc5c28	Merge branch 'develop' into patch-4	2017-06-09 01:24:57 +10:00
garethgreenaway	09096d6ae1	Merge branch 'develop' into develop	2017-06-08 08:18:20 -07:00
Nicole Thomas	e796c91b5c	Merge pull request #41423 from MarloweW/pillar_top_wildcard ... pillar: target's state list support wildcard in top.sls	2017-06-08 09:15:24 -06:00
Vasili Syrakis	4fbcc3b318	Added documentation for the annotation	2017-06-09 00:25:10 +10:00
Vasili Syrakis	87f87b781e	Allowing salted annotation stamp on VMWare VM #35568	2017-06-09 00:11:19 +10:00
Markus Kramer (DPDHL IT Services)	7cc965aec4	Use dump instead of dumps for json files	2017-06-08 13:29:50 +02:00
Nicole Thomas	93a31500c8	Merge branch 'develop' into pillar_top_wildcard	2017-06-07 17:05:06 -06:00
Nicole Thomas	bfe7355a2d	Merge branch 'develop' into issue-41062-ext-http	2017-06-07 16:55:09 -06:00
garethgreenaway	4dc110a43d	Merge pull request #41462 from tsaridas/scheduled_jobs_fix ... try to fix scheduled jobs	2017-06-07 13:16:57 -07:00
Art Schneider	e319ec67a1	Merge branch 'develop' of https://github.com/shitler25oki/salt into develop	2017-06-07 14:04:16 -06:00
Art Schneider	de35ffa966	Removed rstrip from comment in render_tab	2017-06-07 14:03:56 -06:00
Art Schneider	35c3ba079c	Merge remote-tracking branch 'origin/develop' into develop	2017-06-07 14:00:32 -06:00
garethgreenaway	5536b9a8fb	Merge branch 'develop' into develop	2017-06-07 12:43:10 -07:00
Mike Place	db3c7d39a0	Merge branch 'develop' into scheduled_jobs_fix	2017-06-07 12:44:00 -05:00
Mike Place	b7fcf9c0da	Merge pull request #41636 from rallytime/merge-develop ... [develop] Merge forward from nitrogen to develop	2017-06-07 12:42:04 -05:00
Neil Rhine	1ca90885d0	Adding ability to specify an encryption key for KMS	2017-06-07 10:01:51 -07:00
Mike Place	cacb0155c9	Merge pull request #41577 from Juniper/junos-doc ... Junos specific documentation for topic Network Automation	2017-06-07 11:50:24 -05:00
garethgreenaway	6e0181c6e8	Merge branch 'develop' into issue-41062-ext-http	2017-06-07 09:04:29 -07:00
rallytime	396b06fdf8	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-06-07 09:54:20 -06:00
Mike Place	45326ccdec	Merge pull request #41621 from gtmanfred/mac ... Fix some mac tests	2017-06-07 10:19:25 -05:00
Art Schneider	3f25cc3b07	Add newline after cron comment	2017-06-07 08:12:34 -06:00
Erik Johnson	913450bd45	Merge pull request #41620 from Ch3LL/skip_mac_git ... Skip git_pillar tests on MacOSX	2017-06-07 09:07:01 -05:00
Nitin Kr	1401b50621	Merge branch 'develop' into junos-doc	2017-06-07 14:06:28 +05:30
rajvidhimar	0fd3344a65	Update network_automation doc	2017-06-07 14:04:58 +05:30
Marlowe W	88bd2bd189	Merge branch 'develop' into pillar_top_wildcard	2017-06-07 09:51:36 +08:00
Nicole Thomas	832b96ea05	Merge pull request #41614 from rallytime/merge-nitrogen ... [nitrogen] Merge forward from 2016.11 to nitrogen	2017-06-06 18:42:44 -06:00
Andreas Tsaridas	df28ad117a	Merge branch 'develop' into scheduled_jobs_fix	2017-06-07 00:52:48 +02:00
Mike Place	bc0f9699ca	Merge pull request #41613 from rallytime/merge-develop ... [develop] Merge forward from nitrogen to develop	2017-06-06 17:39:54 -05:00
rallytime	8aaadd8787	Revert "Update new pyroute2 unit test to conform with 2016.11 branch standards" ... This reverts commit 535b8e8d8e.	2017-06-06 16:35:12 -06:00
Mike Place	c7f60312c8	Merge pull request #41591 from FireEater64/add-choco-no-progress-option ... Choco: Add support for the --no-progress option	2017-06-06 17:30:53 -05:00
Ch3LL	0e35605f20	Skip git_pillar tests on MacOSX	2017-06-06 17:17:57 -04:00
Mike Place	20c54a984b	Merge pull request #40694 from xetus-oss/boto_ec2_volume_present ... Boto ec2 volume present	2017-06-06 16:03:25 -05:00