valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,308 Commits 24 Branches 182 Tags 341 MiB
7bfb28c5db
Commit Graph

65308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
6ad59e78c5 Merge pull request #30767 from tonybaloney/feature/dimension_data_cloud 
Add saltcloud module for Dimension Data Cloud
 2016-02-02 08:55:34 -07:00
Mike Place
15e247cd96 Merge pull request #30811 from s0undt3ch/issues/py26-deepcopy-fix 
Teach python 2.6 how to copy the object.
 2016-02-02 08:46:32 -07:00
Mike Place
e6990e4c3d Merge pull request #30812 from s0undt3ch/features/de-blackhole-salt-ssh 
Make `salt-ssh` executions less of an exception black hole
 2016-02-02 08:46:13 -07:00
Mike Place
e3f0c8e162 Merge pull request #30731 from Unity-Technologies/feature/osx_keychain 
Added the ability to configure keychains on OSX
 2016-02-02 08:03:14 -07:00
Mike Place
6cac5d54a9 Merge pull request #30768 from jizhilong/fix/redis_return_get_jids 
Return a dict in `redis_return.get_jids`.
 2016-02-02 07:49:23 -07:00
Mike Place
330abcad12 Merge pull request #30775 from Unity-Technologies/feature/mac_defaults 
Added the ability to set OS X settings using defaults
 2016-02-02 07:47:49 -07:00
Pedro Algarvio
ba5a271e2d Make salt-ssh executions less of an exception black hole 2016-02-02 14:46:48 +00:00
Pedro Algarvio
6f7f7fea69 Teach python 2.6 how to copy the object. 2016-02-02 14:32:20 +00:00
Mike Place
65abaea9fe Merge pull request #30795 from sjorge/states-smartos-fix 
states.smartos.config_present, fixed bug where spaces broke the smartos config parser
 2016-02-02 07:27:31 -07:00
Mike Place
fc1437c73f Merge pull request #30796 from skizunov/develop2 
Fix minion failover after disconnect
 2016-02-02 07:26:31 -07:00
Mike Place
cab0d07924 Merge pull request #30801 from kartsm/jboss7-artifactory 
Decouple jboss7.deployed from Artifactory
 2016-02-02 07:09:55 -07:00
Mike Place
e4ca01181b Merge pull request #30803 from Unity-Technologies/feature/win_certutil 
Added the ability to add and remove certificates from Windows minions
 2016-02-02 07:04:30 -07:00
Mike Place
0763ae97b3 Merge pull request #30804 from Unity-Technologies/feature/win_license 
Added ability to install and activate a windows license
 2016-02-02 07:03:29 -07:00
Daniel Hobley
2567ea6956 Lint fixes 2016-02-02 11:48:17 +01:00
Daniel Hobley
5127c29e20 Lint fixes 2016-02-02 11:08:47 +01:00
Daniel Hobley
becb643557 Added ability to install and activate a windows license 2016-02-02 11:07:05 +01:00
Daniel Hobley
ddc24708ad Added the ability to add and remove certificates from Windows minions 
- Uses certutil.exe to add and remove certificates
 2016-02-02 10:06:20 +01:00
Daniel Hobley
04877e06e7 Updated based on PR feedback 
- Renamed type to vtype
- Made if statements a little more clear
 2016-02-02 09:01:38 +01:00
root
4366235f88 Merge branch 'feature/dimension_data_cloud' of https://github.com/tonybaloney/salt into feature/dimension_data_cloud 2016-02-02 14:25:38 +11:00
root
ce2f695840 extra space before disabling import warning 2016-02-02 14:25:18 +11:00
anthony-shaw
a61e7fbef3 Documentation for the driver 2016-02-02 14:20:08 +11:00
root
0ca43ba6b8 Fixed all remaining pylint issues 2016-02-02 14:01:15 +11:00
root
47d9e06b19 Set encoding and removed unused libs 2016-02-02 13:31:41 +11:00
anthony-shaw
cf2de669b5 additional fixes to linting 2016-02-02 13:25:21 +11:00
Tony Monroe
5f2998e5a2 Indentation causes recognition of no-fetch deployment 2016-02-01 17:18:56 -08:00
Tony Monroe
fdd69389fa Don't crash out if undeploy is not requested 2016-02-01 17:04:19 -08:00
Tony Monroe
4917751c3e Meaningful comment instead of exception when deploying from a local file 2016-02-01 16:59:23 -08:00
Tony Monroe
b2c88e7c1b source is now optional 2016-02-01 16:48:02 -08:00
anthony-shaw
918943639e Progress on linting errors with dimensiondata.py 2016-02-02 11:20:16 +11:00
Tony Monroe
76a5adb380 Slight doco cleanup 2016-02-01 15:46:41 -08:00
Tony Monroe
79f68ea9f6 Handle both managed-file and no-copy deployments 2016-02-01 15:35:31 -08:00
Tony Monroe
4692a31894 First pass at #30515 
Attempt to purge obvious Artifactory bits, and adjust doco accordingly
 2016-02-01 15:07:40 -08:00
