valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,079 Commits 24 Branches 182 Tags 341 MiB
c25ebe3a6e
Commit Graph

82079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
4d3399c6c4 Couple more typos, assert not asset. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
14a903ef61 Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
a531d01b26 Updating the assert tests for develop based on changes from 41569. 2017-06-09 09:16:09 -06:00
Nicole Thomas
564d5fd9d3 Merge pull request #41661 from whiteinge/rest_cherrypy-keys-headers 
Add note about avoiding the `-i` flag for the /keys endpoint
 2017-06-09 09:03:39 -06:00
Nicole Thomas
55ac7312bf Merge pull request #41657 from gtmanfred/nitrogen 
Disable libcloud test if the module doesn't load
 2017-06-09 08:58:06 -06:00
Nicole Thomas
f3f76f9b86 Merge pull request #41665 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-09 08:57:08 -06:00
Nicole Thomas
38424f3e3e Merge pull request #41660 from garethgreenaway/41651_fixing_aptpkg_held_unheld_with_test 
Fix to modules/aptpkg.py for unheld
 2017-06-09 08:53:22 -06:00
Enquier
293bc64158 Removed empty debug log 2017-06-08 22:53:54 -06:00
rallytime
093f96f84e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-08 16:45:34 -06:00
Nicole Thomas
a308b960d8 Merge pull request #41656 from rallytime/bp-41575 
Back-port #41575 to 2016.11
 2017-06-08 16:43:22 -06:00
Sergey Kizunov
154d6ce59e Don't invoke lspci if enable_lspci is False 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-08 17:05:04 -05:00
Nicole Thomas
c292b1161f Lint: quick fix to add missing blank line 2017-06-08 16:04:59 -06:00
Nicole Thomas
4374e6b034 Replace "tbd" with release version information 2017-06-08 15:43:33 -06:00
Seth House
a66ffc9d3e Add note about avoiding the -i flag for the /keys endpoint 2017-06-08 13:56:01 -06:00
C. R. Oldham
687872a488 Lint 2017-06-08 13:54:15 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
rallytime
81413896d1 Lint: Add index numbers to format {} calls 2017-06-08 12:32:00 -06:00
Gareth J. Greenaway
30da2370a4 Fix when test=True and packages were being set to unheld. 2017-06-08 11:21:35 -07:00
Mike Place
e6d37b5f3e Merge pull request #41456 from bdrung/fix-pkgrepo.managed-changes-check 
Fix pkgrepo.managed always return changes for test=true
 2017-06-08 13:21:04 -05:00
Mike Place
721e5b6cb9 Merge pull request #41530 from gtmanfred/2016.11 
Set default for consul_pillar to None
 2017-06-08 13:13:14 -05:00
Mike Place
8926d1c731 Merge pull request #41638 from gtmanfred/cmdscript 
don't overwrite args if they are passed to the script
 2017-06-08 12:48:48 -05:00
Johannes Scholz
d49a1579b0 Use re.escape to escape paths, before handing them to re.match 2017-06-08 19:40:54 +02:00
Johannes Scholz
ac240facca use correct variable 2017-06-08 19:36:37 +02:00
Johannes Scholz
c777eba2c1 Use re.escape to escape paths, before handing them to re.match 
Addresses #41365
 2017-06-08 19:31:27 +02:00
Daniel Wallace
5010e1a89d Disable libcloud test if the module doesn't load 
This is causing the mac tests to fail.  apache-libcloud 0.20.1 is what is being
imported, and the libcloud_dns module is not being used.
 2017-06-08 11:27:24 -06:00
Gareth J. Greenaway
d688a1cd88 Enable jobs scheduled on the master to fire their return data to the event bus 2017-06-08 10:25:11 -07:00
Mike Place
c5eee0a3a8 Merge pull request #41642 from Ch3LL/fix_mem_grain 
Change division from / to // for MacOSX mem_total grain
 2017-06-08 12:14:06 -05:00
Mike Place
c524f42951 Merge pull request #41643 from terminalmage/py3-tests 
Fix some test instability caused by the testprogram class
 2017-06-08 12:10:33 -05:00
Derek Schaller
384570384e only list top level npm modules during {un)install 2017-06-08 10:06:33 -06:00
Erik Johnson
0428617b52 Wait for orphans in test_exit_status_correct_usage 
Also ensure that the shutdown will be run even when assertions fail
 2017-06-08 00:44:52 -05:00
Erik Johnson
cb91437b08 Add wait_for_orphans to testprogram classes 
This allows for the shutdown function to also terminate any orphaned
processes which were spawned during the time between when
terminate_process is invoked, and when the processes are actually
killed.
 2017-06-08 00:25:53 -05:00
Erik Johnson
846200f11e Include terminate_process_list in import 2017-06-08 00:24:53 -05:00
Nicole Thomas
ecb09b8694 Merge pull request #41639 from dmurphy18/minion_netstat_check 
Update notrim check, netstat takes minutes if large number connections
 2017-06-07 17:03:23 -06:00
Nicole Thomas
2913a33b27 Merge pull request #41611 from garethgreenaway/41309_right_return_res 
Additional fixes to states/saltmod.py
 2017-06-07 16:58:24 -06:00
Ch3LL
0c3d6fc7d4
Change division from / to // for MacOSX mem_total grain 2017-06-07 17:30:28 -04:00
C. R. Oldham
e44673cdae Add caching of key. 2017-06-07 15:23:34 -06:00
Nicole Thomas
83cb447a96 Merge pull request #41641 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-07 13:52:14 -06:00
CEG
3d9871fe11 Cleaning up, removing debugging tests 2017-06-07 13:49:40 -06:00
CEG
c78e5feea9 Fixing error message 2017-06-07 12:46:13 -06:00
CEG
404dffb6b8 Debugging variable format 2017-06-07 12:45:38 -06:00
CEG
6fa3b976a5 removing string call 2017-06-07 12:37:00 -06:00
CEG
005995e1b0 modifying variable calls 2017-06-07 12:35:49 -06:00
CEG
9e5e7a38ec Testing variable changes 2017-06-07 12:32:50 -06:00
CEG
05e240f37f Debugging Format of floating_ip variable 2017-06-07 12:30:19 -06:00
CEG
366aca00a8 Adding Max version check for Nova since Cloud no longer operates at higher versions 2017-06-07 12:04:38 -06:00
rallytime
d54d5e077a Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
 2017-06-07 11:58:50 -06:00
Mike Place
334a5fc2a0 Merge pull request #41637 from gtmanfred/cmd 
never run bg for onlyif or unless cmd states
 2017-06-07 12:37:46 -05:00
CEG
6f66c9d10c Fixing response of floating_ip_show to align with other floating ip's. Spelling fix 2017-06-07 11:33:56 -06:00
CEG
58459adbe8 Adding ability to set a Floating IP by a specific IP address 2017-06-07 11:25:43 -06:00
Mike Place
143dad59af Merge pull request #41408 from s0undt3ch/nitrogen 
Partially revert 1b84bee06. Fixes #40517
 2017-06-07 12:05:25 -05:00