valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,965 Commits 24 Branches 182 Tags 341 MiB
e75baade0f
Commit Graph

5965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
730a924452 Merge pull request #1759 from herlo/master 
Reworded paragraphs and fixed up some grammar
 2012-08-02 22:04:22 -07:00
Thomas S Hatch
ddca1526e9 Merge pull request #1760 from archtaku/subnetdata 
Add subnet data to network module
 2012-08-02 22:02:54 -07:00
Erik Johnson
ccab296fa7 Add subnet data 
Introduces two new module functions: network.subnets and
network.in_subnet. The former returns a list of subnets to which the
minion belongs, and the latter returns True/False depending on whether
or not the minion belongs to a given subnet. Note that the argument to
netork.in_subnet need not be a subnet from the list provided by
network.subnets.
 2012-08-02 23:32:58 -05:00
Clint Savage
015766d28b reworded paragraphs and fixed up some grammar 2012-08-02 22:04:37 -06:00
Clint Savage
ccbf5ef6b6 Merge branch 'develop' of git://github.com/saltstack/salt 2012-08-02 22:02:31 -06:00
Clint Savage
4fcc3fdc35 added a period as it should have been :( 2012-08-02 20:59:57 -06:00
Thomas S Hatch
8883bb6442 Update man page source 2012-08-02 20:58:52 -06:00
Thomas S Hatch
2e2ce45190 Merge pull request #1757 from alekibango/develop 
salt-key delete-all|-D   doesnt take arguments
 2012-08-02 19:57:09 -07:00
Thomas S Hatch
d5b0c7c821 Merge pull request #1758 from herlo/master 
Fixed up some wording on extend statement
 2012-08-02 19:57:00 -07:00
David Pravec
15d1e382a1 salt-key delete-all|-D doesnt take arguments 
this fixex the man page to be consistent with behaviour of the utility.
 2012-08-03 03:54:21 +02:00
Clint Savage
a791a60de6 hopefully better wording of a very confusing statement 2012-08-02 18:35:18 -06:00
Thomas S Hatch
55816cf628 Merge pull request #1755 from herlo/master 
Missed some additional paths in the documentation
 2012-08-02 16:38:42 -07:00
Clint Savage
db3ed4e72d fixed another set of paths in documentation 2012-08-02 17:35:29 -06:00
Thomas S Hatch
ca791be569 Merge pull request #1754 from herlo/master 
New spec and fixup some documentation
 2012-08-02 16:34:12 -07:00
Clint Savage
4b06beae7e paths were inconsistent and really shouldn't appear as though they are in / 2012-08-02 17:30:25 -06:00
Clint Savage
70bd540acb Merge branch 'develop' of git://github.com/saltstack/salt 2012-08-02 17:25:08 -06:00
Thomas S Hatch
6ff63ea321 Finish Fix #1753 2012-08-02 16:18:24 -06:00
Thomas S Hatch
e2c70cdd36 Fix module inline autoreloading 2012-08-02 16:09:21 -06:00
Clint Savage
2b010adb3d repackage with patch to fix #1730 2012-08-02 11:20:11 -06:00
Thomas S Hatch
42afa2becf Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-02 09:57:01 -06:00
Thomas S Hatch
bc938cd471 glob.glob returns a full path 2012-08-02 09:56:30 -06:00
Clint Savage
034d2793ef Merge branch 'develop' of git://github.com/saltstack/salt 2012-08-02 09:51:18 -06:00
Clint Savage
0c6756af1a Merge branch 'master' of git://github.com/saltstack/salt 2012-08-02 09:50:50 -06:00
Clint Savage
aca084a0ac moved RPM to 0.10.2 2012-08-02 09:45:24 -06:00
Thomas S Hatch
fdc975feef Merge pull request #1752 from skreutzberger/patch-2 
Hardened __grant_generate
 2012-08-02 08:24:22 -07:00
Thomas S Hatch
8a200ebc31 Merge pull request #1751 from imankulov/bugfixes 
Minor bugfixes
 2012-08-02 08:22:22 -07:00
Sebastian Kreutzberger
0eb411a4e5 Hardened __grant_generate 
Grants are now correctly recognized as existing even if they have one or more spaces after the comma.
 2012-08-02 16:16:20 +03:00
Roman Imankulov
3ae22e81d1 Fix attempt to use undefined variable in module.run 2012-08-02 16:02:53 +06:00
Roman Imankulov
492a427a2f Add lost "superuser" option to postgres_user.present 2012-08-02 15:53:06 +06:00
Thomas S Hatch
c32a1d2d83 Merge pull request #1750 from johnthedebs/develop 
Fix 'user' setting for cmd.script state
 2012-08-01 20:08:55 -07:00
John Debs
893fd8e0cf Fix 'user' setting for cmd.script state 2012-08-01 23:04:40 -04:00
Thomas S Hatch
f2ec1d1f16 Merge pull request #1748 from johnthedebs/develop 
Fix TypeError in cmd.script state when 'onlyif' or 'unless' are defined
 2012-08-01 16:48:43 -07:00
John Debs
cc849ff862 Fix TypeError in cmd.script state when 'onlyif' or 'unless' are defined 2012-08-01 19:39:31 -04:00
Thomas S Hatch
e390b0fd24 Merge pull request #1746 from s0undt3ch/master 
Removed the pip module integration tests
 2012-08-01 15:19:06 -07:00
Pedro Algarvio
6d3028f3da Removed the pip module integration tests since it's also being tested in the virtualenv's integration tests. 2012-08-01 23:11:48 +01:00
Thomas S Hatch
815582aff2 Merge pull request #1745 from s0undt3ch/master 
Fix `pip.freeze` which require an active virtualenv.
 2012-08-01 14:48:43 -07:00
Pedro Algarvio
963f28b586 Merge branch 'develop' of git://github.com/saltstack/salt 2012-08-01 22:45:12 +01:00
Pedro Algarvio
e57f505a2d Fix pip.freeze tests which require an active virtualenv. 2012-08-01 22:40:15 +01:00
Thomas S Hatch
e73929a74b Merge pull request #1744 from drawks/develop 
Added 0.10.2 entry to debian/changelog per issue 1743
 2012-08-01 13:59:44 -07:00
Dave Rawks
14d29578dd Added 0.10.2 entry to debian/changelog per issue 1743 2012-08-01 13:38:09 -07:00
Thomas S Hatch
5af6234f5c Merge pull request #1741 from s0undt3ch/master 
Fix `integration/modules/file.py`
 2012-08-01 11:40:42 -07:00
Pedro Algarvio
97a4c1dde2 Fix integration/modules/file.py 
Since the tests are comparing results, switch to `assertEqual`'s.
 2012-08-01 19:36:49 +01:00
Pedro Algarvio
842036b136 Minor cosmetic change while running tests. 
Make the salt's printed `~~` lines match the length of the `--` printed lines from unittest.
 2012-08-01 19:07:56 +01:00
Thomas S Hatch
e52a55ad90 Merge pull request #1740 from s0undt3ch/master 
Fix virtualenv integration tests.
 2012-08-01 11:01:27 -07:00
Pedro Algarvio
7148735b12 Fix virtualenv integration tests. 
The virtualenv module needs to have a default for `venv_bin`.
 2012-08-01 18:57:31 +01:00
Thomas S Hatch
3f19c00c00 Merge pull request #1739 from s0undt3ch/master 
Fix `test_inodeusage`
 2012-08-01 10:44:30 -07:00
Pedro Algarvio
051fdc4dce Fix test_inodeusage 
Only concatenate arguments to command if any arguments are actually passed.
 2012-08-01 18:41:52 +01:00
Thomas S Hatch
80e23fb08f Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-01 11:12:08 -06:00
Thomas S Hatch
b9c2d913b6 Add a ref to compount targets 2012-08-01 11:11:40 -06:00
Thomas S Hatch
7157fe6002 Merge pull request #1736 from skreutzberger/patch-1 
Update salt/modules/mysql.py
 2012-08-01 07:39:40 -07:00