Jacob Hammons
0d1b691549
Updated release notes with additional CVE information
2015-10-16 10:12:12 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be
Changed current release to 8.1 and added CVEs to release notes
2015-10-15 11:14:50 -06:00
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
Erik Johnson
a4b7457683
Add information re: git state/module rewrite
...
Also improve the git_pillar information
2015-08-19 15:25:07 -05:00
rallytime
d44a75d7c0
Don't allow VMs with duplicate names to be created in EC2/AWS
...
Even if the VM is in the terminated state, from salt-cloud's perspective,
there should never be duplicately named instances.
This PR also changes the ``rename_on_destroy`` config default to True to
avoid errors and move the old ones out of the way if you forget to set it
in your cloud config.
2015-08-19 11:30:12 -06:00
Colton Myers
73282d51cc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cli/daemons.py
salt/master.py
salt/minion.py
salt/modules/gpg.py
salt/modules/pw_group.py
salt/utils/http.py
setup.py
tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
Colton Myers
f6481a1fb3
Merge pull request #26410 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-18 11:52:13 -06:00
Mike Place
fa88b7d35c
Add release note regarding tcp transport on freebsd
...
Refs #26364
2015-08-18 09:06:13 -06:00
Colton Myers
d3d0e004d9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/minion.py
salt/modules/gpg.py
salt/modules/keystone.py
salt/modules/pw_user.py
salt/states/reg.py
setup.py
2015-08-17 16:54:16 -06:00
Justin Findlay
1e3f33a03c
autogenerated 2015.5.4 release notes
2015-08-13 14:32:17 -06:00
Andreas Lutro
a86b1b7f94
add release note about cron state changes
2015-08-12 10:07:02 +02:00
Colton Myers
1b0b21394e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Erik Johnson
b9fa443eba
Update release notes with more information about winrepo changes
2015-08-09 17:42:13 -05:00
Colton Myers
d332d54eec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-05 15:32:11 -06:00
Erik Johnson
8f1cac4226
Add notes about winrepo and dockerng changes
2015-08-04 14:22:10 -05:00
Justin Findlay
b794dbf7e4
autogenerated release notes for 2015.8.0rc3
2015-08-04 11:23:40 -06:00
Colton Myers
d5fbd960fe
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/fileserver/s3fs.py
salt/modules/chocolatey.py
salt/modules/s3.py
salt/modules/zpool.py
salt/pillar/s3.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Thomas S Hatch
20d4fbdd64
Merge pull request #25759 from rallytime/one-getting-started
...
Added Getting Started with OpenNebula docs
2015-07-28 09:32:06 -06:00
rallytime
cb81050876
Add OpenNebula changes to Boron release notes
2015-07-27 13:12:48 -06:00
Colton Myers
882d11836b
Update release candidate docs to 2015.8.0rc2
2015-07-23 14:29:09 -06:00
Justin Findlay
b27378b186
add 2015.8.0rc2 autogenerated changelog
2015-07-23 11:04:18 -06:00
Mike Place
bc2321a5c6
Merge pull request #25595 from terminalmage/git_pillar-rewrite
...
Bring git_pillar up to feature parity with gitfs
2015-07-22 10:55:13 -06:00
Erik Johnson
d109fce299
Add git_pillar rewrite info to release notes
2015-07-21 16:46:15 -05:00
Colton Myers
76e468bc20
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/cloud/clouds/vmware.py
salt/daemons/flo/core.py
salt/modules/hipchat.py
salt/modules/lxc.py
salt/modules/rabbitmq.py
salt/pillar/s3.py
salt/states/dockerio.py
salt/states/file.py
salt/utils/process.py
salt/utils/s3.py
2015-07-20 13:55:14 -06:00
rallytime
f011890217
Add vmware back-port change to release notes
2015-07-17 10:58:38 -06:00
rallytime
7138f36d05
Add page number change to release notes
2015-07-15 10:48:23 -06:00
rallytime
faf49ea2a3
Add page number change release notes
2015-07-15 10:44:57 -06:00
rallytime
7795670bdc
Remove Beryllium Deprecation Warnings
2015-07-10 09:27:50 -06:00
C. R. Oldham
58ca83cda1
Merge pull request #25254 from rallytime/change_beryllium_refs
...
Change versionadded/changed references from Beryllium to 2015.8.0
2015-07-09 15:01:15 -06:00
Colton Myers
3a7289a0cb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/states/all/salt.states.aptpkg.rst
doc/ref/states/all/salt.states.etcd_mod.rst
doc/topics/releases/releasecandidate.rst
salt/client/mixins.py
salt/modules/win_pkg.py
tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
rallytime
1b7efa91e0
Remove references to Beryllium in relevant docs
2015-07-08 11:17:01 -06:00
Colton Myers
452880d4aa
Update releasecandidate docs
2015-07-07 09:24:57 -06:00
Colton Myers
24d51fb8f1
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/configuration/minion.rst
salt/config.py
salt/modules/sudo.py
tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Justin Findlay
3187d5d5aa
add 2015.5.3 release notes
2015-07-01 13:43:30 -06:00
rallytime
9b4b6bce64
Add rest api change to release notes
2015-06-19 16:21:24 -06:00
Joseph Hall
d299475d34
Merge pull request #24796 from rallytime/deprecate_provider_for_driver
...
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-19 09:43:26 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
rallytime
404268286a
Add provider --> driver change to release notes
2015-06-18 10:14:02 -06:00
Mike Place
ae65d78cf4
Add Boron release notes
2015-06-17 12:29:49 -06:00
rallytime
64c565d9be
Add .0 to version number
2015-06-16 21:49:43 -06:00
Peter Tripp
5ed801b98f
Add codenames for 2015.5 and future versions. Trailing newline.
2015-06-16 21:48:41 -06:00
Justin Findlay
4cbef0f7e4
Merge pull request #24735 from notpeter/develop
...
Add 2015.5 codename to version numbers docs
2015-06-16 21:31:08 -06:00
Peter Tripp
05114de3ab
Add codenames for 2015.5 and future versions. Trailing newline.
2015-06-16 18:09:17 -07: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
Justin Findlay
79de6cd477
prefer shutdown timeout value in minutes on windows
...
Fixes #24411 .
2015-06-10 16:21:09 -06:00
Nitin Madhok
308681f4ab
Change removed to deprecated
2015-06-07 18:01:25 -04:00
Nitin Madhok
676bf4859c
Add deprecation to beryllium release
2015-06-07 17:58:54 -04:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
rallytime
f5ec1a1693
Add 2015.5.2 release notes
2015-06-03 13:27:17 -06:00
Thomas S Hatch
742cf7e4dd
Merge pull request #24256 from rallytime/remove_digital_ocean_v1
...
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
2015-05-29 17:09:12 -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
rallytime
095979d0c2
Add digitalocean deprecation notice to Beryllium release notes
2015-05-29 14:50:22 -06:00
Colton Myers
e5ba31b5b5
2015.5.1 release date
2015-05-28 10:19:47 -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
Colton Myers
58aed60838
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/runners/lxc.py
2015-05-21 11:27:52 -06:00
rallytime
113c6049f5
Update release note for 2015.5.1
2015-05-20 14:50:08 -06:00
Justin Findlay
1aa0420040
Merge pull request #23933 from jacobhammons/2014.7
...
sphinx saltstack2 doc theme
2015-05-20 12:19:19 -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
Colton Myers
36f0065faf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/client/ssh/wrapper/pillar.py
2015-05-19 15:23:37 -06:00
Colton Myers
32b65dc2a9
Add extended changelog to 2014.7.6 release notes
2015-05-19 15:18:29 -06:00
Jacob Hammons
78b737c5e6
removed 2015.* release from release notes, updated index page to remove PDF/epub links
2015-05-19 13:53:31 -06:00
Colton Myers
d8a60d6181
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/index.rst
salt/modules/saltutil.py
2015-05-18 17:10:10 -06:00
Colton Myers
c2eed77691
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-18 17:07:15 -06:00
Colton Myers
dec153bcea
Update the release notes index page
2015-05-18 17:06:27 -06:00
Colton Myers
49921b6cb2
Update the 2014.7.6 release notes with CVE details
2015-05-18 16:34:48 -06:00
Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Colton Myers
7d8038f134
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
debian/changelog
salt/modules/win_pkg.py
salt/pillar/__init__.py
salt/states/file.py
2015-05-14 10:27:00 -06:00
Colton Myers
06a3ebd9d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-14 10:13:40 -06:00
Mike Place
bdbbfa6ee7
Start on 2015.5.1 release notes
2015-05-13 12:31:41 -06:00
Mike Place
d5986c21b4
Rename kwarg in cloud runner
...
Closes #23403
2015-05-13 12:15:06 -06:00
Colton Myers
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Erik Johnson
0504e7a184
Update Lithium docstrings in 2015.2 branch
2015-05-06 11:01:53 -06:00
Colton Myers
8510a4c30e
Update to release notes from 2015.2 branch
2015-05-06 10:48:06 -06:00
Colton Myers
3255fbc0d5
Rename the release notes
2015-05-06 10:47:16 -06:00
Colton Myers
2981aed48e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-05-05 16:49:31 -06:00
Colton Myers
b261c95cd6
Add note to 2015.2.0 release notes about master opts in pillar
2015-05-05 16:14:42 -06:00
Colton Myers
b2f033f485
Add CLI note
2015-05-05 16:02:26 -06:00
Colton Myers
48e7b3ee4f
Add warning about python_shell changes to 2015.2.0 release notes
2015-05-05 15:54:50 -06:00
Colton Myers
1f9934c634
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
2015-04-20 11:39:41 -06:00
rallytime
36b54ee79b
Remove extra line
2015-04-17 12:53:58 -06:00
rallytime
93a858c591
Added release note for 2014.7.5 release
2015-04-17 12:53:50 -06:00
rallytime
fde1feed46
Remove extra line
2015-04-17 11:42:14 -06:00
rallytime
b19b95d992
Added release note for 2014.7.5 release
2015-04-17 11:41:07 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Colton Myers
ff8561df8d
Add minor CVEs to 2014.7.4 release notes
2015-04-15 19:01:28 -06:00
Oliver Bestwalter
20ce197674
Add mention of Windows release candidates
...
... so the windows folks realize, that they can test RCs easily as well :)
2015-04-15 21:32:48 +02:00
Wolodja Wentland
c52e9a94af
Remove enabled option from pkgrepo.managed
...
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.
This closes #22147
2015-04-14 18:05:03 +01:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
rallytime
becc997de4
Apply release note fix to develop branch
2015-04-13 15:34:24 -06:00
rallytime
fb03af37d3
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:29:55 -06:00
rallytime
1f243d6276
Apply release note change to develop
2015-04-13 13:53:03 -06:00
rallytime
9eb273f097
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 13:35:48 -06:00
shanedlee
c874ca8c20
Added additional details regarding windows implementation
2015-04-09 11:32:13 -04:00
Kevin Bowling
f324d38f8c
2015.2 relnotes edits
2015-04-06 14:36:51 -07:00
rallytime
5cd2db23eb
Update sidebar and releasecandidate docs for rc2
2015-04-02 16:42:01 -06:00
Nitin Madhok
bfa4ef77e2
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20
Fixing some spninx errors and violations
2015-03-31 12:54:32 -04:00
Nicole Thomas
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
Mike Place
4538ea629f
Merge pull request #22057 from jfindlay/opts_prefix
...
remove default prefix of '-' in archive.tar and archive.cmd_unzip
2015-03-30 10:45:11 -06:00
Justin Findlay
0e57aeb3d0
mention console log colors in beryllium release notes
2015-03-26 23:21:30 -06:00
Justin Findlay
4b2ebfaf7c
document '-' prefix removal in Berrylium notes
2015-03-26 22:23:11 -06:00
Nicole Thomas
f38b67b687
Merge pull request #22041 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-03-26 10:30:21 -06:00
Colton Myers
afeb4743a1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-26 09:45:55 -06:00
Mike Place
6fb70ea874
Add etcd sdb to 2015.2 release notes
2015-03-26 09:13:28 -06:00
Colton Myers
74dcd7df1c
Add 2014.7.4 release notes
2015-03-26 09:03:35 -06:00
Justin Findlay
7ac7b74621
add release note about reactor users for runners
2015-03-25 21:14:10 -06:00
Justin Findlay
9b1e3f7a2a
wrap at 80 chars
2015-03-25 21:12:51 -06:00
Justin Findlay
88add58cef
misc cachedout edits
2015-03-25 21:10:48 -06:00
Thomas S Hatch
c58fe8bc07
Update release notes back to Jan 29th
2015-03-25 13:23:38 -06:00
Colton Myers
b0fe5cc955
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/fileclient.py
salt/minion.py
tests/unit/pyobjects_test.py
2015-03-25 12:04:30 -06:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
Mike Place
2639f4b566
Release note changes
2015-03-24 17:02:18 -06:00
Mike Place
53846aa284
Merge pull request #21958 from cachedout/2015_2_mm_note
...
Add known multimaster issue to 2015.2 notes
2015-03-24 15:50:16 -06:00
Mike Place
98642d7b87
Add known multimaster issue to 2015.2 notes
2015-03-24 15:49:58 -06:00
Mike Place
e6d70629df
2014.7.3 release notes
2015-03-24 15:48:05 -06:00
Justin Findlay
1436d4011a
add versions_report update to release notes
2015-03-23 14:02:16 -06:00
Thomas Jackson
2512a0841d
Add LazyLoader and Singleton auth to 2015.2 release notes
2015-03-23 11:42:48 -07:00
Colton Myers
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
2015-03-16 15:12:02 -06:00
Mike Place
87bd28b8cb
Note the issue number
2015-03-11 12:19:51 -06:00
Mike Place
9d5da3b878
Note the change in release notes
2015-03-11 12:19:51 -06: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
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Mike Place
393cf9c13a
Note the change to tcp keepalives in release notes
2015-03-10 10:45:16 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
rallytime
e9402e7564
Remove "Lithium" and change to "2015.2.0" for versionadded tags
2015-03-05 12:44:22 -07:00
Alexander Schwartz
0887dfe5d8
make latest 2014.7.x releases visible in documentation
2015-03-03 17:14:06 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Justin Findlay
367f14a4d0
add args to cmd.script_retcode
2015-02-27 10:52:15 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
Mike Place
d31913118f
ID field for event returns in mysql
2015-02-24 12:20:25 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
Joseph Hall
0ff1d027ab
Add Joyent keyname note to release notes
2015-02-19 14:55:13 -07:00
Colton Myers
f00465a8a1
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
jfindlay
c47beeac51
Merge pull request #20707 from russellballestrini/rb-state-archive-user-group
...
state.archive recursively set group
2015-02-16 13:36:34 -07:00
Russell Ballestrini
31dabae10d
Deprecated archive_user in favor of standard user
...
modified: doc/topics/releases/2014.7.2.rst
modified: salt/states/archive.py
2015-02-16 12:35:15 -05:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Arnold Bechtoldt
cca2563fdf
set appropriate headline for release notes of 2015.2.0
2015-02-12 23:33:37 +01:00
Colton Myers
b2a80b195e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-12 11:44:57 -07:00
rallytime
3f9af9f7d3
Change the release notes title to 2014.7.2
2015-02-12 11:26:17 -07:00
rallytime
3c2dd7d801
Change the releasecnadidates doc to reflect 2015.2.0rc1
2015-02-11 12:30:16 -07:00
Colton Myers
1e5bd7e1b8
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/fileserver/gitfs.py
salt/loader.py
salt/renderers/pyobjects.py
salt/utils/args.py
salt/utils/decorators/__init__.py
salt/utils/lazy.py
tests/integration/loader/globals.py
tests/integration/loader/loader.py
2015-02-11 09:17:35 -07:00
Colton Myers
eba17606b4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48
Add file-locking bugfix to 2014.7.2 release notes
2015-02-09 11:32:20 -06:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Justin Findlay
b87615e277
document lowercase removal change
2015-02-03 16:27:41 -07:00
Colton Myers
068a23e390
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/daemons/flo/core.py
salt/fileclient.py
salt/utils/cloud.py
salt/utils/schedule.py
2015-02-02 15:27:43 -07:00
Colton Myers
ca6ecc0f0f
Add only_upgrade to 2015.2 release notes
2015-01-30 16:07:39 -07:00
rallytime
9898fcf613
Merge branch '2015.2' into 'develop'
...
Conflicts:
.gitignore
.pylintrc
.testing.pylintrc
salt/client/mixins.py
salt/cloud/clouds/msazure.py
salt/config.py
salt/modules/mount.py
salt/runners/doc.py
salt/utils/event.py
salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
rallytime
80bfa4a2a6
Add beacons section to 2015.2.0 release notes
2015-01-26 20:26:51 -07:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Pedro Algarvio
cdbbe4c0dd
Fix typos
2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80
Added docs for Lithium deprecations
2015-01-24 03:16:49 +00:00
Colton Myers
8bba4bbec4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/msazure.py
salt/modules/boto_sns.py
salt/states/boto_sns.py
tests/integration/modules/boto_sns.py
tests/integration/states/boto_sns.py
2015-01-23 14:20:34 -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
9446633e9d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-01-21 12:05:51 -07:00
Colton Myers
098c39596a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Kevin Bowling
494543c5bc
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 02:09:32 -07:00
Thomas S Hatch
1569520a4b
Merge pull request #19792 from rallytime/merge_forward_develop
...
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08:00
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Colton Myers
d1b201e2bf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/runners/manage.py
salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
Colton Myers
228ada2890
Add release notes for 2014.7.2
2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249
Add more release notes for 2014.7.1
2015-01-14 15:17:21 -07:00
Thomas S Hatch
cad85fd81b
Merge pull request #19583 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-09 17:49:43 -07:00
Mike Place
1b78f4069f
Use __func_alias__
2015-01-09 15:03:44 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Mike Place
b5c0dbe0ed
Cleanup jboss module
...
Closes #18600
2015-01-08 17:15:05 -07:00
Mike Place
b419366443
Release note note
...
Fixes #18551
2015-01-08 16:41:20 -07:00
Colton Myers
139bd8df5b
Add salt-ssh mine to lithium release notes
2014-12-23 11:35:40 -07:00
Colton Myers
321413e638
Rename lithium release notes to 2015.2.0
2014-12-23 11:34:52 -07:00
Colton Myers
7fc1cc2ba2
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/topics/releases/2014.7.1.rst
salt/modules/mdadm.py
salt/modules/mine.py
salt/modules/win_firewall.py
salt/modules/win_groupadd.py
salt/modules/win_service.py
salt/modules/win_system.py
salt/modules/win_useradd.py
salt/runners/jobs.py
tests/unit/modules/mdadm_test.py
2014-12-22 13:33:53 -07:00
Colton Myers
9d5e05a381
Add more release notes for 2014.7.1
2014-12-18 14:19:52 -07:00
Colton Myers
e0b6f1623c
Add publish wrapper to lithium release notes
2014-12-16 16:13:03 -07:00
Thomas Jackson
3f4b2cc8bb
Comma cleanup
2014-12-12 11:31:43 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Thomas Jackson
52fe04db18
Remove trailing whitespace
2014-12-11 07:53:19 -08:00
Thomas S Hatch
3d73816507
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/network.py
salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Erik Johnson
00bf5daff8
Add bugfix for #17963 to 2014.7.1 releae notes
2014-12-08 08:45:03 -06:00
Colton Myers
79e5e80ad1
Add state.single to salt-ssh release notes for lithium
2014-12-04 14:35:52 -07:00
Pedro Algarvio
50105aa001
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
tests/unit/modules/boto_vpc_test.py
2014-12-01 23:07:39 +00:00
Erik Johnson
b11542dab9
Update 2014.7.1 release notes
2014-11-28 16:55:49 -06:00
Colton Myers
397d61b1fc
Add lithium release notes
2014-11-25 15:25:46 -07:00
Colton Myers
754baafcf7
Merge branch '2014.7' into develop
2014-11-24 14:38:46 -07:00
Erik Johnson
55b80853f6
Add new release notes file for 2014.7.1
2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e
Fix wording in 2014.1.1 release notes
...
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86
Add 2014.7.0 to toctree
2014-11-24 09:46:48 -06:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Ronan Amicel
3d2b44a14b
Fix typo in 2014.7.0 release notes
...
virturalenv → virtualenv
2014-11-20 11:26:01 +01:00
Elias Probst
b0ead3f326
Typo in 2014.7.0 release notes (documentaiton → documentation).
2014-11-19 20:47:18 +01:00
Nitin Madhok
31ffaff1e7
Fixes #18114
2014-11-18 03:06:11 -05:00
C. R. Oldham
79d2de5d44
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-11-10 16:33:50 -07:00
C. R. Oldham
25f7bf111a
Add breaking change notice for module.run in 2014.1.0
2014-11-10 16:28:21 -07:00