valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,913 Commits 24 Branches 182 Tags 341 MiB
4ab9af05d0
Commit Graph

51913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
022a43aaa9 Merge pull request #22904 from jacobhammons/2015.2 
Regenerated man pages
 2015-04-21 12:51:48 -06:00
Thomas S Hatch
e636a31bfd Merge pull request #22855 from jacksontj/2015.2 
Add failhard option to salt batching
 2015-04-21 12:51:24 -06:00
Thomas S Hatch
c802ba7514 Merge pull request #22902 from rallytime/docker_doc_fix 
Change state example to use proper kwarg
 2015-04-21 12:50:47 -06:00
Thomas S Hatch
ac582030e6 Merge pull request #22895 from aletourneau/pam_tally2.fix 
pam_tally counter was not reset to 0 after a succesfull login
 2015-04-21 12:50:27 -06:00
mguegan
c37d70af34 Fix compatibility with pkgin > 0.7 
- Add testing for parsing ability
- Fix broken parser for :
  - pkg.list_pkgs
  - pkg.search

Sample of bad parsing :

[INFO    ] Executing command '/usr/sbin/zfs help || :' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin -v' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin se ^memcached$' in directory
'/root'

local:
     ----------
     memcached-1.4.21;=;High:
         performance
 2015-04-21 20:26:40 +02:00
rallytime
1be53aaf7d Remove Python 2.6 incompatible section of test 
A portion of this test seems to be only testing the differences
between the way Python is using the help string between 2.6 and
2.7. This section doesn't really seem to be testing any salt code.
 2015-04-21 12:25:31 -06:00
Joseph Hall
3bf4e66112 Properly merge cloud configs to create profiles 2015-04-21 12:07:44 -06:00
Justin Findlay
81771a7769 Merge pull request #22898 from terminalmage/issue12003 
dockerio: better error message for native exec driver
 2015-04-21 12:02:58 -06:00
Justin Findlay
3565816876 Merge pull request #22900 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-21 12:01:39 -06:00
Justin Findlay
13698f2a7e Merge pull request #22899 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-21 12:01:31 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Thomas S Hatch
e2ec4ecc55 Merge pull request #22897 from rallytime/fix-22825 
Add param documentation for file.replace state
 2015-04-21 11:31:04 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages" 
This reverts commit 069a0cac71.
 2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
rallytime
8f703461b0 Change state example to use proper kwarg 
docker.run takes cid as a kwarg, not container
 2015-04-21 11:16:05 -06:00
Thomas S Hatch
629f9e02ac Merge pull request #22883 from jfindlay/fix_syndic_cache_path 
make parent dir(s) before creating syndic cache file
 2015-04-21 11:07:17 -06:00
Alexandre Letourneau
0f4fbe9306 Fixed pylint issues 2015-04-21 13:05:57 -04:00
Thomas S Hatch
fd53889f0e Merge pull request #22850 from bersace/fix-pillar-salt-mixed 
Fix pillar and salt fileserver mixed
 2015-04-21 11:04:33 -06:00
rallytime
3ce1cef592 Fix Python 2.6 syntax error in unit.modules.state_test.py 2015-04-21 11:01:33 -06:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Justin Findlay
ba4a786984 add route53 record sync wait, default=False 2015-04-21 10:38:30 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
Erik Johnson
c375309434 dockerio: better error message for native exec driver 
This provides a more useful error message when using the native
execution driver and nsenter is not available.
 2015-04-21 11:23:24 -05:00
Nicole Thomas
f7ccbac1f2 Merge pull request #22884 from jfindlay/merge_22847 
Merge 22847
 2015-04-21 10:15:31 -06:00
Thomas S Hatch
7ad8d790c0 Merge pull request #22875 from nmadhok/grains-patch 
Revert #22562
 2015-04-21 09:57:27 -06:00
rallytime
9c51630002 Add param documentation for file.replace state 
Fixes #22825
 2015-04-21 09:47:31 -06:00
Erik Johnson
eb696f4246 Lint fix 2015-04-21 10:41:33 -05:00
Justin Findlay
8b2e60127d Merge pull request #22893 from s0undt3ch/hotfix/lint-2015.2 
[2015.2] Lint Fixes
 2015-04-21 09:24:49 -06:00
