Commit graph

3727 commits

Author SHA1 Message Date
Greg Armendariz
fe5cf3f8e6 Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]
Former-commit-id: 6a5463ab87
Former-commit-id: 2fd4ace0a2
2015-02-25 09:51:49 -06:00
Dave Hladky
de74770e0b Omaha #3220 Verified config file is read when an update occurs.
Former-commit-id: 15f3234242 [formerly c7de9128a2 [formerly 9ad78f067456eb04367a9d3aca58d9f5ee330c41]]
Former-commit-id: c7de9128a2
Former-commit-id: 99cc0e8764
2015-02-24 16:20:56 -06:00
Steve Harris
a4eb4e6446 Omaha #3220 - reverting #3841, #3873, and most of #3220
Revert "Omaha #3841 - Fixed saving problem for distance and time."
This reverts commit 9b4c91d9ba [formerly bfbe322c73] [formerly 15ae209055] [formerly b8be69c429 [formerly 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]].
Revert "Omaha #3220 - Performance - Safe Seas, Snow, Fog."
This reverts commit e44794e98b [formerly efee22d0fb] [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]].
Revert "Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers."
This reverts commit ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]].
Revert "Omaha #3841 - Corrected updateZones method."
This reverts commit 81791694e9 [formerly 01d004673d] [formerly 24322ed6ca] [formerly 6ebe11d430 [formerly 24322ed6ca [formerly 4d133cc367ab016b378ada534cff0fcda579e323]]].
Revert "Omaha #3220 - Moved refreshing of table in the UI thread."
This reverts commit c61f1676dc [formerly 974cc09ca5] [formerly d06882f4c9] [formerly fd3a6ea199 [formerly d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]].
Revert "Omaha #3873 - Fixed assigning timeObs for maritime record."
This reverts commit fc045d397e [formerly 4b43ae6fb4] [formerly 090bc93302] [formerly 63026ac59b [formerly 090bc93302 [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559]]].
Revert "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station."
This reverts commit f0a1a13869 [formerly f20361a507] [formerly 8763f67abf] [formerly dc1722a8b7 [formerly 8763f67abf [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]]].
Revert "Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors."
This reverts commit c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]].


