SaltyCharles
06047f6454
fix typo
...
fix typo for clarity
2017-10-20 13:51:12 -07: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
9da66a2bb9
Reduce the number of days an issue is stale by 25
2017-10-20 10:53:11 -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
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
Sol Kim
fa7e34324f
Merge branch 'develop' into fix-inconsistent-exception-handling
2017-10-20 17:36:08 +09: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
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
Mike Place
866a78a673
Merge pull request #44176 from vernondcole/simplify-saltify
...
Simplify saltify cloud driver
2017-10-19 14:37:17 -05:00
Nicole Thomas
f0175623ed
Merge branch 'develop' into ssh_known_hosts_improvements
2017-10-19 13:44:29 -04:00
Vernon Cole
4c8cd9c507
lint and comment fixes
2017-10-19 10:16:28 -06:00
Nicole Thomas
05d91f44f4
Whitespace fix
2017-10-19 11:44:17 -04:00
Nicole Thomas
6052bef2f4
Fixup warn_until messages
...
This change also updates the `salt.utils.warn_until` path to the new `salt.utils.versions.warn_util` path.
2017-10-19 10:28:27 -04:00
Nicole Thomas
b59cd3698e
Merge pull request #44177 from senthilkumar-e/redis_doc_update
...
Fixing default redis.host in documentation
2017-10-19 09:38:30 -04:00
Nicole Thomas
e52aac2587
Merge pull request #43649 from twangboy/win_installer_multimaster
...
Add support for multimaster setup
2017-10-19 09:20:44 -04:00
Nicole Thomas
f77fa8ec26
Merge pull request #44159 from benediktwerner/fix-shadow-test
...
Fix shadow module unit test if not root or the module is not present
2017-10-19 09:14:08 -04:00
Pratik Bandarkar
ed38db2702
create route to send traffic by natting for_GCP
...
A route is a rule that specifies how certain packets should be handled by the
virtual network. Routes are associated with virtual machine instances by tag,
and the set of routes for a particular VM is called its routing table.
For each packet leaving a virtual machine, the system searches that machine's
routing table for a single best matching route.
This module will create a route to send traffic destined to the Internet
through your gateway instance.
2017-10-19 09:31:16 +00:00
Senthilkumar Eswaran
44e37bf6e5
Fixing default redis.host in documentation
2017-10-18 22:08:26 -07:00
Vernon Cole
2b4f69e1f8
remove unused parameter
2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests
2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import
2017-10-19 03:17:16 +02:00
Nicole Thomas
3d5e3e51e9
Merge pull request #43454 from kunal-bajpai/fix_returner_core
...
Fix save_load which is never called for returner jobs
2017-10-18 15:39:12 -04:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests
...
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.
This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
2017-10-18 14:15:50 -04:00
kstreee
e210f12cb7
Fixes inconsistent exception handling in rest_tornado.
2017-10-19 02:22:23 +09:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow
2017-10-18 19:10:55 +02:00
Nicole Thomas
23deab2f4d
Merge branch 'develop' into boto_asg
2017-10-18 12:52:58 -04:00
Mike Place
990a454f99
Merge pull request #44153 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-18 10:51:14 -06:00
Vernon Cole
805d5106ed
remove references to salt-api from docs
2017-10-18 10:50:47 -06:00
Vernon Cole
33fb7331a9
convert netapi calls to client calls
2017-10-18 10:47:09 -06:00
Nicole Thomas
2261f0b3c5
Merge pull request #44089 from cetanu/patch-1
...
Catch on empty Virtualbox network addr #43427
2017-10-18 12:15:10 -04:00
Nicole Thomas
8d6e4df752
Merge pull request #44102 from pratik705/add-auto_delete-option-while-attaching_disk
...
add "auto_delete" option to "attach_disk" and "create_attach_volumes"
2017-10-18 12:13:01 -04:00
Nicole Thomas
255a20f0e7
Merge pull request #44123 from terminalmage/gitfs-singleton
...
Use one salt.utils.gitfs.GitFS instance per thread
2017-10-18 12:12:25 -04:00
Nicole Thomas
8fdf0fa91f
Merge pull request #44144 from b-harper/doc-venv_bin-state
...
add documentation for venv_bin in virtualenv_mod state
2017-10-18 12:10:18 -04:00
Nicole Thomas
c72deedc14
Merge pull request #44141 from wido/parted-units
...
parted: Cast boundary to string when checking unit type
2017-10-18 12:09:44 -04:00
garethgreenaway
ae5b58c64b
Merge pull request #44146 from rallytime/groupadd-cleanup
...
Replace salt utils import with correct salt.utils.files path
2017-10-18 07:23:54 -07:00
rallytime
d712031a43
Update to_unicode util references to new stringutils path
2017-10-18 09:44:55 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/opkg.py
- salt/utils/templates.py
- tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
rallytime
0311c2a4de
Replace salt utils import with correct salt.utils.files path
...
This fixes a couple of test failures in the develop branch and cleans up
a couple of formatting issues and import ordering.
2017-10-17 17:55:18 -04:00
Mike Place
afcaa0c591
Merge pull request #43913 from twangboy/win_fix_test_jinja
...
Fix `unit.templates.test_jinja` for Windows
2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1
Merge pull request #43917 from twangboy/win_unit_test_pillar
...
Fix `unit.test_pillar` for Windows
2017-10-17 15:06:45 -06:00
Mike Place
d15de697f8
Merge pull request #44058 from mkoderer/issues/44056
...
Use correct mac prefix for kvm/qemu
2017-10-17 14:45:56 -06:00
Mike Place
d8e909777d
Merge pull request #44014 from garethgreenaway/43961_sls_id_pillar
...
[develop] Additions to state.sls_id
2017-10-17 14:43:40 -06:00
Mike Place
72e39caed7
Merge branch 'develop' into 43961_sls_id_pillar
2017-10-17 14:43:22 -06:00
