Synced with upstream

Author: Marat Komarov

chef/api.py

@@ -116,9 +116,14 @@ def from_config_file(cls, path):
                 value = md.group(2)
             else:
                 # Not a string, don't even try
+<<<<<<< HEAD
                 log.debug('Value for %s does not look like a string: %s' % (key, value))
                 continue
 
+=======
+                log.debug('Value for %s does not look like a string: %s'%(key, value))
+                continue
+>>>>>>> master
             def _ruby_value(match):
                 expr = match.group(1).strip()
                 if expr == 'current_dir':
@@ -230,7 +235,11 @@ def request(self, method, path, headers={}, data=None):
         return response
 
     def api_request(self, method, path, headers={}, data=None):
+<<<<<<< HEAD
         headers = dict((k.lower(), v) for k, v in headers.items())
+=======
+        headers = dict((k.lower(), v) for k, v in headers.iteritems())
+>>>>>>> master
         headers['accept'] = 'application/json'
         if data is not None:
             headers['content-type'] = 'application/json'