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
75,114 Commits 24 Branches 182 Tags 341 MiB
4ff0f3bcbe
Commit Graph

75114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Bleotu
4ff0f3bcbe Added get_properties_of_managed_object in salt.utils.vmware 
- optimally retrieves the properties of a managed object
 2016-10-26 05:53:40 -04:00
Mike Place
0881caae96 Merge pull request #37247 from cachedout/carbon_develop 
Carbon -> develop
 2016-10-26 15:49:02 +09:00
Mike Place
05079a206a
Merge branch 'carbon' into carbon_develop 2016-10-26 14:12:37 +09:00
Mike Place
2010d41f47 Merge pull request #37229 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-26 14:05:26 +09:00
rallytime
409e48f26b Remove duplicate `destroy` function from minion.py 
This was added during a merge forward from 2016.3 to carbon.
 2016-10-25 20:56:20 -06:00
Mike Place
fa20c4c128 Merge pull request #37223 from alexbleotu/get_service_instance_from_managed_object-gh 
Get service instance from managed object gh
 2016-10-26 10:35:02 +09:00
Mike Place
15ea1decda Merge pull request #37227 from jfindlay/init_kwargs 
cloud.__init__: convert kwargs to dict before **
 2016-10-26 10:17:22 +09:00
Mike Place
b8bd051ebb Merge pull request #37242 from dmurphy18/amzn_building 
Refined rpm building natively on Amazon Linux
 2016-10-26 10:11:15 +09:00
David Murphy
6bc1dfdeeb Refined rpm building natively on Amazon Linux 2016-10-25 14:26:55 -06:00
Nicole Thomas
534f510756 Merge pull request #37230 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-25 12:23:42 -06:00
rallytime
a9da340759 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-25 10:40:15 -06:00
rallytime
bd58650af2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - tests/unit/netapi/rest_tornado/test_handlers.py
  - tests/utils/__init__.py
 2016-10-25 10:39:02 -06:00
Daniel Wallace
b96d74a517 remove duplicate work (#37225) 
Looks like there might have been an error in a merge forward here
 2016-10-25 09:48:39 -06:00
Justin Findlay
d41350dfd8 cloud.__init__: convert kwargs to dict before ** 2016-10-25 09:41:56 -06:00
Alexandru Bleotu
ac451002dd Added tests for get_service_instance_from_managed_object 2016-10-25 11:21:32 -04:00
Alexandru Bleotu
c9c0695fb4 Added get_service_instance_from_managed_object 
- uses the HTTP stub to create a working service instance object from a
  managed object (entity)
 2016-10-25 11:21:32 -04:00
Pedro Algarvio
af31f6c3d1 Merge pull request #37220 from meaksh/carbon-zypper-fix 
Fix Zypper module and tests for Carbon
 2016-10-25 11:40:48 +01:00
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01:00
Mike Place
6aaf6bf399 Merge pull request #37213 from cachedout/more_salttesting_fixes 
More salttesting fixes
 2016-10-25 16:53:33 +09:00
Mike Place
0bbf06bd86
Lint fix 2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils 2016-10-25 16:51:30 +09:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
b448455c31 Merge pull request #37207 from cachedout/issue_37194 
Correct documentation for mine_functions
 2016-10-25 16:25:08 +09:00
Mike Place
a5e1c041cc Merge pull request #37208 from cachedout/issue_37182 
Give multimion a process manager and its own destroy method
 2016-10-25 16:24:52 +09:00
Mike Place
f3e2148f94 Merge pull request #37210 from cachedout/fix_spm_merge_conflect 
Fix merge conflict in SPM
 2016-10-25 16:24:22 +09:00
Mike Place
f70c52b15c
Fix merge conflict in SPM 
Refs e3916813bb
 2016-10-25 16:23:33 +09:00
Mike Place
4ce16b7f7a Merge pull request #37209 from cachedout/3_carbon 
Merge 2016.3 to carbon
 2016-10-25 16:14:44 +09:00
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon 2016-10-25 16:13:44 +09:00
Mike Place
ca78ffbfc2 Merge pull request #37184 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-25 16:11:37 +09:00
Mike Place
6767d5dcdb Remove repr flag from format 
Per pylint
 2016-10-25 16:11:08 +09:00
Mike Place
1449770b0b
Give multimion a process manager and its own destroy method 2016-10-25 14:37:26 +09:00
Mike Place
e19ee88b6b Merge pull request #37206 from cachedout/transport_test_hang 
Address transport test hang
 2016-10-25 14:25:55 +09:00
Mike Place
9fcdf6da94
Correct documentation for mine_functions 
Closes #37194
 2016-10-25 14:12:46 +09:00
Mike Place
1e1ea180a7 Merge pull request #37171 from benediktwerner/sensehat-module 
Sensehat module
 2016-10-25 13:53:23 +09:00
Mike Place
6737fd3ad9 Merge pull request #37179 from isbm/isbm-fix-saltapi-ssh-crash-2016-3 
Fix Salt-API ssh crash (2016.3)
 2016-10-25 13:52:19 +09:00
Mike Place
fdd0056cc0 Merge pull request #37180 from isbm/isbm-fix-saltapi-ssh-crash-dev 
Fix Salt-API ssh crash (dev)
 2016-10-25 13:49:38 +09:00
Mike Place
815dfd1c04 Merge pull request #37183 from gtmanfred/2016.3 
load tags should reference the actual load tags
 2016-10-25 13:38:00 +09:00
Mike Place
ca63376c97 Merge pull request #37188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-25 13:37:25 +09:00
Mike Place
0003bdf38b Merge pull request #37196 from t2b/issue-36951 
update documentation of dockerng cpu_shares
 2016-10-25 13:34:41 +09:00
Mike Place
83bcdfb80e Merge pull request #37204 from xbglowx/fix-pass-renderer 
Allow pass renderer to work with complex yaml structures
 2016-10-25 13:25:45 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
Brian Glogower
899a7642e5 Allow pass renderer to work with complex yaml structures 
Before, pass could only handle a 1 level dict with a value as
the pass path (string).

Greatly influenced by the GPG renderer, once again.
 2016-10-24 16:33:52 -07:00
Erik Johnson
cf0c14997c Merge pull request #37167 from luitzifa/dnf-fix-yumpkg 
fixes pkgrepo for fedora>22
 2016-10-24 17:29:23 -05:00
Nicole Thomas
0eb2565e14 Merge pull request #37185 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-24 10:42:49 -06:00
rallytime
ccb664050d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-24 10:20:46 -06:00
rallytime
063ddfd7ce Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-24 10:16:17 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00
rallytime
70851807bd Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-10-24 09:35:00 -06:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
 2016-10-24 09:29:53 -06:00