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
29,797 Commits 24 Branches 182 Tags 341 MiB
6ce4b953eb
Commit Graph

29797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
ccc229a9b8 Add delimiter override for {grains,pillar}.get 
Resolves #12300
 2014-04-28 14:57:44 -05:00
Thomas S Hatch
efa7d23781 maint process is still buggy - needs more love 2014-04-28 13:21:32 -06:00
Joseph Hall
2489780dda Merge pull request #12345 from cachedout/highstate_profile 
Basic profiling information on highstates.
 2014-04-28 12:53:35 -06:00
Mike Place
cae9fd7f81 Basic profiling information on highstates. 2014-04-28 12:31:55 -06:00
Samuel Smith
1aa4bac8eb Merge pull request #12344 from SmithSamuelM/sam_raet_38 
Minor cleanup
 2014-04-28 12:10:14 -06:00
Samuel M Smith
578ff73ee4 Merge remote-tracking branch 'upstream/develop' into sam_raet_38 2014-04-28 12:04:16 -06:00
Samuel M Smith
7d160db1f8 Minor change to acceptance logic for raet version 2014-04-28 12:02:59 -06:00
Thomas S Hatch
69beb54d30 Lint 2014-04-28 11:07:13 -06:00
Thomas S Hatch
ac16d9a1f0 Merge pull request #12325 from baconz/develop 
Add a first pass at a gpg renderer
 2014-04-28 10:42:59 -06:00
Thomas S Hatch
bf4cb3cd75 Merge pull request #12039 from ranl/winrepo_state 
winrepo state
 2014-04-28 10:18:26 -06:00
Thomas S Hatch
d93f9a725a Merge pull request #12324 from jacksontj/develop 
Misc cleanup
 2014-04-28 10:10:31 -06:00
Thomas S Hatch
9cadc43393 Merge pull request #12304 from AccelerationNet/git-windows 
git module: support windows
 2014-04-28 10:09:10 -06:00
Ryan Davis
588b63882c use explicit boolean in __virtual__ 
Returning a non-boolean value will rename the package
 2014-04-28 09:23:18 -04:00
Joseph Hall
021d3e94fb Merge pull request #12338 from gtmanfred/iptables 
Do closer checks for iptables checking
 2014-04-28 07:12:01 -06:00
Daniel Wallace
441068788e Fix up debian and ubuntu checks 2014-04-28 00:07:37 -05:00
Daniel Wallace
6fab6990b2 Do closer checks for iptables checking 
Ubuntu 10.04 does not have --check and neither does Debian 6.

When in doubt, just do a .find on the command to see if it base --check
in the help list
 2014-04-27 23:43:14 -05:00
Erik Johnson
bfa3413f79 Improved wording for fileserver docs 2014-04-27 15:46:42 -05:00
Pedro Algarvio
02e4a879c9 Use string formatting 2014-04-27 19:16:13 +01:00
Joseph Hall
aeb6070b63 Merge pull request #12329 from codekoala/develop 
Minion-specific etcd pillar values
 2014-04-27 09:20:06 -06:00
Pedro Algarvio
8b11fb1032 Merge pull request #12334 from s0undt3ch/hotfix/jenkins 
Provide a custom keyring just for tests.
 2014-04-27 13:34:43 +01:00
Pedro Algarvio
e31ca389ae Provide a custom keyring just for tests. 
Properly skip tests.
 2014-04-27 13:26:59 +01:00
Pedro Algarvio
f283a1e7d6 Merge pull request #12333 from s0undt3ch/hotfix/jenkins 
Adapt the test to the changes made in 3c284b1b6.
 2014-04-27 12:38:38 +01:00
Pedro Algarvio
18d969a674 Adapt the test to the changes made in 3c284b1b6. 2014-04-27 12:35:07 +01:00
Pedro Algarvio
9337a4e7fc Merge pull request #12330 from s0undt3ch/develop 
Bootstrap Script Updates
 2014-04-27 11:48:47 +01:00
Pedro Algarvio
23b12283fb Update the bootstrap script tutorial doc to latest from the project. 
Also ignore the bootstrap script HTTPS URL.
 2014-04-27 11:48:17 +01:00
