Steve Harris
|
056b2fa457
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]
Former-commit-id: 2257eb5ddd
Former-commit-id: 7768ee1c36
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
8df88e1b77
|
13.5.3-3 baseline
Former-commit-id: 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]
Former-commit-id: baa036cd62
Former-commit-id: 883ad32443
|
2013-10-31 12:52:07 -04:00 |
|
Steve Harris
|
67ab6c135e
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]
Former-commit-id: 0ab03f2796
Former-commit-id: 5aac54b9f9
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
235d1f8583
|
13.5.3-2 baseline
Former-commit-id: 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]
Former-commit-id: 055783655b
Former-commit-id: c6d951b390
|
2013-10-30 12:53:25 -04:00 |
|
Richard Peter
|
89e5781b13
|
Issue #2362: Fix merge issue
Former-commit-id: 51bf66d456 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]
Former-commit-id: 814b1878b2
Former-commit-id: 6dba9925c3
|
2013-10-28 12:13:04 -05:00 |
|
Steve Harris
|
116d3822ac
|
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]
Former-commit-id: 702b66ee52
Former-commit-id: 64062fa355
|
2013-10-25 10:51:42 -05:00 |
|
Steve Harris
|
e67aaa07b7
|
13.5.2-11 baseline
Former-commit-id: cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]
Former-commit-id: b820a28276
Former-commit-id: 9215a213a1
|
2013-10-25 09:45:58 -04:00 |
|
Richard Peter
|
f84e84989b
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]
Former-commit-id: 31c87ab01e
Former-commit-id: f0c05dc6d8
|
2013-10-08 09:45:27 -05:00 |
|
Steve Harris
|
553238dca4
|
13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 94aa71fcd1
Former-commit-id: 8ba7d392d6
|
2013-10-04 11:30:03 -04:00 |
|
Richard Peter
|
c3555c1ad4
|
Issue #2362: Fix gpd-ingest to not register with distributionSrv
Former-commit-id: 40dc79bbaa [formerly 1ece015398 [formerly 1ad1cb6b3d6d7a4fd0bef33ac9691cfdad4612d7]]
Former-commit-id: 1ece015398
Former-commit-id: 0343eb206b
|
2013-09-26 14:32:17 -05:00 |
|
Richard Peter
|
7455465049
|
Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
Former-commit-id: 3a859792ae [formerly 4a32664d5e [formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]
Former-commit-id: 4a32664d5e
Former-commit-id: 3d7af2ceb3
|
2013-09-24 12:57:48 -05:00 |
|
Richard Peter
|
fb9a34e22a
|
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]
Former-commit-id: 92a45d77bb
Former-commit-id: 4b934caa41
|
2013-09-24 12:29:16 -05:00 |
|
Steve Harris
|
0c4b4f2f51
|
13.5.1.1-4 baseline
Former-commit-id: f578f90a0b [formerly f58a17c8b3 [formerly 128f9c8e0e2d3706c39e259170b049a6c234be4c]]
Former-commit-id: f58a17c8b3
Former-commit-id: 87ffb2c668
|
2013-09-23 10:29:32 -04:00 |
|
Steve Harris
|
265a5590e8
|
13.5.1.1-3 baseline
Former-commit-id: 06694a32ce [formerly 1f4c8f317f [formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]
Former-commit-id: 1f4c8f317f
Former-commit-id: a4bb855c1f
|
2013-09-23 10:16:44 -04:00 |
|
Steve Harris
|
3cb4574635
|
13.5.2-6 baseline
Former-commit-id: 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3821475d4e
Former-commit-id: 059549438a
|
2013-09-23 10:03:15 -04:00 |
|
Richard Peter
|
c9853d3736
|
Issue #2327: Manual ingest now routes by plugin
Change-Id: I7627049a4881ecaa572c0f4e86d31092ce79871e
Former-commit-id: 7dd9dc40fd [formerly c64e1ecae3 [formerly 311a74bbb65dc1fd8337ba9b004ec977da24a5f8]]
Former-commit-id: c64e1ecae3
Former-commit-id: 93c51b648c
|
2013-09-19 11:44:28 -05:00 |
|
Richard Peter
|
df374f45aa
|
Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: da4faa645d [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]
Former-commit-id: 4b6e4fcd3a
Former-commit-id: a0d6ce6dbb
|
2013-09-12 13:47:43 -05:00 |
|
Richard Peter
|
3e5a619134
|
Issue #2298: Remove setPluginName python calls.
Former-commit-id: 799fe37bca [formerly 6b93f9ad06 [formerly b666f99d3dc79b90525177072e2448077c39545a]]
Former-commit-id: 6b93f9ad06
Former-commit-id: 7d1cf6881e
|
2013-09-12 12:49:23 -05:00 |
|
Richard Peter
|
04c64843dd
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 80e7b265dd [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]
Former-commit-id: 41550aaf9f
Former-commit-id: feeddb503f
|
2013-09-12 12:48:36 -05:00 |
|
Steve Harris
|
3d0b711ccf
|
13.5.2-4 baseline
Former-commit-id: 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: e3c935d48b
Former-commit-id: 595e7bc0d9
|
2013-09-12 11:13:59 -04:00 |
|
Steve Harris
|
8dcd159377
|
13.5.2-2 baseline
Former-commit-id: 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 4a47fb97c5
Former-commit-id: 8cde3b2b54
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
3cd0b2dfc6
|
13.5.2-1 baseline
Former-commit-id: 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 73dd0f166c
Former-commit-id: 894d2425b2
|
2013-08-28 09:43:48 -04:00 |
|
Greg Armendariz
|
429898edc6
|
13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 29b823fee4
Former-commit-id: f0b62a22bf
|
2013-08-08 17:00:36 -04:00 |
|
Greg Armendariz
|
34e0218b59
|
13.5.1-12 baseline
Former-commit-id: fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: c9898ba8d1
Former-commit-id: 01d067cff9
|
2013-08-08 15:34:01 -04:00 |
|
Steve Harris
|
1be9abc02f
|
13.5.1-9 baseline
Former-commit-id: 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 97fe6a670f
Former-commit-id: 778df21de9
|
2013-08-01 09:20:23 -04:00 |
|
Steve Harris
|
52da6c54db
|
13.5.1-8 baseline
Former-commit-id: dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: 3bece5e5d0
Former-commit-id: 392faf86e7
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
67299457b1
|
13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: bf58a81b38
Former-commit-id: 630705aa3f
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
e375a74bc8
|
13.5.1-6 baseline
Former-commit-id: b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: 7e09fa5a0b
Former-commit-id: 5894853996
|
2013-07-10 10:04:22 -04:00 |
|
Greg Armendariz
|
ed9da994c7
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: 492f92ef7b
Former-commit-id: 82aabf1066
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
2487a8b435
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
a0ff6c20ea
|
13.5.1-3 baseline
Former-commit-id: 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 63803c1424
Former-commit-id: d8176d4a4c
|
2013-06-24 09:29:43 -04:00 |
|
Steve Harris
|
7fe15db2f8
|
13.5.1-2 baseline
Former-commit-id: 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: adb779323d
Former-commit-id: bc60b22f00
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
5d99df9969
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
ffcce90f3f
|
13.4.1-14 baseline
Former-commit-id: 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: c749e122eb
Former-commit-id: be236eb722
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
623f813923
|
13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: 6a97b4325a
Former-commit-id: 397bbf674a
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
294c127b0a
|
13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 9a403b3615
Former-commit-id: 68fe2134b8
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
02dba50c00
|
13.4.1-8 baseline
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
ef5893b279
|
13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: d33e5861aa
Former-commit-id: 99f4569650
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
79567aac51
|
13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
196767d525
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
e621424fcb
|
13.3.1-18 baseline
Former-commit-id: ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: a2b098d86d
Former-commit-id: f3e79bcc9d
|
2013-04-03 14:58:29 -05:00 |
|
Steve Harris
|
70fece2da1
|
13.3.1-15 baseline
Former-commit-id: 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: eb1dab3864
Former-commit-id: 4cf3ad6abb
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
f9b3430485
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
6f374b35d0
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
23faf84455
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: a72254cc75
Former-commit-id: 97d2f521e4
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
4eef6862d6
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
e0406d3183
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
d176ec1f38
|
13.2.1-8 baseline
Former-commit-id: 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
934a76bd7e
|
13.2.1-7 baseline
Former-commit-id: 9c23bf6e73 [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 6fad5da5ed
Former-commit-id: 0b7287b130
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
ed224fde88
|
13.2.1-4 baseline
Former-commit-id: 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 8f2e7d4437
Former-commit-id: ae2859d5a2
|
2013-01-31 11:40:31 -06:00 |
|