Commit Graph

29292 Commits

Author SHA1 Message Date
Thomas S Hatch
eb03e88c60 Merge pull request #12054 from whiteinge/salt-grains-changes
Added missing truthy changes to the grains states return
2014-04-17 07:38:09 -06:00
Pedro Algarvio
6a327c69ae Merge pull request #12069 from techhat/issue12062
Parted updates as per @davidone
2014-04-17 14:16:40 +01:00
Pedro Algarvio
df9657f567 Merge pull request #12068 from techhat/sensors
Cleaning up code as per @s0undt3ch
2014-04-17 14:08:44 +01:00
Joseph Hall
f63d866b40 Update __virtual__ for parted dependencies 2014-04-17 06:47:27 -06:00
Joseph Hall
6c5ee23313 Add revised code from @davidone #12062 2014-04-17 06:42:18 -06:00
Joseph Hall
41f77b3374 Cleaning up code as per @s0undt3ch 2014-04-17 06:35:12 -06:00
Joseph Hall
b48cdaa382 Merge pull request #12060 from cachedout/sensors2
An execution module to pull data from lm-sensors
2014-04-17 06:34:18 -06:00
Joseph Hall
5bc54a2572 Merge pull request #12067 from conkiztador/develop
Fix doc typo
2014-04-17 06:23:34 -06:00
Kieran Spear
20c2583b8e Fix doc typo 2014-04-17 22:18:20 +10:00
Seth House
9646ef9706 Switch Google search to search box only
This takes the user to Google's site directly instead of opening a new
window for each query.
2014-04-17 01:23:35 -06:00
David Boucha
e271af84b2 Merge pull request #12061 from UtahDave/develop
Point docs to the 2014.1.3 Windows Installers
2014-04-17 00:45:12 -06:00
David Boucha
a15d861f05 Point docs to the 2014.1.3 Windows Installers 2014-04-17 00:43:19 -06:00
Seth House
a133c15e77 Merge branch 'doc-google-custom-search' into develop 2014-04-17 00:06:00 -06:00
Seth House
f723c4e8dd Remove OpenSearch configuration
I don't know what this is or does.
2014-04-16 23:59:45 -06:00
Seth House
b01bf7cab0 Add environment variable check to switch search providers
Using Google's search is an opt-in. Defaults to Sphinx-native
search.
2014-04-16 23:59:40 -06:00
Seth House
2c659f033b Remove RTD check for theme selection 2014-04-16 23:58:58 -06:00
Seth House
ffc35fb565 Add template for using Google's customized search 2014-04-16 23:58:11 -06:00
Mike Place
2dfdbfba97 An execution module to pull data from lm-sensors 2014-04-16 22:50:28 -06:00
Seth House
fbed073db4 Added missing truthy changes to the grains states return 2014-04-16 22:18:27 -06:00
Thomas S Hatch
1c44a835b2 Merge pull request #12059 from mlister2006/develop
ScientificLinux : Use of correct grain value in modules/service.py
2014-04-16 22:07:07 -06:00
mlister2006
0db6e9a3f2 ScientificLinux : Use of correct grain value in modules/service.py
Small bug fix.
modules/service.py should use correct grain value for ScientificLinux
as reported below.

# salt-call grains.item os
local:
  os: ScientificLinux
