Thomas S Hatch
|
d86e5dd7fb
|
Merge pull request #20135 from kev009/remove-restart_on_error
Remove unused restart_on_error config
|
2015-01-28 14:58:20 -07:00 |
|
Thomas S Hatch
|
328d7220e4
|
Merge pull request #20129 from whiteinge/events-token-regression-fix
Fix regression with token handling in the /events URL
|
2015-01-28 14:52:23 -07:00 |
|
Nicole Thomas
|
545b5f3ff4
|
Merge pull request #20160 from rallytime/fifteen_pylint
Pylint fix for 2015.2
|
2015-01-28 14:46:50 -07:00 |
|
rallytime
|
bd4322360a
|
Moar pylint
|
2015-01-28 14:46:28 -07:00 |
|
Thomas S Hatch
|
9466dc25f3
|
lint
|
2015-01-28 14:41:26 -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 |
|
Jeremy Rosenbaum
|
5ba815e37f
|
Allow relative paths for --config_dir with daemonized minions
|
2015-01-28 13:40:54 -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 |
|
Joseph Hall
|
f846925ba7
|
Document text_out and headers_out
|
2015-01-28 11:08:31 -07:00 |
|
Joseph Hall
|
d1746fa7fe
|
Document updating CA bundles
|
2015-01-28 10:51:04 -07:00 |
|
Joseph Hall
|
4712e870be
|
Allow execution module to update_ca_bundle
|
2015-01-28 10:50:40 -07:00 |
|
Joseph Hall
|
38e349f042
|
Allow runner to update_ca_bundle
|
2015-01-28 10:50:04 -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 |
|
Joseph Hall
|
7a805e5db1
|
Allow user to merge extra files to the end of the CA bundle
|
2015-01-28 09:55:49 -07:00 |
|
Joseph Hall
|
a619de5444
|
Change from /srv/salt to file_roots
|
2015-01-28 09:37:34 -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 |
|
Joseph Hall
|
8d5ff1907d
|
Add function to update CA cert bundle
|
2015-01-28 09:22:38 -07:00 |
|
rallytime
|
592ff1c748
|
Add extension_modules to mocked __opts__ in test_sock_path_len
|
2015-01-28 09:20:26 -07:00 |
|
pille
|
13f7fe1d8e
|
support --only-upgrade option in apt
fixes #16293
|
2015-01-28 15:30:55 +01: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 |
|
Kevin Bowling
|
23155964f5
|
Remove unused restart_on_error config
|
2015-01-27 19:24:29 -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 |
|
Seth House
|
f900179e48
|
Added token and salt_token as param docs
Also un-emphasized this way of passing the token in examples since it is
the lesser-used form of authenticating with this endpoint.
|
2015-01-27 15:57:07 -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 |
|
Thomas S Hatch
|
c620cefddc
|
update simple types filter to handle tuples
|
2015-01-27 14:52:15 -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 |
|
Seth House
|
1ad58a800b
|
Fix regression with token handling in /events URL
If no params passed use default cookie/header handling.
|
2015-01-27 14:02:09 -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
|
5422eae6cf
|
journald beacon is almost there, just need to clean up the
data types from the journald reader
|
2015-01-27 13:19:05 -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 |
|
Thomas S Hatch
|
3e6ade38bd
|
wtmp beacon final fixes
|
2015-01-27 10:55:59 -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 |
|
Thomas S Hatch
|
86a6c80268
|
initial wtmp beacon for login monitoring
|
2015-01-27 00:06:27 -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
|
750676fb7a
|
Start on a simple journald beacon
|
2015-01-26 23:11:23 -07:00 |
|