valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,961 Commits 24 Branches 182 Tags 341 MiB
08a2863676
Commit Graph

66961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Calmer
a585341019 do not change kwargs in refresh while checking a value 2016-02-24 10:15:00 -07:00
C. R. Oldham
db7b675b09 We need one more mocked return from listdir. 2016-02-24 10:15:00 -07:00
C. R. Oldham
7a8ab2fc03 Can't add a tuple and a string. 2016-02-24 10:15:00 -07:00
Michael Calmer
6cc399ccd9 simplify checking the refresh paramater 2016-02-24 10:15:00 -07:00
Erik Johnson
51fa6e03e1 Use --set-upstream instead of --track to set upstream on older git 
This pull request also adds some DRY logic to reduce code duplication,
adds an additional comment to the state return data in the event that
git.checkout was run, and fixes a minor logging inaccuracy (a
str.format() placeholder was used in a string but that string did not
call .format(), so the placeholder was being logged).

Other changes:

* If a new branch needs to be checked out, a hard reset to remote_rev was
  unnecessarily being performed afterwards. This had no functional effect
  since the act of checking out the new branch will place HEAD at
  remote_rev, but the reset was still redundant.

* Also, when a new branch is being checked out, the tracking branch was
  being unnecessarily set, since the act of checking out the branch would
  setup the tracking branch if the rev being checked out is a branch.

Fixes #31229.
 2016-02-24 10:15:00 -07:00
Brendan McGrath
17bddb8119 Added sanity check: is 'pillar' in self.opts 
This fixes an exception that is thrown when using the 'when' clause in a
master scheduler. The master does not appear to create a 'pillar' entry
in self.opts
 2016-02-24 10:15:00 -07:00
abednarik
b59ff1f2da Fix Logrotate module. 
There is an issue reported #31137 where current logrotate module
create a .bak file, when using it. This will break logrotate since .bak
file will be left in /etc/logrotate.d directory.
At the same time and as a consecuence of fixing this, file.psed was
replace with file.replace since psed is deprecated since long time.

Fixes #31137.
 2016-02-24 10:15:00 -07:00
Mathieu Le Marec - Pasquet
16a06ddf3b Bring up ext_pillar rendering errors as well 2016-02-24 10:15:00 -07:00
Michael Calmer
3a41a7c740 add refresh option to more functions 2016-02-24 10:11:47 -07:00
Michael Calmer
93db6cbddc unify behavior of refresh 2016-02-24 10:09:04 -07:00
C. R. Oldham
6f04fc9192 Check to see if a path is a link, because it's likely that if it IS 
a link, one of the other paths points to it.  Ignore so we don't get
duplicates.
 2016-02-24 10:08:03 -07:00
C. R. Oldham
d92e2ea188 Some distros do not seem to have a /lib/systemd, but do have a /usr/lib/systemd 2016-02-24 10:08:03 -07:00
twangboy
78535f7306 Fix some formatting issues 2016-02-24 10:08:03 -07:00
Nicolas Delaby
d2bcc37416 Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-24 10:08:03 -07:00
twangboy
b0f2d3d9f6 Clarification for Windows Package Manger 
Formatting issues
 2016-02-24 10:08:03 -07:00
Mike Place
aa0a9a03dd Merge pull request #31458 from vutny/correct-doc-install-debian 
Correct installation documentation for Debian
 2016-02-24 10:01:09 -07:00
rallytime
42415a4a7b Make rpm_tags query more concise 2016-02-24 09:57:59 -07:00
Mike Place
cd595104bf Merge pull request #31449 from justindesilets/add-service_name-key-to-service-beacon 
Added the key value service_name to service beacon
 2016-02-24 09:56:15 -07:00
justinta89
2da5285c03 Added codeauthor 2016-02-24 09:56:11 -07:00
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09:00
Mike Place
89bc27c48b Merge pull request #31443 from jfindlay/blackout 
tests.runtests: add minion test runner
 2016-02-24 09:51:26 -07:00
