Justin Findlay
ad8456eeed
Merge pull request #25714 from cachedout/issue_25435
...
Display warning when progressbar can't be loaded
2015-07-24 18:10:13 -06:00
Nicole Thomas
a0969ff74a
Merge pull request #25699 from rallytime/bp-25660
...
Back-port #25660 to 2015.5
2015-07-24 16:11:40 -06:00
Mike Place
fe829564f4
Merge pull request #25694 from s0undt3ch/2015.5
...
Salt-SSH fix for #25689
2015-07-24 15:41:56 -06:00
Mike Place
44f34684ef
Included note in help docs
2015-07-24 15:20:56 -06:00
Mike Place
4e2fee17cc
Display warning when progressbar can't be loaded
...
Closes #25435
2015-07-24 15:18:58 -06:00
Mike Place
fb4744b2f8
Merge pull request #25710 from jahamn/integration-test-for-issue-25250
...
Integration Testcase for Issue 25250
2015-07-24 14:57:33 -06:00
Colton Myers
18c9d5454d
Merge pull request #25680 from basepi/jinja.alias.25049
...
[2015.5] Move cmd.run jinja aliasing to a wrapper class to prevent side effects
2015-07-24 13:52:10 -06:00
Colton Myers
6a5c6dcd04
Merge pull request #25682 from basepi/fix.hash.parsing
...
[2015.5] Fix parsing args with just a hash (#)
2015-07-24 13:52:01 -06:00
Nicole Thomas
d330ef0d81
Merge pull request #25695 from stanislavb/expose-aws-region-config-and-fetch-region-from-metadata
...
Configurable AWS region & region from IAM metadata
2015-07-24 13:36:40 -06:00
Jason Hamner
24f653e963
Integration Test for Issue 25250
...
Adds integration test for #25250
2015-07-24 13:28:15 -06:00
Thomas S Hatch
ea0d295d49
Merge pull request #25645 from kev009/freebsd-pkgng-add
...
Fix pkgng provider to work with a sources list and the underlying pkg…
2015-07-24 10:33:18 -06:00
Thomas S Hatch
2cad79c2f0
Merge pull request #25677 from aneeshusa/fix-pacman-list-upgrades-when-refreshing
...
Fix pacman.list_upgrades when refresh=True.
2015-07-24 10:30:06 -06:00
Thomas S Hatch
18e739b812
Merge pull request #25675 from UtahDave/2015.5local
...
Use OS line endings with contents on file.managed
2015-07-24 10:29:50 -06:00
Cole Kowalski
85c636d7a1
add glusterfs' direct-io-mode to mount_invisible_keys
2015-07-24 09:26:02 -06:00
Stanislav Blokhin
595da6252e
Configurable AWS region & region from IAM metadata
2015-07-24 16:06:20 +02:00
Pedro Algarvio
afba3bde90
Use a relative un-nested path to the salt-call logfile.
...
Fixes #25689
2015-07-24 13:01:04 +01:00
Pedro Algarvio
6309f22a65
Fix wrong variable assignment
2015-07-24 13:01:04 +01:00
Pedro Algarvio
c312592c81
Have cookie JAR's respect the configured cachedir
...
And only when missing default to `syspaths.CACHE_DIR`
2015-07-24 13:01:04 +01:00
Colton Myers
e83a0f9b2b
Use new-style classes
2015-07-23 16:45:59 -06:00
Colton Myers
8d75c1b882
Fix parsing args with just a hash (#)
2015-07-23 16:44:19 -06:00
Colton Myers
4a50bac1c2
Fix typo
2015-07-23 16:10:28 -06:00
Colton Myers
36410389dc
Name the Nitrogen release
2015-07-23 16:03:24 -06:00
Colton Myers
77679596f9
Make ALIASES global
2015-07-23 16:02:30 -06:00
Colton Myers
01c209efd9
Fix some aliases references
2015-07-23 16:01:04 -06:00
Colton Myers
1644641c57
Move cmd.run aliasing to a wrapper class to prevent side effects
2015-07-23 15:52:11 -06:00
Aneesh Agrawal
7062ae4eae
Fix pacman.list_upgrades when refresh=True.
...
When refresh=True, there more than 1 informational line.
Only use lines that match the specified print format,
which has one space (all other lines have more than one space).
2015-07-23 17:21:42 -04:00
Colton Myers
7914f51636
Merge pull request #25676 from basepi/2015.8.0rc2releasedocs
...
Update release candidate docs to 2015.8.0rc2
2015-07-23 14:29:37 -06:00
Colton Myers
882d11836b
Update release candidate docs to 2015.8.0rc2
2015-07-23 14:29:09 -06:00
David Boucha
d0f9d001db
Use OS line endings with contents on file.managed
2015-07-23 14:21:36 -06:00
Nicole Thomas
c36b714401
Merge pull request #25666 from nmadhok/vmware-cloud-fix_2015.5
...
Check if the properties exist before looping over them causing KeyError
2015-07-23 11:55:40 -06:00
Nitin Madhok
8e812296ef
Check if the properties exist before looping over them causing KeyErrors Fixes #25665
2015-07-23 12:58:27 -04:00
Mike Place
36d04b2954
Merge pull request #25656 from alprs/fix-locale_detection
...
Fix locale detection in debian/gentoo
2015-07-23 10:46:40 -06:00
Justin Findlay
b1c1735aae
Merge pull request #25661 from rallytime/bp-25624
...
Back-port #25624 to 2015.5
2015-07-23 10:26:48 -06:00
Justin Findlay
6a2843dee2
Merge pull request #25662 from rallytime/bp-25638
...
Back-port #25638 to 2015.5
2015-07-23 10:26:40 -06:00
Mark McGuire
90d833d5dc
fix bad merge 99fc7ec
2015-07-23 09:41:54 -06:00
Ian Babrou
4e1fcfa15e
Fix typo in get_routes example for debian_ip
2015-07-23 09:40:28 -06:00
Andreas Lutro
a260236942
change variable name
2015-07-23 15:18:08 +02:00
Andreas Lutro
dd2a188c05
fix tests
2015-07-23 15:17:18 +02:00
Andreas Lutro
aefd0fb374
code formatting
2015-07-23 15:16:49 +02:00
Andreas Lutro
e58d222fb0
fix locale detection in debian/gentoo
2015-07-23 12:57:16 +02:00
Kevin Bowling
ee2cbb574a
Fix pkgng provider to work with a sources list and the underlying pkg-add(8)
2015-07-22 16:11:11 -07:00
Mike Place
00f4689fe3
Merge pull request #25644 from cachedout/issue_25413
...
pillar doc fix
2015-07-22 16:57:23 -06:00
Mike Place
8cef61e6cc
pillar doc fix
...
closes #25413
2015-07-22 16:56:53 -06:00
Mike Place
aeaeb53ed6
Merge pull request #25642 from cachedout/issue_25540
...
Warn on pillar schedule delete
2015-07-22 16:04:11 -06:00
Mike Place
74f6b6930c
Warn on pillar schedule delete
...
Closes #25540
2015-07-22 16:03:25 -06:00
Mike Place
7b79e433f1
Merge pull request #25598 from twangboy/fix_25437
...
Fixed problem trying to load file with name of boolean type
2015-07-22 11:07:49 -06:00
Mike Place
f4a38a8aee
Merge pull request #25604 from terminalmage/fix-mock_open
...
Move patching of mock_open to within test
2015-07-22 10:53:55 -06:00
Mike Place
224484df7e
Merge pull request #25609 from s0undt3ch/hotfix/bootstrap-script-2015.5
...
[2015.5] Update the bootstrap script to latest release v2015.07.22
2015-07-22 10:28:52 -06:00
Erik Johnson
123b8ee1cb
Fix mock_open patch
...
Forgot to add this when I removed the decorator in my previous commit.
2015-07-22 11:09:15 -05:00
Mike Place
07eb78c79f
Merge pull request #25603 from terminalmage/issue21912
...
Add version_cmp function to yumpkg.py
2015-07-22 09:42:29 -06:00
