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
25,536 Commits 24 Branches 182 Tags 341 MiB
233f08d990
Commit Graph

25536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted Strzalkowski
e4d3d38ed5 Updated network io counter function. 
Change psutil.network_io_counters() to psutil.net_io_counters()
as the former is deprecated.  Output remains unchanged.
 2014-02-01 13:11:02 -08:00
Ted Strzalkowski
4bea0ea506 Updated get_boot_time function. 
Change psutil.BOOT_TIME to psutil.get_boot_time() as the
former is deprecated.  Output remains unchanged.
 2014-02-01 13:10:26 -08:00
Ted Strzalkowski
a7329bb06e Added new features for virtual/swap memory stats. 
Added ps.virtual_memory and ps.swap_memory to replace the following
deprecated functions:

 - psutil.phymem_usage()
 - psutil.virtmem_usage()
 - psutil.cached_phymem()
 - psutil.phymem_buffers()
 - psutil.avail_phymem()
 - psutil.used_phymem()
 - psutil.total_virtmem()
 - psutil.avail_virtmem()
 - psutil.used_virtmem()
 2014-02-01 13:09:31 -08:00
Ted Strzalkowski
ac1bb42fc1 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-02-01 12:34:32 -08:00
Thomas S Hatch
ec4d75fe12 Add documentation to the virt runner 2014-02-01 11:26:46 -07:00
Thomas S Hatch
727dacf132 Whitespace 2014-02-01 10:58:48 -07:00
Ted Strzalkowski
2426c224a4 Change output of states.service to reflect changes 
If a service is started, but already enabled, changes are now
reflected to the user.
 2014-02-01 09:38:15 -08:00
Ted Strzalkowski
3e7451ae8c Merge remote-tracking branch 'upstream/develop' into develop 2014-02-01 09:36:06 -08:00
Mathieu Le Marec - Pasquet
20702ec0c0 allow ext_dirs for grains 2014-02-01 18:08:40 +01:00
Frank Klaassen
2b964268ca Allow pillars to be cleared for all minions 
This function was requiring an argument while `clear_mine` and `clear_grains` are clearing the selected data for all minions (or the targeted ones).
 2014-02-01 17:48:32 +01:00
Joseph Hall
d62e6d509a Merge pull request #10100 from s0undt3ch/develop 
EXtend the virtual terminal notes
 2014-02-01 04:49:54 -08:00
Pedro Algarvio
002d294f04 EXtend the virtual terminal notes 2014-02-01 08:20:16 +00:00
Pedro Algarvio
e228f88662 Merge pull request #10098 from terminalmage/release_notes 
Add additional info to the 2014.1.0 release notes
 2014-02-01 00:13:22 -08:00
Ted Strzalkowski
73b1633043 Changed rabbitmq module to check retcode from enable/disable plugin 2014-01-31 22:31:39 -08:00
Ted Strzalkowski
9560536b0b Added ability to check return code using cmd.run_all in rabbitmq module 2014-01-31 22:31:05 -08:00
Pedro Algarvio
9102f983bc Make sure the user knows a Saltfile will be loaded. 2014-02-01 05:38:41 +00:00
Pedro Algarvio
72c65de68d Allow for config settings to be overridden by a Saltfile 
The order of configuration handling is the following:
1. If the user passes an option to the parser, that option rules.
2. If no option is passed to the parser and that option is set a
`Saltfile`, that option rules.
3. If none of the above and such option is set in the cofiguration file,
that value rules
4. As a last resort the default value rules

The format of the `Saltfile` is:

```yaml
<salt-cli-tool>:
  <confi-key>: <config-value>

salt-key:
  ssh_max_procs: 50
```
 2014-02-01 05:14:50 +00:00
Joseph Hall
12328cc7c3 Merge pull request #10097 from tedski/develop 
Updated requisites docs to only monospace sls keys
 2014-01-31 20:05:00 -08:00
Ted Strzalkowski
e2949d865d Updated requisites docs to only monospace sls keys 2014-01-31 19:54:21 -08:00
Erik Johnson
8b224d7161 Add additional info to the 2014.1.0 release notes 2014-01-31 18:43:43 -06:00
C. R. Oldham
12087a11c9 Pre-SaltConf patches. 2014-01-31 15:17:36 -07:00
C. R. Oldham
f30531f11c Pre-SaltConf changes 2014-01-31 15:17:27 -07:00
Thomas S Hatch
ae31d5d4f9 whitespace 2014-01-31 14:46:54 -07:00
Thomas S Hatch
6c0ed1dfb4 Merge pull request #10079 from ticosax/fix-docker-pull 
The json response changed
 2014-01-31 13:30:30 -08:00
Erik Johnson
47a1799539 Merge pull request #10090 from terminalmage/issue10000 
Quiet all logging when dealing with passwords/hashes
 2014-01-31 11:02:27 -08:00
