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
23,061 Commits 24 Branches 182 Tags 341 MiB
660a91d1ea
Commit Graph

23061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Joseph Hall
f62e7efdd6 Merge pull request #8883 from s0undt3ch/develop 
Only check for the execution bits if a value was actually passed.
 2013-11-28 05:23:37 -08:00
Joseph Hall
5baa867c7b Merge pull request #8884 from s0undt3ch/issues/8863-deploy-search-path-as-string 
deploy search path unit test
 2013-11-28 05:21:52 -08:00
Joseph Hall
71b1d8dea6 Merge pull request #8885 from holmboe/hwm1000 
Set default HWM in API call as well
 2013-11-28 04:31:24 -08:00
Henrik Holmboe
899cdff3e8 Set default HWM in API call as well 
@basepi set the HWM to 1000 by default in #8804 and this is a
complementary commit to that one. It is now obvious that the HWM is 1000
by default in the source code.

X-ref: #7662 and #7284
 2013-11-28 12:59:31 +01:00
Pedro Algarvio
a6c52e8905 Add missing CLI Example string. 2013-11-28 11:43:36 +00:00
Pedro Algarvio
9289c9cf31 Add a deploy_scripts_search_path test case. 
The test checks if the user provided search path is loaded, even if not passed as a list, and if it's the first occurrence on the list.
 2013-11-28 11:18:09 +00:00
Pedro Algarvio
4a08f332af Move and update the cloud configuration unit tests. 2013-11-28 11:02:23 +00:00
Pedro Algarvio
88692e9e4b Only check for the execution bits if a value was actually passed. 2013-11-28 10:50:15 +00:00
David Boucha
998775e974 Merge pull request #8874 from UtahDave/develop 
add space after comma
 2013-11-27 22:54:34 -08:00
David Boucha
f83adfcb2d add space after comma 2013-11-27 23:53:50 -07:00
Thomas S Hatch
d1811836e7 Merge pull request #8865 from maxchk/facter-load-puppet-libraries 
Facter load puppet libraries
 2013-11-27 22:09:52 -08:00
Thomas S Hatch
bbca4fd20b Merge pull request #8872 from terminalmage/tests 
Fix ubuntu deps for pkgrepo integration tests
 2013-11-27 22:09:19 -08:00
Max Horlanchuk
be6c2c1b42 Merge branch 'facter-load-puppet-libraries' of github.com:maxchk/salt into facter-load-puppet-libraries 2013-11-28 17:03:27 +11:00
Max Horlanchuk
ff6c45c4c5 Merge branch 'facter-load-puppet-libraries' of github.com:maxchk/salt into facter-load-puppet-libraries 2013-11-28 16:26:59 +11:00
Max Horlanchuk
a1e8444ca8 Merge branch 'develop' of github.com:maxchk/salt into develop 2013-11-28 16:23:44 +11:00
Max Horlanchuk
5c0c8495b9 Allow Facter to load Puppet-specific facts 2013-11-28 16:22:01 +11:00
Erik Johnson
0ffce3ce6d Fix ubuntu deps for pkgrepo integration tests 
This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
 2013-11-27 20:01:14 -06:00
Joseph Hall
315b83c748 Merge pull request #8871 from techhat/novafix 
Making the warning about the status of this driver more obvious
 2013-11-27 17:42:35 -08:00
Joseph Hall
4daec36653 Making the warning about the status of this driver more obvious 2013-11-27 18:41:17 -07:00
David Boucha
283d6ebec1 Merge pull request #8870 from UtahDave/develop 
add index to curly braces for .format()
 2013-11-27 17:00:14 -08:00
David Boucha
a4456e64c2 add index to curly braces for .format() 2013-11-27 17:59:34 -07:00
C. R. Oldham
ae0e6d2b5f Merge pull request #8867 from cro/fix_8781 
Check to make sure the virtualenv's Python is actually executable.
 2013-11-27 14:56:52 -08:00
