1358 Commits

Author	SHA1	Message	Date
Nicole Thomas	8e2e1f957e	Merge pull request #44772 from terminalmage/issue36275 ... Rename environment config option to saltenv, introduce lock_saltenv option	2017-12-04 16:49:23 -05:00
Erik Johnson	bf8384d230	Add documentation for lock_saltenv ... Also add documentation for renaming of environment to saltenv	2017-11-30 14:53:01 -06:00
Erik Johnson	ecdd273231	Add info about runner/wheel retcodes to Oxygen release notes	2017-11-29 09:47:56 -06:00
Gareth J. Greenaway	45c9a233dc	Merge branch 'develop' into req_any	2017-11-13 09:16:56 -07:00
Vitaliy	43e4861fc4	Fixed minor spelling mistake.	2017-11-10 12:30:12 -05:00
Gareth J. Greenaway	a8e495f18f	Updating documentation and release notes.	2017-11-08 16:06:44 -08:00
Volodymyr Samodid	0c7f63e9d4	fix docstring errors during rendering	2017-11-07 10:24:56 +02:00
Nicole Thomas	9fc7fde8d2	Merge pull request #43885 from garethgreenaway/43825_swap_total_grain ... [develop] Adding swap_total to core grains	2017-10-27 13:01:11 -04:00
Nasenbaer	35c6a02689	Add sentry config deprecation to release notes	2017-10-26 10:29:43 +02:00
Nicole Thomas	e52aac2587	Merge pull request #43649 from twangboy/win_installer_multimaster ... Add support for multimaster setup	2017-10-19 09:20:44 -04:00
Gareth J. Greenaway	bcee88ce77	Adding note about new swap_total grain to release notes for Oxyten.	2017-10-18 14:57:32 -07:00
rallytime	b8dc018178	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/opkg.py - salt/utils/templates.py - tests/unit/templates/test_jinja.py	2017-10-18 09:37:47 -04:00
Mike Place	73c3581864	Merge pull request #44037 from vernondcole/vagrant-cloud ... Vagrant cloud and state modules	2017-10-17 14:36:38 -06:00
rallytime	c0f16dae74	Merge branch '2017.7' into 'develop' ... Conflicts: - doc/topics/tutorials/index.rst - salt/crypt.py - salt/modules/cmdmod.py - salt/modules/grains.py - salt/pillar/git_pillar.py - salt/roster/clustershell.py - tests/unit/states/test_augeas.py - tests/unit/utils/test_utils.py	2017-10-16 15:26:19 -04:00
rallytime	c4ae4a6b50	Merge branch '2017.7.2' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.2.rst	2017-10-16 13:53:13 -04:00
twangboy	a0972704e5	Fix bad headings	2017-10-16 10:51:34 -06:00
twangboy	601d8bc5af	Add release notes	2017-10-16 10:51:34 -06:00
garethgreenaway	22dbed1e45	Merge branch 'develop' into vagrant-cloud	2017-10-13 13:08:50 -07:00
Nicole Thomas	a85837d72b	Merge pull request #44066 from Ch3LL/cherry_release ... Add Known CherryPy Issue to 2017.7.2 Release Notes	2017-10-12 11:18:24 -04:00
Ch3LL	8e597fcce9	Add Known CherryPy Issue to 2017.7.2 Release Notes	2017-10-12 09:33:59 -04:00
Vernon Cole	e9c7c69402	documentation for vagrant cloud & state	2017-10-11 05:02:26 -06:00
rallytime	788ad0609a	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-10-10 16:34:52 -04:00
Ch3LL	027f509368	Add 2017.7.3 Release Note File	2017-10-10 15:33:42 -04:00
Ch3LL	7f9015eb41	Add 2016.11.9 Release Note File	2017-10-10 15:31:19 -04:00
Nicole Thomas	33e0353858	Merge branch 'develop' into vmm_grain	2017-10-10 09:01:33 -04:00
Mike Place	e434c39c4e	Merge pull request #43960 from cro/ldap_nopw_bind2 ... Require that bindpw be non-empty when auth.ldap.anonymous is False	2017-10-09 17:09:01 -06:00
garethgreenaway	e9dfda2177	Merge pull request #43991 from Ch3LL/3.8_sec_2 ... Add Security Notes to 2016.3.8 Release Notes	2017-10-09 15:00:24 -07:00
Ch3LL	1977df8462	Add Security Notes to 2016.3.8 Release Notes	2017-10-09 16:26:13 -04:00
Ch3LL	57fd6f7bcb	Add Security Notes to 2017.7.2 Release Notes	2017-10-09 13:09:58 -04:00
Ch3LL	f0c3184288	Add Security Notes to 2016.11.8 Release Notes	2017-10-09 13:03:23 -04:00
C. R. Oldham	9df3d91d8f	Release notes blurb for change to bindpw requirements	2017-10-06 15:33:10 -06:00
Nicole Thomas	7785919437	Merge pull request #43829 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-10-05 16:09:23 -04:00
Eric Radman	1a9f12fd67	Detect OpenBSD guest running under VMM(4) ... grains.manufacturer is 'OpenBSD' when running under VMM	2017-10-02 17:45:37 -04:00
rallytime	2337904656	Add updated release notes to 2017.7.2 branch	2017-10-02 17:18:30 -04:00
Nicole Thomas	9f25a1c2dd	Merge pull request #43503 from The-Loeki/high-out-by_id ... Additional highstate output modes; changes_id, filter_id, terse_id, full_id	2017-10-01 10:14:26 -04:00
rallytime	a38ceab7cf	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/batch.py - salt/master.py - salt/utils/path.py - tests/unit/modules/test_state.py	2017-09-29 11:48:33 -04:00
garethgreenaway	61280cc0c3	Merge branch 'develop' into release-note-formatting	2017-09-28 19:49:12 -07:00
Nicole Thomas	3f77571dad	Merge branch 'develop' into high-out-by_id	2017-09-28 13:27:47 -04:00
Ch3LL	50779c3b1c	Add note to nitrogen release notes about pip for cent6	2017-09-28 11:50:54 -04:00
Simon Dodsley	cdafbe2068	Update Oxygen Release notes with new grains and module ... Also do a final cosmetic fix to the purefa module documentation	2017-09-28 07:26:30 -07:00
rallytime	d862a6f3f2	Fix some formatting issues on the oxygen release notes page	2017-09-28 09:52:04 -04:00
Mike Place	6a25bf4475	Merge pull request #42349 from coredumb/saltclass ... New pillar/master_tops saltclass module	2017-09-28 14:26:45 +02:00
Ch3LL	caf5795856	add mac patch notes	2017-09-26 17:27:29 -04:00
Ch3LL	3d5fce0955	Add 2017.7.2 Release Notes	2017-09-26 17:21:24 -04:00
Ronald van Zantvoort	a2234e45e2	Update release note docs regarding _id highstate output modes	2017-09-25 18:37:48 +02:00
Ronald van Zantvoort	bfbca748e2	highstate output: Document additional output modes	2017-09-25 18:32:52 +02:00
rallytime	281cbbe048	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cloud/clouds/libvirt.py - salt/daemons/masterapi.py - salt/modules/file.py - salt/modules/yumpkg.py - salt/states/archive.py - salt/states/file.py - salt/utils/files.py - salt/utils/minions.py	2017-09-25 09:40:18 -04:00
rallytime	fca4e5563a	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - tests/unit/utils/test_parsers.py	2017-09-22 09:40:03 -04:00
Daniel Wallace	afaf76d0ba	add release note	2017-09-19 12:50:50 -06:00
Mike Place	9767e46ce4	Merge branch 'develop' into cisc_oxygen_release_notes	2017-09-13 10:45:24 -06:00