cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup missed merge conflict sections

Browse source
This commit is contained in:
James Cammarata 2015-08-13 15:05:58 -04:00
parent d41db8edd6
commit 4dba30ccd0
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/inventory/__init__.py
View file

@ -533,16 +533,7 @@ class Inventory(object):
if subset_pattern is None: if subset_pattern is None:
self._subset = None self._subset = None
else: else:
<<<<<<< HEAD
<<<<<<< HEAD
subset_patterns = self._split_pattern(subset_pattern) subset_patterns = self._split_pattern(subset_pattern)
=======
subset_pattern = subset_pattern.replace(',',':')
subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
>>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern
=======
subset_patterns = self._split_pattern(subset_pattern)
>>>>>>> Don't accept undocumented "p1;p2" patterns; note in changelog
results = [] results = []
# allow Unix style @filename data # allow Unix style @filename data
for x in subset_patterns: for x in subset_patterns: