[53/59] [abbrv] syncope git commit: Merge branch 'master' into 2_0_X

Mon, 16 Feb 2015 00:07:31 -0800 

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ò <[email protected]>
Authored: Fri Feb 13 15:21:03 2015 +0100
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Feb 13 15:21:03 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

Reply via email to