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
72,820 Commits 24 Branches 182 Tags 341 MiB
ce2070e2a3
Commit Graph

72820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
ce2070e2a3 Fix logic error in ckminions. 
Fixup for #35623
 2016-08-22 11:39:01 +09:00
Mike Place
5733fb7826 Merge pull request #35627 from cachedout/comment_boto_lambda_test 
Comment boto lambda test
 2016-08-21 21:48:47 +09:00
Mike Place
9757766c71 Better method to skip test. This way we can track it. 2016-08-21 21:47:08 +09:00
Mike Place
ab6ead3e63 This test was doing all sorts of things, raging from simply failing 
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney
 2016-08-21 21:43:52 +09:00
Mike Place
93182fabdc Merge pull request #35625 from cachedout/fix_more_locale_test 
Fix the rest of the locale tests on develop
 2016-08-21 16:23:09 +09:00
Mike Place
def20eb95d Fix the rest of the locale tests on develop 
Bad mocks
 2016-08-21 16:22:09 +09:00
Mike Place
d4a116cf93 Merge pull request #35624 from cachedout/fix_event_modifier 
Fix case where the printer functions would modify the event system
 2016-08-21 15:31:07 +09:00
Mike Place
96cd9f0a7d Fix case where the printer functions would modify the event system 
There was a case where the printer func passed into NamespacedEvent
could modify the data which was then passed onto the event bus. This,
in turn, would do things like converting ints to strings. This,
in turn, would then break when the master picked up the data on the
other end of the event bus and did things like pass that data to the
outputter system which was (in this case) expecting an int.

Resolves this test case: integration.runners.state.StateRunnerTest.test_orchestrate_output
 2016-08-21 15:27:50 +09:00
Mike Place
166029abd3 Merge pull request #35623 from cachedout/fixup_34954 
Still check for minions in cache list
 2016-08-21 13:54:31 +09:00
Mike Place
32f18b1209 Still check for minions in cache list 
Refs #34954
 2016-08-21 13:53:46 +09:00
Mike Place
c24bd158ad Merge pull request #35622 from cachedout/fix_cache_test 
Fix cache test on develop
 2016-08-21 13:36:29 +09:00
Mike Place
c4ea3cd073 Fix cache test on develop 2016-08-21 13:35:27 +09:00
Mike Place
9c4d87de41 Merge pull request #35620 from cachedout/fix_one_locale_mock 
Fix one broken locale unittest
 2016-08-20 22:44:56 +09:00
Mike Place
2452752fa6 Fix one broken locale unittest 2016-08-20 22:42:23 +09:00
Mike Place
f923ba82b5 Merge pull request #35619 from cachedout/make_runtest_issue_non_fatal 
Provide a cleaner error for older versions of salt-testing for runTest()
 2016-08-20 22:23:49 +09:00
Mike Place
520019f9a4 Provide a cleaner error for older versions of salt-testing for runTest() 2016-08-20 22:22:52 +09:00
Mike Place
0b81679cb7 Merge pull request #35550 from cachedout/subproc_encode 
Encode stdin to subproc calls for Py3 compat
 2016-08-20 22:17:38 +09:00
Mike Place
8e784c6e80 Merge pull request #35554 from cachedout/git_test_py3 
Fix git module test for py3
 2016-08-20 22:17:13 +09:00
Mike Place
fa392e33fe Merge pull request #35438 from cachedout/issue_35137 
Option to display id instead of name in state_ouptut: mixed
 2016-08-20 22:10:37 +09:00
Mike Place
e1fd997928 Typo 2016-08-20 12:14:15 +09:00
Mike Place
579358bb18 Merge pull request #35457 from jtand/properly_skip_win_firewall_test 
Win_firewall_test was not properly gated to windows
 2016-08-20 12:12:13 +09:00
Mike Place
1fb2c03e88 Merge pull request #35474 from twangboy/fix_windows_installer 
Hide minion config page, add master config file
 2016-08-20 12:11:37 +09:00
Mike Place
ce481ae3e7 Merge pull request #35477 from bodhi-space/infra1931 
INFRA-1931 - support (present/absent) for hosted zones in states/boto_route53
 2016-08-20 12:09:32 +09:00
Mike Place
b282d877e6 Merge pull request #35482 from raazvvann/dev/rheghedu/system-comments 
Add linux support for {get,set}_computer_desc CONTINUED
 2016-08-20 11:44:25 +09:00
