valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,183 Commits 24 Branches 182 Tags 341 MiB
f20e78b534
Commit Graph

71183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
f20e78b534 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 15:35:21 -06:00
Nicole Thomas
dde104e8c1 Merge pull request #34680 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-14 15:33:38 -06:00
Nicole Thomas
d57507dde8 Merge pull request #34679 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-14 14:59:45 -06:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 14:10:10 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
aa4a37af0f Merge pull request #34668 from andras-tim/fix-ini-line-ending 
INI uses proper line endings - fix #34667
 2016-07-14 12:25:10 -06:00
Mike Place
3192e1674b Merge pull request #34676 from cachedout/partial_revert_34644 
Revert "Modify lodaer global test to use populated dunders"
 2016-07-14 12:12:55 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Mike Place
b88c39e1d2 Merge pull request #34605 from gtmanfred/2016.3 
catch error if no dns domains exist
 2016-07-14 09:20:46 -06:00
Mike Place
196266140a Merge pull request #34549 from Inveracity/fix-dsc-set-lcm-config 
fixes multiple values in mof configuration
 2016-07-14 09:12:56 -06:00
Mike Place
b3dc6031fe Merge pull request #34557 from jacobweinstock/jboss7_cli-handle-expression-type 
handle jboss cli expression type in the parsing of output
 2016-07-14 09:09:49 -06:00
Mike Place
c1820323bf Merge pull request #34664 from w32-blaster/develop 
Added error message if the sqs_events engine cannot be imported
 2016-07-14 09:07:40 -06:00
Mike Place
07840714c5 Merge pull request #34608 from pass-by-value/cassandra_cql_returner_opts 
Add support for more options to Cassandra CQL returner
 2016-07-14 09:06:43 -06:00
Mike Place
55fa192fd8 Merge pull request #34631 from czee/develop 
Add account lock/unlock support to shadow module
 2016-07-14 09:00:34 -06:00
Andras Tim
c211cfa0bc INI uses proper line endings - fix #34667 2016-07-14 16:55:04 +02:00
Mike Place
eadae09e0a Merge pull request #34563 from rallytime/py3-state-unit-tests 
Py3 fixes for running unit tests in the unit/states/ directory.
 2016-07-14 08:28:49 -06:00
Mike Place
3b6f1089b2 Merge pull request #34601 from lorengordon/clarify-doc 
Clarifies the proper way to reference states
 2016-07-14 08:20:41 -06:00
Tamas Szasz
700c4bb200 Added error message if the sqs_events engine cannot be imported 2016-07-14 16:12:56 +02:00
Mike Place
eed45b6c71 Merge pull request #34650 from bodhi-space/infra1850 
INFRA-1850 - add support for grafting into specific namespaces to makostack ext_pillar module
 2016-07-14 08:01:21 -06:00
Mike Place
d3df37e57a Merge pull request #34641 from rallytime/fix-34627 
Gate the Public IP ssh_interfaces warning a little better
 2016-07-14 07:57:54 -06:00
Mike Place
9376a3f5b6 Merge pull request #34634 from fdamstra/add-json-file-returner 
Added rawfile_json returner, writes directly to local file
 2016-07-14 07:55:36 -06:00
Mike Place
cc1d849fb4 Merge pull request #34643 from nevins-b/shlex-quotes 
fix augeas module so shlex doesn't strip quotes
 2016-07-14 07:51:00 -06:00
Mike Place
46b7d46ff1 Merge pull request #34654 from techhat/checkevent 
Switch Thorium check over to expr_match
 2016-07-14 07:48:40 -06:00
Mike Place
265ff57a99 Merge pull request #34655 from at0S/allow-to-alloate-eip-in-vpc 
Elastic IP now could be allocated to VPC or EC2 region
 2016-07-14 07:47:26 -06:00
Taras Yermolenko
253c2f4e92 Elastic IP now could be allocated to VPC or EC2 region 
Signed-off-by: Taras Yermolenko <ven1meux@donar.eng.actionhrm.com>
 2016-07-14 12:23:44 +10:00