C. R. Oldham
f61cffc6c7 Check to make sure the virtualenv's Python is actually executable. 2013-11-27 15:53:34 -07:00
Joseph Hall
1af467eb54 Merge pull request #8864 from s0undt3ch/issues/8784-writable-deploy.d 
Update the salt bootstrap script to a writeable path
 2013-11-27 13:01:05 -08:00
Pedro Algarvio
9b395df1f4 Typo 2013-11-27 20:29:57 +00:00
Pedro Algarvio
4ffd0b4f2c Update the salt bootstrap script to a writeable path. Fixes #8784. 2013-11-27 20:27:09 +00:00
Pedro Algarvio
6c6eeb551f Fix the path to the built-in cloud deploy scripts. 2013-11-27 20:25:10 +00:00
Thomas S Hatch
aa4bdc043b Fix pylint errors in tests 2013-11-27 10:50:55 -07:00
Joseph Hall
0351da57c6 Merge pull request #8860 from cachedout/smtp_returner_test 
Unit-test SMTP returner.
 2013-11-27 09:18:52 -08:00
Mike Place
4108fb72a2 Unit-test SMTP returner. 2013-11-27 10:10:51 -07:00
Joseph Hall
1e8ec10f33 Merge pull request #8859 from techhat/cloudstate 
Adding cloud execution and state modules
 2013-11-27 09:10:29 -08:00
Joseph Hall
6dcc13ca8d Adding cloud execution and state modules 2013-11-27 10:07:59 -07:00
Thomas S Hatch
b6f1ddc9cc Don't return sets, cast to lists 2013-11-27 09:49:40 -07:00
Joseph Hall
6ca9ba805a Merge pull request #8858 from basepi/eventfirecli 
Fix the event firing CLI examples
 2013-11-27 08:51:05 -08:00
Colton Myers
889eb74b4a Fix the event firing CLI examples 
Data must be formed as a dict
 2013-11-27 09:46:01 -07:00
Joseph Hall
d8b609c279 Merge pull request #8857 from basepi/minioneventlisten 
Fix eventlisten.py for minion event bus
 2013-11-27 08:43:20 -08:00
Colton Myers
dd2883dff8 Fix eventlisten.py for minion event bus 
The sock_dir modification was happening after the minion opts had
already returned.  Just make sure it happens before any return
statement.
 2013-11-27 09:39:52 -07:00
Thomas S Hatch
33a719c1d4 Merge pull request #8848 from terminalmage/tests 
Add pkgrepo.managed test SLS for Ubuntu
 2013-11-27 08:10:12 -08:00
Thomas S Hatch
e0a2d8dbf9 Merge pull request #8838 from shadowfax-chc/hgfs-too-many-processes 
Added missing closes to hgfs.
 2013-11-27 08:08:34 -08:00
Joseph Hall
58cca630ae Merge pull request #8851 from regilero/docfix 
Document the fact use does not inherit requisites, @ref #8796
 2013-11-27 06:52:59 -08:00
Pedro Algarvio
19d8a81886 Merge pull request #8855 from s0undt3ch/hotfix/tests-pylint-fixes 
tests suite pylint fixes
 2013-11-27 05:39:24 -08:00
Pedro Algarvio
906b93ecfe Merge pull request #8854 from pille/fix-doc-sphinx 
fix missing blanks in sphinx syntax
 2013-11-27 05:12:34 -08:00
Pedro Algarvio
6e596738de Disable some PyLint warnings. 2013-11-27 13:07:24 +00:00
Pedro Algarvio
aa8ead9897 Remove duplicate method 2013-11-27 13:06:59 +00:00
Pedro Algarvio
77df007d2f Ignore the exception not declared Pylint error. 2013-11-27 13:04:45 +00:00
Pedro Algarvio
b21bf4b682 Extra or misplaced white-space 2013-11-27 12:59:56 +00:00
Pedro Algarvio
880c9b5cff Fix PEP8 E261 - White space before inline comment 2013-11-27 12:56:35 +00:00
Pedro Algarvio
b34377612e Remove extra white-space. 2013-11-27 12:54:34 +00:00
Pedro Algarvio
ac8963b286 Ignore the relative import warning. 2013-11-27 12:54:13 +00:00