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
19,442 Commits 24 Branches 182 Tags 341 MiB
6ef4b6bfcc
Commit Graph

19442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cmartyniuk
6ef4b6bfcc Added information about sls type requisites 2013-10-25 09:18:38 -03:00
Joseph Hall
bc556c291f Merge pull request #8095 from c-cooperjones/develop 
Changes to iptables state and module.
 2013-10-25 04:53:15 -07:00
Chris Jones
3756f12a10 Changes to iptables state and module. 
Added flush and set policy to iptables state.
Added a -if option to specify interface mainly to allow traffic over lo.
Also added in sport so OUTPUT policy can be set to DROP and have more control over the rule.
 2013-10-25 11:16:24 +01:00
Pedro Algarvio
ad514e1f17 Merge pull request #8092 from cvrebert/develop 
copyedit recently-enhanced docs
 2013-10-24 23:44:21 -07:00
Chris Rebert
31ad8ee653 copyedit recently-enhanced docs 2013-10-24 23:31:13 -07:00
Pedro Algarvio
c59b31888b Minor indentation fix. 2013-10-25 01:07:40 +01:00
Pedro Algarvio
1e95193f37 Merge pull request #8085 from cachedout/disable_lspci 
Disable lspci
 2013-10-24 17:06:17 -07:00
Mike Place
94d84befd3 Pylint. (See, I learn eventually.) 2013-10-24 15:13:50 -06:00
Mike Place
ef772e3e1c Fix merge. 2013-10-24 15:07:03 -06:00
Mike Place
c959512c4a Merge branch 'develop' of https://github.com/saltstack/salt into disable_lspci 
* 'develop' of https://github.com/saltstack/salt: (57 commits)
  fixed a typo in the halite docs, reworded a sentence to clarify how halite is obtained
  Using the same technique as the python path checker to determine the correct md5 command. This improves the previous technique.
  OS X doesn't call md5sum by its full name. Instead, it is installed as simple 'md5'. Because we don't know what OS we're deploying to ahead of time, we need to check that condition for that in the shim script and account for it.
  Remove stale files in the docs dir. Refs #7984. Tested against a build and walk-through of the HTML docs.
  pip freeze output has comments sometimes: ignore
  Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion.
  Fix my typo
  Change assertEquals to assertEqual
  Use versionadded instead of note
  Reworked part of the halite docs to clarify the running of halite itself, created sections in prep for nginx/apache work.
  Reformatted according to Debian spec. Also added note to  declare that images in doc/_ext/images were created in-house, by Salt Stack.
  Forgot to add youtube.py.
  Initial commit of a top-level COPYING file to assist package maintainers.
  Stop shipping fonts in the docset. Start using free-fonts from Google and then fall-back to system fonts if those are not available.
  Fix for swapped vars in ssh-client auth.
  Still guess an ID always, but only cache if it's a proper minion
  Add note about upgrading minions for 0.17.1
  fix bad indent
  Kill some whitespace
  Lint fixes for execution module file.block
  ...

Conflicts:
	salt/grains/core.py
 2013-10-24 15:05:11 -06:00
Mike Place
5c839171e3 Too broad. Don't throw errors in things like salt-call for this condition. Only warn if user has explicitely disabled. 2013-10-24 15:02:48 -06:00
Colton Myers
058eeec39d Merge pull request #8081 from gravyboat/develop 
fixed a typo in the halite docs.
 2013-10-24 12:57:01 -07:00
Colton Myers
7c4ccb95e2 Merge pull request #8080 from cachedout/osx_ssh_shim_md5 
OS X doesn't call md5sum by its full name. Instead, it is installed as s...
 2013-10-24 12:54:07 -07:00
Forrest Alvarez
35745dbfea fixed a typo in the halite docs, reworded a sentence to clarify how halite is obtained 2013-10-24 19:02:59 +00:00
Mike Place
167cfd866e Using the same technique as the python path checker to determine the correct md5 command. This improves the previous technique. 2013-10-24 12:10:29 -06:00
Mike Place
dce16261eb OS X doesn't call md5sum by its full name. Instead, it is installed as simple 'md5'. Because we don't know what OS we're deploying to ahead of time, we need to check that condition for that in the shim script and account for it. 2013-10-24 11:30:50 -06:00
Colton Myers
8f5e0245dd Merge pull request #8065 from gravyboat/develop 
Initial documentation push for halite, updates to 0.17 release notes, updates to hacking guide.
 2013-10-24 10:06:02 -07:00
Colton Myers
6a359974b6 Merge pull request #8077 from cachedout/#7984 
Remove stale files in the docs dir. Refs #7984. Tested against a build a...
 2013-10-24 10:03:32 -07:00
David Boucha
ba0abb6810 Merge pull request #8073 from equinoxefr/update_nsis_installer 
Removing nsProcess plugin.
 2013-10-24 09:58:55 -07:00
Mike Place
9153576eb0 Merge pull request #8076 from AccelerationNet/develop 
pip freeze output has comments sometimes: ignore them
 2013-10-24 09:17:41 -07:00
