Homec4science

Merge branch 'maint-2.0'

Authored by kuncar on Apr 21 2015, 13:42.

Description

Merge branch 'maint-2.0'

  • maint-2.0: global: redesign of requirements.py docker: Dockerfile and compose config rewrite travis: extraction of dev config into script
  • Amends setup.py with changes from 10c1f2f. (closes #3041)

Details

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:ec0b8791f866: Merge branch 'maint-2.0' (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Apr 21 2015, 13:42

Merged Changes

CommitAuthorDetailsCommitted
83a9ba90c057Marco Neumann
global: redesign of requirements.py 
Apr 21 2015
ab72121a2534Marco Neumann
docker: Dockerfile and compose config rewrite 
Apr 21 2015
d5d40d1bb7ecMarco Neumann
travis: extraction of dev config into script 
Apr 21 2015