valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,426 Commits 24 Branches 182 Tags 341 MiB
708e729162
Commit Graph

6426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
708e729162 Merge pull request #2067 from s0undt3ch/issues/2028 
Fix #2028
 2012-09-23 13:33:13 -07:00
Pedro Algarvio
6f2f8d1f78 Merge branch 'develop' of github.com:saltstack/salt into issues/2028 2012-09-23 18:41:28 +01:00
Pedro Algarvio
03c006debb Removed a test that was using state.template_str. Re-adding later. 
The test was removed in order to have a clean pull request. A new issue will be opened because of that failing test.
 2012-09-23 18:32:04 +01:00
Pedro Algarvio
c315e95b95 Move the state pip.installed tests to the proper place. 
* Moved the state `pip.installed` tests to it's own module, the correct one.
* Added a test which checks for the presence of errors while running `pip.installed` introduced while fixing #2028
 2012-09-23 18:16:11 +01:00
Pedro Algarvio
5b9c6f92ce Issue #2028 fixes and improvements. 
* `salt.states.pip.installed()` now keeps a reference to the output of the `__salt__['pip.install']()` call. The reason for this is that we need to know and pass along any information about an eventual error when running that call. This is now done in addition to the old behaviour.
* Add some tests which triggered the issue.
 2012-09-23 17:25:21 +01:00
Thomas S Hatch
9721a5a498 Merge pull request #2066 from FireHost/setup_import_safe 
Add ifmain to make setup.py import safe
 2012-09-22 22:22:19 -07:00
Aaron Tygart
44234ff2bd Add ifmain to make setup.py import safe 2012-09-23 00:19:39 -05:00
Thomas S Hatch
9bf2e74454 Merge pull request #2065 from FireHost/mongo_pillar 
Mongo ext_pillar
 2012-09-22 21:47:22 -07:00
Thomas S Hatch
b12ec27817 Merge pull request #2063 from FireHost/rework_os_grains 
Rework os, osrelease, and oscodename grains
 2012-09-22 21:44:04 -07:00
Aaron Tygart
d445ad0e2b Merge branch 'upstream/develop' into mongo_pillar 2012-09-22 23:30:56 -05:00
Aaron Tygart
c5c6e51475 Update mongo pillar documentation 2012-09-22 23:26:49 -05:00
Aaron Tygart
557a84049b Merge branch 'upstream/develop' into rework_os_grains 
Conflicts:
	salt/grains/core.py
 2012-09-22 22:26:18 -05:00
Aaron Tygart
1f050476de Rework os, osrelease, and oscodename grains 
* Rework the above three grains
  * Rework data flow for Windows and Linux core grains
  * Optimize some repeated calls
 2012-09-22 19:58:55 -05:00
Thomas S Hatch
f3dc904ce2 Fix #2048 2012-09-22 16:34:08 -06:00
Thomas S Hatch
c45b36a72b Add exclude to release notes 2012-09-22 15:59:35 -06:00
Thomas S Hatch
ec1df1769d Add exclude docs 2012-09-22 15:55:32 -06:00
Thomas S Hatch
a060ec1c51 exclude works! This should fix #2053 2012-09-22 15:27:10 -06:00
Thomas S Hatch
3eca7d709e Add apply_exclude method to state 
I have noot hooked this in and tested it yet, all of the high data
hooks (highstate, sls and top) need to be linked in.
 2012-09-22 11:36:06 -06:00
Thomas S Hatch
9f700e416d Add __exclude__ data to the rendered highstate 2012-09-22 10:27:16 -06:00
Thomas S Hatch
7445cb7612 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-22 10:14:11 -06:00
Thomas S Hatch
b2a689c915 Add check for exclude in sls files 
This does not do anything with the exclude yet, but it does add
the __exclude__ data for future processing
 2012-09-22 10:13:06 -06:00
Thomas S Hatch
492800cafc Merge pull request #2061 from fatbox/detect-cloudlinux 
Detect cloudlinux
 2012-09-22 08:48:49 -07:00
Evan Borgstrom
632e48dd2d Support CloudLinux in the modules 2012-09-22 11:43:39 -04:00
Thomas S Hatch
ebb110ca8a Merge pull request #2060 from s0undt3ch/develop 
Some more source code formatting audit fixes and changes.
 2012-09-22 08:40:57 -07:00
