DLR-SC / prov-db-connector / 198

96%

master: 96%

push

travis-ci

Merge branch 'master' into develop

# Conflicts:
#	README.md
#	docs/Database-Adapaters.md
#	provdbconnector/db_adapters/baseadapter.py
#	provdbconnector/db_adapters/in_memory/simple_in_memory.py
#	provdbconnector/db_adapters/neo4j/neo4jadapter.py
#	provdbconnector/exceptions/database.py
#	provdbconnector/exceptions/provapi.py
#	provdbconnector/exceptions/utils.py
#	provdbconnector/provapi.py
#	provdbconnector/tests/__init__.py
#	provdbconnector/tests/db_adapters/in_memory/test_simple_in_memory.py
#	provdbconnector/tests/db_adapters/neo4j/test_neo4jadapter.py
#	provdbconnector/tests/db_adapters/test_baseadapter.py
#	provdbconnector/tests/examples.py
#	provdbconnector/tests/test_provapi.py
#	provdbconnector/tests/utils/test_converter.py
#	provdbconnector/utils/serializer.py

1 of 1 new or added line in 1 file covered. (100.0%)

1796 of 1883 relevant lines covered (95.38%)

0.95 hits per line