valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,531 Commits 24 Branches 182 Tags 341 MiB
2e28c3868a
Commit Graph

43531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
2e28c3868a Merge pull request #19038 from mikaelhm/add-depth-to-git-latest 
An attempt to solve #16920 - added an optional depth parameter to salt.states.git.latest.
 2014-12-17 14:51:15 -07:00
Thomas S Hatch
5af06f26ee Merge pull request #19037 from jacksontj/develop 
Misc. eauth cleanup
 2014-12-17 14:50:19 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-17 14:48:01 -07:00
Thomas S Hatch
0fea74d51c Merge pull request #19025 from gravieinc/develop 
Fix for #18994
 2014-12-17 14:44:58 -07:00
Thomas S Hatch
d13d8b37b1 Merge pull request #19017 from rupeshta/at_unit_tests 
At unit tests
 2014-12-17 14:44:04 -07:00
Thomas S Hatch
ea28266b35 Merge pull request #19014 from nmadhok/fix-state-file-serialize 
Adding ability to do a test run with test=True.
 2014-12-17 14:42:35 -07:00
Thomas S Hatch
b9d5b22559 Merge pull request #19002 from steverweber/network_wol 
include wol in network module
 2014-12-17 14:39:44 -07:00
Thomas S Hatch
c2c9e56b82 Merge pull request #18931 from cachedout/cli_refactor 
Refactor the entire CLI out of __init__
 2014-12-17 14:37:13 -07:00
Thomas S Hatch
6263382858 Merge pull request #18918 from cachedout/salt_cli_retcode 
Make salt cli return a non-zero error code if an error occurred
 2014-12-17 14:36:51 -07:00
Pedro Algarvio
6d27990c58 Merge pull request #19060 from techhat/impacket1 
Switch from smbclient to impacket
 2014-12-17 19:48:22 +00:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
Joseph Hall
0154515873 Switch from smbclient to impacket 2014-12-17 11:40:26 -07:00
C. R. Oldham
93f76faaf6 Merge pull request #19045 from techhat/smbutil 
Adding initial utils lib for SMB
 2014-12-17 09:46:05 -07:00
Joseph Hall
85fc273521 Linting 2014-12-17 08:59:26 -07:00
Joseph Hall
5b30c15cf7 Wrap impacket.smbconnection.putFile() 2014-12-17 08:36:05 -07:00
Steve Weber
e7acf3a399 Update network.py 
fix lint
 2014-12-17 09:10:37 -05:00
Joseph Hall
efa011dbaa Adding initial utils lib for SMB 2014-12-16 21:00:35 -07:00
Mike Place
71bba6c676 Merge pull request #19039 from cachedout/progess_docs 
Add docs to progress outputter
 2014-12-16 17:37:47 -07:00
Thomas Jackson
82a42482de Cleanup "rights" function 
Since a success followed by a failure is still a success, there is no reason to check the rest

In addition, consolidating the logic to remove the local "good" since it isn't needed
 2014-12-16 16:37:12 -08:00
Mike Place
2d38be6952 Add docs to progress outputter 2014-12-16 17:34:05 -07:00
Mikael H. Møller
502a7538eb removed trailing white space 2014-12-16 15:52:23 -08:00
Thomas S Hatch
9b76717646 Merge pull request #19036 from basepi/lithium-saltssh-release 
Add salt-ssh publish wrapper to lithium release notes
 2014-12-16 16:49:17 -07:00
Mikael H. Møller
3a50f1d503 added an optional depth parameter to salt.states.git.latest 2014-12-16 15:19:21 -08:00
Thomas Jackson
09039f3f6f Remove getter-- since this is just a property 2014-12-16 15:16:17 -08:00
Colton Myers
e0b6f1623c Add publish wrapper to lithium release notes 2014-12-16 16:13:03 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Thomas S Hatch
215a4d0e89 Merge pull request #19027 from cvrebert/patch-1 
utils/__init__.py: rm redundant import
 2014-12-16 14:00:15 -07:00
Thomas S Hatch
b448a152af Merge pull request #19019 from jacksontj/2014.7-config 
Backport #19012 to 2014.7
 2014-12-16 13:01:55 -07:00
Chris Rebert
eb72efd0c0 utils/__init__.py: rm redundant import 
************* Module salt.utils
salt/utils/__init__.py💯 [W0404(reimported), ] Reimport 'salt.defaults.exitcodes' (imported line 97)
 2014-12-16 11:55:31 -08:00
