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
44,379 Commits 24 Branches 182 Tags 341 MiB
7a491b5438
Commit Graph

44379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
e4556d74cb Make AES key never hit disk on the master 
In the past we've been doing coordination of the aes key using dropfiles etc. Not only is this significantly more costly (at least 1 stat per reqserver request) it also means that the symmetric key we use to pub/req messages has been on disk. This re-works the aes key to be a multiprocessing.Array() (char array) which is shared amongst the processes. Now the dropfile is just a request for the master to rotate the key, and this means that *all* key rotation on the master will generate the appropriate event (instead of just ones who passed in sock_dir to dropfile())
 2015-01-12 08:25:05 -08:00
robert.fach
9da67a5727 fixed format error "string-substitution-usage-error" 2015-01-12 16:32:20 +01:00
robert.fach
c9eb4cfe67 added fix for matching the unit of size values for devices to the unit of size values in proc filesystem 2015-01-12 13:25:03 +01:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00:00
Pedro Algarvio
209c0f35c4 Fix stripped kwarg from the merge forward 2015-01-12 00:38:55 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
Thomas S Hatch
fc06a8bbc8 Merge pull request #19571 from s0undt3ch/hotfix/setup-salt-paths 
Fix setup salt paths
 2015-01-11 09:46:48 -07:00
Pedro Algarvio
014e1cd888 Merge pull request #19602 from rallytime/bp-19585 
Backport #19585 to 2014.7
 2015-01-11 15:38:58 +00:00
Justin Findlay
d8dc3afbb3 fix some ip commands 2015-01-10 19:41:44 -07:00
Justin Findlay
8dca3cd0e5 update lxc commands 2015-01-10 17:39:42 -07:00
jfindlay
f554acc54c Merge pull request #19616 from jfindlay/fix_win_servermanager 
quote servermanager cmds
 2015-01-10 15:27:09 -07:00
Pedro Algarvio
e2e535824a Use SaltStackVersion since we don't yet know when Boron will come out 2015-01-10 21:18:51 +00:00
Pedro Algarvio
3f14678796 Throw an error when the time comes to remove the deprecated code. 2015-01-10 21:18:51 +00:00
Pedro Algarvio
8a6e0a38ed Remove unnecessary code 2015-01-10 21:18:51 +00:00
Pedro Algarvio
b2c710e375 Salt path options are now global and default to None. 
Since we now evaluate each `salt.syspath` entry one by one, we only set
the passed settings in the generated `_syspaths` module.

The default values will mandate unless explicitly overridden in the
setup stage.

Refs #19157, #19160, #19161
Fixes #19514
Closes #19515
 2015-01-10 21:18:51 +00:00
Pedro Algarvio
86ca0bcb13 Evaluate paths one by one since some depend on others 2015-01-10 21:18:51 +00:00
Justin Findlay
19d31a78fc quote servermanager cmds 2015-01-10 12:29:19 -07:00
Mike Place
329c8c5723 Merge pull request #19590 from basepi/supervisordvirtual 
Always return True from supervisord virtual function
 2015-01-10 08:56:36 -07:00
Mike Place
1277b71e2d Typo 2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
Thomas S Hatch
30666861cd Merge pull request #19584 from rallytime/bp-19574 
Backport #19574 to 2014.7
 2015-01-09 17:50:02 -07:00
Colton Myers
9659447266 Always return True from supervisord virtual function 
Fixes #18044
 2015-01-09 15:36:57 -07:00
Erik Johnson
ff221219f2 Remove trailing underscore from cmd_{un,}zip_ 
This is unnecessary and means that one needs to use the trailing
underscore if they want to directly run those functions.
 2015-01-09 15:00:25 -06:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
Nicole Thomas
e46ccc8210 Merge pull request #19579 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-09 12:51:48 -07:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
 2015-01-09 11:39:09 -07:00
Nicole Thomas
1079603c54 Merge pull request #19572 from jfindlay/cmd_fixes 
fix some commands
 2015-01-09 11:23:53 -07:00
Mike Place
d16544fcb9 Merge pull request #19577 from cachedout/sreq_2015 
Adjust for a possible subtle bug in zeromq
 2015-01-09 11:12:47 -07:00
Mike Place
2ee4bead9e Adjust for a possible subtle bug in zeromq 2015-01-09 11:10:02 -07:00
Justin Findlay
acd2655770 fix some commands 2015-01-09 09:58:41 -07:00
Colton Myers
45a363fed9 Don't log below warning 
Fixes #19479
 2015-01-09 09:49:47 -07:00
Colton Myers
dc9f36fcf5 Move the quiet check up in _check_loglevel 
In retrospect this probably wasn't a problem where it was.
 2015-01-09 09:40:13 -07:00
Nicole Thomas
76c5d5a372 Merge pull request #19568 from rallytime/pylints 
Pylint fix for 2015.2 branch
 2015-01-09 09:16:53 -07:00
rallytime
ff1985567b Pylint fix for 2015.2 branch 2015-01-09 09:14:44 -07:00
Thomas S Hatch
b02862ae72 Merge pull request #19547 from rallytime/bp-19380 
Backport #19380 to 2015.2
 2015-01-08 22:03:04 -07:00
Thomas S Hatch
4c17b14224 Merge pull request #19549 from rallytime/bp-19517 
Backport #19517 to 2014.7
 2015-01-08 22:02:25 -07:00
Thomas S Hatch
22c8a42180 Merge pull request #19552 from terminalmage/issue19540 
Fix regression in pillar cache
 2015-01-08 22:01:13 -07:00
Thomas S Hatch
47d1e65dfe Merge pull request #19556 from rallytime/fix_brew_mod 
Add python_shell kwarg to brew module
 2015-01-08 22:00:38 -07:00
rallytime
a8c9f95ab8 Add python_shell kwarg to brew module 2015-01-08 17:09:25 -07:00
Thomas S Hatch
8dd6f36c0c Merge pull request #19554 from rallytime/fix_disk_mod 
Move python shell kwarg to correct place
 2015-01-08 17:02:40 -07:00
rallytime
635898c850 Move python shell kwarg to correct place 2015-01-08 17:00:46 -07:00
Thomas S Hatch
2623aa672d Merge pull request #19541 from jfindlay/fix_pip 
change one more pip command
 2015-01-08 16:44:59 -07:00
Thomas S Hatch
081c96c43f Merge pull request #19537 from rallytime/bp-19344 
Backport #19344 to 2014.7
 2015-01-08 16:44:35 -07:00
Erik Johnson
1996656185 Look in local files for pillar data on masterless 2015-01-08 17:44:32 -06:00
Thomas S Hatch
7941a4a738 Merge pull request #19534 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-08 16:44:18 -07:00
Erik Johnson
e063c60691 Add a __pillar key to opts 2015-01-08 17:44:16 -06:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests 
Update archive tests to use python_shell=False
 2015-01-08 16:43:09 -07:00
Thomas S Hatch
9f2ee27b02 Merge pull request #19542 from jfindlay/fixup_svn 
fix svn module str + list error
 2015-01-08 16:42:23 -07:00
Mike Place
854088c649 Merge pull request #19551 from cachedout/minor_note 
Release note note
 2015-01-08 16:41:46 -07:00
Mike Place
b419366443 Release note note 
Fixes #18551
 2015-01-08 16:41:20 -07:00