Merge pull request #210 from mbohlool/automated-cherry-pick-of-#205-upstream-release-1.0

mbohlool · web-flow · commit 39eeff664d1a · 2017-05-03T17:25:36.000-07:00
Automated cherry pick of #205
diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py
@@ -154,8 +154,8 @@ def request(self, method, url, query_params=None, headers=None,
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if headers['Content-Type'] == 'application/json-patch+json':
-                    headers[
-                        'Content-Type'] = 'application/strategic-merge-patch+json'
+                    if not isinstance(body, list):
+                        headers['Content-Type'] = 'application/strategic-merge-patch+json'
                     request_body = None
                     if body:
                         request_body = json.dumps(body)
