valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,892 Commits 24 Branches 182 Tags 341 MiB
b27378b186
Commit Graph

55892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
b27378b186 add 2015.8.0rc2 autogenerated changelog 2015-07-23 11:04:18 -06:00
Justin Findlay
76c28da908 Merge pull request #25639 from terminalmage/fix-git_pillar-init 
Don't do pre-flight check on git_pillar if it is not configured
 2015-07-22 16:54:36 -06:00
Erik Johnson
c492baab3b Don't do pre-flight check on git_pillar if it is not configured 2015-07-22 16:28:16 -05:00
Mike Place
41b760429a Merge pull request #25587 from cachedout/issue_16969 
Fix prereq in salt.state
 2015-07-22 14:05:02 -06:00
Mike Place
9004ce253b Merge pull request #25628 from alprs/fix-highstate_duration_output 
Highstate output: show duration in seconds instead of milliseconds when appropriate
 2015-07-22 14:03:51 -06:00
Colton Myers
26859530e0 Merge pull request #25631 from basepi/2015.8lint 
Remove trailing whitespace
 2015-07-22 13:16:06 -06:00
Colton Myers
f94fe41983 Remove trailing whitespace 2015-07-22 13:15:07 -06:00
Colton Myers
079a15cdbf Merge pull request #25627 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-07-22 13:11:32 -06:00
Colton Myers
0722694c18 Merge pull request #25626 from basepi/salt.ssh.highstate.outputter.25368 
Fix the highstate outputter if 'duration' is not present
 2015-07-22 13:10:57 -06:00
Andreas Lutro
4fd4a0c0ff show duration in seconds instead of milliseconds when appropriate 2015-07-22 20:15:52 +02:00
Colton Myers
c63ef2c7b2 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/gem.py
    salt/modules/ssh.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/states/pkg.py
    salt/utils/__init__.py
    salt/utils/s3.py
 2015-07-22 12:05:50 -06:00
Colton Myers
940c798a5d Fix the highstate outputter if duration is not present 
Happens for `onchanges` states and so forth

Fixes #25368
 2015-07-22 11:55:52 -06:00
Mike Place
6f65fbdb82 Fix test 2015-07-22 11:43:19 -06:00
Mike Place
7b79e433f1 Merge pull request #25598 from twangboy/fix_25437 
Fixed problem trying to load file with name of boolean type
 2015-07-22 11:07:49 -06:00
Mike Place
40e9b07736 Merge pull request #25601 from terminalmage/fix-error-msg 
Fix error message when local bin pkg path is not absolute
 2015-07-22 11:06:27 -06:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Mike Place
f4a38a8aee Merge pull request #25604 from terminalmage/fix-mock_open 
Move patching of mock_open to within test
 2015-07-22 10:53:55 -06:00
Mike Place
2d697d6cc3 Merge pull request #25619 from cachedout/lint_25578_2015_8 
Lint stateconf changes
 2015-07-22 10:52:31 -06:00
Mike Place
2a45097b1c Lint stateconf changes 2015-07-22 10:51:57 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Mike Place
224484df7e Merge pull request #25609 from s0undt3ch/hotfix/bootstrap-script-2015.5 
[2015.5] Update the bootstrap script to latest release v2015.07.22
 2015-07-22 10:28:52 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Mike Place
07eb78c79f Merge pull request #25603 from terminalmage/issue21912 
Add version_cmp function to yumpkg.py
 2015-07-22 09:42:29 -06:00
Erik Johnson
a1ffa0c1c4 More test fixes 2015-07-22 10:40:49 -05:00
Erik Johnson
b9682cce10 Remove unused import 2015-07-22 10:37:47 -05:00
Justin Findlay
f4ad36b282 Merge pull request #25610 from s0undt3ch/hotfix/bootstrap-script-2015.8 
[2015.8] Update the bootstrap script to latest release v2015.07.22
 2015-07-22 09:04:57 -06:00
Pedro Algarvio
165f9ae659 Update the bootstrap script to latest release v2015.07.22 
* Fix tornado installation in Ubuntu. Thanks Yushi Nakai. saltstack/salt-bootstrap#627
* Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
* Install requests on Ubuntu from Chris Lea's PPA. saltstack/salt-bootstrap#630
 2015-07-22 13:24:30 +01:00
Pedro Algarvio
96a8568336 Update the bootstrap script to latest release v2015.07.22 
* Fix tornado installation in Ubuntu. Thanks Yushi Nakai. saltstack/salt-bootstrap#627
* Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
* Install requests on Ubuntu from Chris Lea's PPA. saltstack/salt-bootstrap#630
 2015-07-22 13:22:08 +01:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
Erik Johnson
4d295825cd Lint fixes 2015-07-22 00:36:56 -05:00
Erik Johnson
c05b22a063 Remove unused imports 
These imports now live in salt.utils.gitfs.
 2015-07-22 00:23:00 -05:00
Erik Johnson
99e532ba74 Add versionadded directive 2015-07-22 00:17:30 -05:00
Erik Johnson
8a1765fc6f Add version_cmp function to yumpkg.py 
This uses rpmUtils to more accurately compare version numbers, as
distutils.version.LooseVersion fails to successfully compare some
version numbers.

Fixes #21912.
 2015-07-21 23:33:43 -05:00
Erik Johnson
457e72e273 Fix refernces to __salt__['version_cmp'] 
This will never exist, this should have been __salt__['pkg.version_cmp']
from the beginning.
 2015-07-21 23:32:06 -05:00
Erik Johnson
a19fa2296a Avoid using single-letter variable 2015-07-21 23:29:22 -05:00
Erik Johnson
dcccb0d257 Fix error message when local bin pkg path is not absolute 2015-07-21 20:13:09 -05:00
Justin Findlay
5c94fe3ad3 Merge pull request #25599 from jfindlay/tcp_test 
fix transport settings in #25596
 2015-07-21 17:43:45 -06:00
Justin Findlay
146e6e519a fix transport settings in 3083c71 2015-07-21 16:42:33 -06:00
Mike Place
89e0f151fa Merge pull request #25596 from jfindlay/tcp_test 
Tcp test
 2015-07-21 16:34:56 -06:00
twangboy
c53e11d42c Fixed problem trying to load file with name of boolean type 2015-07-21 16:25:41 -06:00
Erik Johnson
7584f5f02a Remove unnecessary whitespace 2015-07-21 17:24:03 -05:00
Mike Place
69ef81caba Merge pull request #25590 from garethgreenaway/25560_2015_5_schedule_return_data 
2015.5 scheduled jobs return data
 2015-07-21 15:57:42 -06:00
Mike Place
50c331c592 Merge pull request #25591 from garethgreenaway/25560_2015_8_schedule_return_data 
Return data for scheduled jobs in 2015.8 default to True.
 2015-07-21 15:53:52 -06:00
Erik Johnson
d109fce299 Add git_pillar rewrite info to release notes 2015-07-21 16:46:15 -05:00
Erik Johnson
a2fc11ef57 Add new git_pillar configuration docs 2015-07-21 16:46:14 -05:00
Erik Johnson
da5d37bd3e Add new git_pillar code to git_pillar initialization 2015-07-21 16:46:14 -05:00
Erik Johnson
f2bf7a70c8 Add git_pillar to master's preflight checks 2015-07-21 16:46:14 -05:00
Erik Johnson
f3f734ad2f Use new GitFS class for gitfs 2015-07-21 16:46:14 -05:00
Erik Johnson
2512453757 Support calling git_pillar using new config schema 2015-07-21 16:46:14 -05:00