valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,334 Commits 24 Branches 182 Tags 341 MiB
f38793166c
Commit Graph

24334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
f38793166c Alias module.watch to module.wait 
This was done recently for cmd.watch, so this commit aliases the
module.watch state as well for consistency.
 2013-12-30 17:34:55 -06:00
Thomas S Hatch
052ac0497d Merge pull request #9498 from cachedout/unit-tests 
Fix RHEL5 zmq unit tests
 2013-12-30 13:39:02 -08:00
Mike Place
17dea90f63 Fix RHEL5 zmq unit tests 
* Import zmq, check its attr and skip test if necessary.
 2013-12-30 14:37:17 -07:00
Thomas S Hatch
1e1268c36a Merge pull request #9497 from terminalmage/issue8190 
Use "user" instead of "runas" argument when calling pip.install from virtualenv.managed state
 2013-12-30 13:32:35 -08:00
Thomas S Hatch
75fd92fd98 Return locally installed version if no newer is available 2013-12-30 14:24:26 -07:00
Erik Johnson
ff3f9a6502 deprecate runas argument in virtualenv.create 2013-12-30 15:17:48 -06:00
Erik Johnson
dba84c0402 virtualenv.managed: use "user" instead of "runas" for pip install 
This commit changes the virtualenv.managed state to use "user" instead
of "runas" when it runs pip.install to satisfy a requirements file.
 2013-12-30 15:15:11 -06:00
Thomas S Hatch
2d91584ee8 Merge pull request #9496 from cachedout/unit-tests 
Another swing at fixing Postgres tests.
 2013-12-30 13:03:07 -08:00
Mike Place
b8e1ddf4bf Another swing at fixing Postgres tests. 2013-12-30 13:28:51 -07:00
Seth House
04d5d059f1 Remove .old & .orig files from debian_ip templates 
Leftovers from a Git merge in e30bd167.
 2013-12-30 12:12:04 -07:00
Thomas S Hatch
3865c6e20c Add CLI Example to extract_hash 2013-12-30 11:58:48 -07:00
Thomas S Hatch
fe545b8b9f Fix lint errors from #9446 
@martinhbramwell there were a few lint issues in your PR, just
so you know for next time :)
http://jenkins.saltstack.com/job/salt-lint/1671/violations/
 2013-12-30 11:52:18 -07:00
Thomas S Hatch
be7a544445 Merge pull request #9495 from techhat/fuse 
Add a few basic, missing file functions
 2013-12-30 10:43:53 -08:00
Joseph Hall
8a2eca45cf Add a few basic, missing file functions 2013-12-30 11:41:20 -07:00
Thomas S Hatch
5eaca79810 Revert "Better trace for nested jinja errors" 
This reverts commit 99a2791917.
 2013-12-30 11:32:53 -07:00
Thomas S Hatch
e6c383a4a1 Merge pull request #9446 from FleetingClouds/develop 
Address the issue "file.managed is TOO secure"
 2013-12-30 10:31:56 -08:00
Thomas S Hatch
5fbdb1018d Merge pull request #9471 from gagomes/issue9239 
Fix #9239 - include pkg in source dist tarball
 2013-12-30 10:24:00 -08:00
Thomas S Hatch
f6048017f7 Merge pull request #9490 from yannj-fr/develop 
Adding hwaddr_interfaces to grains, it permit to target minion based on ...
 2013-12-30 10:20:07 -08:00
Thomas S Hatch
3cf3e63f7a Merge pull request #9481 from techhat/ipv6 
Adding ipv6 validation
 2013-12-30 10:18:17 -08:00
Thomas S Hatch
f0f3049b18 Merge pull request #9493 from terminalmage/private-clearfuncs 
Make ClearFuncs helper functions private
 2013-12-30 10:17:02 -08:00
Erik Johnson
a6f9ecd9a4 Make ClearFuncs helper functions private 2013-12-30 12:13:12 -06:00
Thomas S Hatch
7017f8ff14 Merge branch 'salt_transport_fix_1' of git://github.com/cro/salt into cro-salt_transport_fix_1 
Conflicts:
	salt/config.py
 2013-12-30 11:09:06 -07:00
Thomas S Hatch
1de92c473e Merge pull request #9492 from cachedout/unit-tests 
Increase timeout for pkg tests.
 2013-12-30 10:11:44 -08:00
Thomas S Hatch
1bf53f65c6 Merge pull request #9489 from cachedout/#5649 
Rewrite interface directive to localhost if 0.0.0.0
 2013-12-30 10:11:06 -08:00
Mike Place
ca57a864b8 Increase timeout for pkg tests. 
* Since we started running a refresh_db in pkgrepo (7c3d0cc80d), we may be checking an exit code prematurely. This increases the timeouts to 120 seconds to see if Jenkins will calm itself.
 2013-12-30 11:08:32 -07:00
