Steve Harris
7da796e1b0
Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
...
Former-commit-id: 0f40604bcb0322884798
2014-10-29 10:03:20 -05:00
Nate Jensen
c4c4fd4cf8
Merge "Omaha #3681 SatBlended implements Interrogatable" into omaha_14.4.1
...
Former-commit-id: c89de11b63040f9f0877
2014-10-28 15:32:32 -05:00
Ron Anderson
ca7c91e795
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
...
Former-commit-id: 30d031989eee12f5dc65
2014-10-28 15:15:26 -05:00
Ron Anderson
89acc631a3
Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
...
Former-commit-id: 9bd76e678f8b32ac8f54
2014-10-28 15:15:16 -05:00
Steve Harris
40225d128a
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: 19527f50bb1b83d045ea
2014-10-28 13:32:31 -05:00
Ben Steffensmeier
9d375a5617
Omaha #3681 SatBlended implements Interrogatable
...
Former-commit-id: 5e63b30ab0790dee3349
2014-10-27 18:16:49 -05:00
Max Schenkelberg
c17fd3d774
Omaha #3612 Fixed Thin client plugin blacklist
...
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42
Former-commit-id: 1fa0ff4c67629d56f480
2014-10-27 13:07:50 -05:00
Matthew Howard
56dc0eb99f
Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
...
Former-commit-id: 4b542e6e5bf1d793c8f5
2014-10-24 10:06:56 -05:00
Rici.Yu
28294702a5
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
...
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: b9269162a645e3b2895b
2014-10-24 10:54:37 -04:00
Shawn.Hooper
1c025e7a9d
ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
...
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f
Former-commit-id: f5b9798c3d7a7d877c17
2014-10-24 09:47:54 -04:00
Greg Armendariz
d4c7882e4f
Merge "Omaha #3299 attempt to fix cave p2-install order" into omaha_14.4.1
...
Former-commit-id: abfcd2505f8d25cfcc94
2014-10-23 11:45:00 -05:00
Nate Jensen
7f0bc3f860
Omaha #3299 attempt to fix cave p2-install order
...
Change-Id: Ic02c4a1c28d6be67cff709e0ea50fed3e36ca6b3
Former-commit-id: ca94deb789972245b270
2014-10-23 11:35:44 -05:00
Nate Jensen
7bff603b2c
Merge "Omaha #3668 Switch grid requests to job pool." into omaha_14.4.1
...
Former-commit-id: d50a3bab27b9ffe1b4ce
2014-10-23 11:15:58 -05:00
Ben Steffensmeier
a61eaa6695
Omaha #3668 Switch grid requests to job pool.
...
Former-commit-id: d5d432e7bdf940b4d3d4
2014-10-23 10:30:27 -05:00
Ron Anderson
ea43af0c3a
Omaha #3685 Fix spell checker to use mixed case.
...
Fix bug in importShapefile
Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793
Former-commit-id: 5c1570eafd6ab8c36e83
2014-10-23 09:02:16 -05:00
Nate Jensen
028b8b4609
Omaha #3713 fix build
...
Change-Id: I84adced908a1f09e802cb5c05fa86ce65f0c3af6
Former-commit-id: 318badc290129e6031e6
2014-10-22 17:00:27 -05:00
Nate Jensen
fb1a02c800
Merge "Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin" into omaha_14.4.1
...
Former-commit-id: b8ed807e4e7cd4d5aa0d
2014-10-22 15:21:48 -05:00
Ron Anderson
64162dd9c0
Omaha #3685 Add support for sending specific products in mixed case
...
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126
Former-commit-id: 5d07d13aa0e729cd8814
2014-10-22 14:29:30 -05:00
Steve Harris
e9c9a17f96
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: bfade7674ddc557b2d0c
2014-10-22 11:45:39 -05:00
Richard Peter
5c10fe0251
Merge "Omaha #3744 Adjust cave g1 region size." into omaha_14.4.1
...
Former-commit-id: 4dc4428f62d679022b3f
2014-10-22 11:18:12 -05:00
Ben Steffensmeier
1a1fafb08a
Omaha #3744 Adjust cave g1 region size.
...
Former-commit-id: 19ccfa66332c9d16911a
2014-10-22 10:30:33 -05:00
Mark Peters
220491ed18
Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin
...
Change-Id: I7c32e066175dab712e69398b58b5e56f4dbde3f4
Former-commit-id: ef80e7632f402591056c
2014-10-21 17:03:53 -05:00
Nate Jensen
332fb931c6
Merge "Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block." into omaha_14.4.1
...
Former-commit-id: 579f38dc6226c8400ac1
2014-10-20 15:32:17 -05:00
David Lovely
f83eb3e69b
Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
...
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d
Former-commit-id: 2e7cade8d6d7cd4cc845
2014-10-20 14:42:39 -05:00
Slav Korolev
1f4ed7fd1b
Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
...
Former-commit-id: 8971f40dc29c369a9c5c
2014-10-20 15:06:05 -04:00
Rici.Yu
51adc6a204
ASM #16858 - Check in SerpISC tool.
...
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6
Former-commit-id: 6958f11ea79c2555466c
2014-10-20 14:39:46 -04:00
Nate Jensen
4f93cf17ee
Merge "Omaha #3681 Allow satellite to be asynchronously interrogated." into omaha_14.4.1
...
Former-commit-id: 4946826d611b628bdfa1
2014-10-20 09:34:57 -05:00
Mark Peters
ec62b9a6f1
Omaha #3709 Collaboration chat windows need to support changing foreground and background color
...
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7
Former-commit-id: e00213200954a3e8d2eb
2014-10-16 10:28:34 -05:00
Ben Steffensmeier
ed00f845b3
Omaha #3681 Allow satellite to be asynchronously interrogated.
...
Former-commit-id: ba4eeff3465292ea66a4
2014-10-15 20:24:44 -05:00
Greg Armendariz
b62baa3b3b
Merge "Omaha #3676 harden numpy array to java array conversions to work with newer versions of python/numpy and not crash when heap cannot be allocated" into omaha_14.4.1
...
Former-commit-id: 21042a8945bb418e47ed
2014-10-15 14:19:28 -05:00
Brian.Dyke
cb92ade16f
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: e6ac4980b941e3037133
2014-10-15 13:55:32 -04:00
Nate Jensen
852fe79de3
Omaha #3676 harden numpy array to java array conversions to work with
...
newer versions of python/numpy and not crash when heap cannot be
allocated
Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288
Former-commit-id: b23d42f561433e8b6fc1
2014-10-15 09:02:07 -05:00
Steve Harris
4fde31539e
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
...
Former-commit-id: f2fdf98d2faff75d954b
2014-10-15 08:42:02 -05:00
Brian Clements
158aa3f439
Omaha #3708 fixed possible NPE in SiteConfigurationManager
...
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab
Former-commit-id: 0a42113bbb180696a594
2014-10-14 15:49:36 -05:00
Brian Clements
78c2aa3650
Omaha #3675 startup shutdown log name includes child pid
...
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 6d6d3d26e63a12ab9bdf
2014-10-13 16:32:41 -05:00
Richard Peter
ef5fcfe852
Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
...
Former-commit-id: 360114be70d2909b6e08
2014-10-13 12:37:28 -05:00
Brian Clements
c33a5ad562
Omaha #3708 collaboration feed room supports blacklists
...
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 2a7feaebfedfb43fda31
2014-10-13 11:11:32 -05:00
Nate Jensen
5ae522c32a
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
...
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 3eada560b7b24faf99cd
2014-10-13 09:34:22 -05:00
David Friedman
455f1ad7aa
ASM #16844 - WarnGen can become disabled when moving storm track
...
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 68f985d668955809450d
2014-10-10 19:33:21 +00:00
Mark Peters
f8e3c8412b
Omaha #3711 Allow configuration of how chat lines will display
...
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f
Former-commit-id: fb6131869c5d87f3d22d
2014-10-10 14:25:38 -05:00
Brian.Dyke
797a9c6c10
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 6ae3795b7cf85eb2d0ac
2014-10-10 11:01:01 -04:00
Richard Peter
db0e85e501
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
...
Former-commit-id: 26e4c16da4ed2bd7a261
2014-10-09 11:09:32 -05:00
Brian Clements
8d58b8d524
Omaha #3675 alertviz cleanly exits when killed by signal
...
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: fbabf6f18d119b2bff17
2014-10-09 11:04:49 -05:00
Nate Jensen
550b269370
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
...
Former-commit-id: 1a24808709f6601e4ee1
2014-10-09 09:38:27 -05:00
Nate Jensen
87d33ff6ca
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
...
Former-commit-id: 98518f4cb60d33e661f2
2014-10-09 09:02:36 -05:00
Brian Clements
1a6624d5d7
Omaha #3705 added collaboration public room search, bookmarking
...
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: f0921db20c87964cb500
2014-10-09 08:38:45 -05:00
Brian Clements
4a824111ec
Omaha #3672 moved aviation advisory plugins to separate feature
...
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 577b3a5e118a4cda892f
2014-10-08 16:47:10 -05:00
Richard Peter
04bf8666b3
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
...
Former-commit-id: fa15d4ff21e8bc97501b
2014-10-08 12:02:17 -05:00
Nate Jensen
2502976504
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
...
Former-commit-id: 5cf1821a6a4e582d0bde
2014-10-08 11:36:44 -05:00
Richard Peter
f5dd25c8e4
Omaha #3300 Fix merge of OB_14.3.1-25m
...
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: a9562d992ca4bfd2d28b
2014-10-07 16:32:48 -05:00
