valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,772 Commits 24 Branches 182 Tags 341 MiB
8f92b6b2cb
Commit Graph

18772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
a745c9028e lxc: actually fix docs and add get/set parameter funcs 2013-10-07 17:36:53 +00:00
Matthew Williams
9a594c58aa ddns: remove debug log message 2013-10-07 17:35:18 +00:00
Matthew Williams
ae86fae63a fix documentation for profiles/nics; add get/set parameter funcs 2013-10-07 17:30:19 +00:00
Samuel M Smith
4978459e40 Merge remote-tracking branch 'upstream/develop' into sam_20131001 2013-10-07 10:01:45 -06:00
David Boucha
7b6fd6710b Merge pull request #7469 from ranl/win_servermanager 
Using shell='powershell' in servermanager/rdp modules
 2013-10-07 08:12:56 -07:00
Luper Rouch
db8eef8f32 Fixed empty file case in modules.file.append() 
Lines are simply inserted at the beginning of the file for empty files.
 2013-10-07 16:31:42 +02:00
Luper Rouch
e5631f2671 Checking for newline at EOF in modules.file.append() 2013-10-07 16:17:25 +02:00
Joseph Hall
99352cee34 Merge pull request #7646 from holmboe/patch-2 
Single vs double backtick
 2013-10-07 05:00:57 -07:00
Joseph Hall
54ce6e501f Merge pull request #7651 from joehealy/debian_updates 
Updated for new release
 2013-10-07 05:00:08 -07:00
Joe Healy
ddf0d72ecd Updated for new release 
Note: this change will primarily have an effect on daily launchpad builds and
then builds for the ubuntu ppa.
 2013-10-07 20:49:34 +11:00
Henrik Holmboe
4ba3b77d5b Single vs double backtick 2013-10-07 08:25:15 +02:00
Dmitry Malinovsky
f6c1f4a962 Added missing arguments check 2013-10-07 10:49:57 +07:00
Thomas S Hatch
8a8c2a68aa Add an initial stub for loading auth data from external sources 2013-10-06 18:02:04 -06:00
Erik Johnson
22cf54c977 Fix remaining refs to pkg.compare 
Pull request #7636 fixed a regression caused by refs to a removed
execution function 'pkg.compare'. This function was moved to salt.utils
and made a common interface so that version comparison could be done
elsewhere in the salt codebase, and these refs were missed when doing
the cleanup.
 2013-10-06 12:51:13 -05:00
Thomas S Hatch
c43dee17e4 Merge pull request #7628 from ajithhub/7597_ssh_zsh_type_which 
Change type to which for ZSH #7597
 2013-10-06 10:14:31 -07:00
Thomas S Hatch
08ff839e46 Merge pull request #7627 from holmboe/issue-7626-tmplpath 
Issue 7626 tmplpath
 2013-10-06 10:12:37 -07:00
Thomas S Hatch
d05b22fd92 Merge pull request #7622 from rmt/develop 
Fix boolean logic so verify_env has meaning
 2013-10-06 10:12:00 -07:00
Thomas S Hatch
9e894f6359 Merge pull request #7639 from evinrude/develop 
Returners function arguments
 2013-10-06 10:10:02 -07:00
Mike Place
6fc8c5a090 Merge remote-tracking branch 'origin/develop' into develop 
* origin/develop:
  The documentation for 'Developing Salt' is missing a critical step for 0.17+ users who wish to utilize the test runner. This commit describes the direct installation of salt-testing.
  -- Please review for accuracy prior to merge --
 2013-10-06 09:43:39 -06:00
Mickey Malone
7e9b082f50 sqlite3 returner support function args 2013-10-06 10:23:59 -05:00
Mickey Malone
3f830a51bf Add function args for returners 2013-10-06 09:42:33 -05:00
ranl
f8a30080f6 typo 2013-10-06 10:44:06 +03:00
ranl
3392028dae Merge branch 'win_servermanager' of github.com:ranl/salt into win_servermanager 
Conflicts:
	salt/modules/rdp.py
 2013-10-06 10:02:48 +03:00
ranl
57267d4716 using shell='powershell' 2013-10-06 09:58:59 +03:00
ranl
1caa086a2f Merge branch 'develop' into win_servermanager 
Conflicts:
	salt/modules/rdp.py
 2013-10-06 09:21:09 +03:00
Joseph Hall
6db389b15d Merge pull request #7636 from terminalmage/issue7624 
Fix regression in apt
 2013-10-05 19:22:27 -07:00
Erik Johnson
3b4f887fbb Fix regression in apt 
Not sure how this was missed, but pkg.compare no longer exists, as
package comparison was moved to a common function in salt.utils. This
commit fixes the regression and thus resolves #7624.
 2013-10-05 21:04:37 -05:00