Former-commit-id: 49a1879325 [formerly 6dc41740c8 [formerly fa81485722db0bcc734095c0639f0ac8875117b5]]
Former-commit-id: 6dc41740c8
Former-commit-id: 19f7dbd0cc
2015-02-24 15:39:04 -06:00
Fay.Liang
4c8e279c0c Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 4521a28536 [formerly 61d335650b [formerly 0580ad455973b3a176208203a140474df0040155]]
Former-commit-id: 61d335650b
Former-commit-id: cd76675754
2015-02-24 15:36:40 -05:00
Fay.Liang
6b09ea0d2f Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]
Former-commit-id: 94a7507b9b
Former-commit-id: da2f15f749
2015-02-24 14:56:50 -05: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
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
Darrel Kingfield
7d83a053fd VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: d73e7e2d8b [formerly 00880112ba [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]
Former-commit-id: 00880112ba
Former-commit-id: 41ece8fea1
2015-02-24 10:14:35 -06:00
Ana Rivera
53827a030a VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a

Former-commit-id: 14ee6d9e50 [formerly 861a749706 [formerly 9242a49a1a688379c625ee93af21e98a007470b0]]
Former-commit-id: 861a749706
Former-commit-id: 19a47ab731
2015-02-23 21:21:25 +00:00
Ana Rivera
9dc664d120 Merge "VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554" into field_14.4.1
Former-commit-id: 83af3c98a8 [formerly 13929d018d [formerly 628dedd3b89dfc591fa21677b308d866fb62e593]]
Former-commit-id: 13929d018d
Former-commit-id: 61cd46e8b7
2015-02-23 20:56:31 +00:00
Ana Rivera
a851bf4d13 VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5

Former-commit-id: d828b762ec [formerly ccc338d7da [formerly 2f9dd9b8422b899146f73da0a3d922b32b021152]]
Former-commit-id: ccc338d7da
Former-commit-id: 2525e00fb2
2015-02-23 17:28:29 +00:00
Ana Rivera
b9f9e5616d VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac

Former-commit-id: 1a7cde7f53 [formerly 0e90c25595 [formerly a5fc4d46bff38ecab9c9019c5184fae99a6ecc90]]
Former-commit-id: 0e90c25595
Former-commit-id: 98ead02564
2015-02-23 15:56:58 +00:00
Ana Rivera
a656992772 Merge branch master_14.3.2 'OB_14.3.2-15m' into tcv_14.3.2
Change-Id: I798ce412136ee0f30123835338920a4607909e1d

Former-commit-id: ad45aae750 [formerly 3d882eed46 [formerly 70ac082595e5c9719807136ed2f2bebf61510016]]
Former-commit-id: 3d882eed46
Former-commit-id: 122f2404f8
2015-02-23 15:15:18 +00:00
Jason Burks
3f3a88828b VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554
Change-Id: I9e11f605069ee8dab0c8efa0c77fe4702d95d18a

Former-commit-id: c71994ea71 [formerly 4a0df1fc59 [formerly ec6e24420ad62fc306c577a0ec9e19c72d0d2bbe]]
Former-commit-id: 4a0df1fc59
Former-commit-id: f62ee78295
2015-02-20 23:31:11 +00:00
Ana Rivera
7982aba305 VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c

Former-commit-id: 3877625b2f [formerly ce6241f01a [formerly f747715fb7479dcaf0bfd0849ca4a96e8b99dad5]]
Former-commit-id: ce6241f01a
Former-commit-id: 556e163629
2015-02-20 20:04:56 +00:00
Steve Harris
20e23e0a9f Merge tag 'OB_14.4.1-13m' into omaha_14.4.1
14.4.1-13


Former-commit-id: 0de5743e1f [formerly 12929f7412 [formerly c75f0f600cc312a83275b767165471b458da18b7]]
Former-commit-id: 12929f7412
Former-commit-id: fedaf58f2a
2015-02-20 09:57:49 -06:00
Ana Rivera
38264269e3 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb

Former-commit-id: 62642d62bc [formerly 90d3fcece6 [formerly 4df76b701f4a85fd0c55f0dd9fd351d1768bd92e]]
Former-commit-id: 90d3fcece6
Former-commit-id: 9c17244d9c
2015-02-20 14:04:10 +00:00
Richard Peter
933960d2bf Omaha #4125 - Fix jaxb performance issue
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1

Former-commit-id: f9fa25b783 [formerly 1184d7629c [formerly 9f81dd0ec5e00827f5a9a98376f15c5139908ce1]]
Former-commit-id: 1184d7629c
Former-commit-id: 5f93f3b5d9
2015-02-19 14:25:12 -06:00
Fay.Liang
f1e6be9aaf Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 0072544dba [formerly 20231cb1f2 [formerly 5dea200def84ed80d2bc38e37e1fe9bf3ac5b26c]]
Former-commit-id: 20231cb1f2
Former-commit-id: c73879c8c4
2015-02-19 13:12:16 -05:00
Fay.Liang
52ae282416 Merge branch 'omaha_14.3.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 00eaa4fef8 [formerly 300eadb096 [formerly 15e1cd65856586733aa8e99f2e5620f3c9b8a063]]
Former-commit-id: 300eadb096
Former-commit-id: 84c0c2dda9
2015-02-19 11:13:28 -05:00
Fay.Liang
1570a00f49 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 608e249e84 [formerly 585dc560b4 [formerly 2a6f8f560b6fb3825e4127fcd5b15b6c5b215ae7]]
Former-commit-id: 585dc560b4
Former-commit-id: 5630c0dc37
2015-02-19 11:09:01 -05:00
Joshua Watson
51e006c656 VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495
Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e

Former-commit-id: e958013148 [formerly 7e1d77fc7d [formerly b8a493859cf272d116cc05c6121c2c84791962d9]]
Former-commit-id: 7e1d77fc7d
Former-commit-id: d7f5da46c3
2015-02-18 16:23:05 -05:00
David Gillingham
fb4cb8e67b Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py.
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly 1e86f4cb13 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]]
Former-commit-id: 1e86f4cb13
Former-commit-id: 632a6905a1
2015-02-18 13:07:56 -06:00
Ron Anderson
40d7dbbf9a Omaha #4139 Fix handling of pre-epoch dates in ISC
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2

