Colton Myers c12f05f83a Merge branch '2014.7' into develop ... Conflicts: salt/modules/aptpkg.py salt/modules/tls.py salt/states/boto_asg.py salt/states/boto_secgroup.py		2014-08-29 16:27:00 -06:00
..
auth/all	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00
cli	Change --list-profiles to accept an argument such as "linode" or "all"	2014-08-26 08:03:39 -06:00
clients	Renamed call_func to cmd for consistency; made compat alias	2014-07-24 16:08:30 -06:00
clouds/all	Add aliyun to toctree	2014-06-09 11:04:31 -05:00
configuration	Merge branch '2014.7' into develop	2014-08-29 16:27:00 -06:00
file_server	Added link target for the module sync system	2014-06-09 19:31:38 -06:00
internals	Remove reference to nonexistant page	2014-06-09 11:06:06 -05:00
modules	Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state	2014-08-25 13:37:47 -06:00
netapi/all	Seperate saltnado_websockets from the rest of the implementation.	2014-06-20 15:10:56 -07:00
output/all	Add newline_values_only outputter to toctree	2014-08-07 19:25:03 -05:00
pillar	Added generated new module docs	2014-07-24 15:56:19 -06:00
renderers	remove example duplicate	2014-08-22 16:06:09 +02:00
returners	Added generated new module docs	2014-07-24 15:56:19 -06:00
roster/all	Added roster modules to the documentation	2014-06-30 14:01:48 -06:00
runners	Added generated new module docs	2014-07-24 15:56:19 -06:00
states	Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state	2014-08-25 13:37:47 -06:00
tops	Add ref/tops/all/salt.tops.reclass_adapter.rst	2013-07-18 12:29:32 -05:00
wheel/all	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00
clientacl.rst	Fixed ping to test as per Tom yelling at me in Salt Class	2013-12-17 14:07:37 -08:00
index.rst	Fixing more sphinx warnings and errors	2014-08-11 14:38:45 -04:00
peer.rst	Added ref anchor for peer docs	2014-02-27 19:38:57 -07:00
python-api.rst	Quiet Sphinx warning for deprecated Python API doc	2013-08-15 16:15:49 -06:00