Joseph Hall
a3730a011b Switch Thorium check over to expr_match 2016-07-13 19:12:00 -06:00
Fred Damstra
24d04a45d7 Switched from open() to salt.utils.flopen() 
flopen() provides locking and file handle tracking.
Also fixed errant copy and pasted comment.
 2016-07-13 20:39:34 -04:00
Fred Damstra
3fbd1b10f1 Rebased to develop 2016-07-13 20:36:16 -04:00
Fred Damstra
8edeba9ab8 Switched from open() to salt.utils.flopen() 
flopen() provides locking and file handle tracking.
Also fixed errant copy and pasted comment.
 2016-07-13 20:34:28 -04:00
Fred Damstra
d75276f9d9 Added documentation link for rawfile_json returner. 2016-07-13 20:34:27 -04:00
Fred Damstra
73e0af8f13 Added rawfile_json returner 
This returner saves the event json directly to a file on the local
filesystem of either the minion (in the event of --return) or
of the master (when using event_return).
 2016-07-13 20:34:27 -04:00
Nicole Thomas
a7868c248a Spelling fixes found in sqlite3 pillar docs (#34652) 2016-07-13 18:59:43 -04:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Tom Williams
648fb37086 INFRA-1850 - add support for grafting into specific namespaces to makostack ext_pillar module 2016-07-13 16:46:56 -04:00
winstonliu1111
c0b77149f3 fixed missed passing of region, key, keyid, and profile into the boto_sns.unsubscribe call into the execution module (#34530) 
* fixed missed passing of region, key, keyid, and profile into the unsubscribe execution module call.

* changed all region, key, keyid and profile args into boto_sns execution modules to be passed by keyword args.
 2016-07-13 15:36:57 -04:00
Mike Place
8a0209101e Merge pull request #34642 from jtand/mysql_integration_cleanup 
Check that mysqladmin exists before running mysql integration tests
 2016-07-13 12:12:44 -06:00
rallytime
966e7539b1 Update error message to be more relevant 
If private_ips are specified, then we won't hit this error message anymore.
 2016-07-13 11:31:13 -06:00
Daniel Wallace
37b0943539 catch error if no dns domains exist 
For digital ocean.  Fixes #33452
 2016-07-13 12:23:09 -05:00
Christopher Zee
f7f783835b Add account lock/unlock support to shadow module 2016-07-13 19:17:58 +02:00
Pedro Algarvio
38d41dc2fe Gate Non Hard Dep Imports (#34636) 
* `lxml` is not a Salt hard dep

* Gate boto import
 2016-07-13 13:13:53 -04:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
rallytime
28caa2bfbd Gate the Public IP ssh_interfaces warning a little better 
Fixes #34627

This error warning would still show up in the logs, even if
ssh_interface was set to private_ips.
 2016-07-13 10:42:33 -06:00
Nevins Bartolomeo
79e583366e fix aegues module so shlex doesn't strip quotes 2016-07-13 12:34:49 -04:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Anthony Shaw
7786c0020c Libcloud DNS module fix (#34628) 
* add test module

* add broken test

* fix typo in config dictionary

* remove call to unused function, add called_with assertion
 2016-07-13 11:47:20 -04:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565) 
* add num_cpus grain to freebsd

* fix pylint
 2016-07-13 11:40:09 -04:00
Joseph Hall
dd855c2148 Properly pass in userdata as string (#34623) 2016-07-13 11:13:21 -04:00
Nicole Thomas
fc38ec7f0c Merge pull request #34624 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-13 11:09:46 -04:00
Collin Richards
279c113b99 Add NILinuxRT support to timezone execution module (#34556) 
get_zone function in the timezone module would not work properly for
NILinuxRT due to OS sniffing. Add NILinuxRT as one of the OSes checked.

Signed-off-by: Collin Richards <collin.richards@ni.com>
 2016-07-13 11:06:31 -04:00