Nicole Thomas
93c54d9884
Merge pull request #44414 from garethgreenaway/req_any
...
[develop] Adding additional requisites to state compiler
2017-11-13 14:17:09 -05:00
Nicole Thomas
8dcca13ca3
Merge pull request #44508 from mzbroch/capirca_integration
...
Capirca integration
2017-11-13 14:16:37 -05:00
Mike Place
c55dd75daf
Merge pull request #43822 from comsul/issues/42512
...
check_result: Correctly check the __extend__ state.
2017-11-13 12:13:38 -07:00
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop
...
Fix autosign file permission check [develop]
2017-11-13 11:34:37 -07:00
Mike Place
2b9a4cf4c6
Merge pull request #44281 from ze42/compound_command
...
minion: don't hang on compound-command
2017-11-13 11:19:51 -07:00
Mike Place
f3b9cc6137
Merge pull request #44419 from rongzeng54/develop
...
- fix "ValueError: too many values to unpack" bug
2017-11-13 10:46:02 -07:00
Mike Place
7701c299eb
Merge pull request #44455 from samodid/fix_38838
...
Fix for #38838
2017-11-13 10:40:34 -07:00
Mike Place
366d2ccbba
Merge pull request #44472 from mephi42/develop
...
nova: fix endpoint URL determination in _v3_setup()
2017-11-13 10:32:37 -07:00
Nicole Thomas
503c7276e0
Merge pull request #44276 from rallytime/salt-cli-imports
...
Change some exception imports to match the others
2017-11-13 12:23:52 -05:00
Gareth J. Greenaway
45c9a233dc
Merge branch 'develop' into req_any
2017-11-13 09:16:56 -07:00
zbroch
c52bc23724
Add priority field to support the latest capirca.
2017-11-13 17:06:07 +01:00
zbroch
b72456eb5e
Add priority field to support the latest capirca.
2017-11-13 16:54:42 +01:00
Nicole Thomas
f4757ca36b
Merge pull request #44502 from sjorge/PR43996
...
Additional comments required for PR #43996
2017-11-13 10:37:21 -05:00
Jorge Schrauwen
25b3c0bd15
Add the missing versionchanged info.
2017-11-12 20:38:08 +01:00
angeloudy
1b5a3a613c
Update zfs.py
2017-11-12 20:36:26 +01:00
Mike Place
bca50dedb0
Merge pull request #44361 from isbm/isbm-file.line-issues-devel
...
Long-awaiting set of unit tests and fixes for "file.line"
2017-11-10 16:37:56 -07:00
mephi42
1f3c4a3cac
nova: fix endpoint URL determination in _v3_setup()
...
Some OpenStack setups return multiple entries for the same service.
This change makes the code consider all matching entries instead of
just the first one.
2017-11-10 20:38:43 +01:00
Nicole Thomas
18ac000e15
Merge pull request #44482 from gtmanfred/develop
...
update kitchen yaml to use master for salt-jenkins
2017-11-10 12:16:30 -07:00
Nicole Thomas
0c4bb0b7e0
Merge pull request #44486 from vitaliyf/patch-1
...
Fixed minor spelling mistake.
2017-11-10 12:15:53 -07:00
Mike Place
8391b34372
Merge pull request #44148 from roaldnefs/add-telegram-returner
...
Add Telegram returner
2017-11-10 12:04:30 -07:00
Bo Maryniuk
7949925ae6
Use tuple instead of list for joining
2017-11-10 19:50:47 +01:00
Bo Maryniuk
ec3e8211ef
Remove unused variable
2017-11-10 19:50:47 +01:00
Bo Maryniuk
ec8050ced2
Discard Git's spaghetti merger
2017-11-10 19:50:47 +01:00
Bo Maryniuk
b2ed7d0ecd
Mute pylint on misdetected regex-like strings that are actually just test data.
2017-11-10 19:50:47 +01:00
Bo Maryniuk
40f1e1d954
Rewrite unit tests for file.line on delete/replace an empty line
2017-11-10 19:50:47 +01:00
Bo Maryniuk
629d1ddcce
Refactor file.line insert/ensure with after/before conditions
2017-11-10 19:50:47 +01:00
Bo Maryniuk
e0d05e5347
Refactor insert/ensure when after/before is known
2017-11-10 19:50:47 +01:00
Bo Maryniuk
c2d9d8f8ea
Add unit test for file.line ensuring line between two lines but content already exists
2017-11-10 19:50:47 +01:00
Bo Maryniuk
c7a320ae8e
Make assert_occurrence return amount of occurrences
2017-11-10 19:50:47 +01:00
Bo Maryniuk
9963895719
Add unit test for file.line ensuring line inside the range of lines
2017-11-10 19:50:47 +01:00
Bo Maryniuk
1e1f5e5a6f
Add unit test for file.line ensuring line between two other lines nearby
2017-11-10 19:50:47 +01:00
Bo Maryniuk
59de17b260
Add unit test for file.line on calling insert/ensure after specific line
2017-11-10 19:50:47 +01:00
Bo Maryniuk
710481b25e
Add unit test for file.line when calling insert/ensure mode
2017-11-10 19:50:47 +01:00
Bo Maryniuk
d98b3a59e8
Bugfix: keep indent of the "before" line.
2017-11-10 19:50:47 +01:00
Bo Maryniuk
a030b53fc7
Bugfix: content at the end should be added as a line, instead of merged to the rest of the data
2017-11-10 19:50:47 +01:00
Bo Maryniuk
218331c882
Bugfix: content at the beginning should be added as a line, instead of merged to the rest of the data
2017-11-10 19:50:47 +01:00
Bo Maryniuk
b42b762c57
Add unit test for file.line when inserting a line at the end of the file (append functionality)
2017-11-10 19:50:46 +01:00
Bo Maryniuk
80c40bbb11
Remove irrelevant issue number
2017-11-10 19:50:46 +01:00
Bo Maryniuk
c95b3e031c
Add unit test about file.line for insert/start
2017-11-10 19:50:46 +01:00
Bo Maryniuk
926372574d
Remove irrelevant issue number from the docstring
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b4cd4bd165
Add unit test for file.line replacement
2017-11-10 19:50:46 +01:00
Bo Maryniuk
9a72761dc6
Add unit test for file.line delete by direct match or regular expression
2017-11-10 19:50:46 +01:00
Bo Maryniuk
60185f578e
Add unit test for file.line usage together with before/after
2017-11-10 19:50:46 +01:00
Bo Maryniuk
fc79a546dd
Rename unit test
2017-11-10 19:50:46 +01:00
Bo Maryniuk
22e7ae2061
Fix: before/after together now define a range, where line will be added right before the last one within the range, i.e. before "before".
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d1a41dd7bd
Add unit test file.line insert before line
2017-11-10 19:50:46 +01:00
Bo Maryniuk
1ea7e33605
Harden unit test for 'after pattern' scenario
2017-11-10 19:50:46 +01:00
Bo Maryniuk
bde3611f08
Remove unnecessary code
2017-11-10 19:50:46 +01:00
Bo Maryniuk
fdffbe47b0
Add unit test for using patterns for line matching
2017-11-10 19:50:46 +01:00
Bo Maryniuk
ed171176a8
Rename unit test while using no patterns
2017-11-10 19:50:46 +01:00
