valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,671 Commits 24 Branches 182 Tags 341 MiB
05d4d104d2
Commit Graph

5060 Commits

Author SHA1 Message Date
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules 
Add Additional Azure ARM Modules
 2018-03-02 16:49:07 -05:00
Nicole Thomas
d1d966abc7
Merge pull request #46302 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-02 16:27:45 -05:00
Ch3LL
52a68450ae
Update releasecandidate doc for 2018.3.0rc1 2018-03-02 12:02:21 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
rallytime
18eca3da3b
Port 2018.3.0.rst release note changes to develop 2018-03-01 14:24:10 -05:00
Nicole Thomas
1bb4ef6bc8
Merge branch 'develop' into add-additional-azurearm-modules 2018-02-28 14:13:39 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
Denys Havrysh
d702846961
[DOC] Replace note rST block for GitHub 2018-02-27 16:53:39 +02:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05:00
Ch3LL
6ddf3246ce
Add 2017.7.5 Release Notes File 2018-02-26 14:22:20 -05:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
nicholasmhughes
2f984d7260
updated required azure module versions 2018-02-25 12:42:40 -05:00
Nicole Thomas
705caa8cca
Merge pull request #46148 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-02-23 14:21:38 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145 
Back-port #46145 to oxygen.rc1
 2018-02-22 16:57:51 -05:00
Erik Johnson
6a8b1ac33a
Document behavior when orchestration runnner invoked with non-orch states 
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
 2018-02-22 10:49:39 -05:00
rallytime
25deebf7a6
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-02-22 10:22:22 -05:00
Erik Johnson
c77341b544
Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree 2018-02-21 21:56:54 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Erik Johnson
f9301fcc34
Document behavior when orchestration runnner invoked with non-orch states 
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
 2018-02-21 20:36:30 -06:00
Denys Havrysh
d8fb051e44
[DOC] Fix code-blocks for reStructuredText 2018-02-21 15:37:57 +02:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-20 17:43:33 -05:00
Denys Havrysh
2062fd0e5c
[DOC] Put https link to the formulas doc page 2018-02-19 12:59:00 +02:00
Wedge Jarrad
5a0fe104f7 Fix contributing doc typo 2018-02-18 10:57:28 -08:00
Ch3LL
8d0eeeb059
Update 2017.7.4 Release Notes with new fixes 2018-02-16 11:45:49 -05:00
Ch3LL
2a5d855d97
add required arg to dns_check jinja doc example 2018-02-16 10:48:57 -05:00
tjgruber
c56b60a1ec
Broken Fedora cloud image link fixed 
http://fedoraproject.org/en/get-fedora#clouds
is broken. 
New url is: https://alt.fedoraproject.org/cloud/
 2018-02-15 20:27:01 -08:00
Nicole Thomas
ece4452953
Merge pull request #45078 from aphor/macports 
update macports doc, portfile
 2018-02-15 14:17:33 -05:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/cloud/clouds/dimensiondata.py
  - salt/config/__init__.py
  - salt/modules/yumpkg.py
  - salt/pillar/ec2_pillar.py
  - salt/utils/docker/__init__.py
  - salt/utils/vault.py
  - tests/integration/states/test_docker_container.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/utils/test_docker.py
 2018-02-14 16:31:31 -05:00
rallytime
a06645ce71
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.4.rst
  - salt/utils/vault.py
 2018-02-13 13:34:24 -05:00
Ch3LL
ac0baf4b34
Add 2017.7.4 Release Notes with PRs 2018-02-13 11:31:20 -05:00
rallytime
d6c2d0693a
Merge branch 'oxygen.rc1' into 'oxygen' 
No conflicts.
 2018-02-13 10:54:25 -05:00
twangboy
6d223cffa7
Add tip about passing bogus saltenv 2018-02-12 14:03:31 -07:00
twangboy
87dc554dc3
Add final updates to docs 2018-02-12 14:03:30 -07:00
twangboy
3646d5c897
Fix some docs formatting, add some warnings 2018-02-12 14:03:30 -07:00
rjc
c758ed9132
Simplify firewall rules 
As with `firewall-cmd`, use a single rule for ports in both, the `iptables` and `pf` examples. BTW, there's no need for `-m mport` or `-m multiport` (and these might not even be available if not compiled) for `iptables` or using a list or a macro in `pf.conf` if a contiguous range is being used - essentially, use colon ('`:`') for simplicity and consistency.
 2018-02-10 06:28:30 +00:00
rallytime
255cc7ffb0
Merge branch 'oxygen' into 'develop' 
No conflicts.
 2018-02-08 11:24:56 -05:00
rallytime
d80547e0b8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/fileclient.py
  - salt/grains/disks.py
  - salt/modules/cmdmod.py
  - salt/state.py
  - salt/states/file.py
  - salt/utils/gitfs.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_state.py
  - tests/unit/cache/test_localfs.py
 2018-02-08 11:23:31 -05:00
rallytime
e4e4744218
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-08 10:42:37 -05:00
Erik Johnson
b4e24a69e6
Move get_context to salt.utils.stringutils 
This avoids circular dependencies when salt.utils.jinja (which is
imported by salt.utils.templates) needs to use get_context()
 2018-02-07 02:09:56 -06:00
rallytime
f937e8ba81
Add release notes file for 2017.7.4 release 2018-02-06 09:57:22 -05:00
rallytime
104a24f244
Remove extraneous ] in release notes for 2016.11.9 2018-02-05 16:34:19 -05:00
Jasper Lievisse Adriaanse
9f50ee6049
Mention nodegroups in the list of compound matchers 2018-02-02 18:05:01 +01:00
Erik Johnson
2feaaa3efc
Fix invalid Sphinx lexers in docs 
This clears up some warnings when we build the docs, and improves the
syntax highlighting in the docs.
 2018-02-02 09:21:07 -06:00
rallytime
502f031f60
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2018-01-29 09:37:19 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
 2018-01-26 17:27:03 -05:00
rallytime
cbf1ed2f97
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/modules/cmdmod.py
 2018-01-26 16:28:01 -05:00
Nicole Thomas
6b4950857c
Merge pull request #45187 from nicholasmhughes/add-azurearm-govcloud-support 
Azure (ARM): Fix GovCloud Support
 2018-01-26 11:35:10 -05:00
rallytime
f10c7ee92d
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-26 09:59:21 -05:00
Ch3LL
84c8216901
Add PRs to 2017.7.3 Release Notes 2018-01-25 15:51:34 -05:00