Commit graph

270 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
5defe76b04 GFESuite port number and servername edits
Former-commit-id: 2320d61438
2015-11-06 11:28:26 -07:00
mjames-upc
c921ec69d6 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
Former-commit-id: f25e918e50
2015-09-03 15:48:53 -06:00
Ron Anderson
b4fb1f8f75 Omaha #4522 Fix handling of 000 UGC zones.
Change-Id: I6bd750d6ca713b5ae4657576306d73d954d853a7

Former-commit-id: 69aeca8a22471b62d524b985a60e3cb934446ab1
2015-06-02 17:15:44 -05:00
Ron Anderson
d2264670f8 Omaha #4522 Fix Active Table query
Change-Id: I2f0c6f30d94daba19fcd746e080e96368ef701c7

Former-commit-id: 6714be267dd2b88b36475b1ffff30c7c0b8d0182
2015-06-01 14:30:35 -05:00
Ron Anderson
7bceddcf07 Omaha #4522 Fix issue with 000 UGCs
Change-Id: Ie1ed615ba3d8dc3ae9e241ae05524093d740b324

Former-commit-id: c5e67c62fcddeb59f1fb58dfa35d9ae32b8f2280
2015-06-01 09:09:22 -05:00
Ron Anderson
2d411c8063 Omaha #4522 Fix a problem with non-unique updates.
Change-Id: If3ed4f6db506d867ceee037ddf37ac0d3716955a

Former-commit-id: 67a4cf1672de7ece87ff50d3b3d054ec80e81031
2015-05-29 13:32:38 -05:00
Ron Anderson
f7d30d71bd Omaha #4522 Add proper primary key to active table
Change-Id: Id1c6f4ce0b317211e3a1eed0240f2463bd842f40

Former-commit-id: 99243fee7951395b37730327a19c6391832cbc36
2015-05-27 13:56:14 -05:00
Ron Anderson
38b8082aac Omaha #4027 Get GFE Formatter auto tests working with mixed case
Change-Id: I55c2b34adca1c049116682be5ff40509729e16c0

Former-commit-id: c214e6cc22140b53ac8bd5514913b63a0850867a
2015-05-07 14:41:49 -05:00
Steve Harris
d05c1bd033 Merge tag 'OB_15.1.1-8' into omaha_15.1.1
15.1.1-7


Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
2015-05-05 13:33:32 -05:00
Ron Anderson
6b3a0d1478 Omaha #4027 More changes for Mixed Case
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e

Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Fay.Liang
40a8c1f7f0 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 634a33f7265840363d11bb1068b6ceb602fba4ed
2015-04-27 14:09:40 -04:00
Ana Rivera
f5bc1eacd9 VLab Issue #7664 - Update VTECTable.py Winter Hazard coding; fixes #7664
Change-Id: Ieafa23f3cbc9e8810a1477caa85a42223fd1c157

Former-commit-id: 6941ac08c5bafb9c0cc7cec382a4339d740adff0
2015-04-22 15:47:17 +00:00
Ron Anderson
87286949fd Omaha #4027 More GFE changes for Mixed Case WA
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Fay.Liang
6f8f2f5398 Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Steve Harris
fdf751fa90 Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java


Former-commit-id: 9b749e134d [formerly 19f99823a6 [formerly 390c7ec5c261717f6e0b2053761e12e1fcb68215]]
Former-commit-id: 19f99823a6
Former-commit-id: bda107f32a
2015-03-18 13:09:03 -05:00
Ron Anderson
9200772cff Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c

Former-commit-id: fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c
2015-03-12 09:47:36 -05:00
Ron Anderson
99da4d09a4 Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c

Former-commit-id: bf2ff2d80f [formerly 9200772cff [formerly fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c]]
Former-commit-id: 9200772cff
Former-commit-id: 8bc5f56bce
2015-03-12 09:47:36 -05:00
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
Fay.Liang
1138f48ee9 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: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
2015-03-09 16:11:13 -04:00
Ron Anderson
a6167718b2 Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: eaecbaa0b66153b43bfe59f96c43a1876b9e235f
2015-03-04 16:06:41 -06:00
Ron Anderson
1d5a9b4cd8 Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: e08d469768 [formerly a6167718b2 [formerly eaecbaa0b66153b43bfe59f96c43a1876b9e235f]]
Former-commit-id: a6167718b2
Former-commit-id: e315d9811d
2015-03-04 16:06:41 -06:00
Ron Anderson
3468d2ee60 Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc

