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,836 Commits 24 Branches 182 Tags 341 MiB
9149cfbeb2
Commit Graph

56836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Pedro Algarvio
06dcaefcaa Fix missed typo 2015-08-18 17:18:59 +01:00
Mike Place
4d6ebc6954 Merge pull request #26307 from cachedout/fix_26234 
Fix bug in top file ordering
 2015-08-18 10:02:54 -06:00
Jorge Schrauwen
53de0b49d1 fix possible shell injection 2015-08-18 15:49:03 +00:00
Nicole Thomas
913451a414 Merge pull request #26431 from rallytime/bp-26417 
Back-port #26417 to 2015.5
 2015-08-18 09:41:58 -06:00
Nicole Thomas
96b8c1fe82 Merge pull request #26428 from cro/pm_20158_2 
Update docs to reflect new pillar structure
 2015-08-18 09:32:23 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
rallytime
2ba97316c9 List public and private ips under the correct label 
Fixes #26426
 2015-08-18 09:19:26 -06:00
Mike Place
983619f1f6 Merge pull request #26429 from cachedout/tcp_freebsd_warn 
Add release note regarding tcp transport on freebsd
 2015-08-18 09:06:47 -06:00
Mike Place
fa88b7d35c Add release note regarding tcp transport on freebsd 
Refs #26364
 2015-08-18 09:06:13 -06:00
C. R. Oldham
b5a4a53062 Update documentation to reflect new pillar structure. 2015-08-18 09:03:23 -06:00
Mike Place
53d4739fa3 Merge pull request #26418 from driskell/fix_discarded_events_2015.8 
Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func
 2015-08-18 08:59:16 -06:00
Mike Place
9fa82ba0b7 Fix test 2015-08-18 08:51:00 -06:00
Andreas Lutro
a8bb0c40b1 if no rev, set remote_rev to HEAD 2015-08-18 16:48:57 +02:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Andreas Lutro
5fa86fee0a set remote_rev to None earlier if rev is None 
this prevents errors later on when trying to concatenate rev with a
string. cannot concatenate NoneType and str
 2015-08-18 16:33:15 +02:00
Mike Place
284e1b9342 Merge pull request #26252 from DSRCompany/issues/24048_http_client_2015.8 
Issues/24048 http client 2015.8
 2015-08-18 08:19:45 -06:00
Mike Place
a3b32bbc9e Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload 
Fix service.{start,restart,reload,force-reload} for masked services
 2015-08-18 08:16:15 -06:00
Mike Place
e5309df170 Merge pull request #26393 from dmurphy18/dgm_envfix 
Added option parameters to make_repo to allow for configuration settings
 2015-08-18 08:14:57 -06:00
Mike Place
afec85caff Merge pull request #26422 from TheBigBear/patch-9 
no dots in SLS filename __AND__ any directories (incl git repos)
 2015-08-18 08:09:15 -06:00
Mike Place
aae52d901d Merge pull request #26323 from 0xf10e/fix_glance_mod_cred 
Fix Credentials used in `glance` Exec Module
 2015-08-18 08:03:37 -06:00
Mike Place
55cd5f5ab6 Merge pull request #26341 from terminalmage/git-refactor 
Rewrite git state and execution modules
 2015-08-18 08:02:28 -06:00
Mike Place
952da7abaf Merge pull request #26378 from stanislavb/2015.5 
Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5
 2015-08-18 08:01:53 -06:00
Mike Place
871933076b Merge pull request #26419 from terminalmage/issue26245 
Only use pygit2.errors if it exists
 2015-08-18 08:00:36 -06:00
Mike Place
09e96dce39 Merge pull request #26420 from terminalmage/issue26245-2015.5 
Only use pygit2.errors if it exists (2015.5 branch)
 2015-08-18 08:00:01 -06:00