Commit Graph

64740 Commits

Author SHA1 Message Date
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket
Boto s3 bucket state
2016-01-21 15:52:58 -07:00
Mike Place
8275e72438 Merge pull request #30519 from sjorge/module-system
Solaris-like systems should have a differente system module (#30414)
2016-01-21 15:51:09 -07:00
Mike Place
6bcc4e88a4 Merge pull request #30517 from sjorge/runner-asam
fix #30477 (salt.runners.asam)
2016-01-21 15:49:07 -07:00
Mike Place
b66749b2f6 Merge pull request #30510 from andrew-regan/docker-fix
Fix assignment of virtual_subtype for Docker when systemd is used
2016-01-21 15:48:26 -07:00
Mike Place
79528c59c3 Merge pull request #30522 from terminalmage/fix-worktree-tests
Update git.list_worktree tests to reflect new return data
2016-01-21 15:34:20 -07:00
Colton Myers
f22f5ff851 Fix lint 2016-01-21 15:33:15 -07:00
Colton Myers
7798d42272 Merge pull request #30484 from terminalmage/dnf-yumpkg-2015.5
Backport DNF support to 2015.5 branch
2016-01-21 15:14:46 -07:00
Jorge Schrauwen
0cd1df69c2 forgot to add versionadded 2016-01-21 21:52:02 +00:00
twangboy
6c3047fc55 More descriptive dunder virtual 2016-01-21 14:44:34 -07:00
twangboy
f6b02d5823 Updated docs for apply_config 2016-01-21 14:44:33 -07:00
twangboy
38daa2dc40 renamed function to run_config 2016-01-21 14:44:32 -07:00
twangboy
4531d52464 Documented new functions 2016-01-21 14:44:31 -07:00
twangboy
19f610c580 Added logic to handle both types of config script 2016-01-21 14:44:30 -07:00
twangboy
92f67264db Fixed compile_apply_config 2016-01-21 14:44:30 -07:00
twangboy
b05f91f652 added working directory 2016-01-21 14:44:29 -07:00
twangboy
98a153c94f Fixed warning in dunder virtual 2016-01-21 14:44:28 -07:00
twangboy
4d5c6bec3e Added additional functions for DSC, renamed others 2016-01-21 14:44:27 -07:00
twangboy
4243f5be47 Cache individual file 2016-01-21 14:44:27 -07:00
Colton Myers
3fb61dcda2 Use proper file execution module function 2016-01-21 14:43:24 -07:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
Colton Myers
0fc879ef25 Add missing import 2016-01-21 14:41:17 -07:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    tests/unit/modules/boto_vpc_test.py
2016-01-21 14:37:32 -07:00
Colton Myers
b348f804b1 Merge pull request #30512 from jfindlay/repo_test
disable pkgrepo test for ubuntu 15.10+
2016-01-21 14:32:58 -07:00
Kris Raney
da9964dbaa Clarity achieved. Follow pylint fix recommendation. 2016-01-21 15:26:39 -06:00
Colton Myers
3f886740f4 Add pillar.file_exists execution module function 2016-01-21 14:15:05 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests
These are being added back as unit tests.
2016-01-21 15:13:02 -06:00
Jorge Schrauwen
f1114275b7 salt.module.system for Solaris-like systems 2016-01-21 20:02:07 +00:00
Jorge Schrauwen
980f5274ed might as well fix this doc string while I am here 2016-01-21 19:49:33 +00:00
Jorge Schrauwen
2ad5fc1a75 enable doc generation for solaris_system 2016-01-21 19:40:44 +00:00
Jorge Schrauwen
a6ad1d1cda do not load salt.modules.system on SunOS 2016-01-21 19:36:13 +00:00
Jorge Schrauwen
ec33b69091 fix #30477 by moving class definition inside try-except 2016-01-21 19:32:27 +00:00
Kris Raney
16e8b4f9e3 cut-and-paste error 2016-01-21 13:23:52 -06:00
Kris Raney
2823b2b68e Fix pylint errors. Turns out checking explicitly for OrderedDict is unnecessary anyway. 2016-01-21 13:21:57 -06:00
Mike Place
54e031fda1 Merge pull request #30514 from cachedout/event_local_test_fix
Fix missing key in opts for event tests
2016-01-21 11:07:09 -07:00
Mike Place
0f5baa65ea Fix missing key in opts for event tests 2016-01-21 11:06:03 -07:00
Pedro Algarvio
111f4b144c The ID might not be set on the master 2016-01-21 18:01:06 +00:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
abednarik
4f8de47723 Updated dependencies documentation.
Added tornado and futures in Quick Install and Installing Salt for Development
sections.

Fixes #30467
2016-01-21 14:43:00 -03:00
Andrew Regan
86a9a0f5bd Fix assignment of virtual_subtype for Docker when systemd is used. 2016-01-21 12:42:34 -05:00
Kris Raney
14f7bf693b Pylint fixes 2016-01-21 11:37:43 -06:00
rallytime
d26ed74bde Make sure the correct profile parameters are being checked when cloning 2016-01-21 10:29:48 -07:00
Kris Raney
4ad20f6217 Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests. 2016-01-21 11:28:53 -06:00
Kris Raney
d699df9c3d Make necessary tweaks so we recognize matching data as actually matching, and don't make an unnecessary change. 2016-01-21 11:28:35 -06:00
Kris Raney
5d4e8109a4 Don't let list order be a factor in comparison 2016-01-21 11:28:35 -06:00
Kris Raney
f65bcf63cc Make it possible to compare ACLs so they don't get updated unnecessarily 2016-01-21 11:28:35 -06:00
Kris Raney
f12ebac387 Implement s3_bucket state, except for ACL which is asymmetric due to syntactic sugar on input, so it always appears to need a change. 2016-01-21 11:28:35 -06:00
Kris Raney
7ac671f70f Make TargetGrants optional to match API requirements 2016-01-21 11:28:35 -06:00
Kris Raney
8506753da9 Make tagging input symmetric with tagging output 2016-01-21 11:28:35 -06:00
Kris Raney
917f48d19f Implement unit tests for boto_s3_bucket module 2016-01-21 11:25:55 -06:00
Pedro Algarvio
fb2ecec7b4 Keep the old side effect behavior 2016-01-21 17:09:45 +00:00