valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,278 Commits 24 Branches 182 Tags 341 MiB
7579b73069
Commit Graph

16278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
7579b73069 Merge pull request #6599 from pcrews/develop 
mysql changes for row returning queries
 2013-08-09 13:28:26 -07:00
Thomas S Hatch
6df21bd79b Fix for #6601 2013-08-09 14:14:07 -06:00
Joseph Hall
e940f60c3c Merge pull request #6600 from TheRealBill/develop 
Adding some clarification about the use of --out=json and the output.
 2013-08-09 12:47:08 -07:00
Bill Anderson
5cc8142d2a Adding some clarification about the use of --out=json and the output. 2013-08-09 14:11:41 -05:00
Joseph Hall
1818c4a430 Merge pull request #6598 from aboe76/update_suse_0.16.3 
Updated suse spec file to 0.16.3
 2013-08-09 12:03:24 -07:00
Niels Abspoel
2efed79b21 Updated suse spec file to 0.16.3 
Updated suse spec file to 0.16.3 bugfix release.
removed creation of /var/cache/salt/minion/proc dir.
not needed anymore
 2013-08-09 20:21:49 +02:00
David Boucha
39adecf507 Merge pull request #6597 from terminalmage/release_notes 
add release notes for 0.16.3
 2013-08-09 10:36:51 -07:00
Erik Johnson
36cc876450 add release notes for 0.16.3 2013-08-09 12:34:22 -05:00
Thomas S Hatch
b6e0ee59ca Merge pull request #6587 from 198d/develop 
Debian Package Architechture
 2013-08-09 10:21:45 -07:00
Joseph Hall
06b92735fb Merge pull request #6596 from l2ol33rt/pidora_patch 
Added Pidora OS Name and Family Mappings
 2013-08-09 09:59:51 -07:00
Robert Hernandez
0b3754255a Added Pidora OS Name and Family Mappings 2013-08-09 09:37:06 -07:00
Joseph Hall
9b432a5c68 Merge pull request #6595 from d--j/patch-1 
Error when persistent mount.unmounted state run does not change mountpoints.
 2013-08-09 08:51:10 -07:00
Daniel Jagszent
9790d06cd6 Error when persistent mount.unmounted state run does not change mountpoints. 
ret['changes']['umount'] is not always defined (only gets set to True when there was a change. never gets set to False).
We need to guard the code against KeyErrors.
 2013-08-09 17:33:32 +02:00
Joseph Hall
4f9f74482a Merge pull request #6594 from s0undt3ch/hotfix/6592 
Fix the `test_install_pre_argument_in_resulting_command` test case.
 2013-08-09 06:59:48 -07:00
Pedro Algarvio
7b3ba67bc7 Fix the test_install_pre_argument_in_resulting_command test case. 
It now checks if the `--pre` output is present in versions >= 1.4 or not in versions < 1.4
 2013-08-09 12:14:56 +01:00
Pedro Algarvio
ae375a8f5c Merge pull request #6592 from mafrosis/pip_amend 
Pip amendments
 2013-08-09 03:24:16 -07:00
mafro
c59a56c2d4 support pre_release parameter in virtualenv state 2013-08-09 04:51:27 +00:00
mafro
3f9c62eeb9 check local pip version on --pre flag 2013-08-09 04:51:27 +00:00
Colton Myers
8cc128bfd1 Merge pull request #6590 from terminalmage/pip-test-fix 
Update assert in test_pip_installed_weird_install
 2013-08-08 17:02:48 -07:00
Colton Myers
715cf21080 Merge pull request #6589 from techhat/bluetooth 
Overhaul (most of) bluez.py to work with BlueZ 5.7
 2013-08-08 16:55:37 -07:00
Erik Johnson
113e5e9b52 Update assert in test_pip_installed_weird_install 
Pull #6574 changed the state output slightly, breaking this test. This
commit fixes the test.
 2013-08-08 18:43:44 -05:00
Joseph Hall
9647ae326b Fix #5084 2013-08-08 17:40:47 -06:00
Joseph Hall
e4ea236218 Enable discoverable and noscan modes in bluez 2013-08-08 17:34:01 -06:00
Joseph Hall
cfc22d053f Fixing on/off issues with power() function 2013-08-08 17:22:20 -06:00
Thomas S Hatch
6f38d5f35b Merge pull request #6583 from terminalmage/issue5270 
Fix _fulfills_version_spec
 2013-08-08 16:04:42 -07:00
