Richard Peter
|
3a80d5c801
|
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: d2f0ab621f [formerly 05784292b7] [formerly d2f0ab621f [formerly 05784292b7] [formerly 2c21e72bf3 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]]]
Former-commit-id: 2c21e72bf3
Former-commit-id: 168854e078 [formerly 7b9653cdad]
Former-commit-id: b77d5b33aa
|
2014-10-21 10:51:56 -05:00 |
|
Nate Jensen
|
c81c996c4b
|
Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 1798a75f18 [formerly 24aca9cd99] [formerly 1798a75f18 [formerly 24aca9cd99] [formerly 73c03a3379 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]]]
Former-commit-id: 73c03a3379
Former-commit-id: 1854ad5653 [formerly 1e3b551f4b]
Former-commit-id: cf8e567c18
|
2014-10-21 08:55:37 -05:00 |
|
Nathan Bowler
|
2565e3f305
|
Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf
Former-commit-id: 679c836fdc [formerly d9f75f5adc] [formerly 679c836fdc [formerly d9f75f5adc] [formerly 1ff018ccdf [formerly 8b001934bef0d672bce4739accf994eba497b32c]]]
Former-commit-id: 1ff018ccdf
Former-commit-id: 674b6c2dcc [formerly 23950384ee]
Former-commit-id: 5268e32927
|
2014-10-21 07:16:18 -04:00 |
|
Slav Korolev
|
8a6f3b4749
|
Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 19db4c34bb [formerly e517a73d81]
Former-commit-id: de09cba07a
|
2014-10-20 15:06:05 -04:00 |
|
Benjamin Phillippe
|
008b23be1e
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f] [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: fdd16051e8
Former-commit-id: a8ef477042 [formerly 5eec33b078]
Former-commit-id: 3808c125b9
|
2014-10-20 12:42:19 -05:00 |
|
Nate Jensen
|
3709881113
|
Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: dd9f6fb257 [formerly 1245df2e0c] [formerly dd9f6fb257 [formerly 1245df2e0c] [formerly 401390dd9b [formerly 1435184cbc94eb9ee2ac97a5616566c421092805]]]
Former-commit-id: 401390dd9b
Former-commit-id: 168396211b [formerly 54602afa68]
Former-commit-id: 6477939d2d
|
2014-10-20 11:45:50 -05:00 |
|
Ron Anderson
|
5f246475bc
|
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: eae4393aa5 [formerly 82a0b4bb9b] [formerly eae4393aa5 [formerly 82a0b4bb9b] [formerly 1a01842639 [formerly 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd]]]
Former-commit-id: 1a01842639
Former-commit-id: 37973d264e [formerly e113d88477]
Former-commit-id: ae5402fe97
|
2014-10-16 18:44:38 -05:00 |
|
Ron Anderson
|
77183528ae
|
Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 734ca75957 [formerly 2fbf61748d] [formerly 734ca75957 [formerly 2fbf61748d] [formerly 2781c4369b [formerly 09e39d4f85c8e853475b9f6059a748291e4d1bd7]]]
Former-commit-id: 2781c4369b
Former-commit-id: 2ff4c96038 [formerly aa0749903b]
Former-commit-id: cb5846b2ab
|
2014-10-16 18:32:04 -05:00 |
|
Nate Jensen
|
e657d347e8
|
Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: 306485851f [formerly cd5e4b9a08] [formerly 306485851f [formerly cd5e4b9a08] [formerly 73e15036de [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]]]
Former-commit-id: 73e15036de
Former-commit-id: 2b6bd2cb0c [formerly 714d812e17]
Former-commit-id: 1caa1c9b7a
|
2014-10-16 17:11:26 -05:00 |
|
Nate Jensen
|
46226566e8
|
Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311
Former-commit-id: 2fc8887e08 [formerly 5dd168e76a] [formerly 2fc8887e08 [formerly 5dd168e76a] [formerly d5a5d55265 [formerly db613b63005c2763ca94851182042867aedd43c9]]]
Former-commit-id: d5a5d55265
Former-commit-id: 957e4c3b2c [formerly 1f970283b5]
Former-commit-id: 97b2b4c5b5
|
2014-10-15 14:46:12 -05:00 |
|
Steve Harris
|
3954f6981f
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4fde31539e [formerly aff75d954b] [formerly 4fde31539e [formerly aff75d954b] [formerly f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: f3017b859e [formerly da238d6478]
Former-commit-id: 3f6bdf84c5
|
2014-10-15 08:42:02 -05:00 |
|
Mark Peters
|
1f13d8a2b9
|
Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49
Former-commit-id: 4a121ecbd5 [formerly 153cf12248] [formerly 4a121ecbd5 [formerly 153cf12248] [formerly 06c9d6f7e9 [formerly 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8]]]
Former-commit-id: 06c9d6f7e9
Former-commit-id: 0cebb38b62 [formerly d67a6327c0]
Former-commit-id: a026684e07
|
2014-10-14 17:13:23 -05:00 |
|
Mark Peters
|
76e4a0d7e9
|
Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4
Former-commit-id: d397d917c9 [formerly e7388847d6] [formerly d397d917c9 [formerly e7388847d6] [formerly 708f961708 [formerly 3a0cc08b25395cb168c8344c00fb17fb016aae36]]]
Former-commit-id: 708f961708
Former-commit-id: 64ec038793 [formerly 613423b7d4]
Former-commit-id: 0563436c65
|
2014-10-14 11:13:03 -05:00 |
|
Brian Clements
|
46845ee755
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 78c2aa3650 [formerly 3a12ab9bdf] [formerly 78c2aa3650 [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: d2042e3485 [formerly 470a695a1a]
Former-commit-id: cf3e570667
|
2014-10-13 16:32:41 -05:00 |
|
Nathan Bowler
|
0c28de9d2a
|
Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba
Former-commit-id: db82cdbdfe [formerly 1df2418409] [formerly db82cdbdfe [formerly 1df2418409] [formerly 33e141dd38 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]]
Former-commit-id: 33e141dd38
Former-commit-id: 0a267a8c22 [formerly 93b2dfc2c9]
Former-commit-id: 815d28aef9
|
2014-10-10 13:20:04 -04:00 |
|
Shawn.Hooper
|
aad1970cf0
|
ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6
Former-commit-id: bfa9eb0dea [formerly cea5061c61] [formerly bfa9eb0dea [formerly cea5061c61] [formerly 0c61661989 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]]
Former-commit-id: 0c61661989
Former-commit-id: 26c4187518 [formerly c2acd70bc5]
Former-commit-id: 7d9fe08ca9
|
2014-10-10 13:14:25 -04:00 |
|
Richard Peter
|
47def22dd0
|
Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: f0243b5e5f [formerly e7fbc0c012] [formerly f0243b5e5f [formerly e7fbc0c012] [formerly b41be59fd6 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]]
Former-commit-id: b41be59fd6
Former-commit-id: f725b827eb [formerly 421fb43d60]
Former-commit-id: 8f4e482678
|
2014-10-10 11:13:12 -05:00 |
|
Benjamin Phillippe
|
ad58fdbb57
|
Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: a7d5db57d8 [formerly 825aa0d5b2] [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]
Former-commit-id: df6b3b3832
Former-commit-id: 48f13629a7 [formerly d7c1c5805f]
Former-commit-id: e2ec6c4a0b
|
2014-10-10 10:59:16 -05:00 |
|
Nate Jensen
|
753bb66398
|
Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e
Former-commit-id: 974113a995 [formerly afb64bc4bb] [formerly 974113a995 [formerly afb64bc4bb] [formerly b638e6e0f6 [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]]
Former-commit-id: b638e6e0f6
Former-commit-id: 57fac3e239 [formerly c552655866]
Former-commit-id: e3eb361995
|
2014-10-10 09:01:29 -05:00 |
|
Nate Jensen
|
b2d2db7eb2
|
Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: d10d25e425 [formerly 3cc3b38539] [formerly d10d25e425 [formerly 3cc3b38539] [formerly ee51fe1977 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]]
Former-commit-id: ee51fe1977
Former-commit-id: 3cca074583 [formerly 2c17405d5f]
Former-commit-id: 9098eaac2a
|
2014-10-09 18:30:33 -05:00 |
|
Mark Peters
|
c906433c99
|
Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27
Former-commit-id: c20d19a2d3 [formerly cf1bff0d02] [formerly c20d19a2d3 [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: 95a34bd053 [formerly 5b5fac85b8]
Former-commit-id: c3665bccd9
|
2014-10-09 15:30:23 -05:00 |
|
Mark Peters
|
4864414e11
|
Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513
Former-commit-id: 7f3eb45256 [formerly 087dabe3bb] [formerly 7f3eb45256 [formerly 087dabe3bb] [formerly 63069f5adc [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]]
Former-commit-id: 63069f5adc
Former-commit-id: 1af7b2d388 [formerly bcb39bffb5]
Former-commit-id: a87212a8d7
|
2014-10-09 11:17:53 -05:00 |
|
Ben Steffensmeier
|
f850818be8
|
Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: 314014503f [formerly b7c0eb89ad] [formerly 314014503f [formerly b7c0eb89ad] [formerly b865762b4f [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]]
Former-commit-id: b865762b4f
Former-commit-id: ea47d859c6 [formerly 44d2085dad]
Former-commit-id: 254c1e7130
|
2014-10-08 12:21:03 -05:00 |
|
Juliya Dynina
|
d85ac13c86
|
Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 1fb3bdb8a1 [formerly 240917cf96] [formerly 1fb3bdb8a1 [formerly 240917cf96] [formerly 4911f61f10 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]]]
Former-commit-id: 4911f61f10
Former-commit-id: 3504f48099 [formerly 404d6667fb]
Former-commit-id: 09ebdd8a25
|
2014-10-08 12:00:39 -05:00 |
|
Nate Jensen
|
a3f23422a7
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 2502976504 [formerly 4e582d0bde] [formerly 2502976504 [formerly 4e582d0bde] [formerly 5cf1821a6a [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]]
Former-commit-id: 5cf1821a6a
Former-commit-id: 53c464b647 [formerly 32fda0ae19]
Former-commit-id: 9135b7458f
|
2014-10-08 11:36:44 -05:00 |
|
Richard Peter
|
3998dac2f0
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b] [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]
Former-commit-id: a9562d992c
Former-commit-id: 901877ec7a [formerly 1be207dccb]
Former-commit-id: 1ec3bdd877
|
2014-10-07 16:32:48 -05:00 |
|
Richard Peter
|
7bb803b504
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: ee86734625 [formerly 1adac05f5a] [formerly ee86734625 [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: 4f056d76c8 [formerly c6cb389a3d]
Former-commit-id: 327d82ed02
|
2014-10-07 15:13:11 -05:00 |
|
Sean Webb
|
89720ee6a6
|
Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: c90be3ba42 [formerly c3f3140c4f] [formerly c90be3ba42 [formerly c3f3140c4f] [formerly 01b52daea2 [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]]]
Former-commit-id: 01b52daea2
Former-commit-id: 8fa1b81841 [formerly e72d2cdc73]
Former-commit-id: 4659b14c23
|
2014-10-07 14:04:58 -05:00 |
|
Kevin.Johnson
|
99b25084ee
|
ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae
Former-commit-id: dcecf025a2 [formerly 355274e7ac] [formerly dcecf025a2 [formerly 355274e7ac] [formerly 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]]
Former-commit-id: 5cf5cac9f7
Former-commit-id: 617128a462 [formerly b0e68c1ed1]
Former-commit-id: 6698928cff
|
2014-10-07 14:55:41 -04:00 |
|
Nate Jensen
|
12e3c3ff75
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: affc326eb7 [formerly 11f460f876] [formerly affc326eb7 [formerly 11f460f876] [formerly 726eea342f [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]
Former-commit-id: 726eea342f
Former-commit-id: 4267d54502 [formerly 557c040868]
Former-commit-id: bf0eb369b3
|
2014-10-07 13:53:43 -05:00 |
|
Steve Harris
|
7c4bb336e1
|
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: 39b2199cec [formerly ad4393bea3] [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]
Former-commit-id: c9e37bf440
Former-commit-id: fc424d7336 [formerly fc35b7313d]
Former-commit-id: f370a2f54e
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
eda2463f7e
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: 2637d1b07f [formerly 773619f741] [formerly 2637d1b07f [formerly 773619f741] [formerly ec37971eff [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]
Former-commit-id: ec37971eff
Former-commit-id: 67bece24d4 [formerly c964fb1e80]
Former-commit-id: c148e3e56f
|
2014-10-07 10:43:47 -05:00 |
|
Brian Clements
|
49bb8437f6
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: 090a787f8d [formerly f39ffcc63f] [formerly 090a787f8d [formerly f39ffcc63f] [formerly 81c73519c2 [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]
Former-commit-id: 81c73519c2
Former-commit-id: 260b3bab88 [formerly c3d7cd6e7f]
Former-commit-id: 639b2c2510
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
8aac93aeed
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]
Former-commit-id: 997bfd689d
Former-commit-id: 77c2dcd170 [formerly 7e910088c9]
Former-commit-id: 1c6068ee84
|
2014-10-06 20:00:19 -05:00 |
|
Qinglu.Lin
|
0c89c85435
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 8372c15a61 [formerly 636f054077] [formerly 8372c15a61 [formerly 636f054077] [formerly 47be3aa143 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]]]
Former-commit-id: 47be3aa143
Former-commit-id: 58948e5e7c [formerly 4589f2e183]
Former-commit-id: 0ea296f865
|
2014-10-06 16:05:26 -04:00 |
|
Steve Harris
|
afd3d3fa2d
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314] [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 2db03d95b3
Former-commit-id: bcf1265a16 [formerly 3542caf090]
Former-commit-id: cfd49c8ca0
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
763e75f35b
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 24bf870977 [formerly 28545083c5] [formerly 24bf870977 [formerly 28545083c5] [formerly 05ae6c5d9b [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]
Former-commit-id: 05ae6c5d9b
Former-commit-id: 7a5bc79ac1 [formerly 8250390a62]
Former-commit-id: 53441b1866
|
2014-10-06 09:08:03 -05:00 |
|
Richard Peter
|
f07a0470ee
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 2422c00fbd [formerly 5a0dc20480] [formerly 2422c00fbd [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]
Former-commit-id: b5f23b8b98
Former-commit-id: 84a1b71e23 [formerly 4ada2c1c77]
Former-commit-id: c6171b84c8
|
2014-10-03 14:14:16 -05:00 |
|
Brian.Dyke
|
918de34464
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 85d83aefe0 [formerly f440da9c70] [formerly 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]
Former-commit-id: 92762f46c7
Former-commit-id: 64aef1a783 [formerly 4dbdf9de26]
Former-commit-id: 91f89ee1f6
|
2014-10-03 14:04:46 -04:00 |
|
Steve Harris
|
e05d31ae36
|
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: f4b771ea72 [formerly da463c484e] [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 306826aed9 [formerly 523cedbb56]
Former-commit-id: 57f5294f08
|
2014-10-03 10:18:34 -05:00 |
|
Mark Peters
|
eda9693e85
|
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: ffe3444650 [formerly 955f21a85c] [formerly ffe3444650 [formerly 955f21a85c] [formerly fb62a1e35b [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]
Former-commit-id: fb62a1e35b
Former-commit-id: 77da058a9f [formerly 6315da5482]
Former-commit-id: f9d5dca0e5
|
2014-10-02 15:36:22 -05:00 |
|
Brian.Dyke
|
572bbdd019
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: db665d3876 [formerly 2a911984f0] [formerly db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 46956a01c6 [formerly 72ea2fbe48]
Former-commit-id: a3ccdd9704
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
e100894074
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c [formerly e77f1e126e]
Former-commit-id: 1d2dfd264a
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
c853463f73
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d4888adc0f [formerly f47840e4d9] [formerly d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 277b6e4b36 [formerly 36d377e08d]
Former-commit-id: 7e465baead
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
0fa5e7da1a
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 31f073ee3a [formerly 4bc465bfbd] [formerly 31f073ee3a [formerly 4bc465bfbd] [formerly 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]
Former-commit-id: 97464ea153
Former-commit-id: 0915cb28b0 [formerly e76ee74410]
Former-commit-id: 1d5c3fb6d4
|
2014-10-02 10:15:34 -04:00 |
|
Steve Harris
|
18d68410e5
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 09d8955b31 [formerly e201e1a493] [formerly 09d8955b31 [formerly e201e1a493] [formerly cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]
Former-commit-id: cc34483b0b
Former-commit-id: 8a627b9bf6 [formerly d711c1b67b]
Former-commit-id: 074e12da64
|
2014-10-02 08:09:02 -05:00 |
|
Shawn.Hooper
|
5a228f5a5c
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: 22c3fde0ef [formerly f9428ace1f] [formerly 22c3fde0ef [formerly f9428ace1f] [formerly ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 9ecf241616 [formerly f2d7288970]
Former-commit-id: e5b5160a51
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
ea401b327b
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 0be927be2d [formerly 5ed17c0e24] [formerly 0be927be2d [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: 4df4eb9c2b [formerly 914da168c8]
Former-commit-id: 8184df119d
|
2014-10-01 15:36:06 -04:00 |
|
Nathan Bowler
|
8f18ed535e
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 2d5d90c055 [formerly 368b6341b0] [formerly 2d5d90c055 [formerly 368b6341b0] [formerly e4779f2e66 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]
Former-commit-id: e4779f2e66
Former-commit-id: b52c1bcafd [formerly a72fec1b38]
Former-commit-id: ae5bde3c3d
|
2014-10-01 14:57:16 -04:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|