Colton Myers
810fbb8bfb
Merge pull request #25853 from davidjb/ssh-id-wrapper-non-root
...
Make ssh-id-wrapper accessible to non-root users
2015-07-30 10:49:47 -06:00
Thomas S Hatch
b6805b068a
Merge pull request #25856 from jfindlay/intro_scale
...
expand minion reauth scalability documentation
2015-07-30 09:33:17 -06:00
Thomas S Hatch
423d528b73
Merge pull request #25840 from jfindlay/winrepo_master
...
add note to winrepo state docs about required grain
2015-07-30 08:38:27 -06:00
Pedro Algarvio
754c8be719
Merge pull request #25846 from jfindlay/depr_code
...
rework deprecation documentation for release names
2015-07-30 14:26:21 +01:00
Justin Findlay
5921461bb1
style and usage consistency in intro_scale
2015-07-30 01:11:22 -06:00
David\ Beitey
6492bde192
Make ssh-id-wrapper accessible to non-root users
...
This fixes #19532 . The wrapper script is copied into a temporary file,
made only accessible and executable to the ``runas`` user performing the
git operation, and then subsequently removed.
This also ensures Windows git clones do not receive a Linux-only script
as the GIT_SSH environment variable as they did before.
2015-07-30 15:59:01 +10:00
Justin Findlay
51dc7cacfb
whitespace adjustments in intro_scale
2015-07-29 23:28:27 -06:00
Justin Findlay
39a82467f1
expand minion reauth scalability documentation
...
Related to #25447 .
2015-07-29 23:26:51 -06:00
Justin Findlay
d377f42c48
rework deprecation documentation for release names
...
Fixes #25827 .
2015-07-29 15:50:33 -06:00
Justin Findlay
b6cfd54f3b
add note to winrepo state docs about required grain
...
Fixes #25801 .
2015-07-29 14:20:52 -06:00
Thomas S Hatch
d9ab4bb989
Merge pull request #25833 from jahamn/fix-cp.push-not-recreating-empty-files
...
Allows cp.push to recreate empty files
2015-07-29 10:14:48 -06:00
Thomas S Hatch
6f93d64784
Merge pull request #25831 from rallytime/fix-11474
...
Add salt:// to key_url options to docs for pkgrepo.managed
2015-07-29 09:38:43 -06:00
Thomas S Hatch
72b3633383
Merge pull request #25807 from rallytime/fix-22699
...
Provide helpful error when using actions with a mapfile
2015-07-29 09:30:15 -06:00
Thomas S Hatch
71497adc0d
Merge pull request #25818 from jfindlay/autoruns_users
...
fix autoruns list
2015-07-29 09:29:20 -06:00
Jason Hamner
eac19fbf33
Allows cp.push to recreate empty files
...
Fixes #23288
cp.push and cp.push_dir now can recreate empty files
2015-07-29 09:16:45 -06:00
Thomas S Hatch
98b324c5f8
Merge pull request #25826 from alprs/fix-onchanges_type_check
...
Check that "onchanges" is a list
2015-07-29 09:00:28 -06:00
rallytime
067ea788e9
Add salt:// to key_url options to docs for pkgrepo.managed
...
Fixes #11474
2015-07-29 08:38:37 -06:00
Andreas Lutro
7992a3f0f4
state.py: check that "onchanges" is a list
2015-07-29 13:22:52 +02:00
Justin Findlay
c2dbb65982
fix autoruns list for modern windowsen
2015-07-29 00:26:31 -06:00
rallytime
3f3005c746
Use handle_exception function in cloud cli.py
2015-07-28 17:18:05 -06:00
Justin Findlay
ad07dc1e27
Merge pull request #25798 from twangboy/fix_25258
...
Fixed stacktrace on package name not found
2015-07-28 16:40:14 -06:00
Justin Findlay
4a38d4a606
Merge pull request #25797 from twangboy/fix_revert_in_25763
...
Changed repocache back to cached_repo
2015-07-28 16:39:32 -06:00
rallytime
f91edf3a33
Provide helpful error when using actions with a mapfile
...
Fixes #22699
2015-07-28 16:10:37 -06:00
Nicole Thomas
823f0ce350
Merge pull request #25793 from rallytime/bp-25730
...
Back-port #25730 to 2015.5
2015-07-28 13:37:34 -06:00
Nicole Thomas
4109ae55f9
Merge pull request #25792 from rallytime/bp-25688
...
Back-port #25688 to 2015.5
2015-07-28 13:37:17 -06:00
twangboy
aa19c2bf8f
Fixed stacktrace on package name not found
2015-07-28 12:13:21 -06:00
twangboy
81d5b5ee55
Changed repocache back to cached_repo
2015-07-28 11:45:52 -06:00
Mike Place
737fb1410c
Merge pull request #25796 from cachedout/debug_doc
...
Remove debug from docs
2015-07-28 11:35:58 -06:00
Mike Place
33bfdf3b0b
Remove debug from docs
2015-07-28 11:35:32 -06:00
Jorge Schrauwen
937779eb51
patchelf lives in pkgsrc
...
alteast on base-64-lts 14.4.0 release
2015-07-28 10:03:20 -06:00
Mike Place
a658753eff
Merge pull request #25749 from jahamn/fix-zpool-special-char-device-support
...
Allow zpool.create on character devices
2015-07-28 10:01:40 -06:00
Bruno Clermont
0aa1416b6b
Don't acquire lock if there is no formatter
...
this cause locking when a log handler don't have a formatter (because it don't need one)
2015-07-28 10:01:34 -06:00
Thomas S Hatch
1fae76d53c
Merge pull request #25685 from twangboy/fix_25594
...
Fixed regex issues with comment and uncomment
2015-07-28 09:29:49 -06:00
Thomas S Hatch
0bdb29402a
Merge pull request #25763 from twangboy/fix_25437
...
Fix 25437
2015-07-28 09:29:27 -06:00
Seth House
c1236595f9
Merge pull request #25752 from thatch45/state_top_saltenv
...
State top saltenv
2015-07-27 19:02:10 -06:00
twangboy
a904e8329b
Fixed another test failure...
2015-07-27 15:05:23 -06:00
twangboy
9e70c800b9
The real fix for 25437 that doesn't break other crap
2015-07-27 14:53:12 -06:00
twangboy
d7347e01e5
Revert "Fixed problem trying to load file with name of boolean type"
...
This reverts commit c53e11d42c
.
2015-07-27 14:21:08 -06:00
David Boucha
f367acb253
Merge pull request #25755 from twangboy/fix_25717
...
Fixed problem with dunder functions not being passed
2015-07-27 13:31:22 -06:00
David Boucha
f05ae95f9c
Merge pull request #25648 from twangboy/fix_25352
...
Clarified functionality of reg module, fixed state to work with new module
2015-07-27 13:30:33 -06:00
twangboy
10e410504d
Fixed problem with dunder functions not being passed
2015-07-27 11:29:51 -06:00
twangboy
aa077d3a86
Fixed more tests... justin findlay helped me...
2015-07-27 11:18:25 -06:00
Shane Lee
d6496ce814
Merge pull request #1 from jfindlay/reg
...
fix reg unit tests
2015-07-27 11:00:39 -06:00
Justin Findlay
3b0cc6592a
fix reg unit tests
2015-07-27 10:57:05 -06:00
Thomas S Hatch
65d6ec0659
don't override the minion config unless requested
2015-07-27 10:51:03 -06:00
Thomas S Hatch
26c858361c
Add state_top_saltenv to the config chain
2015-07-27 10:50:06 -06:00
Thomas S Hatch
36a3b674a7
Add raet support for state_top_saltnev
2015-07-27 10:49:42 -06:00
Thomas S Hatch
f6fa025b13
Add saltenv top file support to salt master_opts
2015-07-27 10:49:15 -06:00
Thomas S Hatch
4a1c53309b
Add state_top_saltenv support
2015-07-27 10:48:50 -06:00
Charlie Root
361f6cc23f
Allow zpool.create on character devices
...
Fixes #24920
2015-07-27 16:30:20 +00:00