Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
DM
dm-docs
Commits
73700d8a
Commit
73700d8a
authored
Oct 25, 2019
by
sveseli
Browse files
Updating version files
parent
b73e49f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
doc/sphinx/source/conf.py
View file @
73700d8a
...
...
@@ -57,9 +57,9 @@ author = u'APS/SDM'
# built documents.
#
# The short X.Y version.
version
=
"
dev
"
version
=
"
3.1.0
"
# The full version, including alpha/beta/rc tags.
release
=
"
dev
"
release
=
"
3.1.0
"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
...
...
etc/dm.deploy.conf
View file @
73700d8a
...
...
@@ -14,7 +14,7 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
DM_CAT_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
44436
DM_PROC_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
55536
DM_APS_DB_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
11236
DM_SOFTWARE_VERSION
=
dev
DM_SOFTWARE_VERSION
=
3
.
1
.
0
LDAP_SERVER_URL
=
'ldaps://dmid-vm.xray.aps.anl.gov:636'
LDAP_DN_FORMAT
=
'uid=%%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
LDAP_UTIL_ADMIN_DN
=
'uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
...
...
src/java/DmWebPortal/nbproject/private/private.properties
View file @
73700d8a
deploy.ant.properties.file
=
/home/oxygen/SVESELI/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3700118484.properties
j2ee.platform.is.jsr109
=
true
j2ee.server.domain
=
/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish/domains/domain1
j2ee.server.home
=
/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish
j2ee.server.instance
=
[/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish:/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
j2ee.server.middleware
=
/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1
user.properties.file
=
/home/oxygen/SVESELI/.netbeans/8.2/build.properties
j2ee.server.home
=
/local/sveseli/DM/support/opt/payara/glassfish
j2ee.server.middleware
=
/local/sveseli/DM/support/opt/payara
src/python/dm/__init__.py
View file @
73700d8a
...
...
@@ -40,5 +40,5 @@ from dm.aps_db_web_service.api.bssApsDbApi import BssApsDbApi
from
dm.aps_db_web_service.api.esafApsDbApi
import
EsafApsDbApi
from
dm.aps_db_web_service.api.serviceMonitorApsDbApi
import
ServiceMonitorApsDbApi
__version__
=
"
dev
"
__version__
=
"
3.1.0
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment