Colton Myers
9128e8e7ae
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
2015-10-07 13:14:28 -06:00
Colton Myers
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
2015-10-07 13:11:48 -06:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
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/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Jacob Hammons
5a9867aad1
initial engines topic, updates to windows repo docs
...
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Jacob Hammons
1c8b32ce26
Updated windows software repository docs
2015-10-01 22:02:01 -06:00
Justin Findlay
f2eb20f26b
add autogenerated 2015.8.1 release notes
2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549
added changes list for 2015.8.1
2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6
add 2015.5.6 release notes
2015-09-30 16:29:57 -06:00
Colton Myers
41cad702e3
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/rest_service.py
salt/states/dockerng.py
salt/utils/cloud.py
2015-09-29 18:13:33 -06:00
Nicole Thomas
12a021da11
Merge pull request #27361 from cro/pxm_doc
...
Correct some issues with proxy minions
2015-09-24 10:03:38 -06:00
C. R. Oldham
3a297d8036
Add release notes for proxy fixes.
2015-09-23 18:42:00 -06:00
Justin Findlay
e509cfca17
fix typo in 2015.8.0 pull list
2015-09-23 14:03:12 -06:00
Justin Findlay
7137e731d3
add FreeBSD documentation to 2015.8.0 notes
2015-09-23 14:03:12 -06:00
Colton Myers
ec6cd80496
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/ref/auth/all/index.rst
doc/ref/auth/all/salt.auth.rest.rst
doc/ref/beacons/all/index.rst
doc/ref/beacons/all/salt.beacons.ps.rst
doc/ref/pillar/all/index.rst
doc/ref/pillar/all/salt.pillar.consul_pillar.rst
doc/ref/pillar/all/salt.pillar.neutron.rst
doc/ref/pillar/all/salt.pillar.sql_base.rst
doc/ref/pillar/all/salt.pillar.sqlite3.rst
doc/ref/sdb/all/salt.sdb.rest.rst
salt/modules/rh_ip.py
salt/utils/http.py
2015-09-22 15:31:46 -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
Colton Myers
be2b0fc497
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/http.py
2015-09-18 10:57:28 -06:00
Colton Myers
f4563ea9b7
Add stub release notes for 2015.5.6
2015-09-18 10:54:15 -06:00
Colton Myers
25410706ee
Add stub release notes for 2015.8.1
2015-09-18 10:51:54 -06:00
Colton Myers
8c204a45ab
Merge pull request #27197 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-17 13:53:22 -06:00
Colton Myers
26b6c92975
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
salt/config/__init__.py
salt/modules/rh_ip.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/user.py
salt/templates/rh_ip/rh7_eth.jinja
2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/gce.rst
salt/cli/api.py
salt/cli/call.py
salt/cli/cp.py
salt/cli/key.py
salt/cli/run.py
salt/cli/salt.py
salt/modules/dockerio.py
salt/states/dockerio.py
2015-09-17 10:54:33 -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
Jacob Hammons
6e323b6dd3
Update latest to 2015.8, 2015.5 is now previous
...
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
9ab642295e
Fixed a release notes typo and bad file rename
2015-09-14 15:51:37 -06:00
Jacob Hammons
daa3f4eee0
Updated release notes, change 2015.8 to latest release for doc site
2015-09-14 15:17:59 -06:00
Jacob Hammons
d939a38c8c
release notes updates
2015-09-14 14:52:14 -06:00
rallytime
a0de117a0f
Merge branch '2015.8' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/config/__init__.py
2015-09-11 09:33:21 -06:00
Justin Findlay
9aaca9338e
generate pull request list v2015.8..v2015.8.0
...
Also remove the changelogs generated for rc2 and rc3 in favor of a
unified list that shows all merged pull requests between the forking of
the 2015.8 branch and the release of 2015.8.0.
2015-09-09 12:41:09 -06:00
TheBigBear
21ea2f6b1b
URL of salt windows downloads has changed
2015-09-08 21:43:59 +01:00
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -06:00
Jacob Hammons
701f47a658
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
...
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
Colton Myers
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -06:00
Jacob Hammons
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
...
Refs #21214
2015-08-31 13:51:31 -06: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
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
Colton Myers
ef76404def
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/releases/2015.5.5.rst
2015-08-26 14:32:03 -06:00
TheBigBear
1d5395b27a
minor doc edits - spelling
2015-08-26 12:11:50 +01:00
Justin Findlay
dc5cee5f8f
add 2015.5.4 notes to 2015.5.5 notes
2015-08-25 16:52:13 -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
3d6f7b0e6a
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/utils/aws.py
2015-08-25 13:57:49 -06:00
David Boucha
5522d87a11
Merge pull request #26603 from terminalmage/issue13550
...
Fixes for git.latest, git module integration tests, etc.
2015-08-24 16:47:16 -05:00
Erik Johnson
33ea02b9d0
Add information on new arguments to release notes
...
Also tweaked the wording and formatting for consistency.
2015-08-23 22:36:48 -05:00
Pedro Algarvio
2f9b40ca25
Merge pull request #26577 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-23 08:14:04 +01:00
Colton Myers
75f48b4a96
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/targeting/grains.rst
2015-08-21 16:48:48 -06:00
Colton Myers
667dfcee14
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/renderers/gpg.py
tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Nitin Madhok
ed343aee6e
Correcting spelling of digital
2015-08-21 07:24:17 -04:00
Erik Johnson
74d1256338
Update release notes
2015-08-21 02:39:34 -05:00
Justin Findlay
2fee5708bb
Merge pull request #26501 from terminalmage/git_pillar_docs
...
Update git_pillar docs, add git.list_worktrees function
2015-08-20 23:34:02 -06:00
Justin Findlay
612e342c70
autogenerated 2015.5.5 release notes
2015-08-20 11:08:56 -06:00
Erik Johnson
817078096f
Fix invalid :py:func: paths
...
These are functions from the execution module, not the state module.
2015-08-19 19:10:17 -05:00
