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
38,041 Commits 24 Branches 182 Tags 341 MiB
71f422fd4d
Commit Graph

38041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
71f422fd4d Merge branch '2014.7' into develop 2014-10-07 15:10:40 -06:00
Colton Myers
d37d7ce02e Merge pull request #16447 from basepi/2014.1.11release 
Update docs for 2014.1.11 and 2014.7.0rc3
 2014-10-07 15:10:14 -06:00
Colton Myers
059416e75b Update release candidate installation instructions for rc3 2014-10-07 15:09:16 -06:00
Colton Myers
8133d7d5c6 Update to 2014.1.11 in docs sidebar 2014-10-07 15:08:32 -06:00
Colton Myers
e1d2d7cb6b Update to rc3 in docs sidebar 2014-10-07 15:08:21 -06:00
Joseph Hall
7bb4af29cc Merge pull request #16405 from steverweber/cloud_fix2 
simple data types from dict and list
 2014-10-07 12:42:57 -06:00
Joseph Hall
f34bef5162 Merge pull request #16440 from steverweber/cloud_fixtimeout 
wait for ip gets stuck in vsphere
 2014-10-07 12:36:39 -06:00
Joseph Hall
2ddf866986 Merge pull request #16442 from UtahDave/develop 
add links to Windows 2014.1.11 installers
 2014-10-07 12:34:21 -06:00
David Boucha
8464201a71 add links to Windows 2014.1.11 installers 2014-10-07 11:52:53 -06:00
Steve Weber
7f72098124 formating fix 
formating fix
 2014-10-07 13:33:50 -04:00
Steve Weber
211f43b198 wait for ip gets stuck in vsphere 
the timeout will never return if the function never throws an exception...
the vsphere cloud wait for an ip only returns a bool of false... so it gets stuck in a loop...

might want to do the same update to the other waits...wait_for_port, wait_for_winexesvc..
just to be on safe side.
 2014-10-07 13:14:12 -04:00
Thomas S Hatch
07f924623c Merge pull request #16373 from cachedout/develop_housekeeping 
Develop housekeeping
 2014-10-07 10:24:34 -06:00
Thomas S Hatch
d4eaf2323e Merge pull request #16339 from cachedout/module_fail_reasons 
Module failure reporting
 2014-10-07 10:21:37 -06:00
Thomas S Hatch
9f1a6da2fe Merge pull request #16418 from rallytime/fix_develop_tests 
Fix develop tests
 2014-10-07 10:05:42 -06:00
rallytime
6212cfba12 Fix assertion messages to match and pass tests 2014-10-07 09:36:04 -06:00
Thomas S Hatch
e80d932a4c Merge pull request #16426 from s0undt3ch/backport/16414 
[BP #16441] Make sure that 'requests' is version 1.0.0 or later
 2014-10-07 09:35:47 -06:00
Joseph Hall
88cfe6aefd Merge branch 'ror6ax-scsiadm' into develop 2014-10-07 09:02:54 -06:00
Joseph Hall
e3aa280869 Fix string formatting 2014-10-07 09:02:36 -06:00
Joseph Hall
649c871747 Update formatting to Salt guidelines 2014-10-07 09:01:30 -06:00
Joseph Hall
b9f3bcaff6 Merge branch 'scsiadm' of https://github.com/ror6ax/salt into ror6ax-scsiadm 2014-10-07 08:59:39 -06:00
rallytime
d8e7feafce Clean up last expectedFailure 2014-10-07 08:42:31 -06:00
rallytime
5ff51987b9 Pylint fix 2014-10-07 08:31:42 -06:00
rallytime
868a6e5459 Change expectedFailures to @skipIfs 2014-10-07 08:13:09 -06:00
ror6ax
ebc477586a added rescan all 2014-10-07 13:15:32 +01:00
skyler
7f684ba279 Make sure that 'requests' is version 1.0.0 or later 2014-10-07 09:58:30 +01:00
Pedro Algarvio
a8862411f6 Merge pull request #16414 from skylerberg/specify-requests-version 
Make sure that 'requests' is version 1.0.0 or later
 2014-10-07 09:54:08 +01:00
rallytime
116c29b135 Fix unittest.case import 2014-10-06 21:24:46 -06:00
Erik Johnson
cd1cce3baa Merge pull request #16400 from steverweber/doc_ipython 
ipython log to look for
 2014-10-06 22:07:41 -05:00
rallytime
6a1da81a99 Pylint fix 2014-10-06 20:48:00 -06:00
rallytime
1ab0d7e6fa Add CLI Examples to boto_vpc module 2014-10-06 20:34:40 -06:00
Joseph Hall
d0258b15ab Merge pull request #16415 from holmboe/patch-3 
Fix reST code block
 2014-10-06 18:34:32 -06:00
rallytime
d98bf9fa3d Add docstrings to boto_vpc module 2014-10-06 17:17:53 -06:00
rallytime
274c61b694 Add docstrings to boto_vpc unit tests 2014-10-06 16:52:57 -06:00
Henrik Holmboe
e696c464b6 Fix reST code block 2014-10-07 00:23:44 +02:00
skyler
4b482dd032 Make sure that 'requests' is version 1.0.0 or later 2014-10-06 15:11:44 -07:00
Samuel Smith
0b471c2fa9 Merge pull request #16411 from SmithSamuelM/sam_dev1 
Application kind now correctly set for Raet Road Stacks
 2014-10-06 15:36:01 -06:00
Thomas S Hatch
8556592959 Merge pull request #16404 from techhat/2014.7-pagerduty 
Move PagerDuty to use native API instead of pygerduty
 2014-10-06 15:19:20 -06:00
Samuel M Smith
ccfd3b3e9d Merge remote-tracking branch 'upstream/develop' into sam_dev1 
Conflicts:
	salt/daemons/flo/minion.flo
	salt/daemons/flo/worker.py
	salt/transport/__init__.py
 2014-10-06 15:07:46 -06:00
Samuel M Smith
bd30e21e98 Merge remote-tracking branch 'upstream/2014.7' into sam_dev1 
Conflicts:
	salt/client/raet/__init__.py
	salt/daemons/flo/core.py
	salt/daemons/flo/worker.py
 2014-10-06 15:00:02 -06:00
Samuel M Smith
d0f6a2d120 remove obsolete comment out lines 2014-10-06 14:52:29 -06:00
Samuel M Smith
207a72a739 Removed uid=0 on create of Lane obsolete semantics 2014-10-06 14:29:02 -06:00
Samuel M Smith
40005b93c1 Refactored exchange parameter to msg to be consistent with usage otherwise 2014-10-06 14:21:54 -06:00
Samuel M Smith
25ee897d34 Refactor behavior names in maint.py so be name spaced relative to salt 2014-10-06 14:17:41 -06:00
Samuel M Smith
111c101ff8 Change kind string to kind value 2014-10-06 14:03:34 -06:00
Mike Place
5aa45ca63d Lint fix 2014-10-06 13:50:45 -06:00
Mike Place
f892738207 Fixing failing tests 2014-10-06 12:42:11 -06:00
Steve Weber
3a47208071 simple data types from dict and list 2014-10-06 13:31:18 -04:00
Joseph Hall
e701a552c4 Move PagerDuty to use native API instead of pygerduty 2014-10-06 11:18:35 -06:00
Mike Place
450ffb1c77 Merge branch 'develop' into module_fail_reasons 2014-10-06 11:09:02 -06:00
Thomas S Hatch
69b6a1c313 Merge branch '2014.7' into develop 2014-10-06 11:02:27 -06:00