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
82,584 Commits 24 Branches 182 Tags 341 MiB
e92b110a1c
Commit Graph

4522 Commits

Author SHA1 Message Date
rajvidhimar
e92b110a1c Junos specific documentation for topic Network Automation 2017-06-05 16:03:30 +05:30
Ric Klaren
aa88749a71 Add flag to disable validation when cloning a libvirt domain 
Provide workaround for issue #41137
 2017-06-01 23:14:15 +02: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
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net 
Remove ex_subnetwork requirement for GCE
 2017-05-26 17:04:06 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
 2017-05-23 09:05:13 -06:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token 
rest_cherrypy CORS fix & /token endpoint
 2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return 
Add full_return to release notes
 2017-05-22 10:56:14 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release 
Add 2016.11.6 Release Notes
 2017-05-19 13:05:08 -05:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc 
Executors redesign and documentation
 2017-05-18 10:42:20 -05:00
Mike Place
1c3741eae1 Merge pull request #41284 from shengis/azurerm_load_balancers 
Add support for load balancers with AzureARM provider
 2017-05-17 13:24:58 -05:00
Aurélien FUSIL-DELAHAYE
f7252151a1 Add support for availibility_set 
documentation added
 2017-05-17 11:50:31 +02:00
Aurelien Fusil-Delahaye
495e848dad Documentation for load-balancer 2017-05-16 23:22:40 +02:00
Dmitry Kuzmenko
7a8b644da7 Executors documentation. 2017-05-15 11:41:00 +03:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
Mike Place
8028b9f00f Merge pull request #41182 from amendlik/win-authtest 
Saltify credendial verification for Windows
 2017-05-12 12:05:07 -05:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup 
Update fingerprint hash type default from md5 to sha256
 2017-05-12 11:13:18 -05:00
Mike Place
8dab7390e6 Merge pull request #41201 from rallytime/remove-blockdev-module 
Remove blockdev execution module
 2017-05-12 11:09:21 -05:00
rallytime
d510583bb5 Remove blockdev execution module 
All of the functions in the blockdev execution module have been
moved over to the disk execution module. These functions were
slated for removal in the Oxygen release.
 2017-05-11 14:13:42 -06:00
rallytime
e1bd7ce10a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-11 13:03:59 -06:00
Nicole Thomas
5cfaa908aa Bump code block example in 4 spaces 
This allows the code-block to be rendered correctly when the docs build.
 2017-05-11 10:28:10 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
Peter C. Norton
3b50059992 Change docs to match what I see in the code 2017-05-10 19:13:08 -04:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist 
Rename the *_env_blacklist config opts to *_saltenv_blacklist
 2017-05-10 14:03:23 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Adam Mendlik
a0d08ed13f Allow saltify cloud provider to verify Windows credentials 2017-05-10 11:58:55 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-09 14:23:28 -06:00
Mike Place
6fa41dc89d Merge pull request #41111 from terminalmage/issue41105 
Allow "ssl_verify: False" to work with pygit2
 2017-05-09 11:56:11 -06:00
rallytime
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -06:00