valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,925 Commits 24 Branches 182 Tags 341 MiB
bfa4ef77e2
Commit Graph

49925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Nitin Madhok
3fa499fd1d Adding Getting Started with VMware docs 2015-03-31 12:06:20 -04: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
Nitin Madhok
3d501b7a66 Docs fixes and adding VMware to core config docs 2015-03-31 11:23:36 -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
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
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
Nitin Madhok
7b562b5579 Fail with error and message if clonefrom not specified. Currently only cloning is supported when creating vm 2015-03-31 07:15:59 -04:00
Nitin Madhok
cc71373f34 Lots of refactoring and adding create() function which can clone from vm/template for now 2015-03-31 07:08:01 -04:00
Jayesh Kariya
bada2e22fa adding sqlite3_test unit test 2015-03-31 15:39:26 +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
Nitin Madhok
6630e2fc09 Adding destroy() to vmware cloud 2015-03-30 17:15:33 -04: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
Nicole Thomas
23045fdb19 Merge pull request #22162 from rallytime/pylinting-dev 
Pylinting dev
 2015-03-30 15:05:12 -06:00
Nicole Thomas
28fb7df29e Merge pull request #22166 from rallytime/fix_bluez_test 
Use lists, not dicts, for MagicMock side_effect
 2015-03-30 14:58:55 -06:00
Nicole Thomas
56fefa5bca Merge pull request #22165 from skizunov/develop 
Bugfix: Reactor missing import.
 2015-03-30 14:31:26 -06:00
Nicole Thomas
fe808b7920 Merge pull request #22163 from johntron/patch-1 
Improves example illustrating SLS-to-Python mapping
 2015-03-30 14:26:29 -06:00
rallytime
10c1dbe01e Fix remaining pylint errors for cassandra_cql.py 2015-03-30 14:21:17 -06:00
rallytime
3c1bb402bc Whitespace fix 2015-03-30 14:10:40 -06:00
rallytime
154f1fe1ae Remove unused import 2015-03-30 14:09:42 -06:00
rallytime
8b1d3cdeda Use lists, not dicts, for MagicMock side_effect 
Fixes the Python 2.6 test failures on develop
 2015-03-30 13:46:48 -06:00
Sergey Kizunov
f25907f125 Bugfix: Reactor missing import. 
This missing import causes the Reactor not to fire in certain cases. This could be related with issue #21651.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-03-30 14:19:23 -05:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05:00
rallytime
0fd10caab7 Python 3 compat for nagios_rpc.py 2015-03-30 12:56:39 -06:00
rallytime
0c11fc95be Pylint clean up for cassandra_cql.py 2015-03-30 12:54:03 -06:00