Former-commit-id: 3d100c7bd6 [formerly a3bced0160 [formerly 2718eab540d66cac4ac88f01b840bdf23bc0562b]]
Former-commit-id: a3bced0160
Former-commit-id: 3ec014a0a9
2015-02-18 11:28:34 -06:00
David Friedman
f7649af19e ASM #17125 - Fix decoding of upper air collectives
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540

Former-commit-id: ab8a709eb6 [formerly 79fb68aeb1 [formerly 420ca2787415f4f609fd6016ace1435f87b740f4]]
Former-commit-id: 79fb68aeb1
Former-commit-id: 38bf119d23
2015-02-18 16:21:31 +00:00
Fay.Liang
c37a5fe707 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 5af44f02e0 [formerly 40e08b3f99 [formerly 49f4bfffc2197ab78eead4de677f1ab9e4bf37a2]]
Former-commit-id: 40e08b3f99
Former-commit-id: 0d69148241
2015-02-17 10:50:41 -05:00
Mike Duff
b6379af6fb Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected.
Change-Id: I88611082397933676c13c58f65fb29a5745ac263

Former-commit-id: 105a862d2e [formerly 705d5b4f2b [formerly f4d4701fd39202f0610e6c4621f106557648050d]]
Former-commit-id: 705d5b4f2b
Former-commit-id: 8119fe20a0
2015-02-17 07:57:30 -06:00
Ana Rivera
04aa4b6cbe Merge "VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered. Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412" into field_14.4.1
Former-commit-id: 94d705e210 [formerly 76b6b292cb [formerly 6f58cd962cc7995af01b96db1210e24b63429372]]
Former-commit-id: 76b6b292cb
Former-commit-id: a2f42298b6
2015-02-13 19:51:48 +00:00
Sarah Pontius
b011d89c00 VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e

