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
6,571 Commits 24 Branches 182 Tags 341 MiB
677a08fe7d
Commit Graph

6571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
bbc6252bd3 Make the ca module code clean and consistent 2012-09-24 00:52:52 -06:00
Thomas S Hatch
80aba3e7a9 Merge pull request #2082 from seanchannel/patch-10 
extension_modules added in root_dir comments
 2012-09-23 23:44:26 -07:00
Sean Channel
e90c3d36a4 extension_modules added in root_dir comments 
I still don't know what it's for, but I know where it goes! :)
 2012-09-23 23:38:25 -07:00
Thomas S Hatch
2a135dd1d1 pylint fixes for ca modules 2012-09-24 00:18:56 -06:00
Thomas S Hatch
16ce0332a1 Merge pull request #2080 from seanchannel/develop 
add tcp_pub_port, tcp_pull_port
 2012-09-23 22:58:25 -07:00
Thomas S Hatch
cf1e87e185 Merge pull request #2031 from scott-w/develop 
Add Supervisor Support
 2012-09-23 22:56:45 -07:00
Sean Channel
9b6ddb4494 Merge branch 'develop' of github.com:/seanchannel/salt into develop 2012-09-23 22:56:00 -07:00
Sean Channel
9fbd83752a tcp_pub_port, tcp_pull_port 2012-09-23 22:55:28 -07:00
Thomas S Hatch
5d43b8b852 Merge pull request #2079 from seanchannel/develop 
11 missing parameters added to minion template
 2012-09-23 22:51:20 -07:00
Sean Channel
ce3e6f1189 pidfile correction: minion -> master 
I don't see the minion actually using this parameter.  I don't see a pidfile anywhere.
 2012-09-23 22:50:38 -07:00
Sean Channel
b6b1dac3e1 added: 
sock_dir
 verify_env
 extension_modules
 master_finger
 failhard
 startup_states
 sls_list
 top_file
 ipc_mode
 grains
 timeout
 2012-09-23 22:40:33 -07:00
Sean Channel
6e9a7905ba missing a space over pidfile 2012-09-23 22:33:49 -07:00
Thomas S Hatch
2ebb93e2d8 Fix #2078 2012-09-23 23:31:18 -06:00
Thomas S Hatch
a536b43551 Add some .format awesome 2012-09-23 22:58:03 -06:00
Thomas S Hatch
77bc67b847 Single quotes :) 2012-09-23 22:51:31 -06:00
Thomas S Hatch
0fd3fd75c4 use single quotes 2012-09-23 22:46:00 -06:00
Thomas S Hatch
df8c540933 invert new diffs 2012-09-23 20:46:04 -06:00
Thomas S Hatch
83c8334101 Merge pull request #2077 from FireHost/fix_file_comment_reversed_diff 
Fix reversed diff on file.comment
 2012-09-23 19:41:15 -07:00
Aaron Tygart
d2c3c138ac Fix reversed diff on file.comment 2012-09-23 21:36:31 -05:00
Thomas S Hatch
6f98b84fa6 Merge pull request #2076 from seanchannel/develop 
added missing master config parameters
 2012-09-23 17:48:26 -07:00
Thomas S Hatch
0b0aee509d Merge pull request #2074 from FireHost/fix_yum_module_import 
Catch AttributeError on yumpkg import test
 2012-09-23 17:45:50 -07:00
Sean Channel
ec078c7bd7 really add missing options to master conf 2012-09-23 17:28:49 -07:00
Sean Channel
1a878f17d0 add missing configuration parameters 2012-09-23 17:05:45 -07:00
Alec Koumjian
eb907cb084 Update doc/ref/renderers/index.rst 
Telling users where they can put their custom renderers.
 2012-09-23 16:21:05 -07:00
Aaron Tygart
6a7c6f99b1 Catch AttributeError on yumpkg import test 2012-09-23 17:26:15 -05:00
Thomas S Hatch
1ce74929f2 Merge pull request #2073 from rubic/develop 
adding my name to AUTHORS
 2012-09-23 15:20:54 -07:00
Thomas S Hatch
34115ec827 Merge pull request #2072 from teftin/fix-extra-fds-on-cmd 
minion not closing extra sockets when running external commands
 2012-09-23 15:19:17 -07:00
Jeff Bauer
548cc3642a adding my name to AUTHORS 2012-09-23 17:13:13 -05:00
Ecto
9cdc2cfc89 tell Popen to close all non-default fds 2012-09-23 22:51:26 +01:00
Thomas S Hatch
2e1cf1f22a Merge pull request #2069 from FireHost/add_distutils_version_freeze 
Add 'distutils.version' to bbfreeze includes.
 2012-09-23 13:34:25 -07:00
Thomas S Hatch
708e729162 Merge pull request #2067 from s0undt3ch/issues/2028 
Fix #2028
 2012-09-23 13:33:13 -07:00
Scott Walton
4ceab3803d Added test handler in supervisor state for #2026 2012-09-23 21:25:00 +01:00
Scott Walton
48c0d56841 Merge remote-tracking branch 'upstream/develop' into develop 2012-09-23 21:16:09 +01:00
Aaron Tygart
100a6c2c2e Add 'distutils.version' to bbfreeze includes. 2012-09-23 13:43:39 -05:00
Pedro Algarvio
36fb821596 Add the module.state.template_str() failing test. 2012-09-23 18:42:26 +01: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