Ana Rivera
4071b58b85
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 20ad0a65f38bfa7c4087
2015-01-27 22:05:59 +00:00
Ron Anderson
a7ab638203
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
...
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 8a86832fb25c08543da0
2015-01-27 13:43:44 -06:00
steve.naples
86b4054251
ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
...
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528
Former-commit-id: 0260da784dd960e4bba1
2015-01-27 18:36:49 +00:00
steve.naples
ffb1fbe0e6
ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
...
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a
Former-commit-id: 565c4d69da349ff47f53
2015-01-27 18:36:07 +00:00
Steve Harris
16b0574adc
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 8eb10d0456716879f58b
2015-01-27 11:56:24 -06:00
Steve Harris
0ac687b980
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
...
Former-commit-id: 82f2a146da1891ed5e5b
2015-01-27 11:34:06 -06:00
Fay.Liang
65d91d9113
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7bc10075e5d29d86ad05
2015-01-27 12:08:28 -05:00
Ana Rivera
62094315d2
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 327945af8b7c5fc26537
2015-01-27 16:28:42 +00:00
Shawn.Hooper
0a91e7cf47
ASM #17071 - Add tokens for Alert Alarm System
...
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189
Former-commit-id: 87575853869ca10f111a
2015-01-27 11:22:56 -05:00
Ron Anderson
178ad50f20
Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
...
Former-commit-id: 3a804c4be7d97b54018c
2015-01-27 08:59:12 -06:00
Ron Anderson
0dc17a57a2
Omaha #4033 Fix logging in configureTextProducts
...
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030
Former-commit-id: 29930e52b313bfa6e362
2015-01-26 17:50:28 -06:00
cmadmin
f793ae4782
Merge "Omaha #3777 - Update numpy" into omaha_15.1.1
...
Former-commit-id: 12eeac74ce79b7be3e69
2015-01-26 15:56:06 -06:00
Ana Rivera
f565ef4315
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: dee10b3f6f171a38175c
2015-01-26 19:04:54 +00:00
Ana Rivera
654d08a588
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 7c25945fd998ac97e397
2015-01-26 18:45:26 +00:00
Shawn.Hooper
e6c4f29036
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e84a037b2e568b7c801a
2015-01-26 11:22:49 -05:00
Greg Armendariz
c0b3980ebc
Omaha #3777 - Update numpy
...
Former-commit-id: 0ebaf6c5eb153897c19f
2015-01-26 09:54:56 -06:00
Nate Jensen
7e8d355f62
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: c4598baf1963189329a1
2015-01-26 09:10:36 -06:00
Roger Ferrel
cc869c167f
Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog.
...
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e
Former-commit-id: d1941fd84e5e91714487
2015-01-26 07:46:00 -06:00
steve.naples
6811eb83a7
ASM #17051 MPE: Daily QC will not display Points+Grids together.
...
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 540ea644986488242165
2015-01-23 20:40:48 +00:00
Nate Jensen
dddc6c2cd4
Omaha #3952 disable cairo in alertviz for safety
...
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 7c7c2e3a38415e2d4035
2015-01-23 12:57:24 -06:00
Steve Harris
b0c09c3ff7
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 9234ceb4852c559f4c88
2015-01-23 09:32:44 -06:00
Steve Harris
8cd9e2e92f
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 0f05c53a53158fa16376
2015-01-23 09:08:06 -06:00
Ana Rivera
de1b989253
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 44fa40c0cc705f02f2be
2015-01-23 14:21:22 +00:00
Richard Peter
4e80bdbd9e
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
...
Former-commit-id: d7f79b859bcc69519ce9
2015-01-22 19:13:09 -06:00
Mark Peters
30229a25f2
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 7a69f354d9db69f5a0bc
2015-01-22 18:05:40 -06:00
Daniel.Huffman
f4ac238888
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: a25fa81a0f845998cbfa
2015-01-22 21:13:04 +00:00
Shawn.Hooper
095a22f5e3
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 37c89530a6314a8497f8
2015-01-22 16:05:52 -05:00
Shawn.Hooper
7839dab5e6
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: a757b554460bc501bd4c
2015-01-22 16:05:41 -05:00
Dave Hladky
5fd928ec4c
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: a15e67385ac1127b066f
2015-01-22 13:22:18 -06:00
Nathan Bowler
42e98486a4
Omaha #3949 Add lightning source to SCAN site run config and filter on it.
...
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5
Former-commit-id: 4dd5b6999cefd13e5442
2015-01-22 12:15:00 -05:00
Ana Rivera
4f8900fd23
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 18b9d5d1637b47ffe362
2015-01-22 16:11:44 +00:00
Greg Armendariz
20029816bf
Merge "Omaha #4014 : Add pattern for ETSS to pqact.conf." into omaha_15.1.1
...
Former-commit-id: 504fe69507be4f0a90a1
2015-01-22 09:47:35 -06:00
Shawn.Hooper
9e83601505
ASM #17054 - Disable MRMS Menu in 14.3.1
...
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: d0b7b06d97bd5dfed072
2015-01-21 12:44:47 -05:00
David Gillingham
00060ba106
Omaha #4014 : Add pattern for ETSS to pqact.conf.
...
Change-Id: I016cc2c4cfdae309a8129876c519ca7919eafe5e
Former-commit-id: 86465c82dd00be4da9e4
2015-01-21 10:29:30 -06:00
Juliya Dynina
a72a325521
Merge "ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's" into asm_14.3.1
...
Former-commit-id: 7dfa9e281b64d09c6982
2015-01-21 09:08:36 -05:00
Ron Anderson
c8fba0cc0b
Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member
...
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805
Former-commit-id: f7b327f1f66b8705ee39
2015-01-20 16:46:47 -06:00
Ron Anderson
d1ae28fe06
Omaha #4012 Create GFE procedure to mark grids updated without change for ISC
...
Change-Id: Iaf9be8083e1c15f0d39734691f88f39f1a897b93
Former-commit-id: 29a0caeae31defc08434
2015-01-20 16:36:19 -06:00
Qinglu.Lin
761fc43aad
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: 30b5bc6a6294ee166aa1
2015-01-20 16:20:58 -05:00
David Gillingham
a6b2a5cabf
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: 460497585441af2f661c
2015-01-20 14:02:06 -06:00
Nate Jensen
7a10bd5620
ensure PGEN appears in thinclient D2D Tools menu
...
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: ac9d787a26bfcb36eeac
2015-01-20 11:52:37 -06:00
Ron Anderson
cbf8da3e81
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: b7b7670bd903df152b3d
2015-01-19 15:08:31 -06:00
Ron Anderson
6e97b2dd31
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: 305d1901fdb58904fe25
2015-01-19 15:08:08 -06:00
Ron Anderson
e238360309
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: ea2dbf54ff596149053f
2015-01-19 14:02:42 -06:00
Lee Venable
e35eea1393
Merge "Omaha #4001 : Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes." into omaha_15.1.1
...
Former-commit-id: f0e2d151904721c5455f
2015-01-19 11:10:08 -06:00
Ron Anderson
79dc5f3c98
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: a955bd6e365dfd9d6f8c
2015-01-16 12:33:52 -06:00
Ron Anderson
9c5de648d6
Merge "Omaha #4006 ensure mask has dtype bool for more strict numpy checks" into omaha_15.1.1
...
Former-commit-id: 939ba09a9d19615b59aa
2015-01-16 11:06:28 -06:00
Ron Anderson
8315f9676f
Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1
...
Former-commit-id: 59b82d777c899235138c
2015-01-16 11:03:14 -06:00
Nate Jensen
4b9a4dd522
Omaha #4006 ensure mask has dtype bool for more strict numpy checks
...
Former-commit-id: b40ad431a177f6df5d34
2015-01-16 09:44:05 -06:00
Fay.Liang
09d7176332
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 7ef58758ec7c3be2689c
2015-01-16 09:00:03 -05:00
Mark Peters
f89786f50e
Omaha #3947 CAVE time in practice mode does not default to real time
...
Change-Id: If53a9348e75abf69f3395629685f8a26973f9e52
Former-commit-id: 4d01175dfa96da1cafbe
2015-01-15 18:06:37 -06:00
