Commit Graph

49620 Commits

Author SHA1 Message Date
Mike Place
adb8d5c718 Merge pull request #22054 from jfindlay/log_color
convert custom LogRecord attribute formatting from {}- to %-style
2015-03-30 10:37:18 -06:00
Mike Place
4ad94fb895 Merge pull request #22154 from cachedout/language_fixup
Small grammar fixup
2015-03-30 10:27:49 -06:00
Mike Place
b98269ad38 Small grammar fixup 2015-03-30 10:27:06 -06:00
Mike Place
8ff88d6b89 Merge pull request #22078 from pengyao/summary
Adjust cli_summary
2015-03-30 10:25:05 -06:00
Mike Place
696065a037 Merge pull request #22133 from eliasp/develop-pilar_ldap-map-support
Implement 'map' mode in LDAP pillar module
2015-03-30 10:08:10 -06:00
Mike Place
98bc85a399 Merge pull request #22123 from F30/autodoc-fix
Fix custom Sphinx formatter for aliased functions
2015-03-30 10:05:20 -06:00
Mike Place
0c95690635 Merge pull request #22120 from cr0hn/patch-1
Update vt.py
2015-03-30 10:01:18 -06:00
Mike Place
6fd00e3a0d Merge pull request #22125 from notpeter/develop
Add documentation for multiple Ubuntu PPAs. Fixes #18822
2015-03-30 09:59:31 -06:00
Mike Place
2211150ea2 Merge pull request #22135 from garethgreenaway/osquery_module
Adding a module to pull information from the osquery daemon.
2015-03-30 09:41:30 -06:00
Mike Place
3267b42374 Merge pull request #22140 from claudiupopescu/boto_describe_subnets_fix
Boto VPC describe subnets
2015-03-30 09:27:04 -06:00
jfindlay
229087b731 Merge pull request #22139 from jayeshka/supervisord-unit-test
adding supervisord unit test case
2015-03-30 07:19:29 -06:00
Corin Kochenower
feb1aad6db Merge branch 'StepOneInc-cassandra-cql' into develop 2015-03-30 07:08:39 -06:00
Claudiu Popescu
2112ee94aa Describe a specific subnet only by providing ID 2015-03-30 14:52:55 +02:00
Corin Kochenower
f561506c8b Changes required for initial module acceptance
String formatting changes required by the Salt linter.

Allow other modules to cross-call the _query function which
has been renamed to cql_query. A Cassandra returner will
bootstrap from this (cassandra_cql) module.

