Thomas S Hatch
|
d0c1fedcbf
|
Merge pull request #14313 from thatch45/2014.7
Backport #14279
|
2014-07-17 13:25:06 -06:00 |
|
Thomas S Hatch
|
242c077e2c
|
Merge branch 'bp-14279' into 2014.7
|
2014-07-17 13:24:18 -06:00 |
|
Elias Probst
|
b240a09b9c
|
Make it more clear what the contents_newline option does.
The current description didn't make it really clear whether
this option is there to preserve newlines in content or just
ensures a final newline.
|
2014-07-17 13:23:58 -06:00 |
|
Thomas S Hatch
|
a4cb3a1f45
|
Merge pull request #14312 from thatch45/2014.7
backport #14274
|
2014-07-17 13:21:18 -06:00 |
|
Thomas S Hatch
|
eb87333fa7
|
Merge branch 'bp-14274' into 2014.7
|
2014-07-17 13:18:59 -06:00 |
|
Michael Birtwell
|
dd8f9da26a
|
Add support for state.top function to salt.state state
|
2014-07-17 13:18:29 -06:00 |
|
Thomas S Hatch
|
9a4a3e8391
|
Merge pull request #14310 from thatch45/2014.7
backport #14260
|
2014-07-17 13:01:42 -06:00 |
|
Thomas S Hatch
|
97ee5640e6
|
Merge branch 'bp-14260' into 2014.7
|
2014-07-17 12:59:28 -06:00 |
|
Colin Johnson
|
00495de1bb
|
LYFT-14491 - resolve issue with boto_asg.exists
|
2014-07-17 12:58:58 -06:00 |
|
Thomas S Hatch
|
9ce1ce1694
|
Merge pull request #14291 from cachedout/parse_input_newline
More aggressive newline catch in args parsing
|
2014-07-17 12:18:13 -06:00 |
|
Mike Place
|
7c603224cc
|
More aggressive newline catch in args parsing
|
2014-07-16 16:10:04 -06:00 |
|
Erik Johnson
|
62d64daf1c
|
Merge pull request #14289 from cachedout/tls_doc
Docs for tls module.
|
2014-07-16 17:03:50 -05:00 |
|
Mike Place
|
1e77cea548
|
Docs for tls module.
|
2014-07-16 15:03:29 -06:00 |
|
Thomas S Hatch
|
7b1e3357a9
|
Merge pull request #14285 from cachedout/raet_pillar
Don't refresh a pillar to None
|
2014-07-16 13:55:47 -06:00 |
|
Mike Place
|
b04e2e33a9
|
Don't refresh a pillar to None
|
2014-07-16 13:26:11 -06:00 |
|
Colton Myers
|
c4672a43c0
|
Merge branch '2014.7' into develop
|
2014-07-16 11:45:13 -06:00 |
|
Colton Myers
|
11bfbd7a85
|
Merge pull request #14272 from rallytime/deprecate_check_dns
Deprecate check_dns
|
2014-07-16 11:44:32 -06:00 |
|
Thomas S Hatch
|
3c6a075033
|
lint
|
2014-07-16 10:21:59 -06:00 |
|
Joseph Hall
|
a39ac5296e
|
Merge pull request #14278 from rallytime/pylint_fix
Fix pylint errors
|
2014-07-16 10:05:20 -06:00 |
|
rallytime
|
d95281c876
|
Fix pylint errors
|
2014-07-16 10:02:26 -06:00 |
|
Colton Myers
|
73acf47805
|
Merge branch '2014.7' into develop
|
2014-07-16 09:31:58 -06:00 |
|
Pedro Algarvio
|
b504f90295
|
Merge pull request #14271 from rallytime/deprecate_no_site_packages
Remove remaining references and tests to no_site_packages
|
2014-07-16 14:05:41 +01:00 |
|
rallytime
|
dfb8894e6a
|
Remove unused imports
|
2014-07-16 06:41:28 -06:00 |
|
rallytime
|
26ab89e8ac
|
Add deprecated check_dns notice to release notes
|
2014-07-16 06:29:14 -06:00 |
|
rallytime
|
6733f45924
|
Removed deprecated references to check_dns
|
2014-07-16 06:26:08 -06:00 |
|
rallytime
|
1c3737a883
|
Remove remaining references and tests to no_site_packages
|
2014-07-16 06:00:08 -06:00 |
|
Erik Johnson
|
c213bf8398
|
Merge pull request #14259 from rallytime/remove_dep_warnings
Removed no_site_packages as it has been deprecated
|
2014-07-15 20:15:31 -05:00 |
|
Pedro Algarvio
|
e0fc7ad2ee
|
Merge pull request #14264 from rallytime/helium_to_num
Change "Helium" to 2014.7.0 for all versionadded sections
|
2014-07-16 02:15:13 +01:00 |
|
Samuel Smith
|
19f1cc6304
|
Merge pull request #14265 from SmithSamuelM/sam_raet_51
Fixed RaetKey.check_minion_cache to work with latest Road Keep files Added test
|
2014-07-15 19:12:36 -06:00 |
|
Samuel M Smith
|
1393a4b74e
|
Fixed RaetKey.check_minion_cache to work with latest Road Keep files
Added test
|
2014-07-15 19:10:33 -06:00 |
|
rallytime
|
2268b0c654
|
Changed versionadded for modules
|
2014-07-15 18:43:24 -06:00 |
|
rallytime
|
e748efe13a
|
Changed versionadded for client, fileserver, netapi, and pillar files
|
2014-07-15 18:26:04 -06:00 |
|
rallytime
|
4d329296b0
|
Remove unused import
|
2014-07-15 18:15:58 -06:00 |
|
Samuel M Smith
|
4f834c5cf8
|
Merge remote-tracking branch 'upstream/develop' into sam_raet_51
|
2014-07-15 17:42:22 -06:00 |
|
rallytime
|
534f3df900
|
Remove test for no_site_packages deprecation
|
2014-07-15 17:28:40 -06:00 |
|
rallytime
|
d4a322255f
|
Changed versionadded in states
|
2014-07-15 17:24:44 -06:00 |
|
rallytime
|
ec963ac596
|
Change versionadded in runners, renderers, queues, utils
|
2014-07-15 17:12:19 -06:00 |
|
rallytime
|
af64d073da
|
Change Helium to 2014.7.0 in cloud files
|
2014-07-15 17:05:22 -06:00 |
|
Samuel M Smith
|
f463945411
|
Added support for raet new store remotes by name feature
|
2014-07-15 17:04:32 -06:00 |
|
rallytime
|
8dcedf684d
|
Change more affected docs from Helium to 2014.7.0
|
2014-07-15 17:02:19 -06:00 |
|
rallytime
|
a8cd830d52
|
Change "Helium" to 2014.7.0 in affected docs
|
2014-07-15 16:53:29 -06:00 |
|
rallytime
|
b1acf66703
|
Removed no_site_packages as it has been deprecated
|
2014-07-15 16:34:52 -06:00 |
|
Colton Myers
|
146930e021
|
Bump version to 2014.7.0
|
2014-07-15 15:41:19 -06:00 |
|
Nicole Thomas
|
6254216462
|
Merge pull request #14254 from rallytime/whitespace
Remove trailing whitespace
|
2014-07-15 15:12:43 -06:00 |
|
rallytime
|
d761254782
|
Remove trailing whitespace
|
2014-07-15 15:12:07 -06:00 |
|
Thomas S Hatch
|
6abccbc0cf
|
fix this better, don't use clean_proc from master.py.
|
2014-07-15 15:06:15 -06:00 |
|
Thomas S Hatch
|
b9421f7c8d
|
Allow raet libs to safely import salt.master
|
2014-07-15 15:04:10 -06:00 |
|
Thomas S Hatch
|
aa9a400ff2
|
Merge pull request #14198 from mgwilliams/lxc-keep-http-proxy
modules.lxc: keep http proxy for bootstrap
|
2014-07-15 15:02:13 -06:00 |
|
Mike Place
|
6b572eaa4b
|
Merge pull request #14253 from pass-by-value/matcher_test_raet_compat
Matcher test raet compat
|
2014-07-15 14:53:57 -06:00 |
|
Aditya Kulkarni
|
615e0b7550
|
Add timeouts to wait longer
|
2014-07-15 16:50:32 -04:00 |
|