Commit Graph

19230 Commits

Author SHA1 Message Date
Seth House
6c23fdbfe1 Updated Saltconf sidebar graphic 2013-10-18 13:28:37 -06:00
David Boucha
e0d8034665 Merge pull request #7951 from terminalmage/docs
Cleanup new chocolatey module and add to docs
2013-10-18 11:24:05 -07:00
Erik Johnson
3831511c38 PEP8 fixes to new chocolatey module
Also added a versionadded directive to top-level docstring
2013-10-18 13:10:07 -05:00
Erik Johnson
c9b455c9fb add "chocolatey" module to docs 2013-10-18 13:09:54 -05:00
Thomas S Hatch
8bf988803a Merge pull request #7943 from wari/jobs.py_refactoring
Jobs.py refactoring
2013-10-18 10:01:24 -07:00
Thomas S Hatch
ca77c58b41 Merge pull request #7942 from kretz/rbenv-support-in-gem
Support gem execution with rbenv ruby.
2013-10-18 09:59:55 -07:00
Thomas S Hatch
43f0d46770 Merge pull request #7941 from scottp-dpaw/develop
Module for controlling the Chocolatey package manager
2013-10-18 09:50:23 -07:00
Thomas S Hatch
daa2c07292 Merge pull request #7939 from wari/patch-1
print_jobs was duplicating results
2013-10-18 09:49:18 -07:00
Thomas S Hatch
6e4e364859 Merge pull request #7938 from scottp-dpaw/patch-1
Close file handle before attempting removal
2013-10-18 09:39:15 -07:00
Thomas S Hatch
f668d39053 Merge pull request #7934 from stevearc/ssh_accept
Add a salt runner that safely accepts minion keys using salt-ssh
2013-10-18 09:38:16 -07:00
Thomas S Hatch
d4fa5bde7b Merge pull request #7932 from c-cooperjones/patch-1
Update build_rule to ignore kwargs __env__, __sls__, order
2013-10-18 09:27:27 -07:00
Thomas S Hatch
f260e80e0a Merge pull request #7927 from tones111/pillar
git_pillar: Don't merge updates
2013-10-18 09:26:31 -07:00
Wari Wahab
c94defb35d Removed serial from _walk_through call
Sounds a lot cleaner. And serial looks a lot like a global variable.
2013-10-18 22:17:44 +08:00
Martin Kretz
2e1db23b15 Added testcases to suppor rbevn in gem. 2013-10-18 13:44:45 +02:00
Wari Wahab
a75e9a59d5 Removed some refactored code
Now that we've normalized some things here, we can remove extra methods that is only used in one instance
2013-10-18 19:28:49 +08:00
Wari Wahab
45256c5a75 Some more refactoring
I believe `job` here makes sense instead of `load`.
2013-10-18 19:18:50 +08:00
Wari Wahab
084285f0ae Some minor refactorings
There's just a bunch of repeated code that I'd like to see 'merged'. This is not perfect either, but it's a start.
2013-10-18 18:49:55 +08:00
Martin Kretz
8cb168f612 Support gem execution with rbenv ruby. 2013-10-18 12:45:25 +02:00
Pedro Algarvio
cea96b8f01 The proper attribute is pw_gid. 2013-10-18 11:01:43 +01:00
Pedro Algarvio
a7f4d816ca Bring HAS_PORTAGE to global scope, wrongly removed(by me). 2013-10-18 10:41:07 +01:00
Pedro Algarvio
859804b689 Don't change pidfile ownership if the current user already owns it. 2013-10-18 10:39:06 +01:00
Scott Percival
f9e4b0407f Add module for controlling the Chocolatey package manager 2013-10-18 17:34:55 +08:00
Wari Wahab
cec5bf2710 print_jobs was duplicating results
The display output was indented at the wrong place, therefore adding results each time there's a return_data.
2013-10-18 17:32:57 +08:00
scottp-dpaw
598f6c73fa Close file handle before attempting removal
Fixes earlier commit; forgot that opening a file defaults to a lock under Windows
2013-10-18 17:26:53 +08:00
Pedro Algarvio
0143e78877 Merge pull request #7929 from cachedout/develop
Fix for #5737 and some minor doc changes.
2013-10-18 00:57:50 -07:00
Pedro Algarvio
296fb7394f Merge pull request #7930 from whiteinge/deb-ps-truncate
Debian sets COLUMNS in base env which will truncate ps output
2013-10-18 00:55:40 -07:00
Pedro Algarvio
9975a86c30 Merge pull request #7935 from terminalmage/issue7813
Fix pkg.installed regression (yumpkg)
2013-10-18 00:54:28 -07:00
David Boucha
1991f20776 Merge pull request #7936 from UtahDave/develop
Bump Salt Windows installer version. Add to docs
2013-10-18 00:25:50 -07:00
David Boucha
746369d7b6 Bump Salt Windows installer version. Add to docs 2013-10-18 01:24:37 -06:00
Erik Johnson
a7d880cc45 Fix pkg.installed regression (yumpkg)
This fixes a regression caused by the "pre-flight" checks recently added
to the pkg.installed state. The check_db function was not properly
handling 32-bit packages on a 64-bit OS.