Mike Place
82d6e28125 Remove stale files in the docs dir. Refs #7984. Tested against a build and walk-through of the HTML docs. 2013-10-24 10:09:37 -06:00
Nathan Bird
6e5adfdd72 pip freeze output has comments sometimes: ignore 
The output of pip freeze can contain lines like

    ## FIXME: could not find svn URL in dependency_links for this
    package:

These shouldn't log an error about being unable to parse a comment.
Especially since the message pip is trying to deliver to the user will
generally be about the following line, which isn't displayed in salt
output.
 2013-10-24 12:04:49 -04:00
EquinoxeFR
34c6f6c831 Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion. 2013-10-24 15:19:21 +02:00
Pedro Algarvio
7e37dc95e3 Merge pull request #8061 from cachedout/free-fonts 
Stop shipping fonts in the docset. Start using free-fonts from Google. Fixes #7983
 2013-10-24 04:35:33 -07:00
Joseph Hall
8652bcc901 Merge pull request #8069 from holmboe/fix-versionadded 
Use versionadded instead of note
 2013-10-24 03:08:56 -07:00
Pedro Algarvio
dad49dadf4 Merge pull request #8071 from holmboe/deprecated-test-functions 
Change assertEquals to assertEqual
 2013-10-24 02:55:17 -07:00
Henrik Holmboe
c10ed8ea60 Fix my typo 2013-10-24 11:42:52 +02:00
Henrik Holmboe
77fd1acb7f Change assertEquals to assertEqual 
According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
 2013-10-24 11:39:04 +02:00
Henrik Holmboe
dada06be37 Use versionadded instead of note 2013-10-24 10:52:34 +02:00
Forrest Alvarez
d6f78e2484 Reworked part of the halite docs to clarify the running of halite itself, created sections in prep for nginx/apache work. 2013-10-24 03:56:19 +00:00
Forrest Alvarez
32a3d82595 Merge remote branch 'upstream/develop' into develop 2013-10-24 03:37:11 +00:00
Seth House
c1cd96cb2b Merge pull request #8063 from cachedout/debian-copying 
Debian copying
 2013-10-23 17:36:37 -07:00
Mike Place
583d9ca705 Reformatted according to Debian spec. Also added note to declare that images in doc/_ext/images were created in-house, by Salt Stack. 2013-10-23 17:00:36 -06:00
Mike Place
75d1e7017c Forgot to add youtube.py. 2013-10-23 16:31:32 -06:00
Mike Place
b3b091e30c Initial commit of a top-level COPYING file to assist package maintainers. 2013-10-23 16:29:39 -06:00
Mike Place
cedf587522 Stop shipping fonts in the docset. Start using free-fonts from Google and then fall-back to system fonts if those are not available. 2013-10-23 15:42:24 -06:00
Mike Place
81c1b9d855 Merge pull request #8056 from cachedout/ssh-swap 
Fix for swapped vars in ssh-client auth.
 2013-10-23 12:04:55 -07:00
Mike Place
990b69d0da Fix for swapped vars in ssh-client auth. 2013-10-23 13:04:00 -06:00
Colton Myers
c4c8c61f18 Merge pull request #8055 from basepi/minionidcaching8052 
Still guess an ID always, but only cache if it's a proper minion
 2013-10-23 11:44:00 -07:00
Colton Myers
2e6d68de0a Still guess an ID always, but only cache if it's a proper minion 
Fix #8052
Fix #8050
 2013-10-23 12:41:06 -06:00
Colton Myers
41c27fc025 Merge pull request #8054 from basepi/0.17.1updateminions 
Add note about upgrading minions for 0.17.1
 2013-10-23 10:49:45 -07:00
Colton Myers
8f2361418f Add note about upgrading minions for 0.17.1 2013-10-23 11:49:07 -06:00
Thomas S Hatch
e87c5a3597 fix bad indent 2013-10-23 11:44:09 -06:00
Thomas S Hatch
2f07b0fe35 Kill some whitespace 2013-10-23 11:39:07 -06:00
Thomas S Hatch
6d0f212c27 Lint fixes for execution module file.block 2013-10-23 11:38:03 -06:00
Thomas S Hatch
4a988a0522 Lint fixes for file.block 2013-10-23 11:33:59 -06:00
Thomas S Hatch
99dd9a9753 Merge pull request #8048 from regilero/file-blockreplace 
Add salt.states.file.blockreplace to maintain a comment delimited block of text in an unmanaged file
 2013-10-23 10:23:20 -07:00
Thomas S Hatch
6e48e7aeed Merge pull request #8040 from cmartyniuk/develop 
Added detection for upstart on Debian/Raspbian distros
 2013-10-23 10:16:12 -07:00
Joseph Hall
2a88e9519e Merge pull request #8049 from holmboe/hacking-doc 
I always have to look up these :)
 2013-10-23 08:09:20 -07:00
Henrik Holmboe
218b842068 I always have to look up these :) 2013-10-23 17:05:56 +02:00