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
81,844 Commits 24 Branches 182 Tags 341 MiB
f3f76f9b86
Commit Graph

81844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nicole Thomas
4374e6b034 Replace "tbd" with release version information 2017-06-08 15:43:33 -06:00
rallytime
81413896d1 Lint: Add index numbers to format {} calls 2017-06-08 12:32:00 -06: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
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
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
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
Mike Place
143dad59af Merge pull request #41408 from s0undt3ch/nitrogen 
Partially revert 1b84bee06. Fixes #40517
 2017-06-07 12:05:25 -05:00
Daniel Wallace
6c7d68b97d don't overwrite args if they are passed to the script 2017-06-07 10:53:03 -06:00
David Murphy
7ab3319090 Update notrim check, netstat takes minutes if large number connections - 260K 2017-06-07 10:47:06 -06:00
Daniel Wallace
40fb6c6249 never run bg for onlyif or unless cmd states 2017-06-07 10:22:46 -06:00
Daniel Wallace
2a4633ce16 Set default for consul_pillar to None 
If these do not default to None, they will default to an empty string,
which could cause the pillar tree to leak to minions it should't.

Also, allow role and environment to be pulled from pillars or minion
config by using config.get

Fixes #41478
 2017-06-07 10:21:35 -06:00
Mike Place
45326ccdec Merge pull request #41621 from gtmanfred/mac 
Fix some mac tests
 2017-06-07 10:19:25 -05:00
Erik Johnson
34dd9ea862 Merge pull request #41255 from lordcirth/fix-sysctl-test-11 
linux_syctl.default_config(): only return path, don't create it
 2017-06-07 09:13:06 -05:00
Erik Johnson
913450bd45 Merge pull request #41620 from Ch3LL/skip_mac_git 
Skip git_pillar tests on MacOSX
 2017-06-07 09:07:01 -05:00
Nicole Thomas
832b96ea05 Merge pull request #41614 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-06 18:42:44 -06:00
Nicole Thomas
4cf577771b Merge pull request #41616 from rallytime/bp-41551 
Back-port #41551 to 2016.11
 2017-06-06 16:44:09 -06:00
rallytime
8aaadd8787 Revert "Update new pyroute2 unit test to conform with 2016.11 branch standards" 
This reverts commit 535b8e8d8e.
 2017-06-06 16:35:12 -06:00
Ch3LL
0e35605f20
Skip git_pillar tests on MacOSX 2017-06-06 17:17:57 -04:00
Mike Place
8f9ba1f258 Merge pull request #41615 from Ch3LL/fix_mac_clock 
Fix get_hwclock_aix test on MacOSX
 2017-06-06 15:52:32 -05:00
Gareth J. Greenaway
fda41ede76 Updating result values to be None for test cases. 2017-06-06 13:01:22 -07:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mike Place
e3dc585d01 Merge pull request #41607 from cloudflare/more-nitrogen-docs 
Index new modules introduced in Nitrogen
 2017-06-06 14:54:31 -05:00
Mike Place
4aadfc2d0e Merge pull request #41600 from rallytime/vultr-py3 
Fix vultr cloud driver to work with Python 3
 2017-06-06 14:52:02 -05:00
garethgreenaway
02f7a7d751 Merge pull request #41609 from gtmanfred/nitrogen 
load source files as binary
 2017-06-06 12:41:03 -07:00
Daniel Wallace
b25b487ceb create home directory for issue-1959 
Fixes https://github.com/saltstack/salt-jenkins/issues/388
 2017-06-06 13:32:57 -06:00
darenjacobs
53bca96328 Update __init__.py 
Fix for #35481
 2017-06-06 13:11:12 -06:00
Ch3LL
ea147701f4
Fix get_hwclock_aix test on MacOSX 2017-06-06 15:06:08 -04:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
 2017-06-06 12:57:44 -06:00
Mike Place
846ca54688 Merge pull request #41552 from Enquier/neutron-floatingip-remove 
Adding logic so that update_floatingip can dissassociate floatingip's
 2017-06-06 13:25:55 -05:00
Mike Place
53ecb5c4b0 Merge pull request #41553 from terminalmage/issue41527 
Fix installing RPMs via remote URLS which are 30x redirects
 2017-06-06 13:23:41 -05:00
Daniel Wallace
fd23f7dad3 Mark known flaky mac power test 2017-06-06 12:19:45 -06:00
Mike Place
b720ecb732 Merge pull request #41569 from gtmanfred/fix_test_result_check 
Check all entries in result
 2017-06-06 13:18:16 -05:00
Gareth J. Greenaway
003f2d9323 Following the documentation, when passed the test=True argument the runner and wheel functions should return a result value of False. 2017-06-06 11:16:06 -07:00
Mike Place
d9546c6283 Merge pull request #41599 from garethgreenaway/41540_fixes_to_archive_module 
Fixes to modules/archive.py
 2017-06-06 13:02:13 -05:00
garethgreenaway
bd6af111e3 Merge pull request #41608 from Ch3LL/fix_mac_user_test 
Disable home dir check for mac in test_user
 2017-06-06 10:25:49 -07:00
garethgreenaway
10ac80ee96 Merge pull request #41453 from peter-funktionIT/fix_win_pki_state_import_cert 
Update win_pki.py
 2017-06-06 10:15:54 -07:00