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
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
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
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
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
Metin OSMAN
f8b2f8079f
Add the ability to specify a base pattern for metrics path used by the carbon returner
2015-07-23 13:13:01 +02:00
Andreas Lutro
e58d222fb0
fix locale detection in debian/gentoo
2015-07-23 12:57:16 +02:00
twangboy
99d9518af8
Clarified functionality of reg module, fixed state to work with new module
2015-07-22 17:45:50 -06: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
9634351fc2
Merge pull request #25633 from AkhterAli/2014.7
...
Update loader.py
2015-07-22 14:02:41 -06:00
Akhter Ali
29be4bbe11
Update loader.py
2015-07-22 15:56:05 -04: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
twangboy
cf57712eeb
Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25437
2015-07-22 09:53:15 -06: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
Pedro Algarvio
96a8568336
Update the bootstrap script to latest release v2015.07.22
...
* Fix tornado installation in Ubuntu. Thanks Yushi Nakai. saltstack/salt-bootstrap#627
* Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
* Install requests on Ubuntu from Chris Lea's PPA. saltstack/salt-bootstrap#630
2015-07-22 13:22:08 +01:00
Erik Johnson
af82835f42
Move patching of mock_open to within test
...
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
2015-07-22 03:04:07 -05:00
Erik Johnson
99e532ba74
Add versionadded directive
2015-07-22 00:17:30 -05:00
Erik Johnson
8a1765fc6f
Add version_cmp function to yumpkg.py
...
This uses rpmUtils to more accurately compare version numbers, as
distutils.version.LooseVersion fails to successfully compare some
version numbers.
Fixes #21912 .
2015-07-21 23:33:43 -05:00
Erik Johnson
457e72e273
Fix refernces to __salt__['version_cmp']
...
This will never exist, this should have been __salt__['pkg.version_cmp']
from the beginning.
2015-07-21 23:32:06 -05:00
Erik Johnson
a19fa2296a
Avoid using single-letter variable
2015-07-21 23:29:22 -05:00
twangboy
c53e11d42c
Fixed problem trying to load file with name of boolean type
2015-07-21 16:25:41 -06:00
Mike Place
69ef81caba
Merge pull request #25590 from garethgreenaway/25560_2015_5_schedule_return_data
...
2015.5 scheduled jobs return data
2015-07-21 15:57:42 -06:00
Mike Place
9ffefc867e
Merge pull request #25584 from rallytime/bp-24054-and-25576
...
Back-port #24054 and #25576 to 2015.5
2015-07-21 15:16:37 -06:00
Mike Place
a966e439d1
Merge pull request #25589 from jahamn/Fix-ssh_known_host-not-taking-port-into-account
...
Fixes ssh_known_host not taking port into account
2015-07-21 15:15:06 -06:00