Evan Borgstrom
b1b2f4e750 Add CloudLinux to the RedHat family 2012-09-22 11:38:33 -04:00
Pedro Algarvio
5e1b85ffb2 Some more changes for the code formatting audit. 2012-09-22 12:13:17 +01:00
Pedro Algarvio
6173bedfa7 Some more source code formatting audit changes. 2012-09-22 11:14:46 +01:00
Pedro Algarvio
7f4203d5e1 Fix code introduced from previous source code audit. 2012-09-22 11:14:02 +01:00
Thomas S Hatch
f1972b2624 Merge pull request #2056 from seanchannel/develop 
add backup_mode to minion config and config reference
 2012-09-21 19:14:04 -07:00
Sean Channel
974a7042ed add backup_mode to minion config and config reference 2012-09-21 18:48:41 -07:00
Thomas S Hatch
05429b870a Merge pull request #2055 from s0undt3ch/develop 
Source code formatting audit.
 2012-09-21 16:44:07 -07:00
Pedro Algarvio
29aa2444e5 Source code formatting audit. 
* Substitute all `%` string operations with python's `string.format()`. There are still some `%` string operations left behind on some specific cases which will be evaluated in order to keep **all** string operation using `format()`. More info on http://docs.python.org/library/string.html#formatstrings
* PEP-8 corrections.
* Add space after commas(`,`), for example:
	x, y = foo.split()
	'{0} {1}'.format(foo, bar)
* Pyflakes corrections.
* Favor single quotes over double quotes.
* Minor typos.
 2012-09-21 23:21:28 +01:00
Thomas S Hatch
6b742b4004 Merge pull request #2050 from seanchannel/patch-9 
change location of sock dir
 2012-09-20 16:50:31 -07:00
Sean Channel
f384b5d194 change location of sock dir 
per issue #2044 / commit 075c754 

here also
 2012-09-20 16:49:04 -07:00
Thomas S Hatch
25f9c5386a Merge pull request #2046 from FireHost/windows_multiprocessing 
Windows multiprocessing support and Esky bugfixes
 2012-09-20 16:49:03 -07:00
Thomas S Hatch
6e0d3f22e2 Merge pull request #2049 from seanchannel/patch-8 
change location of sock dir
 2012-09-20 16:48:30 -07:00
Sean Channel
e204440766 change location of sock dir 
per issue #2044 / commit 075c754
 2012-09-20 16:46:06 -07:00
Thomas S Hatch
2a0ce1f26c Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-20 13:36:45 -06:00
Thomas S Hatch
9bfe0bb95f Set startup_states in the release notes 2012-09-20 13:34:54 -06:00
Pedro Algarvio
0a9b0b3e08 Merge branch 'develop' of github.com:saltstack/salt into issues/2028 2012-09-20 19:33:00 +01:00
Pedro Algarvio
6640e9581d Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-20 19:29:49 +01:00
Pedro Algarvio
94b9decdb7 If it's not a dict, it should not be treated like one. 2012-09-20 19:27:45 +01:00
Pedro Algarvio
39af3fb5d6 Fix the test-cases custom logging handler. 
* Even when the tests logging handler stream is directed to `/dev/null` we still need a low logging level so that our custom logging handler, used to see if certain log messages are emitted or not, catches messages.
 2012-09-20 19:27:32 +01:00
Thomas S Hatch
528600692b Add docs for the new startup_states option 2012-09-20 12:22:12 -06:00
Pedro Algarvio
62446308ff Fix the test-cases custom logging handler. 
* Even when the tests logging handler stream is directed to `/dev/null` we still need a low logging level so that our custom logging handler, used to see if certain log messages are emitted or not, catches messages.
 2012-09-20 19:16:20 +01:00
Thomas S Hatch
06db85a9fe Add startup states options to config.py 2012-09-20 11:52:48 -06:00
Thomas S Hatch
0b9fe9c8d9 Add the capability to run states when the minion starts 2012-09-20 11:45:03 -06:00
Thomas S Hatch
e66ebc7621 Allow minions to send a return that requests a jid 2012-09-20 11:19:24 -06:00
Thomas S Hatch
d76f051610 dd some more docs making the order to requitie relationship 
a little more clear
 2012-09-20 09:39:16 -06:00
Thomas S Hatch
075c75425e Change the default sock_dir to /var/run/salt, because that is correct 2012-09-20 09:31:59 -06:00