Former-commit-id: 009e56509930c8fdf2eacd250903260a13a6f3ca
2015-03-04 15:37:22 -06:00
Ron Anderson
c18c4dbbad Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc

Former-commit-id: 1b2258ed00 [formerly 3468d2ee60 [formerly 009e56509930c8fdf2eacd250903260a13a6f3ca]]
Former-commit-id: 3468d2ee60
Former-commit-id: f299aab920
2015-03-04 15:37:22 -06:00
Fay.Liang
8bfe8fb65f Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
Fay.Liang
548851cad0 Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9a4751b60e [formerly 8bfe8fb65f [formerly 5aa2c444583d03b442768a8e9ea462877a25bb8d]]
Former-commit-id: 8bfe8fb65f
Former-commit-id: 97be252793
2015-03-03 14:26:22 -05:00
David Gillingham
d7c0000508 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 5d962bf6cf7a3e40ee152bc98817daf116633f60
2015-02-26 15:57:47 -06:00
David Gillingham
fde97e61b3 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 63139c2f38 [formerly d7c0000508 [formerly 5d962bf6cf7a3e40ee152bc98817daf116633f60]]
Former-commit-id: d7c0000508
Former-commit-id: cdb695e517
2015-02-26 15:57:47 -06:00
David Gillingham
34ea2453b8 Issue #4127: Add ClusterTask-backed write lock to ActiveTable.
Change-Id: I54309f369e7ef872fd102a764641569d95c62799

Former-commit-id: c564462d34bae64c3339339254d5cb6caba70fda
2015-02-24 12:39:03 -06:00
David Gillingham
073988bd69 Issue #4127: Add ClusterTask-backed write lock to ActiveTable.
Change-Id: I54309f369e7ef872fd102a764641569d95c62799

Former-commit-id: def338c49f [formerly 34ea2453b8 [formerly c564462d34bae64c3339339254d5cb6caba70fda]]
Former-commit-id: 34ea2453b8
Former-commit-id: ab7e413893
2015-02-24 12:39:03 -06:00
Ron Anderson
e19901c6e1 Issue #4099 Fix ETNs for products that span year-end.
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)


Former-commit-id: 7ca4dd9ba059035e366807d4928768121fdd0712
2015-02-24 12:09:29 -06:00
Ron Anderson
47f2095326 Issue #4099 Fix ETNs for products that span year-end.
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)


