valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,107 Commits 24 Branches 182 Tags 341 MiB
82087e772f
Commit Graph

28107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
82087e772f Added vector versions of the latest Salt logo 2014-03-21 13:51:53 -06:00
Seth House
0b92ae7452 Removed old/unused icons 2014-03-21 13:51:53 -06:00
Seth House
89b6a322fc Removed old versions of the Salt logo 2014-03-21 13:51:53 -06:00
Seth House
6e1bb4bdf0 Remove unused html_logo setting 2014-03-21 13:51:53 -06:00
Joseph Hall
52192cf4cf Merge pull request #11418 from gtmanfred/apache 
Switch apache module to using salt.utils.fopen
 2014-03-21 13:39:54 -06:00
Daniel Wallace
8a61462d1b Switch apache module to using salt.utils.fopen 2014-03-21 14:36:41 -05:00
Pedro Algarvio
bbaa715661 Merge pull request #11416 from s0undt3ch/develop 
Remove unused import
 2014-03-21 18:46:08 +00:00
Thomas S Hatch
6dd2350c12 Ignore because it is a function pass-through 2014-03-21 12:45:26 -06:00
Pedro Algarvio
623f04a047 Remove unused import 2014-03-21 18:44:44 +00:00
Thomas S Hatch
d47e3f8a70 clean up unused import 2014-03-21 12:43:58 -06:00
Thomas S Hatch
f9c32c3627 Merge pull request #11414 from rallytime/brew_integration 
Integration tests for brew module
 2014-03-21 12:43:06 -06:00
Thomas S Hatch
43de620730 Merge pull request #11413 from s0undt3ch/hotfix/immutable-lists-sum 
Simpler immutable types
 2014-03-21 11:40:09 -06:00
Thomas S Hatch
4aebce6f13 Merge pull request #11409 from alf/develop 
Fix bug in _parse_key
 2014-03-21 11:37:35 -06:00
Thomas S Hatch
e6750a079e Merge pull request #11404 from hvnsweeting/hvn-fix-mount-state 
Hvn fix mount state
 2014-03-21 11:30:30 -06:00
Thomas S Hatch
5bbd59dc6e Merge pull request #11401 from garethgreenaway/develop 
Fixes in the debian_ip module to allow the network.system method to work
 2014-03-21 11:18:08 -06:00
Thomas S Hatch
fa12a4e393 Merge pull request #11399 from makinacorpus/sls 
Do not rely solely on cached filelisting for sls
 2014-03-21 11:10:04 -06:00
Thomas S Hatch
baf37883ab Merge pull request #11397 from basepi/cmdscript11189 
Update error message for `cmd.script` on cache fail to use saltenv
 2014-03-21 11:03:34 -06:00
Thomas S Hatch
39d77b52b6 Speed things up a bit 2014-03-21 10:56:06 -06:00
Thomas S Hatch
7b48481c89 Merge pull request #11396 from kev009/get_fqhostname 
Replace socket.getfqdn with internal salt.utils.network.get_fqhostname
 2014-03-21 10:54:56 -06:00
rallytime
1c26ce3845 Integration tests for brew module 2014-03-21 10:52:51 -06:00
Thomas S Hatch
b3320f9fe4 Merge pull request #11395 from cheuschober/add-pillar-get-merge 
Add pillar get merge
 2014-03-21 10:44:27 -06:00
Thomas S Hatch
e5bc3ccb2b Merge branch 'fix-mod_repo-saltenv' of git://github.com/bbinet/salt into bbinet-fix-mod_repo-saltenv 
Conflicts:
	salt/states/pkgrepo.py
 2014-03-21 10:41:20 -06:00
Thomas S Hatch
4681b30224 Merge pull request #11370 from makinacorpus/hfix5 
state.saltmod: kwarg support
 2014-03-21 10:29:04 -06:00
Joseph Hall
c0ae8b4493 Merge pull request #11400 from bretep/add-salt-cloud-to-debian 
Add salt-cloud to debian packaging
 2014-03-21 09:59:32 -06:00
