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
54,855 Commits 24 Branches 182 Tags 341 MiB
da8b637d4d
Commit Graph

54855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
da8b637d4d Merge pull request #24804 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-18 14:12:01 -06:00
Colton Myers
e707193055 Lint 2015-06-18 12:41:55 -06:00
Mike Place
b93fa83a72 Merge pull request #24808 from cachedout/lint_state 
Fix lint in state.py
 2015-06-18 12:13:06 -06:00
Mike Place
92a61ff79c Fix lint in state.py 2015-06-18 12:11:49 -06:00
Mike Place
bf0fe4ea2e Merge pull request #24807 from cachedout/skip_enc 
Skip encoding tests if unsupported
 2015-06-18 12:09:28 -06:00
Mike Place
558ce63b31 Skip encoding tests if unsupported 2015-06-18 12:06:10 -06:00
Mike Place
0da049b6ae Merge pull request #24806 from cachedout/better_payload_logging 
Improved debugging for missing or corrupt payloads
 2015-06-18 11:53:15 -06:00
Mike Place
e7d8e23d9e Improved debugging for missing or corrupt payloads 2015-06-18 11:52:30 -06:00
Mike Place
07b6a2bffd Merge pull request #24805 from cachedout/test_zmq_wait 
Fix failing zmq tests
 2015-06-18 11:46:39 -06:00
Mike Place
72752f53ff Fix failing zmq tests 
This is just a stopgap to prevent the ioloop from shutting down before the procs die off.
 2015-06-18 11:45:57 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
C. R. Oldham
1a158e8a3b Merge pull request #24792 from rallytime/bp-24757 
Back-port #24757 to 2015.5
 2015-06-18 09:58:35 -06:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod 
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
 2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Mike Place
66939939c1 Merge pull request #24785 from The-Loeki/patch-1 
Small utility function for deriving IPv6 SLAAC EUI-64 identifiers
 2015-06-18 08:53:46 -06:00
Mike Place
39f088a74c Merge pull request #24778 from nmadhok/backport-2015.2-24777 
Backporting PR #24777 to 2015.2 branch
 2015-06-18 08:53:04 -06:00
Mike Place
b290b9b474 Merge pull request #24777 from nmadhok/develop 
Fixing issue where --static option fails with ValueError Fixes #24776
 2015-06-18 08:51:19 -06:00
Mike Place
2a4f65f3f7 Merge pull request #24774 from zefrog/fix-lxc-lvname-param 
Fix lxc lvname parameter command
 2015-06-18 08:49:06 -06:00
Mike Place
4e7abeb48b Merge pull request #24786 from chrismcmacken/develop 
Adding a couple tests for the mysql.grant_exists
 2015-06-18 08:41:48 -06:00
Mike Place
afc58bb92f Merge pull request #24767 from dmyerscough/Fixing-doc-typo 
Fixing spacing typo
 2015-06-18 08:39:38 -06:00
Mike Place
f3120b3e2c Merge pull request #24788 from cachedout/lint_24772 
Lint and remove unused import
 2015-06-18 08:39:02 -06:00
Mike Place
bf0a849072 Lint and remove unused import 
Refs #24772
 2015-06-18 08:38:28 -06:00
Mike Place
5c4bc1728b Merge pull request #24772 from garethgreenaway/ifttt_module 
Initially adding a module to trigger events in IFTTT from Salt.
 2015-06-18 08:35:21 -06:00
Mike Place
fd7339014b Merge pull request #24782 from jayeshka/slack-states-unit-test 
adding states/slack unit test case.
 2015-06-18 08:33:55 -06:00
Mike Place
c9c90af512 Merge pull request #24771 from jacksontj/2015.5 
Always extend requisites, instead of replacing them
 2015-06-18 08:29:09 -06:00
Ronald van Zantvoort
036e654237 leading zero fix for mac2eui64 
and update to improved mac input handling
 2015-06-18 15:06:36 +02:00
Chris McMacken
3025ba1ec1 Adding a couple of tests for grant_exists 2015-06-18 08:00:23 -05:00
Ronald van Zantvoort
e1f08f120f PyLint fix 
Learned something today; an int automagically grows to a long apparently w00t
 2015-06-18 14:48:55 +02:00
Ronald van Zantvoort
c944661580 Update network.py 2015-06-18 14:34:13 +02:00
Ronald van Zantvoort
26ce922342 Small utility function for deriving IPv6 SLAAC EUI-64 identifiers 
`mac2eui64` will take a MAC and optional prefix, and generate the excepted EUI-64/SLAAC address from it
 2015-06-18 14:12:26 +02:00
Jayesh Kariya
e2b6214764 adding states/slack unit test case. 2015-06-18 15:47:27 +05:30
Nitin Madhok
ae3701f639 Backporting PR #24777 to 2015.2 branch 2015-06-18 05:12:12 -04:00
Nitin Madhok
a34b74a70c Fixing issue where --static option fails with ValueError Fixes #24776 2015-06-18 05:06:08 -04:00
Maxime Douailin
21e0cd4a5e Fixed typo in lxc module: lvname parameter typo 2015-06-18 10:18:45 +02:00
Maxime Douailin
283d86ec12 Fixed bug in lxc module: lvname using wrong parameter in cmd 2015-06-18 10:18:14 +02:00
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in 
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
 2015-06-17 21:57:37 -07:00
Thomas Jackson
378f6bfc36 Only merge when the merge is of requisites 
Fix for #24770

This extends functionality is used for both requisites and extending SLSs, so instead of having a hard coded list of requisites we should use the global of all state requisite keywords.
 2015-06-17 21:57:37 -07:00
Gareth J. Greenaway
5b0218b2f8 Initially adding a module to trigger events in IFTTT from Salt. 2015-06-17 21:49:41 -07:00
Justin Findlay
7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5 2015-06-17 16:36:36 -06:00
Justin Findlay
4cacd93c22 use correct yum versionlock pkg name on centos 5 2015-06-17 16:10:08 -06:00
Mike Place
99af7695e3 Merge pull request #24765 from cachedout/encoding_fallback 
Fix extreme edge case where system encoding can not be detected
 2015-06-17 16:01:28 -06:00
Damian Myerscough
916519c333 Fixing spacing typo 2015-06-17 14:54:58 -07:00
Mike Place
5fe4de8f62 Merge pull request #24766 from msteed/undoc-dns_check 
Remove doc references to obsolete minion opt
 2015-06-17 15:36:55 -06:00
Michael Steed
f92a769d35 Remove doc references to obsolete minion opt 2015-06-17 15:29:50 -06:00
Mike Place
4cbf86a483 Fix extreme edge case where system encoding can not be detected 2015-06-17 14:35:31 -06:00
Mike Place
fc4d4912f0 Merge pull request #24764 from cachedout/ssh_syntax_error 
Fix syntax error
 2015-06-17 13:59:46 -06:00
Mike Place
b83d3862d3 Fix syntax error 2015-06-17 13:59:23 -06:00
Mike Place
a407ab7c51 Merge pull request #24329 from jayeshka/postgres_database-states-unit-test 
adding states/postgres_database unit test case.
 2015-06-17 13:11:02 -06:00
Mike Place
3401f9d154 Merge pull request #24763 from cachedout/fix_lint_24590 
Lint riak
 2015-06-17 13:04:40 -06:00
Mike Place
511e24dc5f Lint riak 2015-06-17 13:03:35 -06:00