Return-Path: 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 E211510E9F for ; Fri, 13 Feb 2015 12:07:16 +0000 (UTC) Received: (qmail 66879 invoked by uid 500); 13 Feb 2015 12:07:17 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 66810 invoked by uid 500); 13 Feb 2015 12:07:16 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 66714 invoked by uid 99); 13 Feb 2015 12:07:16 -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; Fri, 13 Feb 2015 12:07:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 848A2E07F2; Fri, 13 Feb 2015 12:07:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Fri, 13 Feb 2015 12:07:20 -0000 Message-Id: <4ea7c466adde4c358575d099d4617b00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] syncope git commit: Merge branch 'master' into 2_0_X Merge branch 'master' into 2_0_X Conflicts: core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/094e68f3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/094e68f3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/094e68f3 Branch: refs/heads/2_0_X Commit: 094e68f3744f78142bbfa856deb89e9406000211 Parents: 2d19463 36327a9 Author: Francesco Chicchiriccò Authored: Fri Feb 13 13:06:48 2015 +0100 Committer: Francesco Chicchiriccò Committed: Fri Feb 13 13:06:48 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------