Skip to content
Commits on Dec 22, 2012
  1. @terminalmage @thatch45
  2. @terminalmage @thatch45

    Restrict import of pkgutil.py to Solaris only

    This fixes #2994.
    terminalmage committed with thatch45 Dec 21, 2012
  3. @jacksontj @thatch45
  4. @thatch45
  5. @tf198 @thatch45

    Make pidfile respect root_dir setting

    Conflicts:
    	salt/config.py
    tf198 committed with thatch45 Dec 21, 2012
Commits on Dec 21, 2012
  1. @thatch45

    Added test to support alternate SERVICE_DIR location

    Christer Edwards committed with thatch45 Dec 20, 2012
Commits on Dec 20, 2012
  1. @s0undt3ch @thatch45
  2. @thatch45

    List modules that aren't in the kernel folder.

    Jeff Hutchins committed with thatch45 Dec 20, 2012
  3. @s0undt3ch @thatch45

    Set linger on ZMQ sockets before closing, stops issues with `context.…

    …term()` hanging indefinitely. Refs #2958.
    
    * Any unsent messages a socket which does not have `linger` set to a positive value, will make `context.term()` hang indefinitely. See zeromq/pyzmq#102 for more info.
    s0undt3ch committed with thatch45 Dec 20, 2012
  4. @thatch45

    Fix mounting issue introduced by e01c3d5

    Jeff Hutchins committed with thatch45 Dec 20, 2012
  5. @thatch45

    coding style changes for issue #2941

    - update import os and use os.sep
    - import the specific jinja2.exceptions exception and catch it by
      name rather than catching generic "Exception"
    
    Conflicts:
    	salt/modules/rh_ip.py
    Mike Chesnut committed with thatch45 Dec 19, 2012
  6. @thatch45

    fixing os.path import and function use as mentioned in #2928

    thatch45 comment that we don't want to import the exists and join
    functions into this module "bare" as they would then be totally
    exposed to salt (and callable from salt, e.g., rh_ip.exists),
    which we don't want.  this change fixes that and calls the functions
    as os.path.exists and os.path.join instead.
    Mike Chesnut committed with thatch45 Dec 19, 2012
  7. @thatch45

    coding style changes for issue #2941

    - update import os and use os.sep
    - import the specific jinja2.exceptions exception and catch it by
      name rather than catching generic "Exception"
    Mike Chesnut committed with thatch45 Dec 19, 2012
  8. @thatch45

    change from jinja's PackageLoader to FileSystemLoader

    this removes the dependency on distribute (setuptools) at runtime.
    added some checks around each of the calls to get_template, to
    catch the exception thrown when the template environment cannot be
    loaded by the FileSystemLoader.
    
    a good TODO / follow-up to this would be to enhance
    states/network.py to better handle the situations this creates...
    Mike Chesnut committed with thatch45 Dec 18, 2012
  9. @thatch45

    bump version to 0.11.1

    thatch45 committed Dec 19, 2012
Commits on Dec 19, 2012
  1. @thatch45

    Fix #2958

    thatch45 committed Dec 19, 2012
  2. @thatch45

    Fix issue from bad merge

    thatch45 committed Dec 19, 2012
  3. @thatch45
  4. @giantlock @thatch45

    cron.raw_cron needs exactly raw stdout from cmd.run

    Conflicts:
    	salt/modules/cmdmod.py
    giantlock committed with thatch45 Dec 19, 2012
  5. @techhat @UtahDave
  6. @UtahDave
Commits on Dec 18, 2012
  1. @thatch45
  2. @thatch45
  3. @aleszoulek @thatch45

    Batch.run() should return minion name as

    - When using Batch.run() (or client.cmd_batch()) there was no way to tell
      from what minion the returned date came from.
    - Batch.run() returns a dictionary which has minion id as a key, and
      returned data as a value
    aleszoulek committed with thatch45 Dec 17, 2012
  4. @aleszoulek @thatch45

    Bugfix Batch class quiet option

    - look for quiet attribute on the class, it's not global, neither
      local var
    aleszoulek committed with thatch45 Dec 17, 2012
  5. @thatch45
  6. @thatch45

    Fix error if sig is ommited

    thatch45 committed Dec 17, 2012
  7. @thatch45

    Minion side additions for #2916

    thatch45 committed Dec 17, 2012
  8. @thatch45
  9. @thatch45

    another fix of issue #2111

    on Debian wheezy, salt-call -g |grep os_family
    gives:
       os_family: debian
    
    Which means that apt will not be used
    (it checks os_family for 'Debian').
    
    so i added  debian -> Debian into _OS_FAMILY_MAP
    
    ... this patch also contains 2 little pep8  fixes
    David Pravec committed with thatch45 Dec 17, 2012
  10. @thatch45

    adding myself to authors file

    after sending few patches and bash completion,
    i finally add myself to AUTHORS file.
    David Pravec committed with thatch45 Dec 17, 2012
  11. @terminalmage @thatch45
  12. @thatch45
  13. @terminalmage @thatch45

    Tweaked the info on running in debug mode

    Sorry for the repeated commits, but this wording seemed better, and
    doesn't presume that running in debug mode means you should forgo a log
    file.
    terminalmage committed with thatch45 Dec 16, 2012
  14. @terminalmage @thatch45

    Move info about pidfile into master/minion config

    Thanks to s0undt3ch for suggesting this. Anything to type less on the
    command line :)
    
    Also, the filenames for the master and minion templates are "master" and
    "minion", not "master.template" and "minion.template". Corrected this.
    terminalmage committed with thatch45 Dec 16, 2012
Something went wrong with that request. Please try again.