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
48,969 Commits 24 Branches 182 Tags 341 MiB
12ffcd1062
Commit Graph

48969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
12ffcd1062 Fixed #18919 false-positive on pkg.refresh 2015-07-06 14:30:38 -06:00
Colton Myers
01ed062ca7 Merge pull request #25191 from basepi/fix.fileclient.is_cached 
Add extrndest back to fileclient.is_cached in 2015.5
 2015-07-06 13:35:24 -06:00
Justin Findlay
a9404aea5c Merge pull request #25175 from rallytime/bp-25020 
Back-port #25020 to 2015.5
 2015-07-06 12:53:19 -06:00
Justin Findlay
c70fec65b8 Merge pull request #25173 from rallytime/partial-bp-25019 
Partial back-port of #25019
 2015-07-06 12:52:59 -06:00
Justin Findlay
c5ba9a90ba Merge pull request #25171 from rallytime/bp-25001 
Back-port #25001 to 2015.5
 2015-07-06 12:51:53 -06:00
Colton Myers
5fa74f4408 Add back in the extrndest stuff (which is now in develop) 2015-07-06 12:07:34 -06:00
Nicole Thomas
3e06602545 Merge pull request #25170 from rallytime/bp-24982 
Back-port #24982 to 2015.5
 2015-07-06 10:34:43 -06:00
Martin Hoefling
da2e1704ea Fix for issue #25016 2015-07-06 09:32:50 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Mike Place
09602808a0 Merge pull request #25161 from aneeshusa/allow-checking-non-normalized-systemd-service-availability 
Allow checking for non-normalized systemd units.
 2015-07-06 09:15:31 -06:00
Jason Keene
a891108793 Add docs for key arg in ssh_known_hosts.present 2015-07-06 09:14:28 -06:00
joseph.gimenez@peoplematter.com
3e6eab3ae9 ec2 network_interfaces fix 2015-07-06 09:13:03 -06:00
Mike Place
3599b8abab Merge pull request #25151 from jleroy/ipv6-scope-support 
Support for IPv6 addresses scopes in network.interfaces
 2015-07-06 08:43:03 -06:00
Mike Place
66d6365a9f Merge pull request #25166 from cachedout/lint_saltnado 
Lint #25149
 2015-07-06 08:40:29 -06:00
Mike Place
2fe167edf8 Lint #25149 2015-07-06 08:39:48 -06:00
Mike Place
2f1bad1c01 Merge pull request #25149 from jacksontj/saltnado 
Saltnado multiprocess support
 2015-07-06 08:38:43 -06:00
Aneesh Agrawal
b4d544fe70 Allow checking for non-normalized systemd units. 
When using service.available with the systemd provider, allow appending
the .service suffix for service files, so that service.available('sshd')
and service.available('sshd.service') both are True.
 2015-07-06 07:44:46 -04:00
Jonathan Leroy
edce034e6c
Support for IPv6 addresses scopes in network.interfaces 2015-07-04 19:22:52 +02:00
Thomas Jackson
6aa5548e2d Enable multiprocess support in saltnado 
The main exception seen is the incompatibility of debug=True and multiprocessing. In addition to that we were initing the event listener (read: zmq sockets) before the fork wich causes other issues. This patch makes rest_tornado fully multiprocess capable.

Feature for #24979
 2015-07-03 16:13:10 -07:00
Thomas Jackson
9a1351eada Change print to logger, so we can set a level and log exc_info 2015-07-03 15:53:31 -07:00
Thomas S Hatch
a723af0f10 Merge pull request #25120 from d--j/patch-2 
add missing continue for exeption case
 2015-07-02 13:38:45 -06:00
Thomas S Hatch
6e2222241a Merge pull request #25117 from basepi/fix.fileclient.is_cached 
Fix fileclient.is_cached
 2015-07-02 13:38:26 -06:00
Thomas S Hatch
c80990ba4f Merge pull request #25087 from 0xf10e/fix_glance_2015.5 
Fix execution module for glance - now based on 2015.5!
 2015-07-02 13:36:27 -06:00
Colton Myers
38e243fdfb Add fix from merge forward 2015-07-02 11:39:49 -06:00
Colton Myers
549ee47420 Merge pull request #25129 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-07-02 11:37:40 -06:00
Colton Myers
187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    setup.py
 2015-07-02 09:42:57 -06:00
Daniel Jagszent
81d5d15dce add missing continue for error case 2015-07-02 12:56:48 +02:00
Justin Findlay
86f2791fdb Merge pull request #25114 from saltstack/revert-24798-revert-24329-postgres_database-states-unit-test 
Revert "Revert "adding states/postgres_database unit test case.""
 2015-07-01 19:01:29 -06:00
Colton Myers
52f35f761a Add import 2015-07-01 16:11:25 -06:00
Colton Myers
23c32a7518 Backport develop version of salt.fileclient.is_cached 2015-07-01 16:10:47 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test 
adding states/postgres_user unit test case.
 2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test 
adding states/postgres_schema unit test case.
 2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test 
adding states/postgres_extension unit test case.
 2015-07-01 15:43:58 -06:00
Justin Findlay
f0f512a4da Merge pull request #25109 from jfindlay/2015.5 
add 2015.5.3 release notes
 2015-07-01 13:45:56 -06:00
Justin Findlay
3187d5d5aa add 2015.5.3 release notes 2015-07-01 13:43:30 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test 
Postgres group test
 2015-07-01 12:48:25 -06:00
David Boucha
0a846400c6 Merge pull request #25085 from jfindlay/fix_file 
accept all sources in the file state
 2015-07-01 12:23:45 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test 
Win groupadd unit tests
 2015-07-01 12:18:53 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
Mike Place
36d53ef59e Merge pull request #25093 from jaybocc2/2014.7 
quick fix for issue #18447
 2015-07-01 09:56:53 -06:00
Mike Place
7c8d2a8656 Merge pull request #25089 from jfindlay/fix_sudo 
fix minion sudo
 2015-07-01 09:53:16 -06:00
Mike Place
4d6078e5dd Merge pull request #25099 from driskell/patch-1 
Fix broken batch results
 2015-07-01 09:51:29 -06:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Florian Ermisch
7749cc081c PEP8 W601... 2015-07-01 17:15:50 +02:00
Florian Ermisch
bbda079fa5 fix pylint E302, E502, E713, E1305 2015-07-01 15:41:00 +02:00
Jason Woods
59b23e5f6e Fix broken batch results 
Fixes #24875

a34b74a70c fixed the ValueError but caused results to be overwritten as if a minion did not return, when actually it did.
 2015-07-01 11:11:29 +01:00
Justin Findlay
937a252e16 remove unnecessary file state tests 2015-06-30 17:16:17 -06:00
Jay Bendon
c6a501ebda quick fix for issue #18447 2015-06-30 14:59:00 -07:00
Thomas S Hatch
46350796b6 Merge pull request #25083 from steverweber/fix_ipmi_stat 
ipmi: get_sensor_data would always fail
 2015-06-30 14:57:21 -06:00