valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,428 Commits 24 Branches 182 Tags 341 MiB
e1fa6955ff
Commit Graph

25428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
969655223f Merge pull request #10138 from s0undt3ch/hotfix/lint 
Make use of the `print()` function.
 2014-02-03 03:09:01 -08:00
Pedro Algarvio
69d0f907f9 Make use of the print() function. 2014-02-03 11:07:43 +00:00
Pedro Algarvio
378a9d5b21 Simplify test requirements. 2014-02-03 10:55:44 +00:00
Pedro Algarvio
237d3204bf Merge pull request #10136 from s0undt3ch/hotfix/lint 
Make use of the `print()` function
 2014-02-03 02:51:13 -08:00
Pedro Algarvio
f525d2aa47 Make use of the print() function 2014-02-03 10:50:04 +00:00
Pedro Algarvio
4a128097c8 Merge pull request #10134 from s0undt3ch/hotfix/lint 
Fix lint issues
 2014-02-03 02:44:33 -08:00
Pedro Algarvio
f417bb5b5a Minor cosmetic change for consistency. 2014-02-03 10:31:13 +00:00
pille
3eee5d8697 fix doc typo 2014-02-03 11:19:11 +01:00
Pedro Algarvio
7d114ac4ec rabbitmq-plugins is only necessary for part of the module. 2014-02-03 09:53:30 +00:00
Pedro Algarvio
0c4179dbea It's not a "non-sequence". 2014-02-03 08:35:20 +00:00
Pedro Algarvio
7b45ce8384 Tell PyLint that we know how to handle the unballanced tuple. 2014-02-03 08:35:20 +00:00
Pedro Algarvio
2081010cc3 Use the print() function. 2014-02-03 08:35:20 +00:00
Bret Palsson
d048e0ceff CRITICAL: State's don't send the environment... 
CRITICAL: State's don't send the environment to render the pillar!

This is why `salt-call pillar.items` works and `salt-call state.highstate` does not.

There defiantly needs to be a test around this bug. I've tested this fix with both the `environment: dev` and ` `#environment: dev`. It works just fine.

Here is the corresponding code that does work: https://github.com/saltstack/salt/blob/develop/salt/minion.py#L283
 2014-02-02 20:18:37 -07:00
Chris Rebert
567b545e04 remove unused apparently-unnecessary **kwargs from npm.{installed,removed} 2014-02-02 18:21:17 -08:00
Joseph Hall
b347216b7f Merge pull request #10129 from hulu/lxc-runner-shadowing 
avoid shadowing outer info() func in runners/lxc.list_()
 2014-02-02 18:16:48 -08:00
Chris Rebert
be4ae3e333 avoid shadowing outer info() func in runners/lxc.list_() 2014-02-02 18:10:03 -08:00
Kyle Kelley
cc81a38f12 Fix requisite type in supervisor state 2014-02-02 09:46:34 -07:00
Gareth J. Greenaway
d1dd597a7f Adding a check to ensure -m multiport is included if dports & sports is used. 2014-02-02 08:02:14 -08:00
Joseph Hall
8b3f7ff1ba Merge pull request #10123 from s0undt3ch/hotfix/lint 
White space related lint fix
 2014-02-02 04:58:07 -08:00
Pedro Algarvio
5dc41a6983 White space related lint fix 2014-02-02 12:56:52 +00:00
Joseph Hall
5e1d8ac76c Merge pull request #10122 from garethgreenaway/develop 
Adding the ability to specify multiple iptables match options
 2014-02-02 04:26:47 -08:00
Pedro Algarvio
144e4a1769 Merge pull request #10121 from makinacorpus/buildout 
Bunch of safeguards for utf8 errors in buildout module
 2014-02-02 02:41:34 -08:00
Gareth J. Greenaway
d9d1dd4655 Adding the ability to specify multiple iptables match options 2014-02-01 21:00:30 -08:00
Erik Johnson
ae1b0ee963 Merge pull request #10118 from tedski/9301 
Revert "Updated network io counter function."
 2014-02-01 19:52:36 -08:00
Mathieu Le Marec - Pasquet
3a209d4c07 Bunch of safeguards for utf8 errors in buildout module 2014-02-02 04:18:32 +01:00
Ted Strzalkowski
09b3aa9000 Revert "Updated network io counter function." 
This reverts commit e4d3d38ed5.

 - psutil.network_io_counters() isn't deprecated until psutil v1.0.0
 2014-02-01 18:45:56 -08:00
Erik Johnson
08781d0171 pkg.installed/latest: don't refresh_db if refresh==False 
See https://github.com/saltstack/salt/issues/5733#issuecomment-33888898
for further information.
 2014-02-01 20:21:17 -06:00
Thomas Jackson
e32761b7dc Adding warning about old yamilify arg passing 2014-02-01 18:07:33 -08:00
Joseph Hall
5db42e6c51 Merge pull request #10114 from jacksontj/develop 
Update dev_requirements in HACKING.rst-- filenames are changed now :)
 2014-02-01 17:55:18 -08:00
Thomas Jackson
e8cb103c2e Update dev_requirements in HACKING.rst-- filenames are changed now :) 2014-02-01 17:34:33 -08:00
Erik Johnson
97a4263a60 Merge pull request #10112 from izhukov/fix-npm-install-yo 
fix npm installed command
 2014-02-01 16:36:08 -08:00
Thayne Harbaugh
370522e2d5 Strip leading path separator characters in a portable way. 
Addresses the situation where get_id() ignores root_dir and always
looks for minion_id in /etc/salt/minion_id.

Fixes 10035
 2014-02-02 00:23:27 +00:00
C. R. Oldham
5aecbd3174 Merge pull request #10111 from cro/fix_only_10110 
Fix only 10110
 2014-02-01 15:48:32 -08:00
Aleksey Zhukov
ca2b378ed5 fix npm installed command 2014-02-02 03:48:16 +04:00
C. R. Oldham
9c6e115506 Remove log message 2014-02-01 16:47:40 -07:00
C. R. Oldham
2723a68faf Fix TypeError stacktrace with cmd.run. 2014-02-01 16:45:51 -07:00
Erik Johnson
dc9135eee2 Merge pull request #10108 from terminalmage/tests 
Fix test failures
 2014-02-01 15:37:11 -08:00
Erik Johnson
35c397d14b Fix test failures 
http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/
 2014-02-01 16:51:48 -06:00
Justin Carmony
65eac5da3c Merge pull request #1 from s0undt3ch/hotfix/saltfile 
Salfile
 2014-02-01 14:30:18 -08:00
Erik Johnson
e254cbc764 Fix sphinx warnings 2014-02-01 16:05:54 -06:00
Erik Johnson
ebbd193b0a Fix pylint violations, use :mod: role 2014-02-01 15:59:19 -06:00
Erik Johnson
e2f36c1739 Merge pull request #10106 from tedski/9301 
Replacing deprecated functions in ps execution module.
 2014-02-01 13:48:28 -08:00
Ted Strzalkowski
08f4cd9d3b Added deprecation docstrings and warnings to ps module. 2014-02-01 13:29:55 -08:00
Ted Strzalkowski
488dd52e2c Added unit tests for new psutil features. 2014-02-01 13:22:44 -08:00
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