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
19,377 Commits 24 Branches 182 Tags 341 MiB
aec8fd67fc
Commit Graph

19377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EquinoxeFR
f6ca119edc Adding close process and service stop to windows installer 2013-10-22 12:12:02 +02:00
Pedro Algarvio
3b991b51fe Merge pull request #7992 from puluto/develop 
Update state.py
 2013-10-22 01:21:17 -07:00
Pedro Algarvio
5088ce2a05 Merge pull request #8011 from malinoff/fix-no-output 
Fix printing newline if there is nothing to print
 2013-10-22 01:05:29 -07:00
Dmitry Malinovsky
6c09b10efa Added check about empty string 2013-10-22 10:44:24 +07:00
Mike Place
b181bba441 Minor code reformat. 2013-10-21 17:40:18 -06:00
Mike Place
910b0a35a3 Realized that the lexical grant parser doesn't handle multi-word statements. Corrected for this condition. 2013-10-21 16:31:27 -06:00
Colton Myers
d02a439062 Merge pull request #8008 from UtahDave/develop 
slice the string. Don't use lstrip incorrectly
 2013-10-21 15:03:36 -07:00
David Boucha
bf4c2e13c4 slice the string. Don't use lstrip incorrectly 2013-10-21 16:00:02 -06:00
David Boucha
5a0e41c2fd Merge pull request #8007 from eliasp/auth-init-typo 
Corrected typo (fromt he → from the).
 2013-10-21 14:50:37 -07:00
Elias Probst
d4a952e7ea Corrected typo (fromt he → from the). 2013-10-21 23:41:40 +02:00
Colton Myers
bd6d969cc2 Merge pull request #8001 from eliasp/eauth-typo 
Corrected typo (extended auth → external auth).
 2013-10-21 14:19:54 -07:00
Mike Place
f3116ace42 if->elif per @s0undt3ch 2013-10-21 14:26:46 -06:00
Puluto
69e2f4c2d0 Update state.py 
https://github.com/saltstack/salt/pull/7992#issuecomment-26747276
 2013-10-22 03:43:04 +08:00
Sebastien Pahl
5678f46744 Generate jid in _wait in state module if not specified (can happen when called in the mine with queue=True) 2013-10-21 12:25:11 -07:00
Mike Place
c4453b3307 Add a lexical parser for MySQL grants to the MySQL module. Change the behavior of the grant-checker to use this new method by default and fallback to the strict method if it fails. 2013-10-21 13:16:54 -06:00
Elias Probst
c6a5fca0d3 Corrected typo (extended auth → external auth). 2013-10-21 20:56:13 +02:00
Erik Johnson
67ca15ecc2 Fix sphinx build warning 
Section headers must have their underline the same length as the section
header itself.
 2013-10-21 10:43:55 -05:00
Thomas S Hatch
bc1deeeaf3 Merge pull request #7998 from terminalmage/quickfix 
Add versionadded directive to dockerio module
 2013-10-21 08:32:27 -07:00
Erik Johnson
498d9013b7 Add versionadded directive to dockerio module 
Also changed the top line of the docstring, as this affects its
appearance in the docs, and this top line should be a simple explanation
of the module. Having "overview of this module" in this line is
redundant.
 2013-10-21 10:27:58 -05:00
Puluto
71184923ee Update state.py 
https://github.com/saltstack/salt/issues/7991
 2013-10-21 15:05:02 +08:00
Erik Johnson
95efdad8ba Remove ubuntu 32-bit target 2013-10-20 21:47:05 -05:00
Erik Johnson
7984a8c2cf Apparently the test framework doesn't like private member functions 2013-10-20 21:46:06 -05:00
Erik Johnson
81434578fc Fix function name 2013-10-20 21:29:36 -05:00
Erik Johnson
74ce0cb604 Add CLI example for ports.list_all 2013-10-20 21:09:58 -05:00
Erik Johnson
1c0d279c59 Fix import error 2013-10-20 20:50:28 -05:00
Erik Johnson
9397840021 More tweaks to package tests 
This makes package tests work better on CentOS 5, and also adds a 32-bit
target for Ubuntu.
 2013-10-20 20:27:45 -05:00
Erik Johnson
90d6d045f1 Move _wait_for_pkgdb_unlock inside of PkgTest class 2013-10-20 18:48:01 -05:00
Erik Johnson
63ee0f1e83 Add function to wait for pkgdb lock to clear 
Arch pkg tests that call pkg.latest_version seem to fail on running
this function due to the package database still being locked from
previous tests. This adds a function that waits (in 5 second increments)
for up to 60 seconds for the pkgdb to be unlocked.

