Justin Findlay
|
6e15e19907
|
appease pylint's blank line strictures
|
2015-05-13 12:22:20 -06:00 |
|
Mike Place
|
d5986c21b4
|
Rename kwarg in cloud runner
Closes #23403
|
2015-05-13 12:15:06 -06:00 |
|
Colton Myers
|
bd635488ef
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-05-13 11:49:55 -06:00 |
|
Colton Myers
|
acdd3fc6bd
|
Fix lint
|
2015-05-13 11:47:43 -06:00 |
|
Mike Place
|
da8a2f5cb3
|
Handle lists correctly in grains.list_prsesent
Closes #23548
|
2015-05-13 11:31:07 -06:00 |
|
salt_build
|
731e7af3dd
|
Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present
|
2015-05-13 17:13:05 +00:00 |
|
Azidburn
|
ed30dc4642
|
Fix for #23604. No error reporting. Exitcode !=0 are ok
|
2015-05-13 11:06:56 -06:00 |
|
salt_build
|
d6f70a4545
|
Fixed user.present to create password in windows
|
2015-05-13 17:06:41 +00:00 |
|
rallytime
|
ef4c6adae3
|
Remove another unused import
|
2015-05-13 11:04:20 -06:00 |
|
FELD Boris
|
73cfda751a
|
Remove unused import
|
2015-05-13 11:04:03 -06:00 |
|
FELD Boris
|
52b68d695a
|
Use the zip_longest from six module for python 3 compatiblity
|
2015-05-13 11:04:03 -06:00 |
|
FELD Boris
|
18d5ff9a8e
|
Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes
|
2015-05-13 11:03:35 -06:00 |
|
Nicole Thomas
|
0f006ac1d8
|
Merge pull request #23661 from rallytime/merge-23640
Merge #23640 with whitespace fix
|
2015-05-13 09:47:30 -06:00 |
|
Nicole Thomas
|
fabef759e0
|
Merge pull request #23662 from rallytime/merge-23642
Merge #23642 with pylint fix
|
2015-05-13 09:46:51 -06:00 |
|
Nicole Thomas
|
072b92733d
|
Merge pull request #23622 from jfindlay/pgjsonb
merge #23508
|
2015-05-13 09:36:49 -06:00 |
|
Nicole Thomas
|
c1bdd4d377
|
Merge pull request #23651 from jayeshka/solr-unit-test
adding solr unit test case
|
2015-05-13 09:26:15 -06:00 |
|
Nicole Thomas
|
ee43411677
|
Merge pull request #23649 from jayeshka/libvirt_states-unit-test
adding states/libvirt unit test case
|
2015-05-13 09:24:48 -06:00 |
|
Nicole Thomas
|
c7fc466f1e
|
Merge pull request #23648 from jayeshka/linux_acl_states-unit-test
adding states/linux_acl unit test case
|
2015-05-13 09:24:11 -06:00 |
|
rallytime
|
aa7bbd84fa
|
Remove unused import
|
2015-05-13 09:18:32 -06:00 |
|
rallytime
|
4427f42bb6
|
Whitespace fix
|
2015-05-13 09:14:49 -06:00 |
|
Nicole Thomas
|
84e2ef88fc
|
Merge pull request #23639 from cachedout/issue_23452
Handle exceptions raised by __virtual__
|
2015-05-13 09:11:12 -06:00 |
|
Nicole Thomas
|
4cba7ba35c
|
Merge pull request #23650 from jayeshka/kmod_states-unit-test
adding states/kmod unit test case
|
2015-05-13 09:09:18 -06:00 |
|
Nicole Thomas
|
bd9b94ba8c
|
Merge pull request #23637 from cachedout/issue_23611
Convert str master to list
|
2015-05-13 09:08:19 -06:00 |
|
Jayesh Kariya
|
3f0ab29eb0
|
removed error.
|
2015-05-13 18:02:35 +05:30 |
|
Jayesh Kariya
|
6e05148962
|
adding solr unit test case
|
2015-05-13 17:14:53 +05:30 |
|
Jayesh Kariya
|
11081c121c
|
adding states/linux_acl unit test case
|
2015-05-13 17:12:28 +05:30 |
|
Jayesh Kariya
|
0fb923a283
|
adding states/libvirt unit test case
|
2015-05-13 17:11:09 +05:30 |
|
Jayesh Kariya
|
1987015033
|
adding states/kmod unit test case
|
2015-05-13 17:09:57 +05:30 |
|
Mike Place
|
56cb1f52e3
|
Fix typo
|
2015-05-13 03:16:39 -06:00 |
|
Mike Place
|
9e66d4c88e
|
Let saltmod handle lower-level exceptions gracefully
|
2015-05-13 03:03:50 -06:00 |
|
Mike Place
|
d418b49a77
|
Syntax error!
|
2015-05-13 02:48:28 -06:00 |
|
Mike Place
|
dd9115466e
|
Add warning to get_or_set_hash about reserved chars
Refs #22141
|
2015-05-13 02:17:54 -06:00 |
|
Mike Place
|
45b4015d7d
|
Handle exceptions raised by __virtual__
Closes #23452
|
2015-05-13 01:27:17 -06:00 |
|
Mike Place
|
f6fcf19a7f
|
Convert str master to list
Closes #23611
|
2015-05-13 01:06:28 -06:00 |
|
Justin Findlay
|
bc8faf1543
|
Merge pull request #23633 from jayeshka/win_network-2015.5-unit-test
made changes to test_interfaces function.
|
2015-05-13 00:51:07 -06:00 |
|
Jayesh Kariya
|
0936e1d386
|
made changes to test_interfaces function.
|
2015-05-13 11:09:40 +05:30 |
|
Thomas S Hatch
|
7df3579bbc
|
Merge pull request #23619 from jfindlay/fix_kmod_state
fix kmod.present processing of module loading
|
2015-05-12 19:16:56 -06:00 |
|
Colton Myers
|
680e88f058
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
salt/modules/ebuild.py
tests/unit/modules/grains_test.py
|
2015-05-12 16:06:36 -06:00 |
|
Justin Findlay
|
d4f30955fa
|
Merge pull request #23598 from rahulhan/states_win_dns_client_unit_test
Adding states/win_dns_client.py unit tests
|
2015-05-12 15:47:36 -06:00 |
|
Justin Findlay
|
811c6a1d89
|
Merge pull request #23597 from rahulhan/states_vbox_guest_unit_test
Adding states/vbox_guest.py unit tests
|
2015-05-12 15:46:30 -06:00 |
|
Justin Findlay
|
454322c7e4
|
appease pylint's proscription on blank line excess
|
2015-05-12 15:40:55 -06:00 |
|
C. R. Oldham
|
57c617136d
|
Get time with timezone correct also in job return.
|
2015-05-12 15:34:56 -06:00 |
|
C. R. Oldham
|
e109d0f643
|
Get time with timezone correct.
|
2015-05-12 15:34:56 -06:00 |
|
C. R. Oldham
|
21e06b9112
|
Fix SQL, remove unneeded imports.
|
2015-05-12 15:34:56 -06:00 |
|
C. R. Oldham
|
653f360723
|
Stop making changes in 2 places.
|
2015-05-12 15:34:56 -06:00 |
|
C. R. Oldham
|
d6daaa0292
|
Typo.
|
2015-05-12 15:34:55 -06:00 |
|
C. R. Oldham
|
7d748bff75
|
SSL is handled differently by Pg, so don't set it here.
|
2015-05-12 15:34:55 -06:00 |
|
C. R. Oldham
|
cc7c377bcd
|
Fill alter_time field in salt_events with current time with timezone.
|
2015-05-12 15:34:55 -06:00 |
|
C. R. Oldham
|
43defe9b20
|
Port mysql module to Postgres using jsonb datatypes
|
2015-05-12 15:34:55 -06:00 |
|
Justin Findlay
|
73facbfc1f
|
fix kmod.present processing of module loading
|
2015-05-12 15:30:01 -06:00 |
|