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
74,643 Commits 24 Branches 182 Tags 341 MiB
e653413dfc
Commit Graph

74643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e653413dfc Merge pull request #37495 from sjorge/2016.11-sunos_pkgsrc 
Allow OmniOS and OpenIndiana to find libcrypto
 2016-11-07 11:18:28 +13:00
Super-User
52c3f159a9 handle other Solaris-like distributions that use pkgsrc the same as SmartOS 2016-11-06 14:19:02 +01:00
Mike Place
59ab1b4357 Merge pull request #37471 from twangboy/fix_win_file 
Fix file.managed for Windows
 2016-11-06 14:49:05 +13:00
Nicole Thomas
56a02027ad Merge pull request #37479 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-04 15:27:56 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
Nicole Thomas
a1bf88b767 Merge pull request #37439 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-04 13:14:42 -06:00
twangboy
a4612d809a Add get_source_sum to the namespaced functions 2016-11-04 16:12:40 +00:00
Pablo Suárez Hernández
4ae036055d Fix unit test for Zypper dist-upgrade in Carbon 2016-11-04 09:36:41 -06:00
rallytime
4080cb4f12 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-11-03 08:54:32 -06:00
Nicole Thomas
80a99c4cc5 Merge pull request #37430 from meaksh/zypper-dist-upgrade-debug-solver-fix-2016.3 
Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (2016.3)
 2016-11-03 08:35:46 -06:00
