Colton Myers
21d9de2995
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileclient.py
salt/utils/serializers/yaml.py
2015-04-29 11:47:06 -06:00
Justin Findlay
ffd18493e8
compare OrderedDicts in serializer unit test
2015-04-28 13:30:16 -06:00
Pedro Algarvio
a24ae29ee9
Revert "We no longer warn."
...
This reverts commit 5d35f856ac
2015-02-26 09:41:22 +00:00
Colton Myers
b2a80b195e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890
Merge pull request #20616 from rallytime/merge-20419
...
Merge #20419 with test syntax fix
2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557
Fix second pylint error that popped up
2015-02-11 22:07:37 -07:00
rallytime
789570fb94
Fix pylint/syntax of test in which_test to merge #20419
2015-02-11 21:48:34 -07:00
Hung Nguyen Viet
d10ce3ade2
fix unittest for windows
2015-02-12 01:37:40 +07:00
Arnold Bechtoldt
9de6c1d839
improve test tests/unit/utils/validate_net_test.py useability
2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db
do call class methods correctly
2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7
fix pep8 lint checks, refs #20508
2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76
fix broken ipv6 address verification in salt.utils.validate.net
2015-02-08 23:48:05 +01:00
rallytime
db612d0b81
Clean up some pylint on 2015.2
...
This way PRs against 2015.2 will be a little happier
2015-02-06 07:58:26 -07:00
Pedro Algarvio
5d35f856ac
We no longer warn.
2015-01-24 03:16:51 +00: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
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
Thayne Harbaugh
dc4892442a
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters.
...
When templating state files the variable contents may contain
characters that YAML will interpret specially. Rather than try to
escape the special characters so that they are safe use a filter that
protects special characters in YAML values.
2014-11-03 16:14:54 -07:00
Thomas S Hatch
3f58d716a2
Merge pull request #16878 from plastikos/improvement-filter_by
...
Improve filter_by() base argument:
2014-10-30 10:02:32 -06:00
Mike Place
39d6d8e75f
remove splitted test
2014-10-27 18:23:20 -06:00
Thayne Harbaugh
7bd7e4c2b7
Appease the pylint gods; back-out unrelated changes.
2014-10-24 11:32:12 -06:00
Thayne Harbaugh
65e477dd67
Improve filter_by() base argument:
...
* Change filter_by() base argument to a key in lookup_dict rather
than a dictionary. This allows more compact usage and more
readable use of base values/defaults in the lookup_dict.
* Change/improve function-local documentation for lookup_dict().
* Add specific use-case of "base" argument for lookup_dict() in the
formulas documentation.
* Expand filter_by() unit testing to validate use of base argument.
* Add unit test for salt.utils.dictupdate.update() to provide
complete depth-of-testing of filter_by() which uses
dictupdate.update().
2014-10-24 11:13:47 -06:00
