Colton Myers
|
17b919e9ec
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/eauth/access_control.rst
salt/modules/state.py
salt/state.py
salt/states/boto_secgroup.py
tests/unit/modules/state_test.py
|
2016-01-07 16:36:40 -07:00 |
|
Jacob Hammons
|
0d2111d397
|
Assorted doc bug fixes
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
|
2016-01-07 14:08:30 -07:00 |
|
Dmitry Kuzmenko
|
7a5204ef02
|
Deprecate client_acl with publisher_acl (rename)
Keeping client_acl support
|
2015-10-23 11:59:40 +03:00 |
|
Thomas Jackson
|
498a612078
|
Whitespace cleanup
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
|
2014-12-11 07:53:19 -08:00 |
|
Gary Wilson Jr
|
bd499e5640
|
Fixed several minor misspellings and acronym capitalizations.
|
2013-03-18 16:42:57 -05:00 |
|
John Albietz
|
2e9cdc8f7e
|
typo fix. added example of unrestricted access.
|
2013-02-18 14:13:02 -08:00 |
|
Seth House
|
5b0abf59eb
|
Added / updated targets for the acl and eauth docs
|
2012-11-16 11:21:51 -07:00 |
|
Thomas S Hatch
|
e8870573a2
|
mod_watch needs to always return a state dict, Fix #2233
|
2012-10-12 12:45:49 -06:00 |
|
Thomas S Hatch
|
de59231013
|
Initial eauth docs
|
2012-10-09 19:02:59 -06:00 |
|