3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ff42e7cdcd97/ Changeset: ff42e7cdcd97 Branch: next-stable User: jmchilton Date: 2014-05-20 22:31:14 Summary: Enable job metrics by default. They should work with all stock Galaxy runners now. Affected #: 1 file diff -r b814c23924470203ff3f37b28066a118e75bf348 -r ff42e7cdcd9716324c7b423135f24b44d327168c run.sh --- a/run.sh +++ b/run.sh @@ -19,6 +19,7 @@ data_manager_conf.xml.sample shed_data_manager_conf.xml.sample openid_conf.xml.sample + job_metrics_conf.xml.sample universe_wsgi.ini.sample tool-data/shared/ncbi/builds.txt.sample tool-data/shared/ensembl/builds.txt.sample https://bitbucket.org/galaxy/galaxy-central/commits/e49feb93943d/ Changeset: e49feb93943d Branch: next-stable User: jmchilton Date: 2014-05-20 22:31:14 Summary: Fix up job_conf.xml env element logging. Now works with all runners. Affected #: 1 file diff -r ff42e7cdcd9716324c7b423135f24b44d327168c -r e49feb93943da7c6a1ccb84d6dff4518742282a8 job_conf.xml.sample_advanced --- a/job_conf.xml.sample_advanced +++ b/job_conf.xml.sample_advanced @@ -104,12 +104,11 @@ </destination><destination id="remote_cluster" runner="drmaa" tags="longjobs"/><destination id="java_cluster" runner="drmaa"> - <!-- set arbitrary environment variables at runtime - like metrics - doesn't yet work with local or CLI runners. But should work with - DRMAA/SLURM, PBS, Condor, and LWR. General dependencies for tools - should be configured via tool_dependency_dir and package options - and these options should be reserved for defining cluster specific - options. + <!-- set arbitrary environment variables at runtime. General + dependencies for tools should be configured via + tool_dependency_dir and package options and these + options should be reserved for defining cluster + specific options. --><env id="_JAVA_OPTIONS">-Xmx=6GB</env><env id="ANOTHER_OPTION" raw="true">'5'</env><!-- raw disables auto quoting --> https://bitbucket.org/galaxy/galaxy-central/commits/622d4d3ed3bd/ Changeset: 622d4d3ed3bd User: jmchilton Date: 2014-05-20 22:31:43 Summary: Merge next-stable. Affected #: 2 files diff -r 70400d62e299e041b18e934788fc34ad7bfc2ddb -r 622d4d3ed3bdb34edeca089a0775cdff86114798 job_conf.xml.sample_advanced --- a/job_conf.xml.sample_advanced +++ b/job_conf.xml.sample_advanced @@ -104,12 +104,11 @@ </destination><destination id="remote_cluster" runner="drmaa" tags="longjobs"/><destination id="java_cluster" runner="drmaa"> - <!-- set arbitrary environment variables at runtime - like metrics - doesn't yet work with local or CLI runners. But should work with - DRMAA/SLURM, PBS, Condor, and LWR. General dependencies for tools - should be configured via tool_dependency_dir and package options - and these options should be reserved for defining cluster specific - options. + <!-- set arbitrary environment variables at runtime. General + dependencies for tools should be configured via + tool_dependency_dir and package options and these + options should be reserved for defining cluster + specific options. --><env id="_JAVA_OPTIONS">-Xmx=6GB</env><env id="ANOTHER_OPTION" raw="true">'5'</env><!-- raw disables auto quoting --> diff -r 70400d62e299e041b18e934788fc34ad7bfc2ddb -r 622d4d3ed3bdb34edeca089a0775cdff86114798 run.sh --- a/run.sh +++ b/run.sh @@ -19,6 +19,7 @@ data_manager_conf.xml.sample shed_data_manager_conf.xml.sample openid_conf.xml.sample + job_metrics_conf.xml.sample universe_wsgi.ini.sample tool-data/shared/ncbi/builds.txt.sample tool-data/shared/ensembl/builds.txt.sample Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.