Ana Rivera
|
d5da5dfff6
|
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
|
2015-05-21 13:39:59 +00:00 |
|
Fay.Liang
|
16dcd77341
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: a282c0b3fac70f99abd8f734771fc8805d8b8a13
|
2015-05-14 14:05:04 -04:00 |
|
Fay.Liang
|
afcdd952a2
|
Merge branch 'mdl_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: 3dbd8b5a06aa96adbbfdfb25600527a15bfe011a
|
2015-05-14 13:58:44 -04:00 |
|
Kenneth Sperow
|
23a92ec6a2
|
VLab Issue #8185. Include JFreeChart into AWIPS2.
Former-commit-id: d5480d6c067eef6c14a46c37f8cbb381964780d5
|
2015-05-14 08:40:31 -07:00 |
|
Bruce.Hundermark
|
8c76f38994
|
ASM #14920 - GFE: SmartInits not calculating 12hr PoP correctly
Change-Id: Ie4d463d005aedb15ccbfb1f17835b57e65fd1264
Former-commit-id: 1f1252ed08512c78ec1cab03dfb7929d51408430
|
2015-05-14 14:20:35 +00:00 |
|
Juliya Dynina
|
6927d3173a
|
Merge "ASM #17438 - WarnGen: improve performance logging" into asm_15.1.1
Former-commit-id: baf59c779424582d3ae124d9cee9d40ea5c9309a
|
2015-05-14 08:12:50 -05:00 |
|
Matthew Howard
|
1ac6770d3e
|
Merge "ASM #17144 - GFE: Add Capabilities for CONUS real-Time Mesoscale Analysis at 2.5km" into asm_15.1.1
Former-commit-id: bd6bd016eca0339221e47c3d113deeaf5fcbb2c9
|
2015-05-13 15:41:33 -05:00 |
|
Fay.Liang
|
8cce7a082c
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
|
2015-05-13 15:11:13 -04:00 |
|
Fay.Liang
|
4bce2c0959
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 53eed5ee0c73100c13f7fef013bff6061db4815b
|
2015-05-13 15:08:24 -04:00 |
|
David Friedman
|
fb4faf96ec
|
ASM #17438 - WarnGen: improve performance logging
Change-Id: If0635087e542642883238e28481d8577c9d05f44
Former-commit-id: 9955a64e0d6902e50e6bc62c8e857e5d68451017
|
2015-05-13 17:24:27 +00:00 |
|
Bruce.Hundermark
|
15db360d00
|
ASM #17144 - GFE: Add Capabilities for CONUS real-Time Mesoscale Analysis at 2.5km
Change-Id: Id759bf52cfcf7ee7a13e65facf3dfd32be9feb22
Former-commit-id: a1f4da43d6b9271789ca42f71c3d7334f8a6b773
|
2015-05-13 14:47:16 +00:00 |
|
Ana Rivera
|
fccd72234a
|
Merge "VLab Issue #8088 - Volume Browser ensemble/SREF/Aviation menu file has incorrect contents; fixes #8088" into field_15.1.1
Former-commit-id: 9986873d82e1222dae434fff8f79349a61f86984
|
2015-05-13 14:34:02 +00:00 |
|
Shawn.Hooper
|
003c528458
|
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
|
2015-05-12 11:30:23 -04:00 |
|
Fay.Liang
|
a07bb535be
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 02ea64b8c62525e9ec63bce9ad0d573fa4f6d6c0
|
2015-05-12 10:06:11 -04:00 |
|
Ana Rivera
|
12f8c4cf81
|
Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I33c3dd2cc2b8be8a8ca9370839f07512b12d8e6d
Former-commit-id: 8608cf4250be497aa20d13088a20bece02befd92
|
2015-05-11 20:21:13 +00:00 |
|
Kevin.Johnson
|
1e4e452389
|
ASM #17480 - added HFR pattern to pqact.conf.template
Change-Id: I01c4a9bc038e41aadcf81b6e7ec9667d214a702f
Former-commit-id: 65dfaecbbe9bc276fbe77d6646e89085311c3dae
|
2015-05-11 12:57:51 -04:00 |
|
Juliya Dynina
|
db20a52379
|
Merge "ASM #17442 New ndm-modes.xml for ingestHydro for ALR" into asm_15.1.1
Former-commit-id: 953c0d744f6cb86aeb892d51daa8518786cecaed
|
2015-05-11 11:35:34 -05:00 |
|
Xuezhi.Wei
|
93d050f0e9
|
ASM #17442 New ndm-modes.xml for ingestHydro for ALR
Change-Id: I2857355665f2901a43ab7fcdc40477a5ffbebd45
Former-commit-id: a0f91c6b8fab3a98ef404c37d49cbbe9b0cdaeba
|
2015-05-11 11:51:49 +00:00 |
|
Fay.Liang
|
4ea3f9eb11
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: d1319234bf47eec87890cc7c00dcc1ab11febc91
|
2015-05-10 01:27:38 -04:00 |
|
Fay.Liang
|
18d8746429
|
ASM #17476 - Add 64bit libthrift libraries
Change-Id: I8c7bb826c9688950ad09092bb22f27414cadfae2
Former-commit-id: 6131f8ff469989c607a61edd471c4129a23dca8a
|
2015-05-10 01:25:59 -04:00 |
|
Fay.Liang
|
af1448c5d0
|
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 3fa21300bc62a687cd076b709e4df8f8bf508edc
|
2015-05-10 00:16:32 -04:00 |
|
Fay.Liang
|
0d4c9d4cf1
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 62c8b784ec6cc09c405ecc3ee75325db8e0ae204
|
2015-05-10 00:11:55 -04:00 |
|
Fay.Liang
|
95ab6a74b1
|
ASM #17476 - HWR: Certain marine observations missing from product
Change-Id: Ib289f53e3f8cb2f82df3ac512540917eae072a08
Former-commit-id: 272927b1a4e27e59ff82353ed12de68634efd7da
|
2015-05-10 00:07:16 -04:00 |
|
Fay.Liang
|
92090243be
|
ASM #17252 - Text lightning decoding problem after 14.3.1 upgrade
Change-Id: Idc866ed518419d0c20ca51fdc118f0878082cc24
Former-commit-id: adbf1f76743d9dd6bbf7785f83984e1bdf16e7f2
|
2015-05-08 15:55:40 -04:00 |
|
Fay.Liang
|
24e389ad6d
|
Merge branch 'master_15.1.1' into asm_15.1.1
Former-commit-id: b3081252a90b2aae24047b57a9124b1575f5fb49
|
2015-05-08 15:16:48 -04:00 |
|
Matthew Foster
|
4b06688205
|
VLab Issue #8088 - Volume Browser ensemble/SREF/Aviation menu file has incorrect contents; fixes #8088
Change-Id: Ia497e1aa8c1a954f1878283ebb527ec6233b48e7
Former-commit-id: 99a24163e22b46f20a4ec31e6f4d08c916e95152
|
2015-05-08 19:01:48 +00:00 |
|
David Friedman
|
61157be4f8
|
ASM #17310 - WarnGen: a large portion of hatched area was not included in polygon
Change-Id: I77c1a45f67e41e0ad0d9cdcca006f43c9f30e7f1
Former-commit-id: 7e97e943d7c6b291bf3e1b03540b623a8ec73677
|
2015-05-08 18:26:37 +00:00 |
|
Steve Harris
|
2cc7b15af1
|
Merge tag 'OB_14.4.1-36' into omaha_14.4.1
14.4.1-36
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 8256d399c695b9ebcd8966d34fbc7f938505b574
|
2015-05-08 13:01:38 -05:00 |
|
Melissa Porricel
|
037427861a
|
ASM #7951 - Add RTMA menu items to Misc/Aviation VB menu
Change-Id: Idddde521d6c2403d8a76f3341e977d217b8469d6
Former-commit-id: 4f1ad3c4db5d5e8ec77870c34a9d66c440be2691
|
2015-05-08 12:51:59 -04:00 |
|
Ana Rivera
|
565fbb949c
|
VLab Issue #8081 - Baseline NWPS Weather Element groups; fixes #8081
Change-Id: I901d43e6474cb659407b6bcf1e1798c7de2dc341
Former-commit-id: 5e749f9f2b1bddbb57d1e61d0211982db90656cd
|
2015-05-08 14:42:40 +00:00 |
|
Fay.Liang
|
0c99e1fc1b
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 81532ad0a395afe679af36e6a3b49e804891bf5b
|
2015-05-07 16:52:57 -04:00 |
|
Slav Korolev
|
2a1cad119b
|
Omaha #4434 - Added pattern for GFS20
Former-commit-id: 87849fbc952fb4b5ae58c43b00c118e1ab100c61
|
2015-05-07 11:55:17 -04:00 |
|
Roger Ferrel
|
c58a008d3d
|
Omaha #4419 Add com.raytheon.uf.common.bmh to excludes list for DatabaseSessionConfiguration.
Change-Id: Iae4d3b9fe179c94d72782d3fd8b1717febaf03db
Former-commit-id: db2feae191b036fc20257807ae6923238bdea9fd
|
2015-05-07 08:30:50 -05:00 |
|
Ron Anderson
|
8aa6c2355c
|
Merge "Omaha #4467 Add support for mixedCase to runIFPText." into omaha_14.4.1
Former-commit-id: 99149cfe22a11e7723a5172c138aa81af9664e85
|
2015-05-06 14:41:33 -05:00 |
|
Ron Anderson
|
d99db10d5f
|
Merge "Omaha #4383: Fix iscDataRec for FireWxISC, properly parse XML data received from MHS for iscDataRec." into omaha_15.1.1
Former-commit-id: 089fd64381aa3d6983bd21716df879564f288c20
|
2015-05-06 14:41:18 -05:00 |
|
David Gillingham
|
d2a56bb2ea
|
Omaha #4383: Fix iscDataRec for FireWxISC, properly parse XML data received from MHS for iscDataRec.
Change-Id: Ibe0f5664cfadf1a9a0328efce795963a12efb523
Former-commit-id: 979719e62aee61a58915935398738ee0cf7d4bf9
|
2015-05-06 13:53:50 -05:00 |
|
Greg Armendariz
|
52a0135bb2
|
Merge "Omaha #4462 delta script of populat blank sites' in stdtextproducts table." into omaha_14.4.1
Former-commit-id: de66a3f9822e80d48bfcfdb7219ce6c76972daff
|
2015-05-06 13:38:16 -05:00 |
|
Ron Anderson
|
c8be7b62d7
|
Omaha #4467 Add support for mixedCase to runIFPText.
Change-Id: I69c063596d175ea89a2b4537722bdb1ff399cb55
Former-commit-id: 3cc39323a55aaec6b38356724d2949605d4fde37
|
2015-05-06 13:17:08 -05:00 |
|
Sean.Webb
|
933c8172e7
|
ASM #17468 - Commented out MRMS pattern
Change-Id: I43c9d5df9cc30f6bf9ec2a3929999cb3cb4c12f7
Former-commit-id: c341f3ef9f3ffc4fd313966ff4e85a19e9ca55b3
|
2015-05-06 11:00:06 -04:00 |
|
Shawn Hooper
|
1ada75023f
|
Merge "Revert "ASM #17467 - Commented out MRMS entry"" into asm_14.4.1
Former-commit-id: 704d599c2c968185459d6c6195b0023a5f421dcf
|
2015-05-06 11:01:41 -05:00 |
|
Shawn Hooper
|
4a66af9dac
|
Revert "ASM #17467 - Commented out MRMS entry"
This reverts commit 3b5a5bc44e [formerly e09eb0800c7798bc81dc8e5f617a7460cba1cae8].
Change-Id: Iaf756b38b02a1cc451045f43103730f48ae8d506
Former-commit-id: 22308ff720605ae3d915226f308261b0876035ae
|
2015-05-06 11:01:18 -05:00 |
|
Sean.Webb
|
ef2aaa0245
|
Merge "ASM #17467 - Commented out MRMS entry" into asm_14.4.1
Former-commit-id: 1c3e932a6bea6eda2ee950e48336e9187952ef06
|
2015-05-06 10:54:39 -05:00 |
|
Sean.Webb
|
3b5a5bc44e
|
ASM #17467 - Commented out MRMS entry
Change-Id: I8c9ffd223be82c3db4d9bad55cb1d5c93ffa6c68
Former-commit-id: e09eb0800c7798bc81dc8e5f617a7460cba1cae8
|
2015-05-06 10:47:11 -04:00 |
|
Richard Peter
|
c0cc6d7365
|
Omaha #4468 - Fix gribDatasets_NCEP-7.xml typos
Change-Id: I5cd8f130c86cde73b88b75017cc46dce7dbaed34
Former-commit-id: 3185ab93ef9d1ba7efbd59f24cc3c8a270938853
|
2015-05-06 09:17:50 -05:00 |
|
Roger Ferrel
|
a104dd0dc8
|
Omaha #4419 Sort User Administration's edit user dialog lists.
Former-commit-id: 972c3f1ff1fcbcc35c4268275a3c8fd4c0d74860
|
2015-05-05 17:10:40 -05:00 |
|
Roger Ferrel
|
c8a7c14fbd
|
Omaha #4462 delta script of populat blank sites' in stdtextproducts table.
Former-commit-id: 8845b12e74bd6183f86cdc998b2fde24dc9bf923
|
2015-05-05 15:43:38 -05:00 |
|
Richard Peter
|
5413eeadb2
|
Merge "Omaha #4462 Always set text product's site when writing standard text product." into omaha_14.4.1
Former-commit-id: 0c755b4ad0a789a6b28829a209fe88b9238862be
|
2015-05-05 13:44:14 -05:00 |
|
Steve Harris
|
0a7e5a4474
|
Merge tag 'OB_15.1.1-8' into omaha_15.1.1
15.1.1-7
Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
|
2015-05-05 13:33:32 -05:00 |
|
Steve Harris
|
40660158ab
|
Merge tag 'OB_14.4.1-33' into omaha_14.4.1
14.4.1-33
Former-commit-id: c97ae8555c08e5394c536a42e1b25e0c47a310aa
|
2015-05-05 13:18:29 -05:00 |
|
Roger Ferrel
|
c6e0f2dc7c
|
Omaha #4462 Always set text product's site when writing standard text product.
Former-commit-id: 14b7158f8dc7d5ea35ff95fd03957527760d72ba
|
2015-05-05 12:30:55 -05:00 |
|