Mike Place
e7405258d4 Merge pull request #35499 from cro/returner_self_destruct 
Returner self destruct
 2016-08-20 11:42:03 +09:00
Mike Place
41cda642d6 Merge pull request #35518 from cachedout/fix_parallels 
Fix Parallels module and associated tests
 2016-08-20 11:38:44 +09:00
Mike Place
f79976532d Remove debugging 2016-08-20 11:38:15 +09:00
Mike Place
2876e67ac4 Merge pull request #35530 from rallytime/remove_add_proxymodule_to_opts 
Remove add_proxymodule_to_opts from minion.py in Carbon
 2016-08-20 11:33:40 +09:00
Mike Place
05ea6b7083 Merge pull request #35532 from rallytime/remove_parse_args_and_kwargs 
Remove the parse_args_and_kwargs function from minion.py
 2016-08-20 11:32:31 +09:00
Mike Place
01f6489373 Merge pull request #35536 from rallytime/ssh_wrapper_state_deprecations 
Remove env references in salt-ssh state wrapper
 2016-08-20 11:27:25 +09:00
Mike Place
3900d9069d Lint 2016-08-20 11:10:59 +09:00
Mike Place
b9673b8b35 Str subst 2016-08-20 10:58:45 +09:00
Mike Place
37075ca229 Merge pull request #35557 from 10ne1/dev/ionel/fix-integration-test-tmpdir-cleanup 
tests/integration: wait for test children to terminate
 2016-08-20 10:57:22 +09:00
Mike Place
125f7a2c94 Merge pull request #35560 from cachedout/protect_iter_in_state 
Use list for iter in keys iteration in state compiler for py3
 2016-08-20 10:54:07 +09:00
Mike Place
61903666dd Merge pull request #35576 from shitler25oki/develop 
Updated user.py to redact password when test=true
 2016-08-20 10:52:34 +09:00
Mike Place
04610d0e5b Merge pull request #35596 from fillarios/develop 
Add 'os_family' grain mapping for FedBerry
 2016-08-20 10:51:32 +09:00
Mike Place
2df7f56841 Merge pull request #35607 from jmacfar/cpgeturl_makedirs 
Pass makedirs from cp.get_url through to fileclient
 2016-08-20 10:43:32 +09:00
jmacfar
bd70a12ec6 Pass makedirs through to fileclient 
Integration tests for get_url makedirs=True
 2016-08-19 12:18:05 -05:00
Atis Fillarios
d260de96c1 Add 'os_family' grain mapping for FedBerry 2016-08-19 16:22:21 +03:00
Mike Place
05636ec25e Merge pull request #35478 from dincamihai/fix-salt-returns-invalid-json 
Run self.close only if GC did not delete the class before the instance
 2016-08-19 18:21:33 +09:00
Joseph Hall
9dcf24e4e2 Allow extra opts to be passed when creating nodes (#35541) 
* Allow extra opts to be passed when creating nodes

* Allow cloud states to pass in opts
 2016-08-18 17:02:59 -06:00
Nicole Thomas
e0e24aab60 Merge pull request #35578 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-18 16:59:45 -06:00
rallytime
b2a89dbe9b Update other syspaths.SOCK_DIR references with __opts__['sock_dir'] in develop 2016-08-18 15:17:28 -06:00
rallytime
7b3fc41868 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/lxc.py
  - salt/cloud/clouds/nova.py
  - salt/cloud/clouds/vmware.py
  - salt/cloud/clouds/vsphere.py
  - salt/cloud/libcloudfuncs.py
  - salt/minion.py
  - salt/modules/yumpkg.py
  - salt/utils/cloud.py
 2016-08-18 14:37:42 -06:00
Nicole Thomas
f7a18234db Merge pull request #35571 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-18 13:50:03 -06:00
Nicole Thomas
9943224f10 adding the () to make changes work (#35573) 
without this change it won't ever show any changes
 2016-08-18 13:49:27 -06:00
rallytime
2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted 
This brings these tests inline with the changes made to salt.utils.systemd.booted
in #35510
 2016-08-18 13:31:26 -06:00
Erik Johnson
73b549ed00 Merge pull request #35572 from terminalmage/docs 
Fix poor formatting in pkg state docs
 2016-08-18 13:15:52 -05:00
Erik Johnson
7d7a7de9e6 Fix poor formatting in pkg state docs 2016-08-18 13:14:11 -05:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
 2016-08-18 12:09:51 -06:00