Merge branch 'master' into 'master'
Master See merge request DM/dm!25
No related branches found
No related tags found
Showing
- doc/Installation/DataManagementSplitSystemSetup.md 4 additions, 4 deletionsdoc/Installation/DataManagementSplitSystemSetup.md
- doc/RELEASE_NOTES.txt 6 additions, 0 deletionsdoc/RELEASE_NOTES.txt
- etc/dm.deploy.conf 1 addition, 1 deletionetc/dm.deploy.conf
- etc/dm_dev.deploy.conf 1 addition, 1 deletionetc/dm_dev.deploy.conf
- src/java/DmApi/nbproject/project.properties 4 additions, 2 deletionssrc/java/DmApi/nbproject/project.properties
- src/java/DmApi/src/java/gov/anl/aps/dm/api/DmRestApi.java 3 additions, 2 deletionssrc/java/DmApi/src/java/gov/anl/aps/dm/api/DmRestApi.java
- src/java/DmBase/nbproject/project.properties 4 additions, 2 deletionssrc/java/DmBase/nbproject/project.properties
- src/java/DmBase/src/java/gov/anl/aps/dm/common/exceptions/DmExceptionFactory.java 3 additions, 2 deletions.../gov/anl/aps/dm/common/exceptions/DmExceptionFactory.java
- src/java/DmBase/src/java/gov/anl/aps/dm/common/objects/DmObjectFactory.java 3 additions, 2 deletions...c/java/gov/anl/aps/dm/common/objects/DmObjectFactory.java
- src/java/DmBase/src/java/gov/anl/aps/dm/common/utilities/CryptUtility.java 3 additions, 2 deletions...rc/java/gov/anl/aps/dm/common/utilities/CryptUtility.java
- src/java/DmBase/src/java/gov/anl/aps/dm/common/utilities/NoServerVerificationSSLSocketFactory.java 3 additions, 2 deletions...ommon/utilities/NoServerVerificationSSLSocketFactory.java
- src/java/DmWebPortal/nbproject/build-impl.xml 6 additions, 4 deletionssrc/java/DmWebPortal/nbproject/build-impl.xml
- src/java/DmWebPortal/nbproject/project.properties 6 additions, 4 deletionssrc/java/DmWebPortal/nbproject/project.properties
- src/java/DmWebPortal/nbproject/project.xml 6 additions, 2 deletionssrc/java/DmWebPortal/nbproject/project.xml
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DmEntityController.java 3 additions, 2 deletions...gov/anl/aps/dm/portal/controllers/DmEntityController.java
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java 3 additions, 2 deletions...v/anl/aps/dm/portal/controllers/ExperimentController.java
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentRoleTypeController.java 3 additions, 2 deletions...s/dm/portal/controllers/ExperimentRoleTypeController.java
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentStationController.java 3 additions, 2 deletions...ps/dm/portal/controllers/ExperimentStationController.java
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java 3 additions, 2 deletions...l/aps/dm/portal/controllers/ExperimentTypeController.java
- src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/LoginController.java 3 additions, 2 deletions...va/gov/anl/aps/dm/portal/controllers/LoginController.java
Loading
Please register or sign in to comment