Joseph Hall
97d2676de8 Merge pull request #11412 from pzbitskiy/softlayer-windows 
Improve Windows support for SoftLayer
 2014-03-21 09:58:36 -06:00
Thomas S Hatch
65668d073c Merge pull request #11410 from s0undt3ch/hotfix/kwarg-parsing 
Some more fixes to CLI kwarg paring and it's tests
 2014-03-21 09:46:03 -06:00
Thomas S Hatch
fc2c1a1860 Bah! Args! 2014-03-21 09:45:23 -06:00
Thomas S Hatch
6fb72fb633 lint fixes 2014-03-21 09:38:02 -06:00
Pavel Zbitskiy
e5c4a91ef7 Improve Windows support for SoftLayer 
* Determine username and password and
  use them as a default
* Do not connect to Windows to 22/TCP and
  use 445/TCP (Windows DS) instead
  This is based on windows config option
  or win_installer option
 2014-03-21 19:25:14 +04:00
Pedro Algarvio
40807dbdf9 Call super() instead. 
Why wasn't super being called?
 2014-03-21 15:09:12 +00:00
Pedro Algarvio
e564bb252b Improve mode management. Specifically, unquote it. 2014-03-21 13:10:41 +00:00
Pedro Algarvio
5fa42543e3 Fix reference and allow standalone test excution. 2014-03-21 12:51:42 +00:00
Pedro Algarvio
f38b18ce7d Fix reference. 2014-03-21 12:48:06 +00:00
Pedro Algarvio
1825dfe635 Also test slicing 2014-03-21 12:45:54 +00:00
Alf Lervåg
fdd87b8142 Fix bug in _parse_key 
According to the documentation, we should have double backslashes between the path segments in the key, however _parse_key split and joined on a single backslash which caused the resulting path to start and end with a backslash.
 2014-03-21 13:09:53 +01:00
Gareth J. Greenaway
ea385be702 Fixes in the debian_ip module to allow the network.system method to work as expected on Debian based systems. Gateway in that section is still ignored and should be put in the interface definition. 2014-03-20 22:54:52 -07:00
Bret Palsson
0c35f5f69c
ibmsce was removed, removing from doc config 2014-03-21 05:00:23 +00:00
Bret Palsson
38d5a5cb85
Add salt-cloud to debian packaging 2014-03-21 04:59:50 +00:00
hvnsweeting
7f578fc440 BUGFIX: allow "/" as name 2014-03-21 04:32:42 +00:00
hvnsweeting
ff3fd161df pythonic 2014-03-21 04:30:10 +00:00
hvnsweeting
24507feb00 remove obsolete document 2014-03-21 04:21:44 +00:00
Thomas S Hatch
ed9e174339 Merge pull request #11369 from makinacorpus/hfix3 
Improvment to salt.utils.cmd:
 2014-03-20 22:03:11 -06:00
Thomas S Hatch
415ed42c0c Merge branch 'cli-arg-parse-refactor' of git://github.com/terminalmage/salt into terminalmage-cli-arg-parse-refactor 
Conflicts:
	salt/client/ssh/__init__.py
 2014-03-20 21:59:52 -06:00
Joseph Hall
db8c96edaf Merge pull request #11393 from CaptTofu/hpcloud 
Added code to better handle floating IPs, pep8/pyflakes cleanup
 2014-03-20 21:12:23 -06:00
Kevin Bowling
d882014a41 Lint fixes 2014-03-20 19:39:16 -07:00
Pedro Algarvio
6314d755aa Merge pull request #11398 from terminalmage/replace-basestring 
Replace instances of "basestring" with salt._compat.string_types
 2014-03-21 01:00:13 +00:00
Mathieu Le Marec - Pasquet
9367551deb Do not rely solely on cached filelisting for sls 2014-03-21 01:10:15 +01:00
Pedro Algarvio
49bdbefb66 No more proxied immutables. Add test for nested immutables. 2014-03-20 23:59:38 +00:00
Erik Johnson
2608f8a44b update basestring -> string_types 2014-03-20 18:51:52 -05:00
Erik Johnson
af5b2385f5 update basestring -> string_types 2014-03-20 18:51:52 -05:00