Commit Graph

3717 Commits

Author SHA1 Message Date
Thomas S Hatch
307d5a17b2 Branding, it matters 2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff Merge pull request #35062 from thatch45/develop
Initial Docker sls tutorial
2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3 like this you think? 2016-08-01 15:55:46 -06:00
Thomas S Hatch
c7ea94ea01 it is no secret, I don't spell too well :) 2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135 SUSE, not Suse, not SuSE 2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf clarify on image used 2016-08-01 14:44:32 -06:00
Thomas S Hatch
823dc8d586 fix typo 2016-08-01 14:23:07 -06:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
2016-08-01 13:42:36 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability
Refs #33870
2016-08-01 11:14:53 -06:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
2016-08-01 06:52:40 -06:00
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
Erik Johnson
723b536eae Add documentation, release notes mention for new feature 2016-07-29 19:28:52 -05:00
Thomas S Hatch
82228b47d9 Initial Docker sls tutorial 2016-07-29 10:32:10 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model
Fix cpu_model grain on Windows to actual CPU model
2016-07-29 10:06:25 -06:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart
Introduce a template system for extending SaltStack open
2016-07-28 22:38:10 -06:00
David Boucha
2fe747c05c add release note about the cpu_model grain change 2016-07-28 15:35:55 -06:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/schedule.py
2016-07-28 11:08:14 -06:00
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Anthony Shaw
1280940079
linting fixes 2016-07-28 09:13:22 +10:00
Erik Johnson
82ebfc6b31 Improve Carbon release docs 2016-07-27 12:15:28 -05:00
Erik Johnson
6ae5667c23 Clarify usage of module.run state in states documentation 2016-07-27 11:57:55 -05:00
Erik Johnson
4e804217e3 Add documentation on utility modules 2016-07-27 11:56:41 -05:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Anthony Shaw
dac5cec503
start doc layout 2016-07-27 19:56:35 +10:00
Mike Place
9cd052f07f Merge pull request #34959 from terminalmage/utils-in-runners
Make __utils__ dunder available in runner funcs
2016-07-26 16:13:35 -06:00
Erik Johnson
7b22b6b0e6 Add new runner feature to Carbon release notes 2016-07-26 12:29:59 -05:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
2016-07-26 11:05:24 -06:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707
Feature addition: preserve mode in file states
2016-07-22 16:43:31 -06:00
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3'
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
2016-07-21 13:39:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
2016-07-21 12:06:25 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Thomas S Hatch
94df6f8dc6 Add a clarifying note on Saltfile 2016-07-21 11:09:28 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Erik Johnson
087500bde7 Add new file mode preservation feature to carbon release notes 2016-07-20 15:33:11 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-19 10:31:07 -06:00
C. R. Oldham
bf4dc079df Document fqdn_base. 2016-07-18 15:49:59 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756)
adds link to all tutorials to using salt section
Refs #33923
2016-07-18 15:36:50 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure
Refs #27980
2016-07-18 11:26:36 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
2016-07-18 10:34:03 -06:00
Mike Place
c6700a219a Document how to test for the existence of a log message (#34738) 2016-07-18 09:12:13 -06:00
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630
Various spelling fixes
2016-07-16 13:49:54 -06:00
rallytime
b9e0bd1918 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-16 13:24:10 -06:00
rallytime
cca9446c37 Various spelling fixes
Fixes #34630
2016-07-16 13:17:09 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-16 12:29:54 -06:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 15:35:21 -06:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-14 14:06:42 -06:00
Mike Place
07840714c5 Merge pull request #34608 from pass-by-value/cassandra_cql_returner_opts
Add support for more options to Cassandra CQL returner
2016-07-14 09:06:43 -06:00