Merge pull request #3439 from jmchilton/fix_resubmissions

Fix bug with job re-submission introduced in 34f0b0f

Author: nsoranzo

lib/galaxy/jobs/__init__.py

@@ -243,7 +243,7 @@ def __parse_job_conf_xml(self, tree):
             job_destination['env'] = self.__get_envs(destination)
             destination_resubmits = self.__get_resubmits(destination)
             if destination_resubmits:
-                resubmits = self.default_resubmits
+                resubmits = destination_resubmits
             else:
                 resubmits = self.default_resubmits
             job_destination["resubmit"] = resubmits