Steve Harris
|
4fde31539e
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]
Former-commit-id: aff75d954b
|
2014-10-15 08:42:02 -05:00 |
|
Brian Clements
|
158aa3f439
|
Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab
Former-commit-id: 0a42113bbb [formerly 21924a6b536409681073f65d769bef53db049102]
Former-commit-id: 180696a594
|
2014-10-14 15:49:36 -05:00 |
|
Brian Clements
|
78c2aa3650
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 6d6d3d26e6 [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]
Former-commit-id: 3a12ab9bdf
|
2014-10-13 16:32:41 -05:00 |
|
Richard Peter
|
ef5fcfe852
|
Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: 360114be70 [formerly a7b644d5e831bc38f0442efc16f681fd5ff317d7]
Former-commit-id: d2909b6e08
|
2014-10-13 12:37:28 -05:00 |
|
Brian Clements
|
c33a5ad562
|
Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 2a7feaebfe [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]
Former-commit-id: dfb43fda31
|
2014-10-13 11:11:32 -05:00 |
|
Nate Jensen
|
5ae522c32a
|
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 3eada560b7 [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]
Former-commit-id: b24faf99cd
|
2014-10-13 09:34:22 -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 |
|
Mark Peters
|
f8e3c8412b
|
Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f
Former-commit-id: fb6131869c [formerly b929d424107b0a2495f4305fd2500e362cccce4e]
Former-commit-id: 5d87f3d22d
|
2014-10-10 14:25:38 -05:00 |
|
Brian.Dyke
|
797a9c6c10
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 6ae3795b7c [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]
Former-commit-id: f85eb2d0ac
|
2014-10-10 11:01:01 -04:00 |
|
Richard Peter
|
db0e85e501
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 26e4c16da4 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]
Former-commit-id: ed2bd7a261
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
8d58b8d524
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: fbabf6f18d [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]
Former-commit-id: 119b2bff17
|
2014-10-09 11:04:49 -05:00 |
|
Nate Jensen
|
550b269370
|
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 1a24808709 [formerly 05a008ed69414e3977998cca45516a736181d5b6]
Former-commit-id: f6601e4ee1
|
2014-10-09 09:38:27 -05:00 |
|
Ron Anderson
|
95b1633c25
|
Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462
Former-commit-id: 5368107615 [formerly b538cd55c0662d3d593522817986109c7e03625a]
Former-commit-id: c7bf818989
|
2014-10-09 09:21:29 -05:00 |
|
Nate Jensen
|
87d33ff6ca
|
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 98518f4cb6 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]
Former-commit-id: 0d33e661f2
|
2014-10-09 09:02:36 -05:00 |
|
Brian Clements
|
1a6624d5d7
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: f0921db20c [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]
Former-commit-id: 87964cb500
|
2014-10-09 08:38:45 -05:00 |
|
Brian Clements
|
4a824111ec
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 577b3a5e11 [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]
Former-commit-id: 8a4cda892f
|
2014-10-08 16:47:10 -05:00 |
|
Richard Peter
|
04bf8666b3
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]
Former-commit-id: e8bc97501b
|
2014-10-08 12:02:17 -05:00 |
|
Nate Jensen
|
2502976504
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 5cf1821a6a [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]
Former-commit-id: 4e582d0bde
|
2014-10-08 11:36:44 -05:00 |
|
Richard Peter
|
f5dd25c8e4
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]
Former-commit-id: a4bfd2d28b
|
2014-10-07 16:32:48 -05:00 |
|
Nate Jensen
|
0bfc7514a4
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 6d0d6c2a96 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]
Former-commit-id: 70521e80f8
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
e63de52465
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: b0f025c0df [formerly 60155e8f96ba20204c6049206ef35a840f64a767]
Former-commit-id: c066e8264d
|
2014-10-07 13:53:33 -05:00 |
|
Steve Harris
|
39b2199cec
|
Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java
Former-commit-id: c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]
Former-commit-id: ad4393bea3
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
48352e964d
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: 42cefd3655 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]
Former-commit-id: 66705190b5
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
dc27d9252c
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]
Former-commit-id: 3464751716
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
2637d1b07f
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: ec37971eff [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]
Former-commit-id: 773619f741
|
2014-10-07 10:43:47 -05:00 |
|
Nate Jensen
|
9c95c255c2
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: b2dcfdf572 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]
Former-commit-id: ef6da2a181
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
f8278a9ad3
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 9025e166dd [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]
Former-commit-id: 446e0bcdf6
|
2014-10-06 15:41:42 -05:00 |
|
Roger Ferrel
|
2f8d5263b9
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: d4ef865375 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]
Former-commit-id: dfbf07f377
|
2014-10-06 15:34:30 -05:00 |
|
Michael Gamazaychikov
|
3851e4c961
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: e6d3baaa9c [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]
Former-commit-id: f0b644d92e
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
06a27b2d3c
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]
Former-commit-id: 39c5e9c314
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
71efead2db
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: de8b9cf0b8 [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]
Former-commit-id: 87d80afd0b
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
b544abb498
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 23c5ea21e4 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]
Former-commit-id: baec32be20
|
2014-10-06 09:07:38 -05:00 |
|
Steve Harris
|
522ce92c43
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: e20dc457e4 [formerly 9e7230482cf604b389bed68e07f5e5b17a65c24a]
Former-commit-id: 997e80470f
|
2014-10-06 09:04:05 -05:00 |
|
Brian.Dyke
|
85d83aefe0
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]
Former-commit-id: f440da9c70
|
2014-10-03 14:04:46 -04: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 |
|
Brian.Dyke
|
db665d3876
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]
Former-commit-id: 2a911984f0
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
006bdb00ad
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]
Former-commit-id: 65ad6056b6
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
d4888adc0f
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]
Former-commit-id: f47840e4d9
|
2014-10-02 10:24:04 -04:00 |
|
Nate Jensen
|
9f74ca65bc
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 33e3281d55 [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]
Former-commit-id: e964375fcc
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
694b39c979
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: b5d8e0a423 [formerly 9519a47ea459390148d07e97189df86e094c037b]
Former-commit-id: fc60a83082
|
2014-10-02 08:30:25 -05:00 |
|
Steve Harris
|
09d8955b31
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]
Former-commit-id: e201e1a493
|
2014-10-02 08:09:02 -05:00 |
|
Nate Jensen
|
9e4bd6c1b7
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: aa43004f85 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]
Former-commit-id: cddda47923
|
2014-10-02 07:57:30 -05:00 |
|
Slav Korolev
|
05a7f534bf
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: ad4bae10c9 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]
Former-commit-id: f7bcb81010
|
2014-10-01 16:45:33 -04:00 |
|
Nate Jensen
|
dd72c8e139
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 53f2bf8395 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]
Former-commit-id: 116f6840e2
|
2014-10-01 15:06:03 -05:00 |
|
Brian.Dyke
|
0be927be2d
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]
Former-commit-id: 5ed17c0e24
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
8ae0af5c6f
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 7c7510d471 [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]
Former-commit-id: 659f4869bc
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
74883424ca
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]
Former-commit-id: 319ea78480
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
f7eac5f1db
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 3146dd083c [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]
Former-commit-id: a5e4190b35
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
fce7d5899f
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]
Former-commit-id: 482af416b3
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
6a775aa2be
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: d5994a8a6b [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]
Former-commit-id: a1d23e4198
|
2014-10-01 10:22:25 -05:00 |
|