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
30,343 Commits 24 Branches 182 Tags 341 MiB
b55afab090
Commit Graph

30343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
fb054029f7 Use the formated version attribute. 2014-05-06 05:41:03 +01:00
Thomas S Hatch
8bf268af76 Merge pull request #12547 from terminalmage/issue12505 
Better documentation for outputters
 2014-05-05 21:47:33 -06:00
Chad Heuschober
e998d5997c Fixes lint error, too many newlines. 2014-05-05 22:41:39 -04:00
Thomas S Hatch
7350a8cb01 Merge pull request #12546 from rallytime/develop 
Added deleted grain functionality to grains states
 2014-05-05 20:38:59 -06:00
Chad Heuschober
6b42010cca Fixes an oversight in the new modules.pillar.get merge parameter that failed to provide adefault when no value was available. 2014-05-05 22:29:16 -04:00
Pedro Algarvio
80f1f6c4b4 Update 'doc/.tx/config' - Build #43 
http://cookingwithsalt.org/job/salt/job/transifex/43/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-05-06 03:00:01 +01:00
mikeslattery
c418d6efea Add svn_pillar - pillars stored in SVN 
A functionally identical port of git_pillar to SVN.  The code is based on git_pillar.py, but with some restructuring and simplification.
 2014-05-05 21:08:40 -04:00
Samuel Smith
f51b1a7280 Merge pull request #12549 from SmithSamuelM/sam_raet_39 
Added unit tests for salting.py SaltRaet and RaetKey
 2014-05-05 17:19:16 -06:00
Samuel M Smith
780a501e13 Merge remote-tracking branch 'upstream/develop' into sam_raet_39 2014-05-05 17:17:10 -06:00
Samuel M Smith
50cc7a00a4 updated test to bootstrap with SaltSafe 2014-05-05 17:14:23 -06:00
Pedro Algarvio
7650a7c9b1 Revert "Include version codename in the generated version string." 
This reverts commit 98b52748f8.
 2014-05-06 00:00:52 +01:00
Pedro Algarvio
8f186a2034 Revert "We can remote this logic since string now include the codename." 
This reverts commit 87a3f8f234.
 2014-05-06 00:00:20 +01:00
Samuel M Smith
20f0a2874a fixed bug in how SaltSafe loads remote safe data 2014-05-05 16:52:26 -06:00
Erik Johnson
b3e42245f6 Better documentation for outputters 2014-05-05 17:50:47 -05:00
Thomas S Hatch
2bcad0c037 iAdd initial mod_aggregate docs 2014-05-05 16:23:09 -06:00
Thomas S Hatch
0606f4b78c initial docs for the mod_aggregate system 2014-05-05 16:00:17 -06:00
Thomas S Hatch
e47bb32a9d Add function awareness to pkg mod_aggregate 2014-05-05 15:10:39 -06:00
Thomas S Hatch
2bbc2ddc94 Add initial mod_aggregate to pkg 
This commit is the first trial of the new mod_aggregate system and
is still subject to heavy change (unless I got it right the first time)
 2014-05-05 15:01:37 -06:00
Thomas S Hatch
8d693dea33 Make mod_aggregate more flexible to configure 2014-05-05 15:01:37 -06:00
Samuel M Smith
f1a0e41a13 Updated init and test 2014-05-05 14:32:50 -06:00
rallytime
4873c9736c Added deleted grain functionality to grains states 2014-05-05 14:18:51 -06:00
Thomas S Hatch
e20593a455 Merge pull request #12543 from cachedout/11877 
11877
 2014-05-05 13:52:55 -06:00
Colton Myers
914d08ba8d Merge pull request #1 from terminalmage/relnotes-2014.1.4 
Formatting enhancements to 2014.1.4 release notes
 2014-05-05 13:10:43 -06:00
