Return-Path: 
 <commits-return-6490-apmail-syncope-commits-archive=syncope.apache.org@syncope.apache.org>
X-Original-To: apmail-syncope-commits-archive@www.apache.org
Delivered-To: apmail-syncope-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F1E01185D5
	for <apmail-syncope-commits-archive@www.apache.org>;
 Mon,  7 Dec 2015 08:06:23 +0000 (UTC)
Received: (qmail 99653 invoked by uid 500); 7 Dec 2015 08:06:23 -0000
Delivered-To: apmail-syncope-commits-archive@syncope.apache.org
Received: (qmail 99622 invoked by uid 500); 7 Dec 2015 08:06:23 -0000
Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@syncope.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@syncope.apache.org>
List-Post: <mailto:commits@syncope.apache.org>
List-Id: <commits.syncope.apache.org>
Reply-To: dev@syncope.apache.org
Delivered-To: mailing list commits@syncope.apache.org
Received: (qmail 99604 invoked by uid 99); 7 Dec 2015 08:06:23 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 08:06:23 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id A0637E048E; Mon,  7 Dec 2015 08:06:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mdisabatino@apache.org
To: commits@syncope.apache.org
Date: Mon, 07 Dec 2015 08:06:23 -0000
Message-Id: <5364692e7b4648d3bf35f119a2b7e987@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] syncope git commit: [SYNCOPE-739] Merge from 1_2_X

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());
     }