Thomas S Hatch
29c66d85a4
Merge pull request #25740 from rallytime/bp-25722
...
Back-port #25722 to 2015.5
2015-07-27 10:08:40 -06:00
Thomas S Hatch
135b03e53b
Merge pull request #25739 from rallytime/bp-25709
...
Back-port #25709 to 2015.5
2015-07-27 10:08:27 -06:00
Thomas S Hatch
095a923b6e
Merge pull request #25738 from rallytime/bp-25671
...
Back-port #25671 to 2015.5
2015-07-27 10:08:23 -06:00
Thomas S Hatch
05fbfe64e9
Merge pull request #25737 from rallytime/bp-25608
...
Back-port #25608 to 2015.5
2015-07-27 10:08:18 -06:00
Thomas S Hatch
9817fc5556
Merge pull request #25733 from davidjb/mount-fix
...
Avoid IndexError when listing mounts if mount output ends in newline
2015-07-27 10:08:05 -06:00
Thomas S Hatch
82ba390b7b
Merge pull request #25705 from blackduckx/augeas-setm
...
Support for setm augeas command.
2015-07-27 10:07:10 -06:00
Thomas S Hatch
f732be365d
Merge pull request #25703 from cachedout/master_type_2015_5
...
Return to `str` for master_type for 2015.5
2015-07-27 10:06:22 -06:00
David Boucha
dea3d31578
Merge pull request #25702 from twangboy/fix_25144
...
Fixed win_user module for groups with spaces in the name
2015-07-27 09:06:33 -06:00
David Boucha
186af9b54d
Merge pull request #25711 from twangboy/fix_25351
...
Fixed problem with win_servermanager.list_installed
2015-07-27 09:05:48 -06:00
Alexey Pakseykin
c33eb813ea
Change docs for --static option with JSON - text B
2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb
Change docs for --static option with JSON - text A
2015-07-27 09:00:59 -06:00
Cole Kowalski
fda2ffa44e
add direct-io-mode to mount_invisible_options
2015-07-27 08:59:04 -06:00
Nick Milosevic
525cd70589
added a parameter so verifying SSL is now optional instead of hard-coded
2015-07-27 08:57:17 -06:00
ralf matulat
df85d734bc
Fix: prevent git.latest from removing target
...
Fixes #25229
While force=True and test=True git.latest should not remove the
target directory.
2015-07-27 08:53:31 -06:00
David\ Beitey
6d0bce2418
Test length of comps when listing mounts
...
If the stdout returned from the mount command ends with a newline char,
this produces an empty string during splitting. This empty string is
attempted to be ``split()`` on whitespace, and thus produces an
empty-length list, which errors on the following line because no
elements are present.
2015-07-27 17:18:38 +10:00
Frederic Brin
cad0f2b46e
Augeas: fix pylint and documentation
...
+ Fix pylint
+ Add setm support in the documentation
2015-07-25 15:02:16 +02:00
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
twangboy
87c8f8dfb5
Fixed some tests... maybe...
2015-07-24 15:07:45 -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
twangboy
82fa911931
Fixed problem with win_servermanager.list_installed
2015-07-24 14:20:13 -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
Mike Place
0dc28ad3e4
Return to str for master_type for 2015.5
2015-07-24 11:55:56 -06:00
Frederic Brin
ee97896cba
Support for setm augeas command.
...
Fix build on top of 2015.5.x version
2015-07-24 19:55:31 +02:00
twangboy
d5be7a2fdf
Fixed win_user moduele for groups with spaces in the name
2015-07-24 10:38:18 -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
twangboy
b473fb7827
Fixed some tests... maybe...
2015-07-24 09:40:46 -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
twangboy
3c1a73f16c
Fixed some lint
2015-07-24 08:05:34 -06: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
twangboy
b3e44e342c
Fixed states to work with comment_line
2015-07-23 17:49:35 -06:00
twangboy
b1cedd1153
Fixed regex issues with comment and uncomment
2015-07-23 17:37:41 -06: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
