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
79,435 Commits 24 Branches 182 Tags 341 MiB
bdd18d874d
Commit Graph

7036 Commits

Author SHA1 Message Date
Walter Goulet
bdd18d874d Added support for generating key based on configured policy and to use updated flattened APIs 2017-03-21 09:47:28 -06:00
Joseph Hall
55adc635b9 Remove obvious depends from the docs 2017-03-15 14:51:48 -06:00
Joseph Hall
be33cd8146 Add Venafi support 2017-03-15 14:50:07 -06:00
rallytime
4b0bdc9ce0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/s3.py
 2017-03-14 15:39:51 -06:00
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon 
Telegram beacon
 2017-03-14 13:30:37 -06:00
Joseph Hall
dde48b3650 Add event_filter to salt cloud 2017-03-13 15:36:13 -06:00
Mike Place
af242e1c51 Merge pull request #39864 from rallytime/remove-26-requirements 
Remove the dev_python26.txt install file
 2017-03-10 20:51:24 -07:00
Mike Place
4d5adadebd Merge pull request #39966 from techhat/armcache 
Update Azure ARM cache
 2017-03-10 20:35:04 -07:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Joseph Hall
44bb43825a Update Azure ARM cache 2017-03-10 14:15:12 -07:00
Mike Place
935652cb24 Merge pull request #39923 from cloudflare/capirca-module 
New execution module: Capirca
 2017-03-10 12:25:29 -07:00
Mike Place
6350b07384 Merge pull request #39952 from vutny/doc-faq-minion-upgrade-restart 
Fix #7997: describe how to upgrade Salt Minion in a proper way
 2017-03-10 11:41:56 -07:00
Mike Place
dc7d4f4224 Merge pull request #39935 from cro/namespace_proxy_cfg 
Add special token to insert the minion id into the default_include path
 2017-03-10 10:51:54 -07:00
Denys Havrysh
d989d749d6 Fix #7997: describe how to upgrade Salt Minion in a proper way 2017-03-10 16:17:19 +02:00
Mike Place
eca9844cca Merge pull request #39926 from cloudflare/netacl-module 
New execution module: netacl (napalm_acl)
 2017-03-09 17:31:34 -07:00
Mike Place
27f1fffd33 Merge pull request #39927 from cloudflare/netacl-state 
Netacl state
 2017-03-09 17:29:26 -07:00
rallytime
c8b5d390b5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-09 16:05:15 -07:00
C. R. Oldham
e4aef54c73 Add special token to insert the minion id into the default_include path 2017-03-09 15:31:16 -07:00
Mike Place
bdbb1f814e Merge pull request #39928 from jmickle/develop 
updating documentation for librato returner
 2017-03-09 12:46:56 -07:00
Jonathan Mickle
6b52e5a0b9 updating documentation for librato returner 2017-03-09 10:04:46 -08:00
Mircea Ulinic
fa7a6ff19b Add autodoc for netacl state 2017-03-09 17:09:27 +00:00
Mircea Ulinic
cf535d744e Add autodoc for netacl 2017-03-09 16:54:36 +00:00
David Murphy
5077c989bb Updated changes file for added AIX support 2017-03-09 09:38:35 -07:00
Mircea Ulinic
d7dbc05caa Include Capirca autodoc 2017-03-09 16:34:20 +00:00
Ronald van Zantvoort
170cbadc54 CIDR matching supports IPv6, update docs 
After #22080 IPv6 CIDR matching is supported & functional, docs should('ve) reflected that since 2015.8
 2017-03-09 13:52:13 +01:00
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07:00
Joseph Hall
35440c5936 Add installation tips for azure 2017-03-07 12:12:56 -07:00
Joseph Hall
2a1ae0bf2e Change example master in azure docs 2017-03-07 10:01:09 -07:00
Mike Place
da164bfc22 Minor grammar cleanup 2017-03-07 08:51:29 -07:00
Ronald van Zantvoort
7cd3ac4e78 Cache roster: add release notes 2017-03-07 12:10:34 +01:00
rallytime
2193cee012 Remove the dev_python26.txt install file 
Since we're moving to support Python 2.7 and 3.4 in Nitrogen,
we shouldn't need the 2.6 requirements file any longer.

Also updates the doc instructions to use the dev_python34 file
instead of dev_python26, depending on your Python version.
 2017-03-06 23:02:17 -07:00
Nicole Thomas
76adf65880 Merge pull request #39853 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-06 11:44:38 -07:00
rallytime
a3fe63f972 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-06 09:12:01 -07:00
Rafael Caricio
88589fb1f6 Add documentation for the Telegram bot 2017-03-05 16:09:47 +01:00
Mike Place
4002dc1947 Merge pull request #39819 from terminalmage/top-file-matching-docs 
Improve the Top File matching docs
 2017-03-04 09:06:39 -07:00
Jan Kadlec
804b12048c Add missing apostrophe 2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs 
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
 2017-03-03 10:40:22 -06:00
Mike Place
e48036a05d Merge pull request #39773 from twangboy/win_file_dacl 
Make win_file use the win_dacl salt util
 2017-03-02 09:24:50 -07:00
Mike Place
2d711782e8 Merge pull request #39736 from techhat/spmstates 
Add pre and post states to SPM
 2017-03-01 19:57:41 -07:00
twangboy
7ef41155c0 Make win_file use the win_dacl salt util 2017-03-01 17:57:23 -07:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -07:00
Mike Place
2484e52716 Merge pull request #39743 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-01 11:46:47 -07:00
Joseph Hall
255db60f5a Add pre and post states to SPM 2017-03-01 10:40:30 -07:00
Mike Place
4fc0451d64 Merge pull request #39702 from techhat/spmfiles 
Add files section to FORMULA files
 2017-03-01 10:18:30 -07:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
rallytime
452822f5f7 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-28 17:14:40 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
Nicole Thomas
7b4865c058 Merge pull request #39729 from rallytime/update-release-ver-2016.11 
[2016.11] Bump latest release version to 2016.11.3
 2017-02-28 11:08:25 -07:00