Pedro Algarvio
e7ae71f3cd Merge pull request #7633 from s0undt3ch/issues/7244-archive.tar-untar 
Properly format the call(missing white-space).
 2013-10-05 07:55:55 -07:00
Joseph Hall
1ac4fb2b0a Merge pull request #7632 from s0undt3ch/issues/7244-archive.tar-untar 
Properly support decompressing `tar` files. Refs #7244.
 2013-10-05 07:53:12 -07:00
Pedro Algarvio
7b0d7b6ae1 Properly format the call(missing white-space). 2013-10-05 15:53:02 +01:00
Pedro Algarvio
7b68ffdeff Properly support decompressing tar files. Refs #7244. 2013-10-05 15:50:53 +01:00
Thomas S Hatch
e5b021f1c8 Strat on the Authorize class to localize the auth 2013-10-05 08:34:52 -06:00
Pedro Algarvio
87d561ff9c Merge pull request #7638 from s0undt3ch/features/pylint-pep8 
Pylint Checking PEP8
 2013-10-06 08:29:07 -07:00
Pedro Algarvio
5c09aa1460 Check PEP8 using Pylint 2013-10-06 16:18:29 +01:00
Joseph Hall
57e69016d2 Merge pull request #7637 from virtua-network/fix-smf 
Allow SmartOS to use the smf module
 2013-10-06 05:18:49 -07:00
Pedro Algarvio
bcd908ca2b Check PEP8 using Pylint 2013-10-06 12:21:49 +01:00
mguegan
5b4055db40 Allow SmartOS to use the smf module 2013-10-06 11:05:25 +02:00
Ajith Antony
dfe2a24961 More salt-ssh improvements than belong in this issue 
- Explict bourne shell, there is no other way to get broad compability
- test python version in SHIM
- inspect SHIM output for errors, and report sensible error results
- Refactor some stuff to consolidate deploy behavior.  We still test and
  attempt deploy in at least 3 other palces yet.
- factor run_wfunc out of single.run for obvious reasons
 2013-10-05 02:37:41 -07:00
Jacob Magnusson
971953e883 YAML filter fix, take 2 2013-10-05 03:22:11 +02:00
Jacob Magnusson
1b306b9eb2 Fix for yaml template filter outputting raw OrderedDict repr 2013-10-05 02:16:41 +02:00
Erik Johnson
4a8a6b039c Fix custom grain chicken-and-egg issue in highstates 
This commit re-gathers pillar data if custom grains were synced during a
highstate.
 2013-10-04 19:11:27 -05:00
Ajith Antony
e485a9e607 Change type to which for ZSH #7597 
- The original SHIM did not save the resturn value of `type`.  It would
  just test for a good result, then use the unqualifed command name.
- I changed the SHIM to save the fully-qualified path as retuned becuase
  when using `sudo` the PATH may not be the same as the logged-in user.
- `type` output on ZSH apparently differs from other shells:

      ZSH:

      [aantony@pan]/work/salt/salt-develop% type -p python
      python is /work/salt/salt-develop/salt-virtualenv2.7/bin/python
      ^^^^^^^^^
      BASH:

      aantony@pan [619] $ type -p python
      /work/salt/salt-develop/salt-virtualenv2.7/bin/python

- `which`is consistent across them, and I would expect most shells.
 2013-10-04 16:57:59 -07:00
Henrik Holmboe
e3a223c7cd Catch file not found 2013-10-05 00:32:11 +02:00
Henrik Holmboe
2aaf9e0e6d Verticalize arguments 2013-10-05 00:31:42 +02:00
Henrik Holmboe
4daec2e23b Honor tmplpath in wrapped template renderers 
Before this change you had to directly use `render_*_tmpl()` in order to
use `tmplpath`. Failing that, by using the renderers wrapped with
`wrap_tmpl_func()` the `tmplpath` argument was not used.

Fixes saltstack/salt#7626
 2013-10-05 00:31:03 +02:00
Colton Myers
4130cafabc Merge pull request #7623 from s0undt3ch/hotfix/jenkins 
Fix `test_issue_6973_state_highstate_exit_code`.
 2013-10-04 14:08:25 -07:00
Pedro Algarvio
8f0a19946d Fix test_issue_6973_state_highstate_exit_code. 2013-10-04 21:31:46 +01:00
Thomas S Hatch
a280c4dfa1 Merge pull request #7621 from cachedout/develop 
Documentation changes/updates
 2013-10-04 12:09:00 -07:00
Thomas S Hatch
ffdbdbb8d6 Merge pull request #7620 from s0undt3ch/hotfix/jenkins 
Patch `salt.utils.which` to fix Django tests.
 2013-10-04 12:07:28 -07:00
Robert M. Thomson
5d15d72396 Fix boolean logic so verify_env has meaning 2013-10-04 20:39:56 +02:00