Commit Graph

66900 Commits

Author SHA1 Message Date
twangboy
86de04b08c Fix typo in test_latest_version 2016-03-25 15:28:46 -06:00
twangboy
9c97057b84 Add destructiveTest decorators 2016-03-25 15:28:46 -06:00
twangboy
770b45ca35 Fix class attribute 2016-03-25 15:28:46 -06:00
twangboy
ada508f8eb Improve cleanup 2016-03-25 15:28:46 -06:00
twangboy
b63986d2ce Add remaining integration tests 2016-03-25 15:28:46 -06:00
twangboy
6d9b388a39 Improve return on existing installations 2016-03-25 15:28:46 -06:00
twangboy
d4512348e3 Add version to return in latest_version function 2016-03-25 15:28:46 -06:00
twangboy
70f72cf81b Fix latest_version function 2016-03-25 15:28:46 -06:00
twangboy
5adab6c3d4 Refactor _list function 2016-03-25 15:28:46 -06:00
twangboy
255bd0ad82 Improve return for upgrade function 2016-03-25 15:28:46 -06:00
twangboy
4385814963 Fix mac_ports 2016-03-25 15:28:46 -06:00
twangboy
469ebc3c04 Initial commit 2016-03-25 15:28:46 -06:00
Nicole Thomas
abace3aa5f Merge pull request #32151 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-25 14:06:15 -06:00
Mike Place
7ffdebad6c Merge pull request #32132 from gtmanfred/adext
allow for expanded matching with eauth
2016-03-25 12:01:31 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
Mike Place
bff94a5160 Merge pull request #32145 from paclat/issue_29817
fixes 29817
2016-03-25 10:55:47 -06:00
Mike Place
245249d347 Merge pull request #32133 from basepi/api_user_passthrough
Pass eauth user/groups through salt-api to destination functions
2016-03-25 10:49:46 -06:00
Mike Place
e24d285436 Merge pull request #32092 from twangboy/mac_service_int
Integration tests for mac_service.py
2016-03-25 10:39:42 -06:00
Daniel Wallace
0a9e062444 allow for expanded matching with eauth
Expand the server matching across multiple groups, incase users are in
more than one group, and allow for more than one type of matching.
2016-03-25 10:57:02 -05:00
Colton Myers
41ba309839 Change the kwarg names to be more specific 2016-03-25 09:56:11 -06:00
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs
Add runners to __salt__ docs
2016-03-25 09:54:02 -06:00
charles_paclat
5d970ca031 fixes 29817
Makes sure we unsubscribe from self.events and also dereference the job info iterator
2016-03-25 11:40:24 -04:00
Nicole Thomas
76b843cf9e Merge pull request #32136 from jtand/arch_alternatives
Arch does not have the alternatives directory
2016-03-25 09:24:56 -06:00
Nicole Thomas
cc224b877a Merge pull request #32143 from DSRCompany/issues/30183_failover_fix
Set auth retry count to 0 if multimaster mode is failover.
2016-03-25 09:23:09 -06:00
Nicole Thomas
37f2a98dc9 Merge pull request #32140 from rallytime/bp-32110
Back-port #32110 to 2016.3
2016-03-25 09:22:30 -06:00
Nicole Thomas
0679a61871 Merge pull request #32134 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-25 09:22:07 -06:00
Erik Johnson
ad924226ca Merge pull request #32091 from clarkperkins/bugfix/yumpkg-repoquery
Fixed the regression in #410da78
2016-03-25 09:53:08 -05:00
Dmitry Kuzmenko
93d34a2573 Set auth retry count to 0 if multimaster mode is failover.
Backport of PR #31382 into 2015.8.
2016-03-25 16:58:44 +03:00
Mike Place
377c102470 Merge pull request #31790 from twangboy/mac_system_int
Integration tests for mac_system
2016-03-24 17:11:29 -06:00
rallytime
58c844a7d7 Add mac_desktop integration tests
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
2016-03-24 17:02:53 -06:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
Nicole Thomas
b84908d51f Merge pull request #32135 from rallytime/32129-to-2915.8
[2015.8] Support multiple valid option types when performing type checks
2016-03-24 16:42:28 -06:00
rallytime
482690ef33 Add note to docs about __salt__ referencing runner modules 2016-03-24 16:35:50 -06:00
Justin Anderson
a0d1f42337 Lint fix 2016-03-24 16:33:18 -06:00
Justin Anderson
291a5695d3 Arch does not have the alternatives directory 2016-03-24 16:12:01 -06:00
Mike Place
b23a08f3f4 Merge pull request #31760 from sakateka/fix_master_switch
SMinion need wait future from eval_master
2016-03-24 16:08:56 -06:00
Erik Johnson
7d43bdd721 Change type check errors to debug loglevel 2016-03-24 16:01:14 -06:00
Erik Johnson
ed5abf4381 Support multiple valid option types when performing type checks
Fixes #32044.
2016-03-24 16:01:06 -06:00
Mike Place
6b5c65eafa Merge pull request #32093 from twangboy/mac_softwareupdate_int
Use class attributes in mac_softwareupdate tests
2016-03-24 15:55:24 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Mike Place
1545b80017 Merge pull request #32034 from twangboy/mac_pkgutil_int
Integration tests for mac_pkgutil
2016-03-24 15:44:51 -06:00
Mike Place
5efe37ddc8 Merge pull request #32106 from jfindlay/suse_patch
update suse master service patch
2016-03-24 15:34:01 -06:00
Mike Place
59fde81457 Merge pull request #32094 from twangboy/mac_power_int
Use class attributes in mac_power tests
2016-03-24 15:33:30 -06:00
Mike Place
31da3776a1 Merge pull request #32111 from thatch45/ssh_fix
fix for no grains in salt-ssh
2016-03-24 15:21:01 -06:00
Mike Place
bdd7ea89d5 Merge pull request #32129 from terminalmage/issue32044
Support multiple valid option types when performing type checks
2016-03-24 15:16:29 -06:00
Colton Myers
40f7e596d8 Pass eauth user/groups through salt-api to destination functions 2016-03-24 15:08:01 -06:00
Justin Anderson
d172b1d270 Fix the process_test.test_kill failure in 2016.3 2016-03-24 14:31:43 -06:00
Erik Johnson
34ca1ea12e Change type check errors to debug loglevel 2016-03-24 15:30:58 -05:00
Erik Johnson
5462081488 Support multiple valid option types when performing type checks
Fixes #32044.
2016-03-24 15:30:58 -05:00
Thomas S Hatch
66475c3138 CAN HAZ 2016-03-24 14:04:55 -06:00