Commit Graph

47012 Commits

Author SHA1 Message Date
Pedro Algarvio
0940548d58 The decorator looks for 2 binaries. We always want the first. 2015-04-10 00:26:15 +01:00
Eli Ribble
9f6f99f45f Fix pylint error 2015-04-09 15:19:37 -06:00
Ronald van Zantvoort
277929b426 Add version tag 2015-04-09 23:00:30 +02:00
Justin Findlay
64d7e86b54 Merge pull request #22507 from twangboy/release_notes
Added additional details regarding windows implementation
2015-04-09 13:43:29 -06:00
Justin Findlay
38441a701c Merge pull request #22506 from rallytime/bp-20095
Backport #20095 to 2014.7
2015-04-09 13:42:39 -06:00
Ronald van Zantvoort
83cf03e653 small typo fix 2015-04-09 18:33:37 +02:00
Ronald van Zantvoort
333daa1bcc Modify A to use non-deprecated C function
Add AAAA function
2015-04-09 18:29:38 +02:00
Thomas Jackson
77395d76d8 Change to sets, we don't gaurantee minion ordering in returns 2015-04-09 09:06:59 -07:00
shanedlee
c874ca8c20 Added additional details regarding windows implementation 2015-04-09 11:32:13 -04:00
Colin Coghill
755c26e1b7 Handle pkgrepo keyids that have been converted to int. #19737 2015-04-09 09:07:16 -06:00
Justin Findlay
5c73b1ceb7 Merge pull request #22500 from rahulhan/states_hg_unit_test
Adding states/hg.py unit test cases
2015-04-09 09:07:11 -06:00
Justin Findlay
25903258b2 Merge pull request #22496 from rahulhan/states_host_unit_test
Adding states/host.py unit test cases
2015-04-09 09:06:49 -06:00
Justin Findlay
b232a73db7 Merge pull request #22504 from jayeshka/serverdensity_device-unit-test
adding serverdensity_device unit test case.
2015-04-09 09:06:25 -06:00
Thomas Jackson
7614f7ed10 Caste returns to sets, since we don't care about order. 2015-04-09 07:45:24 -07:00
Justin Findlay
ae55fb4824 Merge pull request #22499 from rahulhan/states_http_unit_test
Adding states/http.py unit test cases
2015-04-09 07:17:29 -06:00
Justin Findlay
738fb1c4b6 Merge pull request #22495 from rahulhan/win_service_unit_test
Adding win_service.py unit test cases
2015-04-09 07:15:37 -06:00
Justin Findlay
0307ebe7ce Merge pull request #22381 from batulin-s/fix-portage_config-appending-accept_keywords
fix #22321 bug
2015-04-09 07:13:15 -06:00
Justin Findlay
6662853542 Merge pull request #22492 from davidjb/2014.7
Correctly report disk usage on Windows. Fix #16508
2015-04-09 07:11:36 -06:00
Jayesh Kariya
8afff0f337 adding serverdensity_device unit test case. 2015-04-09 17:29:48 +05:30
Rahul Handay
2a6073dde5 Adding states/hg.py unit test cases 2015-04-09 15:44:22 +05:30
Rahul Handay
80bf9e8734 Adding states/http.py unit test cases 2015-04-09 15:42:01 +05:30
sergey.b
418fd9758e may be last fix #22321 bug 2015-04-09 13:00:45 +03:00
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
Rahul Handay
65adbce5e7 Adding states/host.py unit test cases 2015-04-09 13:02:15 +05:30
Rahul Handay
0b28284b7d Adding win_service.py unit test cases 2015-04-09 12:31:51 +05:30
David\ Beitey
5d831ed01c Correctly report disk usage on Windows. Fix #16508
The GetDiskFreeSpace API call uses 32-bit unsigned ints, which causes it
to fail for large disks.  The GetDiskFreeSpaceEx method uses long
integers and avoids the need for several manual calcuations.

This also ensures the capacity reported rounds correct.  The previous
implementation was to convert the percentage directly to an int, slicing
off the decimal portion.

Conflicts:
	salt/modules/win_disk.py
