valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,140 Commits 24 Branches 182 Tags 341 MiB
8a2dd86c79
Commit Graph

58140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
aace656a37 Fix bad url. 2015-08-19 16:38:30 -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
rallytime
56ee889038 Whitespace fix 2015-08-19 15:45:19 -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
Justin Findlay
cbe330e78b add dateutil dependency reporting 2015-08-19 14:47:28 -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
rallytime
7fd19777f5 Make sure cloud maps don't ignore terminated instances in EC2 2015-08-19 14:41:53 -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
Erik Johnson
a4b7457683 Add information re: git state/module rewrite 
Also improve the git_pillar information
 2015-08-19 15:25:07 -05:00
Erik Johnson
dbeffe4944 Point git_pillar reference in winrepo documentation at a valid ref 2015-08-19 15:24:30 -05:00
Erik Johnson
ee1eac925a Point git_pillar section in gitfs tutorial at git_pillar docstring 2015-08-19 15:23:52 -05:00
Erik Johnson
52156df144 Docstring fixes in git execution module 2015-08-19 15:23:25 -05:00
Erik Johnson
1be2a8a1a1 Add config examples to git_pillar top-level docstring 
Also, hide the legacy git_pillar code from sphinx by prefixing the class
name with an underscore.
 2015-08-19 15:22:04 -05:00
Erik Johnson
83dc9a34f6 Tweak top-level RST in git state module 2015-08-19 15:21:28 -05: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
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
Pedro Algarvio
60c5d16330 One more missed typo 2015-08-19 19:43:37 +01:00
TheBigBear
332535f2e6 Update file.py 2015-08-19 19:26:06 +01:00
TheBigBear
598500034f Update file.py 2015-08-19 19:25:07 +01:00
TheBigBear
ec7c7d738d minor note: added 
note based on findings in #25360
 2015-08-19 19:16:28 +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
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
rallytime
d44a75d7c0 Don't allow VMs with duplicate names to be created in EC2/AWS 
Even if the VM is in the terminated state, from salt-cloud's perspective,
there should never be duplicately named instances.

This PR also changes the ``rename_on_destroy`` config default to True to
avoid errors and move the old ones out of the way if you forget to set it
in your cloud config.
 2015-08-19 11:30:12 -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
Arthur Lutz
b3f638ff0f docstring improvement for network.ping module execution 2015-08-19 08:47:24 -06:00