AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
e6d9f6f7fd3MMerge branch 'development'
Marco GrawunderMarco Grawunder
cd2975ce620added solobuild profile
Tobias BrandtTobias Brandt
9ba67b885b0MMerge pull request #5 in OI/opc from development to master* commit '5bfd3e1e455ffccd00be940d61d2c5dbb5a57cf9': maven preparation
Tobias BrandtTobias Brandt
5bfd3e1e455maven preparation
Tobias BrandtTobias Brandt
d2a977bf1beMMerge pull request #4 in OI/opc from development to master* commit '3ccd943a6f8f94982f84f8d74e3028dda6906fa2': odysseus_dev update
Marco GrawunderMarco Grawunder
840e59a4826odysseus_dev update
Marco GrawunderMarco Grawunder
3ccd943a6f8odysseus_dev update
Marco GrawunderMarco Grawunder
0fb0238a8c3MMerge pull request #3 in OI/opc from development to master* commit 'bed5c728b7694f247e0f75f6a86c21b8d37b8e98':
Marco GrawunderMarco Grawunder
bed5c728b76MMerge pull request #2 in OI/opc from master to development* commit 'a3a099ff60866dee865a616f9d2c48637200e608': submodule update maven preparations
Marco GrawunderMarco Grawunder
a3a099ff608MMerge branch 'development'
Marco GrawunderMarco Grawunder
aafb29f530fMaven buildable
Marco GrawunderMarco Grawunder
b51df6c55f5submodule update
Marco GrawunderMarco Grawunder
33b7121e0f0maven preparations
Marco GrawunderMarco Grawunder
7e5daf10720maven preparations
Marco GrawunderMarco Grawunder
e5a4342ac00Added submodules
Marco GrawunderMarco Grawunder
d2235872feaInitial commit
Marco GrawunderMarco Grawunder
3203886679fCommit removals
Marco GrawunderMarco Grawunder
1b6ec72c04fMMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
8b85b19b6d5MMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
d99e8e213b8MMerge 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
f21c63edcb8Moved bundles to module folders
Marco GrawunderMarco Grawunder
1a0cfd6c689MMerge 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...
Marco GrawunderMarco Grawunder
ebe3958a231Adding submodule wrapper/opcua
Marco GrawunderMarco Grawunder
0318f855507Removing directory to replace with submodule
Marco GrawunderMarco Grawunder
78f876387ddAdding submodule wrapper/opcda
Marco GrawunderMarco Grawunder
e1e4314538bRemoving directory to replace with submodule
Marco GrawunderMarco Grawunder
689a7232dbcRevert "Merge pull request #6 in ODY/odysseus from submodulesWrapper to development"This reverts commit 1e4a500cb7de116913a544ec10c496ace1d8ef07, reversing changes made to fd0ce61647d2a80e7b59e714477f82b820a9f46f.
Marco GrawunderMarco Grawunder
e3a492c7631MMerge 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...
Marco GrawunderMarco Grawunder
bc036c4c208Adding submodule wrapper/opcua
Marco GrawunderMarco Grawunder
1a457ee3657Removing directory to replace with submodule
Marco GrawunderMarco Grawunder
874ba4a1d58Adding submodule wrapper/opcda
Marco GrawunderMarco Grawunder
b61727d5ec1Removing directory to replace with submodule
Marco GrawunderMarco Grawunder
bce78cd6620MMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
80b742687ecremoved version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
6dd39672a24MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
909b065fb30Moved each wrapper (plugin(s) and feature) to own subfolder
Marco GrawunderMarco Grawunder
42e520f0833MMerge 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
ffd2401a865MMerge 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
29d30125806MMerge 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
3c9b83cebceMMerge pull request #411 in ODY/odysseus from ODY-1626-java-10-compability to development* commit '237add5dee5f9eb9d4436c0f5b5fa02617e5a899 [formerly 579be6983c8fc368d5b99fd5061db658331ead62]': ODY-1626: Added external libs for removed jdk support Former-commit-id: f9a0b06f202e124bf80db3229fb6aacc346942fcODY-1626
Marco GrawunderMarco Grawunder
597c23b1e12ODY-1626: Added external libs for removed jdk supportFormer-commit-id: 579be6983c8fc368d5b99fd5061db658331ead62ODY-1626
Marco GrawunderMarco Grawunder
af648a60f5fMMerge 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
d49c2853ce8MMerge 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
76a81bab340MMerge 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
af01a20075dMMerge 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
d9b0c4578f9MMerge 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
b048bfd72e9MMerge 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
c202caa5843MMerge 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
848ddec927cMMerge 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
14885bce5c7MMerge 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

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut