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 |
|