valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,664 Commits 24 Branches 182 Tags 341 MiB
83ba45c5a3
Commit Graph

16664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
83ba45c5a3 Merge pull request #6749 from whiteinge/filter_by-override 
Allow filter_by to be overridden by pillar values
 2013-08-16 15:34:58 -07:00
Seth House
c6b312bd97 Added flag to allow overriding the grains.filter_by dict with Pillar 2013-08-16 15:37:31 -06:00
Seth House
b35c74f942 Improved grains.filter_by usage example with multiple lookups 2013-08-16 15:37:31 -06:00
Seth House
3acc84fe5e Added param docs to grains.filter_by 2013-08-16 15:37:31 -06:00
Pedro Algarvio
72e94511b2 Merge pull request #6742 from terminalmage/issue6733 
Fix FTP authentication in the salt fileclient
 2013-08-16 12:32:18 -07:00
Pedro Algarvio
f696c5a7c6 Merge pull request #6743 from SmithSamuelM/develop 
Added 'success' field to successful runner return events
 2013-08-16 12:30:30 -07:00
Samuel M Smith
d61961933d Prefix runner fun with 'runner' so round trip symmetric with api interface 2013-08-16 13:00:15 -06:00
Samuel M Smith
6b603a9cee Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	salt/runner.py
 2013-08-16 12:50:45 -06:00
Samuel M Smith
7282b88585 Added 'success' field to successful runner return events 2013-08-16 12:48:44 -06:00
Erik Johnson
046a2bf6db Fix FTP authentication in the salt fileclient 
4f36393 inadvertently broke FTP authentication by stripping the username
and password from URIs and trying to use an HTTP authenticator. This
commit restricts that behavior to http(s) URIs. Fixes #6733.
 2013-08-16 13:45:47 -05:00
Pedro Algarvio
7ff16157a2 Merge pull request #6738 from terminalmage/walkthrough-fix 
Clarify the minion ID generation docs
 2013-08-15 21:01:21 -07:00
Erik Johnson
a59b5149c6 Clarify the minion ID generation docs 2013-08-15 22:23:14 -05:00
Thomas S Hatch
378a41ab7e Merge pull request #6736 from s0undt3ch/features/reusable-warn-until 
Allow other SaltStack projects to reuse `warn_until`.
 2013-08-15 19:54:58 -07:00
Thomas S Hatch
58c4ecdb10 Merge pull request #6737 from s0undt3ch/hotfix/6710-skip-network-tests 
Allow network related tests to be skipped if no network is available
 2013-08-15 19:53:54 -07:00
Pedro Algarvio
5ea7c2ce4e Finish the obfuscation work started on e58e895. 2013-08-16 03:03:18 +01:00
Pedro Algarvio
2d06026f19 Merge pull request #6731 from s0undt3ch/develop 
Remove trailing white-space and some line wrapping.
 2013-08-15 18:21:33 -07:00
Seth House
a97817abfa Added note about Salt versions to formulas doc 2013-08-15 19:20:56 -06:00
Pedro Algarvio
2f750ed06c Allow network related tests to be skipped if no network is available. Fixes #6710. 2013-08-16 02:02:37 +01:00
Pedro Algarvio
1bce964105 Remove trailing white-space and some line wrapping. 2013-08-16 01:40:50 +01:00
Pedro Algarvio
7e9e889cf7 Allow other SaltStack projects to reuse warn_until. 2013-08-16 01:39:23 +01:00
Pedro Algarvio
afddbc8ee9 Merge pull request #6734 from terminalmage/issue6645 
Check /etc/hostname to derive minion id
 2013-08-15 16:29:32 -07:00
Erik Johnson
94b088d98c Use raw string in regex 
This quiets pylint, as it complains when a regex contains a backslash
and the string is not a raw string.
 2013-08-15 18:12:52 -05:00
Erik Johnson
ce9b2728a0 Add documentation on how the minion id is derived 2013-08-15 18:03:38 -05:00
Erik Johnson
f0240de257 Check /etc/hostname before socket.getfqdn() in get_id() 
This fixes #6645 by checking /etc/hostname first before trying
socket.getfqdn().
 2013-08-15 18:00:40 -05:00
