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
68,466 Commits 24 Branches 182 Tags 341 MiB
b88c39e1d2
Commit Graph

68466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
b88c39e1d2 Merge pull request #34605 from gtmanfred/2016.3 
catch error if no dns domains exist
 2016-07-14 09:20:46 -06:00
Mike Place
b3dc6031fe Merge pull request #34557 from jacobweinstock/jboss7_cli-handle-expression-type 
handle jboss cli expression type in the parsing of output
 2016-07-14 09:09:49 -06:00
Nicole Thomas
a7868c248a Spelling fixes found in sqlite3 pillar docs (#34652) 2016-07-13 18:59:43 -04:00
Daniel Wallace
37b0943539 catch error if no dns domains exist 
For digital ocean.  Fixes #33452
 2016-07-13 12:23:09 -05:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565) 
* add num_cpus grain to freebsd

* fix pylint
 2016-07-13 11:40:09 -04:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
Nicole Thomas
61f5045a0d Merge pull request #34619 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-12 17:52:00 -04:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Nicole Thomas
9f123543e5 Merge pull request #34617 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-12 16:11:40 -04:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
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
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -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
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
jacobhammons
c8bdfb272d Merge pull request #34616 from jacobhammons/network-settings-mock 
Adds a mock required for the network settings beacon
 2016-07-12 13:09:30 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -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
Nicole Thomas
d8c8b4ac6f Merge pull request #34553 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-11 15:36:26 -04:00
Mike Place
5b002e11b4 Merge pull request #34569 from eliasp/2016.3-postgres-doc 
Minor doc fixes for PostgreSQL states
 2016-07-11 08:02:12 -06:00
Elias Probst
221da29ef5
Typo (defaul → default) 2016-07-09 16:02:38 +02:00
Elias Probst
ba3d7c624b
Add code formatting 2016-07-09 16:02:29 +02:00
Elias Probst
b3409c97a2
Fix typo (seens → seen) 2016-07-09 16:02:16 +02: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
Jacob Weinstock
1945153399 handle jboss cli expression type in the parsing of the output 2016-07-08 12:08:36 -06: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
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -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
Mike Place
7e1abd77ba Merge pull request #34524 from terminalmage/yumpkg-upgrade-logging 
yumpkg: Avoid spurious logging in pkg.upgrade
 2016-07-07 16:06:01 -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
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
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