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
56,861 Commits 24 Branches 182 Tags 341 MiB
184801db19
Commit Graph

56861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evgeny Vereshchagin
184801db19 Unmask a runtime masked services too 2015-08-20 14:23:09 +00:00
Mike Place
103651d963 Merge pull request #26488 from cachedout/fix_unsupported_tornado_kwarg 
Don't pass unsupported kwarg to tornado
 2015-08-19 16:54:47 -06:00
Mike Place
da464a6dbe Merge pull request #26451 from terminalmage/issue26338 
Use 'rpm -qa' instead of repoquery to list installed packages
 2015-08-19 16:53:54 -06:00
Mike Place
fee4a7bb04 Merge pull request #26491 from jacobhammons/css-fix 
doc site css fix for tiny fonts that appeared in code or pre tags in …
 2015-08-19 16:46:44 -06:00
C. R. Oldham
e47f4df6f8 Merge pull request #26442 from rallytime/hide_api_key 
Hide API Key from debug logs for Linode Driver
 2015-08-19 16:30:28 -06:00
C. R. Oldham
d2d47ad553 Merge pull request #26441 from rallytime/linode_improvements 
Refactor a few linode functions to be useful with salt-cloud command
 2015-08-19 16:29:20 -06:00
Justin Findlay
01de0b8c69 Merge pull request #26485 from s0undt3ch/2015.8 
One more missed typo
 2015-08-19 15:15:18 -06:00
Mike Place
ef79125316 Merge pull request #26495 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-19 14:48:36 -06:00
Colton Myers
9cd7ec32bf Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-08-19 14:47:07 -06:00
Mike Place
4fff53b842 Merge pull request #26494 from cachedout/remove_debug_statements 
Remove unecessary debug statements
 2015-08-19 14:46:00 -06:00
Jenkins
d717a43dcc Remove unecessary debug statements 
These were throwing errors on some platforms:

Traceback (most recent call last):
  File "/testing/tests/unit/modules/random_org_test.py", line 296, in test_generateblobs
    format='hex'), ret6)
  File "/testing/salt/modules/random_org.py", line 743, in generateBlobs
    result = _query(api_version=api_version, data=data)
  File "/testing/salt/modules/random_org.py", line 125, in _query
    log.debug('result {0}'.format(result.text))
AttributeError: 'dict' object has no attribute 'text'
 2015-08-19 14:44:16 -06:00
Mike Place
49eebec30a Merge pull request #26492 from cachedout/fix_schedule_test_26 
Fix schedule test error on py26
 2015-08-19 14:36:40 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Jacob Hammons
2a85d71c25 doc site css fix for tiny fonts that appeared in code or pre tags in headings 2015-08-19 14:32:55 -06:00
Mike Place
7dac6ee6e0 Merge pull request #26489 from cachedout/more_tarfile_fix 
Fixing more tarfile tests on py2.6
 2015-08-19 14:13:28 -06:00
Jenkins
9149cfbeb2 Fixing more tarfile tests on py2.6 2015-08-19 14:12:18 -06:00
Jenkins
d2724d1aa3 Don't pass unsupported kwarg to tornado 
Refs #26212
 2015-08-19 14:04:56 -06:00
Pedro Algarvio
60c5d16330 One more missed typo 2015-08-19 19:43:37 +01:00
Mike Place
aec8de6206 Merge pull request #26475 from cachedout/check_not_none_async_req 
Better object checking on asyncreq cleanup
 2015-08-19 11:34:29 -06:00
Mike Place
ed71476ca2 Merge pull request #26477 from cachedout/fix_26_tarfile 
Fix integration.modules.git.GitModuleTest.test_archive on py26
 2015-08-19 11:34:06 -06:00
Jenkins
dbbe206e19 Fix integration.modules.git.GitModuleTest.test_archive on py26 
Fix borrowed from: http://stackoverflow.com/questions/6086603/statement-with-and-tarfile
 2015-08-19 11:31:38 -06:00
