mjames-upc
|
cc362ea73a
|
ui updates from osx cave
Former-commit-id: 31ab502455
|
2015-12-29 23:03:48 -07:00 |
|
mjames-upc
|
3a59fefb09
|
cleaning up unidata_15.1.1 enough to launch in eclipse
Former-commit-id: 0b01029e68
|
2015-12-29 20:15:31 -07:00 |
|
mjames-upc
|
194adffea5
|
another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
|
2015-09-03 15:48:53 -06:00 |
|
mjames-upc
|
9fa5e6e9ee
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: 95cd21246b [formerly a2e6b5e6ed] [formerly f71c396cef] [formerly 999c47a3a6437f22b3abc1d05eff866853b93d9b [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a] [formerly f71c396cef [formerly 2288995260]]]
Former-commit-id: b90a1e3192524bea70619c5bc3af4ed100cf7e6c [formerly 7a2ac36eca3df270f4afc658f6f3530848347ee4] [formerly 93b22eeb17 [formerly cd4cb8eb1d]]
Former-commit-id: 93b22eeb17
Former-commit-id: d33cf5cbc8
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
8b02942e6e
|
menus organization for warngen and awipstools
Former-commit-id: 0ee79971a3 [formerly d2e0d05d34] [formerly e47d48348b] [formerly 30dcedb32109497d28c04f9cef3e605912125975 [formerly 080d101c29e6917327b869065263b9b9702104b1] [formerly e47d48348b [formerly 90f6268724]]]
Former-commit-id: d0c84c49160cb04c1ce02537dce533817d18fad1 [formerly b7dfe5f2bd26a8783450b9f48bbd179c16fd3b9f] [formerly fb03264ea1 [formerly 43a2553d02]]
Former-commit-id: f96657a027f0de00d6229d2daf143a40df36b1bf [formerly fb03264ea1]
Former-commit-id: 37f580ead3
|
2015-04-19 23:37:16 -06:00 |
|
Steve Harris
|
31a6aa8107
|
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 67b3a77c4f [formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
|
2015-03-18 09:29:01 -05:00 |
|
Evan Polster
|
a64e7bb532
|
VLab Issue #6773; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 6b7bec9ce8 [formerly c895a60ff5 [formerly 0b5bb1291e] [formerly 6b7bec9ce8 [formerly 948baed3df402f659cf9b80fd10a3bc3d9788036]]]
Former-commit-id: c895a60ff5 [formerly 0b5bb1291e]
Former-commit-id: c895a60ff5
Former-commit-id: 3cb60bb1e7
|
2015-03-06 23:07:47 +00:00 |
|
Evan Polster
|
c895a60ff5
|
VLab Issue #6773; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 6b7bec9ce8 [formerly 948baed3df402f659cf9b80fd10a3bc3d9788036]
Former-commit-id: 0b5bb1291e
|
2015-03-06 23:07:47 +00:00 |
|
Nate Jensen
|
358280805d
|
Omaha #3978 use InputStream instead of LocalizationFileInputStream or
read()
Change-Id: Ief0137559617f15ac9d7f6510b74630affa5aed5
Former-commit-id: a05af9b1b1 [formerly 3a6c19cccad2a8ae2db0a49c47d737a5c5e0436c]
Former-commit-id: 29bf0fc879
|
2015-02-24 09:57:11 -06:00 |
|
Steve Harris
|
6b97a1bbe9
|
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
14.4.1-13
Former-commit-id: 78b41638b9 [formerly ea76883b615967a79e8c9d0ee16accebd210ee0b]
Former-commit-id: 266e2af93a
|
2015-02-20 13:17:47 -06:00 |
|
Fay.Liang
|
8d4bab98d5
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1208dbde06 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]
Former-commit-id: 30859f6ee6
|
2015-02-11 15:36:05 -05:00 |
|
Fay.Liang
|
1aec809dcc
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1208dbde06 [formerly 8d4bab98d5 [formerly 30859f6ee6] [formerly 1208dbde06 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]
Former-commit-id: 8d4bab98d5 [formerly 30859f6ee6]
Former-commit-id: 8d4bab98d5
Former-commit-id: 8a38eb3a97
|
2015-02-11 15:36:05 -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 |
|
Steve Harris
|
e3f34455ce
|
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
14.4.1-7
Former-commit-id: d95158ec53 [formerly bf0368503a8defd41a20e369e154d560b93bee6c]
Former-commit-id: 85457e37cb
|
2015-02-03 17:30:23 -06:00 |
|
Nate Jensen
|
e2b5ce05fd
|
Omaha #3974 initial extensible drawing of polygons and preliminary
damage path tool
Change-Id: I0355b0a8a889bb0339412e4ad17e1b3f678d06c2
Former-commit-id: 57d35bc0a6 [formerly 9e748a3b6f49c17e7b9d84af1d4953b70a647b0a]
Former-commit-id: 672b872990
|
2015-02-02 11:27:41 -06:00 |
|
Ana Rivera
|
ccd0a40621
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]
Former-commit-id: ea92049aac
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
551831fb59
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ec [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: ccd0a40621 [formerly ea92049aac]
Former-commit-id: ccd0a40621
Former-commit-id: 2be03903bc
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
546f3573f4
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 551831fb59 [formerly 2be03903bc] [formerly ccd0a40621] [formerly ccd0a40621 [formerly ea92049aac]] [formerly 551831fb59 [formerly 2be03903bc] [formerly ccd0a40621] [formerly ccd0a40621 [formerly ea92049aac]] [formerly 070f0136ec [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]]]
Former-commit-id: 070f0136ec
Former-commit-id: 6404fb6437 [formerly c5182d351e] [formerly e358377ca7] [formerly 135ce2f6828a7f2b5c99cd9cfa5d9bd3fe9b1419 [formerly 83f5ea939fdc2f3bd6430413f7c32ec2de4681c6] [formerly e358377ca7 [formerly 1bbb9bad78]]]
Former-commit-id: d01863fad1cf96f5a683a4b8581c6019e3d94f23 [formerly 5a5444cf3e777acf29e90a268647565f4755def7] [formerly 7cea67cfc6 [formerly 0715e923df]]
Former-commit-id: 7cea67cfc6
Former-commit-id: 24e1be0580
|
2015-01-30 19:29:29 +00:00 |
|
Nate Jensen
|
5519a99ba8
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: c36064da2f [formerly 3bcd3a5d40] [formerly 7a10bd5620] [formerly 7a10bd5620 [formerly bfcb36eeac]] [formerly c36064da2f [formerly 3bcd3a5d40] [formerly 7a10bd5620] [formerly 7a10bd5620 [formerly bfcb36eeac]] [formerly ac9d787a26 [formerly 7a10bd5620 [formerly bfcb36eeac] [formerly ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]]]
Former-commit-id: ac9d787a26
Former-commit-id: ad7ff25dd2 [formerly a19eef1d8a] [formerly 74e207f306] [formerly 28b1b3a5e476df2e18d2234461c9795a931a7c31 [formerly 95e99af7a1db07abbf85ec2b55d69d333cf1a06f] [formerly 74e207f306 [formerly 0b9a5965a0]]]
Former-commit-id: 718ed1b366f8bd5d682ee7f05058044d0140010b [formerly 4aceaa5766a0ba388f2e6d517429b5c1cb19738e] [formerly 1915c27938 [formerly 86868080c3]]
Former-commit-id: 1915c27938
Former-commit-id: c44537ed72
|
2015-01-20 11:52:37 -06:00 |
|
Nate Jensen
|
7a10bd5620
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]
Former-commit-id: bfcb36eeac
|
2015-01-20 11:52:37 -06:00 |
|
Nate Jensen
|
c36064da2f
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: ac9d787a26 [formerly 7a10bd5620 [formerly bfcb36eeac] [formerly ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]
Former-commit-id: 7a10bd5620 [formerly bfcb36eeac]
Former-commit-id: 7a10bd5620
Former-commit-id: 3bcd3a5d40
|
2015-01-20 11:52:37 -06:00 |
|
Paula McCaslin
|
1375bc38f3
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: a5c805cf4d [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]
Former-commit-id: e2e8faf273
|
2014-11-12 13:58:24 -07:00 |
|
Paula McCaslin
|
d9499769d8
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: a5c805cf4d [formerly 1375bc38f3 [formerly e2e8faf273] [formerly a5c805cf4d [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]]
Former-commit-id: 1375bc38f3 [formerly e2e8faf273]
Former-commit-id: 1375bc38f3
Former-commit-id: 939adf14a1
|
2014-11-12 13:58:24 -07:00 |
|
Paula McCaslin
|
720b29080b
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: d9499769d8 [formerly 939adf14a1] [formerly 1375bc38f3] [formerly 1375bc38f3 [formerly e2e8faf273]] [formerly d9499769d8 [formerly 939adf14a1] [formerly 1375bc38f3] [formerly 1375bc38f3 [formerly e2e8faf273]] [formerly a5c805cf4d [formerly 1375bc38f3 [formerly e2e8faf273] [formerly a5c805cf4d [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]]]]
Former-commit-id: a5c805cf4d
Former-commit-id: 99f590521d [formerly 4998c1aa02] [formerly 0b569fcba8] [formerly e93634b818722e73a2637d34935d9199ca2489cc [formerly eb97f6ab49df798b44afdf2e60cd2f14406165b1] [formerly 0b569fcba8 [formerly 1038498ced]]]
Former-commit-id: 10be0d7c9191c6421ce806506afd392a23a108a8 [formerly fa2d1a7d9d91b8b773c7633e16cd676db979e98c] [formerly 01dc07b991 [formerly 1d9995c826]]
Former-commit-id: 5348634670e9b12da6a30b2a5803eca543dfec59 [formerly 01dc07b991]
Former-commit-id: be91854d00
|
2014-11-12 13:58:24 -07:00 |
|
Roger Ferrel
|
1d6bec894e
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 8cde49f98e [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]
Former-commit-id: 334d738c79
|
2014-11-12 10:50:43 -06:00 |
|
Roger Ferrel
|
e9399264b6
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 8cde49f98e [formerly 1d6bec894e [formerly 334d738c79] [formerly 8cde49f98e [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]]
Former-commit-id: 1d6bec894e [formerly 334d738c79]
Former-commit-id: 1d6bec894e
Former-commit-id: 2f9df228d7
|
2014-11-12 10:50:43 -06:00 |
|
Roger Ferrel
|
aef9a98c2a
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: e9399264b6 [formerly 2f9df228d7] [formerly 1d6bec894e] [formerly 1d6bec894e [formerly 334d738c79]] [formerly e9399264b6 [formerly 2f9df228d7] [formerly 1d6bec894e] [formerly 1d6bec894e [formerly 334d738c79]] [formerly 8cde49f98e [formerly 1d6bec894e [formerly 334d738c79] [formerly 8cde49f98e [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]]]]
Former-commit-id: 8cde49f98e
Former-commit-id: f9bdf5c236 [formerly 8ff4776207] [formerly 2e30187e47] [formerly b4ab119769ffd8f1e3069e6370b7c129ae2df9ea [formerly 9803e31e7a551d16b0b4b241ac6fbe2af4a04c36] [formerly 2e30187e47 [formerly ae35ba438a]]]
Former-commit-id: a72f7bc462b7317e1afbe3aef13c97cd36e62036 [formerly 16a4af6421c896a3c2b39b9b08433cd5a72153ab] [formerly 73b08f33c6 [formerly a5f2fcf963]]
Former-commit-id: 45a751ef5206c3e4c35d8ce18607e16275035986 [formerly 73b08f33c6]
Former-commit-id: 2d45fc13e0
|
2014-11-12 10:50:43 -06:00 |
|
Steve Harris
|
e9c9a17f96
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]
Former-commit-id: dc557b2d0c
|
2014-10-22 11:45:39 -05:00 |
|
Steve Harris
|
f95adbb8bc
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: bfade7674d [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]
Former-commit-id: e9c9a17f96 [formerly dc557b2d0c]
Former-commit-id: e9c9a17f96
Former-commit-id: f5b5d2bca2
|
2014-10-22 11:45:39 -05:00 |
|
Steve Harris
|
c19ef4223a
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: f95adbb8bc [formerly f5b5d2bca2] [formerly e9c9a17f96] [formerly e9c9a17f96 [formerly dc557b2d0c]] [formerly f95adbb8bc [formerly f5b5d2bca2] [formerly e9c9a17f96] [formerly e9c9a17f96 [formerly dc557b2d0c]] [formerly bfade7674d [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]]]
Former-commit-id: bfade7674d
Former-commit-id: 9953d1a83a [formerly 10e766d644] [formerly 879b0608ed] [formerly 9a73d0b6ff5f65193f4990ece573657351c85382 [formerly c910f3c64c7d7ef6791f3502b2d2ed5eb7f82d29] [formerly 879b0608ed [formerly 9e7ce04543]]]
Former-commit-id: 798059a522420cd55ee1ab38c99c2ff1cb8367c6 [formerly ba2773ec94554e459f05101098727f2b8b98e671] [formerly 116b83101e [formerly 040e641ec9]]
Former-commit-id: 116b83101e
Former-commit-id: a087a820cf
|
2014-10-22 11:45:39 -05:00 |
|
David Friedman
|
455f1ad7aa
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]
Former-commit-id: 955809450d
|
2014-10-10 19:33:21 +00:00 |
|
David Friedman
|
0f87213ea9
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 68f985d668 [formerly 455f1ad7aa [formerly 955809450d] [formerly 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]
Former-commit-id: 455f1ad7aa [formerly 955809450d]
Former-commit-id: 455f1ad7aa
Former-commit-id: b8556f48c4
|
2014-10-10 19:33:21 +00:00 |
|
David Friedman
|
adf4e6c77c
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 0f87213ea9 [formerly b8556f48c4] [formerly 455f1ad7aa] [formerly 455f1ad7aa [formerly 955809450d]] [formerly 0f87213ea9 [formerly b8556f48c4] [formerly 455f1ad7aa] [formerly 455f1ad7aa [formerly 955809450d]] [formerly 68f985d668 [formerly 455f1ad7aa [formerly 955809450d] [formerly 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]]]
Former-commit-id: 68f985d668
Former-commit-id: bc5a787438 [formerly 2013b9427c] [formerly 3f1ed65033] [formerly 6cc7f2f64c5ecb7d5d3b2a95d0d46194786c4e52 [formerly a9b3aa62a2f496643fd9046866f2e1b1496d8361] [formerly 3f1ed65033 [formerly 7176b476a2]]]
Former-commit-id: 6e7f05aafc2494a35e089d88da649f74b28413d3 [formerly 7829e63f06d462f7116d3888d02d99561229d005] [formerly 65eaac9743 [formerly f325e4ad55]]
Former-commit-id: 65eaac9743
Former-commit-id: 10e53eb90f
|
2014-10-10 19:33:21 +00:00 |
|
Steve Harris
|
f4b771ea72
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]
Former-commit-id: da463c484e
|
2014-10-03 10:18:34 -05:00 |
|
Steve Harris
|
fe9e274e09
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 2616fe04b6 [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: f4b771ea72 [formerly da463c484e]
Former-commit-id: f4b771ea72
Former-commit-id: fa1fa76dd9
|
2014-10-03 10:18:34 -05:00 |
|
Steve Harris
|
7a740e3f84
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly 2616fe04b6 [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 641662f39e [formerly 1c1e618183] [formerly 306826aed9] [formerly 40b67d59271cbd32cf7fdbe3aab8ebaa9c8fee28 [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779] [formerly 306826aed9 [formerly 523cedbb56]]]
Former-commit-id: c8c955bbdac9ab07279978c8aa339cb362a09801 [formerly 85a2c5f56cad1fa8121856b8cb5312cdf481051b] [formerly e05d31ae36 [formerly 57f5294f08]]
Former-commit-id: e05d31ae36
Former-commit-id: e40f190f9a
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
f704781f4f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]
Former-commit-id: 8c3625cfec
|
2014-09-30 13:45:54 -04:00 |
|
dmsys
|
c7895c80f6
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 9f4560c480 [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: f704781f4f [formerly 8c3625cfec]
Former-commit-id: f704781f4f
Former-commit-id: 70cb8d81b0
|
2014-09-30 13:45:54 -04:00 |
|
dmsys
|
5517dee8b7
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: c7895c80f6 [formerly 70cb8d81b0] [formerly f704781f4f] [formerly f704781f4f [formerly 8c3625cfec]] [formerly c7895c80f6 [formerly 70cb8d81b0] [formerly f704781f4f] [formerly f704781f4f [formerly 8c3625cfec]] [formerly 9f4560c480 [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 09d728ce5b [formerly 0cb584f44e] [formerly 07f84c6b26] [formerly e092800b2477857f3c562704ece4c265d21245bf [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4] [formerly 07f84c6b26 [formerly b884e5e32d]]]
Former-commit-id: 8c0613f5dceff794a5ae9e2d28f5280fa4f7d687 [formerly 8f7a656cd223aa4bbbad7217939da98d6e8672ab] [formerly 71d6e48473 [formerly e00ea2d8cd]]
Former-commit-id: 71d6e48473
Former-commit-id: 6b2eccce36
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
3598e9b5b6
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]
Former-commit-id: 90e08b96e1
|
2014-09-29 12:58:56 -05:00 |
|
Steve Harris
|
9be38903d8
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a1447 [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3598e9b5b6 [formerly 90e08b96e1]
Former-commit-id: 3598e9b5b6
Former-commit-id: 6900bb61c1
|
2014-09-29 12:58:56 -05:00 |
|
Steve Harris
|
76b1145249
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 9be38903d8 [formerly 6900bb61c1] [formerly 3598e9b5b6] [formerly 3598e9b5b6 [formerly 90e08b96e1]] [formerly 9be38903d8 [formerly 6900bb61c1] [formerly 3598e9b5b6] [formerly 3598e9b5b6 [formerly 90e08b96e1]] [formerly 3b6a8a1447 [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 4e8987e6b6 [formerly e9774e46ea] [formerly 842abaad49] [formerly be19990bc976dbe97bd739c32ff6391d0627fcf3 [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c] [formerly 842abaad49 [formerly 6330a62e85]]]
Former-commit-id: aac1e47bdaf5643e37e850ed9e4da24bd88eb3f4 [formerly df06a15df0e12cfd77916f5f59e1b95c241b34d2] [formerly 4c4380580f [formerly 30f0d27dfb]]
Former-commit-id: 4c4380580f
Former-commit-id: 10752cbc42
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
973d0b9a55
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]
Former-commit-id: b3025aacb0
|
2014-09-25 21:07:16 +00:00 |
|
David Friedman
|
6c569f0453
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 8ab4649312 [formerly 973d0b9a55 [formerly b3025aacb0] [formerly 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]
Former-commit-id: 973d0b9a55 [formerly b3025aacb0]
Former-commit-id: 973d0b9a55
Former-commit-id: d8618f1419
|
2014-09-25 21:07:16 +00:00 |
|
David Friedman
|
21f9780c72
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 6c569f0453 [formerly d8618f1419] [formerly 973d0b9a55] [formerly 973d0b9a55 [formerly b3025aacb0]] [formerly 6c569f0453 [formerly d8618f1419] [formerly 973d0b9a55] [formerly 973d0b9a55 [formerly b3025aacb0]] [formerly 8ab4649312 [formerly 973d0b9a55 [formerly b3025aacb0] [formerly 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]]]
Former-commit-id: 8ab4649312
Former-commit-id: ba8af49921 [formerly d017509506] [formerly a10060f45d] [formerly de206307f0e9bfe1b87fddc7d6936ad3fc28cbae [formerly 78ef0251563c92144b5b39f6944eb8273d2bbaee] [formerly a10060f45d [formerly c19d9ee755]]]
Former-commit-id: 3f82d937326b831dc2c135ebff86cb7c18ab57d4 [formerly 6265764de67efa983a3247d8e0f688518aca6844] [formerly 0a94f1ccfb [formerly f6a6032d61]]
Former-commit-id: 0a94f1ccfb
Former-commit-id: 30ee562dc7
|
2014-09-25 21:07:16 +00:00 |
|
Matthew Howard
|
c0a43b73ce
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 7121e2e6e1 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]
Former-commit-id: 6e0dbf4fb5
|
2014-09-11 08:56:49 -05:00 |
|
Matthew Howard
|
8f8f88ada3
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 7121e2e6e1 [formerly c0a43b73ce [formerly 6e0dbf4fb5] [formerly 7121e2e6e1 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]]
Former-commit-id: c0a43b73ce [formerly 6e0dbf4fb5]
Former-commit-id: c0a43b73ce
Former-commit-id: 4b00403145
|
2014-09-11 08:56:49 -05:00 |
|
Matthew Howard
|
77c72bf8a0
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 8f8f88ada3 [formerly 4b00403145] [formerly c0a43b73ce] [formerly c0a43b73ce [formerly 6e0dbf4fb5]] [formerly 8f8f88ada3 [formerly 4b00403145] [formerly c0a43b73ce] [formerly c0a43b73ce [formerly 6e0dbf4fb5]] [formerly 7121e2e6e1 [formerly c0a43b73ce [formerly 6e0dbf4fb5] [formerly 7121e2e6e1 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]]]]
Former-commit-id: 7121e2e6e1
Former-commit-id: 1c2a604e04 [formerly c6dbdef498] [formerly 5daf615bb0] [formerly 4a0871193ea0d4768845359c853b5cf447c68ce8 [formerly 171a14168a3b3e901e938ab2ca3dfd65cc9e8a7f] [formerly 5daf615bb0 [formerly 03f33b687b]]]
Former-commit-id: c4decb7dfd14b84f59dae1649cb2db437a083533 [formerly a1f06f360df2348392f27764b53793fd0df9b4f7] [formerly 5cace9fcbf [formerly 1f79bceb26]]
Former-commit-id: 5cace9fcbf
Former-commit-id: 021d0fed40
|
2014-09-11 08:56:49 -05:00 |
|
Qinglu.Lin
|
517f0c9d0c
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 3f666817e0 [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]
Former-commit-id: 51d48a6fdc
|
2014-09-09 08:07:46 -04:00 |
|
Qinglu.Lin
|
18882502cb
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 3f666817e0 [formerly 517f0c9d0c [formerly 51d48a6fdc] [formerly 3f666817e0 [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]]]
Former-commit-id: 517f0c9d0c [formerly 51d48a6fdc]
Former-commit-id: 517f0c9d0c
Former-commit-id: f2bd188b06
|
2014-09-09 08:07:46 -04:00 |
|