http://jenkins.saltstack.com/job/salt-rs-arch/474/artifact/salt-runtests.log/*view*/
 2013-10-20 18:18:35 -05:00
Erik Johnson
c5f5b400e9 adjust redhat pkg targets for pkg tests 2013-10-20 17:04:27 -05:00
Erik Johnson
62a9385ddf Don't perform version spec pkg tests on FreeBSD 
pkg_add does not support this, so this test will fail when
pkg.latest_version is run and an assertion is done to determine the
targeted version.
 2013-10-20 16:00:14 -05:00
Erik Johnson
d5120f1041 Fix generic exception: 
Use "except Exception" instead of simply "except". Fixes pylint
violation (see below link for details).

http://jenkins.saltstack.com/job/salt-lint/644/violations/file/salt/utils/parsers.py/
 2013-10-20 15:53:24 -05:00
Erik Johnson
5dc08d552a adjust pkg targets for pkg tests 2013-10-20 15:48:57 -05:00
Erik Johnson
fe1c4487e3 add tests for installing 32-bit packages 2013-10-20 15:16:36 -05:00
Erik Johnson
c7fcc79747 Add tests for pkg.installed with version specification 2013-10-20 14:35:10 -05:00
Pedro Algarvio
34d43c510f Merge pull request #7969 from cachedout/#6538 
Make an effort to return a warning message if we get arguments passed to...
 2013-10-20 09:37:22 -07:00
Thomas S Hatch
e6da57906a whitespace fix per pylint 2013-10-20 06:54:18 -06:00
Thomas S Hatch
b3981a8264 Merge pull request #7988 from makinacorpus/issue-7987 
Pr for #7987
 2013-10-20 05:43:36 -07:00
Mathieu Le Marec - Pasquet
9ba86c7b90 Fix(fileclient): friendly renegotiate authentication 
In case of authentication error, try to renegotiate the crypticle
handshake to mitigate master restart

This fixes #7987
 2013-10-20 13:47:54 +02:00
Joseph Hall
045c241459 Merge pull request #7985 from kula/yaml-long-keys 
Document how to handle long SSH keys being used as YAML keys
 2013-10-19 19:28:08 -07:00
Thomas L. Kula
ba61a2d00a Document how to handle long SSH keys being used as YAML keys 
The YAML specification limits simple keys to being 1024 characters
in length. Since SSH keys are often longer than that, and since
the documentation provides examples using the SSH key as a YAML
key, demonstrate the proper way of specifying an YAML 'explicit'
key.
 2013-10-19 21:47:35 -04:00
Erik Johnson
9d75d7a425 Change packages for pkg.installed tests on Debian-based systems 
Travis-CI uses Debian/Ubuntu VMs and bzr is on their base image, so this
causes these tests to fail on Travis. This replaces bzr for tests on
Debian-based OSes.
 2013-10-19 10:48:10 -05:00
Thomas S Hatch
3d3a13050a Merge pull request #7982 from terminalmage/jenkins 
Fix jenkins failures
 2013-10-19 08:22:08 -07:00
Erik Johnson
d8079775b4 Fix jenkins failures 
Mostly whitespace fixes, mixing of tabs and spaces, but also there was a
function call not closed off with a trailing parenthesis.

See http://jenkins.saltstack.com/job/salt-lint/636/violations/ for more
info.
 2013-10-19 10:18:28 -05:00
Pedro Algarvio
df60fa5ffe Merge pull request #7981 from terminalmage/tests 
Add pkg.installed tests
 2013-10-19 07:59:13 -07:00
Erik Johnson
0205f28e4a Add pkg.installed tests 2013-10-19 09:50:48 -05:00
Thomas S Hatch
fc3a849df7 Merge pull request #7980 from olenz/develop 
Reduced the output of the state pkg.latest.
 2013-10-19 07:48:53 -07:00
Thomas S Hatch
427a5ec4f0 Merge pull request #7975 from c-cooperjones/patch-3 
Allow iptables rules to be saved from state iptables.append.
 2013-10-19 07:41:58 -07:00
Thomas S Hatch
63ae1efc63 Merge pull request #7973 from UtahDave/fix_win_recurse 
Pipes are illegal in Windows paths and filenames
 2013-10-19 07:41:29 -07:00
Thomas S Hatch
5ef6b1078f Merge pull request #7972 from cloudflare/pass-data-to-minion-in-caller 
Pass data to minion when using salt-call
 2013-10-19 07:40:57 -07:00
Olaf Lenz
838490f2da Reduced the output of the state pkg.latest. 2013-10-19 15:19:46 +02:00