Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
5cca52a3c1
Fixed windows installer paths
...
Refs #25567
2015-08-31 20:20:44 -06:00
Colton Myers
40718af1d5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
salt/modules/win_service.py
tests/integration/cloud/providers/digital_ocean.py
2015-08-26 14:29:57 -06:00
Jacob Hammons
b6af538070
version change for latest branch
2015-08-26 08:02:54 -06:00
Jacob Hammons
4e5766fdde
update version to 2015.5
2015-08-26 07:45:08 -06:00
Jacob Hammons
fefd7aa7e8
2015.8.0 release notes and doc/conf.py updates
2015-08-25 15:12:20 -06:00
Colton Myers
0fc16040d6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/__init__.py
salt/cloud/clouds/vmware.py
salt/loader.py
salt/minion.py
salt/modules/archive.py
salt/modules/file.py
salt/states/pkg.py
salt/utils/http.py
2015-08-10 13:21:57 -06:00
Jacob Hammons
75243b61cf
Updated windows download links in the docs to https://repo.saltstack.com
2015-08-05 15:13:19 -06:00
Jacob Hammons
7c162d181c
Updated windows download links in the docs to https://repo.saltstack.com
...
Refs #25961
2015-08-05 14:45:42 -06:00
Colton Myers
2a144b954a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/states/requisites.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/config.py
salt/minion.py
salt/modules/cp.py
salt/pillar/__init__.py
salt/states/file.py
2015-07-14 10:57:36 -06:00
Jacob Hammons
88f5fcf58d
Latest help theme updates
2015-07-10 09:52:01 -06:00
Jacob Hammons
19f88920fa
version change to 2015.5.3
2015-07-10 09:43:15 -06:00
Jacob Hammons
0a46dc4c40
Built man page for spm, added man page entry for spm to doc/conf.py
...
Refs #25213
2015-07-07 20:48:58 -06:00
Colton Myers
725e5c689f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-11 13:15:38 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Colton Myers
768494c819
Update latest release in docs
2015-05-28 10:19:00 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Colton Myers
7dfbd929ff
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-26 15:51:15 -06:00
Jacob Hammons
1e1eb2b3ea
added custom search for each branch, fixed style issues
2015-05-22 11:53:33 -06:00
Colton Myers
9dbafcc051
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/tls.py
2015-05-20 11:59:59 -06:00
Jacob Hammons
31023c8915
Updates to sphinx saltstack2 doc theme
2015-05-19 15:54:28 -06:00
Jacob Hammons
e867f7df77
Changed build settings to use saltstack2 theme and update release versions.
2015-05-19 13:44:00 -06:00
Colton Myers
a87b057137
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.slack_notify.rst
2015-05-19 09:53:58 -06:00
Jacob Hammons
f7eb70ca60
changed previous release to 2014.7.6
2015-05-18 17:40:50 -06:00
Jacob Hammons
8c32152be0
removed TOC numbering, additional tweaks to layout.html
2015-05-13 21:18:00 -06:00
Jacob Hammons
16d8a753ad
saltstack2 sphinx theme and build settings
2015-05-11 17:29:12 -06:00
Colton Myers
1bb8a73afb
Update latest release to 2015.5.0
2015-05-11 16:05:04 -06:00
Seth House
6be273d5f3
Removed stormpath_mod and linodepy docs; these were renamed
2015-05-01 14:24:00 -06:00
Seth House
cda915bcd4
Remove fsutils module documentation
...
This module was moved to the utils folder in #17883 .
2015-05-01 14:13:59 -06:00
Seth House
901fa33440
Mocked tornado.httputil
...
Refs #22820
2015-05-01 13:57:43 -06:00
Colton Myers
82477562dd
Release 2014.7.5
2015-04-22 15:56:03 -06:00
rallytime
662593c902
Change latest release version in doc sidebar
2015-04-16 15:00:36 -06:00
Seth House
aaf1917bdf
Add mocked references for new module additions
2015-04-15 17:52:10 -06:00
Colton Myers
ebe7eeafd9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/cloud/clouds/linode.py
salt/states/composer.py
salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Seth House
5f1feb838d
Switch the current release version back to 2014.7.2
...
Accidentally bumped in #21467 .
2015-03-10 22:44:54 -04:00
Seth House
c673e24a66
Merge pull request #21529 from whiteinge/doc-current-release-shortcut
...
Replace current release Jinja variable with rST substitution
2015-03-10 22:11:07 -04:00
Seth House
43709e0e10
Replace current release Jinja variable with rST substitution
...
Follow-up to the changes in #21286 .
2015-03-10 22:06:59 -04:00
Jacob Hammons
921d679065
Regenerated and updated man pages, updated release version in conf.py to 2014.7.2
2015-03-10 09:22:57 -06:00
Jacob Hammons
767a3c378d
Updated man pages, updated copyright year in conf.py
2015-03-09 18:36:38 -06:00
Colton Myers
6338b4f820
Update latest release in docs
2015-02-19 09:20:45 -07:00
Seth House
9a1a2db3aa
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e
Remove Mako from mocked deps for docs build
...
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.
Closes #9571 (at long last).
2015-02-06 19:00:35 -07:00
Colton Myers
f609366dee
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973
Release 2014.7.1 (docs sidebar and release date for release notes)
2015-01-22 16:52:21 -07:00
Colton Myers
dc778a8e5e
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
salt/states/boto_secgroup.py
2014-12-23 10:57:26 -07:00
Seth House
d2e9378084
Switch html_title to empty string instead of None
2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f
Switch the :formula: extlink to :formula_url:
...
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
2014-12-19 14:34:57 -07:00
Seth House
f345188d06
Set minimum Sphinx version to 1.3
2014-12-19 14:34:57 -07:00
Anthony Scalisi
44963fae0e
fix various typos
2014-12-08 14:32:53 -08:00
