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 33673FC4F for ; Wed, 5 Nov 2014 10:08:27 +0000 (UTC) Received: (qmail 43043 invoked by uid 500); 5 Nov 2014 10:08:27 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 42982 invoked by uid 500); 5 Nov 2014 10:08:27 -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 42959 invoked by uid 99); 5 Nov 2014 10:08:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2014 10:08:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C0083A0A0B4; Wed, 5 Nov 2014 10:08:26 +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: Wed, 05 Nov 2014 10:08:29 -0000 Message-Id: <8d643f3f9dd148b48a0f651de8e0c804@git.apache.org> In-Reply-To: <579cb12431e94831b52cc310acb718ec@git.apache.org> References: <579cb12431e94831b52cc310acb718ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/8] git commit: Merge branch '1_1_X' into 1_2_X Merge branch '1_1_X' into 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/377963e8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/377963e8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/377963e8 Branch: refs/heads/1_2_X Commit: 377963e869b67809ec5b22c5cb65a00328a1b281 Parents: bcc3e5b 296ffa3 Author: Francesco Chicchiriccò Authored: Wed Nov 5 10:50:08 2014 +0100 Committer: Francesco Chicchiriccò Committed: Wed Nov 5 10:50:08 2014 +0100 ---------------------------------------------------------------------- .../core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/377963e8/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java ----------------------------------------------------------------------