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
68,210 Commits 24 Branches 182 Tags 341 MiB
4205fd605c
Commit Graph

68210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4205fd605c Merge pull request #34209 from lomeroe/fix_s3_utils_regression_33682 
fix regression in s3.query from #33682
 2016-06-22 11:50:19 -07:00
Mike Place
05a4785c8c Merge pull request #34222 from cachedout/lint_34200 
Lint 34200
 2016-06-22 11:48:53 -07:00
Mike Place
eadf80a56f Linted #34200 2016-06-22 12:38:29 -06:00
Mike Place
0cbdb73fc5 Merge pull request #34197 from eliasp/2016.3-salt.modules.ssh.recv_known_host-empty_results 
Make `module.ssh.recv_known_host()` more resilient against hosts not returning a key
 2016-06-22 10:26:02 -07:00
Mike Place
606ae3c886 Merge pull request #34201 from DarkKnightCZ/cmdmod-34199 
Suffix temp file with .sr1 and add mandatory argument when executing PowerShell script
 2016-06-22 10:21:24 -07:00
Mike Place
cb704b780b Merge pull request #34198 from DarkKnightCZ/cmdmod-34196 
Don't use binary mode for cmdmod.exec_code
 2016-06-22 10:14:06 -07:00
Mike Place
0578a2f87d Merge pull request #34172 from dmurphy18/debbuild_deps 
Support for building with local packages on Debian and Ubuntu
 2016-06-22 09:36:44 -07:00
Ethan Moore
a2b99703b1 fix regression in s3.query from #33682 
attempting to pull a list of objects from s3 would fail to return the list of objects
 2016-06-22 16:26:15 +00:00
