valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,528 Commits 24 Branches 182 Tags 341 MiB
229fa20808
Commit Graph

44528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
229fa20808 Merge branch 'develop' of github.com:saltstack/salt into develop 2015-01-12 17:13:49 +00:00
Thomas S Hatch
2fe1757cb9 Merge pull request #19599 from fayetted/Issue_19598 
Fix ssh_auth test mode, compare lines not just key
 2015-01-12 09:13:23 -07:00
Thomas S Hatch
86a3bf3269 Merge pull request #19429 from lyft/ignore-missing-for-pillars 
Add new ignore_missing option to pillar top
 2015-01-12 09:06:15 -07:00
Pedro Algarvio
c3bc043b23 Merge branch '2015.2' into develop 
Conflicts:
	salt/syspaths.py
	setup.py
	tests/integration/__init__.py
 2015-01-11 22:45:35 +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
Daniel Fayette
1fee1ad67b Fix ssh_auth test mode, compare lines not just key 
Intened to fix #19598
 2015-01-11 15:09:22 -06:00
Thomas S Hatch
b85999988b Merge pull request #19621 from stackstrap/develop 
Adding Hjson renderer.
 2015-01-11 10:12:24 -07: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
jfindlay
f554acc54c Merge pull request #19616 from jfindlay/fix_win_servermanager 
quote servermanager cmds
 2015-01-10 15:27:09 -07:00
Howard Roark
be78528456 Adding Hjson renderer. 2015-01-10 16:37:02 -05: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
0e935486de Merge pull request #19605 from jacksontj/develop 
Fixes for develop
 2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d Temporarily change this test to work around race condition in the runnerclient 
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
 2015-01-10 00:18:16 -08:00
Thomas Jackson
df3655dc45 Don't spin waiting for runner return, just use get_event (it has a poller) 2015-01-10 00:17:50 -08:00
Thomas Jackson
6d29d661b4 Join the async process, otherwise we leave zombies (which looks like a memory leak). 2015-01-10 00:01:18 -08: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
Nicole Thomas
f2b63b816e Merge pull request #19601 from rallytime/pylint 
Fix pylint on develop branch
 2015-01-09 21:05:59 -07:00
rallytime
d5d0e75f38 Fix pylint on develop branch 2015-01-09 20:54:36 -07:00
Mike Place
710c455b9b Merge pull request #19600 from cachedout/cleanup_jboss 
Typ fix
 2015-01-09 18:15:18 -07:00
Mike Place
dfb8810afc Typo 2015-01-09 18:14:52 -07:00
Thomas S Hatch
8ec6d4a257 Merge pull request #19561 from favadi/clean_file 
add pkgrepo.managed clean_file option
 2015-01-09 17:51:35 -07:00
Thomas S Hatch
98cc0f88b4 Merge pull request #19585 from cachedout/async_flag_for_test_run 
Async flag for test run
 2015-01-09 17:50:52 -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
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-09 17:49:43 -07:00
Thomas S Hatch
02251ae8fa Merge pull request #19582 from manonthemat/develop 
url fix of dependency in installation guide
 2015-01-09 17:47:46 -07:00
Thomas S Hatch
6cce713a76 Merge pull request #19581 from jacksontj/develop 
Remove clear() method
 2015-01-09 17:44:14 -07:00
Thomas S Hatch
f8f7867461 Merge pull request #19595 from thatch45/Trax-air-fix-azure-cloud-service 
Merge #19580 with fixes
 2015-01-09 17:39:01 -07:00
Thomas S Hatch
20555c9c38 Merge branch 'develop' into Trax-air-fix-azure-cloud-service 
Conflicts:
	salt/cloud/clouds/msazure.py
 2015-01-09 17:37:48 -07:00
Thomas S Hatch
83fab2739d lint (and single quotes when I see them :) ) 2015-01-09 17:35:25 -07:00
Thomas S Hatch
0990057313 Merge branch 'fix-azure-cloud-service' of https://github.com/Trax-air/salt into Trax-air-fix-azure-cloud-service 2015-01-09 17:34:26 -07:00
Thomas S Hatch
2aa9b97373 Merge pull request #19594 from thatch45/Trax-air-salt-add-azure-volume 
Merge #19566
 2015-01-09 17:25:10 -07:00
Thomas S Hatch
4c56245f98 lint 2015-01-09 17:24:08 -07:00
Thomas S Hatch
80197a06d1 Merge branch 'salt-add-azure-volume' of https://github.com/Trax-air/salt into Trax-air-salt-add-azure-volume 2015-01-09 17:23:09 -07:00
Thomas S Hatch
91d0b5b75c Merge pull request #19562 from rupeshta/debconfmod_unit_tests 
Implemented unit test cases for debconfmod module
 2015-01-09 17:14:56 -07:00
Thomas S Hatch
402eb97448 Merge pull request #19593 from cachedout/mine_sleep 
Give event-based mines time to propogate
 2015-01-09 17:14:18 -07:00
Thomas S Hatch
ba3b7c7c63 Merge pull request #19557 from cachedout/cleanup_jboss 
Cleanup jboss module
 2015-01-09 17:12:54 -07:00
Mike Place
3eefb8e47d Give event-based mines time to propogate 2015-01-09 16:58:21 -07:00
Colton Myers
9659447266 Always return True from supervisord virtual function 
Fixes #18044
 2015-01-09 15:36:57 -07:00
Mike Place
1b78f4069f Use __func_alias__ 2015-01-09 15:03:44 -07:00
Thomas Jackson
d26f6f327c Disable gc while deserializing msgpack messages 
From msgpack docs: "CPython's GC starts when growing allocated object. This means unpacking may cause useless GC. You can use gc.disable() when unpacking large message."
 2015-01-09 12:58:00 -08:00
Mike Place
7aec24e8e1 Typo 2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264 Async flag and test cleanup 2015-01-09 13:14:33 -07:00