valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,975 Commits 24 Branches 182 Tags 341 MiB
ae201823c1
Commit Graph

1628 Commits

Author SHA1 Message Date
rallytime
ae201823c1
Deprecate 'master_shuffle' in favor of 'random_master' 2018-07-12 13:43:06 -04:00
Eugene Davis
722e5a3d86 Update fluorine release notes with state module change 2018-07-10 17:48:45 +02:00
rallytime
b55aa5b946
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-07-03 16:07:46 -04:00
Ch3LL
ef288f2a74
[2018.3] Remove In Progress Warning on 2017.7.7 2018-07-03 09:32:34 -04:00
Nicole Thomas
5b38019ca0
Merge pull request #48339 from terminalmage/backport-tojson-filter 
Backport tojson filter from #48309 to 2018.3
 2018-07-02 13:52:52 -04:00
Ch3LL
0cfd233c0e
[develop] Remove In Progress Warning on 2017.7.7 2018-07-02 10:23:42 -04:00
rallytime
bf6c788350
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/utils/thin.py
 2018-06-30 09:48:06 -04:00
Nicole Thomas
fdd1f24567
Merge pull request #48309 from terminalmage/fix-yaml-hacks 
Drop support for Python 2 unicode string literals in YAML renderer
 2018-06-30 09:07:55 -04:00
Nicole Thomas
fbbafc8de4
Merge pull request #48300 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-30 08:58:27 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -04:00
Erik Johnson
4433bec891
Add release notes for tojson jinja filter 2018-06-27 12:36:30 -05:00
Erik Johnson
267544fd3e
Tweak release notes to reflect new jinja filter being backported 2018-06-27 12:26:35 -05:00
Erik Johnson
baf49d709d
Add release notes about json_encode_dict/json_encode_list deprecations 2018-06-27 10:29:31 -05:00
Erik Johnson
458b45b9e6
Minor clarification 2018-06-27 10:29:31 -05:00
Erik Johnson
7f473e6fde
Fix RST link syntax 2018-06-27 10:29:31 -05:00
Erik Johnson
b34f56b27b
Document change to YAML loader behavior in Fluorine release notes 2018-06-27 10:29:30 -05:00
Ch3LL
962cb143bc
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:09:30 -04:00
Ch3LL
dfce1ad5ed
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:04:11 -04:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
67cb5563ef
Merge pull request #48252 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-22 11:13:41 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py
 2018-06-21 14:22:15 -04:00
rallytime
19c104b6cd
Update release notes for 2018.3.2 2018-06-21 13:03:39 -04:00
rallytime
36032c8ee7
Update release notes for 2017.7.7 2018-06-21 13:02:25 -04:00
Max Arnold
00798a9e33 Fix quite common Exception typos 2018-06-21 14:22:44 +07:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3' 2018-06-19 14:56:06 -04:00
Erik Johnson
44c275698a
Actually it's more than just add/remove that updates the mine 2018-06-17 21:16:09 -05:00
Erik Johnson
0cb6996b07
Add release notes mention of docker.update_mine config option 2018-06-17 21:11:05 -05:00
rallytime
f23207002d
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/unit/beacons/test_btmp_beacon.py
  - tests/unit/beacons/test_wtmp_beacon.py
  - tests/unit/grains/test_core.py
 2018-06-15 17:00:59 -04:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Nicole Thomas
e1e566d1f8
Merge pull request #48135 from rallytime/release-notes-2017.7 
Update the 2017.7.7 and 2017.7.8 release notes
 2018-06-14 17:22:06 -04:00
Erik Johnson
7f53d5a68e
Improve module environment docs 2018-06-14 13:46:32 -05:00
Bo Maryniuk
d1abcf2322
Update the documentation 2018-06-14 13:45:23 -05:00
Bo Maryniuk
ef96da833b
Add documentation for the configurable module environment 2018-06-14 13:45:23 -05:00
rallytime
7a97f157b3
Add missing v for tag reference 2018-06-14 12:10:18 -04:00
rallytime
2f2b69ed37
Add "in progress" notation to 2017.7.7 release notes 2018-06-14 12:08:47 -04:00
rallytime
06a1151a63
Add release notes file for 2017.7.7 2018-06-14 12:06:04 -04:00
rallytime
885b2862ce
Move 2017.7.7 release notes to 2017.7.8 2018-06-14 12:05:37 -04:00
rallytime
afe1e91972
Add "in progress" notation to 2018.3.2 release notes 2018-06-14 10:55:44 -04:00
rallytime
3e4272ac09
Add release notes for 2018.3.2 2018-06-14 10:53:40 -04:00
rallytime
88c584cb0d
Move 2018.3.2 release notes to 2018.3.3 2018-06-14 10:53:07 -04:00
rallytime
0fcf4c54d1
Add no_proxy option to cont/minion docs and Fluorine release notes 
Also cleans up a couple of items based on the feedback in #43764
 2018-06-13 15:49:00 -04:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
 2018-06-13 15:04:55 -04:00
rallytime
843171f5e3
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:55:33 -04:00
rallytime
f3c9381d16
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:55:25 -04:00
rallytime
fad6a0991e
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:53:08 -04:00
rallytime
a3b3b0a0e1
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:52:12 -04:00
rallytime
1b8d1c936b
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:49:47 -04:00
Erik Johnson
20f71ff6f6
Fix link without target in 2018.3.0 release notes 2018-06-11 12:01:34 -05:00
Rares POP
3e0547b135 Add fluorine release notes for salt-api 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 18:04:58 +03:00