Steve Harris
943628f462
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
rpms/build/common/lookupRPM.sh
Former-commit-id: 8db96f4003ee58a46c7b37c385d0683329b66d55
2015-08-10 20:42:11 -05:00
Ron Anderson
9fd4b674ac
Merge "Omaha #4547 More template fixes" into omaha_16.1.1
...
Former-commit-id: 989cac1d437f6e997f3b22578ac7dea0157f3e42
2015-08-10 13:48:38 -05:00
Ying-Lian.Shi
4d892154a5
ASM #17443 GFE Svcbu: Bug in scripts results in rsync_parms.ccc file not getting used
...
Change-Id: Ie4b48937b845165a3e4c4508abb0e322474193f4
Former-commit-id: 2ad5b3868b58bb8b48860ddd1bea94887f42df58
2015-08-10 18:09:27 +00:00
Ron Anderson
ea8812f51c
Omaha #4547 More template fixes
...
Change-Id: Ifbf3341f669682157fd95d64bcccfd7c1b4243e7
Former-commit-id: 5a02fe4695575b841675dfde6ec3a7ce38c028b8
2015-08-10 11:58:14 -05:00
Shawn.Hooper
3889542318
Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
...
Former-commit-id: cd4bb3527882a840ef476013919a47870776d265
2015-08-10 12:47:19 -04:00
Shawn.Hooper
bbb48e8551
Merge branch 'master_16.1.1' into asm_16.1.1
...
Former-commit-id: 1d9f29deb012fb833757c3960e9c91fea6d2156d
2015-08-10 11:41:55 -04:00
Richard Peter
32a4df07a7
Omaha #4500 - Fix hydro type casts
...
Change-Id: Ie2cbfed309ff9c2274d9cdfd3768f8d60ca18af8
Former-commit-id: e8d3d006f9bd1485b59dfbc869714f1320ec2ff0
2015-08-07 15:12:38 -05:00
Juliya Dynina
0109002f12
Merge "ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed" into asm_16.1.1
...
Former-commit-id: b60b829cecbc23847dbd0946da46357d0280f703
2015-08-07 09:50:52 -05:00
Juliya Dynina
bf518a28cf
Merge "ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance" into asm_16.1.1
...
Former-commit-id: 771b4ceb398b4426b99a232a4369e87875940d4d
2015-08-07 09:50:20 -05:00
David Friedman
a0c82a85ae
ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed
...
Change-Id: I50e45c01e3d454d2278248ba073bd09b39ad7f46
Former-commit-id: 90fddd16408d7e45850dad5c1f4c4d3a27d64ea0
2015-08-07 14:00:05 +00:00
David Friedman
be8070e543
ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
...
Change-Id: I66cedc0301d8aac07fb57d4acf72ea61e0633cea
Former-commit-id: 416d74f3b06d4946ddccf670344573c47efd5b40
2015-08-07 13:55:03 +00:00
Richard Peter
687a9ad5b9
Merge "Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp" into omaha_16.2.1
...
Former-commit-id: 8002ce0f2eaf5662e55eb2d67bc7d67600e5e0ff
2015-08-06 15:05:17 -05:00
Richard Peter
3a61a5e4aa
Merge "Omaha #4703 optimized some deriv params for numpy" into omaha_16.2.1
...
Former-commit-id: 7f49641a9c3d0d6363d0a62c2c80864f8644d15d
2015-08-06 15:04:23 -05:00
Richard Peter
9d0b59066b
Merge "Omaha #4533 Upgrade PostgreSQL to 9.3.9." into omaha_16.2.1
...
Former-commit-id: d56b868de36225f464279e6d1c350ff65959a6d9
2015-08-06 15:02:59 -05:00
Ben Steffensmeier
60b605731e
Omaha #4693 Make AlertView preferences easier to understand.
...
Former-commit-id: f3c7fdeb757cefebfc995269671f95e33cc94d2a
2015-08-06 14:30:17 -05:00
Roger Ferrel
2e9f97c965
Omaha #4360 alterGridTablesDataURI missed non-nullable location_id. QUIDScatObs corrected name on Unique Constraint.
...
Former-commit-id: b9c8333fa67fd711795df17bf83ae1f3feff4bba
2015-08-06 11:18:35 -05:00
Nate Jensen
91f06183d3
Omaha #4703 optimized some deriv params for numpy
...
removed some unused imports
cast NaN to float32 for numpy 1.9 safety
more usage of in place arrays for memory efficiency
Change-Id: I5dc4b365086c740164f3e5c92866f91f8f73ef14
Former-commit-id: b40344398b832d9da80b94327de34ba5efab5740
2015-08-06 10:11:39 -05:00
Nate Jensen
19020a1412
Merge "Omaha #4635 : Damage path tool now defaults to using SITE level for working file." into omaha_16.2.1
...
Former-commit-id: b3b6cd2f77dd37937c718bd2c0f4e2cc13711c91
2015-08-06 09:32:01 -05:00
David Lovely
fb17d06dfe
Omaha #4533 Upgrade PostgreSQL to 9.3.9.
...
Former-commit-id: 85e76387ff22609803bc4a13413d912b7d3fab6e
2015-08-05 20:11:54 -05:00
Richard Peter
71049248fd
Omaha #3861 - Split npp feature
...
Change-Id: I68f94b4a07adadc6d3a780e2dfa5fa7c975d0fda
Former-commit-id: 0c16e6144595c5efbb98b3df1249613e93031edb
2015-08-05 17:50:23 -05:00
Richard Peter
a0ccfb3288
Omaha #3861 - Fix feature build order
...
Change-Id: Ic85eb0d3a790100a200ca0dcdc09ccbc9f7b1e50
Former-commit-id: 55787e771f70704e4b650f66f905fa748e253873
2015-08-05 16:32:54 -05:00
David Gillingham
3e2837966d
Omaha #4635 : Damage path tool now defaults to using SITE level for working file.
...
Change-Id: Ia2f6bf29678a7382c32cc9780695b08ce37ec39c
Former-commit-id: ed2f1fb83d789cc16f9a378955f82072afefed31
2015-08-05 15:55:05 -05:00
Nate Jensen
39fce33cc1
Merge "Omaha #3861 - Fix nsharp and volumebrowser features" into omaha_16.2.1
...
Former-commit-id: 628194f0fbd4c931c2b65d020905c04af5ab4feb
2015-08-05 15:44:15 -05:00
Richard Peter
c6c410484e
Omaha #3861 - Fix nsharp and volumebrowser features
...
Change-Id: Ib81b6c9c651659f10c2b9df2c2cdd37410bf666e
Former-commit-id: 4ab88734e152af3cb9dbd998ed417f1b783f2bea
2015-08-05 15:39:10 -05:00
Ron Anderson
0dda55b7ca
Merge "Omaha #4263 : Fix NullPointerExceptions in TextProductManager." into omaha_16.2.1
...
Former-commit-id: 7f6c31bf7fe49fd349ac642da092b2f865e10480
2015-08-05 15:30:37 -05:00
Richard Peter
5d7f17e149
Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp
...
Change-Id: Ib425d2f4021a587b5c8cd52bfe3816c723f6b0a1
Former-commit-id: 06d943d51fec264ec34a45ed84547b7972925e7e
2015-08-05 15:19:05 -05:00
Roger Ferrel
7e8faee168
Omaha #4360 Fix bug in the copy constructor.
...
Former-commit-id: 6c2fce8058cd60bbee19a3f903c735f0c78c43b6
2015-08-05 12:50:24 -05:00
Joshua Watson
a65817021e
VLab Issue #9982 - Fix pqact for Extratropical Storm Surge Model (ESTOFS) data - Pacific; fixes #9982
...
Change-Id: I5bc9d6d4122a5449ee6db4ea65f92f4d25d1dbfd
Former-commit-id: 9c0c45c4c45b7d61d3fe265e9a096b4d07879e44
2015-08-05 12:53:28 -04:00
Qinglu.Lin
850c3ee7fc
ASM #17865 - Mixed Case causing some counties to not be locked properly in WarnGen
...
Change-Id: Iefee989b42ac140c06909c8930a3d6e6c3e27199
Former-commit-id: a6cab1a374f4efc0a60fd04d8306fb2709caa086
2015-08-05 12:10:47 -04:00
Ana Rivera
3f6454bc4f
Merge branch 'master_16.1.1' into field_16.1.1
...
Change-Id: I63d05be8eb16715d410b4f4fb5328d942353cc40
Former-commit-id: 0cc857db8cbc4481ceb7d059485ba0eaf730f48e
2015-08-05 16:04:20 +00:00
David Gillingham
cad3439b1b
Omaha #4263 : Fix NullPointerExceptions in TextProductManager.
...
Change-Id: I63dc2f04fbdaa585f5c5ed5372c9ac49e45c60af
Former-commit-id: 7ae47d7143bc43e6ace85d4bd29b09855bbdff08
2015-08-05 10:05:58 -05:00
Greg Armendariz
368a4a2b2d
Omaha #4604 - Removed files packaged by NCEP CLI RPM
...
Change-Id: I8da4049c60a5d9e9372b1919d65be6e0329e03fb
Former-commit-id: dfc0d8210cdb2fc5ca6d40e327292aae1c8f4afc
2015-08-05 09:09:04 -05:00
Nate Jensen
ceddb3ef74
Merge "Omaha #4702 updated lookupRPM.sh for jep 3.3.6" into omaha_16.1.1
...
Former-commit-id: 7b918666378abd4a1c9d1afb0bf3e22b2fb8761e
2015-08-05 09:02:33 -05:00
Roger Ferrel
58ed937654
Omaha #4360 Renaming unique constaints now picks up old names with mix case.
...
Former-commit-id: 83333e1fbacad6de25b2cbfdc3579d3d73b14fdc
2015-08-04 16:55:40 -05:00
Ron Anderson
cb6dadd09b
Merge "Omaha #4654 - Added localization level filters to AlertViz messages." into omaha_16.2.1
...
Former-commit-id: ed5d696b88f37dda3fe938340d3254be0ce251fc
2015-08-04 14:36:07 -05:00
Ben Steffensmeier
23bfac5d4c
Omaha #3861 Separate product creation from the main vb plugin.
...
Former-commit-id: 00e617e97a2979f756de4e58ff602b707a0cc509
2015-08-04 14:09:04 -05:00
Nate Jensen
f727ed5ed7
Merge "Omaha #4263 : Rewrite GFE TextProductManager so it can be initialized off main thread." into omaha_16.2.1
...
Former-commit-id: fdca4b84f225efad85f1433161be87bd9d691861
2015-08-04 14:02:21 -05:00
Steve Harris
716970c597
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Former-commit-id: 2c28db21de36edb64a6a741e93803b3423f5c22c
2015-08-04 13:41:21 -05:00
David Gillingham
ed30c7d60e
Omaha #4263 : Rewrite GFE TextProductManager so it can be initialized off main thread.
...
Change-Id: Ia0cc2cf0c01f6ec6573c61768cd638f45feb0893
Former-commit-id: ceed238549ff6a6a8be8aa30aef3dfaeef5ce25d
2015-08-04 13:28:30 -05:00
Steve Harris
380c76a769
Merge tag 'OB_16.1.1-3' into omaha_16.1.1
...
16.1.1-3
Former-commit-id: cf16b85be683f57537a2913627489d9c490a972b
2015-08-04 12:53:30 -05:00
Nate Jensen
9facc2fc44
Merge "Omaha #4694 Logback configurations will now append user.home to LOGDIR." into omaha_16.1.1
...
Former-commit-id: d129c358e3c525fa15b380b651df897e13a7fd4e
2015-08-04 12:44:31 -05:00
David Lovely
b9e10fcf31
Omaha #4694 Logback configurations will now append user.home to LOGDIR.
...
Change-Id: I1ed4b3c59d934ac703bd5481b2277beca4ff9568
Former-commit-id: 825064c84ebfa384703074b9be520f03fbb83e8d
2015-08-04 12:38:45 -05:00
Nate Jensen
30b602f243
Omaha #4702 updated lookupRPM.sh for jep 3.3.6
...
Change-Id: If09abfd868a444d088da6b6e3296ff589c2f603a
Former-commit-id: 4885e73e4ee9d6436d362dab12966b7ec2bc766d
2015-08-04 11:57:41 -05:00
Slav Korolev
b0d93c1b99
Omaha #4654 - Added localization level filters to AlertViz messages.
...
Former-commit-id: acf06c64c7495c930c25924cccbe22f358ad7dad
2015-08-04 12:14:32 -04:00
Benjamin Phillippe
becd8cc911
Omaha #4712 Added parameter to PersistableDataObject on ActiveTableRecord
...
Former-commit-id: 6b6949d45ab9f487ebfa0755b419398cc6e55026
2015-08-04 11:10:43 -05:00
Ben Steffensmeier
121d858bdc
Omaha #4693 Bring alertview to top instead of activating it.
...
Former-commit-id: fc3bfc4997b276445471f0a6896e8cb3561a6010
2015-08-04 10:44:15 -05:00
Roger Ferrel
9797c7f2e0
Omaha #4360 Rename delta script's folder.
...
Change-Id: If551d6c39c7aca761200c1734dc537b912da3f84
Former-commit-id: 8ab4092c6a9059bbab59146f0d4c867d261b8efe
2015-08-04 09:46:56 -05:00
Shawn.Hooper
cb3348102e
Merge branch 'master_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: 3a7f2119bf29cc21044d9e07fe722bdcea16e419
2015-08-04 10:08:06 -04:00
Ana Rivera
0aaba96d2e
Merge branch 'master_16.1.1'(OB_16.1.1-2) into field_16.1.1
...
Change-Id: Icbd151fa26f70df56667c200852be0fabe8462d3
Former-commit-id: 44193d6ac1d120c797d8ce6641c03baef9816ca7
2015-08-04 12:56:53 +00:00
Steve Harris
f696d5731d
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
...
16.1.1-2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
2015-08-03 17:06:31 -05:00