Denys Havrysh
37978a1ebe Correct the docstrings formatting in pkgbuild modules and state (#34194) 2016-06-22 11:37:08 -04:00
Lukas Raska
05748743bc Suffix temp file with .sr1 and add -File argument when executing PowerShell code via cmdmod.exec_code 
Fixes #34199
 2016-06-22 13:00:49 +02:00
Ignat Korchagin
2cd0433f8d Fix parted module set CLI example 2016-06-22 11:38:15 +01:00
Lukas Raska
04553cd3de Don't use binary mode for cmdmod.exec_code 
Fixes #34196
 2016-06-22 12:11:34 +02:00
Elias Probst
82c4b1229e
Make module.ssh.recv_known_host() more resilient against hosts not returning a key 
Some providers (esp. Bitbucket) have faulty git/SSH endpoints which
often simply return empty results. A previous attempt in Salt to improve
this by adding an optional timeout value didn't change much here, as it
just increased the time it took to return: nothing.

Repeating the request a few times until the host returns a value works
around this issue far more reliable.

Signed-off-by: Elias Probst <mail@eliasprobst.eu>
 2016-06-22 12:10:23 +02:00
Nicole Thomas
a8429c2595 Merge pull request #34186 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-21 19:26:34 -04:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 16:03:31 -06:00
Nicole Thomas
1c4369d093 Merge pull request #34184 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-21 17:43:46 -04:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 14:47:23 -06:00
Mike Place
5411ebb3b4 Merge pull request #34141 from jtand/boto_vpc_test_fix 
Fixed boto_vpc_test failure
 2016-06-21 13:08:11 -07:00
Mike Place
c059d6c08c Merge pull request #34176 from rallytime/bp-34103 
Back-port #34103 to 2015.8
 2016-06-21 13:01:45 -07:00
Mike Place
5cbaaed167 Merge pull request #34179 from terminalmage/issue34114 
Raise the correct exception when gitfs lockfile is empty
 2016-06-21 13:00:59 -07:00
Mike Place
67deded119 Merge pull request #34178 from terminalmage/remove-comment 
Remove unnecesssary comment
 2016-06-21 12:15:37 -07:00
Erik Johnson
86d1b8e864 Raise the correct exception when gitfs lockfile is empty 
Catching the ValueError around line 416 means that when we re-raise
the exception below, we raise the wrong exception. This commit
explicitly raises the outer-scope exception that we caught above the
block where we attempt to read from the lock file.

Resolves #34114.
 2016-06-21 13:48:32 -05:00
Erik Johnson
4965be72b1 Remove unnecesssary comment 
This was part of some intermediate work while I was working on ab9da90c
and it should have been removed.
 2016-06-21 13:28:19 -05:00
Mike Place
3413c494bd Merge pull request #34173 from rallytime/fix-34162 
Update docs to match log_level default
 2016-06-21 10:15:53 -07:00
Morgan Willcock
2e5e7ed03c Fix diskusage beacon 
Stop trying to load the entire mount dict as the mount point.
 2016-06-21 10:51:26 -06:00
Mike Place
c596bf5744 Merge pull request #34095 from rallytime/bp-32396 
Back-port #32396 to 2016.3
 2016-06-21 09:12:39 -07:00
Michael Calmer
6387d1636e fix salt --summary to count not responding minions correctly (#34165) 
In case a minion is not responding a dict is returned instead of a string.
 2016-06-21 12:10:48 -04:00
Nicole Thomas
e5949ea6f1 doc: add missing dot (#34175) 2016-06-21 12:09:00 -04:00
Nicole Thomas
47595d6795 Typo fix (#34174) 2016-06-21 12:08:43 -04:00
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests 
Add some grains targeting tests
 2016-06-21 09:06:30 -07:00
David Murphy
f7f8a5d33f Fixed pylint issues 2016-06-21 09:56:53 -06:00
Mike Place
b98687875f Merge pull request #34108 from l2ol33rt/docker_absent_dryrun 
Make dockerng.absent state honor test=true
 2016-06-21 08:55:28 -07:00
Mike Place
a75386a669 Merge pull request #34133 from rallytime/bp-34057 
Back-port #34057 to 2016.3
 2016-06-21 08:53:46 -07:00
Mike Place
dd989dac78 Merge pull request #34156 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-21 08:52:58 -07:00
Mike Place
b302cb03ef Merge pull request #34110 from garethgreenaway/git_needs_saltenv_for_identity 
Fixes to git module & state module related to identity file
 2016-06-21 08:52:17 -07:00
Mike Place
6c3405755a Merge pull request #34138 from rallytime/fix-34120 
Update package dep note to systemd-python for RHEL7 install
 2016-06-21 08:51:24 -07:00
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00
David Murphy
82fa276141 Support for building with local packages on Debian and Ubuntu 2016-06-21 09:29:43 -06:00
Denys Havrysh
55c22080df Fix YAML indentation in Apache state docstrings (#34166) 2016-06-21 11:03:06 -04:00
rallytime
b061b86946 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-20 17:22:07 -06:00
rallytime
2199bb8a78 Add integration tests for grains.append 2016-06-20 16:44:22 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06:00
Mike Place
65fba5b4d7 Merge pull request #34142 from isbm/isbm-getid-loglevel-shift 
Move log message from INFO to DEBUG.
 2016-06-20 11:57:34 -07:00
Justin Anderson
02f9ba99ba Updated version check. Moved check into it's own function 2016-06-20 10:33:13 -06:00
Bo Maryniuk
236a67b702 Move log message from INFO to DEBUG. 2016-06-20 17:53:59 +02:00
Justin Anderson
d445026c56 Updated test to work with new moto version. Changed strings to unicode 2016-06-20 09:26:39 -06:00
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install 
Fixes #34120
 2016-06-20 08:53:42 -06:00
Antoine Jacoutot
f7be5e182b _active_mounts_openbsd: unbreak output for special filesystems 
mount(8) output is a little bit different on OpenBSD between local and special
or remote filesystems (e.g. tmpfs or nfs). These do not use a UUID nor a device.

https://github.com/saltstack/salt/issues/34012
 2016-06-20 08:06:41 -06:00
Robert James Hernandez
5598cb4a21 Make docker.absent honor test=true 2016-06-17 17:42:25 -07:00
Gareth J. Greenaway
68092cdc8c When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv. 2016-06-17 16:32:05 -07:00