Former-commit-id: ebb221d935 [formerly e19901c6e1 [formerly 7ca4dd9ba059035e366807d4928768121fdd0712]]
Former-commit-id: e19901c6e1
Former-commit-id: 34bc29be41
2015-02-24 12:09:29 -06:00
Fay.Liang
1e4522ddd2 Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 155801c3d418b6deb7e17ffb04c963a80d092c5a
2015-02-10 10:59:16 -05:00
Fay.Liang
e36e27681e Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 07076f91aa [formerly 1e4522ddd2 [formerly 155801c3d418b6deb7e17ffb04c963a80d092c5a]]
Former-commit-id: 1e4522ddd2
Former-commit-id: 3c6247522e
2015-02-10 10:59:16 -05:00
Fay.Liang
0b0f41fa37 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: 4bcae42022 [formerly e3107ce1e4] [formerly 59f3f87190] [formerly 4bcae42022 [formerly e3107ce1e4] [formerly 59f3f87190] [formerly 43c7161dcf [formerly 59f3f87190 [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]]
Former-commit-id: 43c7161dcf
Former-commit-id: ee6acc8fdd [formerly 149102ec85] [formerly 8b80e6a5ae948ea73931e17354298170ec9d226f [formerly 0b98fc8be6]]
Former-commit-id: 257ec8e3caf9807783d7f6b047aaa84560966ae3 [formerly 2d5858f8f0]
Former-commit-id: 31607db1e1
2015-02-09 17:19:41 -05:00
Fay.Liang
59f3f87190 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Fay.Liang
4bcae42022 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: 43c7161dcf [formerly 59f3f87190 [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]
Former-commit-id: 59f3f87190
Former-commit-id: e3107ce1e4
2015-02-09 17:19:41 -05:00
Rici.Yu
48dcae9064 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ib71d667d8f59ab1fa3c669653d2bc8636bd7901c

Former-commit-id: 6fbdb136e3968e197c38907a20ba898d9532e39e
2015-02-05 15:22:49 -05:00
Rici.Yu
d57ef4bca2 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ib71d667d8f59ab1fa3c669653d2bc8636bd7901c

Former-commit-id: 14bb4d4d59 [formerly 48dcae9064 [formerly 6fbdb136e3968e197c38907a20ba898d9532e39e]]
Former-commit-id: 48dcae9064
Former-commit-id: 8a5e418304
2015-02-05 15:22:49 -05:00
Fay.Liang
bccf70f0bd ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
2015-01-12 13:03:31 -05:00
Fay.Liang
c6bd5d7675 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Fay.Liang
19a29da5de ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
2015-01-12 13:03:31 -05:00
Rici.Yu
6595295016 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: 1a73642a1d [formerly 4d10daca1f] [formerly 97c7681e01] [formerly 1a73642a1d [formerly 4d10daca1f] [formerly 97c7681e01] [formerly 483d0216da [formerly 97c7681e01 [formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]]]]
Former-commit-id: 483d0216da
Former-commit-id: 8d2ba35d76 [formerly 56b0d27d37] [formerly df1ee60bba6c42e88c0fdda727c0ec71202a5507 [formerly 562ea0d566]]
Former-commit-id: 84887a67aab432a1e9ae6f180b53cae0894474ca [formerly 4ddd8c5c15]
Former-commit-id: d43b569d29
2014-12-30 13:56:02 -05:00
Rici.Yu
97c7681e01 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: a98e1f924bf0b99657dd56241c02f529c5e48ce7
2014-12-30 13:56:02 -05:00
Rici.Yu
1a73642a1d ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: 483d0216da [formerly 97c7681e01 [formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]]
Former-commit-id: 97c7681e01
Former-commit-id: 4d10daca1f
2014-12-30 13:56:02 -05:00
Ron Anderson
7a0b6b2cab VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56

Former-commit-id: 4cddd47d0870f4ba3474238107381693c768f6b1
2014-12-17 16:15:39 -06:00
Ron Anderson
804649a91e VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56

Former-commit-id: bde8257ec3 [formerly 7a0b6b2cab [formerly 4cddd47d0870f4ba3474238107381693c768f6b1]]
Former-commit-id: 7a0b6b2cab
Former-commit-id: 7e80850d54
2014-12-17 16:15:39 -06:00
Ron Anderson
5cd911a51a VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56

Former-commit-id: 804649a91e [formerly 7e80850d54] [formerly 7a0b6b2cab] [formerly 804649a91e [formerly 7e80850d54] [formerly 7a0b6b2cab] [formerly bde8257ec3 [formerly 7a0b6b2cab [formerly 4cddd47d0870f4ba3474238107381693c768f6b1]]]]
Former-commit-id: bde8257ec3
Former-commit-id: fac8f86a61 [formerly a916536220] [formerly 55c5025afdd07aa17f840b4a4f72fa65c1773da2 [formerly 6f90de837d]]
Former-commit-id: 40707790016bff887fbc76f5b0f05cc343286aed [formerly d940c33fee]
Former-commit-id: 2851636c0c
2014-12-17 16:15:39 -06:00
Sarah Pontius
ff2a0aa1b1 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: c044f5c349b27be19c6a3ea2abcc3c2294fc07a3
2014-12-15 09:54:17 -07:00
Sarah Pontius
430120f6b9 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: 9b8bdc88d5 [formerly ff2a0aa1b1 [formerly c044f5c349b27be19c6a3ea2abcc3c2294fc07a3]]
Former-commit-id: ff2a0aa1b1
Former-commit-id: 06ac198594
2014-12-15 09:54:17 -07:00