SaltyCharles
|
9b505d955b
|
fix typos
fix typos for clarity
|
2017-10-20 13:45:41 -07:00 |
|
SaltyCharles
|
730c1a390f
|
fix typo
fix typo for clarity
|
2017-10-20 13:41:44 -07:00 |
|
SaltyCharles
|
e33c94a89b
|
fix typos
fix typos for clarity
|
2017-10-20 13:27:59 -07:00 |
|
SaltyCharles
|
3d068357c1
|
fix typos
fix typos for clarity
|
2017-10-20 13:25:14 -07:00 |
|
SaltyCharles
|
56e23f8773
|
fix typo
fix typo for clarity
|
2017-10-20 13:18:50 -07:00 |
|
SaltyCharles
|
6d5409efb8
|
fix typo
fix typo for clarity
|
2017-10-20 13:13:16 -07:00 |
|
SaltyCharles
|
580feea5a7
|
fix typos
fix typo's for clarity
|
2017-10-20 13:10:36 -07:00 |
|
Alex moore
|
f879f322a6
|
Revert changes to pgjsonb from 553aaad105
|
2017-10-20 14:04:20 -06:00 |
|
Alex moore
|
785f33558d
|
Merge branch 'develop' of github.com:almoore/salt into develop
|
2017-10-20 14:02:50 -06:00 |
|
rallytime
|
098f4cfec8
|
Merge branch '2017.7' into merge-develop
|
2017-10-20 12:44:39 -04:00 |
|
Nicole Thomas
|
d7dc2bd0e8
|
Merge pull request #44208 from twangboy/win_fix_group.present
Fix some lint in PR: 44080
|
2017-10-20 12:42:01 -04:00 |
|
twangboy
|
61e2e9ccda
|
Fix some lint
|
2017-10-20 09:59:54 -06:00 |
|
Sergey Kacheev
|
e9699de94c
|
Merge branch 'develop' into fix_requests_ssl_verify_error
|
2017-10-20 22:57:24 +07:00 |
|
Sergey Kacheev
|
b9f7b41f95
|
add ".. versionadded:: Oxygen" tag
|
2017-10-20 22:54:53 +07:00 |
|
Vernon Cole
|
b7c0182d93
|
correct and clarify documentation
|
2017-10-20 09:24:26 -06:00 |
|
Nicole Thomas
|
a7a841d9d2
|
Merge branch '2017.7' into git-noexec-fix
|
2017-10-20 11:08:20 -04:00 |
|
garethgreenaway
|
1227c54626
|
Merge pull request #44204 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 25
|
2017-10-20 08:07:27 -07:00 |
|
Nicole Thomas
|
012477071f
|
Merge pull request #44071 from garethgreenaway/various_beacon_fixes
[develop] Various fixes to beacons
|
2017-10-20 11:06:27 -04:00 |
|
rallytime
|
c830f0f8f4
|
Add some space in new opsgenie docs for rst formmating
Follow up to #43821
These fixes will help the docs render correctly with the various
examples given.
|
2017-10-20 10:59:37 -04:00 |
|
rallytime
|
9da66a2bb9
|
Reduce the number of days an issue is stale by 25
|
2017-10-20 10:53:11 -04:00 |
|
rallytime
|
3b9d02977d
|
Update deprecated salt.utils paths to new salt.utils.x paths
|
2017-10-20 10:48:37 -04:00 |
|
rallytime
|
2617cf851f
|
Merge branch '2017.7' into 'develop'
Conflicts:
- salt/modules/aptpkg.py
- salt/utils/win_functions.py
- tests/unit/states/test_mount.py
|
2017-10-20 10:44:29 -04:00 |
|
rallytime
|
99ff7a5c12
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- salt/utils/virtualbox.py
|
2017-10-20 10:36:37 -04:00 |
|
Oleg Iurchenko
|
f3f3090794
|
Fix Salt CI issues
|
2017-10-20 14:35:26 +00:00 |
|
Nicole Thomas
|
c6d27ada51
|
Merge pull request #43843 from twangboy/win_unit_test_mount
Fix `unit.states.test_mount` for Windows
|
2017-10-20 10:27:25 -04:00 |
|
Nicole Thomas
|
09ddfd0c08
|
Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
Fixes to modules/debian_ip
|
2017-10-20 10:25:38 -04:00 |
|
Nicole Thomas
|
4b0f177adf
|
Merge pull request #43838 from bodhi-space/infra5669_2
INFRA-5669 - add retry loops for API rate limiting in ELB health_check funcs
|
2017-10-20 10:04:59 -04:00 |
|
Vernon Cole
|
6580c6d28f
|
lint fix
|
2017-10-20 08:03:22 -06:00 |
|
Nicole Thomas
|
33ad43eec0
|
Merge pull request #44085 from kstreee/fix-inconsistent-exception-handling
Fixes inconsistent exception handling in rest_tornado.
|
2017-10-20 09:18:28 -04:00 |
|
Nicole Thomas
|
372b9f14b5
|
Merge pull request #43821 from bcelenk/opsgenie-modules
Add OpsGenie's execution and state modules
|
2017-10-20 09:16:47 -04:00 |
|
Nicole Thomas
|
c700cd9c1e
|
Merge pull request #44162 from rallytime/jinja-test-imports
Reorder and group imports in jina template unit tests
|
2017-10-20 09:09:40 -04:00 |
|
Nicole Thomas
|
c3349d6b49
|
Merge pull request #43858 from eyj/boto_asg
Boto_ASG fixes for scaling policy rate limiting and tag conversion
|
2017-10-20 09:08:41 -04:00 |
|
Nicole Thomas
|
12980a6961
|
Merge pull request #43476 from Shados/ssh_known_hosts_improvements
Improvements to SSH known_hosts handling
|
2017-10-20 09:07:20 -04:00 |
|
Oleg Iurchenko
|
8193b2f32a
|
Add client version discovery to Keystone module
This patch adds keystoneclient.discover.Discover feature to Keystone module
|
2017-10-20 09:39:28 +00:00 |
|
Sergey Kacheev
|
9afc2e94df
|
pass "verify" from runner to make_request
|
2017-10-20 16:20:23 +07:00 |
|
Sol Kim
|
fa7e34324f
|
Merge branch 'develop' into fix-inconsistent-exception-handling
|
2017-10-20 17:36:08 +09:00 |
|
Sergey Kacheev
|
16fbb1383f
|
Merge branch 'develop' into fix_requests_ssl_verify_error
|
2017-10-20 12:49:23 +07:00 |
|
Vernon Cole
|
cea457efa0
|
more better documentation, fix parameter handling
|
2017-10-19 20:14:07 -06:00 |
|
Vernon Cole
|
d3769b3568
|
add saltify wake-on-lan and document it
|
2017-10-19 20:14:07 -06:00 |
|
Mike Place
|
2551454f6a
|
Add absolute_import
|
2017-10-19 18:26:08 -05:00 |
|
Mike Place
|
19a5383c59
|
Merge pull request #43966 from pratik705/create-route-to-send-traffic-by-natting_for_GCP
create route to send traffic by natting for_GCP
|
2017-10-19 18:01:05 -05:00 |
|
Mike Place
|
9f9e936b52
|
Merge pull request #43830 from rallytime/bp-43644
Back-port #43644 to 2016.11
|
2017-10-19 17:57:50 -05:00 |
|
Eric Radman
|
6da4fd979b
|
Check file attributes in check_file_meta() if lsattr(1) is installed
lsattr/chattr is not installed on many Unix-like platforms by default,
including *BSD, Solaris, and minimal Linux distributions such as Alpine.
|
2017-10-19 18:38:12 -04:00 |
|
Mike Place
|
bdfefd1549
|
Merge branch 'develop' into sentry_mod
|
2017-10-19 17:33:27 -05:00 |
|
Mike Place
|
07db6a3d8b
|
Merge pull request #43994 from oeuftete/fix-manage-runner-presence
Fix manage.present to show lost minions
|
2017-10-19 17:27:58 -05:00 |
|
Mike Place
|
372820ea38
|
Merge pull request #44111 from alprs/fix-deb8-py3-oscodename
Try to correctly parse debian codename from /etc/os-release
|
2017-10-19 17:23:25 -05:00 |
|
Mike Place
|
a07537e258
|
Merge pull request #44188 from terminalmage/issue44150
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
|
2017-10-19 17:20:34 -05:00 |
|
Mike Place
|
1e3abfea59
|
Merge branch 'develop' into various_beacon_fixes
|
2017-10-19 15:58:01 -05:00 |
|
Mike Place
|
cc2c99c94c
|
Merge branch 'develop' into fix-inconsistent-exception-handling
|
2017-10-19 15:53:24 -05:00 |
|
Mike Place
|
68ed8c21b2
|
Merge branch 'develop' into jinja-test-imports
|
2017-10-19 15:42:20 -05:00 |
|