Nicole Thomas
b23dd2234d
Merge pull request #22315 from rahulhan/event_unit_test
...
Adding states event.py unit tests
2015-04-03 06:30:58 -06:00
Nicole Thomas
cd69833731
Merge pull request #22318 from jayeshka/twilio_notify-unit-test
...
adding twilio_notify unit test case.
2015-04-03 06:30:13 -06:00
Nicole Thomas
eb4fd0b903
Merge pull request #22320 from rahulhan/nova_unit_tests
...
Adding nova.py unit tests
2015-04-03 06:29:18 -06:00
Rahul Handay
a572f3cadc
Adding nova.py unit tests
2015-04-03 14:40:46 +05:30
Jayesh Kariya
57925820ed
adding twilio_notify unit test case.
2015-04-03 14:29:49 +05:30
Thayne Harbaugh
c91392bc91
Add option -J/--pillar-pcre to match on pillar PCREs
2015-04-03 02:47:19 -06:00
Rahul Handay
034386e855
Adding states event.py unit tests
2015-04-03 11:24:47 +05:30
Thomas Jackson
efb9d411bc
Fix suicide_when_without_parent
...
If you call sys.exit within a thread it raises SystemExit-- which inside of a thread just exits the thread. This os._exit() will *actually* allow the thread to cause the process to exit
2015-04-02 19:00:50 -07:00
twangboy
51370ab2f9
Removed dialog box that was used for testing
2015-04-03 00:17:12 +00:00
twangboy
7377c503de
Add switches for passing version to nsi script
2015-04-03 00:13:58 +00:00
Thomas S Hatch
4281cd67fa
Merge pull request #22300 from rallytime/windows_release_docs
...
Add windows package installers to docs
2015-04-02 17:45:38 -06:00
Thomas S Hatch
6c68668c52
Merge pull request #22302 from rallytime/code-block
...
Fix code-block display for beacons.load doc example
2015-04-02 17:45:33 -06:00
Mike Place
8558542930
Merge pull request #22308 from whiteinge/doc-reactor-what-where-how
...
Better explanations and more examples of how the Reactor calls functions
2015-04-02 17:21:19 -06:00
Mike Place
4ec5593e58
Merge pull request #22272 from jacksontj/2015.2
...
Initial TLS state
2015-04-02 17:07:35 -06:00
Seth House
a8bdc17bbf
Better explanations and more examples of how the Reactor calls functions
...
Refs #20841
2015-04-02 17:07:22 -06:00
rallytime
8cdac11ed7
Don't forget the ..
2015-04-02 16:16:02 -06:00
rallytime
df4930801d
Fix code-block display for beacons.load doc example
2015-04-02 15:48:54 -06:00
jfindlay
19a5b09605
Merge pull request #22297 from rallytime/fix_22284
...
Add versionadded directive to yubico.py file
2015-04-02 15:25:02 -06:00
twangboy
1d2383c266
Fixed logic error
2015-04-02 21:23:54 +00:00
twangboy
36804256d5
Fixed incorrect importing of salt utils
2015-04-02 20:35:09 +00:00
rallytime
966bd9a40a
Remove unreachable code
2015-04-02 13:35:04 -06:00
rallytime
b24f4fe7e3
Add versionadded directive to yubico.py
2015-04-02 13:34:31 -06:00
twangboy
c5b34533d6
Fixed git module for windows
2015-04-02 19:13:02 +00:00
jfindlay
4d0ea7a863
Merge pull request #22266 from twangboy/win_install_fix
...
Win install fix
2015-04-02 12:59:31 -06:00
Thomas S Hatch
2bb9760e36
Merge pull request #22288 from nshalman/smartos-pkgsrc2014Q4
...
SmartOS Esky: pkgsrc 2014Q4 Build Environment
2015-04-02 12:52:38 -06:00
Thomas Jackson
90bf819ab7
Initial TLS state
...
This state will allow you to enforce that a certificate is valid (optionally for some time in the future). To do this I've added "cert_info" to the tls execution module to return a structured dict of info regarding the certs
2015-04-02 11:43:15 -07:00
Mike Place
f474860dee
Merge pull request #22280 from s0undt3ch/issues/19923-rackspace-config-drive
...
Don't pass `ex_config_drive` to libcloud unless it's explicitly enabled
2015-04-02 09:28:34 -06:00
Nahum Shalman
a51a90c128
SmartOS Esky: pkgsrc 2014Q4 Build Environment
...
Need to clean up /var/db/pkgin
Need to install mysql-client explicitly
libzmq seems to link against libsodium... drag it along.
2015-04-02 11:27:22 -04:00
Mike Place
5b6075c74c
Merge pull request #22287 from jfindlay/debug_rest_tornado_test
...
debug rest_tornado test error
2015-04-02 09:22:14 -06:00
Justin Findlay
a927087f64
debug rest_tornado test error
2015-04-02 09:05:48 -06:00
Nicole Thomas
b7f560cb49
Merge pull request #22268 from jfindlay/alias_tests
...
adding alias tests
2015-04-02 08:54:46 -06:00
Pedro Algarvio
65e5bac226
Pass it to libcloud if the user has set it in the configuration, True, or False.
2015-04-02 10:55:31 +01:00
Pedro Algarvio
23e735437c
Don't pass ex_config_drive to libcloud unless it's explicitly enabled
...
Fixes #19923
2015-04-02 10:50:55 +01:00
jfindlay
b6aa59618e
Merge pull request #22276 from ag-wood/solaris-pkg
...
Solaris pkg modules - improve performance and correct os detection
2015-04-02 00:11:00 -06:00
Adrian
a91e8d9895
Update solarisips.py
...
Fixed version comparison.
2015-04-02 14:58:03 +10:00
Adrian
4b6a4aa3a9
Update solarispkg.py
...
- Change OS detection to prevent allocating to Solaris 11 by default (SVR4 packaging system is deprecated on Solaris 11)
2015-04-02 14:47:51 +10:00
Adrian
5ef2d05314
Update solarisips.py
...
- Change the virtual name and environment checking to make IPS the default pkg provider for Solaris 11 (SVR4 Packaging is deprecated)
- Modify list_upgrades function to properly use switches rather than piping through external commands for a more efficient result.
2015-04-02 14:43:55 +10:00
Justin Findlay
e48df011fa
adding alias state unit tests
2015-04-01 22:12:33 -06:00
Justin Findlay
2385a78d20
add name, target to ret comment
2015-04-01 16:50:56 -06:00
twangboy
41a96d4daa
Fixed hard coded version
2015-04-01 22:14:35 +00:00
twangboy
82b2f3e637
Removed message_box i left in for testing
...
I'm an idiot
2015-04-01 22:11:08 +00:00
Thomas S Hatch
eadfc30256
Merge pull request #22255 from tjstansell/fix-20841-2015.2
...
fix #20841 for 2015.2: add sls name from reactor
2015-04-01 15:12:03 -06:00
Nicole Thomas
6b5ac9a0dd
Merge pull request #22261 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-01 15:05:15 -06:00
Colton Myers
1e3160f21c
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-01 14:17:35 -06:00
Thomas S Hatch
8ec0c820a6
Merge pull request #22253 from rallytime/merge-22246
...
Merge #22246 with pylint fix and test cleanup
2015-04-01 13:03:27 -06:00
Thomas S Hatch
4184e338a8
Merge pull request #22254 from matdrapeau/7911/ssh_user_option
...
Provide a user option for authentication using salt-ssh
2015-04-01 13:03:17 -06:00
Thomas S Hatch
5129f215e4
Merge pull request #22256 from twangboy/fix_pip_install
...
Fixed pip.install for windows
2015-04-01 13:02:13 -06:00
twangboy
3792ea1d10
Fixed pip.install for windows
2015-04-01 11:48:03 -06:00
Todd Stansell
7ed6e91402
fix #20841 for 2015.2: add sls name from reactor
...
The verify_high() function in state.py assumes there are __sls__ attributes in
the body when it is generating error messages. When the data is originally
created from a reactor, that does not exist, so we inject the name of the
reactor sls files so that verify_high() can properly generate error messages if
it fails to compile.
2015-04-01 10:19:48 -07:00
Thomas S Hatch
3001b727ef
Merge pull request #22126 from s0undt3ch/2014.7
...
Update environment variables.
2015-04-01 10:41:10 -06:00
