valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,677 Commits 24 Branches 182 Tags 341 MiB
73f4c43e2a
Commit Graph

76677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
4f7ac1431e Create a unit test for the _replace_auth_key function in the ssh module 
References Pull Request #39855
 2017-03-28 16:27:53 -06:00
Nitin Madhok
7c144888da Backporting changes in vmware cloud driver from develop branch to 2016.11 branch 2017-03-28 16:29:58 -04:00
Erik Johnson
a8bcaa73d7 Force use of posixpath when joining salt fileserver paths in gitfs 2017-03-28 14:20:21 -05:00
Erik Johnson
cafa08d8e0 Add ability for salt.utils.path_join to force the use of posixpath 
Also remove unused and unnecessary behavior from this function when the
first path component is of single length. An empty first parameter to
this function will normalze to "." and result in an incorrectly-joined
result.
 2017-03-28 14:18:29 -05:00
Nicole Thomas
96bf9427b0 Merge pull request #40368 from Ch3LL/bump_version_3 
[2016.3] Bump previous version to 2016.3.6
 2017-03-28 12:51:01 -06:00
Nicole Thomas
6162698c87 Merge pull request #40369 from Ch3LL/bump_version_11 
[2016.11] Bump previous version to 2016.3.6
 2017-03-28 12:50:39 -06:00
Ch3LL
7597d96edb [2016.11] Bump previous version to 2016.3.6 2017-03-28 12:39:45 -06:00
Ch3LL
a02fa7dd1f [2016.3] Bump previous version to 2016.3.6 2017-03-28 12:38:45 -06:00
rallytime
4f1543c2a1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-28 10:29:41 -06:00
Mike Place
2d2cb5b837 Merge pull request #40333 from gtmanfred/2016.11 
fix some test=True comments
 2017-03-28 10:11:00 -06:00
zer0def
d68067f1d7 Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes 2017-03-28 16:39:19 +02:00
zer0def
4f23a23ca8 Fixed the test_install_download_cache_argument_in_resulting_command to accomodate introduced cache directory argument fixes and renamed it to test_install_download_cache_dir_arguments_in_resulting_command. 2017-03-28 11:53:54 +02:00
zer0def
9d0f94eeba Fixed unnecessary API changes introduced with suggested changes. 2017-03-28 10:45:04 +02:00
Nicole Thomas
bb37f133fc Merge pull request #40347 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-27 20:39:30 -06:00
Mike Place
1381f97292 Merge pull request #40264 from meaksh/2016.3-gather_job_timeout-fix 
Makes sure "gather_job_timeout" is an Integer
 2017-03-27 17:52:50 -06:00
rallytime
e77e86db3a Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-27 17:27:49 -06:00
Daniel Wallace
5596620dfb fix some test=True comments 
Alternatives should say it is setting the symlink to `path` instead of
`current` which it is already set to

ssh_auth.absent should say it is going to remove the key, unless the status is
set to `add`, then it is already absent

Fixes #40322
Fixes #40321
 2017-03-27 18:19:52 -05:00
Mike Place
a572b46183 Merge pull request #40346 from saltstack/revert-40332-pip-cache-fixes 
Revert "Fixes related to cache directory argument changes in pip>=6."
 2017-03-27 17:17:28 -06:00
