Commit Graph

3391 Commits

Author SHA1 Message Date
Thomas S Hatch
1acbbeee4a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-15 09:57:16 -06:00
Thomas S Hatch
630f96e175 fix caps in jobs.active 2012-03-15 09:56:46 -06:00
Thomas S Hatch
8ba0ab81ee Merge pull request #912 from dcolish/develop
Some small fixes
2012-03-14 20:06:20 -07:00
Dan Colish
fde0b31261 Try to support sed options across multiple platforms 2012-03-14 20:03:59 -07:00
Dan Colish
350e9d6d6d Fix var name in minion config 2012-03-14 20:03:33 -07:00
Thomas S Hatch
45801f8b3a Merge pull request #911 from grierj/contribute
Adding hardcoded appendable domain
2012-03-14 18:48:25 -07:00
Thomas S Hatch
c810c5a02a Seperate out key Highstate object components
This change will make extending the Highstate object and adding in a
custom file client and state a viable option
2012-03-14 19:43:45 -06:00
Grier Johnson
f0134bb83f Fixing typo 2012-03-14 18:42:28 -07:00
Grier Johnson
3a3db83012 Adding in append_domain config values. Allows for a harcoded domain to
be appended to minions.  This helps with systems like solaris who, by
default, give back the short name when you ask for socket.getfqdn()
2012-03-14 18:35:07 -07:00
Thomas S Hatch
d87c8016b9 Add loggign to caller.py 2012-03-14 19:28:15 -06:00
Thomas S Hatch
3de9fe0569 Merge pull request #910 from gordonm/develop
Develop
2012-03-14 17:47:48 -07:00
Gordon McAllister
72c2014767 War on typos
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Gordon McAllister
e297628db2 Fix show_lowstate example in docstring 2012-03-14 17:07:46 -07:00
Thomas S Hatch
2ff79fee22 Add providers to config.py 2012-03-14 15:12:02 -06:00
Thomas S Hatch
2003cd7b42 Add providers blurb to minion config 2012-03-14 15:11:11 -06:00
Thomas S Hatch
4481b26c9b Add providers to the capabilities of the minion config 2012-03-14 15:07:17 -06:00
Thomas S Hatch
6c10c17fbf pull out executable on windows 2012-03-14 14:24:41 -06:00
Thomas S Hatch
1e625de5c1 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-14 12:36:16 -06:00
Thomas S Hatch
299843245d fix grains/core.py static reference to cmd.run 2012-03-14 12:35:45 -06:00
Thomas S Hatch
8384c788ce Merge pull request #908 from UtahDave/fix_some_docs
Fix small typo
2012-03-14 10:50:57 -07:00
David Boucha
eaa0c5ec92 Fix small typo 2012-03-14 11:40:37 -06:00
Thomas S Hatch
a3ab251669 Merge pull request #902 from vittyvk/develop
Develop
2012-03-14 08:16:39 -07:00
Vitaly Kuznetsov
d9e744e1c3 If we switch to another user pidfiles must be written from
original one (possibly root) as pidfiles in /var/run are usually
owned by this original user.
2012-03-14 11:53:33 +00:00
Thomas S Hatch
d1359577b4 Merge pull request #901 from SEJeff/fix-unhandled-importerrors
Fix unhandled importerrors
2012-03-13 23:10:19 -07:00
Jeff Schroeder
f701bb8302 Add "Required python modules" to the windows registry module
Also just use a fallthrough in the win_file module
2012-03-13 22:56:08 -07:00
Jeff Schroeder
081d251086 Start documenting optional dependencies and make win_file use it
The new "standard" for documenting non-stdlib python dependencies
is via a module level docstring that includes a line like:

Required python modules: module1, someothermodule, win32api

Add a few helper methods for returning a list of required python
modules which aren't importable and pretty print the error in win_file
2012-03-13 22:41:51 -07:00
Thomas S Hatch
7079dbf04f Add saltutil.refresh_pillar 2012-03-13 23:19:48 -06:00
Jeff Schroeder
18010c2cf6 Rename the cmd module file to cmdmod to not overwrite stdlib
This makes debugging other modules with pdb when developing hard
2012-03-13 22:14:39 -07:00
Jeff Schroeder
0e66b77fcf A few small changes to the cmd module before renaming the file 2012-03-13 22:12:23 -07:00
Thomas S Hatch
7de557d64c change test.kpass to test.kwarg 2012-03-13 23:01:16 -06:00
Thomas S Hatch
fc3acae586 Add check for refreshing the pillar data int he module_refresh file 2012-03-13 22:56:07 -06:00
Thomas S Hatch
49d905db13 Merge pull request #900 from teancom/develop
another typo
2012-03-13 21:41:55 -07:00
David Bishop
51dc7c26df apostrophes are hard 2012-03-14 00:39:47 -04:00
David Bishop
a5159c840e another typo 2012-03-14 00:34:37 -04:00
Jeff Schroeder
9136b2eb85 Fix a small tyop in the pillar example 2012-03-13 21:28:51 -07:00
Thomas S Hatch
deabc3be5a Pass in publication data via kwargs if the function has it
This commit makes it so that module functions that accept **kwargs will
have the publication data passed through as __pub_<item>.
2012-03-13 22:03:02 -06:00
Thomas S Hatch
dc85814aa3 Add test for module kwarg passing 2012-03-13 22:01:56 -06:00
Thomas S Hatch
6921bf03fe Merge pull request #897 from SEJeff/fix-zmq-vercheck
Fix zmq vercheck
2012-03-13 14:01:49 -07:00
Jeff Schroeder
10756d5f16 Successfully return from the version check when using a dev copy of zmq. 2012-03-13 13:53:41 -07:00
Thomas S Hatch
8ca789ba7d Add id to minion publication data 2012-03-13 13:28:54 -06:00
Thomas S Hatch
ab0f7236bf Fix #888 2012-03-13 13:05:12 -06:00
Thomas S Hatch
69e2648fbd Add jid to full data minion publish return 2012-03-13 12:56:16 -06:00
Thomas S Hatch
6bd9a13197 Add full_returns to publish interactions 2012-03-13 12:50:03 -06:00
Thomas S Hatch
dcd662ce85 clean up the function def and change kwarg to form 2012-03-13 12:15:24 -06:00
Thomas S Hatch
21ee588f15 Add full data function to publish 2012-03-13 12:13:42 -06:00
Thomas S Hatch
a268f66162 Add check for functions with whitespace 2012-03-13 11:03:25 -06:00
Thomas S Hatch
4a5f8d2f3f Include docs in source tarball 2012-03-13 10:19:31 -06:00
Thomas S Hatch
8f318549cf Fix issue where only one of the group or user is passed 2012-03-13 09:11:41 -06:00
Vitaly Kuznetsov
bd9ae07865 Revert "Add all master processes to pidfile"
This reverts commit da2df29028.

Conflicts:

	salt/__init__.py
2012-03-13 11:47:01 +00:00
Thomas S Hatch
1a4f244a88 Merge pull request #890 from teancom/develop
very small change
2012-03-12 20:28:04 -07:00