valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,689 Commits 24 Branches 182 Tags 341 MiB
d99e639411
Commit Graph

26689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Johnson
d99e639411 fixed #10800 - updating GCE docs 2014-02-26 22:45:43 +00:00
Thomas S Hatch
6a3152255a Don't fail the setup.py if zmq is a liile on the old side 2014-02-26 15:35:25 -07:00
Thomas S Hatch
6969758108 Add salt-unity to the base deployment 2014-02-26 15:17:14 -07:00
Thomas S Hatch
b483ff7323 Add salt-unity script 
This script allows all salt commands to be called from a single top level
shell script
 2014-02-26 15:15:36 -07:00
Thomas S Hatch
27ca396c31 Merge pull request #10797 from hulu/docker-log-shadowing 
avoid shadowing module-level log in dockerio
 2014-02-26 15:09:46 -07:00
Thomas S Hatch
9f10525591 Merge pull request #10795 from pwdng/develop 
Fix misplaced parenthesis
 2014-02-26 14:42:27 -07:00
pwdng
dea9cedfd6 Minor bug fix 2014-02-26 22:27:29 +01:00
Thomas S Hatch
de28ee5dd4 Merge pull request #10792 from cachedout/doc_toc 
Documentation overhaul
 2014-02-26 14:09:59 -07:00
Mike Place
4a12cb4fd3 Remove spurious heading. Thanks @gravyboat! 2014-02-26 14:06:35 -07:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
0ce328c7e7 Fix line length 2014-02-26 13:32:33 -07:00
Mike Place
2f5c1563df Fix GCE build errors. 2014-02-26 13:32:33 -07:00
Mike Place
fd15b3372b Now compiling cleanly except for GCE. 2014-02-26 13:32:33 -07:00
Mike Place
a559f5a114 Moving around Windows docs. 2014-02-26 13:32:33 -07:00
Mike Place
d7873621b1 Wrapping up sub-TOCs. 2014-02-26 13:32:33 -07:00
Mike Place
826bad4cfb Merge conflict and rebase. 
Conflicts:
	doc/ref/renderers/index.rst
 2014-02-26 13:32:08 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
Thomas S Hatch
3e00d95ca4 Add inline function behavior tot he minion 2014-02-26 13:14:22 -07:00
Thomas S Hatch
3c9d5ae43b Merge branch '10287-fix-dashes-in-interface-names' of git://github.com/dmyerscough/salt into dmyerscough-10287-fix-dashes-in-interface-names 
Conflicts:
	salt/utils/network.py
 2014-02-26 13:10:05 -07:00
Thomas S Hatch
aa22132bd5 Merge pull request #10790 from tomashavlas/develop 
timezone module fixes for Arch
 2014-02-26 12:55:58 -07:00
Thomas S Hatch
3ff670e6ad Merge pull request #10786 from ranl/develop 
tomcat state: adding undeployed function
 2014-02-26 12:54:50 -07:00
Thomas S Hatch
6085b921bf Merge pull request #10785 from terminalmage/rhel6-upstart 
Add RHEL6-specific upstart config files
 2014-02-26 12:54:11 -07:00
Thomas S Hatch
eea9a19481 Merge pull request #10784 from borgstrom/pyobjects_docs 
Adding pyobjects documentation to the tutorial
 2014-02-26 12:53:34 -07:00
Thomas S Hatch
2cec616f31 Whitespace and double quote cleanup #10781 2014-02-26 12:49:19 -07:00
Thomas S Hatch
e54e25920a Merge pull request #10781 from topochan/develop 
nagios module to execute nagios check/plugins
 2014-02-26 12:46:58 -07:00
Thomas S Hatch
e8d2700685 Merge branch 'lint' of git://github.com/terminalmage/salt into terminalmage-lint 
Conflicts:
	salt/daemons/test/test_master.py
	salt/daemons/test/test_minion.py
 2014-02-26 12:39:50 -07:00
