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
44,652 Commits 24 Branches 182 Tags 341 MiB
e354b69391
Commit Graph

44652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e354b69391 Merge pull request #19693 from cachedout/transport_fix 
Fix up transport __init__
 2015-01-13 12:10:15 -07:00
Mike Place
5c8c7da49d Merge pull request #19696 from cachedout/lint 
More linting
 2015-01-13 11:16:23 -07:00
Mike Place
845271d31c More linting 2015-01-13 11:15:45 -07:00
Mike Place
e04952b58e Merge pull request #19695 from cachedout/more_gitignore 
Ignore some auto-generated files in test dir
 2015-01-13 11:03:25 -07:00
Mike Place
8e504f09d1 Ignore some auto-generated files in test dir 2015-01-13 11:02:52 -07:00
Mike Place
40bc220f1b Fix up transport __init__ 
Fixed style errors, incorrect overriden argspec and missing function
inherited from abstract.

Also reverted import changes which need to be where they were to allow
raet to operate correctly.
 2015-01-13 10:57:09 -07:00
Thomas S Hatch
231bd75a4e Merge pull request #19688 from rominf/fish-completion 
[fish shell completion] adopt for non-interactive usage (e.g. from scripts)
 2015-01-13 08:30:51 -07:00
Thomas S Hatch
9d377a97da Merge pull request #19687 from techhat/joyent 
Allow joyent api host suffix to be configurable
 2015-01-13 08:30:30 -07:00
Thomas S Hatch
a16824ec48 Merge pull request #19680 from jayeshka/cpan-unit-tests 
adding cpan test case
 2015-01-13 08:26:31 -07:00
Thomas S Hatch
49f98ff858 Merge pull request #19677 from aneeshusa/output-subsystem 
Remove obsolete unreferenced tuple of static outputters.
 2015-01-13 08:25:36 -07:00
Thomas S Hatch
941eff3854 Merge pull request #19675 from nmadhok/patch-1 
Adding missing import so that new caller instance can be instantiated without AttributeError
 2015-01-13 08:21:22 -07:00
Thomas S Hatch
f1391fb8d9 Merge pull request #19667 from cachedout/ssh_tests 
Fix tests
 2015-01-13 08:14:34 -07:00
Thomas S Hatch
9942ca20fb Merge pull request #19615 from h4ck3rm1k3/template_debugging 
template debugging
 2015-01-13 08:07:07 -07:00
Joseph Hall
11d802d873 Allow joyent api host suffix to be configurable 2015-01-13 07:32:02 -07:00
Jayesh
d2a5eda14a resolved pylint error 2015-01-13 17:54:45 +05:30
Jayesh
2aa6479d25 adding cpan test case 2015-01-13 15:56:21 +05:30
Aneesh Agrawal
b828add446 Add blank line to conform with PEP8 (E302). 2015-01-13 01:55:24 -05:00
Aneesh Agrawal
9aa5f2d6d4 Remove obsolete unreferenced tuple of static outputters. 
Completes commit 9f758a8 / follow-up to PR #6608.
 2015-01-13 01:39:18 -05:00
Thomas S Hatch
c368b88963 Merge pull request #19665 from cachedout/tornado_test_timeout 
Fix tornado tests
 2015-01-12 22:15:03 -07:00
Nitin Madhok
94e1d5ff08 Adding missing import causing new caller instance from being instantiated. Fixes #19674 2015-01-13 00:00:33 -05:00
Mike Place
fc9a647a3b Remove assert: 2015-01-12 18:53:56 -07:00
James Michael DuPont
182665e635 removing prints 2015-01-12 19:23:33 -06:00
Mike Place
cba0d6d597 Fix tests 2015-01-12 16:01:10 -07:00
Mike Place
74501f56ae Fix tornado tests 
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
 2015-01-12 15:36:34 -07:00