Justin Findlay
c2a5d59fb7 Merge pull request #22890 from jayeshka/postfix-unit-test 
adding postfix unit test case
 2015-04-21 09:01:18 -06:00
Justin Findlay
3640fa59bc Merge pull request #22889 from jayeshka/blockdev-states-unit-test 
adding states/blockdev unit test case
 2015-04-21 08:48:06 -06:00
Justin Findlay
910af016ab Merge pull request #22888 from jayeshka/aws_sqs-states-unit-test 
adding states/aws_sqs unit test case
 2015-04-21 08:47:03 -06:00
Alexandre Letourneau
508f704511 Cleaned up pull request 2015-04-21 10:40:13 -04:00
Justin Findlay
7899914dbe fix deprecated artifactory state code 2015-04-21 08:38:23 -06:00
Alexandre Letourneau
d8fe360565 pam_tally counter was not reset to 0 after a succesfull login 2015-04-21 10:22:33 -04:00
Pedro Algarvio
62ae9e061a Forgot to add the code 2015-04-21 15:08:42 +01:00
Pedro Algarvio
3ae68c4f7b Minor cosmetic changes in order not to disable the PEP8 PyLint code all together 2015-04-21 15:03:47 +01:00
Pedro Algarvio
8565e9fe1c Ignore no name in module for distutils.version 2015-04-21 14:53:21 +01:00
Joseph Hall
ce58de87b2 Merge pull request #22885 from dmuntean/fix-aws-plus-sign-encoding 
Encode spaces with %20 instead of plus sign in AWS request query strings
 2015-04-21 07:52:54 -06:00
Pedro Algarvio
4002d90e19 Disable W1307 (invalid-format-index) 
Using invalid lookup key '%s' in format specifier "0['%s']"
 2015-04-21 14:51:54 +01:00
Florian Ermisch
58fa24c7fa Clarify doc on kwarg 'roles' for user_present(). 
Previously passing the roles in single-key-dicts
worked so the changed behavior should be reflected
in a updated docstring.
 2015-04-21 15:50:52 +02:00
Florian Ermisch
f0ae2eb84f Improve readability by renaming tenant_role 
The for-loop processing the kwarg roles only
iterates over tenant *names* so naming the
variable "tenant_role" is misleading.

Also explicitly iterating over the passed dict's
keys so we get a useful error message when a list
is passed instead (and makes the code easier to
read).
 2015-04-21 15:32:15 +02:00
Fred Reimer
5ac5426e46 Revert changes to mixins cmd, as the better place to fix this is where it is called. 2015-04-21 09:03:27 -04:00
Pedro Algarvio
ae2bca1f6f Fix W1504(unidiomatic-typecheck 2015-04-21 14:02:17 +01:00
Pedro Algarvio
7f1954bea9 Fix False comparison 2015-04-21 14:00:46 +01:00
Pedro Algarvio
3dc9b0129b Fix comparison to None 2015-04-21 14:00:00 +01:00
Pedro Algarvio
a37502f0f6 Remove bad PyLint options 2015-04-21 13:54:21 +01:00
Pedro Algarvio
3d058759dc Ignore no name in module for distutils.version 2015-04-21 13:52:13 +01:00
Pedro Algarvio
8a0e042787 Fix PyLint W1504(unidiomatic-typecheck) Using type() instead of isinstance() for a typecheck. 2015-04-21 13:49:45 +01:00
Chris Rebert
cb50a7dcc3 use isinstance() instead of type() for typechecks 
************* Module salt.modules.mdadm
/Users/chris/code/salt/salt/modules/mdadm.py:340: [W1504(unidiomatic-typecheck), assemble] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pip_state
/Users/chris/code/salt/salt/states/pip_state.py:476: [W1504(unidiomatic-typecheck), installed.<lambda>] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pkg
/Users/chris/code/salt/salt/states/pkg.py:227: [W1504(unidiomatic-typecheck), _find_install_targets] Using type() instead of isinstance() for a typecheck.
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:462: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
/Users/chris/code/salt/salt/pillar/pepa.py:464: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
 2015-04-21 13:49:15 +01:00
Fred Reimer
365c7ffcb8 Remove wait for minion start, I think this happens before, so we will never proceed. 2015-04-21 08:48:46 -04:00