valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,247 Commits 24 Branches 182 Tags 341 MiB
543f0ca712
Commit Graph

65247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Mike Place
629c0b2829 Merge pull request #30772 from HerrBerg/develop 
supervisord: allow updating single process groups
 2016-02-03 12:58:13 -07:00
Mike Place
a52fde5a20 Merge pull request #30871 from ChrisLundquist/update-cmd-env-docs 
[states/cmd.py] update docs on passing env to run
 2016-02-03 12:55:32 -07:00
Mike Place
618f823e21 Merge pull request #30774 from Unity-Technologies/feature/mac_package 
Added ability to install PKG, DMG and APP files for OS X minions
 2016-02-03 12:54:32 -07:00
Chris Lundquist
ac3f1f326e [states/cmd.py] update docs on passing env to run 
In Salt: 2015.8.3 it seems there is a simpler way to pass
environmental variables to cmd.run. This updates the documentation
to reflect a more straight forward way.
 2016-02-03 11:31:28 -08:00
Mike Place
a901601211 Merge pull request #30797 from rhansen/docker-volume-driver 
don't delete existing Docker volume if driver unspecified
 2016-02-03 09:34:30 -07:00
Mike Place
5827347884 Merge pull request #30844 from terminalmage/pr-30703 
Perform initial gitfs/git_pillar fetch when init'ing remotes on masterless minion
 2016-02-03 09:31:21 -07:00
Mike Place
5b22cdfe4f Merge pull request #30854 from silenius/develop 
pip: add --no-cache-dir
 2016-02-03 09:26:11 -07:00
Julien Cigar
be265a83a4 pip: add --no-cache-dir 2016-02-03 11:06:56 +01:00
Daniel Hobley
29a4c3958e Removed possible shell injections as requested by PR feedback 2016-02-03 08:44:13 +01:00
Erik Johnson
20c8badf4c Add __role to master opts for gitfs integration tests 2016-02-02 21:29:39 -06:00
Erik Johnson
7310fe3a9b Only perform initial fetch when running on a minion 
This prevents the master's maintenance process from attempting to run a
fetch while GitBase.init_remotes() is in the process fetching a
newly-added remote.

We have proper locking in place, so there is no danger of a race
condition, but this does suppress the warning generated when an update
lock is in place at the time a fetch is attempted.
 2016-02-02 20:45:57 -06:00
Erik Johnson
3945f5cb98 gitfs: add initial fetch to pygit2 and dulwich 2016-02-02 20:45:57 -06:00
Richard Hansen
653caaae0f document the behavior if the driver is unspecified 2016-02-02 19:24:44 -05:00
Richard Hansen
cbda6446df add additional states.dockerng.volume_present() unit tests 
The unit tests now test for the bug fixed in the previous commit
(among other things).
 2016-02-02 19:24:44 -05:00
Richard Hansen
069864d8cb don't delete existing Docker volume if driver unspecified 
Before, if the driver parameter wasn't specified, the dockerng state
module's volume_present() function would try to delete the volume and
recreate it.  Now it simply ignores the existing volume's driver
setting and returns success.

Note that this change assumes that if the driver is unspecified then
the user means "I don't care what the driver is", not "I care that the
driver matches the Docker default".
 2016-02-02 18:07:31 -05:00
jacobhammons
d323ad9704 Merge pull request #30839 from jacobhammons/dev-rel-notes 
Added known issue #30820 to 2015.8.4 release notes
 2016-02-02 15:39:59 -07:00
Jacob Hammons
ea520fd848 Added known issue #30820 to 2015.8.4 release notes 2016-02-02 15:37:17 -07:00
Mike Place
dfbccdf896 Merge pull request #30689 from sjorge/states-grains 
fix for #30651 grains.list_present and grains.list_absent
 2016-02-02 13:52:06 -07:00
Mike Place
985d4c671b Merge pull request #30824 from alxf/local/issue-#28706 
Issue #28706: Fix state user.present behavior.
 2016-02-02 13:22:11 -07:00
Mike Place
bc0ffa840f Merge pull request #30825 from rallytime/doc-fixes 
Fix some autodoc import warnings from building docs
 2016-02-02 13:21:08 -07:00
jacobhammons
a8554c10d5 Merge pull request #30828 from jacobhammons/release-dev 
Updated man pages, version to 2015.8.4, added CVE 2016-1866 to releas…
 2016-02-02 13:05:01 -07:00
Jacob Hammons
fca119fe80 Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:04:34 -07:00
Mike Place
6ac7ee0b09 Merge pull request #30821 from iamseth/develop 
Fix for win_network changing dhcp to static DNS
 2016-02-02 12:42:38 -07:00
rallytime
cdc7957808 Fix some autodoc import warnings from building docs 2016-02-02 12:19:38 -07:00
Mike Place
4c17b4d272 Merge pull request #30475 from iondulgheru/develop 
Fix password variable type is int instead of string in postgres module
 2016-02-02 12:11:54 -07:00
alxf
e098f7b5b6 Issue #28706: Fix state user.present behavior. 
- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.
 2016-02-02 19:47:46 +01:00
Miller, Seth
c4c11f8d0e Fix for win_network changing dhcp to static DNS 
This fixes a bug that happens when managing network configuration for Windows hosts.

If the current mode is 'dhcp' but the state specifies 'static', the state fails with a generic error "Failed to set desired configuration settings for interface {IFACE}"

This is because the changes['dns_servers'] value doesn't get set so the win_ip module doesn't get invoked later on.
 2016-02-02 12:41:44 -06:00
Thomas S Hatch
d79efe8991 Merge pull request #30723 from twangboy/mac_service_2 
Mac service 2
 2016-02-02 09:59:43 -07:00
Mike Place
3a90b13e20 Merge pull request #30816 from rallytime/new-dimension-data-docs 
Add new dimension data to doc list
 2016-02-02 09:52:16 -07:00
Ion Dulgheru
16de7ce232 Fix password is treated as int instead of string in postgres module 2016-02-02 18:16:18 +02:00
rallytime
6375aa2be3 Add new dimension data to doc list 2016-02-02 09:00:01 -07:00
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
Patrick Scharrenberg
e84c0e178d check for string instrad of not None 2016-02-02 15:28:55 +01: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
Patrick Scharrenberg
ecc47dbfbb added check against None 2016-02-02 15:22:19 +01: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