Mike Place
67cc7a7dc4 Fix incorrect reference of __utils__ in salt.utils (#37428) 
Closes #37388
 2016-11-03 08:33:40 -06:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver 
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
 2016-11-03 08:34:26 +00:00
Mike Place
4c40525554 Merge pull request #37425 from gtmanfred/2016.11 
get cachedir_index add and del moved to __utils__
 2016-11-03 11:38:35 +13:00
Nicole Thomas
09878620c7 Merge pull request #37420 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-02 15:40:21 -06:00
Nicole Thomas
7864f9b79d Merge pull request #37419 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-02 15:40:04 -06:00
Daniel Wallace
8df7f37d3b get cachedir_index add and del moved to __utils__ 2016-11-02 16:13:36 -05:00
Erik Johnson
d749567f1e Fix regression in output for Ctrl-c'ed CLI jobs (#37416) 
https://github.com/saltstack/salt/pull/37115 backported a fix from
develop into 2016.3 and inadvertently broke a fix that I had initially
submitted in https://github.com/saltstack/salt/pull/36750. This commit
corrects this regression.
 2016-11-02 13:34:53 -06:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Aditya Kulkarni
e9b4620fac Add unit tests for cloning from snapshot (#37414) 2016-11-02 11:22:37 -06:00
rallytime
bce47c9175 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-02 11:18:20 -06:00
Nicole Thomas
881c4b7120 Merge pull request #37411 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-02 10:12:28 -06:00
Nicole Thomas
8679ce4510 Back-port #37321 to 2016.11 (#37409) 
* status.uptime - avoid nawks srand, causes problems on smartos

* status.uptime - remove docs comment that no longer applies

* status.uptime - optimize a tiny it and get rid of the need for a shell

* status.uptime - actually remove the now redudent line too

* status.uptime - readded fallback to uptime binary, atleast we get something on the BSDs too now

* status.uptime - support python pre 2.7 as per damon-atkins

* status.uptime - want OpenBSD support

* status.uptime - want freebsd support, removed fallback once again so we are consistant

* status.uptime - want NetBSD support

* status.uptime - fold @jfindlay  work for OSX into mine, tweak mine based on his work

* status.uptime - push tests from @jfindlay with updates SunOS test

* status.uptime - remove cmd.run_all as it was replaced by sysctl.get

* status.uptime - attempt to fix sunos test

* Figured out why there was a cmd.run mock  was there.

* add note for SunOS, so we do not forget

* Update version added tag
 2016-11-02 09:50:30 -06:00
rallytime
d1a605e745 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-02 08:48:28 -06:00
Mike Place
ecd794a233 Merge pull request #37404 from saltstack/revert-37401-bootstrap_delay 
Revert "Bootstrap delay option for salt-cloud"
 2016-11-02 22:48:52 +13:00
Mike Place
e864de8f03 Revert "Bootstrap delay option for salt-cloud" 2016-11-02 22:48:39 +13:00
Mike Place
2eb44fbd11 Merge pull request #37401 from cachedout/bootstrap_delay 
Bootstrap delay option for salt-cloud
 2016-11-02 22:02:13 +13:00
Mike Place
6e42b0e157
Bootstrap delay option for salt-cloud 2016-11-02 22:01:20 +13:00
Mike Place
9446e48da0 Merge pull request #37350 from pass-by-value/full_and_linked_clone_v1 
Add handling for full and linked clone
 2016-11-02 21:02:29 +13:00
Mike Place
e08290ed29 Merge pull request #37365 from skizunov/develop5 
PY3: Use `enter_context` instead of `push` for `ExitStack`
 2016-11-02 20:51:06 +13:00
Mike Place
421cfa6e66 Merge pull request #37368 from terminalmage/issue34101 
Overhaul archive.extracted state
 2016-11-02 20:45:05 +13:00
Mike Place
fc0c33cfae Merge pull request #37378 from skizunov/develop6 
Fix `__context__` to properly sandbox
 2016-11-02 19:43:50 +13:00
Mike Place
c7f4d7f76a Merge pull request #37386 from rallytime/fix-34841 
Fix win_useradd.chgroups return when cmd.run_all retcode != 0
 2016-11-02 19:34:12 +13:00
Mike Place
34b6c6459a Merge pull request #37390 from rallytime/fix-34263 
Don't insert __pub* keys into dnsmasq config file with set_config function
 2016-11-02 19:31:53 +13:00
Mike Place
798b2acbe3 Merge pull request #37391 from rallytime/bp-35287 
Back-port #35287 to 2016.3
 2016-11-02 19:18:26 +13:00
Mike Place
7b1d3b5562 Merge pull request #37392 from rallytime/bp-33190 
Back-port #33190 to 2015.8
 2016-11-02 19:18:13 +13:00
Erik Johnson
3014afd517 Overhaul archive.extracted state 
This fixes a number of annoyances with the archive.extracted state.
Rather than re-state the changes again here, they can be observed in the
carbon release notes, where they have been documented.
 2016-11-01 19:35:57 -05:00
Jason Portnoy
4063bae5de catch None cases for comments in jboss7 state module 2016-11-01 15:56:31 -06:00
Derek Maciel
0e1ebea5a4 Simplify return value to "True". 
It is fine to return True here because, in the event that the directory
cannot be created, an exception can be raised anyway.
 2016-11-01 15:54:36 -06:00
Derek Maciel
13022c5cc4 return value for mkdir instead of None 2016-11-01 15:54:36 -06:00
rallytime
e082ff538b Fix failing test now that we're raising a CommandExecutionError 
Also adds a test to check that the CommandExecutionError is raised
when the filename is not present.
 2016-11-01 15:51:09 -06:00
rallytime
c6a3476abb Filter out the __pub keys passed via **kwargs for dnsmasq.set_config 
Fixes #34263
 2016-11-01 14:32:54 -06:00
rallytime
fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in #34263 2016-11-01 14:31:14 -06:00
Nicole Thomas
ba1e6cd1a6 Merge pull request #37384 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-01 12:53:07 -06:00
rallytime
c70492a1fe Fix win_useradd.chgroups return when cmd.run_all retcode != 0 
Fixes #34841

When calling user.chgroups on a windows system, we were not checking
for the retcode of the `cmd.run_all` call when the localgroup call
failed.

This adds a check to make sure the retcode is 0. If it isn't 0, then
we should be returning False, not True.
 2016-11-01 11:19:23 -06:00
rallytime
da79271aed Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-01 10:43:07 -06:00
Nicole Thomas
7115f8e79f Merge pull request #37380 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-01 10:42:06 -06:00
rallytime
b1d64448c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/context.py
 2016-11-01 09:33:29 -06:00
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3 
initialize super class of NamespacedDictWrapper
 2016-11-01 09:12:49 -06:00
Thomas S Hatch
f0c37efb3c Merge pull request #37361 from rallytime/fix-36829 
Remove --no-compress option from mac_package.install_app function
 2016-11-01 09:12:25 -06:00
Thomas S Hatch
45f365e14f Merge pull request #37357 from rallytime/update-version-refs 
Update remaining Carbon references to 2016.11.0
 2016-11-01 09:07:05 -06:00