syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdisabat...@apache.org
Subject [1/2] syncope git commit: [SYNCOPE-739] Merge from 1_2_X
Date Mon, 07 Dec 2015 08:06:23 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 3fa2dce9d -> 141f96956


[SYNCOPE-739] Merge from 1_2_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/141f9695
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/141f9695
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/141f9695

Branch: refs/heads/master
Commit: 141f96956f35c85543b2cea3ffb728d4dcf7b692
Parents: dde2a12
Author: Marco Di Sabatino Di Diodoro <mdisabatino@apache.org>
Authored: Fri Dec 4 17:50:41 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <mdisabatino@apache.org>
Committed: Mon Dec 7 09:05:55 2015 +0100

----------------------------------------------------------------------
 .../apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/141f9695/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
index 2e99c34..19193dd 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
@@ -49,11 +49,7 @@ public class VirSchemaTest extends AbstractTest {
 
     @Test
     public void findAll() {
-<<<<<<< da596533f9b9726802d360d51045a24a1cf23677:core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
         List<VirSchema> list = virSchemaDAO.findAll();
-=======
-        List<UVirSchema> list = virSchemaDAO.findAll(UVirSchema.class);
->>>>>>> [SYNCOPE-739] Virtual attributes are not updated after a sync
task:core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
         assertEquals(3, list.size());
     }
 


Mime
View raw message