Thomas S Hatch
a5c61bf39b Merge pull request #19012 from jacksontj/develop 
Fix infinites spinning in minion RemoteFileClient
 2014-12-16 12:34:12 -07:00
Thomas S Hatch
f960a87c7a Merge pull request #19024 from galet/fix-ini-manage-for-nonstrings 
Fix ini_manage state - equality detection for non-string values
 2014-12-16 12:30:26 -07:00
Nathan Hartwell
88a1d5b4b9 Fix for #18994 2014-12-16 12:05:24 -06:00
Michal Galet
782f6118cc Fix ini_manage state - equality detection for non-string values 2014-12-16 18:45:14 +01:00
Thomas S Hatch
31d7c6f57b Merge pull request #18996 from garethgreenaway/18969_2014_7_schedule_list 
schedule.list should return an empty dictionary, not None
 2014-12-16 10:19:25 -07:00
Thomas Jackson
a86c2e8b5a Pylint cleanup 2014-12-16 07:44:18 -08:00
Thomas Jackson
44f1448d01 Remove "init_timeout" in RemoteFileClient.get_file 
This timeout seems to attempt to retry in the event that the master returns nothing-- but the channel should be responsible for that.

In addition this would retry infinitely since the retry counter was re-initialized on every loop iteration. This meant you spun with an strace that looks something like:

```
read(12, "e\351\r\6y\357\331\313a0\233t\256\16qP", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\207L\210\340\314\203\353\207\236\231B{\304$\320\227", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\3\253\250\326w~\325\277\306\233'\355\300\225\202=", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\250\371\205\375\310\257\30\254\376\261\250o\177\357C6", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\322\0276\\\231\214v\5@pp\36\211\277\360\207", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout
```

Lastly, this retry attempt counter did nothing in the event of 10 failures (assuming it could get one) so it should be safe to remove it all together

Conflicts:
	salt/fileclient.py
 2014-12-16 07:44:09 -08:00
C. R. Oldham
10b1fd87e8 Merge pull request #19006 from cro/walkpath 
Fix typo in os.walk
 2014-12-16 08:21:40 -07:00
Rupesh Tare
64517b5449 Merge branch 'develop' into at_unit_tests 2014-12-16 19:50:03 +05:30
Rupesh Tare
8d271b173d added test cases for at and atc function from at module 2014-12-16 19:48:30 +05:30
Nitin Madhok
ead0c5184b Adding ability to do a test run with test=True. #18966 2014-12-16 05:02:37 -05:00
Thomas Jackson
8881430522 Pylint cleanup 2014-12-15 19:29:28 -08:00
Thomas Jackson
11a951985b Remove "init_timeout" in RemoteFileClient.get_file 
This timeout seems to attempt to retry in the event that the master returns nothing-- but the channel should be responsible for that.

In addition this would retry infinitely since the retry counter was re-initialized on every loop iteration. This meant you spun with an strace that looks something like:

```
read(12, "e\351\r\6y\357\331\313a0\233t\256\16qP", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\207L\210\340\314\203\353\207\236\231B{\304$\320\227", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\3\253\250\326w~\325\277\306\233'\355\300\225\202=", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\250\371\205\375\310\257\30\254\376\261\250o\177\357C6", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\322\0276\\\231\214v\5@pp\36\211\277\360\207", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout
```

Lastly, this retry attempt counter did nothing in the event of 10 failures (assuming it could get one) so it should be safe to remove it all together
 2014-12-15 19:15:17 -08:00
Thomas Jackson
eb157c06e0 Cleanup fileclient's references to channel 
we don't need an attribute *and* a getter
 2014-12-15 19:13:14 -08:00
C. R. Oldham
79b9198402 Merge pull request #19009 from rallytime/dont_quote_ints 
Fix mac_user.py module --> Don't quote integers like uid and gid
 2014-12-15 17:27:29 -07:00
rallytime
44e60acd12 Fix mac_user.py module --> Don't quote integers like uid and gid 2014-12-15 16:45:01 -07:00
Colton Myers
69337284ef Merge pull request #19000 from jfindlay/split_state 
split win commands in state
 2014-12-15 15:47:27 -07:00
C. R. Oldham
22cd943e5c Fix typo in os.walk 2014-12-15 15:29:27 -07:00
Steve Weber
cafd99f257 include wol in network module 
include wol in network module.
 2014-12-15 16:31:44 -05:00
Mike Place
10c5812646 Fix missing update to daemons refactor 2014-12-15 13:17:29 -07:00
Mike Place
67150306b6 Fix version test 2014-12-15 13:13:42 -07:00