rallytime
|
bd4322360a
|
Moar pylint
|
2015-01-28 14:46:28 -07:00 |
|
rallytime
|
e8144f57eb
|
Pylint fix for 2015.2
|
2015-01-28 14:07:17 -07:00 |
|
Colton Myers
|
d912a845df
|
Merge pull request #20075 from basepi/compound20074
Finish out the matcher_args for compound matcher, Fixes #20074
|
2015-01-28 13:49:53 -07:00 |
|
Nicole Thomas
|
a717549c4e
|
Merge pull request #20116 from rallytime/merge_forward_to_fifteen
Merge 2014.7 into 2015.2
|
2015-01-28 12:15:08 -07:00 |
|
Thomas S Hatch
|
19b7db40b8
|
Merge pull request #19914 from jfindlay/shell_false
change python_shell default to False
|
2015-01-28 10:41:16 -07:00 |
|
Mike Place
|
c86b5c8189
|
Merge pull request #20151 from rallytime/fix_sock_path_len_test
Add extension_modules to mocked __opts__ in test_sock_path_len
|
2015-01-28 09:30:35 -07:00 |
|
rallytime
|
592ff1c748
|
Add extension_modules to mocked __opts__ in test_sock_path_len
|
2015-01-28 09:20:26 -07:00 |
|
Mike Place
|
1a73c46a58
|
Merge pull request #20137 from whiteinge/schedule-file-open-traceback
Wrap opening _schedule.conf file in the try..except
|
2015-01-27 20:14:18 -07:00 |
|
Seth House
|
f4a0a95f9a
|
Wrap opening _schedule.conf file in the try..except
Otherwise tracebacks if the file does not exist.
|
2015-01-27 20:11:54 -07:00 |
|
Nicole Thomas
|
4f3a7ca937
|
Merge pull request #20132 from thatch45/schedule_fix
use a get with a fallback
|
2015-01-27 18:21:45 -07:00 |
|
Thomas S Hatch
|
94d90c1455
|
use a get with a fallback
|
2015-01-27 17:01:12 -07:00 |
|
Thomas S Hatch
|
c619db5df4
|
Merge pull request #20119 from thatch45/schedule_meta
update the schedule to include timezone data if metadata is passed
|
2015-01-27 14:54:32 -07:00 |
|
jfindlay
|
83f47546cb
|
Merge pull request #1 from rallytime/shell_false
Fix some of the mocking on cmdmod_test
|
2015-01-27 14:24:58 -07:00 |
|
rallytime
|
03558dc013
|
Fix some of the mocking on cmdmod_test
This could still use some more love, but it should help for now.
|
2015-01-27 14:15:04 -07:00 |
|
Thomas S Hatch
|
25b767fb81
|
update the schedule to include timezone data if metadata is passed
|
2015-01-27 13:58:03 -07:00 |
|
rallytime
|
dc23823897
|
Merge branch '2014.7' into '2015.2'
Conflicts:
salt/modules/localemod.py
|
2015-01-27 13:24:14 -07:00 |
|
Thomas S Hatch
|
cc1e81ac1a
|
Merge pull request #20112 from rallytime/pylint_7
Pylint fixes for 2014.7 branch
|
2015-01-27 11:18:36 -07:00 |
|
rallytime
|
2a5396ca81
|
Pylint fixes for 2014.7 branch
|
2015-01-27 11:17:17 -07:00 |
|
Thomas S Hatch
|
d54f3b5680
|
Merge pull request #20111 from Trax-air/fix-ssh-port
ssh_port should be an int in deploy_kwargs.
|
2015-01-27 11:11:56 -07:00 |
|
Thomas S Hatch
|
291073cf22
|
Merge pull request #20110 from rallytime/pylint_15
Fix pylint on 2015.2 branch
|
2015-01-27 11:10:22 -07:00 |
|
Flavian
|
f3daf2c780
|
Ssh_port should be an int in deploy_kwargs.
Also contesting for the shortest pull request ever.
|
2015-01-27 18:41:36 +01:00 |
|
rallytime
|
4d0e6ec05d
|
Fix pylint on 2015.2 branch
|
2015-01-27 10:34:43 -07:00 |
|
Thomas S Hatch
|
873fde30c4
|
Merge pull request #20097 from jfindlay/fix_locale_gen
fix debian/ubuntu handling in locale.gen_locale
|
2015-01-27 10:15:12 -07:00 |
|
Thomas S Hatch
|
5867959cf4
|
Merge pull request #20088 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
|
2015-01-27 10:04:39 -07:00 |
|
Thomas S Hatch
|
b3ae619fe1
|
Merge pull request #20079 from kim0/freebsd-status.version-2014.7
Implement Freebsd status.version merge to 2014.7
|
2015-01-27 10:03:56 -07:00 |
|
Thomas S Hatch
|
c56654510e
|
Merge pull request #20072 from techhat/joyenthttp
Switch Joyent to salt.utils.http.query()
|
2015-01-27 09:58:05 -07:00 |
|
Thomas S Hatch
|
21fc5049ed
|
Merge pull request #20070 from techhat/pagerdutyhttp
Switch PagerDuty to salt.utils.http.query()
|
2015-01-27 09:56:55 -07:00 |
|
Thomas S Hatch
|
d1d5676999
|
Merge pull request #20069 from techhat/httputils
Fixup header handling in http.query()
|
2015-01-27 09:56:45 -07:00 |
|
Justin Findlay
|
4be92ed200
|
fix debian/ubuntu handling in locale.gen_locale
fixes #18936; also handle user input gracefully in locale.avail
|
2015-01-26 23:13:55 -07:00 |
|
Thomas S Hatch
|
d0bf8429dc
|
Merge pull request #20080 from kim0/freebsd-status.nproc-2014.7
Implement Freebsd status.nproc merge to 2014.7
|
2015-01-26 20:39:21 -07:00 |
|
Thomas S Hatch
|
d199edde20
|
Merge pull request #20076 from rallytime/fix_states_file_tests
Add some mocked variables to fix the file_test failures
|
2015-01-26 20:38:53 -07:00 |
|
Thomas S Hatch
|
9ce1155b45
|
Merge pull request #20071 from techhat/githubhttp
Switch GitHub to salt.utils.http.query()
|
2015-01-26 20:37:30 -07:00 |
|
Thomas S Hatch
|
11a1506f12
|
Merge pull request #20089 from lyft/lyft-boto-dynamodb-2015.2
add boto dynamodb salt module and state
|
2015-01-26 20:34:16 -07:00 |
|
Thomas S Hatch
|
c86aa162ac
|
Merge pull request #20092 from thatch45/beacons
Beacons!!!!
|
2015-01-26 20:33:54 -07:00 |
|
Thomas S Hatch
|
934fb002f4
|
Merge pull request #6 from rallytime/beacons
Add beacons section to 2015.2.0 release notes
|
2015-01-26 20:32:46 -07:00 |
|
rallytime
|
80bfa4a2a6
|
Add beacons section to 2015.2.0 release notes
|
2015-01-26 20:26:51 -07:00 |
|
Nicole Thomas
|
9d82d0f9a7
|
Merge pull request #20091 from rallytime/fix_cloud_tests
Change image name in rackspace profile config to a valid one
|
2015-01-26 20:04:52 -07:00 |
|
Mike Demmitt
|
51407036d9
|
fixing lint errors
|
2015-01-26 17:43:58 -08:00 |
|
Thomas S Hatch
|
e003927423
|
Merge pull request #5 from whiteinge/beacons-doc
Added beacon docs
|
2015-01-26 18:40:20 -07:00 |
|
Seth House
|
8e476bc455
|
Fixed typos in the beacon docs
|
2015-01-26 18:20:54 -07:00 |
|
Seth House
|
2f7376ad6b
|
Added __virtual__ and __virtualname__ to inotify beacon module
|
2015-01-26 18:19:34 -07:00 |
|
Seth House
|
b777d3cba1
|
Added unique identifier for the beacon docs
|
2015-01-26 18:19:34 -07:00 |
|
Seth House
|
a26aef0d7d
|
Added beacon module docs to the module index
|
2015-01-26 18:19:34 -07:00 |
|
Seth House
|
127ddb6d9c
|
Added cross-references to the inotify beacon module
|
2015-01-26 18:19:34 -07:00 |
|
Thomas S Hatch
|
185856ddbb
|
don't fire master events if the queue is empty!
|
2015-01-26 17:31:48 -07:00 |
|
Thomas S Hatch
|
1421ed22d8
|
need to have a frame to start things later on
|
2015-01-26 17:19:46 -07:00 |
|
Thomas S Hatch
|
9ec62ad249
|
handle typos
|
2015-01-26 17:12:01 -07:00 |
|
Ahmed Kamal
|
34452f1d27
|
enchant pylint with spaces after commas
|
2015-01-27 01:59:35 +02:00 |
|
Thomas S Hatch
|
5affea1022
|
Merge branch '2015.2' into beacons
|
2015-01-26 16:57:43 -07:00 |
|
Ahmed Kamal
|
12222004ec
|
KISS, get nproc value from grains
|
2015-01-27 01:52:07 +02:00 |
|