rallytime
9965fe188a Added to pkg.info_installed test for RedHat and Suse systems 2016-02-24 09:50:52 -07:00
Bo Maryniuk
c0eab8b549 Add space before "assert" keyword 2016-02-24 17:46:49 +01:00
Bo Maryniuk
6bcb89a8f6 Implement list packages test 2016-02-24 17:45:33 +01:00
Bo Maryniuk
78837d2926 Add mocking data 2016-02-24 17:45:23 +01:00
Mike Place
330c4d8b0f Merge pull request #31457 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-24 09:42:17 -07:00
Mike Place
ef47a88202 Merge pull request #31359 from Ashald/feature/event-send-saltenv-pillarenv 
Include saltenv/pillarenv into data in event.send
 2016-02-24 09:40:54 -07:00
rallytime
47cc7c3466 Add error check when retcode is 0, but stderr is present 2016-02-24 09:32:36 -07:00
rallytime
294371243d Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE. 
Fixes #31366
 2016-02-24 09:32:36 -07:00
Mike Place
e553f18dc4 Merge pull request #31439 from rallytime/fix-31370 
Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name
 2016-02-24 09:24:46 -07:00
Bo Maryniuk
0b64b8137f Implement test for version compare, where python fall-back algorithm is called 2016-02-24 17:24:23 +01:00
Bo Maryniuk
18b30a3274 Implement test for version compare, where RPM algorithm is called 2016-02-24 17:24:05 +01:00
Nicole Thomas
fcb12dbe96 Merge pull request #31456 from RabidCicada/clarify-requisites-doc 
Clarified the form of requisite targets/requisite-references
 2016-02-24 09:24:00 -07:00
Nicole Thomas
3eeac55c6a Merge pull request #31382 from DSRCompany/issues/30183_fix_multimaster_failover 
Set auth retry count to 0 if multimaster mode is failover
 2016-02-24 09:13:37 -07:00
Denys Havrysh
42aa7eeafd Add section about installation from the Debian Main Repository 2016-02-24 17:48:37 +02:00
rallytime
94b3cf08c7 Merge branch '2015.5' into '2015.8' 2016-02-24 08:44:18 -07:00
Nicole Thomas
7dac1db55d Merge pull request #31453 from DSRCompany/issues/30431_get_url_large_file_2015.8_backbort 
Backport cp_geturl fix for large files into 2015.8
 2016-02-24 08:38:24 -07:00
Nicolas Delaby
5630401889 _api_mismatch was a good idea 
But impractical since dockerd doesn't necessarily return all configuration items.
 2016-02-24 16:34:45 +01:00
Kyle Stapp
87f4843490 Clarified the form of requisite targets/requisite-references 2016-02-24 10:34:03 -05:00
Denys Havrysh
07dece2f8f Remove duplicate post-installation section for Debian install guide 2016-02-24 17:30:51 +02:00
Nicole Thomas
52dae138bd Merge pull request #31448 from techhat/dnsarecord 
Properly handle A and AAAA records
 2016-02-24 08:29:07 -07:00
Nicole Thomas
b32dd6d332 Merge pull request #31452 from anandxoriant/develop 
Updated win_organization_name default value for vmware driver
 2016-02-24 08:27:27 -07:00
Denys Havrysh
10c05f6943 Add install section for Debian Stretch (Testing) from community repository 2016-02-24 17:26:20 +02:00
Denys Havrysh
b2c78e08dc Add note about supported Debian architectures on SaltStack corp repo 2016-02-24 17:24:44 +02:00
Bo Maryniuk
59eca53441 Adjust test case for the third package in the test static data 2016-02-24 16:06:53 +01:00
Bo Maryniuk
8034cf0b91 Add third test package static info 2016-02-24 16:06:33 +01:00
Bo Maryniuk
90f209569a Implement test for the upgrade_available 2016-02-24 15:52:18 +01:00
Bo Maryniuk
ad87e719d6 Bugfix: when only one package, no dict is returned. Still upgrade_available should return boolean. 2016-02-24 15:52:01 +01:00
Bo Maryniuk
7eb5f19cb4 Implement test for latest_available 2016-02-24 14:10:07 +01:00
Bo Maryniuk
e372c0b596 Implement test for the info_available 2016-02-24 13:59:05 +01:00