Erik Johnson
9acda70e53 Quiet all logging when dealing with passwords/hashes 2014-01-31 11:30:47 -07:00
Thomas S Hatch
15c728bf02 Merge pull request #10086 from dangarthwaite/states_run_on_minions_8389 
states_run_on_minions_8389
 2014-01-31 10:24:40 -08:00
Thomas S Hatch
c37d7f076c Merge pull request #10083 from mbirtwell/fix_waiting_syndic_returns_in_salt_rc_develop 
Ensure that get_iter_returns updates minions
 2014-01-31 10:23:01 -08:00
Thomas S Hatch
3b88b2c29f Merge pull request #10082 from mbirtwell/fix_syndic_minion_highstate_develop 
Ensure that the out parameter is forwarded
 2014-01-31 10:01:17 -08:00
Michael Birtwell
f13807c5d3 Pass on AttrbuteError correctly 2014-01-31 17:56:54 +00:00
Thomas S Hatch
4410f483e4 Merge pull request #10080 from dpavlin/lvm_snapshot 
Added snapshot option to linux_lvm.lvcreate
 2014-01-31 09:55:32 -08:00
Thomas S Hatch
d49a709fee Merge pull request #10077 from ipmb/fixes/scheduler-keyerror 
Fixes KeyError in scheduler
 2014-01-31 09:54:34 -08:00
Thomas S Hatch
bfa1367c0f Merge pull request #10072 from cvrebert/patch-2 
modules.config.manage_mode: rm unnecessary parens
 2014-01-31 09:53:49 -08:00
Thomas S Hatch
e9be222689 Merge pull request #10071 from cvrebert/patch-1 
client/ssh/wrapper/config.py: rm unnecessary parens
 2014-01-31 09:53:34 -08:00
Thomas S Hatch
5912d1e35a Merge pull request #10066 from nshalman/smartos-esky-all-deps 
SmartOS Esky build: Just try to grab everything
 2014-01-31 09:52:40 -08:00
Thomas S Hatch
bbd0e5855b Merge pull request #10063 from mbirtwell/fix_a_missing_returns_case_develop 
Fix a case when job returns are missed by salt because saltutil.find_job times out
 2014-01-31 09:52:22 -08:00
Dan Garthwaite
1edaf7c345 states_run_on_minions_8389 2014-01-31 12:43:51 -05:00
Thomas S Hatch
0be2ce9132 Merge pull request #10048 from hulu/auth_test_update 
Test case where auth loader is called with no auth type specified
 2014-01-31 09:41:43 -08:00
Thomas S Hatch
7b7f288395 Merge pull request #10046 from terminalmage/gitfs-sha-envs 
Allow gitfs to use git commit SHAs as envs
 2014-01-31 09:41:17 -08:00
Thomas S Hatch
ce1f305745 Merge pull request #10031 from kaithar/feature/test-fixes 
Feature/test fixes
 2014-01-31 09:38:38 -08:00
Thomas S Hatch
f3002ff1cb Merge pull request #10006 from cachedout/#9855 
cmd.run child proc tracking
 2014-01-31 09:37:50 -08:00
Thomas S Hatch
c837aedd00 Merge pull request #10004 from rgbkrk/patch-2 
Use __opts__.get
 2014-01-31 09:37:04 -08:00
Thomas S Hatch
3b87555128 Merge pull request #10081 from terminalmage/issue10000 
Remove parsed args/kwargs debugging
 2014-01-31 09:34:21 -08:00
Michael Birtwell
476f9bf3c4 Ensure that get_iter_returns updates minions 
This was getting missed previously because events containing minions and
I assume syndic (I've not seen one of those events) don't include an id.
Made the logic here more like get_cli_event_returns seen as that works.
 2014-01-31 17:30:19 +00:00
Michael Birtwell
8f5c8e7bd0 Ensure that the out parameter is forwarded 2014-01-31 17:29:59 +00:00
Thomas S Hatch
1a0581c8fd Merge pull request #9992 from pakdel/issue-9932 
Fixed Issue #9932: Only the first git repository is initialized and working using git_pillar
 2014-01-31 09:27:59 -08:00
Erik Johnson
f158ad9baa Remove parsed args/kwargs debugging 2014-01-31 10:27:58 -07:00
Nicolas Delaby
a8ad7806df thx Jenkins 2014-01-31 18:27:55 +01:00
Thomas S Hatch
ae05a266ca Merge pull request #9973 from penta-srl/archive-unzip-add-update-option 
unzip: added options parameters
 2014-01-31 09:26:27 -08:00
Thomas S Hatch
5e5cd6350c Merge pull request #9952 from dmyerscough/develop 
Notify the user if dmidecode could not be located
 2014-01-31 09:25:35 -08:00