DLR-SC / prov-db-connector / 209

Builds Branch Commit Type Ran Committer Via Coverage
209 master Merge branch 'master' of https://github.com/DLR-SC/prov-db-connector # Conflicts: # docs/source/conf.py push B-Stefan travis-ci pending completion   set done
208 master Merge pull request #37 from DLR-SC/develop - Changed makefike - Add svg files to docs - try to get read the docs working push web-flow travis-ci pending completion   set done
206 develop add readthedocs config push B-Stefan travis-ci pending completion   set done
205 develop - added svg files to documentation (closes #34) push B-Stefan travis-ci pending completion   set done
204 develop Merge remote-tracking branch 'origin/develop' into develop push B-Stefan travis-ci pending completion   set done
203 develop Make use of pip install again @B-Stefan Rebuild virtual environment after this commit push web-flow travis-ci pending completion   set done
202 master Merge pull request #36 from DLR-SC/develop Merge following features: Documentation Merge mechanism Code-Recator push web-flow travis-ci pending completion   set done
201 master resolved import conflict Pull #36 web-flow travis-ci pending completion   set done
200 develop resolved import conflict push B-Stefan travis-ci pending completion   set done
198 develop 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 ... push B-Stefan travis-ci pending completion   set done
199 master 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 ... Pull #36 web-flow travis-ci pending completion   set done
197 develop Merge pull request #35 from DLR-SC/remove-prov-fork-dependency Remove prov fork dependency updated to prov-1.5.0 push web-flow travis-ci pending completion   set done
196 develop - changed to pip install test Pull #35 web-flow travis-ci pending completion   set done
195 remove-prov-fork-dependency - changed to pip install test push B-Stefan travis-ci pending completion   set done
194 develop - add setup method Pull #35 web-flow travis-ci pending completion   set done