Samuel M Smith
227ffcc412 Enable temporary write permission so can update keys on write_local 2014-05-05 13:10:33 -06:00
Erik Johnson
e2ac8dbe7c Formatting enhancements to 2014.1.4 release notes 2014-05-05 13:47:55 -05:00
Erik Johnson
e11f1e4564 remove errexit 2014-05-05 13:40:19 -05:00
Niels Abspoel
98d32aa37e updated suse spec file for 2014.1.4 2014-05-05 20:39:19 +02:00
Colton Myers
9dfa136a3e Add missing release note 2014-05-05 10:55:21 -06:00
Colton Myers
db271990d2 Update docs version to 2014.1.4 2014-05-05 10:49:37 -06:00
Colton Myers
19f39161fe Add 2014.1.4 release notes 2014-05-05 10:49:00 -06:00
Samuel M Smith
1dc254cc1e Updated tests 2014-05-05 10:46:52 -06:00
Thomas S Hatch
203a09a6d4 clean up mod_aggregate into a seperate method 
also change it to use config.option
 2014-05-05 10:45:43 -06:00
Mike Place
efe6ea345c Pylint 2014-05-05 10:43:42 -06:00
Colton Myers
87b277f349 Merge pull request #12532 from steverweber/fix_minion_id 
fix minion id generation
 2014-05-05 10:31:01 -06:00
Mike Place
867e0c0ff7 Typo 2014-05-05 10:19:50 -06:00
Mike Place
989a0f80cf Additional detection for OpenVZ systems. 
Refs #11877

Conflicts:
	salt/grains/core.py
 2014-05-05 09:59:51 -06:00
Thomas S Hatch
5f9fc325c0 Merge pull request #12541 from crook/12192-fix 
fix issue #12192 to return {} or error message
 2014-05-05 09:58:29 -06:00
Thomas S Hatch
a5f72297ae Merge pull request #12536 from driskell/bug/12484_ssh_key_selinux 
Fix #12484 by running restorecon on .ssh and authorized_keys file if they are created by ssh_auth.present state
 2014-05-05 09:57:29 -06:00
Thomas S Hatch
fec5d660ef Merge pull request #12534 from ranl/winrepo_state 
winrepo state - reading master config from file instead of pillar
 2014-05-05 09:55:31 -06:00
Thomas S Hatch
ef463f929f Merge pull request #12533 from lyft/boto_autoscale 
Initial commit of boto_asg module and state
 2014-05-05 09:54:33 -06:00
Thomas S Hatch
2c56b26c02 Merge pull request #12499 from lyft/boto_route53 
Initial commit of boto_route53 module and state
 2014-05-05 09:53:55 -06:00
Thomas S Hatch
945db1cc0d Merge pull request #12529 from garethgreenaway/additions_to_ssh_module 
Additions to ssh module
 2014-05-05 09:52:00 -06:00
Gareth J. Greenaway
42eaf41272 moving duplicate line out of if statement. 2014-05-05 14:22:03 -07:00
Gareth J. Greenaway
cf0f8349e7 fixing a minor lint issue 2014-05-05 14:18:44 -07:00
Gareth J. Greenaway
ad3f385600 adding the ability to specify the ssh key instead of a fingerprint when adding to known_hosts. Does not require connecting to host to gather key information 2014-05-05 14:14:48 -07:00
Thomas S Hatch
3553846648 Merge pull request #12522 from creaky/issue12422 
Fix Issue: #12422 blockreplace adding blank lines
 2014-05-05 09:45:21 -06:00
Thomas S Hatch
46d2a28867 Merge pull request #12521 from allanparsons/supervisord 
Supervisord
 2014-05-05 09:44:21 -06:00
Thomas S Hatch
ff6942d40e Merge pull request #12516 from crook/12192-fix 
fix issue #12192 to return error message if show_image hit error
 2014-05-05 09:42:41 -06:00
Ray Chen
3df58744c0 fix issue #12192 to return {} or error message 2014-05-05 23:42:09 +08:00
Driskell
add29d8c2a Fix #12484 by running restorecon on .ssh and authorized_keys file if they are created by ssh_auth.present state 2014-05-05 10:19:18 +01:00