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
David Lovely
8a5c1607c9
Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
...
Change-Id: I627ded464d411e7f975df088261a975657d41d9a
Former-commit-id: 531b62d114636e823956
2014-10-21 16:06:18 -05:00
Richard Peter
d2f0ab621f
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
...
Former-commit-id: 2c21e72bf305784292b7
2014-10-21 10:51:56 -05:00
Nate Jensen
1798a75f18
Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
...
Former-commit-id: 73c03a337924aca9cd99
2014-10-21 08:55:37 -05:00
Nathan Bowler
679c836fdc
Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
...
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf
Former-commit-id: 1ff018ccdfd9f75f5adc
2014-10-21 07:16:18 -04: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
Benjamin Phillippe
e6deeb6fb5
Omaha #3454 Upgrading to Hibernate 4.2.15
...
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: fdd16051e87845e8e40f
2014-10-20 12:42:19 -05:00
Nate Jensen
6cb997b25d
Merge "Omaha #3598 Add original, unaltered grid scripts." into omaha_14.4.1
...
Former-commit-id: 9079801e98887b47cda1
2014-10-20 11:50:40 -05:00
Nate Jensen
dd9f6fb257
Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
...
Former-commit-id: 401390dd9b1245df2e0c
2014-10-20 11:45:50 -05:00
Nathan Bowler
c8fd3c154a
Omaha #3598 Add original, unaltered grid scripts.
...
Change-Id: Ifed34ae4edb58e72cb0481ad90d3a7133a15554c
Former-commit-id: ee73c1e8cc1ae94e957b
2014-10-20 11:18:35 -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
Ron Anderson
eae4393aa5
Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
...
Former-commit-id: 1a0184263982a0b4bb9b
2014-10-16 18:44:38 -05:00
Ron Anderson
734ca75957
Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
...
Former-commit-id: 2781c4369b2fbf61748d
2014-10-16 18:32:04 -05:00
Greg Armendariz
8461e3075e
Merge "Omaha #3299 fix xml attribute name" into omaha_14.4.1
...
Former-commit-id: aaa09c668a6c09741587
2014-10-16 18:03:29 -05:00
Nate Jensen
306485851f
Omaha #3299 fix xml attribute name
...
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: 73e15036decd5e4b9a08
2014-10-16 17:11:26 -05:00
Brian.Dyke
498abd3716
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 93df82ac92418894a17b
2014-10-16 12:04:27 -04:00
Nate Jensen
ccde01bd22
Merge "Omaha #3709 Collaboration chat windows need to support changing foreground and background color" into omaha_14.4.1
...
Former-commit-id: 0c5f1c0f78d3d6c9370d
2014-10-16 10:48:06 -05:00
Sean.Webb
b256e04c45
ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
...
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd
Former-commit-id: 5f6c9bc83736d39be5fd
2014-10-16 10:38:14 -05:00
Shawn.Hooper
ee70a6a4bd
ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
...
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209
Former-commit-id: 118f34bbf1eafaf01966
2014-10-16 11:30:29 -04: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
Brian.Dyke
7f719d0124
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0d5f2c0addc60124fa61
2014-10-16 11:21:39 -04:00
Brian.Dyke
7953b736e5
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: f3c8f4eeb086a76b3fe6
2014-10-16 11:20:36 -04:00
Nate Jensen
0ce6914322
Merge "Omaha #3730 export postprocessors package" into omaha_14.4.1
...
Former-commit-id: a1929bed50d5e5ba4103
2014-10-16 10:11:20 -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
Nate Jensen
2fc8887e08
Omaha #3730 export postprocessors package
...
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311
Former-commit-id: d5a5d552655dd168e76a
2014-10-15 14:46:12 -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
Ana Rivera
ee4cdc015f
VLab Issue #5014 ; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
...
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614
Former-commit-id: 927b2dea69f516cc441d
2014-10-15 18:41:58 +00: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
Mark Peters
4a121ecbd5
Omaha #3720 Remove dataURI from redbook plugin
...
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49
Former-commit-id: 06c9d6f7e9153cf12248
2014-10-14 17:13:23 -05:00
Nate Jensen
30f1771008
Merge "Omaha #3708 fixed possible NPE in SiteConfigurationManager" into omaha_14.4.1
...
Former-commit-id: 36049926a40105b3bacf
2014-10-14 15:53:22 -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
Mark Peters
d397d917c9
Omaha #3722 Remove dataURI from taf plugin
...
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4
Former-commit-id: 708f961708e7388847d6
2014-10-14 11:13:03 -05:00
Juliya Dynina
bc1c9b692d
Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1
...
Former-commit-id: 1421171def9825175171
2014-10-14 07:10:10 -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
Nate Jensen
3b54d07fa2
Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
...
Former-commit-id: 8ccb625dc4190a85c872
2014-10-10 14:45:54 -05:00
Juliya Dynina
6beb107913
Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
...
Former-commit-id: 32b7e80d8233e30cab01
2014-10-10 14:43:13 -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
Nathan Bowler
db82cdbdfe
Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
...
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba
Former-commit-id: 33e141dd381df2418409
2014-10-10 13:20:04 -04:00
Brian.Dyke
a1de83a7a8
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 05e4e92e65862712a00f
2014-10-10 13:17:54 -04:00
Shawn.Hooper
bfa9eb0dea
ASM #13467 - GFE: Need to add Beach Hazards Statement
...
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6
Former-commit-id: 0c61661989cea5061c61
2014-10-10 13:14:25 -04:00
