Robert Blum
|
bbcb4f18bc
|
Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008
Former-commit-id: f8661bdb73 [formerly caee4eba19 [formerly 9bef0b91f8] [formerly f8661bdb73 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]]
Former-commit-id: caee4eba19 [formerly 9bef0b91f8]
Former-commit-id: caee4eba19
Former-commit-id: da4f5de40f
|
2014-10-08 13:05:23 -05:00 |
|
Richard Peter
|
597866865f
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: a9562d992c [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]
Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b]
Former-commit-id: f5dd25c8e4
Former-commit-id: 8ffa01471a
|
2014-10-07 16:32:48 -05:00 |
|
Richard Peter
|
82280a1f38
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1bc24c3be2 [formerly ee86734625 [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]
Former-commit-id: ee86734625 [formerly 1adac05f5a]
Former-commit-id: ee86734625
Former-commit-id: 1038af1901
|
2014-10-07 15:13:11 -05:00 |
|
Nate Jensen
|
df3ba0b4d0
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 6d0d6c2a96 [formerly 0bfc7514a4 [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]
Former-commit-id: 0bfc7514a4 [formerly 70521e80f8]
Former-commit-id: 0bfc7514a4
Former-commit-id: 92caee5227
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
0f4da06d5e
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 726eea342f [formerly affc326eb7 [formerly 11f460f876] [formerly 726eea342f [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]
Former-commit-id: affc326eb7 [formerly 11f460f876]
Former-commit-id: affc326eb7
Former-commit-id: 056dbe465d
|
2014-10-07 13:53:43 -05:00 |
|
Nate Jensen
|
b28c4eef82
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: b0f025c0df [formerly e63de52465 [formerly c066e8264d] [formerly b0f025c0df [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]
Former-commit-id: e63de52465 [formerly c066e8264d]
Former-commit-id: e63de52465
Former-commit-id: 3e4434f708
|
2014-10-07 13:53:33 -05:00 |
|
Nate Jensen
|
0c69631a70
|
Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 09cf5de2dd [formerly e3a1adb7f2 [formerly 1e16abcfcd] [formerly 09cf5de2dd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]]
Former-commit-id: e3a1adb7f2 [formerly 1e16abcfcd]
Former-commit-id: e3a1adb7f2
Former-commit-id: 860f584065
|
2014-10-07 13:52:36 -05:00 |
|
Nathan Bowler
|
b8ed73ec8b
|
Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9
Former-commit-id: b84fee6aed [formerly adecc6efa4 [formerly ab2e0edb82] [formerly b84fee6aed [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]]
Former-commit-id: adecc6efa4 [formerly ab2e0edb82]
Former-commit-id: adecc6efa4
Former-commit-id: bcc339a859
|
2014-10-07 14:40:49 -04:00 |
|
Steve Harris
|
3c91dfd8b7
|
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 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]
Former-commit-id: 39b2199cec [formerly ad4393bea3]
Former-commit-id: 39b2199cec
Former-commit-id: c0c1ce7700
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
627ed89ca2
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: 42cefd3655 [formerly 48352e964d [formerly 66705190b5] [formerly 42cefd3655 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]
Former-commit-id: 48352e964d [formerly 66705190b5]
Former-commit-id: 48352e964d
Former-commit-id: 0cd0db130c
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
513224863a
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 5ed537572a [formerly dc27d9252c [formerly 3464751716] [formerly 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]
Former-commit-id: dc27d9252c [formerly 3464751716]
Former-commit-id: dc27d9252c
Former-commit-id: 41a0fa9bfe
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
9c6346b701
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: 81c73519c2 [formerly 090a787f8d [formerly f39ffcc63f] [formerly 81c73519c2 [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]
Former-commit-id: 090a787f8d [formerly f39ffcc63f]
Former-commit-id: 090a787f8d
Former-commit-id: c0544fa109
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
6cb8679704
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 997bfd689d [formerly 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]
Former-commit-id: 3e0a99aed2 [formerly 6a2b2efb1a]
Former-commit-id: 3e0a99aed2
Former-commit-id: d5888d403c
|
2014-10-06 20:00:19 -05:00 |
|
Steve Harris
|
772969f5c8
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314]
Former-commit-id: 06a27b2d3c
Former-commit-id: 53dc9657e2
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
b7448ba4a9
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: de8b9cf0b8 [formerly 71efead2db [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]
Former-commit-id: 71efead2db [formerly 87d80afd0b]
Former-commit-id: 71efead2db
Former-commit-id: 054947764c
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
af58665ce9
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 05ae6c5d9b [formerly 24bf870977 [formerly 28545083c5] [formerly 05ae6c5d9b [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]
Former-commit-id: 24bf870977 [formerly 28545083c5]
Former-commit-id: 24bf870977
Former-commit-id: 40d5da5e50
|
2014-10-06 09:08:03 -05:00 |
|
Nate Jensen
|
8193591e37
|
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 b544abb498 [formerly baec32be20] [formerly 23c5ea21e4 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]
Former-commit-id: b544abb498 [formerly baec32be20]
Former-commit-id: b544abb498
Former-commit-id: f35c95de02
|
2014-10-06 09:07:38 -05:00 |
|
Richard Peter
|
0c3210576e
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: b5f23b8b98 [formerly 2422c00fbd [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]
Former-commit-id: 2422c00fbd [formerly 5a0dc20480]
Former-commit-id: 2422c00fbd
Former-commit-id: 1958d9fe38
|
2014-10-03 14:14:16 -05:00 |
|
Brian.Dyke
|
e2f8c513f9
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]
Former-commit-id: 85d83aefe0 [formerly f440da9c70]
Former-commit-id: 85d83aefe0
Former-commit-id: 5da2026d2b
|
2014-10-03 14:04:46 -04: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 |
|
Mark Peters
|
00db666a87
|
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: fb62a1e35b [formerly ffe3444650 [formerly 955f21a85c] [formerly fb62a1e35b [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]
Former-commit-id: ffe3444650 [formerly 955f21a85c]
Former-commit-id: ffe3444650
Former-commit-id: da72adac03
|
2014-10-02 15:36:22 -05:00 |
|
Brian.Dyke
|
5d1099354e
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 20dd249d2c [formerly db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]
Former-commit-id: db665d3876 [formerly 2a911984f0]
Former-commit-id: db665d3876
Former-commit-id: 7390f6c3a8
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
ff12e5c05c
|
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 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: 006bdb00ad [formerly 65ad6056b6]
Former-commit-id: 006bdb00ad
Former-commit-id: 06f6dfc38a
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
4a0c55af61
|
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 d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]
Former-commit-id: d4888adc0f [formerly f47840e4d9]
Former-commit-id: d4888adc0f
Former-commit-id: d1c62c3542
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
0ed9e51a0e
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 97464ea153 [formerly 31f073ee3a [formerly 4bc465bfbd] [formerly 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]
Former-commit-id: 31f073ee3a [formerly 4bc465bfbd]
Former-commit-id: 31f073ee3a
Former-commit-id: 65ff0876ac
|
2014-10-02 10:15:34 -04:00 |
|
Nate Jensen
|
b3dcc55a80
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 33e3281d55 [formerly 9f74ca65bc [formerly e964375fcc] [formerly 33e3281d55 [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]
Former-commit-id: 9f74ca65bc [formerly e964375fcc]
Former-commit-id: 9f74ca65bc
Former-commit-id: 0aebb15a38
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
ddceec2942
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: b5d8e0a423 [formerly 694b39c979 [formerly fc60a83082] [formerly b5d8e0a423 [formerly 9519a47ea459390148d07e97189df86e094c037b]]]
Former-commit-id: 694b39c979 [formerly fc60a83082]
Former-commit-id: 694b39c979
Former-commit-id: 8b4c2fd720
|
2014-10-02 08:30:25 -05:00 |
|
Steve Harris
|
9b395ef8b9
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly 09d8955b31 [formerly e201e1a493] [formerly cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]
Former-commit-id: 09d8955b31 [formerly e201e1a493]
Former-commit-id: 09d8955b31
Former-commit-id: 0a8b36918a
|
2014-10-02 08:09:02 -05:00 |
|
Nate Jensen
|
29e87b2a11
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: aa43004f85 [formerly 9e4bd6c1b7 [formerly cddda47923] [formerly aa43004f85 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]]]
Former-commit-id: 9e4bd6c1b7 [formerly cddda47923]
Former-commit-id: 9e4bd6c1b7
Former-commit-id: 1d0b39e615
|
2014-10-02 07:57:30 -05:00 |
|
Nate Jensen
|
7c14781813
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 53f2bf8395 [formerly dd72c8e139 [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]
Former-commit-id: dd72c8e139 [formerly 116f6840e2]
Former-commit-id: dd72c8e139
Former-commit-id: 63d524c431
|
2014-10-01 15:06:03 -05:00 |
|
Shawn.Hooper
|
523f51a655
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ae02cbc2da [formerly 22c3fde0ef [formerly f9428ace1f] [formerly ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]
Former-commit-id: 22c3fde0ef [formerly f9428ace1f]
Former-commit-id: 22c3fde0ef
Former-commit-id: 5254c781ef
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
efd1497e54
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4bfbea3c2 [formerly 0be927be2d [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]
Former-commit-id: 0be927be2d [formerly 5ed17c0e24]
Former-commit-id: 0be927be2d
Former-commit-id: 64529eea01
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
36a4d827f9
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 7c7510d471 [formerly 8ae0af5c6f [formerly 659f4869bc] [formerly 7c7510d471 [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]
Former-commit-id: 8ae0af5c6f [formerly 659f4869bc]
Former-commit-id: 8ae0af5c6f
Former-commit-id: 68f934e63c
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
1610751f51
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 87d1286a0c [formerly 74883424ca [formerly 319ea78480] [formerly 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]
Former-commit-id: 74883424ca [formerly 319ea78480]
Former-commit-id: 74883424ca
Former-commit-id: 4dd895a3c5
|
2014-10-01 14:22:22 -05:00 |
|
Nathan Bowler
|
76e1596d24
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: e4779f2e66 [formerly 2d5d90c055 [formerly 368b6341b0] [formerly e4779f2e66 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]
Former-commit-id: 2d5d90c055 [formerly 368b6341b0]
Former-commit-id: 2d5d90c055
Former-commit-id: 1e4b1e36b2
|
2014-10-01 14:57:16 -04:00 |
|
Nate Jensen
|
1bbe51ed67
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 3146dd083c [formerly f7eac5f1db [formerly a5e4190b35] [formerly 3146dd083c [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]
Former-commit-id: f7eac5f1db [formerly a5e4190b35]
Former-commit-id: f7eac5f1db
Former-commit-id: 16907b03de
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
621a2ab225
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: f2633a56c0 [formerly fce7d5899f [formerly 482af416b3] [formerly f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]
Former-commit-id: fce7d5899f [formerly 482af416b3]
Former-commit-id: fce7d5899f
Former-commit-id: 1a4b7cc454
|
2014-10-01 11:53:40 -05:00 |
|
Nate Jensen
|
fd183ed5fe
|
Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
Former-commit-id: 629ab024dc [formerly 7a1508ac90 [formerly 7c5b340168] [formerly 629ab024dc [formerly e0f436a866f2a736b793c3fb2b4fbe770208c6c0]]]
Former-commit-id: 7a1508ac90 [formerly 7c5b340168]
Former-commit-id: 7a1508ac90
Former-commit-id: 8eb01b18bc
|
2014-10-01 11:46:51 -05:00 |
|
Lee Venable
|
5b36e854e7
|
Merge "Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing." into omaha_14.4.1
Former-commit-id: aaf3198443 [formerly 3c26abe355 [formerly d12c4b998e] [formerly aaf3198443 [formerly 7807597daa7cbeb9d988eaadc3539eff876e867a]]]
Former-commit-id: 3c26abe355 [formerly d12c4b998e]
Former-commit-id: 3c26abe355
Former-commit-id: 75a98f8e20
|
2014-10-01 11:45:05 -05:00 |
|
Nathan Bowler
|
883e3074f2
|
Omaha #3596 Adding original, unaltered satellite scripts.
Change-Id: I6441898e986df707376ee61d5952641dc7e9f266
Former-commit-id: 30a565a88b [formerly 8f39df9850 [formerly ce2dac6af9] [formerly 30a565a88b [formerly f52d19b153d443fa643af1d6b763160f0937c603]]]
Former-commit-id: 8f39df9850 [formerly ce2dac6af9]
Former-commit-id: 8f39df9850
Former-commit-id: 896e7fa52c
|
2014-10-01 12:31:57 -04:00 |
|
Robert Blum
|
ff77bd6481
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: d5994a8a6b [formerly 6a775aa2be [formerly a1d23e4198] [formerly d5994a8a6b [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]
Former-commit-id: 6a775aa2be [formerly a1d23e4198]
Former-commit-id: 6a775aa2be
Former-commit-id: 9e885cd270
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
6adc04234e
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 41427a57bb [formerly 131f5ec9f7 [formerly 799ba1babf] [formerly 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]
Former-commit-id: 131f5ec9f7 [formerly 799ba1babf]
Former-commit-id: 131f5ec9f7
Former-commit-id: 8c3c592190
|
2014-10-01 09:46:56 -05:00 |
|
Ron Anderson
|
43667fd746
|
Merge "Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm" into omaha_14.4.1
Former-commit-id: eb73f57321 [formerly 83e7ceb415 [formerly 0750ccc067] [formerly eb73f57321 [formerly 3e2a6efb67a9dda839bafe60bffc1d590ffe236c]]]
Former-commit-id: 83e7ceb415 [formerly 0750ccc067]
Former-commit-id: 83e7ceb415
Former-commit-id: db992519c5
|
2014-10-01 09:20:11 -05:00 |
|
Ron Anderson
|
77f537d3b1
|
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: f44ac32b1e [formerly 35657166ea [formerly ec1530c5e8] [formerly f44ac32b1e [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]
Former-commit-id: 35657166ea [formerly ec1530c5e8]
Former-commit-id: 35657166ea
Former-commit-id: f97651285a
|
2014-09-30 14:09:31 -05:00 |
|
Chris Cody
|
67d58098e5
|
Omaha #3365 Realign AWIPS2_baseline tests
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f
Former-commit-id: 1f9c825de5 [formerly 9397356128 [formerly 98b767f573] [formerly 1f9c825de5 [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]]
Former-commit-id: 9397356128 [formerly 98b767f573]
Former-commit-id: 9397356128
Former-commit-id: c1468c97fb
|
2014-09-30 12:53:20 -05: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 |
|
Nate Jensen
|
c79947a6ca
|
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
Former-commit-id: 3b0296cc99 [formerly 5e97eb494e [formerly 4569b23701] [formerly 3b0296cc99 [formerly 5861d0f99dd2f89a37f72736e139233ea3337605]]]
Former-commit-id: 5e97eb494e [formerly 4569b23701]
Former-commit-id: 5e97eb494e
Former-commit-id: 20607f9d3f
|
2014-09-30 11:58:02 -05:00 |
|
Richard Peter
|
e1824cdc2e
|
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
Former-commit-id: 02fb12501e [formerly b81e0f4549 [formerly 9c0692f861] [formerly 02fb12501e [formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]]]
Former-commit-id: b81e0f4549 [formerly 9c0692f861]
Former-commit-id: b81e0f4549
Former-commit-id: 8e6a3af18c
|
2014-09-30 11:45:25 -05:00 |
|
Mark Peters
|
4cfbeb826a
|
Omaha #3629 Replacing matchElement()
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 776420f2d9 [formerly 6a0703ad98 [formerly 6d59eb314d] [formerly 776420f2d9 [formerly 6f898cc3d7f30651846847c5645ec26ac448ec83]]]
Former-commit-id: 6a0703ad98 [formerly 6d59eb314d]
Former-commit-id: 6a0703ad98
Former-commit-id: 17f328433b
|
2014-09-30 11:39:40 -05:00 |
|
Ron Anderson
|
e8ab282f2e
|
Omaha #3622 Fix null pointer in ServiceBackupLockManager
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: 1c6fa09d4f [formerly 83e46bb3d6 [formerly 437f2fdc47] [formerly 1c6fa09d4f [formerly e6ae629d1667943ae7bf25598f32e2b479e748b1]]]
Former-commit-id: 83e46bb3d6 [formerly 437f2fdc47]
Former-commit-id: 83e46bb3d6
Former-commit-id: edc1a9664a
|
2014-09-30 11:32:30 -05:00 |
|