Mike Place
b4753d1a5a Revert "Fixes related to cache directory argument changes in pip>=6." 2017-03-27 17:17:18 -06:00
Mike Place
a91bab867e Merge pull request #40326 from L4rS6/update-mount-state-doc 
Update mount state documentation (Fixes: #40296)
 2017-03-27 17:15:52 -06:00
Mike Place
ca2980cfb0 Merge pull request #40328 from L4rS6/fix-mount-state-extra-ignore-fs-key 
Fixes wrong compared extra_mount_ignore_fs_keys key.
 2017-03-27 17:14:22 -06:00
Mike Place
3a6c5d0297 Merge pull request #40329 from isbm/isbm-merge-tops-201611 
Merge tops (backport)
 2017-03-27 17:13:46 -06:00
Mike Place
17ab1da0ab Merge pull request #40345 from twangboy/fix_osx_build 
Fix osx build
 2017-03-27 17:05:29 -06:00
Mike Place
2b7b2f1cb4 Merge pull request #40285 from rallytime/docker-test-fixes 
Dockerng unit tests fixes: isolate global variables
 2017-03-27 17:05:02 -06:00
Nicole Thomas
7ab10491ab Merge pull request #40338 from UtahDave/fix_cherrypy_ssl_error_link 
Upstream cherrypy moved to Github from Bitbucket
 2017-03-27 16:00:38 -06:00
Mike Place
01efc842c1 Merge pull request #40341 from twangboy/fix_win_service 
Fix service.create, fix docs
 2017-03-27 15:46:18 -06:00
Mike Place
8eabcca6dc Merge pull request #40332 from zer0def/pip-cache-fixes 
Fixes related to cache directory argument changes in pip>=6.
 2017-03-27 15:01:15 -06:00
Mike Place
ceba1b9bc6 Merge pull request #40337 from Ch3LL/add_unzip_test 
Add archive.extracted with use_cmd_unzip argument
 2017-03-27 15:00:22 -06:00
Mike Place
a192597ec2 Merge pull request #40312 from rallytime/cache-docs 
Update minion data cache documentation
 2017-03-27 14:56:55 -06:00
twangboy
3207d670c5 Fix osx build 2017-03-27 14:52:19 -06:00
twangboy
6736457ec8 Docs for create 2017-03-27 11:49:19 -06:00
twangboy
652cf08f8a Fix service.create, fix docs 2017-03-27 11:44:18 -06:00
rallytime
0f263a52e0 Mock out the get_client_args mocks in the dockerng module tests more aggressively 
The tests pass fine when run independently, but when the full unit test suite
runs, the dockerng state tests are setting global values. This change makes the
module tests avoid those problem by relying on its own mocks.
 2017-03-27 11:27:52 -06:00
David Boucha
280b501950 Upstream cherrypy moved to Github from Bitbucket 2017-03-27 10:45:34 -06:00
Ch3LL
8b21b4c8bb add use_cmd_unzip test 2017-03-27 10:32:27 -06:00
Nicole Thomas
7f16754619 Merge pull request #40315 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-27 09:11:24 -06:00
Nicole Thomas
a9a73bf8dc Merge pull request #40313 from techhat/calcref 
Add minimum and maximum to calls to calc
 2017-03-27 08:54:14 -06:00
zer0def
7976840100 Fixes related to cache directory changes in pip>=6. 2017-03-27 16:29:41 +02:00
Bo Maryniuk
a762c9edda Merge output from master_tops 2017-03-27 11:37:06 +02:00
Lars Wagner
f0f68b9033 Fixes wrong compared extra_mount_ignore_fs_keys key. 2017-03-27 11:00:15 +02:00
Lars Wagner
a717c527a1 Update mount state documentation (Fixes: #40296) 2017-03-27 10:46:53 +02:00
Benjamin Drung
fbf8fcfa98 Simplify _get_envs() by using list comprehensions 
final_list creates an ordered intersection of env_order and client_envs
without duplicates. Instead of creating a intersection set, remove the
duplicates in env_order and generate the ordered intersection with a
simple list comprehension.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-03-27 10:33:41 +02:00
Benjamin Drung
74a3b066ea Fix top_file_merging_strategy warning if env_order is set 
According to the documentation, the env_order config option allows one
to explicitly define the order in which top files are evaluated, when
top_file_merging_strategy is set to merge, and no environment is
specified for a highstate.

Despite honoring the environment order specified in env_order in
BaseHighState._get_envs(), salt still prints a warning recommending
setting env_order. Thus silence the warning when env_order is set.

fixes #29104

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-03-27 10:31:08 +02:00
Benjamin Drung
ec219b5f42 Remove duplicate client_envs variable definitions 
self.client.envs() is called twice and assigned to client_envs and
client_env_list. Remove one of both variables since they are not
modified before usage.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-03-27 10:31:08 +02:00
Joseph Hall
7106a86258 Use named kwargs 2017-03-25 06:34:19 -06:00
rallytime
c65d602f60 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
 2017-03-24 17:11:49 -06:00
Nicole Thomas
9d0762deca Merge pull request #40277 from eldadru/Fix-40247-boto_rds-delete-wait-for-deletion-failure 
Fixing boto_rds.py delete() wait_for_deletion,  if statement was inco…
 2017-03-24 16:29:24 -06:00
Nicole Thomas
6c29c81d01 Merge pull request #40280 from bewing/bp_40273 
Clean up temporary file in net.load_template
 2017-03-24 16:27:04 -06:00
Nicole Thomas
7c21153d3a Merge pull request #40300 from meaksh/2016.3-adding-timeouts-parameters-to-cmd_batch 
Fixes 'timeout' and 'gather_job_timeout' kwargs parameters for 'local_batch' client
 2017-03-24 16:25:21 -06:00
Nicole Thomas
839b620f32 Merge pull request #40310 from gtmanfred/2016.11 
add warning when no host/dns record is found for fqdn_ip
 2017-03-24 15:55:19 -06:00