Pedro Algarvio
85b66a47c5
Py3 compatibility fixes
2015-01-30 22:25:11 +00:00
Pedro Algarvio
a8ff8fa0b5
Py3 compatibility fixes
2015-01-30 22:25:11 +00:00
Pedro Algarvio
8081170d8d
Py3 compatibility fixes
2015-01-30 22:25:11 +00:00
Pedro Algarvio
0ead7d0f9b
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
c3d922bdc4
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
53a5f4beb8
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Pedro Algarvio
5d35f856ac
We no longer warn.
2015-01-24 03:16:51 +00:00
Mike Place
bb3c1714f8
Style fixes
2015-01-15 10:48:44 -07:00
Mike Place
6d14d4e661
Fix broken test
2015-01-15 10:41:08 -07:00
Mike Place
845271d31c
More linting
2015-01-13 11:15:45 -07:00
Aurynn Shaw
b7ae48642a
Adds fire_master to the Salt Event library, for use in 3rd-party code.
2015-01-13 09:29:27 +13:00
sjwehry
342608d9bd
Fixed spelling of "below" in 9 different files.
2015-01-06 19:55:28 -05:00
Colton Myers
56eae4783a
Merge branch '2014.7' into merge-forward-2015.2
2015-01-06 13:33:18 -07:00
Colton Myers
f6eae029f0
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/grains/core.py
salt/minion.py
salt/modules/mongodb.py
salt/states/archive.py
salt/states/mount.py
salt/utils/master.py
salt/utils/schedule.py
salt/utils/thin.py
tests/jenkins-ng.py
2015-01-06 13:14:27 -07:00
rallytime
73ef44dd9f
Pylint fix for 2014.7 branch
2015-01-06 11:14:06 -07:00
Mike Place
0194fbe77c
Attempt to fix inconsintent VT test by preventing a spin
2015-01-05 13:35:02 -07:00
Thomas S Hatch
4274a338e5
Merge pull request #19265 from jfindlay/log_color
...
add color option to console logger
2014-12-29 15:43:35 -07:00
Mike Place
845546c009
Holiday lint
2014-12-29 11:27:05 -07:00
Mike Place
e5fb81970d
Attempt to fix inconsintent VT test by preventing a spin
2014-12-29 10:26:48 -07:00
Justin Findlay
13dca4548b
fix utils unit test
2014-12-27 18:22:11 -07:00
Justin Findlay
751e0c7f43
update color name consistency
2014-12-27 12:20:08 -07:00
Mike Place
a931dd63fe
Increasing sleep to see if it fixes vt test
2014-12-19 14:01:20 -07:00
Colton Myers
fc16bd16c0
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/faq.rst
doc/ref/states/compiler_ordering.rst
doc/topics/best_practices.rst
doc/topics/development/conventions/formulas.rst
salt/config.py
salt/modules/state.py
salt/states/mount.py
salt/utils/event.py
tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Thomas S Hatch
75cc71b051
Merge pull request #18762 from jacksontj/2014.7
...
Move reactor master-clients to threads
2014-12-15 09:43:17 -07:00
Thomas Jackson
545400e006
Pylint cleanup
2014-12-12 09:42:41 -08:00
Thomas S Hatch
bdc907dab6
Merge branch '2014.7' into merge_forward_8798
...
Conflicts:
salt/cli/__init__.py
salt/cloud/clouds/ec2.py
salt/scripts.py
salt/utils/__init__.py
salt/utils/saltminionservice.py
2014-12-12 09:49:34 -07:00
Thomas Jackson
0e6195f778
Add some tests for ThreadPool
2014-12-12 08:16:18 -08:00
Thomas Jackson
77a7d9ab13
backport tests for process manager
2014-12-12 08:04:02 -08:00
Mike Place
454da2545f
Fix failing tests
2014-12-11 16:23:04 -07:00
C. R. Oldham
8e691d7f32
Fix lint
2014-12-10 16:43:42 -07:00
C. R. Oldham
dfdbdb0a26
Add support for sockstat on FreeBSD as an alternative to lsof
2014-12-10 15:52:02 -07:00
Mike Place
5d15fb1f1b
Fix failing tests
2014-12-10 08:42:08 -07:00
Anthony Scalisi
44963fae0e
fix various typos
2014-12-08 14:32:53 -08:00
Colton Myers
472f6577e2
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Thomas S Hatch
b1b770014b
Merge pull request #18592 from nazgul5/utils.network
...
salt.utils.network._interfaces_ifconfig: SunOS fix
2014-12-03 10:02:15 -07:00
Colton Myers
fcc2196a5f
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/cloud/__init__.py
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runner.py
salt/runners/lxc.py
salt/runners/manage.py
salt/utils/schedule.py
tests/unit/modules/boto_vpc_test.py
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
2014-12-01 15:04:03 -07:00
rallytime
3760915099
Skip test_max_open_files test until we can find the real problem
2014-12-01 13:43:57 -07:00
Vitalii Nazg
8f9af6802b
Lint fixes: unused import, tabs
2014-12-01 22:08:23 +02:00
Vitalii Nazg
8ff9e7f7e9
salt.utils.network._interfaces_ifconfig: SunOS fix
...
In SunOS 11.1 with IPv6 enabled interfaces occur twice in 'ifconfig -a'
output with the same name: for ipv4 and then for ipv6 addr family. Thus,
ipv6 data overwrites data collected from ipv4 interfaces.
Every instance has it's own 'UP' status and we assume that ipv4
status determines global interface status.
Thus commit tries to merge data from conflicting instances.
Also, regexp was tuned for SunOS's ifconfig.
2014-11-28 19:02:45 +02:00
Pedro Algarvio
50bb9c3867
Merge branch '2014.7' into hotfix/merge-forward
...
Conflicts:
salt/fileclient.py
2014-11-21 23:39:28 +00:00
Thomas Jackson
44f91a1d21
Add regression test for #8670
...
Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
2014-11-21 08:54:05 -08:00
Thomas S Hatch
03e2785281
lint
2014-11-11 10:03:22 -07:00
Arnold Bechtoldt
485796e9f9
use the right function to test
2014-11-11 02:14:58 +01:00
Arnold Bechtoldt
d03ff7d6dd
fix broken ipv6 address verification in salt.utils.validate.net
2014-11-11 01:42:46 +01:00
Thayne Harbaugh
e4488a3956
Add yaml_encode() jinja filter
...
* Add documentation for yaml_encode()
* Mention yaml_encode() in formulas documentation
* Add unit tests for yaml_encode()
* Improve unit tests and documentation for related yaml_dquote()
2014-11-07 19:12:58 -07:00
Joseph Hall
e1487b330b
Merge pull request #17222 from hulu/typos-2-electric-boogaloo
...
more typo/misspelling fixes
2014-11-06 11:41:07 -07:00
Chris Rebert
802a631dd9
more typo/misspelling fixes
2014-11-05 15:29:25 -08:00
Chris Rebert
c46e43f296
tests/unit/utils/event_test.py: fix typo in comment
2014-11-05 11:03:54 -08:00
