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
62,225 Commits 24 Branches 182 Tags 341 MiB
b90ae407f9
Commit Graph

62225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Ken Crowell
12b579c4e3 When sorting list actual_data, make it a list (#34590) 
This at least impacts the `running` state when updating container
with no `volumes_from` to some.
 2016-07-12 15:16:11 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
Mike Place
91e0656d44 Merge pull request #34531 from terminalmage/issue34397 
Support ignore_epoch argument in version comparisons
 2016-07-08 10:43:36 -06:00
Mike Place
e99befad47 Merge pull request #34545 from terminalmage/docker-exec-driver 
Handle cases where Docker Remote API returns an empty ExecutionDriver
 2016-07-08 10:34:30 -06:00
Mike Place
7120d43df0 Merge pull request #34546 from rallytime/rename-boto-secgroup-test 
Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test
 2016-07-08 10:16:42 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
Erik Johnson
dd5838e242 Handle cases where Docker Remote API returns an empty ExecutionDriver 
Also fix some poorly-formatted RST in the docstring.
 2016-07-07 21:54:46 -05:00
Nicole Thomas
ca92061821 Merge pull request #34537 from rallytime/rename-simple-test 
Rename tests.unit.simple to tests.unit.simple_test
 2016-07-07 20:08:36 -04:00
rallytime
ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test 
These tests are not getting run automatically in a ./runtests.py -u
or on Jenkins runs. This name changes allows them to run automatically.
 2016-07-07 17:12:27 -06:00
Erik Johnson
d0fec1b8f6 salt/modules/zypper.py: accept ignore_epoch argument 2016-07-07 16:27:07 -05:00
Erik Johnson
5ae9463c1f salt/modules/yumpkg.py: accept ignore_epoch argument 2016-07-07 16:27:04 -05:00
Erik Johnson
c2791117af salt/modules/rpm.py: accept ignore_epoch argument 2016-07-07 16:27:01 -05:00
Erik Johnson
c5de8b880d salt/modules/ebuild.py: accept ignore_epoch argument 2016-07-07 16:26:59 -05:00
Erik Johnson
4ee8e8f037 salt/modules/aptpkg.py: accept ignore_epoch argument 2016-07-07 16:26:55 -05:00
Nicole Thomas
fbab2f8c2b [2015.8] Update bootstrap script to latest stable (#34527) 
Version 2016.07.07
 2016-07-07 17:26:35 -04:00
Erik Johnson
5b123b403c Pass ignore_epoch to salt.utils.compare_versions() 2016-07-07 16:25:28 -05:00
Erik Johnson
07368fac40 Accept ignore_epoch argument for salt.utils.compare_versions() 2016-07-07 16:24:58 -05:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
Ahmed M. AbouZaid
c2f296c95b Fix wrong order of retention_policy_exists (#34507) 
The name of retention policy and database were reversed, so SaltStack was using rp name as database, so it returns "database does not exist"
 2016-07-07 16:43:32 -04:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.

This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
 2016-07-07 12:51:01 -05:00
Mike Place
a516f116d1 Merge pull request #34513 from cachedout/lower_loader_log 
Lower the log level for modules which cannot be loaded to trace
 2016-07-07 11:00:47 -06:00
Mike Place
733c5d00c0 Lower the log level for modules which cannot be loaded to trace 2016-07-07 10:57:51 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
zer0def
6ce7cb9616 Gracefully handle non-XML output in GlusterFS execution module. (#34492) 
* Gracefully handle non-XML command output.

* Omit gluster command usage line.

* Remove unnecessary import.
 2016-07-06 17:12:30 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
Nicole Thomas
0f3f87fbc5 Update dnsmasq.get_config docs to use correct config_file param. (#34488) 
Fixes #34261
 2016-07-06 13:29:07 -04:00
Mike Place
e2f576e847 Merge pull request #34462 from terminalmage/git-describe-always 
Use --always when available to git describe
 2016-07-05 21:59:33 -06:00
Mike Place
85f1f18239 Merge pull request #34467 from rallytime/bp-34457 
Back-port #34457 to 2015.8
 2016-07-05 21:56:58 -06:00
Thomas S Hatch
9e15337b74 Merge pull request #34432 from twangboy/fix_file.append 
Fix file.append
 2016-07-05 17:14:22 -06:00
twangboy
13f11fddce Remove refactoring code 2016-07-05 15:15:03 -06:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
twangboy
b83392edea Remove len() in favor of boolean test 2016-07-05 13:52:07 -07:00
twangboy
4373408163 Fix line error 2016-07-05 14:48:45 -06:00
twangboy
2479b53e2f Fix erroneous report on newline code 2016-07-05 14:48:45 -06:00
twangboy
75b6ed1fd5 Change back to binary read 2016-07-05 14:48:45 -06:00
twangboy
65753cff6d Use os.linesep instead of \n 2016-07-05 14:48:45 -06:00
twangboy
a55d63f086 Fix object names 2016-07-05 14:48:45 -06:00
twangboy
3e2fe12e5e Add new line if missing 2016-07-05 14:48:45 -06:00
twangboy
0b7821c8db Fix file.append state 2016-07-05 14:48:45 -06:00
Ryan Lane
746883741f Only access key metadata if we found key metadata 2016-07-05 13:56:13 -06:00
Erik Johnson
6ef7ee198e Restrict use of --always to git 1.5.6 and newer 2016-07-05 13:57:22 -05:00
Erik Grinaker
c554b22fc8 modules/git: added --always parameter for git.describe(). 2016-07-05 13:52:23 -05:00
Mike Place
91e095bb41 Merge pull request #34429 from terminalmage/pkg-latest-versioncheck 
Skip version checking for targeted packages in pkg.latest state
 2016-07-05 11:50:41 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00