Mike Place
|
b3f2410fe9
|
Docs
|
2016-08-23 18:12:09 +09:00 |
|
rallytime
|
86b7c71e09
|
Merge branch '2016.3' into 'develop'
Conflicts:
- salt/modules/glusterfs.py
- salt/states/pkg.py
|
2016-07-07 13:37:58 -06:00 |
|
rallytime
|
2b307b7ea1
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/states/file.py
- tests/unit/states/file_test.py
|
2016-07-06 09:12:25 -06:00 |
|
C. R. Oldham
|
0a264597ca
|
Forgot reference to inotify (#34455)
|
2016-07-05 12:32:49 -04:00 |
|
yobo
|
1e11c2dd9e
|
Fix typo
Fix the typo ect->etc。
|
2016-05-06 14:48:16 +08:00 |
|
rallytime
|
9adc2facb2
|
Merge branch '2015.8' into '2016.3'
No conflicts.
|
2016-03-28 10:57:25 -06:00 |
|
Mike Place
|
104ada5b6f
|
Fix beacon tutorial docs
Closes #31944
|
2016-03-25 16:31:39 -06:00 |
|
Denys Havrysh
|
aebc48163d
|
Remove trailing white spaces in documentation files
|
2016-03-01 17:36:23 +02:00 |
|
rallytime
|
3b74d123af
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/modules/selinux.py
- salt/modules/zypper.py
- salt/pillar/__init__.py
- salt/states/dockerng.py
- tests/runtests.py
|
2016-02-25 12:36:22 -07:00 |
|
Jacob Hammons
|
a72dc15720
|
Assorted doc issues
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
|
2016-02-24 16:56:52 -07:00 |
|
Jacob Hammons
|
b192a9ba38
|
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
2016-01-31 20:10:02 -07:00 |
|
Mike Place
|
04585a2878
|
Documentation for disable_during_state_run
|
2015-11-02 11:00:33 -05:00 |
|
Mike Place
|
0188a9ba4f
|
Documentation for disable_during_state_run
|
2015-10-26 12:22:33 -06:00 |
|
Colton Myers
|
274464a85b
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
|
2015-09-14 14:39:03 -06:00 |
|
Jacob Hammons
|
e475ea688e
|
Fixed typo
|
2015-09-09 13:41:48 -06:00 |
|
Jacob Hammons
|
2401533d9e
|
New content added to beacon docs.
|
2015-09-09 11:16:55 -06:00 |
|
Colton Myers
|
1d77ae9072
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
salt/cloud/clouds/ec2.py
salt/modules/hipchat.py
salt/modules/random_org.py
salt/modules/serverdensity_device.py
salt/modules/slack_notify.py
salt/returners/__init__.py
salt/states/iptables.py
|
2015-05-11 11:38:03 -06:00 |
|
David Boucha
|
5504778adf
|
update to proper examples
|
2015-05-07 18:08:05 +00:00 |
|
Mike Place
|
ef942ce3c8
|
Document becaon intervals
|
2015-03-27 16:38:36 -06:00 |
|
Thomas S Hatch
|
dc691ae3f4
|
Add return data example
|
2015-03-09 14:33:12 -06:00 |
|
Thomas S Hatch
|
bf201865d0
|
MOAR beacons docs
|
2015-03-09 14:10:06 -06:00 |
|
Mike Place
|
7cb5500610
|
Document becaon intervals
|
2015-02-26 18:00:12 -07:00 |
|
Seth House
|
8e476bc455
|
Fixed typos in the beacon docs
|
2015-01-26 18:20:54 -07:00 |
|
Seth House
|
b777d3cba1
|
Added unique identifier for the beacon docs
|
2015-01-26 18:19:34 -07:00 |
|
Seth House
|
127ddb6d9c
|
Added cross-references to the inotify beacon module
|
2015-01-26 18:19:34 -07:00 |
|
Thomas S Hatch
|
54529a9aa2
|
Add initial documentation
|
2015-01-23 23:11:34 -07:00 |
|