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
49,909 Commits 24 Branches 182 Tags 341 MiB
7ef848edc1
Commit Graph

49909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Claudiu Popescu
5562422135 Test parameters for delete_subnet 2015-03-31 15:04:20 +02:00
Claudiu Popescu
573027569c Version and test fixes 2015-03-31 14:57:47 +02:00
Nicole Thomas
33727a5c32 Merge pull request #22190 from jayeshka/rh_service-unit-test 
adding rh_service unit test
 2015-03-31 06:48:36 -06:00
Nicole Thomas
7d47eded8b Merge pull request #22187 from jayeshka/sqlite3-unit-test 
adding sqlite3_test unit test
 2015-03-31 06:47:35 -06:00
Nicole Thomas
a4e4b58882 Merge pull request #22189 from saltstack/revert-22143-state_unit_test 
Revert "Adding state.py unit test"
 2015-03-31 06:39:55 -06:00
Jayesh Kariya
0190f4ac63 adding rh_service unit test 2015-03-31 17:42:14 +05:30
rallytime
88298c5599 Add mock exception class to keystone unit test 
Fixes unit tests error for merge forward
 2015-03-31 05:56:55 -06:00
Nicole Thomas
0ea0f3d592 Revert "Adding state.py unit test" 2015-03-31 05:32:29 -06:00
Nicole Thomas
c25b49fccd Merge pull request #22180 from jfindlay/unit_test_docs 
revise unit test documentation
 2015-03-31 05:17:27 -06:00
Claudiu Popescu
87d5f9d789 Subnet support for boto_vpc state 2015-03-31 12:37:30 +02:00
Claudiu Popescu
af7592c741 Allow subnet deletion by name 2015-03-31 12:36:17 +02:00
Jayesh Kariya
bada2e22fa adding sqlite3_test unit test 2015-03-31 15:39:26 +05:30
Rahul Handay
0b7225ab89 Adding saltcloudmod.py unit test 2015-03-31 15:32:49 +05:30
Justin Findlay
f50949e209 revise unit test documentation 2015-03-31 00:40:05 -06:00
jfindlay
524b3117ac Merge pull request #22176 from dmyerscough/delete-vmware-snapshots 
Allow users to delete VMWare snapshots and fix PEP8 complaints
 2015-03-30 23:59:10 -06:00
jfindlay
7b95940d66 Merge pull request #22143 from rahulhan/state_unit_test 
Adding state.py unit test
 2015-03-30 23:53:36 -06:00
Thomas S Hatch
1fd2daf600 Merge pull request #22151 from ckochenower/develop 
A Cassandra CQL returner
 2015-03-30 20:26:51 -06:00
Corin Kochenower
05ae473023 The last of the lint 2015-03-30 19:18:10 -06:00
Thomas S Hatch
45e11b7bac Merge pull request #22175 from garethgreenaway/nagios_rpc_changes 
Changes to nagios_rpc module
 2015-03-30 18:46:23 -06:00
Corin Kochenower
da616b4b99 Fix lint errors 2015-03-30 18:44:14 -06:00
Corin Kochenower
51f7035f68 Merge branch 'develop' of https://github.com/ckochenower/salt into develop 2015-03-30 18:25:29 -06:00
Corin Kochenower
398708f8d2 Remove eroneous text causing test failures 2015-03-30 18:24:22 -06:00
Corin Kochenower
9077c2efe8 Make nocache parameter an optional parameter 
The Salt SSH client calls prep_jid without any parameters.
As of this commit, the following python modules define
prep_jid with an optional nocache parameter.

returners/
    couchbase_return.py
    local_cache.py
    multi_returner.py
    postgres_local_cache.py

A of the remaining returners require the nocache parameter
and therefore are incompatible with the Salt SSH client.

To allow the Salt SSH client to work with all returners,
make the nocache parameter in all returners optional.
 2015-03-30 18:24:22 -06:00
Corin Kochenower
6e130a55e9 A Cassandra CQL returner 
This returner cross-calls modules/cassandra_cql.py
 2015-03-30 18:24:21 -06:00
Corin Kochenower
3813a7ba6f Remove eroneous text causing test failures 2015-03-30 17:45:50 -06:00
Damian Myerscough
1ebca452b7 Allow users to delete VMWare snapshots and fix PEP8 complaints 2015-03-30 16:29:56 -07:00
Gareth J. Greenaway
0075362344 Splitting status functions into one for host and another for service, per @thatch45. Making errors a bit more obvious by returning them instead of logging. 2015-03-30 16:02:26 -07:00
Corin Kochenower
9d54dc5f06 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-03-30 16:07:05 -06:00
Thomas S Hatch
2ebd6d8a65 Merge pull request #22127 from tsaridas/boto_iam 
Boto iam delete_user module/state
 2015-03-30 15:43:54 -06:00
Thomas S Hatch
d3472f74b0 Merge pull request #22157 from garethgreenaway/osquery_module_updates 
Updates to osquery module
 2015-03-30 15:43:29 -06:00
Thomas S Hatch
1842cc5904 Merge pull request #22114 from dmyerscough/digital-ocean-list-nodes 
Fixing KeyError when there are no additional pages
 2015-03-30 15:36:02 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00