In the process of investigating this regression, I also discovered a bug
in which pkg.latest_version was not identifying 32-bit versions of
packages, effectively rendering it impossible to install these packages
using pkg.latest states.

This commit fixes both bugs.
2013-10-17 22:38:14 -05:00
Steven Arcangeli
3c4a4e07ea Add a salt runner that safely accepts minion keys using salt-ssh 2013-10-17 17:50:44 -07:00
c-cooperjones
a9604d7f44 Update build_rule to ignore __env__, __sls__, order
The rules not created without these switches in the iptables command.
2013-10-18 01:00:14 +01:00
C. R. Oldham
36e00080d4 Merge pull request #7931 from cro/develop
Fix state compiler stack trace, github issue #5767
2013-10-17 16:59:13 -07:00
C. R. Oldham
6ee8b9db03 Fix state compiler stack trace, github issue #5767 2013-10-17 17:56:13 -06:00
Seth House
70be208bc5 Added Saltconf banner to docs sidebar 2013-10-17 17:44:53 -06:00
Mike Place
dc6610a2cf In-line documentation to remind the reader that some pre-processing of minion targets occurs on the master. 2013-10-17 17:04:26 -06:00
Mike Place
33125b7c9e When the minion refreshes its grains, it should also refresh its pillars so that it can fire an event back to the master to inform it of its new state. Refs #5737. 2013-10-17 16:54:10 -06:00
Mike Place
d583554143 Documentation clarification to make the explanation of /etc/salt/grains more specific. 2013-10-17 15:49:14 -06:00
Thomas S Hatch
309ccc2d4c Fix spacing per pylint 2013-10-17 15:37:16 -06:00
Thomas S Hatch
f09b718e24 Add a line per pylint 2013-10-17 15:34:34 -06:00
Thomas S Hatch
3937f49d55 fix intentation in lxc module 2013-10-17 15:33:33 -06:00
Paul Sbarra
981902a764 git_pillar: Don't merge updates
When updating the local cached repository don't try to pull/merge the
changes as the operation will fail if merge conflicts exist.  We only
want to mirror what's in the remote repository.
2013-10-17 15:36:01 -05:00
Seth House
e7baea0c2f Debian sets COLUMNS in base env which will truncate ps output
Fixes #5646
2013-10-17 14:32:11 -06:00
Thomas S Hatch
28847a8e60 don't redirect output on lower level daemonize calls
MAY BREAK THINGS!!!!
2013-10-17 14:16:51 -06:00
Seth House
9834a9afda Added SaltConf banner to main docs page 2013-10-17 12:36:19 -06:00
Thomas S Hatch
71f3fadb40 Merge pull request #7920 from mgwilliams/lxc
[lxc] add nic_opts to init function
2013-10-17 11:13:28 -07:00
Thomas S Hatch
c03d9da15c Merge pull request #7917 from s0undt3ch/features/virtual-doc
Enforce `__virtualname__` usage.
2013-10-17 11:12:27 -07:00
Thomas S Hatch
d005a941ba Merge pull request #7907 from tallmad/pecl_preferred_state
add preferred_state argument for pecl.install
2013-10-17 11:11:10 -07:00
Thomas S Hatch
fef1647e97 Merge pull request #7889 from holmboe/virt-tmpl-refactor
Templating refactor in virt.py
2013-10-17 11:09:34 -07:00
Erik Johnson
db3768d00a Bump version to 0.17.1 2013-10-17 13:04:01 -05:00