Skip to content
Snippets Groups Projects
Commit 5f7a37d2 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

Merge origin/master into copyNode 

Conflicts:
	src/main/java/it/inaf/oats/vospace/JobService.java
	src/main/java/it/inaf/oats/vospace/MoveService.java
	src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java
Merge commit
parents a2faccb3 ecb8bc95
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 171 additions and 440 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment