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

57834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
aa3673385d Remove another heavily-mocked test 2015-08-19 16:08:00 -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
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
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
Nicole Thomas
f77491a34d Merge pull request #26457 from arthurlogilab/patch-11 
docstring improvement for network.ping module execution
 2015-08-19 08:18:14 -06:00
Nicole Thomas
485ab4497f Merge pull request #26455 from arthurlogilab/patch-9 
[doc] topology / proxyminions fix  typos
 2015-08-19 08:17:49 -06:00
Nicole Thomas
65e6283d3a Merge pull request #26456 from arthurlogilab/patch-10 
docstring improvement for ProxyMinion
 2015-08-19 08:17:31 -06:00
Arthur Lutz
c104e6e36d docstring improvement for network.ping module execution 2015-08-19 14:05:30 +02:00
Arthur Lutz
16f940438e docstring improvement for ProxyMinion 2015-08-19 14:04:29 +02:00
Arthur Lutz
9800bcfa3e [doc] topology / proxyminions fix typos 2015-08-19 14:03:14 +02: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
Pedro Algarvio
dc58dbe5bf The CLI options are not meant to include underscores. 
Fixes #26444
 2015-08-18 23:18:09 +01:00
Justin Findlay
a6f4c216db Merge pull request #26447 from shift/feature/fix_slack_returner_docs 
[Docs] Corrected code blocks.
 2015-08-18 15:30:12 -06:00
Vincent Palmer
d99a496324 Corrected code blocks. 2015-08-18 22:59:56 +02:00
Mike Place
ff7852f67b Merge pull request #26421 from alxbse/nova-floating-ip 
Add initial support for floating IP in nova cloud driver.
 2015-08-18 14:29:59 -06: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
d08839f0ed Merge pull request #26437 from s0undt3ch/hotfix/py3-FileNotFoundError-exception 
On Python 3 `os.stat()` might raise FileNotFoundError.
 2015-08-18 14:24:13 -06:00
Mike Place
d8ffb1c4c0 Merge pull request #26436 from TheBigBear/patch-10 
minor edits
 2015-08-18 14:23:36 -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
Pedro Algarvio
fa00a9c412 On Python 3 os.stat() might raise FileNotFoundError. 
FileNotFoundError is apparently a subclass of OSError but it wasn't
getting caught in Python 3. Adding IOError made it work.
 2015-08-18 18:17:06 +01: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
Mike Place
0f64be710f Merge pull request #26430 from rallytime/fix-26426 
List public and private ips under the correct label
 2015-08-18 10:20:32 -06:00