Former-commit-id: e4a1aa13f5 [formerly 564febcc4a [formerly 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291]]
Former-commit-id: 564febcc4a
Former-commit-id: d9ffd6a710
2015-02-13 10:12:53 -07:00
Fay.Liang
7c53d1fccc Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Former-commit-id: af8b95bb97 [formerly 8cdd180b0a [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]
Former-commit-id: 8cdd180b0a
Former-commit-id: c95baa3c40
2015-02-13 09:34:24 -05:00
Fay.Liang
209b1f9e7c Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: eefa05ada3 [formerly 32c91172b4 [formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]
Former-commit-id: 32c91172b4
Former-commit-id: 84dff9abc0
2015-02-13 09:32:40 -05:00
Fay.Liang
6d85666c42 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 92d4e5b370 [formerly adc24b15b6 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]
Former-commit-id: adc24b15b6
Former-commit-id: b54c101e34
2015-02-13 09:29:20 -05:00
Shawn.Hooper
77344aeb28 ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 9c637bda0b [formerly 060a169904 [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]
Former-commit-id: 060a169904
Former-commit-id: 0d9e4dd69e
2015-02-12 17:32:05 -05:00
Juliya Dynina
0858e5a32c Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
Former-commit-id: 39e3497493 [formerly ea11991a31 [formerly 346fc7563a680155c286bcbbcdaea25ec12b30fc]]
Former-commit-id: ea11991a31
Former-commit-id: 92d2d08451
2015-02-12 09:20:27 -05:00
Ana Rivera
46215020b2 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209

Former-commit-id: 6191c93a9c [formerly 420132b396 [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]
Former-commit-id: 420132b396
Former-commit-id: 461db8a395
2015-02-11 22:00:40 +00:00
Steve Harris
a2d87f74f7 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: 9311e6f440 [formerly 3fe3d35339 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]
Former-commit-id: 3fe3d35339
Former-commit-id: e76330fac0
2015-02-11 15:53:38 -06:00
Jason Burks
b729c8dac9 VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered.
Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412

Change-Id: Ie3554842b9f029dd62ff73f5edc928bc03e012e4

Former-commit-id: 9b0f630436 [formerly 0163ec2871 [formerly 2ca313195e2e610d4a198884f45dde37ebecfbc6]]
Former-commit-id: 0163ec2871
Former-commit-id: c28f2e9aed
2015-02-11 20:06:54 +00:00
Fay.Liang
0ecd208056 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 7d18af7172 [formerly a2a4551eae [formerly 0c3fe94f92b6f43d8ae7d506c5c84915500a803c]]
Former-commit-id: a2a4551eae
Former-commit-id: 5c320554c0
2015-02-11 10:45:04 -05:00
David Friedman
a8b7c34e09 ASM #17092 - Add cronOTRs.xml to radar NDM files
Change-Id: I46bf0728607737509ad97f6d2ed1803b3b10eeff

Former-commit-id: 562582f056 [formerly c6c9209f84 [formerly fc9eb096ce16005be0a80eff3b4728f279f75cf5]]
Former-commit-id: c6c9209f84
Former-commit-id: 6db744c3cc
2015-02-11 15:10:34 +00:00
Joshua Watson
00243dfdfc VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51

Former-commit-id: f612e85eed [formerly 56627a9012 [formerly c570ea9f982665f3cb560c665cea6357c11841ce]]
Former-commit-id: 56627a9012
Former-commit-id: 786721c6e8
2015-02-11 09:04:44 -05:00
Juliya Dynina
9a5e754fd5 Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
Former-commit-id: 5ae6e8149e [formerly a2da3621ee [formerly fa16cbd1cf7c92545d22b39c1bca597a0959c98c]]
Former-commit-id: a2da3621ee
Former-commit-id: 43b453b136
2015-02-10 15:45:27 -05:00
Michael Gamazaychikov
563e176546 ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61

Former-commit-id: 9ffad49fa0 [formerly ea046bedd3 [formerly 20efa852dcc64c80890abed6b2882a205b37cf43]]
Former-commit-id: ea046bedd3
Former-commit-id: 4a58408889
2015-02-10 15:21:32 -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
Michael Gamazaychikov
9aaeca7d9d ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba

Former-commit-id: 796871f02f [formerly cecc02d5b1 [formerly e4444751f61adccf1cb62adf0f6cb1abc4ab6384]]
Former-commit-id: cecc02d5b1
Former-commit-id: 9836b17e5e
2015-02-10 10:35:32 -05:00
Ana Rivera
c2975ce69f Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f

Former-commit-id: c2f02ff4b2 [formerly bdb0e3aacb [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]
Former-commit-id: bdb0e3aacb
Former-commit-id: 631d700cf9
2015-02-10 14:41:19 +00: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
Fay.Liang
97f8869b2e Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c80c70e86d [formerly f8360d41ef [formerly 316d8f391992395e8dda3870742f5aea83b2bfe0]]
Former-commit-id: f8360d41ef
Former-commit-id: 98f7e2ccb4
2015-02-09 17:03:42 -05:00
Kiran.Shrestha
c0d137e30c ASM #17085 - lifted index issue reporting in units of Kelvin but labeled as Celsius
Change-Id: I004f3bab00aa82130ea21d888a1307f76ec58849

Former-commit-id: 89b18b15d7 [formerly a4f63f4147 [formerly 391a2576ade26ad7031e037db5e9695915212cd5]]
Former-commit-id: a4f63f4147
Former-commit-id: 8389938a6a
2015-02-09 21:06:36 +00:00
Joshua Watson
9f53a8e0b6 VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848

Former-commit-id: f6cf02c893 [formerly 05c119663f [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]
Former-commit-id: 05c119663f
Former-commit-id: cb6420914f
2015-02-06 16:06:37 -05:00
Greg Armendariz
55d711bd50 Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15

Former-commit-id: d3658d0f28 [formerly 2a554c5498 [formerly 97c6bded155fc58e59beecdb33016e5286e622c1]]
Former-commit-id: 2a554c5498
Former-commit-id: 61bd37895f
2015-02-06 11:20:43 -06:00