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
35,576 Commits 24 Branches 182 Tags 341 MiB
84da7fd57e
Commit Graph

35576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
84da7fd57e Merge pull request #15056 from dmyerscough/fix-ssh-timeout 
Fix #14981 ssh timeout
 2014-08-19 16:27:23 -06:00
Nicole Thomas
31c5fc71e3 Merge pull request #15089 from cachedout/lxc_test_fix 
Fix exception inside lxc
 2014-08-19 16:19:42 -06:00
Mike Place
9f55ea668d Merge pull request #15092 from cachedout/dockerlint 
Lint fix
 2014-08-19 15:48:45 -06:00
Mike Place
4c531fe968 Lint fix 2014-08-19 15:48:17 -06:00
Thomas S Hatch
ed2b459d40 Merge pull request #15090 from thatch45/develop 
Merge #15054 with fixes
 2014-08-19 15:29:53 -06:00
Thomas S Hatch
5607771102 Merge pull request #15039 from mikelodder7/develop 
Add feature execution module dockerio load/save, state dockerio.loaded
 2014-08-19 15:20:48 -06:00
Thomas S Hatch
1a5b8b83d2 Merge branch 'imtx-file_tree-for-develop' into develop 2014-08-19 15:19:17 -06:00
Thomas S Hatch
4e754b5ffc copy-edit the doc and use single quotes 2014-08-19 15:18:47 -06:00
Thomas S Hatch
fcb61fcfc6 Merge branch 'file_tree-for-develop' of https://github.com/imtx/salt into imtx-file_tree-for-develop 2014-08-19 15:07:53 -06:00
Thomas S Hatch
7c9684139b Merge pull request #15036 from danielfrg/patch-2 
Add no_use_wheel option to pip.install
 2014-08-19 15:04:16 -06:00
Mike Place
4f31e86392 Fix exception inside lxc 2014-08-19 14:53:21 -06:00
mikelodder7
c27d88b541 Update dockerio.py 
Pylint
 2014-08-19 14:50:14 -06:00
mikelodder7
e760799688 Update dockerio.py 
Pylint issue
 2014-08-19 14:47:14 -06:00
Thomas S Hatch
0e868164f0 Merge pull request #15033 from ahammond/support_rhel_ipip 
support IPIP interface type for RedHat linux.
 2014-08-19 14:41:04 -06:00
Thomas S Hatch
28b2070547 Merge pull request #15088 from thatch45/develop 
Merge #15009 with fixes
 2014-08-19 14:40:18 -06:00
Thomas S Hatch
e0df29a02d Merge branch 'pakdel-cloudstack__block_device_mappings' into develop 2014-08-19 14:33:29 -06:00
Thomas S Hatch
0bf2407fe0 Lint 2014-08-19 14:33:12 -06:00
Thomas S Hatch
3e7189ef0e Merge branch 'cloudstack__block_device_mappings' of https://github.com/pakdel/salt into pakdel-cloudstack__block_device_mappings 2014-08-19 14:32:13 -06:00
Nicole Thomas
047a519bb8 Merge pull request #15084 from rallytime/fix_loose_import 
Change LooseVersion import to pass integration.modules.Sysmod tests
 2014-08-19 13:45:54 -06:00
rallytime
630c469a40 Change LooseVersion import to pass integration.modules.Sysmod tests 2014-08-19 13:44:11 -06:00
Joseph Hall
10e4db4ddf Merge pull request #15083 from cachedout/15076 
Doc fix
 2014-08-19 13:27:28 -06:00
Mike Place
8e3b01f17e Merge pull request #15013 from felskrone/add_tcp_dumper_script 
Add tcp dumper script
 2014-08-19 13:26:42 -06:00
Mike Place
05e5ef38b0 Doc fix 
Closes #15076
 2014-08-19 13:21:02 -06:00
Nicole Thomas
37420dfed3 Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures 
Boto vpc boto secgroup resolve unit test failures
 2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664 skip if mock not found 2014-08-19 16:19:41 +00:00
Joseph Hall
a55174afb0 Merge pull request #15075 from hal58th/patch-1 
Schedule documentation update.
 2014-08-19 05:57:16 -06:00
Carl Meyers
7c4ce67d28 Schedule documentation update. 2014-08-18 21:20:54 -07:00
Erik Johnson
5ba675f42b Merge pull request #15073 from godber/develop 
Added an example for using states.git.latest
 2014-08-18 22:12:29 -05:00
Austin Godber
e8e8062616 added example of checking out two branches in the same git repo using the name declaration 2014-08-18 17:28:43 -07:00
Joseph Hall
124519ac57 Merge pull request #15070 from rawkode/bugfix/ec2-bad-identation 
Fixed bad indentation that was causing 'instances_id_list' ...
 2014-08-18 18:10:15 -06:00
David McKay
6c1a237383 Fixed bad identation that was causing 'instances_id_list' must be defined when instance_id is used 2014-08-19 00:01:49 +01:00
Colton Myers
360f08dc57 Merge pull request #15068 from techhat/cmdmod 
Template should default to False, not jinja
 2014-08-18 15:47:18 -06:00
Joseph Hall
6f42e06b6d Maybe it should be None, to match the state 2014-08-18 15:46:09 -06:00
Joseph Hall
ad635235a9 Template should default to False, not jinja 2014-08-18 15:40:21 -06:00
Joseph Hall
5fbc3c2232 Merge pull request #15050 from gtmanfred/develop 
add nics capability to salt-cloud nova driver
 2014-08-18 14:49:16 -06:00
Joseph Hall
813ff5e473 Merge pull request #15059 from gm3dmo/resolving-issue-15058 
Resolving issue 15058 Documentation for etcd returner: my_etd_config: sh...
 2014-08-18 06:47:49 -06:00
David Morris
71cc33555e Resolving issue 15058 Documentation for etcd returner: my_etd_config: should read my_etcd_config 2014-08-18 08:44:52 +01:00
Damian Myerscough
c45a64f87e Remove old commit 2014-08-17 21:49:57 -07:00
Damian Myerscough
3117613bba Fix #14981 Salt SSH timeout issue 2014-08-17 21:46:37 -07:00
Pedro Algarvio
8baf773b78 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-18 05:37:27 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
Pedro Algarvio
3644f4f476 Merge pull request #15046 from sylphid8/patch-1 
correct invalid xmlrpclib auth
 2014-08-18 05:36:15 +01:00
Damian Myerscough
4f10495f65 Fixing #14778 - When mount is True we need to ensure the directory exists 2014-08-17 21:23:01 -07:00
Erik Johnson
ebf23ab3cc Merge pull request #15045 from veidt/develop 
Include dependency required for debconfmod
 2014-08-17 18:31:40 -05:00
IM
89a3d905dc Add file_tree external pillar (should fix #13510). 2014-08-18 01:51:00 +04:00
Joseph Hall
23fbd41a54 Merge pull request #15052 from SaveTheRbtz/cosmetic_fixes 
utils: verify: simplified code
 2014-08-17 05:20:57 -06:00
Alexey Ivanov
dbe6d65825 utils: verify: simplified code 2014-08-16 20:34:22 -07:00
Daniel Wallace
696c5b3732 add a note about networks 2014-08-16 18:21:35 -05:00
Joseph Hall
bbf0705f36 Merge pull request #15048 from wackycaptain/fix-doc-contributing 
Fix broken links in contributing documentation.
 2014-08-16 17:08:42 -06:00
Joseph Hall
de91040730 Merge pull request #15047 from gtmanfred/clean-salt-host 
Clean salt host
 2014-08-16 16:56:49 -06:00