Tomas Havlas
5a2e632351 timezone module fixes for Arch 2014-02-26 19:42:39 +01:00
Thomas S Hatch
4b0e136459 Merge pull request #10761 from terminalmage/gitfs-env-whitelist 
Add environment whitelist/blacklist to gitfs backend
 2014-02-26 11:35:01 -07:00
Thomas S Hatch
acdfe4141c Merge pull request #10760 from tallmad/develop 
fix bug of "manage_file dir_mode does not work"
 2014-02-26 11:33:29 -07:00
Thomas S Hatch
b08d5916e3 Merge pull request #10756 from Vye/add_explicit_git_revision_winrepo 
added explicit git revision support to winrepo
 2014-02-26 11:32:48 -07:00
ranl
711430e789 tomcat state: adding undeployed function 2014-02-26 19:45:22 +02:00
Erik Johnson
08d90a7beb Add RHEL6-specific upstart config files 
RHEL6 doesn't use the net-device-up and local-filesystems targets,
meaning that if someone decides to use this upstart config then the
master/minion/syndic does not start on boot.

We don't deploy upstart configs in our RPMs, but this provides a working
upstart config file for those that wish to use it.
 2014-02-26 11:26:06 -06:00
Evan Borgstrom
927b6275af Ensure the code-blocks work properly 2014-02-26 12:22:32 -05:00
Evan Borgstrom
fb98e76fb0 Adding pyobjects documentation to the tutorial 2014-02-26 12:19:00 -05:00
Miguel A. Guillen
ec375affa5 Added carbon returner information 2014-02-26 18:18:25 +01:00
Miguel A. Guillen
48ff3b1f3c Added carbon returner information 2014-02-26 18:18:25 +01:00
Miguel A. Guillen
087c1c1e66 Fix format issues 2014-02-26 18:18:25 +01:00
Thomas S Hatch
1a5958456f Merge pull request #10755 from s0undt3ch/hotfix/zmq-esky 
Properly handle PyZMQ >= 0.14 when freezing
 2014-02-26 10:02:33 -07:00
Thomas S Hatch
80b9d3cbd7 Merge pull request #10746 from kaithar/feature/unreachable-fallback 
Fix a fall back
 2014-02-26 10:00:17 -07:00
Thomas S Hatch
98360d799c Merge pull request #10741 from makinacorpus/fixcron 
Support multiline cron comments
 2014-02-26 09:59:28 -07:00
Thomas S Hatch
d9a01676e7 Merge pull request #10739 from nshalman/smartos-esky-packaging 
update documentation about SmartOS esky packaging
 2014-02-26 09:51:31 -07:00
Miguel A. Guillen
565ecdbf7e Fix format issues 2014-02-26 17:23:38 +01:00
Joseph Hall
4739100c69 Merge pull request #10780 from tomashavlas/develop 
iptables --tcp-flags parse whitespace separated values
 2014-02-26 08:34:57 -07:00
Miguel A. Guillen
09866fee22 Initial version of nagios module 2014-02-26 16:20:50 +01:00
Tomas Havlas
08bb9a880d iptables --tcp-flags nargs fix for 2.6 version 2014-02-26 16:04:00 +01:00
Tomas Havlas
595d3b8951 iptables --tcp-flags parse whitespace separated values 2014-02-26 15:50:07 +01:00
Joseph Hall
95393e501b Merge pull request #10771 from JensRantil/newline-in-debian-timezone 
module/timezone: add newline in `/etc/timezone`
 2014-02-26 07:31:12 -07:00
Joseph Hall
0e74120376 Merge pull request #10777 from Lothiraldan/patch-4 
Expanduser on key_filename in openstack provider
 2014-02-26 07:25:40 -07:00
Boris Feld
77a96ea868 Expanduser on key_filename in openstack provider 2014-02-26 15:11:09 +01:00
Joseph Hall
d92c0089c2 Merge pull request #10770 from tomashavlas/develop 
iptables append --reject-with after --jump
 2014-02-26 06:45:56 -07:00