1. 03 Dec, 2015 1 commit
  2. 02 Dec, 2015 2 commits
    • Javier Vegas-Regidor's avatar
      Merge remote-tracking branch 'origin/develop_SAGA' into develop_SAGA · ff371f36
      Javier Vegas-Regidor authored
      Conflicts:
      	autosubmit/autosubmit.py
      	autosubmit/config/config_common.py
      	autosubmit/job/job.py
      	autosubmit/job/job_common.py
      	autosubmit/job/job_list.py
      	setup.py
      ff371f36
    • Javier Vegas-Regidor's avatar
      Merge branch 'develop_stats' into develop_SAGA · c5fc89d7
      Javier Vegas-Regidor authored
      Conflicts:
      	VERSION
      	autosubmit/autosubmit.py
      	autosubmit/config/config_common.py
      	autosubmit/job/job.py
      	autosubmit/job/job_common.py
      	autosubmit/job/job_list.py
      	autosubmit/platforms/ecplatform.py
      	autosubmit/platforms/hpcplatform.py
      	autosubmit/platforms/localplatform.py
      	autosubmit/platforms/lsfplatform.py
      	autosubmit/platforms/pbsplatform.py
      	autosubmit/platforms/psplatform.py
      	autosubmit/platforms/sgeplatform.py
      	autosubmit/platforms/slurmplatform.py
      	setup.py
      c5fc89d7
  3. 01 Dec, 2015 5 commits
  4. 30 Nov, 2015 1 commit
  5. 27 Nov, 2015 2 commits
  6. 25 Nov, 2015 13 commits
  7. 24 Nov, 2015 4 commits
  8. 05 Nov, 2015 2 commits
  9. 04 Nov, 2015 9 commits
  10. 29 Oct, 2015 1 commit