simon-dube / CARMIN-server

89%

develop: 88%

LAST BUILD ON BRANCH path-upload-raw

branch: path-upload-raw

CHANGE BRANCH

x

Reset

• path-upload-raw
• abstract-descriptor
• app-rework
• better-error-message
• boutiques-descriptor
• change-password
• cli
• datalad-gdrive-1
• db-fix
• develop
• execution-play
• execution-play-continue
• execution-play-with-rework
• fix-logger-crash-on-404
• fix-rename
• generate-random-admin-pw
• get-stdout-stderr
• logging
• misc-fixes-1
• path-refactor
• pg_config-note
• pre-release
• python-3_4-support
• readme-change
• readme-changes
• register-refactor-admin-fix
• restructure
• v0.1-alpha
• v0.2-alpha

Build # 369

Build Type

push

travis-ci

Committed by louis-ver

Commit Message

Merge branch 'develop' into path-upload-raw

# Conflicts:
#	server/common/error_codes_and_messages.py
#	server/resources/execution.py
#	server/resources/execution_kill.py
#	server/resources/execution_play.py
#	server/resources/execution_results.py
#	server/resources/executions.py
#	server/resources/helpers/execution_play.py
#	server/resources/helpers/execution_results.py
#	server/resources/helpers/executions.py
#	server/resources/helpers/pipelines.py
#	server/resources/models/descriptor/boutiques.py
#	server/resources/models/descriptor/descriptor_abstract.py
#	server/resources/models/descriptor/supported_descriptors.py
#	server/test/database/app.db
#	server/test/fakedata/executions.py
#	server/test/fakedata/pipelines.py
#	server/test/resources/test_executions.py

Run Details

2482 of 2791 relevant lines covered (88.93%)

4.44 hits per line