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

68125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
Mike Place
6ac3f4d0b4 Merge pull request #32138 from tegbert/fix-nova-driver-bug-parsing-ip-address 
Fix nova driver bug parsing ip address
 2016-03-28 10:08:32 -06:00
Mike Place
d527eec228 Merge pull request #32156 from rallytime/mac-keychain-test 
Add integration tests for mac_keychain module
 2016-03-28 08:58:55 -06:00
Mike Place
a4aee8748e Merge pull request #32158 from twangboy/mac_path 
Add /opt/salt/bin to PATH in postinstall script for Mac
 2016-03-28 08:57:08 -06:00
Mike Place
ea52d6057a Merge pull request #32161 from abednarik/virtual_ret_boto_rds_state 
states.boto_rds: __virtual__ return err msg.
 2016-03-28 08:55:21 -06:00
Mike Place
c7fe87998e Merge pull request #32172 from messense/fix-supervisord 
Fix supervisord state bug when name contains `:*`
 2016-03-28 08:43:17 -06:00
Mike Place
43ef524370 Merge pull request #32174 from sjorge/2016.3-smartos-change 
smartos state would show changes even if there were none
 2016-03-28 08:41:47 -06:00
Mike Place
dea112d96e Merge pull request #32175 from clinta/32075 
accept path as input to certificate managed state
 2016-03-28 08:36:55 -06:00
Clint Armstrong
5227bb3197 accept path as input to certificate managed state 2016-03-28 08:55:59 -04:00
Jorge Schrauwen
7950a88695 smartos state would show changes even if there were none 2016-03-28 12:53:56 +00:00
messense
a03c50f3e0 Fix supervisord state bug when name contains :* 2016-03-28 17:52:16 +08:00
abednarik
73ec785d02 states.boto_rds: __virtual__ return err msg. 
Added call to missing_fun_string() in order to display module return message.

Fixes #32123.
 2016-03-27 10:45:20 -03:00
rallytime
635263ab1c Finish up mac_keychain tests 2016-03-26 20:30:22 -06:00
Ch3LL
b8f271bdc9 add mac_keychain test 2016-03-26 20:30:22 -06:00
Mike Place
65abe44ee4 Merge pull request #32159 from cachedout/fixup_31817 
Try/catch junos import
 2016-03-25 16:25:46 -06:00
Mike Place
db6702f942 Try/catch junos import 2016-03-25 16:23:37 -06:00
Mike Place
b95c5feda7 Merge pull request #32157 from cachedout/issue_31953 
Add quotes to cron doc
 2016-03-25 16:16:24 -06:00
Mike Place
dd13eb26ff Add quotes to cron doc 
Closes #31953
 2016-03-25 16:15:40 -06:00
twangboy
a0edabf210 Add /opt/salt/bin to PATH 
uses files under paths.d
also removed legacy launchctl load command
 2016-03-25 16:14:40 -06:00
twangboy
61a91175a9 Add /opt/salt/bin to path 2016-03-25 15:43:28 -06:00
Mike Place
e648464f33 Merge pull request #32112 from twangboy/mac_ports_int 
Integration tests for mac_ports.py
 2016-03-25 15:33:12 -06:00
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
0bde9f0aef Merge pull request #32155 from cachedout/lint_32008 
Lint 32008
 2016-03-25 12:40:21 -06:00
Mike Place
211909a620 Lint 2016-03-25 12:39:37 -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
Mike Place
62b919b860 Merge pull request #31859 from hoonetorg/feature/module_state_pcs 
initial commit for a pcs module/state
 2016-03-25 12:00:40 -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
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
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
Mike Place
4ec74c0206 Merge pull request #32097 from blarghmatey/elasticsearch_event_return 
Added `event_return` to Elasticsearch returner
 2016-03-24 17:01:46 -06:00