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
75,759 Commits 24 Branches 182 Tags 341 MiB
07c66f3ff8
Commit Graph

1974 Commits

Author SHA1 Message Date
Mircea Ulinic
07c66f3ff8
Table outputter doc 2016-11-15 16:29:30 +00:00
Mike Place
b049ad6ead Merge pull request #37658 from sjorge/develop-zoneadm 
Want a zoneadm module
 2016-11-12 20:32:05 +00:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
Super-User
2684319213 introduce zoneadm module, implements list 2016-11-05 13:19:36 +01:00
Mike Place
d86ec7372f Merge pull request #37374 from cloudflare/NAPALM-USERS-MODULE 
New execution module: napalm_users
 2016-11-04 18:00:46 +13:00
Mircea Ulinic
8e087c9596
napalm_users doc 2016-11-03 11:23:41 +00:00
Mircea Ulinic
0590c9142f
Doc for exec mod napalm_users 2016-11-03 10:35:37 +00:00
Mike Place
107fd322a6 Merge pull request #37373 from cloudflare/NAPALM-SNMP-STATE 
Napalm snmp state
 2016-11-03 12:13:33 +13:00
Mircea Ulinic
877ed8f1d5
Small typos 2016-11-02 12:01:19 +00:00
Mircea Ulinic
78cf63d0ef
Doc for the napalm snmp mod 2016-11-02 12:01:15 +00:00
Mircea Ulinic
13086c580b
Doc for napalm_route 2016-11-01 14:56:23 +00:00
Mircea Ulinic
626790f7da
Include doc 2016-11-01 13:40:59 +00:00
Benedikt Werner
b641d75235 Added suse_apache and sensehat to doc index and fixed doc formating 2016-10-30 20:41:37 +01:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Mike Place
4d603894d0 Merge pull request #37164 from sjorge/pdbedit 
module and state for pdbedit
 2016-10-24 12:03:48 +09:00
Super-User
5c943ddeae generate docs for pdbedit state 2016-10-22 10:14:30 +00:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/installation/windows.rst
 2016-10-21 15:19:16 -06:00
Super-User
052f069cab enable doc generation for pdbedit 2016-10-21 18:27:36 +00:00
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -06:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-17 09:06:12 -06:00
Daniel Wallace
2a4c9ac4f3 document master_type disable (#37014) 2016-10-14 12:24:12 -06:00
Thomas S Hatch
8e714dbaba Merge pull request #36982 from gtmanfred/webhook 
[RFC] add webhook engine
 2016-10-14 10:16:52 -06:00
Daniel Wallace
daf474a6eb add webhook engine 2016-10-14 11:08:05 -05:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 09:58:18 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/cli/index.rst
 2016-10-12 12:36:00 -06:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Őry, Máté
7d9fdfd0fe doc: document what the argument of salt --subset means (#36943) 2016-10-12 09:46:31 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
Nicole Thomas
7838d8d3f9 Remove "Targeting with Executions" section from docs (#36925) 
This feature was removed long ago and is no longer under development.

Fixes #36906
 2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873) 
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
 2016-10-11 10:33:40 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Jorge Schrauwen
ee9eb7c413 rbac_solaris should be included in the docs (#36859) 
* rbac_solaris - want module docs

* rbac_solaris - want state docs
 2016-10-08 07:54:26 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727 
Merge forward carbon to develop
 2016-10-05 23:57:23 +09:00
Mike Place
aa7bfb422c Merge pull request #36578 from lomeroe/add_states_retry_option 
add global 'retry' option to state processing
 2016-10-05 22:47:57 +09:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
 2016-09-30 16:10:33 -06:00