valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,876 Commits 24 Branches 182 Tags 341 MiB
63efe11e4f
Commit Graph

57876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ageeleshwar Kandavelu
63efe11e4f ini modules test fix 2015-08-21 16:29:30 +05:30
Ageeleshwar Kandavelu
dd48f8ff50 ini_unit test fix 2015-08-21 14:47:13 +05:30
Ageeleshwar Kandavelu
77bc8fcc55 ini lint and formatting fixes 2015-08-21 12:36:11 +05:30
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-21 08:59:43 +05:30
Ageeleshwar Kandavelu
164c433395 format string indexing fix 2015-08-21 08:59:18 +05:30
Justin Findlay
51065b834f Merge pull request #26511 from rasathus/support-nested-upstart 
Adds support for nested upstart scripts in the form of subfolder/serv…
 2015-08-20 17:18:17 -06:00
Colton Myers
c390e812d8 Merge pull request #26435 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-20 10:05:53 -06:00
Justin Findlay
6fd1ed8c42 Merge pull request #26508 from jodv/public_hash_function 
Make arbitrary hash function access public
 2015-08-20 09:53:44 -06:00
Ageeleshwar Kandavelu
8723754dfa pylint fixes 2015-08-20 20:24:15 +05:30
Ageeleshwar Kandavelu
62af0d7f07 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-20 20:06:01 +05:30
Joseph Hall
44fbd49b33 Merge pull request #26503 from nmadhok/vmware-hardware-version-develop 
VMware cloud driver - Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 08:35:46 -06:00
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Chris Fane
e00a98fd37 Adds support for nested upstart scripts in the form of subfolder/service. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for *.conf method. 
Fixes #26478 - nested upstart services are not supported
 2015-08-20 10:59:20 +01:00
Jeremy Rosenbaum
7a04a8dc1e Make arbitrary hash function access public 
While the normal splay functionality to spread job execution times across minions
uses the minion ID as the hash function key, I've found other use cases where I
want access to a consistent hashing algorithm in execution modules but I don't
necessarily want the minion ID to be the key.  This is just a minor change to
allow public access to the previously hidden function that allows that.
 2015-08-19 23:59:56 -07:00
Nitin Madhok
702b55f2ca Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:05:12 -04:00
Mike Place
0cf9f11aa5 Merge pull request #26458 from arthurlogilab/minion_proxy_fixes 
[minionproxy] example modules fixes
 2015-08-19 16:49:49 -06:00
Mike Place
97aea928c4 Merge pull request #26466 from s0undt3ch/hotfix/py3-FileNotFoundError-exception 
Py3 compatibility. Address KeyError.
 2015-08-19 16:48:32 -06:00
Nicole Thomas
3b0c01d2c9 Merge pull request #26468 from TheBigBear/patch-11 
Suggested rewording to satisfy issue #26403
 2015-08-19 16:46:15 -06:00
Colton Myers
8d450b9acd Remove unused import 2015-08-19 16:38:34 -06:00
Colton Myers
04fa77032c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/linode.py
 2015-08-19 16:37:39 -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
Colton Myers
aa3673385d Remove another heavily-mocked test 2015-08-19 16:08:00 -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
Colton Myers
2695e3159e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-19 15:05:52 -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
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
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
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -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
TheBigBear
85c29a437b Suggested uopdate to satisfy issue #26403 
closes and fixes https://github.com/saltstack/salt/issues/26403
 2015-08-19 16:37:46 +01:00
Pedro Algarvio
92685904fc Replace open() with salt.utils.fopen() 2015-08-19 16:26:27 +01:00
Pedro Algarvio
2c5bce356a Py3 compatibility. Address KeyError. 
In cases where the grains aren't being loaded by a master or a minion, `file_buffer_size` is not present in the options and a `KeyError` is raised. Properly address those cases.
Under Py3, `open()` returns bytes. Adapt the logic to take that into account.
 2015-08-19 16:21:07 +01:00
justinta89
c542895bd2 --annotate and --message aren't valid options in older versions of git. 2015-08-19 09:09:34 -06:00