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
Andreas Lutro
4121152e4a
fix highstate duration alignment
2015-07-24 10:58:26 +02:00
Bruno Clermont
24ebef9636
Don't acquire lock if there is no formatter
...
this cause locking when a log handler don't have a formatter (because it don't need one)
2015-07-24 15:07:50 +08:00
Justin Findlay
37766e9dc6
Merge pull request #25684 from davidjb/doc-fix-1
...
Fix doc around Include/Exclude for states
2015-07-23 17:53:44 -06:00
twangboy
b3e44e342c
Fixed states to work with comment_line
2015-07-23 17:49:35 -06:00
David\ Beitey
f65397036f
Fix doc around Include/Exclude for states
2015-07-24 09:42:25 +10: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
C. R. Oldham
ad586ea108
Merge pull request #25637 from rallytime/one-templates
...
Added more template functions to the OpenNebula driver
2015-07-23 16:04:05 -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
twangboy
ff7296d983
Fixed some more lint
2015-07-23 15:08:20 -06:00
twangboy
7a71f5ea6a
Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352
2015-07-23 15:01:22 -06: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
rallytime
c997d8bcf9
Added more template functions to the OpenNebula driver
2015-07-23 14:21:52 -06:00
David Boucha
d0f9d001db
Use OS line endings with contents on file.managed
2015-07-23 14:21:36 -06:00
C. R. Oldham
1d1356ecd1
Merge pull request #25635 from rallytime/one-secgroups
...
Add more security group functions to OpenNebula driver
2015-07-23 14:11:02 -06:00
C. R. Oldham
57ef09a732
Merge pull request #25640 from rallytime/one-images
...
Add more image functions to OpenNebula driver
2015-07-23 14:10:36 -06:00
C. R. Oldham
cbc11e0d2f
Merge pull request #25643 from rallytime/one-virtual-networks
...
Added some virtual network functions to the OpenNebula driver
2015-07-23 14:10:22 -06:00
Nick Milosevic
34c5432363
added a parameter so verifying SSL is now optional instead of hard-coded
2015-07-23 12:19:12 -07:00
Robert Davis
8504a9a92a
Updating cherrypy to also check for proxied requests.
2015-07-23 12:04:08 -07: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
Nicole Thomas
a4aaa7a31e
Merge pull request #25549 from techhat/scalewaybootstrap
...
Switch Scaleway to salt.utils.cloud.bootstrap()
2015-07-23 11:54:10 -06:00
twangboy
f57b2b8e7a
Fixed some line, added documentation
2015-07-23 11:43:00 -06:00
twangboy
d78fa97a71
Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352
2015-07-23 11:42:46 -06:00
rallytime
6124ea2969
Add remaining virtual network functions to OpenNebula driver
2015-07-23 11:13:42 -06:00
Joseph Hall
1531e9035e
Sanitize sensitive fields in http.query()
2015-07-23 11:08:36 -06:00
Justin Findlay
f108061677
Merge pull request #25667 from jfindlay/2015.8
...
add 2015.8.0rc2 autogenerated changelog
2015-07-23 11:05:58 -06:00
Justin Findlay
b27378b186
add 2015.8.0rc2 autogenerated changelog
2015-07-23 11:04:18 -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
ee12fe3881
Merge pull request #25653 from alprs/fix-hightstate_duration_line_length
...
Properly align highstate duration sum
2015-07-23 10:48:19 -06:00
Robert Davis
e56e4df0cd
Updating option name from client_acl to api_acl.
2015-07-23 09:47:33 -07: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
690c89f374
Merge pull request #25663 from rallytime/bp-25638-dot-eight
...
Back-port #25638 to 2015.8
2015-07-23 10:26:58 -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
Justin Findlay
13ecf3162f
Merge pull request #25660 from colekowalski/glusterfs-invisible-opt
...
add glusterfs' direct-io-mode to mount_invisible_keys
2015-07-23 10:08:36 -06:00
Justin Findlay
39e736d666
Merge pull request #25659 from isbm/isbm-zypper-state
...
Bugfix: crash at getting non-existing repo
2015-07-23 10:02:59 -06:00
Mark McGuire
caded5bc9f
fix bad merge 99fc7ec
2015-07-23 09:52:30 -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
Cole Kowalski
864deb748c
add glusterfs' direct-io-mode to mount_invisible_keys
2015-07-23 10:27:18 -04:00