Seth House
506ad11889 Added missing 'eauth' to LocalClient as an optional kwarg 2013-08-15 16:28:51 -06:00
Seth House
bb8e617c57 Quiet Sphinx warning for deprecated Python API doc 2013-08-15 16:15:49 -06:00
Seth House
8724439bd5 Replace cross-references from :py:mod to :ref: for module types 2013-08-15 16:12:49 -06:00
Seth House
4d3012d9db Removed the "Python API" document in favor of the "Clients" doc 
This change moves some docs into class docstrings and some into the
clients/index.rst document.

Fixes #6705
 2013-08-15 16:00:02 -06:00
Erik Johnson
382021004b Merge pull request #6728 from cvrebert/patch-1 
returners.mysql: fix unusual capitalization in log message
 2013-08-15 13:13:47 -07:00
Erik Johnson
c88990933e Merge pull request #6729 from kaptk2/develop 
Updating to version 0.16.3
 2013-08-15 13:13:11 -07:00
Andrew Niemantsverdriet
c53e3717b0 Updating to version 0.16.3 2013-08-15 14:08:38 -06:00
Chris Rebert
b0d291c869 returners.mysql: fix unusual capitalization in log message 2013-08-15 12:54:34 -07:00
Thomas S Hatch
dfacef22ab define the cmd after working out augments 2013-08-15 13:34:58 -06:00
Thomas S Hatch
fddd6083fc File_roots values are lists! 2013-08-15 13:32:33 -06:00
Thomas S Hatch
7cca9c5a62 Pass the correct values to tarfile 2013-08-15 13:12:16 -06:00
Thomas S Hatch
22bc936030 Merge pull request #6725 from SmithSamuelM/develop 
Added name spaced event tags to runner
 2013-08-15 11:36:41 -07:00
Thomas S Hatch
5cdaace6aa Merge pull request #6720 from KennethWilke/develop 
Added exception in ldap auth module
 2013-08-15 11:36:05 -07:00
Thomas S Hatch
4a9ba285ca Merge pull request #6726 from s0undt3ch/develop 
Jenkins pylint reported fixes.
 2013-08-15 11:34:23 -07:00
Thomas S Hatch
04262fa20b Merge pull request #6723 from terminalmage/issue6656 
Fix undefined variable
 2013-08-15 11:33:56 -07:00
Samuel M Smith
9cde7dfce0 Merge remote-tracking branch 'upstream/develop' into develop 2013-08-15 12:17:06 -06:00
Samuel M Smith
3b6ceb6816 Updated runner to use new name spaced event tags 
Also no generated 'new' event at start of runner
passes event tag and jid into low dict so future runners can
emit intermediate events
 2013-08-15 12:13:49 -06:00
Samuel M Smith
5490d50db0 Added 'run' prefix to TAGS 
Added more comments
 2013-08-15 12:13:21 -06:00
Pedro Algarvio
8e0957a729 Fix undefined variable error 2013-08-15 19:09:45 +01:00
Pedro Algarvio
3931516dd8 os.sep is not callable. Add missing imports. Fix except OSError assignment. 2013-08-15 19:05:27 +01:00
Kenneth Wilke
3d5a7558e2 Removed logging to please the thatch 2013-08-15 12:47:16 -05:00
Kenneth Wilke
f706b4913f Raise exception if ldap auth module not available 2013-08-15 12:46:29 -05:00
Erik Johnson
56951f497b Fix undefined variable 
88399f3 introduced an undefined variable, this fixes that.
 2013-08-15 12:42:42 -05:00
Thomas S Hatch
707ca074ec Merge pull request #6716 from UtahDave/develop 
4 spaces, not 2 spaces. Use single quotes,
 2013-08-15 10:35:03 -07:00
Thomas S Hatch
064bd6a2d2 Merge pull request #6719 from terminalmage/issue6656 
Include secondary IP addresses in ip_addrs{,6}
 2013-08-15 10:34:47 -07:00
Kenneth Wilke
2956b3e237 Added warning for import error in ldap auth 2013-08-15 12:29:16 -05:00