valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,836 Commits 24 Branches 182 Tags 341 MiB
a782b00ee1
Commit Graph

75836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
f3ae3cd5c8 Merge pull request #38668 from terminalmage/issue38604 
Fix proposal for #38604
 2017-01-18 10:53:08 -07:00
Denys Havrysh
9bd203ffcc Fix #38388 
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
 2017-01-18 19:16:38 +02:00
Mike Place
c6a19a9e5a Merge pull request #38789 from rallytime/fix-38622 
Update some saltenv refs to environment in salt.modules.state docs
 2017-01-18 08:39:21 -07:00
Mike Place
e0bf700020 Merge pull request #38790 from cachedout/fix_pyobjects_test_typo 
Fix typo in pyobjects test
 2017-01-18 08:38:56 -07:00
Mike Place
6e9785edea Merge pull request #38792 from rallytime/fix-38629 
Update pillar tutorial lanuage regarding pillar_opts settings
 2017-01-18 08:38:18 -07:00
Mike Place
e3ca6881c8 Merge pull request #38799 from aosagie/fix-ansible-dynamic-roster 
Parse ansible dynamic inventory output correctly
 2017-01-18 08:32:47 -07:00
Bo Maryniuk
ffbd45062e Explain what it is about and how to configure that 2017-01-18 15:02:11 +01:00
Nicole Thomas
76df6a43f3 Merge pull request #38787 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-18 01:39:07 -07:00
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -07:00
rallytime
2aad54c49f Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 16:24:42 -07:00
Mike Place
3417adc617 Merge pull request #38796 from saltstack/revert-38707-root_dir_fix-gh 
Revert "Fixed prepending of root_dir override to the other paths"
 2017-01-17 16:18:17 -07:00
Mike Place
cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths" 2017-01-17 16:17:41 -07:00
Erik Johnson
0ea97cdad9 Merge pull request #10 from cachedout/pr-38668 
Munge retcode into return data for batching
 2017-01-17 17:10:20 -06:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
Mike Place
a66afb5f0f
Fix typo in pyobjects test 2017-01-17 13:57:20 -07:00
rallytime
af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs 
If saltenv is not specified in some of these functions, the the
"environment" option is used instead.

Fixes #38622
 2017-01-17 12:17:00 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
Mike Place
bab3479a3c Merge pull request #38585 from rallytime/follow-up-38527 
Follow up to PR #38527
 2017-01-17 11:40:01 -07:00
Mike Place
4e6146f65f Merge pull request #38660 from techhat/cachedir 
Don't force salt.cache to use cachedir from opts
 2017-01-17 11:38:34 -07:00
Mike Place
db81afc035
Munge retcode into return data for batching 2017-01-17 11:31:45 -07:00
rallytime
05587201b6 Pylint fix: add line at end of file 2017-01-17 10:26:43 -07:00
Joseph Hall
be55b57abf One last fix 2017-01-17 10:07:25 -07:00
Joseph Hall
fc24b24998 Add correct function name 2017-01-17 08:55:58 -07:00
Mike Place
89dc86e2bc Merge pull request #38667 from rallytime/bp-37982 
Back-port #37982 to 2016.11
 2017-01-17 08:42:12 -07:00
Mike Place
0fb6bb7b77 Merge pull request #38707 from alexbleotu/root_dir_fix-gh 
Fixed prepending of root_dir override to the other paths
 2017-01-17 08:40:12 -07:00
Mike Place
751e14c523 Merge pull request #38759 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-17 08:22:00 -07:00
Mike Place
96c9dc10f7 Merge pull request #38774 from vutny/dev-test-docs 
DOCS: add C++ compiler installation on RHEL required for bundled 0mq
 2017-01-17 08:20:59 -07:00
Mike Place
bb6291d93a Merge pull request #38778 from cloudflare/fix-38775 
Fix "Error using napalm netusers"
 2017-01-17 08:20:26 -07:00
Mircea Ulinic
b3388f7162 Fix #38775 2017-01-17 14:14:54 +00:00
Denys Havrysh
4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq 2017-01-17 15:02:31 +02:00
Anderson Osagie
26d6f699a7 Parse ansible dynamic inventory output correctly 2017-01-17 01:45:26 -05:00
Mike Place
6663107021 Merge pull request #38664 from clinta/x509-passphrase2 
X509 Improvements. Expose setting permissions, encrypted private keys, and combined key and cert management in one state
 2017-01-16 19:20:17 -07:00
Mike Place
aedfbb7a43 Merge pull request #38749 from vutny/pkg-build-better-exception-msg 
pkg build modules throw better exception message if keyid wasn't found
 2017-01-16 19:13:08 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
Nicole Thomas
8466b34e82 Merge pull request #38743 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-16 18:46:00 -07:00
Clint Armstrong
77c78723fe pep8 2017-01-16 13:09:09 -05:00
Joseph Hall
9bbecf7960 Typo fix 2017-01-16 07:47:31 -07:00
Clint Armstrong
a2b20ee518 No mutable default args, remove unneeded import 2017-01-16 08:12:06 -05:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Joseph Hall
436ba28f08 Change getlist back to list (using _list) 2017-01-15 14:52:17 -07:00
Joseph Hall
ff734fe93b Default to CACHE_DIR in syspaths 2017-01-15 14:46:35 -07:00
Joseph Hall
380abd3744 Add cachedir args to tests 2017-01-15 14:46:35 -07:00
Joseph Hall
deb08c0587 Not every module will need cachedir 2017-01-15 14:46:35 -07:00
Joseph Hall
4489f7cac0 Don't force salt.cache to use cachedir from opts 2017-01-15 14:46:35 -07:00
Mike Place
a642cdef79 Merge pull request #38723 from rallytime/fix-38674 
Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py
 2017-01-15 11:36:13 -07:00
Mike Place
bf6d74c98e Merge pull request #38682 from cloudflare/NotImplementedError-MSG 
[2016.11.2/napalm] Better error message when NotImplementedError raised
 2017-01-15 11:34:24 -07:00
Mike Place
df12e49d80 Merge pull request #38695 from rallytime/fix-37996 
Pass in client_args when calling influxdb execution module funcs
 2017-01-15 11:33:47 -07:00
Mike Place
834e5469fc Merge pull request #38651 from rallytime/fix-38521 
Don't lose the set reference for ec2 securitygroup ids
 2017-01-15 11:06:24 -07:00
Denys Havrysh
53f2be5b21 pkg build modules throw better exception message if keyid wasn't found 2017-01-15 20:05:32 +02:00
Mike Place
fc545af10b Merge pull request #38669 from rallytime/update-bootstrap-script 
Update bootstrap script verstion to latest release
 2017-01-15 11:03:26 -07:00