Commit graph

30 commits

Author SHA1 Message Date
Fay.Liang
059eb032b1 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
David Gillingham
1e86f4cb13 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py.
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: dfbfd38194c88c70f3e75de06bfc7114c6bd3542
2015-02-18 13:07:56 -06:00
Richard Peter
2457d0e6f7 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Ana Rivera
061fd0af28 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
2014-11-14 16:58:11 +00:00
Ron Anderson
e8db5a1bbf Omaha #3623 Created command line utilities to activate/deactivate sites
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: 670a9bd71874fbd6fecd0c9df5567ad342892333
2014-09-17 14:35:47 -05:00
John.McPherson
bdbe5577e9 ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a

Former-commit-id: 4d9b74dc181c359681eda8bae04f7c46f41d5769
2014-03-04 17:24:00 +00:00
Bryan Kowal
feaacd9356 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
2013-10-31 15:34:46 -05:00
Steve Harris
bd95bb6a4e 14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Nate Jensen
a1a9a4751a Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 4383d88a37c9ae9298f7ea9081d87d6ded34de66
2013-08-06 17:17:53 -05:00
Ron Anderson
cfa2d38a32 Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: 03c62b606659be0cf81c8401a1c52c5fe5c52b1b
2013-07-25 13:05:56 -05:00
Steve Harris
63803c1424 13.5.1-3 baseline
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
998961612c 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
85bbf6d242 13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
2013-05-03 09:29:14 -05:00
Steve Harris
2f517b7713 13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
0be473728a 13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
073687d9a9 13.3.1-10 baseline
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
2013-03-20 15:53:01 -05:00
Steve Harris
f97d78994b 13.3.1-8 baseline
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Steve Harris
06d0e6dd16 13.1.1-10 baseline
Former-commit-id: 1e337899d45617a8ee1998f2d2c86f2912668b67
2013-02-14 13:24:43 -06:00
Steve Harris
e4bd20a515 12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Steve Harris
d8ca6b9005 12.11.1-7 baseline
Former-commit-id: 59b9a93267bcf7b82fdefc55784289f7510117d0
2012-10-23 16:40:50 -05:00
Steve Harris
c12ee14e66 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
2012-10-08 13:26:20 -05:00
Steven Harris
618aa3f316 12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
2012-09-27 15:57:45 -05:00
Steve Harris
250f0ccac9 12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
2012-09-11 15:50:57 -05:00
Steve Harris
3adc50a783 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
dcda3a2290 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
31ae7ea218 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
16bf591a33 12.7.1-8 baseline
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
b13cbb7e00 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
4068f5295f 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00