Hande/Raise exceptions from the cql_query function.
2015-03-30 06:52:32 -06:00
Corin Kochenower
7e90f1bf0a Merge branch 'cassandra-cql' of https://github.com/StepOneInc/salt into StepOneInc-cassandra-cql 2015-03-30 06:44:36 -06:00
Jayesh Kariya
28909e3b71 added requested change. 2015-03-30 17:48:29 +05:30
Claudiu Popescu
f93836f6ea Describe all subnets 2015-03-30 12:47:50 +02:00
Jayesh Kariya
c8614e4708 adding supervisord unit test case 2015-03-30 16:09:38 +05:30
Gareth J. Greenaway
64216deb1d fixing lint error 2015-03-29 20:57:29 -07:00
jfindlay
f475b0a5ea Merge pull request #22134 from zboody/virt-query-error
Fixes #9960
2015-03-29 21:04:11 -06:00
Gareth J. Greenaway
8287fd664b Adding a module to pull information from the osquery daemon. 2015-03-29 19:19:13 -07:00
Zach Boody
c404e40f20 Fixes #9960 2015-03-29 19:20:55 -05:00
Elias Probst
23278cb2d3 Improved documentation. 2015-03-30 01:59:25 +02:00
Elias Probst
418255125d Implemented 'map' mode. 2015-03-30 01:59:12 +02:00
Elias Probst
f895fd1be4 Document LDAP pillar module. 2015-03-30 01:59:06 +02:00
Elias Probst
58f501b743 First improvements to example in doc. 2015-03-30 01:59:00 +02:00
Elias Probst
c00c14f2be Initial documentation improvements for pillar.pillar_ldap 2015-03-30 01:58:54 +02:00
Peter Tripp
960df2b043 Add documentation for multiple Ubuntu PPAs. Fixes #18822 2015-03-29 00:31:07 -07:00
Felix Dreissig
0869680435 Fix custom Sphinx formatter for aliased functions
Regression of @99bcf20: Since Sphinx 1.2.1 (commit
sphinx-doc/sphinx@574a796), sphinx.ext.autosummary overwrites custom-set
documenters.
This is not a particularly elegant solution, but none of the events from
sphinx.ext.autodoc allows editing a function's name. Subclassing other
autodoc classes also appears to be quite challenging.
2015-03-29 01:08:26 +01:00
cr0hn
7122c7722b Update vt.py
Add check for base OS running salt. BSD-like OS break at this point
2015-03-28 20:09:00 +01:00
jfindlay
fb080b1e2f Merge pull request #22107 from lyft/fix-grafana-dict-profile
Fix for grafana dict profiles
2015-03-28 11:17:25 -06:00
Ryan Lane
f6c9b922b0 Fix for grafana dict profiles 2015-03-27 16:01:46 -07:00
Colton Myers
3125264786 Merge pull request #22096 from basepi/ssh_auth.absent.source.versionadded
Add versionadded for ssh_auth.absent source argument
2015-03-27 16:06:11 -06:00
Colton Myers
68a68b3c10 Add versionadded for ssh_auth.absent source argument 2015-03-27 16:05:31 -06:00
jfindlay
689e1ab44a Merge pull request #22070 from dmyerscough/hostnamectl-change
systemd hostnamectl
2015-03-27 15:21:05 -06:00
Erik Johnson
cca5adfddd Merge pull request #22092 from makinacorpus/lxc
lxc: reconfigure fixes
2015-03-27 15:11:02 -05:00
Mathieu Le Marec - Pasquet
ab84acbb64 lxc: reconfigure fix memory 2015-03-27 20:23:45 +01:00
Mathieu Le Marec - Pasquet
08c1125c28 lxc: reconfigure fix gateway 2015-03-27 20:16:04 +01:00
Thomas S Hatch
eafc398724 Merge pull request #22086 from claudiupopescu/boto_vpc_internet_gateway
Adds support for VPC internet gateways
2015-03-27 11:31:23 -06:00
jfindlay
7bc4fc5140 Merge pull request #22079 from jayeshka/nftables-unit-test
adding nftables unit test
2015-03-27 11:17:31 -06:00
Thomas S Hatch
42e7bb89c8 Merge pull request #21798 from isbm/isbm-nagios-module-fixes
Multiple bugixes for new "nagios_json" module
2015-03-27 10:54:22 -06:00
Claudiu Popescu
aa47228aba Adds support for VPC internet gateways 2015-03-27 17:13:17 +01:00
Damian Myerscough
feff926db7 Fixing lint error 2015-03-27 09:05:58 -07:00
Nicole Thomas
5c70cdd349 Merge pull request #22085 from rallytime/pylinting
Python 3 compat for azurefs.py
2015-03-27 09:37:31 -06:00
rallytime
2bd8465023 Python 3 compat for azurefs.py 2015-03-27 09:07:57 -06:00
Jayesh Kariya
0cedee74f5 removed pylint errors 2015-03-27 18:21:56 +05:30
Jayesh Kariya
3351e1c58d added python libs 2015-03-27 17:41:48 +05:30
Jayesh Kariya
38abae54d5 adding nftables unit test 2015-03-27 15:45:51 +05:30
pengyao
88851da872 Adjust cli_summary
In 2014.7, no_return minion will return information in more detail like "No response" or "Not connected"
2015-03-27 17:49:51 +08:00
jfindlay
9deb7a2c78 Merge pull request #22073 from jayeshka/publish-unit-test
adding publish unit test
2015-03-27 00:46:16 -06:00