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
47,362 Commits 24 Branches 182 Tags 341 MiB
8d5b50e17c
Commit Graph

47362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
8d5b50e17c Don't forget the blank lines at the end of the file 2015-04-24 16:29:51 -06:00
rallytime
9830708f86 Some small test clean up changes 2015-04-24 16:27:22 -06:00
Justin Findlay
f9bdf6347d Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test 
adding states/boto_iam_role unit test case
 2015-04-24 08:42:51 -06:00
Justin Findlay
588579b124 Merge pull request #23020 from jayeshka/raet_publish-unit-test 
adding raet_publish unit test case
 2015-04-24 08:42:20 -06:00
Jayesh Kariya
49894795ad adding raet_publish unit test case 2015-04-24 17:30:24 +05:30
Jayesh Kariya
93214d0441 adding states/boto_iam_role unit test case 2015-04-24 17:21:28 +05:30
Justin Findlay
80621eb9ce Merge pull request #23002 from rallytime/remove_requests_dep 
Remove python-requests dependency from debian/control
 2015-04-23 21:29:47 -06:00
rallytime
cc3999e006 Remove python-requests dependency from debian/control 2015-04-23 17:04:17 -06:00
Nicole Thomas
1d9230cb8f Merge pull request #22952 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-23 15:56:44 -06:00
Colton Myers
8de3dceeec Revert "Initialize state file client after pillar loading" 
This reverts commit 31b98e72eb.
 2015-04-23 14:09:22 -06:00
Thomas S Hatch
6391053926 Merge pull request #22972 from whiteinge/scheduler-once 
Added 'once' support to the scheduler
 2015-04-23 10:26:55 -06:00
Thomas S Hatch
59d0626928 Merge pull request #22975 from whiteinge/salt-api-misc 
Add a new html tool to rest_cherrypy; fix oversight from #22970
 2015-04-23 10:26:09 -06:00
Nicole Thomas
cf9041744a Merge pull request #22985 from jfindlay/apache_state_test 
fix failing apache state unit test
 2015-04-23 09:18:23 -06:00
Justin Findlay
340dba3210 Merge pull request #22982 from jayeshka/qemu_img-unit-test 
adding qemu_img unit test case
 2015-04-23 08:18:46 -06:00
Justin Findlay
10fa7eea14 Merge pull request #22980 from jayeshka/boto_elb-states-unit-test 
Boto elb states unit test
 2015-04-23 08:16:44 -06:00
Justin Findlay
c50bf4ec50 Merge pull request #22979 from jayeshka/boto_elasticache-states-unit-test 
Boto elasticache states unit test
 2015-04-23 08:15:40 -06:00
Justin Findlay
34453b314e fix failing apache state unit test 2015-04-23 08:09:15 -06:00
Jayesh Kariya
b9188aea6a adding qemu_img unit test case 2015-04-23 18:13:27 +05:30
Jayesh Kariya
d347bb4e3b changes as per 2015.2 branch 2015-04-23 17:58:08 +05:30
Jayesh Kariya
06bf61822d changes as per 2015.2 branch 2015-04-23 17:56:04 +05:30
Justin Findlay
f2eb8c509a Merge pull request #22978 from makinacorpus/file 
Fix file.managed absent source error
 2015-04-23 06:19:26 -06:00
Jayesh Kariya
6ef51d1b2d adding states/boto_elb unit test case 2015-04-23 17:29:19 +05:30
Jayesh Kariya
2c03692d04 adding states/boto_elasticache unit test case 2015-04-23 17:27:28 +05:30
Mathieu Le Marec - Pasquet
73178d7a61 Fix file.managed absent source error 2015-04-23 11:43:13 +02:00
Seth House
eceacad9c4 Added favicon support to avoid 404s 2015-04-23 02:12:12 -06:00
Seth House
de976756d5 Switch is_master_running() to be a private method 
The list of available clients is generated from the public methods on
the class.
 2015-04-23 02:00:51 -06:00
Seth House
b24cbc68d5 Added rest_cherrypy tool to serve HTML the root URL 2015-04-23 01:58:33 -06:00
Justin Findlay
7fdfa4c3fd Merge pull request #22970 from whiteinge/salt-api-503-support 
Add support to salt-api to detect a downed master and return 503s
 2015-04-22 23:10:22 -06:00
Seth House
4328b1839d Added 'once' support to the scheduler 2015-04-22 21:56:41 -06:00
Seth House
e83f73d3e8 Return a 503 when the Salt master is down; for commands and auths 2015-04-22 21:53:37 -06:00
Seth House
036c14cc59 Check if the Salt Master is running before trying to run a command 2015-04-22 21:53:36 -06:00
Seth House
deaa323acd Add new exception subclass for when a required daemon is not running 2015-04-22 21:53:35 -06:00
Seth House
a1de4a137c Add a method to NetapiClient to check if the master is running 2015-04-22 21:53:35 -06:00
Colton Myers
c896b165d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-22 14:21:21 -06:00
Justin Findlay
89fa18500c Merge pull request #22955 from terminalmage/dockerio-run-fix 
Fix regression introduced yesterday in dockerio module
 2015-04-22 12:56:39 -06:00
Justin Findlay
46ef227911 Merge pull request #22954 from rallytime/bp-22909 
Backport #22909 to 2014.7
 2015-04-22 12:56:20 -06:00
Erik Johnson
b4472ad1b2 Fix regression introduced yesterday in dockerio module 
This fixes a problem introduced in 8ddbc20, I left out the double-dash
between the nsenter arguments and the command to run via nsenter.
 2015-04-22 12:13:47 -05:00
mguegan
70c1cd3969 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-22 11:13:31 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
 2015-04-22 10:51:49 -06:00
Thomas S Hatch
2520e816bc Merge pull request #22679 from jfindlay/merge_22219 
merge #22219
 2015-04-22 10:47:45 -06:00
Thomas S Hatch
c9ae593461 Merge pull request #22856 from jfindlay/route53_timeout 
increase timeout and decrease tries for route53 records
 2015-04-22 10:47:01 -06:00
Mike Place
a0cfd8573f Merge pull request #22947 from garethgreenaway/22571_2015_2_schedule_pillar_refresh_seconds_exceptions 
Fixes to scheduler
 2015-04-22 10:26:10 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7 
Test with a more recent pip version to avoid a traceback
 2015-04-22 10:25:17 -06:00
Mike Place
de339bef0a Merge pull request #22945 from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions 
Fixes to scheduler
 2015-04-22 10:25:00 -06:00
Thomas S Hatch
0287c439bb Merge pull request #22912 from thatch45/loader_fix 
late init the lazy loader
 2015-04-22 09:50:48 -06:00
Thomas S Hatch
12d2b91d85 Merge pull request #22887 from hvnsweeting/18843-fix-user-present-home 
fix #18843
 2015-04-22 09:47:05 -06:00
Mike Place
b7de7bdf47 Merge pull request #22930 from jfindlay/localegen_bool 
localemod.gen_locale now always returns a boolean
 2015-04-22 09:37:39 -06:00
Mike Place
a2d2a5b3cb Merge pull request #22931 from jacksontj/2015.2 
Cleanup jinja attribute access for loader
 2015-04-22 09:35:29 -06:00
Mike Place
11bcf14979 Merge pull request #22933 from hvnsweeting/18843-test 
add test for #18843
 2015-04-22 09:27:18 -06:00
Gareth J. Greenaway
595bc284b7 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed│·································· 
and causing exceptions.  This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not.
 2015-04-22 08:17:04 -07:00