From bdb41005c82678933656d651484cd1b9efeb55d1 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 4 Apr 2016 14:36:32 -0400
Subject: [PATCH] Fix pulsar_conf/pulsar_config problem.

One was being validated and the other was being read and documented.
---
 config/job_conf.xml.sample_advanced | 2 +-
 lib/galaxy/jobs/runners/pulsar.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/job_conf.xml.sample_advanced b/config/job_conf.xml.sample_advanced
index b5f97e086ea..bdbd3a54274 100644
--- a/config/job_conf.xml.sample_advanced
+++ b/config/job_conf.xml.sample_advanced
@@ -114,7 +114,7 @@
                https://github.com/galaxyproject/pulsar/blob/master/app.yml.sample
                http://pulsar.readthedocs.org/en/latest/configure.html
           -->
-          <!-- <param id="pulsar_conf">path/to/pulsar/app.yml</param> -->
+          <!-- <param id="pulsar_config">path/to/pulsar/app.yml</param> -->
         </plugin>
 
     </plugins>
diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py
index 66d28734c63..dfb7dbf7a4b 100644
--- a/lib/galaxy/jobs/runners/pulsar.py
+++ b/lib/galaxy/jobs/runners/pulsar.py
@@ -173,7 +173,7 @@ class PulsarJobRunner( AsynchronousJobRunner ):
         self._init_monitor_thread()
 
     def __init_client_manager( self ):
-        pulsar_conf = self.runner_params.get('pulsar_conf', None)
+        pulsar_conf = self.runner_params.get('pulsar_config', None)
         self.__init_pulsar_app(pulsar_conf)
 
         client_manager_kwargs = {}