Odysseus Incubation
  1. Odysseus Incubation

priority

Public
  1. Odysseus Incubation
  2. priority

Commits

AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
d63013975e0MMerge branch 'development'
Marco GrawunderMarco Grawunder
5f8d1e81f42batch updates
Marco GrawunderMarco Grawunder
cbdeed9f3eaMMerge branch 'development'
Marco GrawunderMarco Grawunder
0dbabb984b9Update of extension for tycho
Marco GrawunderMarco Grawunder
89f037ff280Removed Exec Env
Marco GrawunderMarco Grawunder
683c3360ed9MMerge branch 'development'
Marco GrawunderMarco Grawunder
42c2eba6ca1RemovedWarnings
Marco GrawunderMarco Grawunder
40e063fa710MPull request #4: Update of submoduleMerge in OI/priority from development to master * commit 'e1e6764eab34ba32f3582124c8fd77ed4512d72b': Update of submodule
Marco GrawunderMarco Grawunder
e1e6764eab3Update of submodule
Marco GrawunderMarco Grawunder
3439cc05286MMerge pull request #3 in OI/priority from development to master* commit '9464448c49fb70bcf6789a7854b823f7d2acfb9f': removed latency_relational
Marco GrawunderMarco Grawunder
9464448c49fremoved latency_relational
Marco GrawunderMarco Grawunder
60c623adab6MMerge pull request #2 in OI/priority from development to master* commit 'bef6a860abd0fc70e5e0650247b2c4c3c05d4a0b': ODY-1035: Latency CheckpointsODY-1035
Marco GrawunderMarco Grawunder
bef6a860abdODY-1035: Latency CheckpointsODY-1035
Marco GrawunderMarco Grawunder
0c0088834c4MMerge branch 'development'
Marco GrawunderMarco Grawunder
3d415361123added solobuild profile
Tobias BrandtTobias Brandt
1533a1c9b2bMMerge pull request #1 in OI/priority from development to master* commit '9e7343cbc15cbce1d2adc69718cf2cb5d3b82ebb': maven preparation
Tobias BrandtTobias Brandt
9e7343cbc15maven preparation
Marco GrawunderMarco Grawunder
3e82c385a07odysseus_dev update
Marco GrawunderMarco Grawunder
426d3f7846dMaven buildable
Marco GrawunderMarco Grawunder
475e4d42098maven preparations
Marco GrawunderMarco Grawunder
a1b3dac7a35maven preparations
Marco GrawunderMarco Grawunder
0b08fa1ee88Accidentially removed ...
Marco GrawunderMarco Grawunder
e9bebf442b1Added submodules
Marco GrawunderMarco Grawunder
b9d4f25a083Initial commit
Marco GrawunderMarco Grawunder
8d633c013d5Commit removals
Marco GrawunderMarco Grawunder
6a36d8543dfMMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
38f75da6f53Moved rcp, keyvalue and trust to core
Marco GrawunderMarco Grawunder
98525c286e2MMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
865f2707b40MMerge 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
Marco GrawunderMarco Grawunder
37074ccf35cMoved bundles to module folders
Marco GrawunderMarco Grawunder
93ddd79a307MMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
087c1621affremoved version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
94374f7179fMMerge pull request #421 in ODY/odysseus from bugfix/ODY-1620-xmlprocotolhandler-don-t-work-with-push to development* commit '83ba1bfdc434d40defbd7ce8943965e672cbfaef [formerly d54d760c11c516237b5cf9d85541bb4e210b974a]': ODY-1620: Always initialize result-list Former-commit-id: 813c98ca8c059813ac293ae0d087ab883056b107ODY-1620
Marco GrawunderMarco Grawunder
a69ca377238MMerge pull request #420 in ODY/odysseus from feature/digital-signal-processing to development* commit '4db06627db379dc6ae71ea3a47c66b27fd5df448 [formerly f08928cae80156a655ecc35c1e2b148a70beb0a6]': (33 commits) Rename InterpolationMethod interface to IInterpolationMethod Respect Base Time Improved Interpolation Documentation of abstract operators Output Schema of placeholder abstract operators FFT and Cross Correlation substitution rules Fir Filter Substitution First Ve...
Marco GrawunderMarco Grawunder
7650611b47bMMerge pull request #415 in ODY/odysseus from ODY-1627-anomaly-detection-output to development* commit 'b684bef96884542bc7c20b30c8be495f42e50007 [formerly f25bd300cc76a46d0d875d6ce4f484a5b23d2de2]': ODY-1627 Same changes for output on port 1 on master Former-commit-id: fc29aa6c65d6e97eeb51db9234c5f13bb03d6c2dODY-1627
Marco GrawunderMarco Grawunder
05df89b6f22MMerge pull request #407 in ODY/odysseus from bugfix/104-bugfixes to development* commit '38b115cb11e1d2ac47b364d6f66b40e6a1a4753a [formerly 53c38a2748ce62b06601a5cf6acb6de5e1ca6a91]': (44 commits) Removed resources Fixed manifest file after merge OJ104: Added dependency to slf4j again. Reviewer removed it, but it is needed. FIX: Wrong plugin reference in feature Renamed folders (same name as projects now) Some fixes for the reader. Renamed graph lib bundles ...2 Jira issues
Marco GrawunderMarco Grawunder
f5c12a59bf3MMerge remote-tracking branch 'origin/development' into bugfix/104-bugfixesConflicts: common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: bc67c9019f0e7a381ed0283763ab99397bb649df
Tobias BrandtTobias Brandt
3152283c8bcMMerge pull request #408 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to development* commit 'ed208d4393ed8496de729571f4b6c721ec8cb59f [formerly 2ca0906c9126f51f7d001d59f451c78b42fb44a7]': Merge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundles Removed resources from main repo (again) Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for remove...ODY-1612
Marco GrawunderMarco Grawunder
d9eb9295041MMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: common/resources/com.google.code.gson/.classpath common/resources/com.google.code.gson/META-INF/MANIFEST.MF common/resources/com.google.code.gson/build.properties server/spatiotemporal/de.uniol.inf.odysseus.spatiotemporal/META-INF/MANIFEST.MF Former-commit-id: 49a7c81f4eded682784dd0cb445f062fe6c6fe08ODY-1612
Marco GrawunderMarco Grawunder
9c677ed3f9eMMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: server/graph/de.uniol.inf.is.odysseus.graph.server.feature/feature.xml Former-commit-id: cd0052d9740d9d54d9776eee94c51aa81ad63ad1ODY-1612
Michael BrandMichael Brand
93f011dc040MMerge branch 'development' into bugfix/104-bugfixes# Conflicts: # common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: c1fb50078fdfbb600b6b80e62c57505fefcafc57
Marco GrawunderMarco Grawunder
123164ce989MMerge pull request #406 in ODY/odysseus from test to ODY-1612-create-feature-projects-for-resouces-bundles* commit '0f03437aadc933ac89ab08af4d187c036fb0baad [formerly 9fcce41fe3e27a067d7f2143df220df455c4005d]': Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for removed src folders Updated target platform (new dropin location) GS-Stuff name update Former-commit-id: 13e82df37f3ff37e23fc19a8ce0d537b5efa107bODY-1612
Marco GrawunderMarco Grawunder
dd9a6974184MMerge pull request #405 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to test* commit '5119ab0b34e3699de93799f6da19f60c3f89f5ca [formerly 8159b8de5b95fba80736a26cdc3696c8412286c1]': (77 commits) ODY-1612: Removed old restlet version ODY-1612: Removed merge conflicts ODY-1612: Working with new resources from update site ODY-1612: New target platform ODY-1612: Readmes for project changes ODY-1612: Removed Resources ODY-1612: Update to new target platform O...2 Jira issues
Marco GrawunderMarco Grawunder
e716b19d52cMMerge pull request #389 in ODY/odysseus from development to master* commit 'b045ea0de337e579b1df3f1fd9fbc550848095bc [formerly 5c93028eb77f7b5978b8f548ea7d8b8b12c18f88]': ODY-1615: FIX for cases with no transport handler new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of IInformationObjects. new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of...ODY-1615
Philipp MudraPhilipp Mudra
6816d0379d0MMerge remote-tracking branch 'origin/development' into feature/digital-signal-processing Former-commit-id: f08928cae80156a655ecc35c1e2b148a70beb0a6
Philipp MudraPhilipp Mudra
227b17bb340MMerge remote-tracking branch 'origin/master' into feature/digital-signal-processing Former-commit-id: 5b8b4ac098db7f1cf26f6f91f49637ca5dc69a54
Tobias BrandtTobias Brandt
63e2a2e098bMMerge pull request #380 in ODY/odysseus from toString-for-temporal-trust to development* commit '3b7c165c89238149f963d36a5825e958d076853a [formerly 7db834d0cdb05c464a918fc42d652c8ed35b04f0]': A simple toString method for the temporal trust Former-commit-id: 2eb9ea075d4cf75964e33c9970509c5ca3da6d29
Tobias BrandtTobias Brandt
f55d3fbe796MMerge branch 'development' into toString-for-temporal-trust Former-commit-id: 7db834d0cdb05c464a918fc42d652c8ed35b04f0
Marco GrawunderMarco Grawunder
e84f56a722fMMerge pull request #379 in ODY/odysseus from master to development* commit 'fdf91a4fffa8bb47fefedb5c1b20179d674aa83f [formerly ec525e8d761e31923a26322a07a38b8c007e83c2]': Test for Jenkins Former-commit-id: 3bad8f078cd2ff423f7b6ffc47527b07f9db9f6e
Marco GrawunderMarco Grawunder
0acab889dabMMerge pull request #378 in ODY/odysseus from development to master* commit 'a1703e742905b7634df565a411253703a22cf70b [formerly a1d9f4d5b6067c7e331de61f7bd00e11c54506a4]': Netzdatenstrom update 104ProtocolHandler: Avoid multithreading OJ104: fixed ignore sending responses 104ProtocolHandler: synchronization of timestamp map OJ104: Fixed bug with bitshifting PcapFileHandler/104ProtocolHandler: Added the possibility to extract capture time from pcap ...