Colton Myers
191f6d1843 Revert "Merge pull request #6573 from erchn/develop" 
This reverts commit 3e1df4f901, reversing
changes made to 9f2018fff4.
 2013-08-08 17:04:07 -06:00
Colton Myers
90e74a61ca Revert "Fix bad ref to srcpath" 
This reverts commit 39b98a35e4.
 2013-08-08 17:04:01 -06:00
Erik Johnson
a04d8ae4e5 Fix _fulfills_version_spec 
This was caught by travis:

https://travis-ci.org/saltstack/salt/jobs/9999843
 2013-08-08 18:02:41 -05:00
Joseph Hall
e1000bf76e Overhaul (most of) bluez.py to work with BlueZ 5.7 2013-08-08 17:00:50 -06:00
Thomas S Hatch
6e623da69c Merge pull request #6585 from basepi/schedulerfix 
Fix scheduler configuration from Pillar, Fix #6201
 2013-08-08 15:58:38 -07:00
Thomas S Hatch
e39d7838bd Add master_call to runner client 2013-08-08 16:44:25 -06:00
Thomas S Hatch
6ad97e6549 Allow the resolver to verify if a token is still valid 2013-08-08 16:42:43 -06:00
Thomas S Hatch
65fc85af89 Add runner check to ck minions 2013-08-08 16:30:18 -06:00
Thomas S Hatch
e1b4ef0dfd Call runner async exec and return runner jid 2013-08-08 16:30:18 -06:00
Thomas S Hatch
4b116f4c91 use low instead to make transfer easier 2013-08-08 16:30:18 -06:00
Colton Myers
06ec194d0f Merge pull request #6586 from whiteinge/grains-filter_by 
Added function filter_by to grains module
 2013-08-08 15:29:06 -07:00
Colton Myers
d1027b99fb Add a CLI example to config.merge 2013-08-08 16:25:26 -06:00
Thomas S Hatch
3a22783e91 Add token getting to the auth resolver 2013-08-08 16:19:23 -06:00
Thomas S Hatch
8d2bbb2c30 Add async runner call to RunnerClient 2013-08-08 16:19:23 -06:00
John MacKenzie
8dece9ba5f Debian Package Architechture 
Debian packages are allowed to designate the package as
architecture-independent by specifying the value 'all' in the
Architecture field of debian/control. Update
salt.modules.apt.install (via
salt.modules.pkg_resource._parse_pkg_meta) to respect this and not
require ':all' appended to a package name in order to install it on a
64bit machine.
 2013-08-08 22:12:16 +00:00
Seth House
341f6c1740 Added function filter_by to grains module 
This will help to keep too much conditional logic out of Jinja templates
by allowing the creation of unobtrusive lookup tables.
 2013-08-08 16:09:09 -06:00
Colton Myers
8a482ad166 Use config.merge instead of config.option for scheduling, Fix #6201 2013-08-08 16:06:17 -06:00
Colton Myers
ad15d04334 Add config.merge function for merginc config values across sources 2013-08-08 16:06:17 -06:00
Colton Myers
1796fb46f9 Fix some formatting 2013-08-08 16:06:17 -06:00
Colton Myers
6fbbdfe309 Merge pull request #6584 from basepi/pkgformatting 
Fix formatting in salt.states.pkg.py
 2013-08-08 15:05:53 -07:00
Colton Myers
290a14a042 Fix formatting in salt.states.pkg.py 2013-08-08 16:05:15 -06:00
Thomas S Hatch
b2e8aa182e Initial add of runner being called from the master 2013-08-08 15:46:03 -06:00
Thomas S Hatch
39b98a35e4 Fix bad ref to srcpath 2013-08-08 15:46:03 -06:00
Thomas S Hatch
f3d81dd4ef Merge pull request #6579 from terminalmage/develop 
Fix traceback on master when cp.push is used without file_recv being set
 2013-08-08 14:44:10 -07:00
Joseph Hall
022a7499d7 Merge pull request #6582 from hulu/string-terminology 
less confusing string terminology; capitalize SSH
 2013-08-08 14:38:17 -07:00