Paul Miller
c973988d8d
forgot about the linter pass … fixed
2017-05-31 09:06:59 -04:00
Paul Miller
da0d9e4045
Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc.
2017-05-31 08:10:54 -04:00
Andreas Tsaridas
21a29dea5f
minor fix
2017-05-31 13:36:43 +02:00
Andreas Tsaridas
b500fe4dd4
changes requested
2017-05-31 12:40:54 +02:00
Tomas Zvala
916fecb64f
modify ssh_test.py, to check empty lines and comments in authorized_keys #41335
2017-05-31 10:56:02 +02:00
plastikos
518e1d775d
Merge branch 'develop' into bug-denied_key_exit_status
2017-05-31 00:55:59 -06:00
Raymond Kuiper
83a609dc54
Merge branch 'develop' into develop
2017-05-31 07:59:33 +02:00
Raymond Kuiper
2497775170
Removed newline
2017-05-31 07:59:17 +02:00
twangboy
1909e39044
Fix makedirs_ function
...
- Call to mkdir was using the wrong variable
- Added error handling, raise erros on failure
2017-05-30 20:47:54 -06:00
Nicole Thomas
adaeda4d10
Merge branch 'develop' into patch-1
2017-05-30 18:52:41 -06:00
Nicole Thomas
8849884307
Merge pull request #41496 from cloudflare/net-finder-fix
...
Various fixes for the net runner
2017-05-30 18:50:07 -06:00
Nicole Thomas
30ad4fd9a0
Merge pull request #41506 from gtmanfred/2016.11
...
check for integer types
2017-05-30 18:48:21 -06:00
rallytime
29702a3397
Fix the EC2 salt-cloud driver to work with Python 3
...
Fixes #41410
2017-05-30 18:31:17 -06:00
twangboy
fd88bb277f
Remove unused imports (lint)
2017-05-30 16:02:38 -06:00
twangboy
41a39dff00
Use psutil where possible
2017-05-30 15:51:55 -06:00
Mike Place
f1f42e011b
Merge pull request #41501 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-05-30 16:02:38 -05:00
Daniel Wallace
5fe2e9bbf5
check for integer types
...
This will check for int and long in py2 and int in py3
2017-05-30 14:14:54 -06:00
Mike Place
50993f8c6d
Merge branch 'develop' into patch-1
2017-05-30 13:58:06 -05:00
Mike Place
713a671f09
Merge pull request #41471 from terminalmage/blockreplace-test
...
Fix a file.blockreplace test for Python 3
2017-05-30 13:48:22 -05:00
Mike Place
5b2579eb3f
Merge branch 'develop' into bug-denied_key_exit_status
2017-05-30 13:46:21 -05:00
Mike Place
06ef17dec3
Merge pull request #41469 from Ch3LL/fix_redis_error
...
Fix keep_jobs keyerror in redis returner
2017-05-30 13:37:42 -05:00
Mike Place
7a09b2b678
Merge pull request #41473 from twangboy/fix_win_firewall
...
Fix win_firewall execution and state modules
2017-05-30 13:35:23 -05:00
Mike Place
74a732f378
Merge branch 'develop' into develop
2017-05-30 13:32:34 -05:00
Mike Place
ef9e89441f
Merge branch 'develop' into develop
2017-05-30 13:21:03 -05:00
Mike Place
e6587df123
Merge pull request #41486 from Lex-Persona/add-glassfish-sysprops
...
Add glassfish sysprops
2017-05-30 13:17:05 -05:00
Nicole Thomas
55d5e6c6fe
Merge pull request #41500 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-30 12:06:35 -06:00
Nicole Thomas
f635cb11c4
Merge pull request #41499 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-30 12:06:02 -06:00
Mike Place
26c3441c57
Merge branch 'develop' into merge-develop
2017-05-30 12:56:25 -05:00
Mike Place
21a1b41a42
Merge pull request #41502 from whiteinge/epub-tocdup
...
Add epub_tocdup to conf file
2017-05-30 12:44:19 -05:00
rallytime
8c1dc36a8b
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- salt/modules/zypper.py
- salt/utils/parsers.py
2017-05-30 10:20:44 -06:00
Seth House
ebefecea33
Add epub_tocdup to conf file
...
http://www.sphinx-doc.org/en/stable/config.html#confval-epub_tocdup
2017-05-30 10:17:52 -06:00
rallytime
675937e0ab
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- tests/unit/states/test_keystone.py
2017-05-30 10:16:14 -06:00
rallytime
20d893d397
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-05-30 10:14:44 -06:00
Nicole Thomas
cbbe1c7c7b
Merge pull request #41440 from ecdavis/postgres_schema-respect-opts-test
...
postgres_schema: Add support for __opts__['test'] to present and absent states.
2017-05-30 10:12:35 -06:00
Nicole Thomas
6d2ae48c6e
Merge pull request #41488 from arthtux/develop
...
Change typo default_passwoord by default_password
2017-05-30 10:09:21 -06:00
Mike Place
7cd029c9ed
Merge pull request #41142 from FedericoCeratto/mysql_cache
...
Implement MySQL-based minion data cache
2017-05-30 10:59:32 -05:00
Mike Place
4b160ab3df
Merge pull request #41419 from terminalmage/issue39986
...
Add --no-parse CLI option to salt, salt-call, salt-run, and salt-ssh
2017-05-30 10:55:54 -05:00
Raymond Kuiper
bb46af9f78
Added Zabbix usermacro state modules
2017-05-30 17:12:11 +02:00
Nicole Thomas
f7411393e4
Merge pull request #41495 from isbm/bp-41405
...
Takeover from "rallytime:bp-41405"
2017-05-30 09:11:43 -06:00
Mike Place
660ccbdb4f
Merge pull request #41141 from FedericoCeratto/etcd_cache
...
Implement etcd based minion data cache
2017-05-30 10:01:44 -05:00
Mircea Ulinic
418c5c2624
More documentation improvements
2017-05-30 12:17:37 +00:00
Mircea Ulinic
e0f8537bfe
Runners doc cross-reference
2017-05-30 12:15:51 +00:00
Mircea Ulinic
53a90c8842
Complete neighbors function doc ref
2017-05-30 12:12:48 +00:00
Mircea Ulinic
c21f701f37
tgt instead of target and tgt_type instead of expr_form
2017-05-30 12:09:58 +00:00
Mircea Ulinic
6008d2d010
Add VRF optional field
2017-05-30 12:06:07 +00:00
Raymond Kuiper
cfc712383d
added usermacro functions to the zabbix execution module
2017-05-30 13:52:03 +02:00
Mircea Ulinic
21c2b8b269
Various fixes for the net runner
...
Mostly documentation fixes, for better display
under the Salt docs.
Fix: the net.interfaces function couldn't be called
directly from the CLI due to a bug with the ipnet argument.
2017-05-30 11:47:33 +00:00
Mircea Ulinic
488a3b48a5
Enhance BGP runner
...
Insert interface_name and interface_description options.
Reuses the functionality from the net.interfaces runner
and matches the neighbor IP to determine the network interface
and return the interface description & interface name fields.
This field is not enable by default, as the users require to configure
few other mines, as documented in the net runner.
In the master configuration opts, they need to append the additional
interface_description and/or interface_name options under `return_fields`.
2017-05-30 11:40:09 +00:00
Bo Maryniuk
50ccc31cf6
Add missing import of fnmatch (lintfix)
2017-05-30 13:28:05 +02:00
José Rodrigues
332a07ea64
Update ps beacon documentation and behaviour
2017-05-30 11:52:01 +02:00
