Nate Jensen
|
1e3b551f4b
|
Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 24aca9cd99 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]
Former-commit-id: 73c03a3379
|
2014-10-21 08:55:37 -05:00 |
|
Nathan Bowler
|
23950384ee
|
Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf
Former-commit-id: d9f75f5adc [formerly 8b001934bef0d672bce4739accf994eba497b32c]
Former-commit-id: 1ff018ccdf
|
2014-10-21 07:16:18 -04:00 |
|
Slav Korolev
|
e517a73d81
|
Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]
Former-commit-id: 8971f40dc2
|
2014-10-20 15:06:05 -04:00 |
|
Nate Jensen
|
54602afa68
|
Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: 1245df2e0c [formerly 1435184cbc94eb9ee2ac97a5616566c421092805]
Former-commit-id: 401390dd9b
|
2014-10-20 11:45:50 -05:00 |
|
Ron Anderson
|
e113d88477
|
Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
Former-commit-id: 82a0b4bb9b [formerly 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd]
Former-commit-id: 1a01842639
|
2014-10-16 18:44:38 -05:00 |
|
Ron Anderson
|
aa0749903b
|
Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 2fbf61748d [formerly 09e39d4f85c8e853475b9f6059a748291e4d1bd7]
Former-commit-id: 2781c4369b
|
2014-10-16 18:32:04 -05:00 |
|
Nate Jensen
|
714d812e17
|
Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: cd5e4b9a08 [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]
Former-commit-id: 73e15036de
|
2014-10-16 17:11:26 -05:00 |
|
Nate Jensen
|
1f970283b5
|
Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311
Former-commit-id: 5dd168e76a [formerly db613b63005c2763ca94851182042867aedd43c9]
Former-commit-id: d5a5d55265
|
2014-10-15 14:46:12 -05:00 |
|
Steve Harris
|
da238d6478
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]
Former-commit-id: f2fdf98d2f
|
2014-10-15 08:42:02 -05:00 |
|
Mark Peters
|
d67a6327c0
|
Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49
Former-commit-id: 153cf12248 [formerly 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8]
Former-commit-id: 06c9d6f7e9
|
2014-10-14 17:13:23 -05:00 |
|
Mark Peters
|
613423b7d4
|
Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4
Former-commit-id: e7388847d6 [formerly 3a0cc08b25395cb168c8344c00fb17fb016aae36]
Former-commit-id: 708f961708
|
2014-10-14 11:13:03 -05:00 |
|
Brian Clements
|
470a695a1a
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]
Former-commit-id: 6d6d3d26e6
|
2014-10-13 16:32:41 -05:00 |
|
Nathan Bowler
|
93b2dfc2c9
|
Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba
Former-commit-id: 1df2418409 [formerly e1470cb4ce03b49ac85936760469a22786195a99]
Former-commit-id: 33e141dd38
|
2014-10-10 13:20:04 -04:00 |
|
Shawn.Hooper
|
c2acd70bc5
|
ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6
Former-commit-id: cea5061c61 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]
Former-commit-id: 0c61661989
|
2014-10-10 13:14:25 -04:00 |
|
Richard Peter
|
421fb43d60
|
Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: e7fbc0c012 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]
Former-commit-id: b41be59fd6
|
2014-10-10 11:13:12 -05:00 |
|
Benjamin Phillippe
|
d7c1c5805f
|
Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: 825aa0d5b2 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]
Former-commit-id: df6b3b3832
|
2014-10-10 10:59:16 -05:00 |
|
Nate Jensen
|
c552655866
|
Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e
Former-commit-id: afb64bc4bb [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]
Former-commit-id: b638e6e0f6
|
2014-10-10 09:01:29 -05:00 |
|
Nate Jensen
|
2c17405d5f
|
Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: 3cc3b38539 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]
Former-commit-id: ee51fe1977
|
2014-10-09 18:30:33 -05:00 |
|
Mark Peters
|
5b5fac85b8
|
Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27
Former-commit-id: cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]
Former-commit-id: 6bb4f5dbdf
|
2014-10-09 15:30:23 -05:00 |
|
Mark Peters
|
bcb39bffb5
|
Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513
Former-commit-id: 087dabe3bb [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]
Former-commit-id: 63069f5adc
|
2014-10-09 11:17:53 -05:00 |
|
Ben Steffensmeier
|
44d2085dad
|
Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: b7c0eb89ad [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]
Former-commit-id: b865762b4f
|
2014-10-08 12:21:03 -05:00 |
|
Juliya Dynina
|
404d6667fb
|
Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 240917cf96 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]
Former-commit-id: 4911f61f10
|
2014-10-08 12:00:39 -05:00 |
|
Nate Jensen
|
32fda0ae19
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 4e582d0bde [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]
Former-commit-id: 5cf1821a6a
|
2014-10-08 11:36:44 -05:00 |
|
Richard Peter
|
1be207dccb
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]
Former-commit-id: a9562d992c
|
2014-10-07 16:32:48 -05:00 |
|
Richard Peter
|
c6cb389a3d
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]
Former-commit-id: 1bc24c3be2
|
2014-10-07 15:13:11 -05:00 |
|
Sean Webb
|
e72d2cdc73
|
Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: c3f3140c4f [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]
Former-commit-id: 01b52daea2
|
2014-10-07 14:04:58 -05:00 |
|
Kevin.Johnson
|
b0e68c1ed1
|
ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae
Former-commit-id: 355274e7ac [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]
Former-commit-id: 5cf5cac9f7
|
2014-10-07 14:55:41 -04:00 |
|
Nate Jensen
|
557c040868
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 11f460f876 [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]
Former-commit-id: 726eea342f
|
2014-10-07 13:53:43 -05:00 |
|
Steve Harris
|
fc35b7313d
|
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: ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]
Former-commit-id: c9e37bf440
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
c964fb1e80
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]
Former-commit-id: ec37971eff
|
2014-10-07 10:43:47 -05:00 |
|
Brian Clements
|
c3d7cd6e7f
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: f39ffcc63f [formerly a69773742e571a334ef1fd000ff8311805f9c737]
Former-commit-id: 81c73519c2
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
7e910088c9
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]
Former-commit-id: 997bfd689d
|
2014-10-06 20:00:19 -05:00 |
|
Qinglu.Lin
|
4589f2e183
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 636f054077 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]
Former-commit-id: 47be3aa143
|
2014-10-06 16:05:26 -04:00 |
|
Steve Harris
|
3542caf090
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]
Former-commit-id: 2db03d95b3
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
8250390a62
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 28545083c5 [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]
Former-commit-id: 05ae6c5d9b
|
2014-10-06 09:08:03 -05:00 |
|
Richard Peter
|
4ada2c1c77
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 5a0dc20480 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]
Former-commit-id: b5f23b8b98
|
2014-10-03 14:14:16 -05:00 |
|
Brian.Dyke
|
4dbdf9de26
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]
Former-commit-id: 92762f46c7
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
523cedbb56
|
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: da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]
Former-commit-id: 2616fe04b6
|
2014-10-03 10:18:34 -05:00 |
|
Mark Peters
|
6315da5482
|
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: 955f21a85c [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]
Former-commit-id: fb62a1e35b
|
2014-10-02 15:36:22 -05:00 |
|
Brian.Dyke
|
72ea2fbe48
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]
Former-commit-id: 20dd249d2c
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
e77f1e126e
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]
Former-commit-id: f3f95aabb0
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
36d377e08d
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]
Former-commit-id: 2ac30f6c22
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
e76ee74410
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 4bc465bfbd [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]
Former-commit-id: 97464ea153
|
2014-10-02 10:15:34 -04:00 |
|
Steve Harris
|
d711c1b67b
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]
Former-commit-id: cc34483b0b
|
2014-10-02 08:09:02 -05:00 |
|
Shawn.Hooper
|
f2d7288970
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: f9428ace1f [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]
Former-commit-id: ae02cbc2da
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
914da168c8
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]
Former-commit-id: a4bfbea3c2
|
2014-10-01 15:36:06 -04:00 |
|
Nathan Bowler
|
a72fec1b38
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 368b6341b0 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]
Former-commit-id: e4779f2e66
|
2014-10-01 14:57:16 -04:00 |
|
dmsys
|
b884e5e32d
|
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: 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]
Former-commit-id: 9f4560c480
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
fa29bf050e
|
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
Former-commit-id: 4569b23701 [formerly 5861d0f99dd2f89a37f72736e139233ea3337605]
Former-commit-id: 3b0296cc99
|
2014-09-30 11:58:02 -05:00 |
|
Richard Peter
|
4e05ef95b6
|
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
Former-commit-id: 9c0692f861 [formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]
Former-commit-id: 02fb12501e
|
2014-09-30 11:45:25 -05:00 |
|