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
36,443 Commits 24 Branches 182 Tags 341 MiB
1bcaa1fbff
Commit Graph

36443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
1bcaa1fbff Merge pull request #17167 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #196
 2014-11-04 15:33:21 -07:00
Thomas S Hatch
fd683a5ded Merge pull request #17170 from cro/zypp_doc 
Document that pkg.* on openSUSE needs python-zypp
 2014-11-04 15:21:41 -07:00
C. R. Oldham
b51a821413 pkg.* on openSUSE needs python-zypp installed 2014-11-04 15:16:28 -07:00
Thomas S Hatch
6e49163c88 Merge pull request #17156 from cachedout/issue_17105 
Update to new softwareproperties.ppa upstream changes
 2014-11-04 15:04:38 -07:00
Thomas S Hatch
b2b174066f Merge pull request #17154 from cachedout/overstate_dep 
Add deprecation warning to state.over
 2014-11-04 15:02:42 -07:00
Pedro Algarvio
a114dab27d Update 'doc/.tx/config' - Build #196 
http://cookingwithsalt.org/job/salt/job/transifex/196/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-04 21:51:34 +00:00
Colton Myers
5c93de6ea1 Merge pull request #17157 from basepi/prereqdocs17086 
We evaluate a prereq, we don't call it. Fixes #17086
 2014-11-04 11:39:48 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Mike Place
ded8a02d5d Update to new softwareproperties.ppa changes 
Closes #17105
 2014-11-04 11:24:12 -07:00
Mike Place
2b08c753cb Add deprecation warning to state.over 2014-11-04 10:19:24 -07:00
Thomas S Hatch
4d362274a1 Merge pull request #17119 from rallytime/fix_ec2_cloud_test 
Fix ec2 cloud test
 2014-11-03 21:05:31 -07:00
Thomas S Hatch
e713723019 Merge pull request #17118 from jacksontj/2014.7-config 
Fix for an issue where re-started sub-processes would inherit
 2014-11-03 21:04:58 -07:00
Thomas S Hatch
715c434c2f Merge pull request #17104 from avdhoot/fix_#16085 
Fix #16085 pam auth module was not closeing PamHandle hence there was memory leak.
 2014-11-03 20:43:36 -07:00
Thomas S Hatch
01c1d7347a Merge pull request #17080 from jacksontj/2014.7 
2014.7: misc dict usage cleanup
 2014-11-03 20:31:03 -07:00
Thomas S Hatch
d0dbb7c76a Merge pull request #16996 from AccelerationNet/win-service-stop-reliably 
Win service stop reliably
 2014-11-03 20:22:56 -07:00
Thomas Jackson
ce01b7bbc6 Change IndexError to StopIteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
74067e15e4 Change IndexError to StopIteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
fe1266e02a Change from indexerror to stopiteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
df92546948 Another pylint fix 2014-11-03 15:51:11 -08:00
Thomas Jackson
0f971412fd Fix typo 2014-11-03 15:51:11 -08:00
Thomas Jackson
b4afb8ce43 More dict cleanup 
keys() and values() create copies of the data in lists, iterators are better
 2014-11-03 15:51:11 -08:00
Thomas Jackson
0a1b494d2d More dict cleanup 
keys() and values() create copies of the data in lists, iterators are better
 2014-11-03 15:51:11 -08:00
Thomas Jackson
a650a5d9e8 More dict cleanup 
keys() and values() create copies of the data in lists, iterators are better
 2014-11-03 15:51:11 -08:00
Thomas Jackson
c4af0fcef1 More dict cleanup 
keys() and values() create copies of the data in lists, iterators are better
 2014-11-03 15:51:11 -08:00
Thomas Jackson
d81bca7aa7 More dict cleanup 
keys() and values() create copies of the data in lists, iterators are better
 2014-11-03 15:51:11 -08:00
Thomas Jackson
52d0df376f Redundant check 
sorted(dict) == sorted(dict.keys())
 2014-11-03 15:51:11 -08:00
Thomas Jackson
5930bbdaae Utils/wheel cleanup of dicts 2014-11-03 15:51:10 -08:00
Thomas Jackson
2bb27d3d4b More dict cleanup in state/states 2014-11-03 15:51:10 -08:00
Thomas Jackson
8e02c08a92 keys() cleanup in returners 2014-11-03 15:51:10 -08:00
Thomas Jackson
7821b2d390 Keys() cleanup in renderers 2014-11-03 15:51:10 -08:00
Thomas Jackson
1615c0f394 Cleanup pillar modules with dicts 2014-11-03 15:51:10 -08:00
Thomas Jackson
d686479f54 more cleanup 
no need to caste keys() to a list since it returns a list
 2014-11-03 15:51:10 -08:00
