Merge pull request #6 in OI/rdf from development to master* commit '60e38c2ec2934fa04659880549d82188d5d796c6':
Fixed some dependencies ... not working yet
ODY-1706: Changed plugins in feature, too
Option for determine type, Removed warnings
ODY-1706: Replaced sesame with rdf4j
Merge pull request #5 in OI/rdf from bugfix/ODY-1706-rdf-protocol-handler-does-work-correctly to development* commit '550802b3f23fcc2287bb6cdb9615e08689ca66c7':
Fixed some dependencies ... not working yet
ODY-1706: Changed plugins in feature, too
Option for determine type, Removed warnings
ODY-1706: Replaced sesame with rdf4j
odysseus_dev update
Merge pull request #3 in OI/rdf from development to master* commit '476cd3b16c90725a0987b26f6c801cf1d4a621fb':
Update of submodule, added wrapper to category
Merge pull request #2 in OI/rdf from development to master* commit '4262508888f41d6e4996f83312bfb2a184bfad6a':
update of category, versions
odysseus_dev update
Merge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011':
Removed outdated projects
Merge pull request #15 in ODY/odysseus from modules to development* commit 'a80919cfea85e983dd49eb45f47506967cf6fa83':
Renamed folder for cache plugin ...
Moved server projects to same level
Moved bundles to module folders
Merge pull request #7 in ODY/odysseus from submoduleE to development* commit 'ca25dfa076c7e394e0875c15a07831ebd2b21544': (94 commits)
Adding submodule wrapper/actisense
Removing directory to replace with submodule
Adding submodule wrapper/zeromq
Removing directory to replace with submodule
Adding submodule wrapper/xovis
Removing directory to replace with submodule
Adding submodule wrapper/xls
Removing directory to replace with submodule
Adding...
Revert "Merge pull request #6 in ODY/odysseus from submodulesWrapper to development"This reverts commit 1e4a500cb7de116913a544ec10c496ace1d8ef07, reversing
changes made to fd0ce61647d2a80e7b59e714477f82b820a9f46f.
Merge pull request #6 in ODY/odysseus from submodulesWrapper to development* commit '673c29828fecdb9ec04add8ab4f50b6a27c7df72': (94 commits)
Adding submodule wrapper/hdfs
Removing directory to replace with submodule
Adding submodule wrapper/haggis
Removing directory to replace with submodule
Adding submodule wrapper/actisense
Removing directory to replace with submodule
Adding submodule wrapper/zeromq
Removing directory to replace with submodule
Addi...
Merge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7':
ODY-1631: implemented function