Mircea Ulinic
d8dc8a338b
Add redis cache reference
2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c
Adding Jinja cross ref
2017-06-19 09:49:45 +00:00
garethgreenaway
4c8aa25080
Merge pull request #41813 from rallytime/add_new_doc_modules
...
Add new documentation file references to build system for 2017.7
2017-06-16 18:54:15 -07:00
Nicole Thomas
c3a49c9552
Merge pull request #41805 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f
Merge pull request #41728 from twangboy/win_install_docs
...
Win install docs
2017-06-16 15:41:21 -06:00
rallytime
ff277bc458
Add new documenation file references to build system for 2017.7
2017-06-16 21:17:33 +00:00
rallytime
58262608cd
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/config/__init__.py
- salt/master.py
- salt/modules/zypper.py
- tests/unit/modules/timezone_test.py
2017-06-16 10:43:02 -06:00
Mike Place
a46f6809df
Merge pull request #41758 from twangboy/docs_win_add_master_config
...
Add Windows Master config information
2017-06-15 15:29:27 -05:00
twangboy
b6201bac33
Fix version numbers
2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e
Fix indentation
2017-06-15 09:49:13 -06:00
Mike Place
c58f3811ce
Merge pull request #41746 from rallytime/version-added-nitrogen
...
Update Nitrogen references to 2017.7.0
2017-06-15 10:12:18 -05:00
Mike Place
e685858269
Merge pull request #41750 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-06-14 17:15:40 -05:00
twangboy
80ac6381c2
Add Windows Master config information
2017-06-14 15:15:46 -06:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes
2017-06-14 16:00:50 -04:00
rallytime
89834e49c2
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- conf/master
- salt/utils/schedule.py
2017-06-14 13:24:11 -06:00
twangboy
795a1aab4f
Add instructions for Windows Firewall
2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a
Update Nitrogen references to 2017.7.0 in doc/*
2017-06-14 11:36:06 -06:00
twangboy
45975e299e
Remove reference to Salt Enterprise
2017-06-14 09:39:29 -06:00
Mike Place
4b43ba3366
Merge pull request #41585 from cro/sign_minion_messages
...
Sign_minion_messages support
2017-06-13 16:14:40 -05:00
twangboy
22601201c4
Add note about salt-master on Windows
2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7
Remove references to salt master installation
2017-06-13 15:02:44 -06:00
rallytime
bdf33d7f5f
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-06-13 09:26:05 -06:00
rallytime
5150916556
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/parted.py
2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3
Update version in master-tops docs
...
This paragraphs is referring to #37322 , which was pushed to Oxygen.
2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809
Remove note about version incompatibility with salt-cloud
...
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
2017-06-12 11:16:52 -06:00
C. R. Oldham
dadf4b851c
Add documentation to the example master and minion configuration files.
...
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
2017-06-08 13:18:53 -06:00
Mike Place
94aa1876d4
Merge pull request #41546 from cloudflare/dns-grains
...
Add host_dns grain for napalm
2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d
Indent correctly the code block
2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576
Reference new Jinja filters in the release notes
2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479
Small adjustment
2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a
More jinja references
2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873
Restructure the Jinja topic to have refrences
2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04
Add notes regarding other new features
2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2
Fix indentation for better display
2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5
salt.beacons.log instead of 'Log'
2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed
Remove service state, not a new one
2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846
Index new modules introduced in Nitrogen
2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c
Remove the reference to the profile outputter
2017-06-06 12:49:04 +00:00
Mircea Ulinic
fb12353a1d
Insert note in the Nitrogen release
2017-06-01 11:42:53 +00:00
Mike Place
cec5af7ce3
Merge pull request #41437 from Ch3LL/fix_gce_net
...
Remove ex_subnetwork requirement for GCE
2017-05-26 17:04:06 -05:00
rallytime
de85b49b90
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/config/__init__.py
- salt/modules/cp.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/gzip_util.py
- tests/integration/shell/test_cp.py
2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec
Merge pull request #41413 from gtmanfred/nitrogen
...
Write tests for Venafi runner
2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69
Merge pull request #41398 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-26 09:17:48 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE
2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d
add venafi to table of contents
2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c
fix doc
2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8
Updated documentation for Venafi module with better examples & clarifications
2017-05-25 10:26:54 -06:00
David Boucha
5eb27571a0
Correct doc to actually blacklist a module
2017-05-24 17:22:36 -06:00
rallytime
9ff2694155
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/salt-minion.service
- salt/modules/junos.py
- salt/modules/localemod.py
- salt/modules/win_system.py
- salt/states/junos.py
- tests/unit/modules/test_localemod.py
- tests/unit/modules/test_win_powercfg.py
- tests/unit/states/dockerng_test.py
2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec
Fix typos
...
lintian found several spelling errors.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2017-05-24 12:50:29 +02:00