Daniel A. Wozniak
|
8c1b1dbd92
|
Use tmp pillar for signing policies
|
2019-04-02 19:48:52 +00:00 |
|
Daniel A. Wozniak
|
a0e245800d
|
fix unused import
|
2019-04-02 17:49:26 +00:00 |
|
Daniel A. Wozniak
|
7f5f7ddfd4
|
Fix requisite path
|
2019-04-02 17:49:25 +00:00 |
|
Daniel A. Wozniak
|
56304983d0
|
Fix signing policies path
|
2019-04-02 17:49:25 +00:00 |
|
Daniel A. Wozniak
|
0bd08261be
|
Fix issue #51869 and add cert signing test
|
2019-04-02 17:49:20 +00:00 |
|
Daniel Wozniak
|
28f947e35a
|
Merge pull request #52213 from garethgreenaway/beacon_state_dont_save_test_true
[2018.3] Don't save beacons when test=True
|
2019-03-28 18:04:33 -07:00 |
|
Daniel Wozniak
|
10d041b63e
|
Merge pull request #52344 from twangboy/os_release_embedded
Fall back to old way of getting osrelease grain if new way fails
|
2019-03-28 11:06:47 -07:00 |
|
Gareth J. Greenaway
|
e88d3ba2a2
|
Merge pull request #52345 from garethgreenaway/52197_incron_cannot_have_comments
[2018.3] removing use of comments from incron modules
|
2019-03-28 11:03:02 -07:00 |
|
Gareth J. Greenaway
|
070837aaa9
|
Merge branch '2018.3' into 52197_incron_cannot_have_comments
|
2019-03-28 10:08:38 -07:00 |
|
Megan Wilhite
|
27e6cbf26a
|
Merge pull request #52347 from Ch3LL/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-03-28 12:41:52 -04:00 |
|
Shane Lee
|
3eae05aa9a
|
Merge branch '2019.2' into fix_test_symlink_2019.2
|
2019-03-28 10:08:58 -06:00 |
|
Shane Lee
|
a77ec81e6f
|
Merge branch '2018.3' into fix_grains
|
2019-03-28 09:59:09 -06:00 |
|
Ch3LL
|
63962b547a
|
Merge branch '2018.3' into '2019.2'
Conflicts:
- salt/states/linux_acl.py
- salt/transport/ipc.py
|
2019-03-28 11:10:45 -04:00 |
|
Megan Wilhite
|
bda3ca2071
|
Merge pull request #51749 from terminal-labs/salt-cloud-map-alt-update
Salt cloud map alt update
|
2019-03-28 09:52:26 -04:00 |
|
Gareth J. Greenaway
|
8461608438
|
Updating the incron module, state module and tests to remove use of comments.
|
2019-03-27 16:53:28 -07:00 |
|
twangboy
|
74ab4d3792
|
Use old way to get osrelease if new way fails
|
2019-03-27 17:03:13 -06:00 |
|
Daniel Wozniak
|
a743fff416
|
Merge pull request #52113 from twangboy/fix_lgpo
Fix issue with default language in LGPO
|
2019-03-27 15:53:29 -07:00 |
|
Daniel Wozniak
|
7040643a82
|
Merge pull request #52172 from garethgreenaway/51959_fix_acl_present_output
[2018.3] Changes to linux_acl state.
|
2019-03-27 15:51:52 -07:00 |
|
Daniel Wozniak
|
45d6cadd9f
|
Merge pull request #52283 from dmurphy18/fix_cpe_name_amzn2
Update to allow for malformed CPE_NAME from some OS's
|
2019-03-27 15:50:58 -07:00 |
|
Daniel Wozniak
|
14a6b9d417
|
Merge pull request #52306 from terminal-labs/replace-ping-with-version
Replaced `test.ping` with `test.version`
|
2019-03-27 15:50:06 -07:00 |
|
Daniel Wozniak
|
7b2b5217bf
|
Merge pull request #51963 from DSRCorporation/bugs/49147_ipc_subscriber
Allow multiple instances of IPCMessageSubscriber in one process
|
2019-03-27 15:48:55 -07:00 |
|
Shane Lee
|
87bb513d63
|
Fix failing symlink test (#52145)
|
2019-03-27 14:58:57 -06:00 |
|
Dmitry Kuzmenko
|
37aeba3143
|
Minor: Fix typo in docstring
|
2019-03-27 23:39:00 +03:00 |
|
Dmitry Kuzmenko
|
cc46e9c498
|
Merge branch '2018.3' into bugs/49147_ipc_subscriber
|
2019-03-27 23:37:31 +03:00 |
|
Dmitry Kuzmenko
|
23733bde5a
|
Regression test for parallel IPCMessageSubscriber support
|
2019-03-27 23:33:10 +03:00 |
|
Daniel Wozniak
|
d3f4c9d4bf
|
Merge pull request #52314 from twangboy/fix_beacon_tests
Add the ability to pass a timeout to beacons
|
2019-03-27 12:11:12 -07:00 |
|
Alan Cugler
|
9ca0f72308
|
Changed where to mention the map files compatibility for minion configuration options.
This is a result of @Ch3LL suggestion on the PR itself for this doc change.
|
2019-03-27 12:42:03 -05:00 |
|
Alan Cugler
|
364ef065e8
|
Added mention of map file alternative for minion configuration options.
Fixes: #51127
|
2019-03-27 12:42:03 -05:00 |
|
twangboy
|
a5fa99a5c2
|
Add missing **kwargs
|
2019-03-27 11:33:32 -06:00 |
|
twangboy
|
7e88d0478a
|
Add the ability to pass a timeout to beacons
Update the tests to pass a longer timeout of 300 seconds, the default is
30
|
2019-03-27 11:33:32 -06:00 |
|
Megan Wilhite
|
8255901b33
|
document regex_replace Jinja filter (#52326)
Fixes #48952.
|
2019-03-27 10:14:07 -06:00 |
|
Gareth J. Greenaway
|
bad4e479cd
|
Merge pull request #52311 from garethgreenaway/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-03-26 11:31:31 -07:00 |
|
Gareth J. Greenaway
|
3211397cef
|
Merge pull request #52310 from garethgreenaway/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2019-03-26 11:31:14 -07:00 |
|
Gareth J. Greenaway
|
9324b83c53
|
Merge branch '2018.3' into merge-2018.3
|
2019-03-26 09:38:14 -07:00 |
|
Alan Cugler
|
c04ba6e35e
|
Changed a text artifact from the ping function to supporting text for the version function.
|
2019-03-26 09:58:26 -05:00 |
|
Gareth J. Greenaway
|
799a08bd5a
|
Merge branch '2019.2' into 51865_match_search_by_master
|
2019-03-25 15:06:24 -07:00 |
|
Gareth J. Greenaway
|
71e9b665ba
|
Merge pull request #52312 from terminal-labs/zone-clarification
Added in an explaination of the --zone flag
|
2019-03-25 15:03:13 -07:00 |
|
Gareth J. Greenaway
|
ae0e18fd8d
|
Merge branch '2018.3' into zone-clarification
|
2019-03-25 14:42:33 -07:00 |
|
Alan Cugler
|
e8c8dba161
|
Added in an explaination of the --zone flag
approved in #52251
|
2019-03-25 16:10:29 -05:00 |
|
Gareth J. Greenaway
|
11cd485a8b
|
Merge branch '2018.3' into merge-2019.2
Conflicts:
- doc/topics/installation/freebsd.rst
|
2019-03-25 13:42:28 -07:00 |
|
Gareth J. Greenaway
|
4908ed3048
|
Merge branch '2017.7' into merge-2018.3
|
2019-03-25 13:28:15 -07:00 |
|
Shane Lee
|
582d306164
|
Merge pull request #52307 from Akm0d/doc_fix
Fix x509 inconsistent file name in state example
|
2019-03-25 13:11:14 -06:00 |
|
Akmod
|
4da0fd62d3
|
Fix x509 inconsistent file name in state example
Solves issue: https://github.com/saltstack/salt/issues/52166
|
2019-03-25 11:47:27 -06:00 |
|
Alan Cugler
|
0b1eb00dc4
|
Replaced test.ping with test.version
Result of issue #52277
Any where `test.ping` still exists in the docs was left
because of the context in those docs.
|
2019-03-25 12:09:48 -05:00 |
|
Shane Lee
|
bb4a70409a
|
Merge branch '2018.3' into fix_lgpo
|
2019-03-25 09:26:01 -06:00 |
|
Gareth J. Greenaway
|
3ac6dbdd7a
|
Merge pull request #52190 from Ch3LL/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-03-22 18:09:32 -07:00 |
|
Gareth J. Greenaway
|
68c02b9c34
|
Merge branch '2019.2' into merge-2019.2
|
2019-03-22 17:36:18 -07:00 |
|
Shane Lee
|
2cdf48ed67
|
Merge pull request #52276 from terminal-labs/replace-github-dead-link
Replace GitHub dead link
|
2019-03-22 18:28:20 -06:00 |
|
Shane Lee
|
f5fc807c13
|
Merge pull request #52240 from soer7022/patch-2
Fix Typos "swtich" to "switch"
|
2019-03-22 18:08:49 -06:00 |
|
Shane Lee
|
d1308324a3
|
Merge branch '2019.2' into patch-2
|
2019-03-22 18:08:36 -06:00 |
|