Commit Graph

48241 Commits

Author SHA1 Message Date
Nicole Thomas
5ba6437c89 Merge pull request #21324 from rallytime/pylint_develop
Some pylint 3 compatibility fixes for develop
2015-03-06 10:52:31 -07:00
rallytime
81989229b2 Pylint fix for real this time 2015-03-06 10:15:02 -07:00
Thomas S Hatch
5448b720e7 Merge pull request #21375 from mgwilliams/engines
engine updates
2015-03-06 10:11:29 -07:00
Matthew Williams
577aa1ace1 sqs_events engine: properly fire events when running on a minion 2015-03-06 16:18:51 +00:00
Matthew Williams
ac77a16f6d pack __runners__ for master engines 2015-03-06 16:11:03 +00:00
Thomas S Hatch
8e01ee7462 Merge pull request #21340 from tsaridas/fixes_create_failing_with_key
fixes for rds replica state to work with keys
2015-03-06 08:58:16 -07:00
Thomas S Hatch
c74e67f22a Merge pull request #21347 from torhve/fix-file-check_cmd
Fix IOError when using check_cmd
2015-03-06 08:57:41 -07:00
Thomas S Hatch
9d97cf3dde Merge pull request #21351 from garethgreenaway/missing_until_schedule_flag
Adding the until flag into the schedule module.
2015-03-06 08:56:52 -07:00
Thomas S Hatch
7ec1eb799f Merge pull request #21356 from eliasp/develop_grains_virt-what-support
Add support for 'virt-what' in the 'virtual' grain. Improve handling of ...
2015-03-06 08:47:08 -07:00
Thomas S Hatch
bbd526d896 Merge pull request #21357 from rallytime/develop
Add versionadded tag to new jobs.last_run function
2015-03-06 08:46:34 -07:00
Thomas S Hatch
06f9ce8ac7 Merge pull request #21358 from xclusv/fix-php-composer
Fix composer, issue #21349
2015-03-06 08:46:22 -07:00
Thomas S Hatch
954bb8ddb0 Merge pull request #21364 from mgwilliams/engines
engine changes
2015-03-06 08:44:53 -07:00
Thomas S Hatch
760b8a29b6 Merge pull request #21368 from jimmystewpot/develop
Updated EC2/AWS provider documentation to reflect undocumented features regarding static PrivateIpAddress
2015-03-06 08:40:56 -07:00
James Lamb
f18dc55ccb Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop 2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f Update documentation to include how to set a static IP within the VPC for aws/ec2 2015-03-06 15:10:02 +11:00
Matthew Williams
60786180b3 allow engines opt as dict or list 2015-03-05 22:47:17 +00:00
Matthew Williams
f7039585a4 fix sqs_events engine docs 2015-03-05 22:40:09 +00:00
Matthew Williams
edeae4f69e engines: pack runners or minion mods into __salt__ 2015-03-05 22:36:34 +00:00
rallytime
598b1b1ace More pylint fixing 2015-03-05 15:04:31 -07:00
Ross Perkins
a806412d1b Fixed lint complaints. 2015-03-05 22:46:36 +01:00
Matthew Williams
f3fd1af5ac Merge remote-tracking branch 'origin/develop' into engines 2015-03-05 21:43:51 +00:00
Matthew Williams
8ebe941ad1 fix bad wait timeout for sqs_events engine 2015-03-05 21:41:24 +00:00
Ross Perkins
2673f80b28 Added CLI example to composer.did_composer_install 2015-03-05 22:17:23 +01:00
Ross Perkins
ca564622b3 Merge branch 'develop' of https://github.com/saltstack/salt into fix-php-composer 2015-03-05 21:25:50 +01:00
rallytime
31795e1a19 Add versionadded tag to new jobs.last_run function 2015-03-05 12:03:48 -07:00
Elias Probst
1c459e60ec Add support for 'virt-what' in the 'virtual' grain. Improve handling of _cmds set. 2015-03-05 19:53:40 +01:00
Ross Perkins
d6545d1a57 Fixed syntax error. 2015-03-05 19:26:00 +01:00
Ross Perkins
3cf3ccfa8a Fix module: composer.install so it doesn't care what kind of output is returned by composer, and it relies exclusively on the return code instead.
Add module: composer.update
Add module: composer.selfupdate
Fix state: composer.installed to support test mode
Add state: composer.update
Updated tests.
2015-03-05 19:20:52 +01:00
rallytime
d9d30cc855 Pylint fix 2015-03-05 10:31:13 -07:00
Gareth J. Greenaway
3e6d52b577 Adding the until flag into the schedule module. 2015-03-05 08:45:53 -08:00
Mike Place
24f1302cfd Merge pull request #21322 from garethgreenaway/disk_usage_beacon
Adding a beacon to monitor diskusage.
2015-03-05 07:44:23 -07:00
Mike Place
7cb208b9f0 Merge pull request #21335 from garethgreenaway/beacons_network_info
Adding a beacon to monitor network interface information.
2015-03-05 07:41:59 -07:00
Joseph Hall
d4a8b9c7f2 Merge pull request #21339 from schwing/slack_documentation
Update Slack documentation
2015-03-05 06:38:17 -07:00
Joseph Hall
9c342a04c8 Merge pull request #21338 from arthurlogilab/patch-4
typo fix in log s/Cloud/Could/
2015-03-05 06:37:45 -07:00
Tor Hveem
b27c176f1c Fix IOError when using check_cmd 2015-03-05 12:30:49 +01:00
Andrea-Redi Tsarida
d437a11d23 fixes for rds replica state to work with keys 2015-03-05 10:08:54 +01:00
Arthur Lutz
31db428a47 typo fix in log s/Cloud/Could/ 2015-03-05 09:29:43 +01:00
Gareth J. Greenaway
74f4eca45a Adding a beacon to monitor network interface information. 2015-03-04 22:22:30 -08:00
jfindlay
eccbfe602e Merge pull request #21323 from tsaridas/add_key_id
add key_id
2015-03-04 21:14:23 -07:00
jfindlay
53a776e1b3 Merge pull request #21327 from ndenev/develop
Detect if we're running FreeBSD under KVM even if dmidecode is not installed
2015-03-04 21:13:14 -07:00
jfindlay
dfc19edb06 Merge pull request #21331 from nmadhok/doc-fix
Replacing provider aws with ec2 fixes #21274
2015-03-04 21:09:35 -07:00
Seth House
eba7f699d6 Merge pull request #21330 from mgwilliams/engines
add sqs_events engine
2015-03-04 19:16:43 -07:00
Nitin Madhok
b9cdd2b089 Replacing provider aws with ec2 fixes #21274 2015-03-04 20:49:00 -05:00
Matthew Williams
9161d62ba2 add documentation for sqs_event engine 2015-03-05 01:04:50 +00:00
Matthew Williams
e9b331a604 add sqs_events engine; pass engine config to start func 2015-03-05 00:55:48 +00:00
Nikolay Denev
7415ea2ccb Detect if we're running FreeBSD even if dmidecode is not installed 2015-03-05 00:51:00 +01:00
rallytime
dbdc12fe11 Python 3 compat for joyent integration test file 2015-03-04 16:11:45 -07:00
rallytime
2590776f3e Python 3 compat for ec2_pillar 2015-03-04 16:09:46 -07:00
rallytime
76efa22b13 Python 3 compat for engines init and engines test 2015-03-04 16:08:39 -07:00
Andrea-Redi Tsarida
c37e0f47b1 add key_id 2015-03-05 00:07:15 +01:00