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
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
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
Thomas S Hatch
e1af647e5b
Merge pull request #12026 from iquaba/show-jid
...
--show-jid
2014-04-16 12:23:24 -06:00
Thomas S Hatch
241725e01f
Merge pull request #12019 from terminalmage/issue11907
...
Fix os grains for OpenSolaris/OpenIndiana Development
2014-04-16 12:22:30 -06:00
Thomas S Hatch
a643605d4d
Merge pull request #12014 from terminalmage/netbsd-syspaths
...
Set proper fallback CONFIG_DIR for NetBSD
2014-04-16 12:20:22 -06:00
Thomas S Hatch
e51b1c81e7
Merge pull request #12009 from fictivekin/allow-multiple-git-ids
...
Allow multiple identities for git
2014-04-16 12:19:56 -06:00
silviu dicu
8af095d922
chef integration
2014-04-16 14:00:32 -04:00
Joseph Hall
f10584856d
Merge pull request #12041 from techhat/libcloud
...
Remove libcloud as a hard dep for salt-cloud
2014-04-16 11:11:01 -06:00
Joseph Hall
2feab37658
Merge pull request #12040 from JustinHead/develop
...
Use cloud profile to determine key on delete
2014-04-16 10:54:30 -06:00
Joseph Hall
3f623fee26
Removing unused import
2014-04-16 10:45:29 -06:00
Thomas S Hatch
c112a97fe2
Only import zmq if we need to
2014-04-16 10:11:43 -06:00
Nicolas Delaby
3fb905574b
Since docker is using multiple driver extend its attach support.
...
Add support for attaching processes to a container driven by libcontainer.
lxc is still supported.
2014-04-16 18:11:37 +02:00
Joseph Hall
a82b2a3ea3
Remove libcloud as a hard dep for salt-cloud
2014-04-16 09:58:04 -06:00
Thomas S Hatch
07a073034c
Merge pull request #12005 from st0ne-dot-at/pillar_show
...
added runner pillar.show_pillar
2014-04-16 09:52:19 -06:00
Thomas S Hatch
23c441044c
Merge pull request #12004 from ticosax/fix-variable-scope
...
Fix variable definition in wrong scope
2014-04-16 09:51:24 -06:00
Justin Head
8b58c58635
Find key file via profile config on destroy the same way it is found on create.
2014-04-16 10:49:04 -05:00
