Commit Graph

49996 Commits

Author SHA1 Message Date
Thomas S Hatch
c62763744f Merge pull request #22194 from clinta/x509
New module and state: x509
2015-04-01 10:36:12 -06:00
Thomas S Hatch
9e9af6e051 Merge pull request #22249 from claudiupopescu/boto_vpc_describe_route_table
Boto VPC describe route table
2015-04-01 10:35:29 -06:00
Thomas S Hatch
5dac1991b6 Merge pull request #22245 from achernev/develop
Fix grains.get_or_set_hash to work with multiple entries under same key
2015-04-01 10:32:04 -06:00
Claudiu Popescu
28597a53b4 Boto VPC describe route table 2015-04-01 17:39:20 +02:00
Mike Place
6566a5d0ad Merge pull request #22242 from claudiupopescu/boto_vpc_route_exists
Boto VPC check if route exists
2015-04-01 09:36:12 -06:00
Mike Place
8c4d064d9f Merge pull request #22243 from jayeshka/schedule-unit-test
adding schedule unit test
2015-04-01 09:34:13 -06:00
jfindlay
bdd543ab15 Merge pull request #22237 from rahulhan/systemd_unit_test
Adding systemd.py unit tests
2015-04-01 09:17:44 -06:00
jfindlay
450276d4f5 Merge pull request #22229 from rahulhan/reg_unit_tests
Adding Reg.py unit test cases
2015-04-01 08:49:14 -06:00
Clint Armstrong
a354fa5225 Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-04-01 10:19:04 -04:00
Clint Armstrong
93e7bb867e Better CRL handling, verify certificates and CRLs against keys in states 2015-04-01 10:17:37 -04:00
Anton Chernev
81746bcaee Fix grains.get_or_set_hash to work with multiple entries under same key 2015-04-01 14:36:47 +01:00
Jayesh Kariya
07ee9602f4 resolved error. 2015-04-01 18:58:43 +05:30
Clint Armstrong
2de64fd90b wrong quotes 2015-04-01 08:45:49 -04:00
Jayesh Kariya
2b6eccb75e adding schedule unit test 2015-04-01 18:11:48 +05:30
Claudiu Popescu
ecbb62d538 Allow to check if a route exists. 2015-04-01 14:04:30 +02:00
Rahul Handay
c50b842c66 Adding systemd.py unit tests 2015-04-01 14:59:16 +05:30
Rahul Handay
7ef848edc1 Adding Reg.py unit test cases 2015-04-01 11:14:27 +05:30
Thomas S Hatch
20d8f757dd Merge pull request #22226 from garethgreenaway/20107_job_race_condition
Fixes to scheduler
2015-03-31 21:55:57 -06:00
Gareth J. Greenaway
606a275cee Fixing a bug that pops up randomly if you have multiple jobs with multiple threads, jobs would be processed in one thread but an attempt to process in another thread would be attempted. The cache file would be removed after the other thread had gotten the list of cache file. Adding some code to bypass the processing if the file is already gone. 2015-03-31 17:25:12 -07:00
Nicole Thomas
48100905a9 Merge pull request #22213 from rallytime/pylint
Python 3 compat for salt/sdb/etcd_db.py
2015-03-31 15:19:29 -06:00
rallytime
1336796a2e Python 3 compat for salt/sdb/etcd_db.py 2015-03-31 14:14:46 -06:00
Clint Armstrong
8e6c6d8d8a Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-03-31 16:00:58 -04:00
jfindlay
9ffb8a6f60 Merge pull request #22203 from pass-by-value/pip_state_doc_add
Add doc about reload modules on pip state
2015-03-31 13:32:41 -06:00
Clint Armstrong
b75451e50e forgot CLI Example string 2015-03-31 14:13:25 -04:00
Aditya Kulkarni
ea60814320 Add doc about reload modules on pip state 2015-03-31 14:12:59 -04:00
Thomas S Hatch
ab44a43efe Merge pull request #22197 from cachedout/index_jids
Create an index for jids
2015-03-31 12:07:04 -06:00
Thomas S Hatch
a03efac22c Merge pull request #22188 from claudiupopescu/vpc_subnet_features
Boto VPC subnet state
2015-03-31 12:05:44 -06:00
Thomas S Hatch
8efac4c8a2 Merge pull request #22186 from rahulhan/saltcloudmod_unit_test
Adding saltcloudmod.py unit test
2015-03-31 12:05:10 -06:00
Thomas S Hatch
be9001e7ed Merge pull request #22198 from makinacorpus/fixe
Fix syntaxerror
2015-03-31 11:49:07 -06:00
Clint Armstrong
29aa9abe49 lint 2015-03-31 13:23:19 -04:00
Mike Place
35201fc8da Whitespace 2015-03-31 11:18:56 -06:00
Mathieu Le Marec - Pasquet
e026b1bb19 Fix syntaxerror 2015-03-31 19:09:29 +02:00
Clint Armstrong
c1aabf5958 Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-03-31 12:48:39 -04:00
Clint Armstrong
24672e7a56 fix test errors 2015-03-31 12:48:24 -04:00
Mike Place
5005a6a81e Create an index for jids 2015-03-31 10:21:27 -06:00
Nicole Thomas
3cfc0a04f4 Merge pull request #22193 from saltstack/revert-22190-rh_service-unit-test
Revert "adding rh_service unit test"
2015-03-31 09:43:58 -06:00
Nicole Thomas
9412a83f2f Revert "adding rh_service unit test" 2015-03-31 09:42:47 -06:00
Clint Armstrong
a3afeb96c7 remove test state 2015-03-31 11:35:44 -04:00
Clint Armstrong
ec36c7b079 remove unneeded runner 2015-03-31 11:34:52 -04:00
Clint Armstrong
a3993f6773 remove testing state 2015-03-31 11:34:03 -04:00
Clint Armstrong
51b32b860b remove x509 runner docs 2015-03-31 11:31:49 -04:00
Clint Armstrong
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
Clint Armstrong
9de069ee30 lint 2015-03-31 11:23:55 -04:00
Clint Armstrong
ac02f46e4b fix tests, and docs' 2015-03-31 11:22:14 -04:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Clint Armstrong
2af6a65a75 return true on test 2015-03-31 10:55:28 -04:00
Colton Myers
6e10cb5e70 Merge pull request #10 from rallytime/merge-forward-develop
Add mock exception class to keystone unit test
2015-03-31 08:42:01 -06:00
Clint Armstrong
38d6400f2d docs 2015-03-31 10:28:06 -04:00
Clint Armstrong
719256147b docs 2015-03-31 10:08:45 -04:00
Clint Armstrong
14824aa18b docs 2015-03-31 10:03:24 -04:00