Jacob Hammons
|
32a352120a
|
updated spm docs
|
2015-12-28 14:29:02 -07:00 |
|
Colton Myers
|
efb479a1bd
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/vmware.py
salt/grains/chronos.py
salt/grains/marathon.py
salt/loader.py
salt/modules/chronos.py
salt/modules/marathon.py
salt/proxy/chronos.py
salt/proxy/marathon.py
salt/state.py
salt/states/chronos_job.py
salt/states/marathon_app.py
salt/states/user.py
salt/utils/schedule.py
|
2015-11-13 15:18:45 -07:00 |
|
Jacob Hammons
|
d7017be031
|
removed dependencies info from docs
|
2015-11-09 16:07:17 -07:00 |
|
Colton Myers
|
32969b2408
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
|
2015-11-02 18:19:01 -07:00 |
|
SaltyCharles
|
14d4de6fe8
|
Update index.rst
Change released to releases for clarity.
|
2015-10-27 11:02:16 -07:00 |
|
Jacob Hammons
|
cfadda0c0c
|
Added note regarding missing spm exe on Debian/Ubuntu
Minor fixes to spm docs
|
2015-10-21 22:34:45 -06:00 |
|
Colton Myers
|
9864d9e0fa
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/ref/modules/all/index.rst
doc/topics/releases/boron.rst
salt/cli/daemons.py
salt/cli/salt.py
salt/modules/jboss7.py
salt/states/file.py
|
2015-09-18 11:03:37 -06:00 |
|
Jacob Hammons
|
f7a9e25d52
|
Fixed sphinx / latex build warnings and errors
Added missing modules to contents
|
2015-09-17 09:23:24 -06:00 |
|
Colton Myers
|
896313bff0
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/pillar/s3.py
|
2015-09-14 15:01:41 -06:00 |
|
Joseph Hall
|
ee0c8955dd
|
Document develoment of SPM loader modules
|
2015-09-12 11:14:47 -06:00 |
|
Arnold Bechtoldt
|
b9e5095bf5
|
add GH issue label SPM to docs
|
2015-09-12 11:14:26 +02:00 |
|
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 |
|