Nicole Thomas
0f2ef2f85c
Merge pull request #42346 from edgan/patch-2
...
Document use of python methods in jinja
2017-07-19 09:53:25 -06:00
Nathan Grennan
4985e68f61
Update index.rst
2017-07-18 10:38:17 -07:00
Mike Place
1b683f2fca
Merge pull request #37003 from AndrewPashkin/gradual-pillar-loading
...
Make possible to reference previous pillars from subsequent pillars, as they specified in the top file
2017-07-18 12:13:56 -05:00
Nathan Grennan
0bfc1a2fb2
Document use of python methods in jinja
2017-07-17 12:24:41 -07:00
Mike Place
87361ca128
Merge pull request #42244 from alexbleotu/jinja_globals_gh
...
Jinja raise function and globals decorator
2017-07-17 13:16:36 -05:00
Mike Place
c7b3f6a09a
Merge pull request #42302 from rallytime/cloud-utils-fire-event-deprecation
...
Remove sock_dir deprecation warning from salt.utils.cloud.fire_event
2017-07-17 09:35:58 -05:00
rallytime
ffd3fae2c9
Add this change to the Oxygen release notes
2017-07-13 16:46:36 -06:00
rallytime
ccd78ed791
Remove Oxygen deprecation warning in lxc execution module
2017-07-13 16:42:42 -06:00
SaltyCharles
2ff1d814b2
fix typo
2017-07-12 12:26:53 -07:00
Andrew Pashkin
7d59f7a6c6
Make possible to reference pillars, that come before current pillar in the top file
2017-07-12 19:03:05 +03:00
Nicole Thomas
63718024fd
Merge branch 'develop' into jinja_globals_gh
2017-07-12 10:02:42 -06:00
Nicole Thomas
5f01dccf8f
Merge pull request #42214 from gtmanfred/develop
...
allow not verifying ssl winrm saltcloud
2017-07-11 17:33:21 -06:00
Alexandru Bleotu
346b1880e3
Merge branch 'develop' into jinja_globals_gh
2017-07-11 10:33:06 +01:00
shengis
e95316b145
Merge branch 'develop' into add_dns_for_azurearm
2017-07-10 23:01:52 +02:00
Aurélien FUSIL-DELAHAYE
340368fdac
add custom dns support for azurearm provider
...
- added option in documentation : dns_servers
2017-07-10 13:35:08 +02:00
Thomas Dutrion
6144af034a
Remove duplicate instruction in Openstack Rackspace config example
2017-07-09 11:34:14 +02:00
Daniel Wallace
ce6b05d237
add release note
2017-07-07 13:15:30 -06:00
Daniel Wallace
2dac634dd2
add document for winrm_verify_ssl
2017-07-07 13:15:30 -06:00
rallytime
8d960d463a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/grains/core.py
2017-07-06 17:42:30 -06:00
Nicole Thomas
df1ed8929d
Merge pull request #42109 from arthurlogilab/patch-20
...
[doc] Update aws.rst - add Debian default username
2017-07-06 10:58:25 -06:00
Nicole Thomas
afc19048bd
Merge pull request #42131 from gtmanfred/release
...
Add stuff to release notes
2017-07-05 13:33:14 -06:00
Daniel Wallace
e2b3160c96
fix up PR
2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11
add note about roster_defaults
2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468
add release note about about extmod blacklist and whitelist
2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8
Update salt-master first before updating salt-minion
...
Fixes #42124
2017-07-05 10:23:07 -06:00
Alexandru Bleotu
23f963f946
Added Errors section to jinja doc
2017-07-04 16:10:52 +01:00
Arthur Lutz
b78f179b19
[doc] Update aws.rst : typo fix
2017-07-04 14:21:11 +02:00
Arthur Lutz
8fcfb67ff5
Update aws.rst - add Debian default username
2017-07-04 14:00:10 +02:00
twangboy
5a5d70866a
Change repo_ng to repo-ng
2017-07-03 14:15:35 -06:00
rallytime
9227a1263d
Merge branch '2017.7' into 'develop'
...
No conflicts.
2017-06-30 10:00:01 -06:00
rallytime
3b87dbca12
Add the 'provider' key to salt.cloud.CloudClient.create()
...
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.
Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.
Fixes #41971
2017-06-29 14:38:09 -06:00
Erik Johnson
9a50e7c1ca
Merge remote-tracking branch 'upstream/2017.7' into merge-develop
2017-06-28 22:10:50 -05:00
rallytime
e512a29f08
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/state.py
- salt/modules/yumpkg.py
- salt/modules/zypper.py
- salt/states/pkg.py
- salt/version.py
- tests/unit/config/test_config.py
- tests/unit/modules/test_zypper.py
2017-06-28 11:31:53 -06:00
rallytime
7d7be2d375
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- doc/ref/configuration/master.rst
- tests/integration/states/test_archive.py
- tests/unit/transport/test_tcp.py
- tests/unit/transport/test_zeromq.py
2017-06-28 10:48:37 -06:00
Bo Maryniuk
c2b5e50d50
Add missing doc info for pressrelease
2017-06-26 14:38:19 +02:00
garethgreenaway
bd3ed3a7c5
Merge branch 'develop' into patch-1
2017-06-22 12:00:30 -07:00
Mike Place
c89cd2a4bf
Merge pull request #41890 from cachedout/locale_doc
...
Locale doc
2017-06-22 12:34:46 -05:00
Mike Place
fb008e6f84
Merge pull request #41144 from terminalmage/issue34775
...
gitfs: Add two new options to affect saltenv mapping
2017-06-22 12:05:49 -05:00
garethgreenaway
5709cbbde5
Merge branch 'develop' into patch-1
2017-06-22 09:34:39 -07:00
Mike Place
df5a112a9b
Merge pull request #41904 from twangboy/docs_win_add_firewall
...
Fix anchor to _linux-iptables
2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4
Fix anchor to _linux-iptables
2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks
2017-06-22 09:24:55 -06:00
Arno Schuring
e9d381ae6b
Merge branch 'develop' into execution-module-docs
2017-06-22 13:45:05 +02:00
Yagnik
2f32db6d7b
Update documentation of beacons
...
Update beacons documentation to let the user know that beacons can also be set in pillars like other configs.
2017-06-22 10:10:42 +05:30
Mike Place
679040c04b
Locale doc
2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980
Add additional commits to 2016.11.6 release notes
2017-06-21 17:15:11 -04:00
Erik Johnson
1279f56c56
gitfs: Add two new options to affect saltenv mapping
...
This adds 2 new config options:
- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored
It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
2017-06-21 12:42:48 -05:00
Erik Johnson
63823f3436
Do not merge master_tops and top file matches using set union
...
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.
The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.
In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
2017-06-20 15:04:34 -05:00
Mike Place
87a252fda7
Merge pull request #41852 from Ch3LL/rn_2017_py
...
Update 2017 Release Notes with Python Messages
2017-06-20 12:17:04 -05:00
Mike Place
f720a849ba
Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers
...
Things, that didn't made to 2017.7 for some reasons
2017-06-20 09:28:21 -05:00
