Commit eaa0113a authored 6 years ago by piotr.kupczyk@id.ethz.ch

Merge branch 'master' of sissource.ethz.ch:sispub/openbis

parents e4fc9a8e eac330e5

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java 2 additions, 1 deletion

...erver/business/bo/datasetlister/IDatasetListingQuery.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.java 1 addition, 1 deletion

...s/generic/server/dataaccess/db/DatabaseVersionHolder.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserGroup.java 15 additions, 2 deletions

.../systemsx/cisd/openbis/generic/server/task/UserGroup.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTask.java 26 additions, 2 deletions

...is/generic/server/task/UserManagementMaintenanceTask.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java 70 additions, 3 deletions

...ystemsx/cisd/openbis/generic/server/task/UserManager.java
openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java 1 addition, 1 deletion

...sd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
openbis/source/sql/generic/172/data-172.sql 464 additions, 0 deletions

openbis/source/sql/generic/172/data-172.sql
openbis/source/sql/generic/172/schema-172.sql 917 additions, 0 deletions

openbis/source/sql/generic/172/schema-172.sql
openbis/source/sql/postgresql/172/domains-172.sql 35 additions, 0 deletions

openbis/source/sql/postgresql/172/domains-172.sql
openbis/source/sql/postgresql/172/function-172.sql 2287 additions, 0 deletions

openbis/source/sql/postgresql/172/function-172.sql
openbis/source/sql/postgresql/172/grants-172.sql 129 additions, 0 deletions

openbis/source/sql/postgresql/172/grants-172.sql
openbis/source/sql/postgresql/migration/migration-171-172.sql 7 additions, 0 deletions

...bis/source/sql/postgresql/migration/migration-171-172.sql
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java 1 addition, 1 deletion

...ness/bo/fetchoptions/datasetlister/DataSetListerTest.java
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java 75 additions, 5 deletions

...eneric/server/task/UserManagementMaintenanceTaskTest.java
openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTest.java 50 additions, 9 deletions

...ystemsx/cisd/openbis/systemtest/task/UserManagerTest.java
openbis/sourceTest/sql/postgresql/172/.DUMP 0 additions, 0 deletions

openbis/sourceTest/sql/postgresql/172/.DUMP
openbis/sourceTest/sql/postgresql/172/001=attachment_contents.tsv 12 additions, 0 deletions

...sourceTest/sql/postgresql/172/001=attachment_contents.tsv
openbis/sourceTest/sql/postgresql/172/002=attachments.tsv 12 additions, 0 deletions

openbis/sourceTest/sql/postgresql/172/002=attachments.tsv
openbis/sourceTest/sql/postgresql/172/003=authorization_group_persons.tsv 1 addition, 0 deletions

...st/sql/postgresql/172/003=authorization_group_persons.tsv
openbis/sourceTest/sql/postgresql/172/004=authorization_groups.tsv 1 addition, 0 deletions

...ourceTest/sql/postgresql/172/004=authorization_groups.tsv

with 4106 additions and 25 deletions

Please register or to comment