2014-04-16 22:58:43 -04:00
Seth House
cbe7c7e39f Merge pull request #12058 from s0undt3ch/develop
Improvements to the chef module
2014-04-16 19:25:54 -06:00
Pedro Algarvio
48e3d9b0c3 Several improvements to the chef module.
* Use decorators to check for required binaries.
* Double to single quotes
* Use `.format()`
2014-04-17 02:02:14 +01:00
Pedro Algarvio
c9f3b6cf8a True should be returned instead. 2014-04-17 01:57:03 +01:00
Pedro Algarvio
f5cef67700 Merge pull request #12049 from terminalmage/issue12020
Clenup docker state docs, add note about double-indent
2014-04-17 00:22:53 +01:00
Pedro Algarvio
e31abb8390 Merge pull request #12055 from UtahDave/develop
pylint fixes.
2014-04-17 00:19:05 +01:00
David Boucha
2092aa2b6d pylint fixes.
remove trailing whitespace
properly format log.debug() arguments
2014-04-16 17:11:10 -06:00
Mike Place
179316b4d2 Merge pull request #12053 from silviud/chef_integration
chef integration
2014-04-16 16:24:34 -06:00
Joseph Hall
a91ea9c5fb Merge pull request #12050 from cachedout/11994
Set last-changed field in /etc/shadow on passwd change
2014-04-16 15:18:21 -06:00
Thomas S Hatch
93a23af497 Merge pull request #12051 from philipsd6/hotfix-urllib3-import
Import the chardet package for urllib3, using the bundled package if necessary.
2014-04-16 15:11:24 -06:00
Thomas S Hatch
4d6f833194 Merge pull request #12048 from rallytime/requisites_docs
Updated Requisites doc and added examples to watch_in
2014-04-16 15:04:53 -06:00
Thomas S Hatch
e8353bc798 Merge pull request #12047 from JustinHead/develop
Update the key removal to use the corrected key_file variable
2014-04-16 15:04:19 -06:00
Thomas S Hatch
83df553497 Merge pull request #12042 from cachedout/9526
Make jobs.active work correctly.
2014-04-16 15:03:18 -06:00
Mike Place
5ea1f6a819 Set last-changed field in /etc/shadow on passwd change 2014-04-16 14:47:55 -06:00
Philip Douglass
acebbdf8c6 Import the chardet package for urllib3, using the bundled package if necessary. 2014-04-16 16:47:21 -04:00
Erik Johnson
06f1def57e Clenup docker state docs, add note about double-indent
This fixes some bad indentation in the docstring
2014-04-16 15:41:54 -05:00
rallytime
315247f208 Name consistency 2014-04-16 14:26:59 -06:00
rallytime
5354290157 Small yaml fix 2014-04-16 14:25:07 -06:00
rallytime
51bb1d31e6 Updated Requisites doc and added more explanation and examples to watch_in 2014-04-16 14:19:03 -06:00
Justin Head
83d1297225 Update the removal of the key to use the corrected key_file var. 2014-04-16 15:17:08 -05:00
JustinHead
fe770f6805 Merge pull request #2 from saltstack/develop
Pull in latest upstream.
2014-04-16 15:01:45 -05:00
Colton Myers
3729ecb1cf Merge pull request #12045 from basepi/2014.1.2releasenotes
Add more release notes, take out rich text quotes on 2014.1.2.rst
2014-04-16 13:56:05 -06:00
Colton Myers
b7ce0cdc39 Add more release notes, take out rich text quotes on 2014.1.2.rst 2014-04-16 13:47:23 -06:00
Gareth J. Greenaway
ab0ee5539a fixing lint issues. 2014-04-16 12:27:40 -07:00
Gareth J. Greenaway
f1b9c0eb18 removing unused logging import. 2014-04-16 12:13:28 -07:00
Gareth J. Greenaway
721f2da17d Adding the ability to invert rules in the iptables module and state. The rules can be inverted by placing a ! or the word not before the contents of the kwarg argument in either the module call from the CLI or the state file.
Adding a re.compile for the pattern used in the re.sub since it is used often.
2014-04-16 12:13:27 -07:00
Mike Place
b6daf39058 Make jobs.active work correctly.
* Fixed output of running minions (#9526)
* Correctly identify returned minions.
2014-04-16 12:49:17 -06:00
Thomas S Hatch
c4ac4754ee Merge pull request #12038 from ticosax/add-support-multi-docker-engine
Since docker is using multiple driver extend its attach support.
2014-04-16 12:28:00 -06:00
Thomas S Hatch
a733cd1bae Merge pull request #12036 from southquist/improved-softwareupdate
new download functions and other improvements
2014-04-16 12:25:30 -06:00
Thomas S Hatch
fefcfe9116 Merge pull request #12035 from jeroennijhof/develop
Add LDAP uri option and fix deficiencies
2014-04-16 12:24:07 -06:00