1444 Commits

Author	SHA1	Message	Date
Nicole Thomas	9c8573e473	Merge pull request #46499 from rallytime/fix-46475 ... Remove deprecated syntax for "profile" in vault pillar	2018-03-13 16:03:05 -04:00
rallytime	cf44199305	Remove deprecated k8s state ... All functions in the k8s state were deprecated and marked for removal in the Fluorine release. Since now functions would remain in the state, the state has been removed. Fixes #46476	2018-03-12 17:22:04 -04:00
rallytime	05939e5445	Remove deprecated syntax for "profile" in vault pillar ... Fixes #46475	2018-03-12 17:12:57 -04:00
Nicole Thomas	b3c8537f93	Merge pull request #46495 from rallytime/fix-46474 ... Remove deprecated syntax for roster_order in roster/cache.py	2018-03-12 16:27:53 -04:00
rallytime	194c9c12e9	Remove deprecated syntax for roster_order in roster/cache.py ... Fixes #46474	2018-03-12 13:23:31 -04:00
rallytime	651dcaff66	Merge branch '2018.3' into 'develop' ... Conflicts: - tests/integration/states/test_file.py	2018-03-12 11:53:21 -04:00
David Boucha	ff81291d0b	fix typo	2018-03-08 15:34:43 -07:00
David Boucha	250086ae2a	Add minion startup event change to release notes	2018-03-08 15:34:43 -07:00
Benjamin Drung	3d37eca847	Fix various spelling mistakes ... lintian found various spelling mistakes. Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-03-08 19:14:42 +01:00
Nicole Thomas	d1d966abc7	Merge pull request #46302 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-03-02 16:27:45 -05:00
Ch3LL	52a68450ae	Update releasecandidate doc for 2018.3.0rc1	2018-03-02 12:02:21 -05:00
rallytime	ed46ce3c74	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/auth/ldap.py - salt/modules/zfs.py - salt/modules/zpool.py - salt/states/cmd.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py - tests/integration/scheduler/test_postpone.py - tests/unit/grains/test_core.py	2018-03-02 11:55:06 -05:00
rallytime	18eca3da3b	Port 2018.3.0.rst release note changes to develop	2018-03-01 14:24:10 -05:00
rallytime	7243baf2c0	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/topics/orchestrate/orchestrate_runner.rst - salt/grains/core.py - salt/modules/git.py - salt/pillar/ec2_pillar.py - salt/runner.py - salt/utils/ssh.py - tests/integration/modules/test_cp.py - tests/unit/grains/test_core.py - tests/unit/modules/test_file.py - tests/unit/modules/test_git.py	2018-02-27 17:13:28 -05:00
rallytime	6927642321	Merge branch '2018.3' into 'develop' ... Conflicts: - doc/conf.py - salt/modules/cmdmod.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py	2018-02-26 14:23:06 -05:00
Ch3LL	6ddf3246ce	Add 2017.7.5 Release Notes File	2018-02-26 14:22:20 -05:00
rallytime	776f2ea5d7	Merge branch '2018.3.0rc1' into '2018.3' ... Conflicts: - salt/pillar/file_tree.py - tests/unit/modules/test_yumpkg.py	2018-02-26 11:01:42 -05:00
rallytime	25deebf7a6	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - salt/modules/git.py	2018-02-22 10:22:22 -05:00
Erik Johnson	c77341b544	Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree	2018-02-21 21:56:54 -06:00
Erik Johnson	1668a489c4	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
Ch3LL	8d0eeeb059	Update 2017.7.4 Release Notes with new fixes	2018-02-16 11:45:49 -05:00
rallytime	e060a74fd8	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/cloud/clouds/dimensiondata.py - salt/config/__init__.py - salt/modules/yumpkg.py - salt/pillar/ec2_pillar.py - salt/utils/docker/__init__.py - salt/utils/vault.py - tests/integration/states/test_docker_container.py - tests/unit/modules/test_yumpkg.py - tests/unit/templates/test_jinja.py - tests/unit/utils/test_docker.py	2018-02-14 16:31:31 -05:00
rallytime	a06645ce71	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.4.rst - salt/utils/vault.py	2018-02-13 13:34:24 -05:00
Ch3LL	ac0baf4b34	Add 2017.7.4 Release Notes with PRs	2018-02-13 11:31:20 -05:00
rallytime	d6c2d0693a	Merge branch 'oxygen.rc1' into 'oxygen' ... No conflicts.	2018-02-13 10:54:25 -05:00
rallytime	d80547e0b8	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/fileclient.py - salt/grains/disks.py - salt/modules/cmdmod.py - salt/state.py - salt/states/file.py - salt/utils/gitfs.py - salt/utils/win_functions.py - tests/integration/modules/test_state.py - tests/unit/cache/test_localfs.py	2018-02-08 11:23:31 -05:00
rallytime	e4e4744218	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-02-08 10:42:37 -05:00
Erik Johnson	b4e24a69e6	Move get_context to salt.utils.stringutils ... This avoids circular dependencies when salt.utils.jinja (which is imported by salt.utils.templates) needs to use get_context()	2018-02-07 02:09:56 -06:00
rallytime	f937e8ba81	Add release notes file for 2017.7.4 release	2018-02-06 09:57:22 -05:00
rallytime	104a24f244	Remove extraneous ] in release notes for 2016.11.9	2018-02-05 16:34:19 -05:00
rallytime	502f031f60	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/utils/cloud.py	2018-01-29 09:37:19 -05:00
rallytime	0ad101d560	Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/man/salt.7 - salt/modules/git.py - salt/modules/pacman.py - salt/states/git.py - tests/integration/modules/test_mac_user.py - tests/support/parser/__init__.py	2018-01-26 17:27:03 -05:00
rallytime	cbf1ed2f97	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/cloud/clouds/joyent.py - salt/modules/cmdmod.py	2018-01-26 16:28:01 -05:00
rallytime	f10c7ee92d	Merge branch '2017.7.3' into '2017.7' ... No conflicts.	2018-01-26 09:59:21 -05:00
Ch3LL	84c8216901	Add PRs to 2017.7.3 Release Notes	2018-01-25 15:51:34 -05:00
Dmitry Kuzmenko	99a0e1f7e2	Added M2Crytpo release note.	2018-01-25 20:32:00 +03:00
rallytime	b5fb80e8c3	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/utils/saltclass.py	2018-01-25 11:21:31 -05:00
rallytime	d4dac9f7cc	Merge branch '2016.11' into '2017.7' ... 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-proxy.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 - doc/man/spm.1	2018-01-25 10:42:14 -05:00
Nicole Thomas	b2390e69ca	Merge pull request #45505 from DSRCorporation/bugs/raet_deprecation ... Deprecate RAET	2018-01-25 10:05:02 -05:00
Damon Atkins	1d21f86228	Update 2017.7.3.rst	2018-01-25 19:37:32 +11:00
Ch3LL	7b5bed36d9	Add new commits to 2016.11.9 release notes	2018-01-24 16:16:52 -05:00
Dmitry Kuzmenko	f88bbbe147	Raet deprecation warning and release note.	2018-01-24 22:49:18 +03:00
rallytime	1b4744165b	Add auth error raising change to oxygen release notes	2018-01-24 14:03:35 -05:00
Nicole Thomas	9c4c22989f	Merge pull request #45607 from onovy/typos ... Fixed few typos in docs	2018-01-23 17:34:12 -05:00
rallytime	3c298afa72	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/modules/pip.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/runners/manage.py - salt/states/pkg.py - salt/transport/zeromq.py - salt/utils/event.py - tests/integration/modules/test_pip.py - tests/integration/states/test_user.py - tests/unit/grains/test_core.py - tests/unit/states/test_archive.py - tests/unit/utils/test_boto.py	2018-01-23 13:26:43 -05:00
rallytime	af696989c8	Merge branch 'oxygen' into 'develop' ... Conflicts: - doc/topics/releases/oxygen.rst	2018-01-22 12:35:29 -05:00
Ondřej Nový	137f4c21fd	Fixed few typos in docs	2018-01-22 17:14:57 +01:00
Ch3LL	325f4cbcda	Add PR changes to 2016.11.9 Release Notes	2018-01-19 16:32:46 -05:00
Nicole Thomas	3dc3e4e690	Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix ... Isbm ssdp spurious errors fix	2018-01-18 07:07:01 -05:00
rallytime	4b64a3964e	Update function new name in release notes	2018-01-17 12:45:12 -05:00