Commit Graph

38026 Commits

Author SHA1 Message Date
David Boucha
8464201a71 add links to Windows 2014.1.11 installers 2014-10-07 11:52:53 -06: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
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
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
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
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
Steve Weber
54b9aedbf7 ipython log to look for 2014-10-06 12:54:36 -04:00
Mike Place
eacd3746f2 Revert cmdmod from utils 2014-10-06 10:51:20 -06:00
Mike Place
c319461c60 Revert cmdmod refactor 2014-10-06 10:50:58 -06:00
Mike Place
4ecacb166b Revert cmdmod refactor 2014-10-06 10:46:12 -06:00
Thomas S Hatch
52d4fbad1f Merge pull request #16391 from juiceinc/2014.7
Cherry-pick masterless doc clarifications for 2014.7
2014-10-06 10:35:05 -06:00
Thomas S Hatch
8e35c6d0ff Merge pull request #16389 from JensRantil/fix-client-acl-doc
Fix incorrect client ACL documentation
2014-10-06 10:34:44 -06:00
Thomas S Hatch
78887113b2 Merge pull request #16388 from odin793/develop
fixed bug with outputting unicode text in state's result summary
2014-10-06 10:33:57 -06:00
Thomas S Hatch
1c7b437a4a Merge pull request #16387 from terminalmage/bp-16386
Backport #16386 to 2014.7
2014-10-06 10:32:28 -06:00
Thomas S Hatch
df0536d131 Merge pull request #16385 from Akilesh1597/develop
create new file if not already present
2014-10-06 10:31:00 -06:00
Thomas S Hatch
c364345560 Merge pull request #16375 from bechtoldt/debian_ip_whitespacing
fixing whitespacing bug in a debian_ip template
2014-10-06 10:26:03 -06:00
Thomas S Hatch
38da77976c Merge pull request #16368 from Supermathie/16366
documentation: add salt/ event prefix and explain how to get event tag while listening for events
2014-10-06 10:21:00 -06:00
Thomas S Hatch
2551ea2c56 Merge pull request #16359 from whiteinge/rest_cherrypy-expire-response
Add a setting to prevent CherryPy from expiring HTTP responses
2014-10-06 10:19:22 -06:00
Thomas S Hatch
74bc3b8796 Merge pull request #16095 from thedrow/feature/vpc
[WIP] AWS VPC module improvements
2014-10-06 10:12:07 -06:00
Mike Place
e0d5bbda57 Merge branch 'develop' into develop_housekeeping 2014-10-06 09:56:19 -06:00
Joseph Hall
47b8cb5359 Merge pull request #16390 from angystardust/develop
Fix inconsistency in linux_acl.py examples
2014-10-06 08:09:41 -06:00