Daniel Wozniak
a879140e21
Merge branch '2019.2' into issue_51816
2019-03-05 03:02:12 -07:00
Daniel Wozniak
f867e6e565
Merge pull request #51761 from sdodsley/cheery_pick_fb_releasenotes
...
Add new module to release notes for 2019.2.0
2019-03-05 02:44:55 -07:00
Daniel Wozniak
08e3956781
Merge pull request #51799 from s0undt3ch/2019.2
...
Catch attribute error
2019-03-05 02:38:07 -07:00
Daniel Wozniak
ff5d7d6e59
Merge pull request #51810 from Ch3LL/2019.2.1_rn
...
Add 2019.2.1 release notes
2019-03-05 02:26:46 -07:00
Daniel A. Wozniak
0e61cf39e4
Fix linter errors/warnings
2019-03-04 14:48:33 -07:00
Daniel A. Wozniak
171217ae3c
Revert debug logging
2019-03-04 14:39:36 -07:00
Daniel A. Wozniak
8c641c66fb
make LDAP attr defaults string types on py2
2019-03-04 14:36:14 -07:00
Gareth J. Greenaway
37320048ce
Merge pull request #51849 from garethgreenaway/51824_splay_breaking_schedule_present
...
[2019.2] Fix to schedule.list function to filter out attributes that are None
2019-03-01 11:56:16 -08:00
Gareth J. Greenaway
a0af441dfd
Merge branch '2019.2' into 51824_splay_breaking_schedule_present
2019-02-28 08:31:35 -08:00
Pedro Algarvio
342244a99c
Merge branch '2019.2' into 2019.2
2019-02-28 13:51:37 +00:00
Megan Wilhite
3fdb564346
Merge pull request #51878 from Ch3LL/terraform_rn
...
Add new terraform salt-ssh roster feature to release notes
2019-02-27 14:18:48 -05:00
Ch3LL
502d197f84
fix spelling error in release notes
2019-02-27 14:04:41 -05:00
Ch3LL
4d53b41740
Add new terraform salt-ssh roster feature to release notes
2019-02-27 14:00:07 -05:00
Gareth J. Greenaway
39b564509a
Splay defaulting to None internally, broke schedule.present causing it to always report differences when a state is run. Updating the schedule.list function to check if an attribute is None and remove it.
2019-02-26 13:06:51 -08:00
Shane Lee
e63c87245e
Merge pull request #51837 from stratusjerry/backport_49039_2019.2
...
Update win_pkg.py
2019-02-26 09:51:34 -07:00
stratusjerry
531b23d6b1
Update win_pkg.py
...
Fix path and other typos
2019-02-26 11:13:06 -05:00
Ch3LL
aaee5fa0b7
Add 2019.2.1 release notes
2019-02-25 16:38:16 -05:00
Pedro Algarvio
3e8a17e4f6
Catch attribute error
2019-02-25 17:16:07 +00:00
Megan Wilhite
27dd9fbac2
Merge pull request #51772 from Ch3LL/doc_conf_2019
...
Update release versions for the 2019.2 branch
2019-02-25 09:16:39 -05:00
Daniel Wozniak
45425a45c9
Merge pull request #51776 from garethgreenaway/merge-2018.3
...
[2019.2] Merge forward from 2018.3 to 2019.2
2019-02-24 15:08:57 -07:00
Gareth J. Greenaway
186306a80c
reverting change in release notes, adding change to doc/ref/modules/all/index.rst.
2019-02-23 17:20:46 -08:00
Gareth J. Greenaway
1ef140a366
Fixing lint.
2019-02-23 15:19:19 -08:00
Gareth J. Greenaway
61735787dc
Fixing lint errors
2019-02-23 10:01:01 -08:00
Gareth J. Greenaway
38dcab9e9b
fixing lint
2019-02-22 17:07:11 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3
...
Conflicts:
- doc/ref/modules/all/index.rst
- salt/states/file.py
- tests/unit/modules/test_yumpkg.py
- tests/unit/modules/test_zypperpkg.py
- tests/unit/states/test_file.py
2019-02-22 16:38:15 -08:00
Daniel Wozniak
7e3e71ca23
Merge pull request #51756 from twangboy/fix_case_sensitive
...
Make recurse and directory case sensitive
2019-02-22 16:06:10 -07:00
Ch3LL
f28cc9bff1
[2019.2] change build_type and release in doc/conf.py
2019-02-22 15:26:16 -05:00
Ch3LL
4c670e2e62
Update release versions for the 2019.2 branch
2019-02-22 15:02:48 -05:00
twangboy
4c55040ecf
Fix failing py3 tests
...
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
2019-02-22 11:44:39 -07:00
twangboy
64f45f8650
Make recurse and directory case sensitive
2019-02-22 11:44:39 -07:00
Daniel Wozniak
e75fc1c603
Merge pull request #51747 from ymasson/fix_mysql_grants
...
Fix escaping for special charaters
2019-02-22 11:20:17 -07:00
Thomas S Hatch
b1f7e85b4f
Merge pull request #51387 from chrillux/make-binarydata-output-possible
...
Make binary data output possible
2019-02-22 07:53:24 -07:00
Simon Dodsley
80192c80fa
Add new module to release notes for 2019.2.0
2019-02-22 08:18:13 -05:00
Yann Masson
f614dd7d54
Fix escaping for special charaters
...
Issue #49297
2019-02-21 18:41:05 +01:00
Daniel Wozniak
189408229d
Merge pull request #51734 from s0undt3ch/features/nox-2019.2
...
[2019.2] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
2019-02-21 10:39:29 -07:00
Daniel Wozniak
3475813d13
Merge pull request #51694 from assafShapira/2018.3
...
fix minion bootstrapping issue
2019-02-21 10:38:55 -07:00
Daniel Wozniak
c7136cbd3f
Merge pull request #51738 from garethgreenaway/nftables_cleanup
...
[2018.3] Nftables cleanup
2019-02-21 10:25:43 -07:00
Daniel Wozniak
21210492de
Merge pull request #51733 from s0undt3ch/features/nox-2018.3
...
[2018.3] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
2019-02-21 10:22:14 -07:00
Thomas S Hatch
74db589971
Merge pull request #51707 from isbm/isbm-pillar-refresh-fix
...
Bugfix: pillar refresh
2019-02-21 08:12:48 -07:00
Gareth J. Greenaway
8201d1e04f
Fixing lint.
2019-02-20 12:17:57 -08:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup
2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests.
2019-02-20 09:52:54 -08:00
Pedro Algarvio
f4adf33977
Merge pull request #51728 from gtmanfred/virtualnames
...
fix modulenames from virtualnames tests
2019-02-20 17:45:54 +00:00
Daniel Wozniak
82cbd9842b
Merge pull request #51674 from Ch3LL/merge-2019.2
...
[2019.2] Merge forward from 2018.3 to 2019.2
2019-02-20 10:35:06 -07:00
Gareth J. Greenaway
ed1b743664
Additional cleanup. Adding additional documentation for state module.
2019-02-20 09:31:01 -08:00
Pedro Algarvio
01b74c06c4
Add initial nox configuration. Tell tox'ers to use nox'.
2019-02-20 16:49:56 +00:00
Pedro Algarvio
97532c2a68
Add initial nox configuration. Tell tox'ers to use nox'.
2019-02-20 16:49:16 +00:00
Ch3LL
4171271930
Fix pylint, remove unused import
2019-02-20 10:20:24 -05:00
Ch3LL
3f146197a1
Remove skipif and change expected return for solarisips test
2019-02-20 10:14:04 -05:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests
2019-02-20 08:06:29 -06:00
