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
34,943 Commits 24 Branches 182 Tags 341 MiB
d26b671b00
Commit Graph

2724 Commits

Author SHA1 Message Date
Colin Johnson
d26b671b00 add vpc support in boto_secgroup execution module 2014-08-05 03:45:00 +00:00
Thomas S Hatch
d279889abf Merge pull request #14701 from lyft/asg-support-security-group-names 
boto_asg - add support for use of security group names in launch configs
 2014-08-04 10:57:06 -06:00
Thomas S Hatch
77d709a29c Merge pull request #14601 from lyft/provide-vpc-exists-support 
Provide vpc exists support
 2014-08-04 10:16:38 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop 
Conflicts:
	salt/runners/manage.py
 2014-08-01 10:52:52 -06:00
Colton Myers
2bfcbe01d0 Merge pull request #14661 from rallytime/fix_rhel7_test 
Add GPG key file to integration tests
 2014-07-31 16:34:47 -06:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-31 12:23:38 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Pedro Algarvio
586642576a Add another which only changes the noc 2014-07-30 19:34:00 +01:00
Pedro Algarvio
a53ca96c76 Add another example for version comparison 2014-07-30 19:34:00 +01:00
Pedro Algarvio
4ccb73abac Add another version example to the tests 2014-07-30 19:33:59 +01:00
Pedro Algarvio
b24e1b9c49 Support a minor bugfix attribute in the version string 2014-07-30 19:33:59 +01:00
Pedro Algarvio
3a16b42eb9 Add another which only changes the noc 2014-07-30 18:10:22 +01:00
Pedro Algarvio
7a77942a82 Add another example for version comparison 2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9 Add another version example to the tests 2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338 Support a minor bugfix attribute in the version string 2014-07-30 18:10:02 +01:00
Colin Johnson
3bcfd4bb0d unit tests for boto_vpc module 2014-07-30 07:29:45 +00:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04:00
Thomas S Hatch
aeda9730ca Merge pull request #14460 from steverweber/fix_restarts 
fix issues with keepalive minion
 2014-07-25 21:46:01 -06:00
Seth House
d7d8beabb8 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-25 19:55:43 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config 
Load netapi modules using client config instead of master config
 2014-07-25 15:49:02 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config" 
This partially reverts commit 2bc1ed8afb.
 2014-07-25 14:42:19 -06:00
Thomas S Hatch
263ed1ad90 Merge pull request #14503 from robmessick/gem_state_prereleases 
Add support for pre_releases argument to the gem state
 2014-07-25 14:26:20 -06:00
Thomas S Hatch
641eaa7b03 Merge pull request #14298 from mbirtwell/dont_drop_events_during_gather_job_info 
Dont drop events during gather job info
 2014-07-25 14:04:44 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation 
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
 2014-07-25 14:04:03 -06:00
Rob Messick
4549ef25a2 Add support for pre_releases argument to the gem state 2014-07-25 12:30:42 -07:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
a00e84b556 Merge branch '2014.7' into develop 2014-07-25 12:55:42 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax 
Yay!
 2014-07-25 12:27:45 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Colton Myers
e7bd8bf00d Merge branch '2014.7' into develop 2014-07-25 10:43:55 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
Thomas S Hatch
558e2283d1 Merge pull request #14474 from robmessick/issue14469 
add optional pre_releases argument to gem.install
 2014-07-25 10:34:38 -06:00
Thomas S Hatch
8e0d8a7b9f Merge branch '2014.7' into develop 2014-07-25 10:30:07 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr 
Skip test on Darwin after making an effort
 2014-07-25 10:20:10 -06:00
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -07:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config 
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
 2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00