valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,521 Commits 24 Branches 182 Tags 341 MiB
2a9738f00d
Commit Graph

68521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2a9738f00d Merge pull request #34746 from rallytime/azure-version 
Update azure lib dep to match the one in cloud.clouds.msazure
 2016-07-18 12:54:40 -06:00
Mike Place
c0e2657c8e Merge pull request #34744 from jtand/test_valid_docs_fix 
Test valid docs fix
 2016-07-18 12:22:47 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
Justin Anderson
4fe33a7695 add directives example to ldap3.modify 2016-07-18 11:17:24 -06:00
Justin Anderson
6fa40a0d46 Add cli examples for ldap3 module 2016-07-18 10:47:12 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Nicole Thomas
d4adf98b85 Merge pull request #34740 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-18 10:28:56 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-18 09:45:00 -06:00
Mike Place
efc7599f85 Merge pull request #34607 from isbm/isbm-config-reading-exit-2016.3 
Bugfix: Exit on configuration read (backport)
 2016-07-18 09:15:21 -06:00
Mike Place
d0e0c0186b Merge pull request #34739 from cachedout/remove_config_test 
Remove unnedeed config test
 2016-07-18 09:15:15 -06:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
Mike Place
e9e5bbe38b Merge pull request #34721 from rallytime/fix-34703 
Add output_file option to master config docs
 2016-07-16 14:04:02 -06:00
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630 
Various spelling fixes
 2016-07-16 13:49:54 -06:00
Mike Place
922cc5a8a7 Merge pull request #34714 from sjmh/fix/ldap_auth 
Fix ldap auth for function matches
 2016-07-16 13:49:12 -06:00
Nicole Thomas
40626d786a Merge pull request #34720 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-16 13:22:28 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-16 12:29:54 -06:00
Nicole Thomas
8ae4b104ff Add versionadded to "special" option in cron.present state (#34707) 
Fixes #34661
 2016-07-16 12:23:43 -06:00
Steve Hajducko
d4144039bc Fix ldap auth for function matches 
The expand_ldap_entries doesn't take into account that certain entries
may not actually be dicts, such as @runner, @wheel, @jobs, or even .*
 2016-07-15 23:12:52 -07:00
Mike Place
08d00f3a61 Merge pull request #34689 from Azidburn/fix_pkg_sources 
fix second run problems with pkg.installed using sources
 2016-07-15 15:19:39 -06:00
Mike Place
51fce770a5 Merge pull request #34696 from isbm/isbm-zypper-product-boolean-values-2016.3 
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2016.3)
 2016-07-15 15:18:21 -06:00
Mike Place
4cb1ded520 Merge pull request #34695 from isbm/isbm-zypper-product-boolean-values 
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8)
 2016-07-15 15:08:00 -06:00
Mike Place
45045f6900 Merge pull request #34702 from farcaller/fixtags 
Fixed dockerng.list_tags
 2016-07-15 14:50:35 -06:00
Vladimir Pouzanov
032e35a28e Fixed dockerng.list_tags 2016-07-15 20:29:20 +01:00
Bo Maryniuk
96021e257c Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
Bo Maryniuk
337eee33ac Bugfix: return boolean only for 'isbase' and 'installed' attributes 2016-07-15 17:13:58 +02:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
Bo Maryniuk
21444ee240 Bugfix: return boolean only for 'isbase' and 'installed' attributes 2016-07-15 17:11:31 +02:00
Marc Thomas
2c0fc919b3 fix second run problems with pkg.installed using sources 
Fixes #32276
 2016-07-15 14:11:11 +02:00
Nicole Thomas
764f56f711 fixes multiple values in mof configuration (#34681) 
issue #34548
 2016-07-14 17:23:38 -06:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -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
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -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
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
3b6f1089b2 Merge pull request #34601 from lorengordon/clarify-doc 
Clarifies the proper way to reference states
 2016-07-14 08:20:41 -06: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
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
Daniel Wallace
37b0943539 catch error if no dns domains exist 
For digital ocean.  Fixes #33452
 2016-07-13 12:23:09 -05:00
Bo Maryniuk
fb7542f920 Add option to master config reader on ignoring system exit for wrong configuration 2016-07-13 19:20:27 +02:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Bo Maryniuk
abd10b5782 Ignore minion config errors everywhere but the minion itself 2016-07-13 18:46:01 +02: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
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
Bo Maryniuk
e5f43e6711 Remove deprecation: BaseException.message deprecated as of 2.6 2016-07-13 13:02:51 +02:00