2015-04-09 15:57:09 +10:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Justin Findlay
bf1957a781 Merge pull request #22446 from br0ch0n/2014.7
Issue #20850 puppet run should return actual code
2015-04-08 22:51:43 -06:00
Justin Findlay
654f5c58bd Merge pull request #22488 from ckochenower/2015.2
Fix cassandra_cql execution module documentation/examples
2015-04-08 22:45:49 -06:00
Corin Kochenower
21435834d0 Fix cassandra_cql execution module documentation/examples 2015-04-08 20:10:50 -06:00
Nicole Thomas
c83e2d7c88 Merge pull request #22466 from whiteinge/doc-nested-dicts
Updated wording about nested dictionaries in states.file.managed docs
2015-04-08 17:01:36 -06:00
Nicole Thomas
595051aa0c Merge pull request #22468 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-08 16:58:37 -06:00
Nicole Thomas
9f5a414761 Merge pull request #22443 from garethgreenaway/2015_2_fix_runner_doc
Fixes to sysmod.py
2015-04-08 16:57:07 -06:00
Nicole Thomas
8f0f5ae3f5 Merge pull request #22403 from hvnsweeting/enh-host-module-when-missing-hostfile
create host file if it does not exist
2015-04-08 16:53:47 -06:00
Eli Ribble
7daff3ba38 Allow multiple bucket contents caches based on prefix
Without this change multiple ext_pillar S3 directives would use the same
cache file even if using different buckets. Now the cache file is based
on the bucket name and prefix so that we can have multiple directives
working together without accidentally using each others caches

https://github.com/saltstack/salt/issues/22472
2015-04-08 16:37:25 -06:00
Eli Ribble
85380df810 Add the prefix to the pillar root when necessary
Without this if we are downloading a file from

s3://my-bucket/some/prefix/top.sls

Then we will save the cache file at

/var/cache/salt/master/pillar_s3fs/some/prefix/top.sls

But have a pillar root at

/var/cache/salt/master/pillar_s3fs/

Which will fail to find the top file. Now we add the prefix to the root
so that we properly find the files. One might argue we should instead
remove the prefix on download but that would cause conflict when pulling
multiple external pillars from the same s3 bucket with different
prefixes

https://github.com/saltstack/salt/issues/22472
2015-04-08 15:17:58 -06:00
Todd Stansell
3013583dda fix pylint issues 2015-04-08 13:58:16 -07:00
David Boucha
c9394fd779 Merge pull request #22477 from twangboy/fix_win_installer
Moved file deletion to happen after user clicks install
2015-04-08 14:27:05 -06:00
Thomas S Hatch
8ed97c5913 Merge pull request #22473 from EliRibble/fix-22472
Add the ability to specify key prefix for S3 ext_pillar
2015-04-08 13:27:37 -06:00
Brandon Rochon
4e2ab36b80 Issue #20850 puppet run should return actual code --lint fix 2015-04-08 12:26:45 -07:00
Thomas S Hatch
d5cbabc37d Merge pull request #22441 from cro/missing_patch
Throw better error if no patch exec found
2015-04-08 13:05:29 -06:00
Joseph Hall
aa23eb0e26 Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs
Migrate old cloud config documentation to own page
2015-04-08 12:32:35 -06:00
salt_build
6d99681b8d Moved file deletion to happen after user clicks install 2015-04-08 18:25:56 +00:00
Todd Stansell
8117e9f855 fix #21998 - use yum reposdir as basedir defaults
We now use the reposdir list of directories as the default set of repo
directories to manage.  When a new repo is created, it will be created in the
first directory in the list that exists.  Now that basedir is a list, you can
pass multiple directories in the basedir argument, separated by commas.
2015-04-08 10:44:12 -07:00
Eli Ribble
d96e470f9b Add the ability to specify key prefix for S3 ext_pillar
Users can use the prefix parameter to specify that pillar data should
come only from keys that start with the provided prefix. This allows
users to put pillar data in a 'subdirectory' of their bucket. It also
makes it easier to fully define pillars using S3 using a single bucket

See: https://github.com/saltstack/salt/issues/22472
2015-04-08 11:34:48 -06:00
Colton Myers
5f1a4b45b8 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-08 10:38:34 -06:00
Seth House
9a3a747d27 Updated wording about nested dictionaries in states.file.managed docs
Old wording was too ambiguous. Refs #22463
2015-04-08 09:44:47 -06:00
Justin Findlay
ad7b066dce Merge pull request #22455 from jayeshka/grains-unit-test
adding states/grains unit test case.
2015-04-08 09:05:30 -06:00
Thomas Jackson
30db262481 Add timeout to batch tests 2015-04-08 07:53:54 -07:00
Thomas Jackson
8d71c2b222 Cleanup pylint errors 2015-04-08 07:53:47 -07:00