[Merge] lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2

Leandro Soares has proposed merging lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2.

Requested reviews:
  DHIS 2 core developers (dhis2-devs-core)
Related bugs:
  Bug #1201132 in DHIS: "Metadata Import for "Users" fails to import data."
  https://bugs.launchpad.net/dhis2/+bug/1201132

For more details, see:
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329

Changes for allowing user metadata import.

dhis-2\dhis-api\src\main\java\org\hisp\dhis\common\SharingUtils.java
dhis-2\dhis-api\src\main\java\org\hisp\dhis\user\User.java
dhis-2\dhis-api\src\main\java\org\hisp\dhis\user\UserCredentials.java
dhis-2\dhis-api\src\main\java\org\hisp\dhis\mapping\MapView.java
dhis-2\dhis-services\dhis-service-dxf2\src\main\java\org\hisp\dhis\dxf2\metadata\ExchangeClasses.java
dhis-2\dhis-services\dhis-service-dxf2\src\main\java\org\hisp\dhis\dxf2\DefaultIdentifiableObjectImporter.java
dhis-2\dhis-services\dhis-service-core\src\main\java\org\hisp\dhis\startup\TableAlteror.java
dhis-2\dhis-services\dhis-service-core\src\main\resources\org\hisp\dhis\user\hibernate\UserCredentials.hbm.xml

review-diff.txt (10.9 KB)

···

--
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

The proposal to merge lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2 has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329

···

--
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329
Your team DHIS 2 developers is subscribed to branch lp:dhis2.