David Lovely
|
91a9bf9a54
|
Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4
Former-commit-id: 4b526a8813 [formerly d71e91a297] [formerly 260a818778] [formerly 260a818778 [formerly 56c3135aef]] [formerly 4b526a8813 [formerly d71e91a297] [formerly 260a818778] [formerly 260a818778 [formerly 56c3135aef]] [formerly 25f32b4c70 [formerly 260a818778 [formerly 56c3135aef] [formerly 25f32b4c70 [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]]]]
Former-commit-id: 25f32b4c70
Former-commit-id: e2261d9a29 [formerly 7782f738b9] [formerly d282d70d60] [formerly f0f2d35d2987b928ae659c430920a44e67e5fc26 [formerly fb0588046442bda24401b075821a17c3dc4f20a1] [formerly d282d70d60 [formerly ca03110763]]]
Former-commit-id: 7dcf3edaa02a3d652c3a94ad26a44988406fbbf0 [formerly 21decff89559ef10af1d1397315f20a28233e434] [formerly d6913e3259 [formerly 7322783d3f]]
Former-commit-id: d6913e3259
Former-commit-id: afcd1dd5b6
|
2015-02-12 09:16:30 -06:00 |
|
Juliya Dynina
|
0eae3f7b99
|
Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
Former-commit-id: f327c68a8e [formerly 0858e5a32c] [formerly 92d2d08451] [formerly 92d2d08451 [formerly ea11991a31]] [formerly f327c68a8e [formerly 0858e5a32c] [formerly 92d2d08451] [formerly 92d2d08451 [formerly ea11991a31]] [formerly 39e3497493 [formerly 92d2d08451 [formerly ea11991a31] [formerly 39e3497493 [formerly 346fc7563a680155c286bcbbcdaea25ec12b30fc]]]]]
Former-commit-id: 39e3497493
Former-commit-id: 69a7bf7124 [formerly 0e43b7d9d6] [formerly 983ef5cfbc] [formerly 9c97030b7c63e465b9e549e11325983f1e5e8ccc [formerly f11bfaa861f4d77f3c36754b140092cb2de3aaa7] [formerly 983ef5cfbc [formerly 02f0a44ab7]]]
Former-commit-id: cb701968a5b630698880a0fa3aad76da61b13575 [formerly c7819cc6cfc2f0acc01b6e9a95712c7059e2c2d8] [formerly 1959b0f855 [formerly 3fdbb2e68f]]
Former-commit-id: 1959b0f855
Former-commit-id: fda10c84dc
|
2015-02-12 09:20:27 -05:00 |
|
Ana Rivera
|
eb276e6fa0
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: ab619b7a3e [formerly 46215020b2] [formerly 461db8a395] [formerly 461db8a395 [formerly 420132b396]] [formerly ab619b7a3e [formerly 46215020b2] [formerly 461db8a395] [formerly 461db8a395 [formerly 420132b396]] [formerly 6191c93a9c [formerly 461db8a395 [formerly 420132b396] [formerly 6191c93a9c [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 85eec5c125 [formerly 163822ed83] [formerly 726045354b] [formerly 58284ef589c3297a9aec90150e783567ec92fc2c [formerly 828f01ac20d6f6b8cfe06c00f5261d19e5ae4286] [formerly 726045354b [formerly d8b54a59cf]]]
Former-commit-id: c949f12efeddeab90d0cc17009929f1aca3b0df5 [formerly 10f7d308dfa2905bfc05ed43017ea87858618d14] [formerly cb4300775b [formerly 85de48c8bf]]
Former-commit-id: cb4300775b
Former-commit-id: f94b97d128
|
2015-02-11 22:00:40 +00:00 |
|
Steve Harris
|
9440f8f584
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly 9311e6f440 [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]]]
Former-commit-id: 9311e6f440
Former-commit-id: 8711ed280b [formerly f59cef1b7a] [formerly 300e3e50fe] [formerly cbf9f55c4e59cc5798a167b90d3f1418dfc870bd [formerly 9b94ac3d16cf083d4502b712efe3cac0bbc0889c] [formerly 300e3e50fe [formerly 6a2d5ec16d]]]
Former-commit-id: 0d71d4b865ca71f2864a593baff2a96eda233489 [formerly 28adc946fa3fbd5f3f87e0fa9e9c02ac79c68d1b] [formerly f2f6d56366 [formerly 07475d998f]]
Former-commit-id: f2f6d56366
Former-commit-id: 7718c17e3d
|
2015-02-11 15:53:38 -06:00 |
|
Fay.Liang
|
c005339aa7
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 10cb2226f5 [formerly a0dc16d150] [formerly 4f75f6d15e] [formerly 4f75f6d15e [formerly 5ed7f62638]] [formerly 10cb2226f5 [formerly a0dc16d150] [formerly 4f75f6d15e] [formerly 4f75f6d15e [formerly 5ed7f62638]] [formerly eef951faea [formerly 4f75f6d15e [formerly 5ed7f62638] [formerly eef951faea [formerly 3905161a55f66efb33b1fe4bc016545b367e88c1]]]]]
Former-commit-id: eef951faea
Former-commit-id: 34531010e0 [formerly 882c2a990e] [formerly cea66a5add] [formerly 65b64fe4472ec4ed7b8679718753fc55d5f17118 [formerly 07d175fdc3ad08f5194833ce24139ca1f76e6166] [formerly cea66a5add [formerly c8538cded1]]]
Former-commit-id: e8325b0f9628223c949285c4639357c651299f0e [formerly 2eefaa0f322d04065e7f1a2fad28dcbf17d89674] [formerly dd338a5111 [formerly 788f327e6a]]
Former-commit-id: dd338a5111
Former-commit-id: 2bdcc21b94
|
2015-02-11 15:36:25 -05:00 |
|
Fay.Liang
|
b221fb2e77
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1aec809dcc [formerly 8a38eb3a97] [formerly 8d4bab98d5] [formerly 8d4bab98d5 [formerly 30859f6ee6]] [formerly 1aec809dcc [formerly 8a38eb3a97] [formerly 8d4bab98d5] [formerly 8d4bab98d5 [formerly 30859f6ee6]] [formerly 1208dbde06 [formerly 8d4bab98d5 [formerly 30859f6ee6] [formerly 1208dbde06 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]]]
Former-commit-id: 1208dbde06
Former-commit-id: e9edd5164e [formerly 78101fed22] [formerly c8b9377e84] [formerly b744d65edd9b6689567029d50a4bb5efb1942b7f [formerly fe3c9f2d6f1216e7a04c3787ad7cd2442abe36cb] [formerly c8b9377e84 [formerly 10c325518c]]]
Former-commit-id: f8a9426038aff2c3b13886775bab336cbdffb9c3 [formerly 2c9d0fc8e7d57b336fb7a1d64dd163b3f020d1a0] [formerly 9f124dc2e5 [formerly 9f2f5af448]]
Former-commit-id: 9f124dc2e5
Former-commit-id: 29c9534a5e
|
2015-02-11 15:36:05 -05:00 |
|
Jason Burks
|
64f59e5ce4
|
VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered.
Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412
Change-Id: Ie3554842b9f029dd62ff73f5edc928bc03e012e4
Former-commit-id: 5feb324011 [formerly b729c8dac9] [formerly c28f2e9aed] [formerly c28f2e9aed [formerly 0163ec2871]] [formerly 5feb324011 [formerly b729c8dac9] [formerly c28f2e9aed] [formerly c28f2e9aed [formerly 0163ec2871]] [formerly 9b0f630436 [formerly c28f2e9aed [formerly 0163ec2871] [formerly 9b0f630436 [formerly 2ca313195e2e610d4a198884f45dde37ebecfbc6]]]]]
Former-commit-id: 9b0f630436
Former-commit-id: bc40ac2db6 [formerly ab74cf5afc] [formerly 526bae6daf] [formerly 426fd59dcc409b6d9bbb6f61c4fa0f68912dd3fd [formerly 401d5d6f47b5f0c3a6c78f106a1f30f94ce28dbe] [formerly 526bae6daf [formerly e33ed09969]]]
Former-commit-id: b839dd6d97963aaa3073f7a114ea0559882f18f1 [formerly dfecf3c15666e10f475b44eadc6304b5ce78f8f8] [formerly b521b1d445 [formerly 8fe81f8959]]
Former-commit-id: b521b1d445
Former-commit-id: f4dda33ce0
|
2015-02-11 20:06:54 +00:00 |
|
Shawn.Hooper
|
56ca9ebd84
|
ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: f42c137579 [formerly 77ae8677e4] [formerly a6a840f3c8] [formerly a6a840f3c8 [formerly 0ba143cc43]] [formerly f42c137579 [formerly 77ae8677e4] [formerly a6a840f3c8] [formerly a6a840f3c8 [formerly 0ba143cc43]] [formerly 3c3b69809d [formerly a6a840f3c8 [formerly 0ba143cc43] [formerly 3c3b69809d [formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]]]]
Former-commit-id: 3c3b69809d
Former-commit-id: 779426f9aa [formerly ad9630134e] [formerly 91cbf5e2da] [formerly db670d6fcd6098d0a5ac1aa03e2f0ac982ef2e60 [formerly e85c832fb1634edb90d5121038f2ab2a50a31b76] [formerly 91cbf5e2da [formerly 41ebbc98d4]]]
Former-commit-id: 19dd51afa94e9abaa25f3a498772b9fcd47d4090 [formerly 0794da6025723d3e5c15568bfbd663cac45eba12] [formerly 89ab24bc32 [formerly 97de46bbb8]]
Former-commit-id: 89ab24bc32
Former-commit-id: b2ac91adb7
|
2015-02-11 13:55:20 -05:00 |
|
Shawn.Hooper
|
cbd2a1ca8a
|
ASM #16804 - Check in the required library files
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: 4fb2cc4a75 [formerly 9f7f129edb] [formerly 8351eb7bdf] [formerly 8351eb7bdf [formerly 6573bd2672]] [formerly 4fb2cc4a75 [formerly 9f7f129edb] [formerly 8351eb7bdf] [formerly 8351eb7bdf [formerly 6573bd2672]] [formerly ca8b043aed [formerly 8351eb7bdf [formerly 6573bd2672] [formerly ca8b043aed [formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]]]]]
Former-commit-id: ca8b043aed
Former-commit-id: f69c1366e2 [formerly b500ce7bbd] [formerly 065df6c8d6] [formerly c20178711569724b9d46bb86c6fc4f96e0147eaf [formerly 2fc00ddf720a78f6c9fe0ad4d1939fd5ca12ef78] [formerly 065df6c8d6 [formerly 1dc0ff9b6d]]]
Former-commit-id: cb39329555165b7d681dc86198cd24ba9817af57 [formerly e238f488512663b89cc375ed2ce3307025a03e2d] [formerly 0b748e6638 [formerly 0b183167df]]
Former-commit-id: 0b748e6638
Former-commit-id: 2ebde7e2d3
|
2015-02-11 12:40:33 -05:00 |
|
Steve Harris
|
837271c28c
|
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: c437ec08df [formerly 162f4871bf] [formerly 3f8008fc9f] [formerly 3f8008fc9f [formerly 62d29fefb4]] [formerly c437ec08df [formerly 162f4871bf] [formerly 3f8008fc9f] [formerly 3f8008fc9f [formerly 62d29fefb4]] [formerly a5da551a5d [formerly 3f8008fc9f [formerly 62d29fefb4] [formerly a5da551a5d [formerly 45e09e8f848d85ae45205b655074bba8342c9156]]]]]
Former-commit-id: a5da551a5d
Former-commit-id: bd3107ed26 [formerly 00cb95d51c] [formerly 5f4b78fd53] [formerly d6c74424da0c67229d966e75c85672597cb079c0 [formerly 29b0f1ccf454a14cb2d69120b366840d95677bf3] [formerly 5f4b78fd53 [formerly dc372b03d8]]]
Former-commit-id: 99d43d86da28188cae59c4293a11e0b945af8f4d [formerly c15c14b11b7177b7338436b44cb2327a2d7f743c] [formerly 2139ef4dbf [formerly 002c2ab43f]]
Former-commit-id: 2139ef4dbf
Former-commit-id: 44a97b4a97
|
2015-02-11 10:58:07 -06:00 |
|
Fay.Liang
|
5ec467db92
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 40ffd5eb7c [formerly 0ecd208056] [formerly 5c320554c0] [formerly 5c320554c0 [formerly a2a4551eae]] [formerly 40ffd5eb7c [formerly 0ecd208056] [formerly 5c320554c0] [formerly 5c320554c0 [formerly a2a4551eae]] [formerly 7d18af7172 [formerly 5c320554c0 [formerly a2a4551eae] [formerly 7d18af7172 [formerly 0c3fe94f92b6f43d8ae7d506c5c84915500a803c]]]]]
Former-commit-id: 7d18af7172
Former-commit-id: 6726141e49 [formerly ac0baf242c] [formerly e077b8be51] [formerly 486823f65735761b5bfcc05c7a128d2d91030909 [formerly e1be7817e7fea20a29ddd245653060fc6327d9e0] [formerly e077b8be51 [formerly 1d52c90d4c]]]
Former-commit-id: 45fe2aca79ac867d0def737ded6644343d605d76 [formerly 9b142d85d8b0dd170eb8c25ce3afb32f2ca8dc14] [formerly d0084754e7 [formerly 38d28f27fc]]
Former-commit-id: d0084754e7
Former-commit-id: bb6a4287a0
|
2015-02-11 10:45:04 -05:00 |
|
David Friedman
|
8e4f9ee497
|
ASM #17092 - Add cronOTRs.xml to radar NDM files
Change-Id: I46bf0728607737509ad97f6d2ed1803b3b10eeff
Former-commit-id: eebe8a13bc [formerly a8b7c34e09] [formerly 6db744c3cc] [formerly 6db744c3cc [formerly c6c9209f84]] [formerly eebe8a13bc [formerly a8b7c34e09] [formerly 6db744c3cc] [formerly 6db744c3cc [formerly c6c9209f84]] [formerly 562582f056 [formerly 6db744c3cc [formerly c6c9209f84] [formerly 562582f056 [formerly fc9eb096ce16005be0a80eff3b4728f279f75cf5]]]]]
Former-commit-id: 562582f056
Former-commit-id: 0f0c4b6b50 [formerly eed563da1d] [formerly 298a9cd43f] [formerly 4d8b7bd2cbc2a3f21513494061c9372bce0a8b0b [formerly 00cf71590f4f7c6696aa132bc00a495c06810444] [formerly 298a9cd43f [formerly 02c1658af2]]]
Former-commit-id: 98d89a90a75167f9630eb39c91d5b04b0446060e [formerly cda6ba8d0bf301575c11fcbbedbfd690ab40ed4b] [formerly db8a119ca1 [formerly aa0746f502]]
Former-commit-id: db8a119ca1
Former-commit-id: 793a44338f
|
2015-02-11 15:10:34 +00:00 |
|
Joshua Watson
|
501d9dc6f1
|
VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51
Former-commit-id: 36e20c8460 [formerly 00243dfdfc] [formerly 786721c6e8] [formerly 786721c6e8 [formerly 56627a9012]] [formerly 36e20c8460 [formerly 00243dfdfc] [formerly 786721c6e8] [formerly 786721c6e8 [formerly 56627a9012]] [formerly f612e85eed [formerly 786721c6e8 [formerly 56627a9012] [formerly f612e85eed [formerly c570ea9f982665f3cb560c665cea6357c11841ce]]]]]
Former-commit-id: f612e85eed
Former-commit-id: 9f3e723595 [formerly 8351fca04e] [formerly 17587be0a5] [formerly 27fcef4da82348e4e3037a54dce12767caa3f072 [formerly fa27ac8aba23146bd4b56fae27e6d8f738bbcae3] [formerly 17587be0a5 [formerly 6ea886b4cf]]]
Former-commit-id: e69d04d591e3140a199b545f18e6b9f8c4e6ca45 [formerly c3fba4d985417a6b7a91d8e89ba38de2d70ff344] [formerly 672e2deebe [formerly 607003fe11]]
Former-commit-id: bfbebf0191b1e450df1579ac4d92ed7c31da4f5e [formerly 672e2deebe]
Former-commit-id: 2f7959951a
|
2015-02-11 09:04:44 -05:00 |
|
Juliya Dynina
|
adda41f876
|
Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
Former-commit-id: 00eedef9f8 [formerly 9a5e754fd5] [formerly 43b453b136] [formerly 43b453b136 [formerly a2da3621ee]] [formerly 00eedef9f8 [formerly 9a5e754fd5] [formerly 43b453b136] [formerly 43b453b136 [formerly a2da3621ee]] [formerly 5ae6e8149e [formerly 43b453b136 [formerly a2da3621ee] [formerly 5ae6e8149e [formerly fa16cbd1cf7c92545d22b39c1bca597a0959c98c]]]]]
Former-commit-id: 5ae6e8149e
Former-commit-id: 61115807d6 [formerly 5fc2a8237a] [formerly a7fe54d8e5] [formerly d4a0e1c710426123bc756f5e20792f7ba6e0abc9 [formerly 1b3d82e87edfb81e6f21b2b76abd22321ce97a04] [formerly a7fe54d8e5 [formerly 62d5a51b81]]]
Former-commit-id: 31078fb130227732aa78e17c9c0f832fe22e067c [formerly 6afc8d44c6d83f7a98906348cfbcf8c12dccfc41] [formerly 3384329b96 [formerly 41059afb7f]]
Former-commit-id: 3384329b96
Former-commit-id: c7cfa332b9
|
2015-02-10 15:45:27 -05:00 |
|
Michael Gamazaychikov
|
76fe15a71e
|
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61
Former-commit-id: 8789b1485c [formerly 563e176546] [formerly 4a58408889] [formerly 4a58408889 [formerly ea046bedd3]] [formerly 8789b1485c [formerly 563e176546] [formerly 4a58408889] [formerly 4a58408889 [formerly ea046bedd3]] [formerly 9ffad49fa0 [formerly 4a58408889 [formerly ea046bedd3] [formerly 9ffad49fa0 [formerly 20efa852dcc64c80890abed6b2882a205b37cf43]]]]]
Former-commit-id: 9ffad49fa0
Former-commit-id: c8e23efa31 [formerly 0655e8693b] [formerly 44fc2719c8] [formerly f1918ac21997eb277bee58a5e11b77bb7e572e49 [formerly 9f7a1e3f05529287e4b0f27eed672cdf06d3ce6c] [formerly 44fc2719c8 [formerly b490bf66ea]]]
Former-commit-id: c77441104b62f6915f18aceb17dc2805e3582940 [formerly 5dcb4fa8654f74a434108579e2add50d539fdc3a] [formerly 5fa796f77e [formerly 5d7f55047e]]
Former-commit-id: 5fa796f77e
Former-commit-id: cb03ed974f
|
2015-02-10 15:21:32 -05:00 |
|
Michael Gamazaychikov
|
1a9e62c043
|
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: 93b1c7fabc [formerly 9aaeca7d9d] [formerly 9836b17e5e] [formerly 9836b17e5e [formerly cecc02d5b1]] [formerly 93b1c7fabc [formerly 9aaeca7d9d] [formerly 9836b17e5e] [formerly 9836b17e5e [formerly cecc02d5b1]] [formerly 796871f02f [formerly 9836b17e5e [formerly cecc02d5b1] [formerly 796871f02f [formerly e4444751f61adccf1cb62adf0f6cb1abc4ab6384]]]]]
Former-commit-id: 796871f02f
Former-commit-id: 0871865fcc [formerly e353840b02] [formerly ef3a3a7cf8] [formerly b0c7c427f4fa892f5e435849ed7d9cad85bfd6e9 [formerly 2a6494e353ec11ed60092283e77d8d6d7764c37b] [formerly ef3a3a7cf8 [formerly 2ad0f94f01]]]
Former-commit-id: 4a741f99e39fa483392e7ed06167435451485dc2 [formerly 4dde8583f6e894b91ea293e87a85626590a72860] [formerly bc0fde99b2 [formerly c1292536f8]]
Former-commit-id: bc0fde99b2
Former-commit-id: 1aad727f94
|
2015-02-10 10:35:32 -05:00 |
|
Ana Rivera
|
26c990ecae
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: 95d8c5fd0e [formerly c2975ce69f] [formerly 631d700cf9] [formerly 631d700cf9 [formerly bdb0e3aacb]] [formerly 95d8c5fd0e [formerly c2975ce69f] [formerly 631d700cf9] [formerly 631d700cf9 [formerly bdb0e3aacb]] [formerly c2f02ff4b2 [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: c5d99cfcf0 [formerly c1af0b6eff] [formerly e6ea29b193] [formerly 5b76b7a7fa2e610065af32e550930ada4a9ea69a [formerly 7b786ee51c59815f6326886edd8cc2e8dd6f322a] [formerly e6ea29b193 [formerly 0bab05a20b]]]
Former-commit-id: d0da70cadbaa0c547ccb171b0eea2057bc6ba244 [formerly 6c5baed68bc69c3da51b219494643cba2531b474] [formerly 7585c6e288 [formerly 3eb45fd8e1]]
Former-commit-id: 7585c6e288
Former-commit-id: 16cb817e04
|
2015-02-10 14:41:19 +00:00 |
|
Fay.Liang
|
99fa038404
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 43c7161dcf [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]]]
Former-commit-id: 43c7161dcf
Former-commit-id: bd48ef892c [formerly ee6acc8fdd] [formerly 149102ec85] [formerly 583b51e7de21ae85d3bb60f293ea526038265229 [formerly 8b80e6a5ae948ea73931e17354298170ec9d226f] [formerly 149102ec85 [formerly 0b98fc8be6]]]
Former-commit-id: 1ebc4c5e9d2abcfe752452321aa4e29a59294579 [formerly 257ec8e3caf9807783d7f6b047aaa84560966ae3] [formerly 31607db1e1 [formerly 2d5858f8f0]]
Former-commit-id: e971de0fa7c7c16c8490a2e51f3ac9955601eff0 [formerly 31607db1e1]
Former-commit-id: 0b0f41fa37
|
2015-02-09 17:19:41 -05:00 |
|
Greg Armendariz
|
0560da03d0
|
Omaha #3299 - Update buid.xml to work with nightly build and development workstation
Former-commit-id: 4dad075066 [formerly b99479a3c6] [formerly c8d4fb79dd] [formerly c8d4fb79dd [formerly ca6440c80e]] [formerly 4dad075066 [formerly b99479a3c6] [formerly c8d4fb79dd] [formerly c8d4fb79dd [formerly ca6440c80e]] [formerly 5685c69da3 [formerly c8d4fb79dd [formerly ca6440c80e] [formerly 5685c69da3 [formerly ab3ed9118dfd90ea929e450d991d882312f4a520]]]]]
Former-commit-id: 5685c69da3
Former-commit-id: 0f7ef3c394 [formerly 875c02fa4c] [formerly 3db1e79370] [formerly 9e68b6ac6a804c92f170f2e14d854d0bf7fc6e7c [formerly a59f7ca5910aa3f7ddea1d7d56a072e955d24faa] [formerly 3db1e79370 [formerly 2161f229e2]]]
Former-commit-id: 0abc4f59de123a00983e8db827790afa93f976cd [formerly 88135dfbc67fb24212d4274bac3e9dcf8316aa88] [formerly e753638fcb [formerly 04bcd53329]]
Former-commit-id: e753638fcb
Former-commit-id: b9fb53a25f
|
2015-02-09 14:57:22 -06:00 |
|
Greg Armendariz
|
fbf716309e
|
Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
Former-commit-id: 186057e420 [formerly 8815b6bf9d] [formerly a1ee800641] [formerly a1ee800641 [formerly 40e2f812cc]] [formerly 186057e420 [formerly 8815b6bf9d] [formerly a1ee800641] [formerly a1ee800641 [formerly 40e2f812cc]] [formerly 3b596f12d8 [formerly a1ee800641 [formerly 40e2f812cc] [formerly 3b596f12d8 [formerly da49b73121818f3022f71deee8a2a57230b2a227]]]]]
Former-commit-id: 3b596f12d8
Former-commit-id: 7d69e0cfc5 [formerly 3f0f3295de] [formerly a2cd0b9879] [formerly 89bc74c332b33a6a4c2b03a280ddedefaa3087d6 [formerly 0872c4a3ade958d97d613d8278ea545cdb324a0d] [formerly a2cd0b9879 [formerly 9d07126719]]]
Former-commit-id: cf140fccb8de14eea36afe69ad0f9177413b517f [formerly 2c37967af8ebb2636833cfffff8aac790b1c5132] [formerly 97cc17408b [formerly 573b3d77db]]
Former-commit-id: 97cc17408b
Former-commit-id: 6bbeb5802d
|
2015-02-09 10:09:20 -06:00 |
|
Nate Jensen
|
d57818e9b6
|
Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
Former-commit-id: 4fdc2d2fe3 [formerly 9fe563bb9e] [formerly 66c3ef37ca] [formerly 66c3ef37ca [formerly 35295b401c]] [formerly 4fdc2d2fe3 [formerly 9fe563bb9e] [formerly 66c3ef37ca] [formerly 66c3ef37ca [formerly 35295b401c]] [formerly 2bd03ecec0 [formerly 66c3ef37ca [formerly 35295b401c] [formerly 2bd03ecec0 [formerly 24849a362531a27a789ef3ea512bed87d7159af8]]]]]
Former-commit-id: 2bd03ecec0
Former-commit-id: 180a647ba8 [formerly abe0569b09] [formerly a8ae15a20c] [formerly 445a489c58c8a84b84a5fb211a9def5b5bb2353d [formerly 2663fa052609a873270b486a92c9ae4d861f26e8] [formerly a8ae15a20c [formerly 771ff3f4c8]]]
Former-commit-id: fa82399e91b30681373012031b8729fff0088b54 [formerly 58ddebe9045522b0302e375e24f20c2ce78e3b1c] [formerly 431a1a0ed8 [formerly da95c68b42]]
Former-commit-id: 431a1a0ed8
Former-commit-id: 742ef559f8
|
2015-02-09 09:19:45 -06:00 |
|
Joshua Watson
|
963a39c002
|
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: 9eaf0653cb [formerly 9f53a8e0b6] [formerly cb6420914f] [formerly cb6420914f [formerly 05c119663f]] [formerly 9eaf0653cb [formerly 9f53a8e0b6] [formerly cb6420914f] [formerly cb6420914f [formerly 05c119663f]] [formerly f6cf02c893 [formerly cb6420914f [formerly 05c119663f] [formerly f6cf02c893 [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]]]]
Former-commit-id: f6cf02c893
Former-commit-id: 50f3d44f4a [formerly 5412ea207e] [formerly 7235e8444e] [formerly 1158587c100e98ab8e55a5b2be360fa0009ad020 [formerly b39651bb074950ce72a6e85ccb569ec6ce37e753] [formerly 7235e8444e [formerly 5a136bb86b]]]
Former-commit-id: af0f0a8b1b983b28857a698f6768aff29bfda762 [formerly d6460e16a44b51d90f56af7997316b48560dc697] [formerly fa057c8063 [formerly 4827934718]]
Former-commit-id: fa057c8063
Former-commit-id: 1cbf7e1fdf
|
2015-02-06 16:06:37 -05:00 |
|
Greg Armendariz
|
7db73d7d73
|
Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly af72fd3775 [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]]]
Former-commit-id: af72fd3775
Former-commit-id: 1b6d86f91c [formerly 2569f921ef] [formerly d27e4b416e] [formerly fe6bf566078b7303a776f60647517f7f87674768 [formerly 63f866aa8ca54a568af639578ac0d35936abe337] [formerly d27e4b416e [formerly 483ed63a57]]]
Former-commit-id: 3040a8c5d4b266021959cfbeb98f081bfe1230a9 [formerly b19bd39f67e51dfc93fc9bc3ee5e0807b059f4de] [formerly 2f8b5d32eb [formerly 3463c00928]]
Former-commit-id: 2f8b5d32eb
Former-commit-id: 49575f9b1a
|
2015-02-06 11:37:47 -06:00 |
|
Greg Armendariz
|
e8460a563d
|
Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: f44855379a [formerly 55d711bd50] [formerly 61bd37895f] [formerly 61bd37895f [formerly 2a554c5498]] [formerly f44855379a [formerly 55d711bd50] [formerly 61bd37895f] [formerly 61bd37895f [formerly 2a554c5498]] [formerly d3658d0f28 [formerly 61bd37895f [formerly 2a554c5498] [formerly d3658d0f28 [formerly 97c6bded155fc58e59beecdb33016e5286e622c1]]]]]
Former-commit-id: d3658d0f28
Former-commit-id: fd768a1509 [formerly 86366081d8] [formerly 13bb984db1] [formerly d867a2b9f08010f9a0b8f34bbd877b9eda71e9d9 [formerly f52a2ab3d714f3b9792cd7316dff7c2ad4a8837a] [formerly 13bb984db1 [formerly 7a2ab677d1]]]
Former-commit-id: eb4226321afe367278c51fa871401024267ef345 [formerly c9b35a8a928a1ffa6d17583da33082fbcbabd019] [formerly 6a33eca154 [formerly 9b7823cf31]]
Former-commit-id: 6a33eca154
Former-commit-id: 1653832277
|
2015-02-06 11:20:43 -06:00 |
|
Nate Jensen
|
4f86ba0587
|
Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: 13284bb63c [formerly baafc97b60] [formerly ac02fc3a81] [formerly ac02fc3a81 [formerly b42dec0e4a]] [formerly 13284bb63c [formerly baafc97b60] [formerly ac02fc3a81] [formerly ac02fc3a81 [formerly b42dec0e4a]] [formerly ea273e14bf [formerly ac02fc3a81 [formerly b42dec0e4a] [formerly ea273e14bf [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]]]]
Former-commit-id: ea273e14bf
Former-commit-id: 46632f6afc [formerly f4c1282505] [formerly eea6f68b54] [formerly ed9db26a3c05bf9a63580621594064e276b25316 [formerly 123f4e2c2f11c8383e8614ada84d951c57722452] [formerly eea6f68b54 [formerly 2346be4023]]]
Former-commit-id: 3680956ab7682c59539fabbb3ac07ce1ee96c31c [formerly 4726ca5f93aa0bbf0c3c85ce2a747d57a2fefa45] [formerly f20fb4afa8 [formerly e4edba9ee7]]
Former-commit-id: f20fb4afa8
Former-commit-id: 523c65000f
|
2015-02-05 18:03:47 -06:00 |
|
David Friedman
|
cdfb0b8762
|
ASM #17066 - afoslookup entry for site KEY is missing
Change-Id: I8f2ac59c416a2a9f5f28fb72993c5947fb96c126
Former-commit-id: 89b6d8ceae [formerly 89bc130203] [formerly 7912200761] [formerly 7912200761 [formerly de9a5fd3b3]] [formerly 89b6d8ceae [formerly 89bc130203] [formerly 7912200761] [formerly 7912200761 [formerly de9a5fd3b3]] [formerly c1aec126c1 [formerly 7912200761 [formerly de9a5fd3b3] [formerly c1aec126c1 [formerly 49c3a36159f66eb35b70bb76f210b36b2c7140f9]]]]]
Former-commit-id: c1aec126c1
Former-commit-id: 8d9e0faac0 [formerly 6f8a52a1d2] [formerly 90f1d96309] [formerly 3d519950037bc9586c10d57ffce70ec1d42d684c [formerly 475d96f35b670493f7589b8e1824a532c7d600af] [formerly 90f1d96309 [formerly e4d93f33f0]]]
Former-commit-id: 46a09e3e7df6bc07f181c9fa1ec268b6bcfbe08b [formerly b202c6dedac62b0897f1c08936e4ec60c9783871] [formerly dd091f8122 [formerly 11e900c200]]
Former-commit-id: dd091f8122
Former-commit-id: 5c42f235c3
|
2015-02-05 16:21:48 +00:00 |
|
Richard Peter
|
3e2c02f30b
|
Merge "Omaha #4086 resurrect undead textws scripting code and make it work with TextDBQuery" into omaha_14.4.1
Former-commit-id: 6cdd7c0f9a [formerly e2be189c6a] [formerly e7ee620ccb] [formerly e7ee620ccb [formerly d9eb0d8b55]] [formerly 6cdd7c0f9a [formerly e2be189c6a] [formerly e7ee620ccb] [formerly e7ee620ccb [formerly d9eb0d8b55]] [formerly 948dce2527 [formerly e7ee620ccb [formerly d9eb0d8b55] [formerly 948dce2527 [formerly 3196b314c2f75424933163112742c3646a0529b4]]]]]
Former-commit-id: 948dce2527
Former-commit-id: b9018dd4e8 [formerly d568e9205a] [formerly bc0fabc8f4] [formerly ce7f15faa8bc10b157eae6a1b1d4ee331280cffb [formerly 79d88568557fb1cc54ce573c09dadf83f7cb9cc4] [formerly bc0fabc8f4 [formerly e0e70ca408]]]
Former-commit-id: 81f60978e82af11981fd2dbec0de70530d717a8e [formerly c292542b7bda79210961ec2aaa7c4d37e61911a3] [formerly 9646b3f0e6 [formerly 0a79ebe10e]]
Former-commit-id: 9adede54fbd1ce7733be09b9d33abb52505fca83 [formerly 9646b3f0e6]
Former-commit-id: a9b8e0e98c
|
2015-02-05 09:00:57 -06:00 |
|
Joshua Watson
|
4d618c3e6e
|
VLab Issue #5238 - serverConfig.py - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS, changed serverConfig.Vis to Vis on that same line. pqact.conf.template - fixed typo on line 223 FLE to FILE, line 286 missing a period in pattern; fixes #5238
Change-Id: Ia83e3576613683fa58a7631150d2d3132937a7b4
Former-commit-id: d22c711b14 [formerly 6488aceeae] [formerly 5d0dea9253] [formerly 5d0dea9253 [formerly aec617b1eb]] [formerly d22c711b14 [formerly 6488aceeae] [formerly 5d0dea9253] [formerly 5d0dea9253 [formerly aec617b1eb]] [formerly 65a568b79d [formerly 5d0dea9253 [formerly aec617b1eb] [formerly 65a568b79d [formerly 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111]]]]]
Former-commit-id: 65a568b79d
Former-commit-id: c023982106 [formerly 2639dc0d0b] [formerly 12a2f9eff1] [formerly 9b1e860cbda825bff095b77313d17ec190b47248 [formerly 86ad217dfd2c06f5f8ea823e4753bba4b31e8d0a] [formerly 12a2f9eff1 [formerly ac46876161]]]
Former-commit-id: 771219259e8e27e72f840239bee250861f7720fc [formerly b905c42849fd8cf9a80851652f9319c8a62ee267] [formerly 9b66935012 [formerly da106869b6]]
Former-commit-id: 9b66935012
Former-commit-id: 22edf12074
|
2015-02-05 09:26:20 -05:00 |
|
Ana Rivera
|
24e1bb37fd
|
Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: Iadb5e401012d3f34ebd1332cfa872c91270d2c72
Former-commit-id: 33548b570f [formerly 3610f8304b] [formerly e36429dcbd] [formerly e36429dcbd [formerly 2d5a46ab0c]] [formerly 33548b570f [formerly 3610f8304b] [formerly e36429dcbd] [formerly e36429dcbd [formerly 2d5a46ab0c]] [formerly be625ca07e [formerly e36429dcbd [formerly 2d5a46ab0c] [formerly be625ca07e [formerly 2a505d2ebd87b1a2e8f05f6d304debf48be9971c]]]]]
Former-commit-id: be625ca07e
Former-commit-id: 3bc4a5096e [formerly 3642df6314] [formerly 4f82ba7d74] [formerly 1664a13c5dfddbe3b547beffea79f31f521d7f64 [formerly 97137dc563aa5418f5826cfcd6ccb704e3667aac] [formerly 4f82ba7d74 [formerly 020d5604b4]]]
Former-commit-id: 4053eb51a20b8e3660c7c3e544cee31886b471f6 [formerly 3ab2f6c5be4ae2150bc7dd87e703e936a040ef68] [formerly c789373ed6 [formerly 6b5e542330]]
Former-commit-id: c789373ed6
Former-commit-id: eaae319a35
|
2015-02-05 14:17:31 +00:00 |
|
Nate Jensen
|
caba385a59
|
Omaha #4086 resurrect undead textws scripting code and make it work with
TextDBQuery
Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8
Former-commit-id: c6c8729f5e [formerly b09704e3bf] [formerly 49440898a8] [formerly 6d9dafc986b85cf771dddcb28e673bb6059d7cc9 [formerly 49440898a8 [formerly b6fe8b843e]]] [formerly c6c8729f5e [formerly b09704e3bf] [formerly 49440898a8] [formerly 6d9dafc986b85cf771dddcb28e673bb6059d7cc9 [formerly 49440898a8 [formerly b6fe8b843e]]] [formerly fa547ac3dd [formerly 49440898a8 [formerly b6fe8b843e] [formerly fa547ac3dd [formerly 9cdf82d433bd07289002c1f4df9f5242dce0de7e]]]]]
Former-commit-id: fa547ac3dd
Former-commit-id: cdeb280a79 [formerly 5ed4d5a73c] [formerly b25d5630fe] [formerly 308e3e0e87e937b05e54cecee67d8462e27ec4c5 [formerly e0b13c66f11f8050b623356faa459eb4b19cdeeb] [formerly b25d5630fe [formerly 99dc91dd0b]]]
Former-commit-id: a70ea14a2e0d26f4cc960d1571f0a40a5adce4ac [formerly 2e27b588b80cbdb3e34b1f8e46d6a31f4dca33c4] [formerly a9b62ff68d [formerly 0a8e498e9f]]
Former-commit-id: a9b62ff68d
Former-commit-id: f8cfb43604
|
2015-02-04 16:46:21 -06:00 |
|
Fay.Liang
|
18e10261cc
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 63c086eab2 [formerly 9d58b11efd] [formerly 81ebcaada8] [formerly 81ebcaada8 [formerly 551e3dfac0]] [formerly 63c086eab2 [formerly 9d58b11efd] [formerly 81ebcaada8] [formerly 81ebcaada8 [formerly 551e3dfac0]] [formerly 649426f4b3 [formerly 81ebcaada8 [formerly 551e3dfac0] [formerly 649426f4b3 [formerly 999467410f61f1874d5cf1e599fca9ce83ae4f70]]]]]
Former-commit-id: 649426f4b3
Former-commit-id: affbba99e7 [formerly 74f8c3a641] [formerly ec3fcbafec] [formerly 2089eeb330eaeba8f085a9c4776551d6eed1f650 [formerly 35eaa572930695d4d5cdfdd5c365fac9bf2cabc5] [formerly ec3fcbafec [formerly 454c8be23a]]]
Former-commit-id: 440399310f1c6b721d1ad60d2f962a9a324bc4ad [formerly bf1efe66fe3870faa98f20abd7817f44f3fa6870] [formerly 80e592746a [formerly 16c15a10f4]]
Former-commit-id: 80e592746a
Former-commit-id: a5adfcc5dc
|
2015-02-04 16:51:19 -05:00 |
|
Shawn.Hooper
|
5f9f597ff4
|
ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2
Former-commit-id: 2ecd35a10b [formerly 227b629a0b] [formerly f4cd41e2f6] [formerly f4cd41e2f6 [formerly a98b54a944]] [formerly 2ecd35a10b [formerly 227b629a0b] [formerly f4cd41e2f6] [formerly f4cd41e2f6 [formerly a98b54a944]] [formerly 915ddd6964 [formerly f4cd41e2f6 [formerly a98b54a944] [formerly 915ddd6964 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]]]]
Former-commit-id: 915ddd6964
Former-commit-id: c826fb28bb [formerly 76730a5aaf] [formerly b8b4e192fb] [formerly 1ca186df1c681824197ca474f1444b02d7f7e650 [formerly d38321f53fb9ffcbe232f9efbf2b9ddc646befec] [formerly b8b4e192fb [formerly ebe39a11ae]]]
Former-commit-id: b05fc89a9d071e21e585cf0322ac4b36bac1ff12 [formerly b716b127375acd0fe45a9c1508dda9308be2a38b] [formerly 910f220a38 [formerly e1e9c02dcd]]
Former-commit-id: b4ced5d33e96923abef1284e3eb3f42c4337305c [formerly 910f220a38]
Former-commit-id: f76034796e
|
2015-02-04 16:47:26 -05:00 |
|
Fay.Liang
|
7ac12abd4c
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7d8b93928c [formerly 252b2d75e6] [formerly af6ee33276] [formerly af6ee33276 [formerly 46911f1d37]] [formerly 7d8b93928c [formerly 252b2d75e6] [formerly af6ee33276] [formerly af6ee33276 [formerly 46911f1d37]] [formerly 9971e95e7b [formerly af6ee33276 [formerly 46911f1d37] [formerly 9971e95e7b [formerly a67e2eb6f8e0a7d3d5ccc6322adf69ca8d81a28c]]]]]
Former-commit-id: 9971e95e7b
Former-commit-id: 3e3062b3ba [formerly 55d9c42581] [formerly 673e878e96] [formerly 63ce079ffee566a880c7011dec5c127472e0426b [formerly 234dee024b0e7fc989bd05b381cf209986d5c4be] [formerly 673e878e96 [formerly 0989d899ff]]]
Former-commit-id: 3d4ad69e5b2ae1017d82b5d51e8dae6b6f99fd4d [formerly d25212b22153762a0100540bc2811e6cab410292] [formerly dce7317009 [formerly 17503933c9]]
Former-commit-id: dce7317009
Former-commit-id: 0919f0f72c
|
2015-02-04 16:22:50 -05:00 |
|
Fay.Liang
|
1f2e37a847
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 4b89ad6326 [formerly 5ed008279f] [formerly 091ebb1da5] [formerly 091ebb1da5 [formerly fa2ec69693]] [formerly 4b89ad6326 [formerly 5ed008279f] [formerly 091ebb1da5] [formerly 091ebb1da5 [formerly fa2ec69693]] [formerly 98fc313530 [formerly 091ebb1da5 [formerly fa2ec69693] [formerly 98fc313530 [formerly 85751935d73a6c64fd041c791ddb09f081831e20]]]]]
Former-commit-id: 98fc313530
Former-commit-id: e526f4327d [formerly abae7281ac] [formerly 629506683a] [formerly 8f795e331f74910668cf7a3fe76df868af8b3ed6 [formerly b3878237cc6436ee0990f64d49184dabbb672872] [formerly 629506683a [formerly ff0f4b4a13]]]
Former-commit-id: aa51d15cf8178377df23f14d1a2cc389b6df5cba [formerly 1655508baaf6193e489509189c9d55522937681d] [formerly f774d94942 [formerly 8e2e580624]]
Former-commit-id: f774d94942
Former-commit-id: f9199750f7
|
2015-02-04 16:20:31 -05:00 |
|
Slav Korolev
|
2952b4434f
|
Omaha #3841 - Fixed saving problem for distance and time.
Former-commit-id: 53ee684d6c [formerly 9b4c91d9ba] [formerly bfbe322c73] [formerly bfbe322c73 [formerly 15ae209055]] [formerly 53ee684d6c [formerly 9b4c91d9ba] [formerly bfbe322c73] [formerly bfbe322c73 [formerly 15ae209055]] [formerly b8be69c429 [formerly bfbe322c73 [formerly 15ae209055] [formerly b8be69c429 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]]]]
Former-commit-id: b8be69c429
Former-commit-id: 2c055dd1c6 [formerly 78b83789b5] [formerly d023dc9dd3] [formerly 47e86af6ba8a837f3db1a9a853d2aca617778767 [formerly 8d0d9614bbcc2e2dbf3b8696cd4a9bd77b5e6638] [formerly d023dc9dd3 [formerly 8ba4d73cff]]]
Former-commit-id: ff38f033c1012633a2671cb1a8029d0f7a8685cd [formerly 22db162379472613a29c9dc9fd7e4ac96b6532f0] [formerly 486bd8eb90 [formerly a79bc229d5]]
Former-commit-id: 486bd8eb90
Former-commit-id: 1af30ccbde
|
2015-02-04 15:49:49 -05:00 |
|
David Friedman
|
fc426abcda
|
ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8
Former-commit-id: 378a586bad [formerly fb304398b0] [formerly 8a31830def] [formerly 8a31830def [formerly beb5074ddd]] [formerly 378a586bad [formerly fb304398b0] [formerly 8a31830def] [formerly 8a31830def [formerly beb5074ddd]] [formerly d1b3f2a5f4 [formerly 8a31830def [formerly beb5074ddd] [formerly d1b3f2a5f4 [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b]]]]]
Former-commit-id: d1b3f2a5f4
Former-commit-id: 2da5c55f85 [formerly cd4dc0715b] [formerly bf3737595d] [formerly 184ea826dbc162000a1fe805e018b6bef2e50900 [formerly aa459809903ba41ea0a4d52f7b360174aefcfe2d] [formerly bf3737595d [formerly d6d2b52b3a]]]
Former-commit-id: f5dcf82213abe57a3ddb92fb7f7ecaf5226da729 [formerly a7ad94b873b5a43cc6c5f9aa54d59f551cd4d5d3] [formerly 6c7451a37d [formerly 455ac39e04]]
Former-commit-id: 6c7451a37d
Former-commit-id: a9f910dc87
|
2015-02-04 19:56:47 +00:00 |
|
Greg Armendariz
|
d4aa6d3722
|
Merge "Omaha #3839 - Add script to /awips2/edex/bin/" into omaha_14.4.1
Former-commit-id: 15300ac8c1 [formerly 99c6bb0582] [formerly c39decf0af] [formerly c39decf0af [formerly cc49405b55]] [formerly 15300ac8c1 [formerly 99c6bb0582] [formerly c39decf0af] [formerly c39decf0af [formerly cc49405b55]] [formerly 9adbeabfca [formerly c39decf0af [formerly cc49405b55] [formerly 9adbeabfca [formerly ad84dfc315b8a5af393dbcf358622c54830faea0]]]]]
Former-commit-id: 9adbeabfca
Former-commit-id: 3253e81eb5 [formerly 7eefe321b0] [formerly 63e1f2bead] [formerly db091455e88cabe72ed158a5024ce110b4226430 [formerly 8e1a41ace6ccdc98b8520e22988c897663312527] [formerly 63e1f2bead [formerly 0daeb043e9]]]
Former-commit-id: e0fb3c6825355c41c1a070fb60ee7afaafca1daf [formerly 81dc38a5a59c208c418d790ede2b47f8cd011253] [formerly 6a9cabee18 [formerly ab49a59cf0]]
Former-commit-id: 6a9cabee18
Former-commit-id: 4d145cf286
|
2015-02-04 12:16:32 -06:00 |
|
Matthew Howard
|
74569887df
|
Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
Former-commit-id: 6be2dc1f19 [formerly 6d90b07a36] [formerly b482802e1e] [formerly b482802e1e [formerly 4a46df6ed9]] [formerly 6be2dc1f19 [formerly 6d90b07a36] [formerly b482802e1e] [formerly b482802e1e [formerly 4a46df6ed9]] [formerly cfc9629774 [formerly b482802e1e [formerly 4a46df6ed9] [formerly cfc9629774 [formerly a68b74fd45f4da2dfe73085833432416380219f7]]]]]
Former-commit-id: cfc9629774
Former-commit-id: f898b2428e [formerly 4b6d0f990a] [formerly 2731ac39dc] [formerly 4e463223667ed944450252c7ce4d0c75c6f572bf [formerly 594a2148a9460bab3b227e6ac9f188f8278bf04d] [formerly 2731ac39dc [formerly 7e18ae7ff6]]]
Former-commit-id: e0accbd8cb75e5ed112f89aced6e80f0c71eb83a [formerly 0861b3d0fa244d50f6e6f88839e59d9f3ebba0bd] [formerly c0cce89287 [formerly b43e16d769]]
Former-commit-id: c0cce89287
Former-commit-id: af8319abce
|
2015-02-04 11:16:20 -05:00 |
|
Greg Armendariz
|
9d7476eb67
|
Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: 86c78dec1a [formerly d8eca1c90a] [formerly efbdfa504b] [formerly efbdfa504b [formerly 25cb96ec19]] [formerly 86c78dec1a [formerly d8eca1c90a] [formerly efbdfa504b] [formerly efbdfa504b [formerly 25cb96ec19]] [formerly bb8a61a996 [formerly efbdfa504b [formerly 25cb96ec19] [formerly bb8a61a996 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]]]
Former-commit-id: bb8a61a996
Former-commit-id: d04b701019 [formerly d8a5867989] [formerly c3b4d790a3] [formerly 731f162414c5d0954be66ee83e800f52e6cad604 [formerly 203e5232bfa641993a7e1096caa4b0ef2e4b3c3c] [formerly c3b4d790a3 [formerly d405e4bfe1]]]
Former-commit-id: 2f6f2a4a182f4d42fb4cb7b0da2d3ab81e44f4df [formerly a15a1e71e88b253a90d12a782b1761b2e7c40409] [formerly b0121df3bc [formerly 956a8fd092]]
Former-commit-id: b0121df3bc
Former-commit-id: 76bbe51da6
|
2015-02-04 09:59:06 -06:00 |
|
Rici.Yu
|
2ce48422b0
|
ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: a5c75bc7a1 [formerly 5ea106504c] [formerly 0a489fea9c] [formerly 0a489fea9c [formerly 5470139b42]] [formerly a5c75bc7a1 [formerly 5ea106504c] [formerly 0a489fea9c] [formerly 0a489fea9c [formerly 5470139b42]] [formerly 1188dab0f4 [formerly 0a489fea9c [formerly 5470139b42] [formerly 1188dab0f4 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]]]]
Former-commit-id: 1188dab0f4
Former-commit-id: 1d7080c90e [formerly ee698f53ad] [formerly e1762b3ae9] [formerly 6192a6082351be4a501ad206038596f68e732198 [formerly 6da28c19a36ade277d972747bb7dd288cf026ad0] [formerly e1762b3ae9 [formerly f41d5cffef]]]
Former-commit-id: 16a529f6c208c1deda8dae3ae6dafee45d64d068 [formerly b96c2b573732c2570ee542113a6fab3a4c4d6573] [formerly 520899992d [formerly ff0177a6dd]]
Former-commit-id: 520899992d
Former-commit-id: 3b7f5cda16
|
2015-02-04 10:23:30 -05:00 |
|
Steve Harris
|
47074351a4
|
Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7
Former-commit-id: 50468f63c5 [formerly dfa3bb1060] [formerly 8f2af8e359] [formerly 8f2af8e359 [formerly f428e16ebb]] [formerly 50468f63c5 [formerly dfa3bb1060] [formerly 8f2af8e359] [formerly 8f2af8e359 [formerly f428e16ebb]] [formerly 2468be4dd1 [formerly 8f2af8e359 [formerly f428e16ebb] [formerly 2468be4dd1 [formerly 88b43275725882327d4487733e3135489874de1f]]]]]
Former-commit-id: 2468be4dd1
Former-commit-id: 2765ea892d [formerly a6b5aba01e] [formerly 520023d6c2] [formerly 8a57ea4f46c13c84c003ac7e631f38c491e91309 [formerly 3c7a988d1488ecf6c544205f7af49cb89e43e4ab] [formerly 520023d6c2 [formerly 8a8e66a3e1]]]
Former-commit-id: d5fd77b4dfd03f311db78fec4344ec58212bccbb [formerly f1c803d98526694248910d47bb0c6f25f4f53214] [formerly d09bee3e06 [formerly 8513926d87]]
Former-commit-id: b716971c14208b73f81bb13288e2f412416384df [formerly d09bee3e06]
Former-commit-id: d0c9f2ae8b
|
2015-02-03 17:18:57 -06:00 |
|
Joshua Watson
|
e952035eb2
|
VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0
Former-commit-id: 97de4bcb26 [formerly 2ea15c4b05] [formerly 931a18418d] [formerly 931a18418d [formerly af60ca1232]] [formerly 97de4bcb26 [formerly 2ea15c4b05] [formerly 931a18418d] [formerly 931a18418d [formerly af60ca1232]] [formerly 4c574676d7 [formerly 931a18418d [formerly af60ca1232] [formerly 4c574676d7 [formerly b32bdbe92d1db52997c9e79ece82df19f91357f3]]]]]
Former-commit-id: 4c574676d7
Former-commit-id: 69a0ebb993 [formerly d9c1b23b9b] [formerly 641f08a259] [formerly 1900f3b4ac93c06d77b04b23850bdfca862abb81 [formerly 65c4b388e2d251467c8bc8756f8ea8118b95d36f] [formerly 641f08a259 [formerly 66a1965ce1]]]
Former-commit-id: fb123fc7f534440151d365858fc24875d9d8dc7c [formerly f21a50f2b4d27b6ba1f1d9e2ea28b69671b848ca] [formerly fef69b67e3 [formerly 42753b59ab]]
Former-commit-id: efcc2dc056497ff55fb7b12ab067022050c7f0e6 [formerly fef69b67e3]
Former-commit-id: 4e6b1586d7
|
2015-02-03 17:43:17 -05:00 |
|
Shawn.Hooper
|
fea486ce9e
|
Merge "ASM #16969 - Update jdk tarball with correct version" into asm_14.4.1
Former-commit-id: 23801311d3 [formerly 1fc9965ca6] [formerly 9bfe24f884] [formerly 9bfe24f884 [formerly e505183f64]] [formerly 23801311d3 [formerly 1fc9965ca6] [formerly 9bfe24f884] [formerly 9bfe24f884 [formerly e505183f64]] [formerly 0abe2e23a0 [formerly 9bfe24f884 [formerly e505183f64] [formerly 0abe2e23a0 [formerly 18ebaf6a58644c50d9ed41eda373f3c6d9259c32]]]]]
Former-commit-id: 0abe2e23a0
Former-commit-id: 2d28c98735 [formerly ba9f3bba73] [formerly 14ddda1157] [formerly 71b5b818abc156588677afaaac0cbe9b228ce942 [formerly 6688b3c650bf12f7c7608e3a99c7580098b241c5] [formerly 14ddda1157 [formerly d5536aaf6c]]]
Former-commit-id: 976c56f8cbd52dc05cce913ec393da6dda719724 [formerly e6949fb6640dad91e755e90ab06df81a0196c1da] [formerly 086eb170e5 [formerly 9d7318bc83]]
Former-commit-id: 086eb170e5
Former-commit-id: b79fcf9fff
|
2015-02-03 17:06:28 -05:00 |
|
Fay.Liang
|
6beb73adcb
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: b0553b2062 [formerly 1adbe5f79d] [formerly 3aa9f17455] [formerly 3aa9f17455 [formerly 07c742044d]] [formerly b0553b2062 [formerly 1adbe5f79d] [formerly 3aa9f17455] [formerly 3aa9f17455 [formerly 07c742044d]] [formerly de502a310b [formerly 3aa9f17455 [formerly 07c742044d] [formerly de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]]]]
Former-commit-id: de502a310b
Former-commit-id: 2c9c238c9f [formerly 99a4b44c8a] [formerly f075116f65] [formerly 9ce4f21d080f69c69f5392a41092e5d5a7ea33bc [formerly d231ab28435e2f65bc8ff6d93bb9fd5f679fa47a] [formerly f075116f65 [formerly 7517728c42]]]
Former-commit-id: 6218869c75e85384c05830544ecc394f2c8f8151 [formerly 5e6472d40bbea721fe507f096045f2af8c2cb055] [formerly 267fb768d9 [formerly a3c39c1a8d]]
Former-commit-id: 267fb768d9
Former-commit-id: 7f546a3e77
|
2015-02-03 16:04:56 -05:00 |
|
Greg Armendariz
|
a1e91286f6
|
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: 2e1c03f1b1 [formerly 7eda7b5786] [formerly bdcb5067d4] [formerly bdcb5067d4 [formerly e87f8c0c5f]] [formerly 2e1c03f1b1 [formerly 7eda7b5786] [formerly bdcb5067d4] [formerly bdcb5067d4 [formerly e87f8c0c5f]] [formerly e004e0881f [formerly bdcb5067d4 [formerly e87f8c0c5f] [formerly e004e0881f [formerly ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91]]]]]
Former-commit-id: e004e0881f
Former-commit-id: 5767eed53d [formerly 129860e79e] [formerly 24d9da8c2c] [formerly 52d6840ae54b857eb016fd96e4e2ce2fb3d3e389 [formerly 86897597623c877c359f50bded3e73aa21997fef] [formerly 24d9da8c2c [formerly 48afd5b062]]]
Former-commit-id: 39c4e7fdc08a7406d0474b1542fa57313c21833b [formerly 70b22005e259a1671675360f8b64a8293497db69] [formerly e09375ffce [formerly 86a6f08f80]]
Former-commit-id: e09375ffce
Former-commit-id: aff1854649
|
2015-02-03 11:35:26 -06:00 |
|
Steve Harris
|
7e5fb1f78e
|
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6
Former-commit-id: 2356f94a5e [formerly d0a1514ece] [formerly 80dae4bc15] [formerly 80dae4bc15 [formerly db185ed16c]] [formerly 2356f94a5e [formerly d0a1514ece] [formerly 80dae4bc15] [formerly 80dae4bc15 [formerly db185ed16c]] [formerly b684848820 [formerly 80dae4bc15 [formerly db185ed16c] [formerly b684848820 [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]]]]
Former-commit-id: b684848820
Former-commit-id: 6db70a3cd8 [formerly f2dd38f246] [formerly b971724d20] [formerly 0df6fe5139452df6c61597d5995613765d0e10bf [formerly abe5b26a9420a557ed9d91527aa7c8b4f60ad64c] [formerly b971724d20 [formerly 40f44c9e15]]]
Former-commit-id: 30cf0c999ffaf80e43806888a7261293ad2960e7 [formerly 4ab3047aced3d5bb43ac42d3f596598077be6e0a] [formerly 2a1c5cfc23 [formerly 9ffe8b7084]]
Former-commit-id: 2a1c5cfc23
Former-commit-id: b5dd031417
|
2015-02-03 11:24:39 -06:00 |
|
Fay.Liang
|
1c75e328f7
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: acadbd02f3 [formerly eafbc466a4] [formerly 5550322f62] [formerly 5550322f62 [formerly ae85ade54d]] [formerly acadbd02f3 [formerly eafbc466a4] [formerly 5550322f62] [formerly 5550322f62 [formerly ae85ade54d]] [formerly f1c34884a5 [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]]]
Former-commit-id: f1c34884a5
Former-commit-id: 21b45770c1 [formerly 3f1e57ac13] [formerly 7ac4ff3f48] [formerly 6029ed9ea44dbf797f7d48781b848dabd0cd4579 [formerly 87259344c87456b2e79b92767744947da2f8575a] [formerly 7ac4ff3f48 [formerly 82b3637598]]]
Former-commit-id: ed404cf009b91b011488f93eb41f6224182a664c [formerly 349eeb1f68c792e29ee19136353a5a6cbd392309] [formerly 7f3a53beaf [formerly 37f830c123]]
Former-commit-id: 7f3a53beaf
Former-commit-id: 241eba4a05
|
2015-02-03 11:24:57 -05:00 |
|
Greg Armendariz
|
57209b63d4
|
Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 6bb1b2cb5c [formerly 290192e2d6] [formerly 19d79f71d3] [formerly 19d79f71d3 [formerly 8c38289cf7]] [formerly 6bb1b2cb5c [formerly 290192e2d6] [formerly 19d79f71d3] [formerly 19d79f71d3 [formerly 8c38289cf7]] [formerly fbadd1deb1 [formerly 19d79f71d3 [formerly 8c38289cf7] [formerly fbadd1deb1 [formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]]]]]
Former-commit-id: fbadd1deb1
Former-commit-id: 2df575cfc0 [formerly 5538a3bd3c] [formerly 6a7891d660] [formerly 842e6a857de52e9e60d12a2dee07ca7d3c828000 [formerly 8aa9d6f342be9278c2766e73453e125107be66ea] [formerly 6a7891d660 [formerly a3d4342498]]]
Former-commit-id: 66497698f58fba1ddc144f8744f9170f328b0f11 [formerly cb6466c713f8797796f1c8ba79116d461def4aff] [formerly e3f22bed4c [formerly fdf1408c06]]
Former-commit-id: e3f22bed4c
Former-commit-id: 05647adcaf
|
2015-02-03 10:12:54 -06:00 |
|
Ron Anderson
|
96eb5a4e9c
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 5699e86af0 [formerly 292c9777a4] [formerly 8c6c42fe43] [formerly 8c6c42fe43 [formerly f280c0ab2e]] [formerly 5699e86af0 [formerly 292c9777a4] [formerly 8c6c42fe43] [formerly 8c6c42fe43 [formerly f280c0ab2e]] [formerly 933590f36a [formerly 8c6c42fe43 [formerly f280c0ab2e] [formerly 933590f36a [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]]]
Former-commit-id: 933590f36a
Former-commit-id: 03ad8f6261 [formerly 5a873f87d5] [formerly cc882eae28] [formerly 1b66f135b72aec34f26c6d1950ad189baffed778 [formerly ef204f25ac9dde9f0e1bedc81cb36de22a062b37] [formerly cc882eae28 [formerly 074512f362]]]
Former-commit-id: 39fe9049efcb56e9170b755e699435af9c5e26e5 [formerly e0a40872c1ee10521c91a39a50f26b152adfe7b1] [formerly a3bfe3b090 [formerly fa9890db7a]]
Former-commit-id: 27d309206138622940f95f62612d78e223967864 [formerly a3bfe3b090]
Former-commit-id: 72fa5331da
|
2015-02-02 15:04:51 -06:00 |
|
Bradley Mabe
|
55db1f4aae
|
Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java
Change-Id: I8506bb7deb4f57f5989d3513d682561948870593
Former-commit-id: 2afda4ce04 [formerly 8f0fb81e42] [formerly e8dc39ee79] [formerly e8dc39ee79 [formerly 847c663329]] [formerly 2afda4ce04 [formerly 8f0fb81e42] [formerly e8dc39ee79] [formerly e8dc39ee79 [formerly 847c663329]] [formerly de986a26ed [formerly e8dc39ee79 [formerly 847c663329] [formerly de986a26ed [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]]]]
Former-commit-id: de986a26ed
Former-commit-id: b9ae3b7234 [formerly 50b7386177] [formerly 165e747e6e] [formerly a2104920e0d3b7458a611fb383334847e74b727b [formerly 83fcd3c9dae87c83c35abcb5f46acf7fe196b097] [formerly 165e747e6e [formerly eebc4f4232]]]
Former-commit-id: c087f2d65a8017028be46d1ec5cff639329144ad [formerly 00b56cb62b9053f8d57fdb81ccaf384e92462158] [formerly 1911c68fb3 [formerly d86ae801fb]]
Former-commit-id: 7e6a5092d0241ce87ddcc297a89a95bfcb4d1137 [formerly 1911c68fb3]
Former-commit-id: 94094f2600
|
2015-02-02 15:49:14 -05:00 |
|