Nate Jensen
|
3eada560b7
|
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c
|
2014-10-13 09:34:22 -05:00 |
|
Richard Peter
|
26e4c16da4
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 5977e37b7368487867aca1cfdd362943633f92eb
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
fbabf6f18d
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: 6bc42c58541363bee9be1607b1bdf2aca6f5a000
|
2014-10-09 11:04:49 -05:00 |
|
Nate Jensen
|
1a24808709
|
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 05a008ed69414e3977998cca45516a736181d5b6
|
2014-10-09 09:38:27 -05:00 |
|
Nate Jensen
|
98518f4cb6
|
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 5ae10ba1a54ec5b20d1569d6c78c2762015c35de
|
2014-10-09 09:02:36 -05:00 |
|
Brian Clements
|
f0921db20c
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: 919c816ba7af2082b9dcb0308128fa1b228475d2
|
2014-10-09 08:38:45 -05:00 |
|
Brian Clements
|
577b3a5e11
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 771e06df242b0fe7b4eec1e7c3099dfd316182ce
|
2014-10-08 16:47:10 -05:00 |
|
Richard Peter
|
fa15d4ff21
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 157588d388b9033424ddc46a22d74ccc302eea85
|
2014-10-08 12:02:17 -05:00 |
|
Nate Jensen
|
5cf1821a6a
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 87f49d9bcc07d2178a535fc934d02cab36063894
|
2014-10-08 11:36:44 -05:00 |
|
Richard Peter
|
a9562d992c
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: 110499cec453532545431a6fa05057f47af66ed2
|
2014-10-07 16:32:48 -05:00 |
|
Nate Jensen
|
6d0d6c2a96
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: a75ecea2121d1c030a7acb4ba50095a6d2769c01
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
b0f025c0df
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 60155e8f96ba20204c6049206ef35a840f64a767
|
2014-10-07 13:53:33 -05:00 |
|
Steve Harris
|
c9e37bf440
|
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: 6bb7a7312a22a9585d2f5981d873751879082cb1
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
42cefd3655
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: ccd1d646a175e6a2493def2fb3a22d7109e225a7
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
5ed537572a
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 5f22815ea1ca5a1fbd010f642afe6a83778f6f58
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
ec37971eff
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: a758b7aff6b30194a3180fddffcefa5d019f2ee5
|
2014-10-07 10:43:47 -05:00 |
|
Roger Ferrel
|
d4ef865375
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
2db03d95b3
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
de8b9cf0b8
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 45140e7bd5ac2dcc51351d74dc87119aeac98f3b
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
23c5ea21e4
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 73be758f4ae461539c4a622cf52b7bc73705fc50
|
2014-10-06 09:07:38 -05:00 |
|
Brian.Dyke
|
92762f46c7
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
2616fe04b6
|
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: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
|
2014-10-03 10:18:34 -05:00 |
|
Brian.Dyke
|
20dd249d2c
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
f3f95aabb0
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
2ac30f6c22
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
|
2014-10-02 10:24:04 -04:00 |
|
Nate Jensen
|
33e3281d55
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 690868294ab74d5c3b73c12f81534d685bb652aa
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
b5d8e0a423
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: 9519a47ea459390148d07e97189df86e094c037b
|
2014-10-02 08:30:25 -05:00 |
|
Steve Harris
|
cc34483b0b
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
|
2014-10-02 08:09:02 -05:00 |
|
Nate Jensen
|
aa43004f85
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: c643d7c706ef39d1c17926b2a99bcfa2e52c3193
|
2014-10-02 07:57:30 -05:00 |
|
Nate Jensen
|
53f2bf8395
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 155fdc66bca15c242345858152fcf0b129e28a6d
|
2014-10-01 15:06:03 -05:00 |
|
Brian.Dyke
|
a4bfbea3c2
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
7c7510d471
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 8c3cb6032fe79f68f24eb5dee7f3a820aa475257
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
87d1286a0c
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 3f63e3887f21b1cb5eb1ea1bb5225f492e161021
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
3146dd083c
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 227ab9d68d59a9899025055a51b278bbcd9123f5
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
f2633a56c0
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
d5994a8a6b
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
41427a57bb
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 501aa1ac560f34024ab906391dc8c22c422d8509
|
2014-10-01 09:46:56 -05:00 |
|
dmsys
|
9f4560c480
|
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: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
510d26050d
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
8c0a087bf0
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: f785d88ee1c388b564921c3ecd8c931329639f04
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
245804a21a
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
3b6a8a1447
|
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: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
Nate Jensen
|
c3648d1989
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
95b096192b
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
c03bc273da
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
|
2014-09-29 11:14:32 -05:00 |
|
Ben Steffensmeier
|
5b10ac2f36
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
46af1d0857
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|
Brian.Dyke
|
142432ba5e
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
05707d0f20
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
f26fe97ec4
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
|
2014-09-26 14:19:03 -04:00 |
|