Shawn.Hooper 663c44637f Merge tag 'OB_16.1.2-20' into asm_16.2.1 ... 16.1.2-20 Conflicts: cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077 Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18		2016-02-22 11:13:16 -05:00
..
configProps.py	VLab Issue #12366 - DCS 16287. Additional validation of ISC parameters. Remerge of 10405; fixes #12366	2015-11-03 14:05:45 +00:00
doConfig.py	VLab Issue #12366 - DCS 16287. Additional validation of ISC parameters. Remerge of 10405; fixes #12366	2015-11-03 14:05:45 +00:00
Maps.py	ASM #18606 - check in Maps.py change from Shannon	2016-02-08 11:40:07 -05:00
serverConfig.py	VLab Issue #15532 - GFE SmartInits ISC DB local parm - fixes #15532.	2016-02-11 19:34:59 +00:00
svcbu.properties	ASM #17873 renive qyites from default SVCBU_USER_ID	2015-10-22 16:38:13 +00:00
wrapper.py	Issue #2032 moving localization edex_static files to respective plugins, except colormaps	2013-07-18 17:20:27 -05:00