Thomas S Hatch
cb5103bff0 get rid of assert 2015-01-12 14:48:23 -07:00
Thomas S Hatch
6f552fd6a7 Merge pull request #19641 from aurynn/fire_master 
Adds fire_master to the Salt Event library, for use in 3rd-party code.
 2015-01-12 14:42:16 -07:00
Thomas S Hatch
29a23046c8 Merge pull request #19655 from s0undt3ch/develop 
Fix requirements files paths
 2015-01-12 14:00:31 -07:00
Thomas S Hatch
dd070f32ab Merge pull request #19550 from cachedout/issue_8240 
Properly compare ssh keys.
 2015-01-12 13:52:32 -07:00
Thomas S Hatch
5f8e21b7a2 Merge pull request #19614 from h4ck3rm1k3/localtransport 
Localtransport
 2015-01-12 13:35:06 -07:00
Aurynn Shaw
f4b33398e8 Merging to finish rebase of fire_master to tip 2015-01-13 09:32:38 +13:00
Aurynn Shaw
b7ae48642a Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-13 09:29:27 +13:00
Pedro Algarvio
74e513f6f3 Fix requirements files paths 2015-01-12 19:58:09 +00:00
Mike Place
c381f8c326 Properly compare ssh keys. 
Fixers #8240
 2015-01-12 12:07:32 -07:00
Thomas S Hatch
8d45f147bf Merge pull request #19633 from ether42/develop 
lxc module: kwarg shadowing in run_cmd provokes unexpected return value
 2015-01-12 12:04:54 -07:00
Thomas S Hatch
b7899b2935 Merge pull request #19058 from cournape/add_darwin_pkg_support 
Add darwin pkg support
 2015-01-12 11:43:44 -07:00
Thomas S Hatch
2c065ac5b9 Merge pull request #19640 from TronPaul/s3_source_hash 
Add s3 to protocols for remote source_hash
 2015-01-12 11:38:01 -07:00
Thomas S Hatch
41eb958dbf Merge branch 'aurynn-develop' into develop 2015-01-12 11:36:38 -07:00
Thomas S Hatch
bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop 
Conflicts:
	doc/topics/ssh/roster.rst
 2015-01-12 11:36:24 -07:00
Thomas S Hatch
c79871e77d Merge pull request #19637 from s0undt3ch/develop 
Merge branch '2015.2' into develop
 2015-01-12 11:33:14 -07:00
Thomas S Hatch
f7f564e1b1 Merge pull request #19634 from DSRCompany/raet_presence_requests 
Slightly refactored Salt Raet Presenter code
 2015-01-12 11:32:08 -07:00
Thomas S Hatch
7406b778f1 Merge pull request #19253 from jacksontj/runner_event 
Refactor of evented runners (#17283)
 2015-01-12 10:51:16 -07:00
Pedro Algarvio
eeb6dadc21 Merge branch '2015.2' into develop 2015-01-12 17:13:57 +00:00
Pedro Algarvio
229fa20808 Merge branch 'develop' of github.com:saltstack/salt into develop 2015-01-12 17:13:49 +00:00
Pedro Algarvio
0ceda58bd6 Fix mock call. 2015-01-12 16:51:02 +00:00
Thomas S Hatch
2fe1757cb9 Merge pull request #19599 from fayetted/Issue_19598 
Fix ssh_auth test mode, compare lines not just key
 2015-01-12 09:13:23 -07:00
Thomas S Hatch
86a3bf3269 Merge pull request #19429 from lyft/ignore-missing-for-pillars 
Add new ignore_missing option to pillar top
 2015-01-12 09:06:15 -07:00
Aurynn Shaw
1612bc7d5b Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-12 20:04:04 +13:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00:00
Mark McGuire
af4aee8a6b Add s3 to protocols for remote source_hash 2015-01-11 19:11:35 -06:00
Aurynn Shaw
e1dbd4c07e Removes spurious text 2015-01-12 13:55:44 +13:00