Richard Peter
|
ed2bd7a261
|
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
|
119b2bff17
|
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
|
f6601e4ee1
|
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
|
0d33e661f2
|
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
|
87964cb500
|
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
|
8a4cda892f
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 771e06df242b0fe7b4eec1e7c3099dfd316182ce
|
2014-10-08 16:47:10 -05:00 |
|
Ben Steffensmeier
|
b7c0eb89ad
|
Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: e0ec387c62e64a19a4d598578f18ee17686f312a
|
2014-10-08 12:21:03 -05:00 |
|
Richard Peter
|
e8bc97501b
|
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
|
4e582d0bde
|
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 |
|
Nate Jensen
|
aa9567ccbe
|
Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: 617994f10079a9b905f37c1bf1c1b83e6a210e61
|
2014-10-07 17:18:51 -05:00 |
|
Richard Peter
|
a4bfd2d28b
|
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 |
|
Richard Peter
|
1adac05f5a
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5
|
2014-10-07 15:13:11 -05:00 |
|
Nathan Bowler
|
1fd0ece81a
|
Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0
Former-commit-id: 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583
|
2014-10-07 15:23:38 -04:00 |
|
Nate Jensen
|
70521e80f8
|
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
|
11f460f876
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: cdeea610953d82fe2b380341b3059b15b6ecd1ff
|
2014-10-07 13:53:43 -05:00 |
|
Nate Jensen
|
c066e8264d
|
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 |
|
Nate Jensen
|
1e16abcfcd
|
Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 747f8fc91e2ff977724f634b6e610c96150cb4ad
|
2014-10-07 13:52:36 -05:00 |
|
Nathan Bowler
|
ab2e0edb82
|
Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9
Former-commit-id: e57506f274da8a2d917c6cf061e789e50993b5c3
|
2014-10-07 14:40:49 -04:00 |
|
Steve Harris
|
ad4393bea3
|
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
|
66705190b5
|
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
|
3464751716
|
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
|
773619f741
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: a758b7aff6b30194a3180fddffcefa5d019f2ee5
|
2014-10-07 10:43:47 -05:00 |
|
Brian Clements
|
f39ffcc63f
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
6a2b2efb1a
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 7fa6925c27330262dd0a70afcb77c589718cf1f7
|
2014-10-06 20:00:19 -05:00 |
|
Roger Ferrel
|
dfbf07f377
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
39c5e9c314
|
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
|
87d80afd0b
|
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
|
28545083c5
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: ded3f476047f92d48891613e4c0b78d20858f1ff
|
2014-10-06 09:08:03 -05:00 |
|
Nate Jensen
|
baec32be20
|
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 |
|
Richard Peter
|
5a0dc20480
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 075f3f69cbf19d298398cb7c481668b97d4dad5d
|
2014-10-03 14:14:16 -05:00 |
|
Brian.Dyke
|
f440da9c70
|
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
|
da463c484e
|
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 |
|
Mark Peters
|
955f21a85c
|
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: 475fa37d70d51e5e9538141730fbead4a6b5d88e
|
2014-10-02 15:36:22 -05:00 |
|
Brian.Dyke
|
2a911984f0
|
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
|
65ad6056b6
|
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
|
f47840e4d9
|
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 |
|
Brian.Dyke
|
4bc465bfbd
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f26e54011d334972bb1e999304b1b2d13a1c408f
|
2014-10-02 10:15:34 -04:00 |
|
Nate Jensen
|
e964375fcc
|
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
|
fc60a83082
|
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
|
e201e1a493
|
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
|
cddda47923
|
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
|
116f6840e2
|
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 |
|
Shawn.Hooper
|
f9428ace1f
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
5ed17c0e24
|
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
|
659f4869bc
|
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
|
319ea78480
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 3f63e3887f21b1cb5eb1ea1bb5225f492e161021
|
2014-10-01 14:22:22 -05:00 |
|
Nathan Bowler
|
368b6341b0
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: d67d1e941b89357e7d86fa0f810a82f9e01f4c27
|
2014-10-01 14:57:16 -04:00 |
|
Nate Jensen
|
a5e4190b35
|
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
|
482af416b3
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
|
2014-10-01 11:53:40 -05:00 |
|
Nate Jensen
|
7c5b340168
|
Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
Former-commit-id: e0f436a866f2a736b793c3fb2b4fbe770208c6c0
|
2014-10-01 11:46:51 -05:00 |
|