[midPoint-git] [Evolveum/midpoint] 83bf75: Implementing model.importObjectsFromFile. Lookup t...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 83bf757f3d42c1ac8dd94ee20a2a5d22a8a0f702
      https://github.com/Evolveum/midpoint/commit/83bf757f3d42c1ac8dd94ee20a2a5d22a8a0f702
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/gensync/lookup-languages-replacement.xml

  Log Message:
  -----------
  Implementing model.importObjectsFromFile. Lookup table reimport test.


  Commit: f8268e9754c4a8492cfd7efd75483e5510a78c5f
      https://github.com/Evolveum/midpoint/commit/f8268e9754c4a8492cfd7efd75483e5510a78c5f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/57c678621a3c...f8268e9754c4