Merge branch 'master' into ssdm-8226-replace-lucene-search-query-engine
# Conflicts: # openbis_ng_ui/src/js/components/common/error/ErrorDialog.jsx
No related branches found
No related tags found
Showing
- datastore_server/dist/etc/service.properties 6 additions, 1 deletiondatastore_server/dist/etc/service.properties
- datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemView.java 8 additions, 5 deletions...isd/openbis/dss/generic/server/ftp/DSSFileSystemView.java
- datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java 29 additions, 12 deletions.../server/plugins/standard/ArchivingAggregationService.java
- integration-tests/test_pybis.py 2 additions, 2 deletionsintegration-tests/test_pybis.py
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutor.java 1 addition, 1 deletion.../v3/executor/operation/AsynchronousOperationExecutor.java
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationThreadPoolExecutor.java 4 additions, 2 deletions...or/operation/AsynchronousOperationThreadPoolExecutor.java
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationThreadPoolExecutor.java 3 additions, 1 deletion...r/operation/IAsynchronousOperationThreadPoolExecutor.java
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationsExecutor.java 2 additions, 1 deletion...rver/asapi/v3/executor/operation/IOperationsExecutor.java
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java 25 additions, 4 deletions...erver/asapi/v3/executor/operation/OperationsExecutor.java
- openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutor.java 1 addition, 1 deletion...i/v3/executor/operation/SynchronousOperationExecutor.java
- openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java 10 additions, 8 deletions.../systemsx/cisd/openbis/generic/server/AbstractServer.java
- openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java 1 addition, 1 deletion...isd/openbis/generic/server/ServiceForDataStoreServer.java
- openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java 7 additions, 11 deletions...sx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
- openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/operation/AbstractOperationExecutionOptions.js 7 additions, 0 deletions.../v3/as/dto/operation/AbstractOperationExecutionOptions.js
- openbis/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutorTest.java 7 additions, 7 deletions...executor/operation/AsynchronousOperationExecutorTest.java
- openbis/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutorTest.java 5 additions, 5 deletions.../executor/operation/SynchronousOperationExecutorTest.java
- openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java 46 additions, 0 deletions...is/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java
- openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.java 4 additions, 5 deletions...va/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.java
- openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java 15 additions, 4 deletions...temsx/cisd/openbis/generic/server/AbstractServerTest.java
- openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java 8 additions, 3 deletions...ystemsx/cisd/openbis/generic/server/CommonServerTest.java
Loading
Please register or sign in to comment