Thomas Jackson
1ef0b85ff5 Remove redundant keys() since dict is an iterator of keys 2014-11-03 15:51:10 -08:00
Thomas Jackson
1d4444d2f7 More dict cleanup 2014-11-03 15:51:10 -08:00
Thomas Jackson
847659b424 more dict cleanup 2014-11-03 15:51:10 -08:00
Thomas Jackson
6f3f3226b9 More keys() removal 2014-11-03 15:51:10 -08:00
Thomas Jackson
fbc14beb97 No need to create a copy of the keys 2014-11-03 15:51:10 -08:00
Thomas Jackson
3d871c97c2 No reason to create a copy of the dict in memory, we can just get the key from the key iterator 2014-11-03 15:50:55 -08:00
Thomas Jackson
152154df57 Don't need keys() dicts are iterators of their keys 2014-11-03 15:50:54 -08:00
Thomas Jackson
27b5bbe1c1 Dicts are already iterators over their keys 2014-11-03 15:50:54 -08:00
Thomas S Hatch
0bbe01b2f0 Merge pull request #16937 from terminalmage/issue16285 
Force VCS fileserver backend config values to be loaded as strings
 2014-11-03 16:30:40 -07:00
rallytime
92fc46607f Don't use HVM image type. 2014-11-03 16:12:21 -07:00
Thomas Jackson
896a2cc7de Pylint cleanup 2014-11-03 14:41:36 -08:00
rallytime
e272c41bb8 Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6 2014-11-03 15:13:14 -07:00
Thomas Jackson
35b110fc69 Fix for an issue where re-started sub-processes would inherit the signal handlers from the process manager. Then you would end up with stack traces like: 
```
Process Publisher-6:
Traceback (most recent call last):
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/home/thjackso/src/salt-github/salt/master.py", line 403, in run
    package = pull_sock.recv()
  File "socket.pyx", line 628, in zmq.backend.cython.socket.Socket.recv (zmq/backend/cython/socket.c:5616)
  File "socket.pyx", line 662, in zmq.backend.cython.socket.Socket.recv (zmq/backend/cython/socket.c:5436)
  File "socket.pyx", line 139, in zmq.backend.cython.socket._recv_copy (zmq/backend/cython/socket.c:1771)
  File "checkrc.pxd", line 11, in zmq.backend.cython.checkrc._check_rc (zmq/backend/cython/socket.c:5863)
  File "/home/thjackso/src/salt-github/salt/utils/process.py", line 242, in kill_children
    p_map['Process'].join(0)
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 117, in join
    assert self._parent_pid == os.getpid(), 'can only join a child process'
AssertionError: can only join a child process
```
 2014-11-03 13:53:13 -08:00
Thomas S Hatch
072ec7997f Merge pull request #16393 from s0undt3ch/features/ssh-packaging 
READ BEFORE MERGE
 2014-11-03 14:47:39 -07:00
Ryan Davis
480ee850ef only sleep after sc reports we're still waiting 
In testing, sometimes `net stop` might not stop the service, but
checking the service using `sc query` immediately afterwards reported
the service as stopped (I suspect a process scheduling issue, but have
no real evidence of that).

Changes the logic to check using `sc query` and then sleep only if we're
not stopped (as opposed to sleep, then check using `sc query`).

This results in a few different execution paths:

* `net stop` works, we exit
* `net stop` fails, `sc query` reports the service is stopped, we exit
* `net stop` fails, `sc query` reports the service is NOT stopped, we
  sleep then check again

This approach should have us sleeping only if we really need to.
 2014-11-03 08:39:59 -05:00
Ryan Davis
0afbe2cdf6 pep8 2014-11-03 08:39:46 -05:00
avdhoot
265e5c558c Fix #16085 pam auth module was not closeing PamHandle. moreinfo: http://pubs.opengroup.org/onlinepubs/8329799/pam_end.htm 2014-11-03 15:54:41 +05:30
Pedro Algarvio
58f3575fce Merge pull request #17084 from terminalmage/docs 
Update RC version in docs sidebar
 2014-11-02 09:08:24 +00:00