Pedro Algarvio
a99bb566b9 Use the proper HTTPS URL for the bootstrap script. 
Closes #12328
 2014-04-27 11:48:17 +01:00
Pedro Algarvio
b288ccdbb0 Merge pull request #12332 from s0undt3ch/hotfix/jenkins 
Revert "Default to https instead of http"
 2014-04-27 11:47:33 +01:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http" 
This reverts commit 6fc260be9e.
 2014-04-27 11:46:36 +01:00
Pedro Algarvio
37ebffff7c Merge pull request #12328 from gtmanfred/https 
Default to https instead of http
 2014-04-27 11:45:08 +01:00
Pedro Algarvio
faa4184c6c Merge pull request #12331 from s0undt3ch/hotfix/proper-bootstrap-script-name 
proper bootstrap script name
 2014-04-27 11:41:49 +01:00
Pedro Algarvio
76c9aba4ef Call the right script name. 
Fixes #12320.
Closes #12321.
 2014-04-27 11:41:34 +01:00
Josh VanderLinden
f8db59cd01 Updating docs to be in the third person 2014-04-27 00:45:33 -06:00
Josh VanderLinden
44bdee16de Documenting minion-specific etcd ext_pillar 2014-04-27 00:16:44 -06:00
Josh VanderLinden
470bce8927 Minion-specific etcd values 
This allows you to specify something such as the following in your
master config to get minion-specific values in etcd that may override
shared values.

    local_etcd:
      host: 127.0.0.1
      port: 4001

    ext_pillar:
      - etcd: local_etcd root=/salt-shared
      - etcd: local_etcd root=/salt-private/%(minion_id)s
 2014-04-27 00:10:39 -06:00
Thomas S Hatch
3301b1c468 expose _chroot_exec as run_chroot under cmd exec module 2014-04-26 23:39:28 -06:00
Daniel Wallace
6fc260be9e Default to https instead of http 
For everything that doesn't use python urllib
 2014-04-26 20:20:32 -05:00
Thomas Jackson
202650c6d9 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-04-26 16:34:55 -07:00
Thomas Jackson
75dbbcda55 Cleanup, the return is already a boolean 2014-04-26 14:40:00 -07:00
Thomas Jackson
fd440adc1a No reason for a regex, the intent is to stop publish events calling publish. The regex we had (publish.*) actually checks if publish is in the string, we care if it starts with publish. 2014-04-26 14:37:43 -07:00
Seth Madison
9a91ef099c Add a first pass at a gpg renderer 2014-04-26 17:35:16 -04:00
Thomas Jackson
494f2e3bb4 Remove old comment of code-- we have version control :) 2014-04-26 14:35:06 -07:00
Thomas Jackson
97e56ada15 Misc cleanup 2014-04-26 14:29:34 -07:00
Evan Borgstrom
75564e4c54 PEP8/PEP20: use kwargs.get instead of one line if/else 
I was poking around in the transport code thinking about an idea and
noticed this simplification.
 2014-04-26 14:29:33 -07:00
Erik Johnson
9c43e634b6 Merge pull request #12318 from borgstrom/develop 
PEP8/PEP20: use kwargs.get instead of one line if/else
 2014-04-26 14:40:52 -05:00
Thomas S Hatch
1d3a733d84 Fix networking in lxc 2014-04-26 11:41:12 -06:00
Thomas S Hatch
d81c25acf9 minior style fix 2014-04-26 11:41:12 -06:00
Thomas S Hatch
f6829a881e Merge pull request #12316 from GuillaumeDerval/develop 
RHEL 7 should use the systemd module
 2014-04-26 11:01:27 -06:00
Pedro Algarvio
1f270b7e4b Merge pull request #12319 from bechtoldt/doc_typo 
fix tiny typo in docstring ssh execution module
 2014-04-26 16:00:01 +01:00
Arnold Bechtoldt
61a1542582 fix tiny typo in docstring ssh execution module 2014-04-26 16:16:56 +02:00
Evan Borgstrom
bbe38a627d PEP8/PEP20: use kwargs.get instead of one line if/else 
I was poking around in the transport code thinking about an idea and
noticed this simplification.
 2014-04-26 09:53:33 -04:00