Richard Peter
b803359eb4
Issue #2368 : Update JMS routing to set message persistence and durability at the config level
...
Former-commit-id: a5a7816b985111debc92
2013-09-15 13:44:17 -05:00
Bryan Kowal
1d0e58f85d
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: f1cfc60a93d322c993c0
2013-09-13 10:03:08 -05:00
Steve Harris
029d8287dd
Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
...
Former-commit-id: efa925587dd6dfaa0927
2013-09-12 10:28:59 -05:00
Steve Harris
b1fb0f9236
13.5.1.1-1 baseline
...
Former-commit-id: d2217643ff5b0cd7cbcc
2013-09-12 11:03:55 -04:00
Ben Steffensmeier
2d4d5653b0
Issue #2341 relocate the warngen button.
...
Former-commit-id: e5b20903928a97c28ac5
2013-09-09 14:13:20 -05:00
Ron Anderson
7dad82b511
Issue #2329 Cleaned up combinations file saving
...
Change-Id: I61eea505c36e10239dbb3147bfcc46e513504550
Former-commit-id: d069127c2868f868117f
2013-09-09 14:13:08 -05:00
Steve Harris
fb4173d5dd
13.5.1-20 baseline
...
Former-commit-id: 5f2a2434a6a60b097050
2013-09-03 09:58:18 -04:00
Steve Harris
d50a0f64c9
13.5.1-19 baseline
...
Former-commit-id: 3b296a33b05b643065e9
2013-09-03 09:48:08 -04:00
Steve Harris
d931b80e70
13.5.1-18 baseline
...
Former-commit-id: 0a7acf96c7afb34814dd
2013-08-22 09:12:43 -04:00
Steve Harris
2d882ccb54
13.5.1-17 baseline
...
Former-commit-id: b210c902459dd7dc5d20
2013-08-19 16:34:24 -04:00
Steve Harris
6818d80085
13.5.1-16 baseline
...
Former-commit-id: 7ce0234d76cd3b63d961
2013-08-15 13:40:37 -04:00
Steve Harris
535218c676
13.5.1-15 baseline
...
Former-commit-id: c6dc1817e753e96e21db
2013-08-14 10:24:26 -04:00
Steve Harris
b848317203
13.5.1-14 baseline
...
Former-commit-id: 80e5f7fbd4d695e5debe
2013-08-14 10:07:41 -04:00
Greg Armendariz
f0b62a22bf
13.5.1-13 baseline
...
Former-commit-id: 5577e686c129b823fee4
2013-08-08 17:00:36 -04:00
Greg Armendariz
01d067cff9
13.5.1-12 baseline
...
Former-commit-id: fe51885ba7c9898ba8d1
2013-08-08 15:34:01 -04:00
Greg Armendariz
c402dbf6e9
13.5.1-11 baseline
...
Former-commit-id: 4ec04083bdea7b22500e
2013-08-07 14:34:27 -04:00
Greg Armendariz
e276b0fabe
13.5.1-10 baseline
...
Former-commit-id: acf7ced37b852455843f
2013-08-07 14:14:46 -04:00
Steve Harris
778df21de9
13.5.1-9 baseline
...
Former-commit-id: 6e60cd9a7997fe6a670f
2013-08-01 09:20:23 -04:00
Steve Harris
392faf86e7
13.5.1-8 baseline
...
Former-commit-id: dfbf9a5afe3bece5e5d0
2013-07-26 09:02:34 -04:00
Steve Harris
630705aa3f
13.5.1-7 baseline
...
Former-commit-id: 86ce1248c2bf58a81b38
2013-07-18 12:07:22 -04:00
Greg Armendariz
5894853996
13.5.1-6 baseline
...
Former-commit-id: b9044b11957e09fa5a0b
2013-07-10 10:04:22 -04:00
Greg Armendariz
82aabf1066
13.5.1-5 baseline
...
Former-commit-id: ea7ac37930492f92ef7b
2013-07-03 12:20:27 -04:00
Steve Harris
c56be8a332
13.5.1-4 baseline
...
Former-commit-id: e197f23ce370e4ff30a6
2013-06-28 09:46:25 -04:00
Steve Harris
d8176d4a4c
13.5.1-3 baseline
...
Former-commit-id: 72d22a30c963803c1424
2013-06-24 09:29:43 -04:00
Steve Harris
bc60b22f00
13.5.1-2 baseline
...
Former-commit-id: 3386330894adb779323d
2013-06-17 15:01:22 -04:00
Steve Harris
6384018950
13.5.1-1 baseline
...
Former-commit-id: fe872355a7998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
bb6628c17f
Merge branch 'master_13.4.1' into master_13.5.1
...
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: 2fc7f80939b0e5c758dc
2013-06-10 15:07:59 -04:00
Steve Harris
be236eb722
13.4.1-14 baseline
...
Former-commit-id: 18b90226a2c749e122eb
2013-06-06 15:15:27 -04:00
Steve Harris
e3b8086bd0
13.4.1-13 baseline
...
Former-commit-id: de476791fb87b9712009
2013-05-29 16:30:09 -04:00
Steve Harris
397bbf674a
13.4.1-12 baseline
...
Former-commit-id: e53ada66b86a97b4325a
2013-05-22 16:42:39 -04:00
Steve Harris
d6319a2ca6
13.4.1-11 baseline
...
Former-commit-id: c0376ce9ed2edee36158
2013-05-21 09:19:25 -04:00
Steve Harris
68fe2134b8
13.4.1-10 baseline
...
Former-commit-id: 92152778b99a403b3615
2013-05-20 10:52:47 -04:00
Steve Harris
88eee9cbfa
13.4.1-9 baseline
...
Former-commit-id: aff41713f9bcf7f15c90
2013-05-16 11:12:07 -04:00
Steve Harris
576a74fe0b
13.4.1-8 baseline
...
Former-commit-id: c59b52a26619866e7032
2013-05-14 09:21:41 -04:00
Steve Harris
8072752c77
13.4.1-7 baseline
...
Former-commit-id: 8347bed50e4c6ff79e71
2013-05-13 12:58:10 -04:00
Steve Harris
6fcbb5ae6b
13.4.1-6 baseline
...
Former-commit-id: 16fe8cc5a28379977673
2013-05-07 08:47:39 -04:00
Steve Harris
aa9a719836
13.4.1-5 baseline
...
Former-commit-id: 4ae0e2e85885bbf6d242
2013-05-03 09:29:14 -05:00
Steve Harris
344054d3e9
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
...
Former-commit-id: 0f76c3cbee1a6fd7edfd
2013-05-03 09:20:30 -05:00
Steve Harris
99f4569650
13.4.1-4 baseline
...
Former-commit-id: 7a78f8ac6ed33e5861aa
2013-05-02 10:00:38 -05:00
Steve Harris
3486902772
13.4.1-3 baseline
...
Former-commit-id: 86e96f378c54afedf617
2013-04-29 12:25:07 -05:00
Steve Harris
9212be8b74
13.4.1-2 baseline
...
Former-commit-id: 5ebd58a0b352f0ae4758
2013-04-24 17:22:10 -05:00
Steve Harris
f95e0ad10b
13.4.1-1 baseline
...
Former-commit-id: 00332e63052f517b7713
2013-04-24 17:15:55 -05:00
Steve Harris
035878a846
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: e6d37f3e6d7957c52dec
2013-04-15 09:34:45 -05:00
Steve Harris
07f7e6e2b4
13.3.1-20 baseline
...
Former-commit-id: 446bec6f4925432cc388
2013-04-15 08:58:59 -05:00
Steve Harris
dc9fef33a9
13.3.1-19 baseline
...
Former-commit-id: abaf9f12f99be238bcc4
2013-04-09 08:37:12 -05:00
Steve Harris
3487a41532
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: d98a119f4dea34b1db1e
2013-04-04 11:12:22 -05:00
Steve Harris
bf8a149596
Merge AWIPS2 master branch (13.2.1-21) into master
...
Former-commit-id: 19bb7374250676aa710a
2013-04-04 09:54:02 -05:00
Steve Harris
c946213066
Merge branch 'master_13.2.1' into master
...
Former-commit-id: 9df0038ea3f0b9589c11
2013-04-04 10:51:40 -04:00
Steve Harris
4b2462390e
Merge AWIPS2 master branch (13.2.1-19) into master
...
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: dab32b04134861007a03
2013-04-04 08:22:05 -05:00
Steve Harris
a86d44584d
13.2.1-21 baseline
...
Former-commit-id: 33bd359cfed4358b93dc
2013-04-03 18:08:41 -04:00
