Commit graph

7812 commits

Author SHA1 Message Date
Greg Armendariz
b0dcdf688c Omaha #3299 - Remove fits plugin from awips2-edex-cots feature
Former-commit-id: bd3a7e13ac [formerly 07c51b71bf [formerly 4ddbeaba11bab77ece13ee46e89d34f141619701]]
Former-commit-id: 07c51b71bf
Former-commit-id: 8ea0c0d1b5
2015-03-02 13:11:44 -06:00
Greg Armendariz
214513f99b Omaha #3299 - Remove features
Change-Id: Icb1583b2f0a7bd165034714826c5c43ff7bf88b7

Former-commit-id: d7fad73fcc [formerly dc4cc9e7c7 [formerly 504cf2eb9598364f7f2717dafe93f54bd8f2187d]]
Former-commit-id: dc4cc9e7c7
Former-commit-id: dbb07175dc
2015-02-27 09:37:25 -06:00
Greg Armendariz
82842a4717 Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8

Former-commit-id: 9d95e79cd7 [formerly 7539d84bba [formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]]
Former-commit-id: 7539d84bba
Former-commit-id: 465da92660
2015-02-26 14:03:17 -06:00
Nate Jensen
bea946605f Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: ad82097a9e [formerly 601df7e202 [formerly 338968eebfe41680949dc39b60696e2fdc9f96c1]]
Former-commit-id: 601df7e202
Former-commit-id: 5d8b9f55e6
2015-02-26 09:28:55 -06:00
Richard Peter
7ae1b885c1 Omaha #3353 - Fix warngen sync blocks on geospatial data.
Change-Id: I3d596030d4a06eb3e9cc8fbffa15ce5c596ed8ac

Former-commit-id: b8becf24a3 [formerly b0fba55588 [formerly 4df7c51d45ca960f364d9b0a626e8ec1fd0c325c]]
Former-commit-id: b0fba55588
Former-commit-id: 32ba320224
2015-02-25 20:00:19 -06:00
Mark Peters
bd18a8f195 Omaha #4154 Null pointer when trying to add a contact notifier in collaboration
Change-Id: Ie291a4638e5a82a45f5d8a7a46c80604997dea89

Former-commit-id: cc9720e678 [formerly a037243fee [formerly ade10f507637a6cc9689fd020d9bf5f98270b53c]]
Former-commit-id: a037243fee
Former-commit-id: ad7efdb649
2015-02-25 16:24:38 -06:00
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
David Lovely
93866e732e Omaha #4164 Fixed AlertViz communications issue and log file directories.
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: e04988d5d2 [formerly d6f74b3e28 [formerly 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369]]
Former-commit-id: d6f74b3e28
Former-commit-id: 1c1ab2943a
2015-02-24 08:24:33 -06:00
Steve Harris
eaaee6d06b Merge branch 'master_14.4.1' into omaha_14.4.1
removing gsd CIMSS and NCEP directories replaced by new repositories


Former-commit-id: a83d163c1b [formerly cb847225e0 [formerly 8ff67af4fa7a223956071213fd75d6416e2be4b7]]
Former-commit-id: cb847225e0
Former-commit-id: a544e224bd
2015-02-20 15:49:35 -06: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
Shawn.Hooper
fdbe5ce2f8 Moved the CIMSS, gsd, and ncep directories to separate repos
Change-Id: I4caa5d7425129d8d5df6c721b23226558ab4e2b3

Former-commit-id: 22df67d70c [formerly 3d169da195 [formerly 5ed3823b82d5da57a3c1f1a7e4331911670acc28]]
Former-commit-id: 3d169da195
Former-commit-id: 3bb5371f91
2015-02-20 08:04:15 -05: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
Ron Anderson
07c469d49e Merge "Omaha #4139 Fix handling of pre-epoch dates in ISC" into omaha_14.4.1
Former-commit-id: d731fb756b [formerly ecb7199c3b [formerly 8eec6d6b3e3b3bb791a99a611040f5b1432fe1b1]]
Former-commit-id: ecb7199c3b
Former-commit-id: 2de6e9f0c7
2015-02-18 11:42:20 -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
Fay.Liang
4be7ba08fb Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 31dcfdc402 [formerly a534707534 [formerly ef870235658ea88d676ca65611bcfbdd56d206b1]]
Former-commit-id: a534707534
Former-commit-id: 058bd4ae9c
2015-02-17 14:07:11 -05:00
Ben Steffensmeier
7936725972 Omaha #4135 Fix speckles, set no data value for derived satellite data.
Former-commit-id: 22822c1a65 [formerly 19f1d29e52 [formerly 65a50fe832ef6260dfd0e02c9fad9cd2eed6f6f2]]
Former-commit-id: 19f1d29e52
Former-commit-id: 6ec30c1372
2015-02-17 11:56:57 -06:00
Sean.Webb
289d7078aa ASM #17142 - Fixed nwps dir permissions
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37

