You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/02/16 09:07:18 UTC
[53/59] [abbrv] 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/AbstractAttrTemplate.java
core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrTemplate.java
core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrTemplate.java
core/src/main/resources/META-INF/orm.xml
core/src/main/resources/META-INF/orm.xml.oracle
core/src/main/resources/META-INF/orm.xml.sqlserver
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/01785499
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/01785499
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/01785499
Branch: refs/heads/master
Commit: 01785499355f971bced0347c02acce532bcfb7fb
Parents: 094e68f 04b0530
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Feb 13 15:21:03 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Feb 13 15:21:03 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------