Commit graph

127 commits

Author SHA1 Message Date
Steve Harris
0dd6732b0e Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 18609de83d [formerly 3c862170db [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]
Former-commit-id: 3c862170db
Former-commit-id: 569ecb35d5
2013-11-01 13:23:28 -05:00
Steve Harris
667ec69fbc 13.5.3-4 baseline
Former-commit-id: da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]
Former-commit-id: 8aeae1c481
Former-commit-id: 0ee69293ec
2013-11-01 14:20:00 -04:00
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
Bryan Kowal
bf245a7f89 Re-enable the build of the awips2 rpm.
Former-commit-id: 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]
Former-commit-id: 40e8a94235
Former-commit-id: 16e83e3455
2013-10-30 15:24:01 -05: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
Steve Harris
a474e60927 Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]
Former-commit-id: 602f138493
Former-commit-id: f04be86698
2013-10-28 14:39:22 -05:00
Steve Harris
9577afee9e 13.5.3-1 baseline
Former-commit-id: 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]
Former-commit-id: 1d8a2026f6
Former-commit-id: 059083170d
2013-10-28 10:30:57 -04: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
e755dbb114 13.5.2-13 baseline
Former-commit-id: e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]
Former-commit-id: 2100a15013
Former-commit-id: ba50a26e70
2013-10-25 10:06:56 -04:00
Steve Harris
845d49e370 13.5.2-12 baseline
Former-commit-id: bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]
Former-commit-id: a532896473
Former-commit-id: e2b9baf2ed
2013-10-25 09:59:15 -04: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
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
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
Bryan Kowal
99ac59a375 Issue #2368 - restore yajsw-wrapped qpid changes to 13.5.1.1
Former-commit-id: bb6db1ee7b [formerly 8955c3a9d4 [formerly b8f277fb13562bf0c7d07700940f75074db1f93b]]
Former-commit-id: 8955c3a9d4
Former-commit-id: d751cdf6be
2013-09-16 17:05:17 -05:00
Bryan Kowal
f553e47d72 Issue #2368 - apply java qpid patch
Former-commit-id: d6eca92d11 [formerly 164598e584 [formerly 1f29b62624650652a4a1b347dfd70fc161be0f5e]]
Former-commit-id: 164598e584
Former-commit-id: 4c2871a59b
2013-09-16 16:15:50 -05:00
Richard Peter
449692aeff Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: a5a7816b98 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]
Former-commit-id: 5111debc92
Former-commit-id: b803359eb4
2013-09-15 13:44:17 -05:00
Bryan Kowal
1ff8ab2db2 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: f1cfc60a93 [formerly d322c993c0 [formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]
Former-commit-id: d322c993c0
Former-commit-id: 1d0e58f85d
2013-09-13 10:03:08 -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
dcaa4767f3 13.5.1.1-1 baseline
Former-commit-id: d2217643ff [formerly 5b0cd7cbcc [formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]
Former-commit-id: 5b0cd7cbcc
Former-commit-id: b1fb0f9236
2013-09-12 11:03:55 -04:00
Steve Harris
12f85e6c92 13.5.1-19 baseline
Former-commit-id: 3b296a33b0 [formerly 5b643065e9 [formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]
Former-commit-id: 5b643065e9
Former-commit-id: d50a0f64c9
2013-09-03 09:48:08 -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
Steve Harris
80d8236464 13.5.1-18 baseline
Former-commit-id: 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: afb34814dd
Former-commit-id: d931b80e70
2013-08-22 09:12:43 -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
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
9a7ef48967 13.4.1-13 baseline
Former-commit-id: de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]
Former-commit-id: 87b9712009
Former-commit-id: e3b8086bd0
2013-05-29 16:30:09 -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
65d8f51034 13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: 2edee36158
Former-commit-id: d6319a2ca6
2013-05-21 09:19:25 -04:00
Steve Harris
301821988e 13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: bcf7f15c90
Former-commit-id: 88eee9cbfa
2013-05-16 11:12:07 -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
81bc07bff4 13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 4c6ff79e71
Former-commit-id: 8072752c77
2013-05-13 12:58:10 -04:00
Steve Harris
5544c4a072 13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]
Former-commit-id: 8379977673
Former-commit-id: 6fcbb5ae6b
2013-05-07 08:47:39 -04:00
Steve Harris
29777b406e 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]
Former-commit-id: 1a6fd7edfd
Former-commit-id: 344054d3e9
2013-05-03 09:20:30 -05: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