Fix missed rebase conflicts

AUTHORS

@@ -1,12 +1,12 @@
 Ansible Container has been contribued to by the following authors:
 This list is automatically generated - please file an issue for corrections)
 
-Joshua "jag" Ginsberg <[email protected]>
 Chris Houseknecht <[email protected]>
+Joshua "jag" Ginsberg <[email protected]>
 Ryan Brown <[email protected]>
 Shubham Minglani <[email protected]>
-Matt Clay <[email protected]>
 Pierre-Louis Bonicoli <[email protected]>
+Matt Clay <[email protected]>
 Greg DeKoenigsberg <[email protected]>
 Marc Sensenich <[email protected]>
 Sandra Wills <[email protected]>
@@ -22,33 +22,44 @@ Fabian von Feilitzsch <[email protected]>
 Charlie Drage <[email protected]>
 Roderick Randolph <[email protected]>
 Will Refvem <[email protected]>
-Sebastien Plisson <[email protected]>
 Mike Hume <[email protected]>
+Sebastien Plisson <[email protected]>
 Gerard Braad <[email protected]>
 ekultails <[email protected]>
 Evgeni Golov <[email protected]>
-Will Thames <[email protected]>
-Vadim Rutkovsky <[email protected]>
 Joseph Callen <[email protected]>
+Vadim Rutkovsky <[email protected]>
 Grzegorz Nosek <[email protected]>
 Abhishek Pratap Singh <[email protected]>
+Will Thames <[email protected]>
 Todd Barr <[email protected]>
 Florian Dambrine <[email protected]>
-Will Refvem <[email protected]>
 Julien Pivotto <[email protected]>
-Daniel Heitmann <[email protected]>
+Will Refvem <[email protected]>
 Arnaud Moret <[email protected]>
+Daniel Heitmann <[email protected]>
 marc-sensenich <[email protected]>
 Ted Timmons <[email protected]>
-Bruce Becker <[email protected]>
 Jeff Geerling <[email protected]>
+Bruce Becker <[email protected]>
 Evan Zeimet <[email protected]>
 John Matthews <[email protected]>
 Sean Summers <[email protected]>
 Alex Yanchenko <[email protected]>
 Balazs Zagyvai <[email protected]>
-Trishna Guha <[email protected]>
-Ali Asad Lotia <[email protected]>
+Jakub Błaszczyk <[email protected]>
+koralsky <[email protected]>
+Gabor Lekeny <[email protected]>
+szinck1 <[email protected]>
+Aaron Cowdin <[email protected]>
+fignew <[email protected]>
+grimmjow <[email protected]>
 Erik Nelson <[email protected]>
+John R Barker <[email protected]>
+Trishna Guha <[email protected]>
 Chrrrles Paul <[email protected]>
+Ali Asad Lotia <[email protected]>
+Shea Stewart <[email protected]>
+Sidharth Surana <[email protected]>
 Andrea De Pirro <[email protected]>
+Michael Carden <[email protected]>

container/config.py

@@ -329,13 +329,8 @@ def _process_defaults(self):
                 dict(processed)))
 
     def _process_top_level_sections(self):
-<<<<<<< HEAD
         self._config['settings'] = self._config.get('settings', yaml.compat.ordereddict())
         for section in ['volumes', 'registries', 'secrets']:
-=======
-        self._config['settings'] = self._config.get('settings', ordereddict())
-        for section in ['volumes', 'registries']:
->>>>>>> Work around ordereddict failures.
             logger.debug('Processing section...', section=section)
             setattr(self, section, dict(self._process_section(self._config.get(section, ordereddict()))))
 

container/docker/engine.py

@@ -20,9 +20,9 @@
 import tarfile
 
 from ruamel.yaml.comments import CommentedMap
-from six import reraise, iteritems, string_types
+from six import reraise, iteritems, string_types, PY3
 
-if six.PY3:
+if PY3:
     from functools import reduce
 try:
     import httplib as StatusCodes
@@ -1002,7 +1002,7 @@ def build_conductor_image(self, base_path, base_image, prebaking=False, cache=Tr
                         arcname='container-src/conductor-build/conductor-requirements.yml')
 
             utils.jinja_render_to_temp(TEMPLATES_PATH,
-                                       'conductor-dockerfile.j2', temp_dir,
+                                       'conductor-src-dockerfile.j2', temp_dir,
                                        'Dockerfile',
                                        conductor_base=base_image,
                                        docker_version=DOCKER_VERSION,