Matthew Howard
e977069a71
Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
...
Former-commit-id: 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7
2014-09-23 10:23:16 -05:00
Shawn.Hooper
99f6ff6d0a
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
...
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7
2014-09-23 10:44:38 -04:00
Sean.Webb
4d2c798cc2
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
...
Former-commit-id: 3592653ff850b2950d3ca4c0fead17292b58f971
2014-09-22 14:23:18 -05:00
Sean.Webb
9b164205c0
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
...
Former-commit-id: d5f0fa6d025ec11eb83b9ceceb8309a23f80820b
2014-09-22 14:22:58 -05:00
Sean.Webb
00479a436d
ASM #16761 - Fixed typo on variable character
...
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36
2014-09-22 14:10:28 -04:00
Sean.Webb
47aef24f6f
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 721bead655f9a384ea12444617774b7ef404feb0
2014-09-22 07:18:21 -04:00
Shawn Hooper
2df3755d31
Merge changes Ia37804af,I1649c38e,I9dc84e7e,Ie9e2ab55 into asm_14.2.3
...
* changes:
ASM #16761 - Fixed typo on variable character
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
ASM #16761 - Added retrans code updates from ISG
ASM #16761 - Updated ldm spec to add retrans
Former-commit-id: fc69e9debbbad3f8b82a8670f700a158fb68c12b
2014-09-19 14:05:35 -05:00
Sean.Webb
4368f4650b
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: 5c541f50dcc68a856e8c81bff8577334abf1ff75
2014-09-19 13:43:45 -04:00
Sean.Webb
b0b01694f7
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
...
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: 031c41d4f7801c8a5127cf007358856bf771593a
2014-09-19 09:29:31 -04:00
Sean.Webb
5c84cadaf6
ASM #16761 - Added retrans code updates from ISG
...
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 165b9a9b3481b3fa1d31b771eead03180430be59
2014-09-19 07:25:18 -04:00
Sean.Webb
35bfd8269c
ASM #16761 - Updated ldm spec to add retrans
...
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: bb9d431a842511b0081660224f3ddefd947f76fd
2014-09-18 09:33:47 -04:00
Qinglu.Lin
0e2be5afd8
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
2014-09-17 10:26:25 -04:00
David Friedman
8d7ba120a2
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
...
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: 17d27fca04fb733d74e5bac99bfed3112bd81b6c
2014-09-10 19:28:57 +00:00
Brian.Dyke
7b7ef56b04
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: a77577595da1e2dcc8057c5a8b8643a612780339
2014-09-04 15:59:00 -04:00
Brian.Dyke
e762271240
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: ad120a9357402fbdedb350cabe88d2becf5d7361
2014-09-04 14:18:34 -04:00
Qinglu.Lin
8c28597210
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 33adaf353c6a4b7dc418dc86428257dae260c4c5
2014-09-04 14:09:24 -04:00
Brian.Dyke
72e2882496
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36
2014-09-04 14:01:26 -04:00
Nate Jensen
2cfbfc1dc4
Issue #3574 Properly dispose radar graphics graphics objects.
...
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782
2014-09-04 10:10:37 -05:00
Brian.Dyke
043a95d35e
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a
2014-09-03 21:14:27 -04:00
Brian.Dyke
121a2d100f
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: 82d7bbe6bf005e543e1ad6772c6a18024f1b0764
2014-09-03 21:10:16 -04:00
Brian.Dyke
368f80f220
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: f9daf7d6e906904e96438fabc510e24ff66536d4
2014-09-02 15:09:06 -04:00
Qinglu.Lin
2374673f8d
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
2014-09-02 14:37:19 -04:00
Steve Harris
db74dc031e
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
...
Former-commit-id: 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21
2014-09-02 08:09:48 -05:00
Juliya Dynina
169dc0ba43
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
...
Former-commit-id: bb260c4003b477ca51cf5fd9c8d54275af906772
2014-08-28 15:52:11 -05:00
David Friedman
de6e79f9e3
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
...
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: aca832a81bc18d954eadb51755ce04597cd264df
2014-08-28 18:08:23 +00:00
Daniel.Huffman
c89a7169b0
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
...
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f
2014-08-28 17:20:30 +00:00
David Friedman
a2dfe8e8f6
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
2014-08-28 15:43:32 +00:00
Steve Harris
891019aadd
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
...
Former-commit-id: 579781387325a36e27135b8384b2a8b14cb38317
2014-08-27 11:34:06 -05:00
Daniel.Huffman
8962a069be
ASM #16715 - Reverted and augmented Cities.xml
...
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: 2107976bd25c429521d4df7a92a3726a38806ba3
2014-08-26 13:30:09 +00:00
Steve Harris
a03b5201cb
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
...
Former-commit-id: 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd
2014-08-25 08:19:50 -05:00
Brian.Dyke
14d21b336d
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 614b2bb59424f01d2608cd2db3a14dbcd77c90e6
2014-08-21 12:07:16 -04:00
Qinglu.Lin
fb92838427
ASM #15700 - Warngen issues an error and toggles off on Radar update
...
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: b8a4741b2519e8c02a1b80ba8544be9b1c26d35c
2014-08-21 10:43:22 -04:00
David Friedman
78ee5a56c5
ASM #16703 - Errors issuing Marine Products over areas under a Watch
...
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 7027ff533991251f64f2e5a0deb31e2945cdde5f
2014-08-20 14:13:32 +00:00
Steve Harris
0d6d3bd7f5
Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
...
Former-commit-id: 8f436bd859a52374fe5788102465a6a20355fda2
2014-08-19 12:38:53 -05:00
Brian.Dyke
ef9ddd0f98
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8
2014-08-18 13:17:13 -04:00
Brian.Dyke
9a212410b5
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 5c9880c3179bf376798bb5658aec3666bddd7d3e
2014-08-18 11:47:38 -04:00
Brian.Dyke
0bdacc25f6
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee
2014-08-18 10:20:49 -04:00
Melissa Porricel
67e44f145a
ASM #15699 - Fix Grib decoder error
...
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511
Former-commit-id: e8c156d166cedc1553f9ffd8867633651443872d
2014-08-15 13:41:53 -04:00
Brian.Dyke
8b1b457310
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea
2014-08-15 11:52:35 -04:00
Michael Gamazaychikov
9897417235
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
...
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: 126ec43423a864df597bd6dd745671ee0bf4fbfb
2014-08-15 11:03:23 -04:00
Nate Jensen
5bcddf1af1
Issue #3524 ensure apache httpclient always sends credentials with https
...
requests
Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c
Former-commit-id: 843a3b51f2fd90275149d0d814f280ed64247a2c
2014-08-15 09:15:11 -05:00
Steve Harris
1839d53d2c
Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
...
Former-commit-id: c5d804b092e56082337b80f717c6b2f3307fd9be
2014-08-13 14:50:49 -05:00
Ron Anderson
10a5053981
Issue #3517 Improved iscMosaic memory utilization and error handling when unzipping input file.
...
Change-Id: Idcce2dd53e39a8b483c2d5e244d4ec27bce94489
Former-commit-id: 36d33879425d32b4ff7de617d511d7a2c51b6a4e
2014-08-13 09:03:48 -05:00
Brian.Dyke
59183249ed
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 84fc55492f7eccf55d3bf8e7e3227c882286a8fb
2014-08-12 13:24:35 -04:00
Richard Peter
a9f8b72b6f
Issue #3458 Update ldm-6.11.5 queue size
...
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: c717d54c05cdae71b050eeee6afb06e6c71753a8
2014-08-11 11:54:59 -05:00
Brian.Dyke
d5177787c6
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 6c54705000e153a9c17465631149a26aaf5f8c67
2014-08-08 11:31:24 -04:00
Bryan Kowal
a9b4b4124a
Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
...
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.
Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903
Former-commit-id: d11649deb78aa356f27a22f33b38f7238513576c
2014-08-07 16:27:46 -05:00
Richard Peter
477119b739
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: e537db61848adeea0cef18e6a769597d746d6620
2014-08-07 14:01:54 -05:00
Richard Peter
cefae5e9bd
Merge "Issue #3493 Grouped common VTECs together" into omaha_14.2.2
...
Former-commit-id: 90a8191245d599077ea7d42de2ee80f074a7397a
2014-08-07 09:21:55 -05:00
Jonathan Sanchez
0302efdc77
Issue #3493 Grouped common VTECs together
...
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9
Former-commit-id: 47de8da4cadd899ae9aa0ffe6c89a109491966bc
2014-08-06 17:40:44 -05:00
