valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,019 Commits 24 Branches 182 Tags 341 MiB
4fcc9277dd
Commit Graph

8927 Commits

Author SHA1 Message Date
Nicole Thomas
a8ca8f71ba
Merge pull request #50512 from Ch3LL/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-11-15 09:38:42 -05:00
Erik Johnson
1d39f88301
Make fluorine docs use the latest available release for download links 2018-11-14 12:45:05 -06:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
 2018-11-14 12:38:16 -05:00
Erik Johnson
ae96e29032
Fix docs configuration for renamed logstash engine 2018-11-13 19:05:29 -06:00
Erik Johnson
06be9d2896
Disable custom sphinx automodule 
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
 2018-11-13 14:53:13 -06:00
Erik Johnson
ee835b10bc
Fix fluorine docs build warnings 2018-11-13 11:10:11 -06:00
Erik Johnson
9754791db6
Fix header underline length to avoid another sphinx warning 2018-11-13 10:19:33 -06:00
Erik Johnson
cb256418a9
Fix header underline length to avoid another sphinx warning 2018-11-13 10:18:47 -06:00
Erik Johnson
d6e1ee47c1
Fix more sphinx build errors 2018-11-13 10:17:55 -06:00
Erik Johnson
7c298b27b0
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 10:17:37 -06:00
Erik Johnson
9272f7b735
Fix more sphinx build errors 2018-11-13 09:56:42 -06:00
Erik Johnson
d4571328ed
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 08:47:12 -06:00
rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/support/case.py
 2018-11-12 16:11:17 -05:00
Nicole Thomas
c85561ee56
Merge pull request #50442 from rallytime/replace-docbanner 
Update docbanner hyperlink
 2018-11-08 17:10:32 -05:00
rallytime
193325d58a
Update docbanner hyperlink 2018-11-08 17:05:13 -05:00
Nicole Thomas
72005688e5
Merge pull request #50439 from rallytime/bootstrap-contributing-docs 
Add bootstrap section to contributing docs
 2018-11-08 16:53:08 -05:00
rallytime
2af92bd647
Update SaltConf doc banner 2018-11-08 16:42:29 -05:00
rallytime
d2158aa0fa
Add bootstrap section to contributing docs 
Fixes #34089
 2018-11-08 16:03:19 -05:00
rallytime
b86ad94fb1
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
 2018-11-08 10:44:10 -05:00
rallytime
e993692d01
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - tests/integration/cli/test_batch.py
 2018-11-05 12:54:30 -05:00
rallytime
0621f7dd2e
Add a few more feature release codenames to the version_numbers doc 2018-11-02 12:15:53 -04:00
rallytime
533cc617ad
Extend deprecation warning for enable_legacy_startup_events to Sodium 
This deprecation warning only went in recently and is new in Salt "Fluorine".
We need 2 full feature releases for deprecation warnings and "Neon" would
have only been 1 feature release cycle.
 2018-11-01 16:46:07 -04:00
rallytime
3f2712fbc1
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/unit/states/test_virt.py
  - tests/unit/test_config.py
 2018-10-29 12:36:28 -04:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050 
Backport runtests.py modifications from develop to 2018.3
 2018-10-29 12:25:06 -04:00
Ch3LL
f83460da62
change order of search engine ids 2018-10-25 16:47:46 -04:00
Ch3LL
bf3f21721e
Update search engine IDs for releases 2018-10-25 16:47:41 -04:00
rallytime
d8e5e9ea49
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-25 16:16:10 -04:00
Ch3LL
3452d9bf01
change order of search engine ids 2018-10-25 16:11:35 -04:00
Ch3LL
c9546dfb08
Update search engine IDs for releases 2018-10-25 16:10:15 -04:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-24 15:54:15 -04:00
Nicole Thomas
88673ad9e7
Merge pull request #50208 from Ch3LL/2update_version_doc_2018.3 
Update release versions for the 2018.3 branch
 2018-10-24 11:52:18 -04:00
Nicole Thomas
85e22d2f25
Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7 
Update release versions for the 2017.7 branch
 2018-10-24 11:51:12 -04:00
Ch3LL
896caa120f
Add 2016.11.10 release notes to 2018.3 branch 2018-10-24 11:08:38 -04:00
Ch3LL
cdbf493400
Add 2017.7.8 previous release 2018-10-24 10:39:04 -04:00
Ch3LL
198d25ca1d
Add 2017.7.8 previous release 2018-10-24 10:38:37 -04:00
Ch3LL
6f775e748a
Update release versions for the 2018.3 branch 2018-10-24 10:34:26 -04:00
Ch3LL
d4e26aceda
Update release versions for the 2017.7 branch 2018-10-24 10:34:24 -04:00
Ch3LL
1e3415860f
[2018.3.3] remove in progress and add security details 2018-10-24 10:31:16 -04:00
Ch3LL
71ee68b6f1
[2017.7.8] remove in progress and add security details 2018-10-24 10:27:39 -04:00
Erik Johnson
5ea1024b5d
Add documentation explaining naming convention for test files 2018-10-23 14:51:28 -05:00
Max Arnold
881a521586 Revert curly braces example for nested dictionaries 2018-10-23 23:25:08 +07:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Nicole Thomas
aa66d1b7ba
Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial 
[DOC] Fix JSON payload example in HTTP tutorial
 2018-10-22 14:37:51 -04:00
Denys Havrysh
fe2d70d4a3
[DOC] Fix JSON payload example in HTTP tutorial 2018-10-22 18:57:04 +03:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
Mike Place
bfce09c2fe
Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results 
Fix value of `virtual` grain when using `virt-what`
 2018-10-19 07:27:42 -06:00
Elias Probst
08b1b17465
Add release notes for virtual grain fix 2018-10-19 01:03:25 +02:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Mike Place
f7f8cb533f
Merge pull request #50094 from rallytime/doc-errs 
Fix varstack_top naming in docs
 2018-10-18 12:49:24 +02:00