Former-commit-id: edae59425b [formerly 9d46bf24dc [formerly fc7258495581cd1d241f55aba2a8e60053575571]]
Former-commit-id: 9d46bf24dc
Former-commit-id: 62e125667f
2015-02-17 12:29:55 -05: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
Nate Jensen
76e6cd5eca Merge "Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected." into omaha_14.4.1
Former-commit-id: 61039e84a9 [formerly 8f39a549dc [formerly 042882e840e7aacc356f89e6385ab4ff63a6a589]]
Former-commit-id: 8f39a549dc
Former-commit-id: dc74e320e1
2015-02-17 08:47:55 -06: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
Nate Jensen
540de7c432 Merge "Omaha #4117 fix 14.3/14.4 shared display interoperability bug" into omaha_14.4.1
Former-commit-id: 2a57d8e886 [formerly 7df06aeb3e [formerly 2f07a0d67efd0d12e80cec06256ce30931b55d97]]
Former-commit-id: 7df06aeb3e
Former-commit-id: c5a601012f
2015-02-13 09:20:02 -06: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
Brian Clements
a7e397d999 Omaha #4117 fix 14.3/14.4 shared display interoperability bug
14.4 now defaults to sending directly to user id (if known)

Change-Id: Id0d78a6f6287cebe7b6f110143b1b6a735078e5d

Former-commit-id: 62a0f31c60 [formerly 2d98b0616a [formerly 424c3630897847a6b2362418618d0806093223ce]]
Former-commit-id: 2d98b0616a
Former-commit-id: 9485b0354e
2015-02-12 09:34:38 -06:00
David Lovely
d71e91a297 Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4

Former-commit-id: 25f32b4c70 [formerly 56c3135aef [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]
Former-commit-id: 56c3135aef
Former-commit-id: 260a818778
2015-02-12 09:16:30 -06: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
Fay.Liang
a0dc16d150 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: eef951faea [formerly 5ed7f62638 [formerly 3905161a55f66efb33b1fe4bc016545b367e88c1]]
Former-commit-id: 5ed7f62638
Former-commit-id: 4f75f6d15e
2015-02-11 15:36:25 -05:00
Fay.Liang
8a38eb3a97 Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]
Former-commit-id: 30859f6ee6
Former-commit-id: 8d4bab98d5
2015-02-11 15:36:05 -05: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
Shawn.Hooper
77ae8677e4 ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508

Former-commit-id: 3c3b69809d [formerly 0ba143cc43 [formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]
Former-commit-id: 0ba143cc43
Former-commit-id: a6a840f3c8
2015-02-11 13:55:20 -05:00
Shawn.Hooper
9f7f129edb ASM #16804 - Check in the required library files
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a

Former-commit-id: ca8b043aed [formerly 6573bd2672 [formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]]
Former-commit-id: 6573bd2672
Former-commit-id: 8351eb7bdf
2015-02-11 12:40:33 -05:00
Steve Harris
162f4871bf Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: a5da551a5d [formerly 62d29fefb4 [formerly 45e09e8f848d85ae45205b655074bba8342c9156]]
Former-commit-id: 62d29fefb4
Former-commit-id: 3f8008fc9f
2015-02-11 10:58:07 -06: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
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
Greg Armendariz
b99479a3c6 Omaha #3299 - Update buid.xml to work with nightly build and development workstation
Former-commit-id: 5685c69da3 [formerly ca6440c80e [formerly ab3ed9118dfd90ea929e450d991d882312f4a520]]
Former-commit-id: ca6440c80e
Former-commit-id: c8d4fb79dd
2015-02-09 14:57:22 -06:00
Greg Armendariz
8815b6bf9d Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
Former-commit-id: 3b596f12d8 [formerly 40e2f812cc [formerly da49b73121818f3022f71deee8a2a57230b2a227]]
Former-commit-id: 40e2f812cc
Former-commit-id: a1ee800641
2015-02-09 10:09:20 -06:00
Nate Jensen
9fe563bb9e Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
Former-commit-id: 2bd03ecec0 [formerly 35295b401c [formerly 24849a362531a27a789ef3ea512bed87d7159af8]]
Former-commit-id: 35295b401c
Former-commit-id: 66c3ef37ca
2015-02-09 09:19:45 -06:00