Unverified Commit fa58f37f authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_20.09' into release_21.01

parents 40e73295 25861047

lib/galaxy/jobs/handler.py

+5 −1
Original line number Diff line number Diff line
@@ -604,7 +604,11 @@ class JobHandlerQueue(Monitors): 
                    elif history.state == "ok":

                        finished = history.create_time



                if started is not None and finished is not None:

                    time_spent += finished - started

                else:

                    log.warning("Unable to calculate time spent for job %s; started: %s, finished: %s",

                                job.id, started, finished)



            if time_spent > self.app.job_config.limits.total_walltime["delta"]:

                return JOB_USER_OVER_TOTAL_WALLTIME, job_destination

packages/data/HISTORY.rst

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ History 
.. to_doc



---------------------

20.9.1.dev0

20.9.1 (2021-03-02)

---------------------

packages/data/galaxy/project_galaxy_data.py

+1 −1
Original line number Diff line number Diff line 
__version__ = '20.9.1.dev0'

__version__ = '21.1.0.dev0'



PROJECT_NAME = "galaxy-data"

PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"