Sergey Kizunov
616eb79ae2 Fix minion failover after disconnect 
salt/minion.py:
- In the `__master_disconnected` case, it originally set
`self.opts['master']` to the result of `self.eval_master`. This
makes no sense since `self.eval_master` returns a future. Now we
yield on `self.eval_master` and store both return values.
- Just like in `Minion.destroy`, we clear `self.pub_channel.on_recv`.
Also, if `self.pub_channel` has a `close`, it is invoked. This
resolves a circular reference issue with the TCP transport. The
`SaltMessageClient` contains function references to the
`connect_callback` and `disconnect_callback` functions in
`AsyncTCPPubChannel`. This circular reference prevents the `del` from
deallocating the `AsyncTCPPubChannel` object.

salt/transport/tcp.py:
- In `SaltMessageClient.close`, reset the function references
`self.connect_callback` and `self.disconnect_callback`. This allows a
subsequent `del` on `AsyncTCPPubChannel` to actually deallocate the
object.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-01 16:15:11 -06:00
Mike Place
4fabce16c0 Merge pull request #30704 from DSRCompany/issues/30431_get_url_large_file 
Issues/30431 get url large file
 2016-02-01 15:13:58 -07:00
Jorge Schrauwen
f8166ccb52 fix strings with spaces not being handled properly 2016-02-01 21:56:54 +00:00
Mike Place
47f3ee48b4 Merge pull request #30629 from skizunov/develop2 
Fix TCP transport presence events to work with a NAT
 2016-02-01 14:55:15 -07:00
Mike Place
d9bf97fb16 Merge pull request #30793 from jacobhammons/release-2015.5 
Versioned latest release to 2015.8.4
 2016-02-01 14:52:43 -07:00
Mike Place
86ea047933 Merge pull request #30734 from Unity-Technologies/feature/osx_assistive 
Added ability to change assistive access on OSX 10.9+
 2016-02-01 14:51:47 -07:00
Mike Place
e068c57eca Merge pull request #30778 from sjorge/module-zpool 
salt.modules.zpool had some issues with URL
 2016-02-01 14:20:43 -07:00
Jacob Hammons
c41e6bf981 Versioned latest release to 2015.8.4 2016-02-01 14:13:08 -07:00
jacobhammons
028ddc9fe6 Merge pull request #30770 from jacobhammons/doc-toc-reorg 
Doc restructuring, organization, and cleanup
 2016-02-01 13:48:03 -07:00
Mike Place
abfdd3ee3c Merge pull request #30782 from jtand/cmdmod_script 
SyntaxError not appropriately caught.
 2016-02-01 13:12:29 -07:00
Mike Place
68f4fd2fb3 Merge pull request #30697 from Unity-Technologies/feature/proxy-settings 
Added ability to set proxy settings on OSX and Windows
 2016-02-01 13:04:59 -07:00
Colton Myers
25102fc78c Merge pull request #30790 from xmj/develop 
salt/modules/sysrc.py: Fix documentation for set_
 2016-02-01 12:25:44 -07:00
Johannes Meixner
b4117397aa salt/modules/sysrc.py: Fix documentation for set_ 
set_ documentation was yank&pasted from remove without changing it.

Instead, give a proper example how to use sysrc.set.
 2016-02-01 20:41:58 +02:00
Daniel Hobley
f0771134ac Lint fixes 2016-02-01 19:01:08 +01:00
Mike Place
d68d753dbb Merge pull request #30766 from alxf/local/issue-#29752 
Add feature mentionned in issue #29752.
 2016-02-01 11:57:51 -06:00
Mike Place
220920ed08 Merge pull request #30765 from sjorge/grains-mdata-fix 
mdata grains on smartos tweak
 2016-02-01 11:55:32 -06:00
justinta89
9b5ce69a54 SyntaxError not appropriately caught. Further testing shows that python2.4 will use print() without an error. 2016-02-01 10:34:24 -07:00
Jorge Schrauwen
5943ce6ef1 hande url as values better in salt.modules.zpool 2016-02-01 15:19:35 +00:00