11 Commits

Author	SHA1	Message	Date
Colton Myers	1bbe45538e	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/__init__.py salt/modules/smartos_vmadm.py salt/utils/s3.py setup.py	2015-08-28 16:44:08 -06:00
Joseph Hall	116e345cb0	Document top_level_dir	2015-08-27 14:57:25 -06:00
Joseph Hall	f4723efe68	Add SPM paths into mainline Salt configs	2015-08-27 12:21:53 -06:00
Joseph Hall	2eef80414a	Document reactor packages	2015-08-26 14:59:01 -06:00
Colton Myers	76c70162db	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py doc/topics/spm/index.rst salt/cloud/clouds/gce.py salt/cloud/clouds/opennebula.py salt/cloud/clouds/openstack.py tests/unit/states/file_test.py	2015-08-26 14:47:33 -06:00
Joseph Hall	e4dcef5048	Document SPM package types	2015-08-26 12:21:28 -06:00
Jacob Hammons	9830921032	Refs #25063 ... Refs #25473	2015-07-16 13:24:01 -06:00
Joseph Hall	d7f6f3a2a9	Should be FORMULA, not FORMULA.yml	2015-07-07 10:23:45 -06:00
Joseph Hall	1e4f7aa574	Add man page for spm, change pillar to .orig	2015-06-30 09:45:13 -06:00
Joseph Hall	393cbf2114	Document pillars and loader modules	2015-06-30 07:16:58 -06:00
Joseph Hall	32c158892b	Adding docs for SPM	2015-06-23 12:06:47 -06:00