valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,739 Commits 24 Branches 182 Tags 341 MiB
31cc97ccf4
Commit Graph

64739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Alphonso
31cc97ccf4 looks like a re-merge of PR #20972 which relates to #19288 2016-01-24 12:12:15 -05:00
Colton Myers
8823d7f56a Merge pull request #30562 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-22 15:24:03 -07:00
Colton Myers
c3cbe74730 Fix line endings 2016-01-22 14:13:03 -07:00
Mike Place
e749f2954d Merge pull request #30564 from cachedout/fix_win_service_test 
Fix bad mock in win_service_test
 2016-01-22 13:38:09 -07:00
Mike Place
f27b602a0f Fix bad mock in win_service_test 2016-01-22 13:37:32 -07:00
Mike Place
8ba57a5efc Merge pull request #30557 from twangboy/mac_ports 
renamed macports.py to mac_ports.py
 2016-01-22 13:18:33 -07:00
Colton Myers
9885976ac3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.yumpkg.rst
    salt/modules/yumpkg.py
 2016-01-22 12:59:54 -07:00
twangboy
df0a4d2e58 renamed macports.py to mac_ports.py 2016-01-22 12:06:57 -07:00
Mike Place
44dea20bf3 Merge pull request #30550 from cachedout/fix_30113 
Fixup for Let test=True option work for http.query state #30113
 2016-01-22 11:35:31 -07:00
Mike Place
427f6f7cad Fix failing unit test 2016-01-22 10:54:25 -07:00
Mike Place
f1845150ff Merge pull request #30543 from sjorge/module-pkgin 
fix salt.modules.pkgin on SmartOS (#30497)
 2016-01-22 10:26:00 -07:00
Mike Place
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod 
Add execution module for working in sls files
 2016-01-22 10:25:16 -07:00
Mike Place
a050cebda0 Merge pull request #30544 from kraney/boto_s3_bucket 
Always-modify bug in boto_s3_bucket.present
 2016-01-22 10:23:01 -07:00
Mike Place
ff80eb4abe Merge pull request #30536 from rrzaripov/fix-sc-output-on-non-us-locale 
This commit fixes #30535
 2016-01-22 10:20:28 -07:00
Mike Place
1da1bb9afc Merge pull request #30529 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-22 10:19:39 -07:00
Erik Johnson
e85ad690fb Lint fixes 2016-01-22 10:58:34 -06:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Seth House
155966c9d2 Add execution module for working in sls files 2016-01-22 09:45:45 -07:00
Mike Place
f0dbc0f0de Merge pull request #30537 from akissa/add-postgres-init-data-dir 
Add postgres init data dir support
 2016-01-22 09:42:35 -07:00
Kris Raney
3c6fe2eb17 Always-modify bug in s3_bucket.present when versioning has never been turned on. 2016-01-22 10:37:51 -06:00
Mike Place
d0d01fe9de Merge pull request #30542 from gladiatr72/fix_off-posix_log-level_exceptions 
address color log dict lookup exceptions w/ non-posix log level names
 2016-01-22 09:29:23 -07:00
Jorge Schrauwen
fe3b0cb022 sprinkle some version changed love 2016-01-22 16:13:05 +00:00
Jorge Schrauwen
b12e02cf94 fix salt.modules.pkgin on SmartOS 2016-01-22 16:08:43 +00:00
Stephen D. Spencer
de4ae26a9c Some 3rd-party modules (e.g. gnupg) define custom log levels that emit 
at INFO level and above.  This patch sets the color data lookups to
default to TextFormat('reset') rather than producing a stack trace
every time a log message is generated from an affected module.
 2016-01-22 08:24:53 -06:00
Andrew Colin Kissa
806823315e Add postgres_initdb state module documentation 2016-01-22 12:21:03 +02:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Andrew Colin Kissa
47a7f7d11c Add postgres_initdb state module 2016-01-22 12:16:28 +02:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02:00
Andrew Colin Kissa
e420c91061 Add postgres data directory init functionality 
Add postgres data directory existance check functionality
 2016-01-22 12:14:32 +02:00
Renat Zaripov
a79a2c1fa0 This commit fixes #30535 2016-01-22 12:58:48 +03:00
Erik Johnson
43829ecee6 Docstring tweaks 
This commit adds 2015.8-specific context to the top-level docstring and
also removes yum-specific terminology from the pkg.remove function.
 2016-01-22 01:53:03 -06:00
Erik Johnson
92d5a2a49c Fix spelling 2016-01-22 01:31:45 -06:00
Erik Johnson
fdc60fc04a Modify pkg.group_installed to reflect changes in yumpkg.py 2016-01-22 01:21:59 -06:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Mike Place
8069863a04 Merge pull request #30523 from twangboy/dsc_boron 
DSC Module (Experimental)
 2016-01-21 19:33:46 -07:00
Mike Place
e366f6a7fd Merge pull request #30526 from twangboy/reg_flushkey 
Added FlushKey to make sure it's changes are saved to disk
 2016-01-21 19:33:13 -07:00
Nicole Thomas
01bd1bfd31 Merge pull request #30525 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-21 18:27:02 -07:00
twangboy
23085ffbbb Added FlushKey to make sure it's changes are saved to disk 2016-01-21 18:21:55 -07:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
twangboy
1717d15d25 Applied suggested fixes 2016-01-21 16:37:20 -07:00
Mike Place
12194b7f1d Merge pull request #30388 from s0undt3ch/features/global-exception-handler 
Patch the multiprocessing processes run method to log uncaught exceptions
 2016-01-21 16:05:36 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Mike Place
587a03e1d8 Merge pull request #30466 from s0undt3ch/hotfix/stop-deprecating-and-fix-opts-id 
Stop the deprecation path started in 0.17 about ext_pillar
 2016-01-21 15:58:36 -07:00
Mike Place
72da31159d Merge pull request #30524 from basepi/pillar.exists.27299 
Add pillar.file_exists execution module function
 2016-01-21 15:56:12 -07:00
Mike Place
019af349af Merge pull request #30485 from jtand/pip_8_update_2015.8 
Updated pip_state to work with pip 8.0 on 2015.8
 2016-01-21 15:55:38 -07:00
Mike Place
3259fde362 Merge pull request #30494 from isbm/isbm-zypper-nfoinst-bool-fix 
Zypper: info_installed — 'errors' flag change to type 'boolean'
 2016-01-21 15:55:05 -07:00
Mike Place
359b5267ac Merge pull request #30509 from abednarik/dependencies_doc_update 
Updated dependencies documentation.
 2016-01-21 15:54:31 -07:00
Mike Place
596892326d Merge pull request #30506 from jacksontj/2015.8 
Properly remove newlines after reading the file
 2016-01-21 15:53:57 -07:00
Mike Place
15c7aedd46 Merge pull request #30508 from rallytime/linode-clone-fixes 
Fix Linode driver cloning functionality
 2016-01-21 15:53:36 -07:00
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket 
Boto s3 bucket state
 2016-01-21 15:52:58 -07:00