Thomas S Hatch
1b562cb785 Merge pull request #9409 from makinacorpus/test-trace 
Better trace for nested jinja errors
 2013-12-30 09:57:50 -08:00
Thomas S Hatch
cd0bf3b968 Remove clusted methods, they were never used 2013-12-30 10:47:31 -07:00
Joseph Hall
eeb6b2ef91 Merge pull request #9491 from terminalmage/docs 
Add note about upstart to resource limits documentation
 2013-12-30 09:50:33 -08:00
Erik Johnson
0fe0caebc3 Add note about upstart to resource limits documentation 2013-12-30 11:43:58 -06:00
Thomas S Hatch
b3b6c0bcee Merge pull request #8734 from terminalmage/autoreject_file 
add an autoreject_file parameter to the master config file
 2013-12-30 09:24:03 -08:00
yannj-fr
851878d8cf Adding hwaddr_interfaces to grains, it permit to target minion based on Mac Address 2013-12-30 17:52:24 +01:00
Pedro Algarvio
763ca1c33e Merge pull request #9483 from terminalmage/docs 
More refinement of master/minion troubleshooting docs
 2013-12-30 04:21:46 -08:00
Pedro Algarvio
b161665e28 Merge pull request #9485 from hulu/superfluous-parens-del 
fix all pylint C0325 (superfluous-parens) warnings
 2013-12-30 03:01:19 -08:00
Pedro Algarvio
faa16ea0c6 Merge pull request #9486 from gravyboat/develop 
Fixed a typo I missed a while back with some spacing.
 2013-12-30 03:00:10 -08:00
Forrest Alvarez
4f45c4d8f8 Fixed a typo I missed a while back with some spacing. 2013-12-30 07:05:59 +00:00
Chris Rebert
c8879022b2 fix all pylint C0325 (superfluous-parens): Unnecessary parens after 'del' keyword 2013-12-29 22:51:12 -08:00
Erik Johnson
84c6b62005 More refinement of master/minion troubleshooting docs 
Added an nmap example for checking if ports are open, removed some
redundant wording, and reworded other parts to be more concise.
 2013-12-29 20:13:11 -06:00
Pedro Algarvio
747d305635 Merge pull request #9482 from gravyboat/develop 
Fixed a typo in cloud troubleshooting, new section for master troubleshooting.
 2013-12-29 00:21:55 -08:00
Forrest Alvarez
c0c5bfd526 Updated the master troubleshooting doc with details regarding unexpected behavior with the -c option. 2013-12-29 06:30:37 +00:00
Forrest Alvarez
650223e1a4 Merge remote branch 'upstream/develop' into develop 2013-12-29 06:09:29 +00:00
Thomas S Hatch
4326a14322 Merge pull request #9480 from cachedout/unit-tests 
Unit tests
 2013-12-28 21:11:02 -08:00
Erik Johnson
c1eee828fd Slight tweak to earlier master troubleshooting page edit 2013-12-28 22:10:03 -06:00
Joseph Hall
37af3acfe8 Adding ipv6 validation 2013-12-28 20:05:29 -07:00
Mike Place
ff51066463 Possible fix for #5649 
* Rewrite a client's interface directive to localhost if it's set to 0.0.0.0.
 2013-12-28 18:51:07 -07:00
Forrest Alvarez
f6f21f9b00 Fixed a lower case reference to Salt on the cloud troubleshooting docs. 2013-12-29 01:02:03 +00:00
Mike Place
94591d7e2d Fix unit tests for Postgres on some platforms 
* Fix for inconsistent behavior wherein systems will use varying escaping behavior for quotes and double-quotes. (Most notably, Ubuntu 10 for some oddball reason.

  * Reformatting.
 2013-12-28 17:16:54 -07:00
Pedro Algarvio
6202b61723 Merge pull request #9479 from terminalmage/docs 
Enhancement to master troubleshooting docs
 2013-12-28 12:21:50 -08:00
Pedro Algarvio
a067057fea Merge pull request #9478 from terminalmage/sphinx 
Fix sphinx build warning
 2013-12-28 12:20:58 -08:00
Erik Johnson
2087462bd9 Enhancement to master troubleshooting docs 
Made some of the language more concise, and improved the example on
setting resource limits. /etc/security/limits.d/NN-something.conf is
the generally preferred method of setting resource limits.
 2013-12-28 14:18:24 -06:00
Erik Johnson
6286b28304 Fix sphinx build warning 
This fixes a sphinx build warning resulting from improperly formatted
argument names.
 2013-12-28 14:17:24 -06:00