Mike Place
4d320e0c3c Merge pull request #26469 from jtand/2015.8 
--annotate and --message aren't valid options in older versions of git.
 2015-08-19 11:25:21 -06:00
Mike Place
c6626bad0f Check socket too 2015-08-19 11:21:15 -06:00
Mike Place
e213840f4b Better object checking on asyncreq cleanup 2015-08-19 11:15:35 -06:00
Colton Myers
e57f767244 Merge pull request #26439 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-19 10:39:04 -06:00
Justin Findlay
f46a0dab5d Merge pull request #26465 from rallytime/bp-26457 
Back-port #26457 to 2015.5
 2015-08-19 10:08:16 -06:00
Justin Findlay
d790538082 Merge pull request #26464 from rallytime/bp-26456 
Back-port #26456 to 2015.8
 2015-08-19 10:07:58 -06:00
Justin Findlay
1653ecbecd Merge pull request #26463 from rallytime/bp-26455 
Back-port #26455 to 2015.8
 2015-08-19 10:07:47 -06:00
justinta89
c542895bd2 --annotate and --message aren't valid options in older versions of git. 2015-08-19 09:09:34 -06:00
Arthur Lutz
b3f638ff0f docstring improvement for network.ping module execution 2015-08-19 08:47:24 -06:00
Arthur Lutz
16b79b6d3f docstring improvement for ProxyMinion 2015-08-19 08:45:58 -06:00
Arthur Lutz
4ce50ad5bf [doc] topology / proxyminions fix typos 2015-08-19 08:44:46 -06:00
Erik Johnson
7517654e6d Use 'rpm -qa' instead of repoquery to list installed packages 
Resolves #26338
 2015-08-18 23:29:14 -05:00
Erik Johnson
b3a0e40a0a Line width fixes + remove raw string formatting 2015-08-18 23:14:08 -05:00
Erik Johnson
ee85c901ea Merge pull request #26449 from s0undt3ch/2015.8 
The CLI options are not meant to include underscores.
 2015-08-18 22:49:49 -05:00
rallytime
ce0942117d Convert a couple more functions to be able to use salt-cloud command in Linode driver 2015-08-18 16:45:56 -06:00
Pedro Algarvio
dc58dbe5bf The CLI options are not meant to include underscores. 
Fixes #26444
 2015-08-18 23:18:09 +01:00
Mike Place
554b7a42f4 Merge pull request #26270 from sjorge/solaris-networking 
salt.modules.network now supports SmartOS and SunOS < Solaris 11
 2015-08-18 14:24:35 -06:00
Mike Place
d8ffb1c4c0 Merge pull request #26436 from TheBigBear/patch-10 
minor edits
 2015-08-18 14:23:36 -06:00
rallytime
fbfcef73ee Hide API Key from debug logs for Linode Driver 2015-08-18 13:30:53 -06:00
rallytime
6e781bc8c0 Refactor a few linode functions to be useful with salt-cloud command 2015-08-18 13:11:23 -06:00
Colton Myers
bf6c7e82cc Keep the formatted assertMsg 2015-08-18 12:50:24 -06:00
Colton Myers
8ec612e9db Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    setup.py
 2015-08-18 12:15:03 -06:00
Colton Myers
c1458980f3 Merge pull request #26434 from s0undt3ch/2015.5 
Fix missed typo
 2015-08-18 12:14:29 -06:00
Colton Myers
c08668ecf1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/fileserver/gitfs.py
    salt/master.py
    salt/pillar/s3.py
 2015-08-18 12:13:05 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Erik Johnson
5d969116ad Merge pull request #26427 from alprs/fix-git_latest_no_rev_concat 
git.latest with no rev: fix concatenation error (NoneType and str)
 2015-08-18 12:27:49 -05:00
TheBigBear
e57dc520f6 minor edits 
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
 2015-08-18 18:11:44 +01:00
Colton Myers
38f22875e1 Fix schedule test failures 
Includes removal of heavily-mocked test_list and test_reload
 2015-08-18 10:48:01 -06:00