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,479 Commits 24 Branches 182 Tags 341 MiB
0c566dce89
Commit Graph

68479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Place
2dc937e105 Fix master crash on ctl-c for long-running job (#34490) 
* Fix master crash on ctl-c for long-running job

This was causing events to loop into the reactor, spiking CPU and leaking memory.

* Lint
 2016-07-07 16:47:31 -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
Erik Johnson
40992f0790 yumpkg: Avoid spurious logging in pkg.upgrade 
An earlier commit added the ability to upgrade only specific packages.
however, when no packages are passed to the this function, then
pkg_resource.parse_targets will log an error. Rather than allowing this
spurious error to be logged, this commit avoids this error by not
running pkg_resource.parse_targets when no packages are passed to this
function.
 2016-07-07 14:52:58 -05: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
Nicole Thomas
b9e87620f5 Merge pull request #34520 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-07 15:22:40 -04:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -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
Mike Place
58f46eae15 Merge pull request #34499 from gtmanfred/2016.3 
remove unnecessary block parsing ip addrs for nova
 2016-07-07 10:23: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
Shane Lee
17a3b23ff8 Use Python 2.7.12 for Windows Build (#34468) 2016-07-06 17:29:50 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
Daniel Wallace
019671d4c2 remove unnecessary block parsing ip addrs for nova 
This block shouldn't be necessary, we correctly parse the ipaddrs in the
NovaServer class now.  This was added in commit
47ecb7a150
 2016-07-06 16:23:21 -05: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
Shane Lee
858e5c1772 Update Python to 2.7.12 for Mac (#34493) 2016-07-06 17:10:53 -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
Nicole Thomas
95094c73ff Merge pull request #34486 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-06 13:28:31 -04:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06: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
7867d49193 Merge pull request #34459 from terminalmage/issue33915 
Ignore retcode when formatting highstate output
 2016-07-05 21:59:23 -06:00
Mike Place
ae6902290a Merge pull request #34463 from terminalmage/issue34371 
states/git: pass required cwd parameter to git.describe.
 2016-07-05 21:59:05 -06:00
Mike Place
8f8a6d2f68 Merge pull request #34466 from rallytime/bp-34436 
Back-port #34436 to 2016.3
 2016-07-05 21:57:15 -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
artxki
e97c00b018 Fix #34395 Nonfunctional default_password in states.postgres_user.present 2016-07-05 13:54:50 -06:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
Erik Grinaker
f981a5646a states/git: pass required cwd parameter to git.describe. 2016-07-05 14:14:13 -05: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