Finish Release-0.12.3

TGAC · Mar 17, 2016 · e005014 · e005014
2 parents bbbdb43 + aff58d9
commit e005014
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/source/env-config.rst b/doc/source/env-config.rst
@@ -25,8 +25,8 @@ Conan - scheduler configuration
 RAMPART's execution context is specified by default in a file called "conan.properties".  In this file it is possible to
 describe the type of scheduling system to use and if so, what queue to run on.  Valid properties:
 
-* ``executionContext.scheduler =`` Valid options {"","LSF","PBS"}
-* ``executionContext.scheduler.queue =`` The queue to execute child jobs on.
+* ``executionContext.scheduler =`` Valid options {"","LSF","PBS","SLURM"}
+* ``executionContext.scheduler.queue =`` The queue/partition to execute child jobs on.
 * ``executionContext.locality = LOCAL`` Always use this for now!  In the future it may be possible to execute child jobs at a remote location.
 * ``externalProcessConfigFile = <location to external process loading file>`` See next section for details of how to setup this file.
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
 	<groupId>uk.ac.tgac.rampart</groupId>
 	<artifactId>rampart</artifactId>
-	<version>0.12.2</version>
+	<version>0.12.3</version>
 	<packaging>jar</packaging>
 
     <name>RAMPART</name>
@@ -477,7 +477,7 @@
         <dependency>
             <groupId>uk.ac.tgac.conan</groupId>
             <artifactId>tgac-conan-process-wrappers</artifactId>
-            <version>0.12.7</version>
+            <version>0.12.9</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-cli</groupId>