twangboy
|
eb04ed7eef
|
Remove User from c:\salt
|
2017-01-18 17:32:55 -07:00 |
|
Mike Place
|
d5f2d92a4e
|
Merge pull request #38810 from UtahDave/fix_beacon_doc_zd1035
Fix beacon doc
|
2017-01-18 14:37:20 -07:00 |
|
Mike Place
|
88faf08a71
|
Merge pull request #38811 from techhat/sanvm
Show a lot less data when requesting a VM
|
2017-01-18 14:08:02 -07:00 |
|
Joseph Hall
|
47c19325cf
|
Show a lot less data when requesting a VM
|
2017-01-18 12:13:23 -07:00 |
|
David Boucha
|
dbe9edb806
|
fix reactor example.
This version is tested on 2016.11 branch and was found working
ZD 1035
|
2017-01-18 11:46:34 -07:00 |
|
Megan Wilhite
|
a8a6215663
|
refine the os detection in archive test (#38807)
|
2017-01-18 11:03:55 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Mike Place
|
8b38cfea8d
|
Merge pull request #38659 from techhat/issue38216
Turn None into an empty string (for minion matching)
|
2017-01-15 11:02:02 -07:00 |
|
Mike Place
|
0ad5d22ad4
|
Merge pull request #38703 from yhekma/docfix
The `test` option is only valid for the minion, not the master
|
2017-01-15 10:56:22 -07:00 |
|
Mike Place
|
50d417f267
|
Merge pull request #38693 from twangboy/update_jinja
Update jinja2 to 2.9.4
|
2017-01-15 07:40:45 -07:00 |
|
Mike Place
|
8c1222e7db
|
Merge pull request #38718 from terminalmage/zd909
Fix for dynamic git_pillar when pillarenv is used
|
2017-01-15 07:37:30 -07:00 |
|
Mike Place
|
f4233bb18d
|
Merge pull request #38739 from vutny/fix-runtests-doc
DOCS: correct examples of running test suite
|
2017-01-15 07:35:47 -07:00 |
|
Denys Havrysh
|
b872bb63f6
|
DOCS: correct examples of running test suite
|
2017-01-15 11:48:04 +02:00 |
|