Mike Place
27315c31c8
Add release note about ssh rosters
2017-09-12 10:41:06 -06:00
Mike Place
87ffd3f105
Merge pull request #42103 from davidjoliver86/ssh-config-roster
...
ssh config roster for salt-ssh
2017-09-12 10:38:49 -06:00
Erik Johnson
626129f5a3
Import all of configparser into module for easier access to error classes
2017-09-12 11:37:13 -05:00
Erik Johnson
507c1b871e
Add a GitConfigParser class for manipulating git config files
...
This class is designed to be used for (among other things) gitfs and git_pillar, to enforce config settings which reside in a git config file without resorting to using the git CLI.
2017-09-12 11:37:13 -05:00
Mike Place
50720846a6
Merge pull request #42756 from terminal-labs/develop
...
Adding fingerprint_hash_type to known host example.
2017-09-12 10:30:26 -06:00
spenceation
dfc44b8d14
Added Cisco UCS Chassis associated modules.
2017-09-12 12:25:58 -04:00
Mike Place
1a81663e46
Merge pull request #43302 from lyft/upstream-boto_cloudfront
...
Upstream boto_cloudfront execution and state modules
2017-09-12 10:10:20 -06:00
garethgreenaway
a29a9855a6
Fixing typo.
...
Fixing typo.
2017-09-12 08:47:55 -07:00
Mike Place
4f1e3bc24d
Merge pull request #43321 from sdodsley/purefa_module
...
Add module to control Pure Storage FlashArray
2017-09-12 09:37:21 -06:00
Nicole Thomas
f1a93401d1
Merge pull request #43425 from garethgreenaway/42135_isolate_salt_scheduler
...
Isolate Salt Scheduler
2017-09-12 09:05:06 -04:00
Nicole Thomas
4b5bf54aa8
Merge pull request #43450 from mc/typofix20170912
...
typofix 'tempalte' => 'template'
2017-09-12 09:00:55 -04:00
ribx
b712f971f7
Merge branch 'develop' into develop
2017-09-12 11:49:29 +02:00
Rico Gloeckner
f452860316
typofix 'tempalte' => 'template'
2017-09-12 08:24:56 +02:00
Simon Dodsley
a8bfa4574c
Merge branch 'develop' into purefa_module
2017-09-11 20:54:39 -04:00
Aneesh Agrawal
2e9f1999f6
Upstream boto_cloudfront execution and state modules
...
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
2017-09-11 23:36:31 +00:00
Mike Place
b4ca024e44
Merge pull request #43117 from garethgreenaway/slack_engine_class_fixes
...
Slack engine class fixes
2017-09-11 16:33:31 -06:00
Mike Place
ea4f903ed9
Merge pull request #43389 from raazvvann/nilrt_ip-fix-DNS
...
nilrt_ip: Fix DNS
2017-09-11 16:26:58 -06:00
Nicole Thomas
2681b7d3fa
Merge branch '2017.7' into 43386_2017_7_schedule_kwargs_pub
2017-09-11 18:06:08 -04:00
Mike Place
5378ac7756
Merge pull request #41547 from cloudflare/px_merge_pillar_opts
...
Override proxy minion opts with pillar data
2017-09-11 15:47:50 -06:00
Mike Place
08d102c869
Merge pull request #41943 from twangboy/win_unit_test_local_cache
...
Fix `unit.returners.test_local_cache` for Windows
2017-09-11 15:34:02 -06:00
Gareth J. Greenaway
8140cab71d
Swapping the default value for the standalone from None to False to be more clear.
2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
54cb69edec
Renaming isolate to standalone
2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
980d3f4a53
Adding the ability to isolate the scheduler to run outside of Salt minion or Salt master.
2017-09-11 14:31:00 -07:00
Mike Place
50ab79f0cb
Merge pull request #43424 from twangboy/win_unit_test_hosts
...
Fix `unit.modules.test_hosts` for Windows
2017-09-11 15:28:41 -06:00
Mike Place
2ac185b055
Merge pull request #43439 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-11 15:18:40 -06:00
Simon Dodsley
0344245423
Merge branch 'develop' into purefa_module
2017-09-11 17:17:36 -04:00
Mike Place
2c28156b89
Merge pull request #41619 from skizunov/develop2
...
Add ability to set minion ID by module
2017-09-11 15:16:50 -06:00
Mike Place
abb06552ec
Merge pull request #43444 from garethgreenaway/43386_develop_schedule_kwargs_pub
...
[develop] Fixes to scheduler __pub values in kwargs
2017-09-11 15:13:07 -06:00
Joseph Nix
b7e42a279d
Merge branch 'develop' into develop
2017-09-11 15:25:33 -05:00
Mike Place
aad33df4af
Merge pull request #41845 from mc/develop
...
recomply modules/napalm_network.py to file.get_managed
2017-09-11 14:25:16 -06:00
Mike Place
0f0ed5a093
Merge pull request #42652 from skizunov/develop3
...
Fix loader.py's raw_mod() to look in all module dirs
2017-09-11 13:43:47 -06:00
Mike Place
bb8bffde1a
Merge pull request #42915 from garethgreenaway/missing_minions_branch
...
Show missing minions in lists & nodegroups
2017-09-11 13:38:55 -06:00
Mike Place
da16b6670a
Merge pull request #42752 from skizunov/develop4
...
Add config option to ensure jid is unique
2017-09-11 13:38:30 -06:00
Mike Place
5c5df57efb
Remove extra space for linter
2017-09-11 13:12:45 -06:00
Mike Place
9b60cc0d1f
Merge pull request #43137 from aogier/x-no-grains-on-jenkins
...
system group creation integration test
2017-09-11 13:09:36 -06:00
Mike Place
2de83b95af
Merge pull request #43182 from basepi/defaultgw
...
[Feature] Add grains to detect default gateway
2017-09-11 12:59:18 -06:00
Mike Place
0e42e8f9cc
Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh
...
Ext pillar config param gh
2017-09-11 12:58:01 -06:00
Mike Place
e7a411c7f4
Merge pull request #43252 from rallytime/utils-files-moves
...
Move salt.utils.istextfile to salt.utils.files.is_text_file
2017-09-11 12:42:40 -06:00
rallytime
5413a5337e
Lint: remove unused import
2017-09-11 14:34:20 -04:00
Mike Place
ca091bc8a4
Merge pull request #43438 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-09-11 12:33:38 -06:00
root
059ae3e46c
Add module to control Pure Storage FlashArray
...
Provides ability to manage volumes, hosts, hostgroup, protection groups
and volume snapshots.
2017-09-11 11:29:46 -07:00
Gareth J. Greenaway
7c03bc2ee7
Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item.
2017-09-11 11:23:14 -07:00
Gareth J. Greenaway
3fd59ed369
Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item.
2017-09-11 11:22:26 -07:00
Mike Place
940995c40d
Merge pull request #43273 from lordcirth/add-nfs-state
...
Add nfs_export state
2017-09-11 11:49:40 -06:00
Mike Place
49288993c0
Merge pull request #43437 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 30
2017-09-11 11:40:47 -06:00
Mike Place
a9592dd3e2
Merge pull request #43320 from twangboy/win_fix_alternatives
...
Fix `unit.modules.test_alternatives` for Windows
2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846
Merge pull request #43363 from twangboy/scratch_ini_tests
...
Fix `unit.modules.test_ini_manage` for Windows
2017-09-11 11:10:30 -06:00
Mike Place
673ce387c1
Merge pull request #43421 from gtmanfred/compat
...
Revert "Reduce fileclient.get_file latency by merging _file_find and …
2017-09-11 11:07:17 -06:00
rallytime
984fa35062
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/key.py
- salt/modules/mount.py
- salt/modules/system.py
- tests/unit/modules/test_mount.py
- tests/unit/modules/test_pam.py
- tests/unit/modules/test_parted.py
2017-09-11 12:55:39 -04:00
Mike Place
2964707e5d
Merge pull request #43341 from ixs/fedora-rh_ip
...
Fix rh_ip template use for Fedora
2017-09-11 10:30:53 -06:00