Ben Steffensmeier
2e5abaeb44
Issue #1896 Make FFMPResource work better with D2D time matcher.
...
Former-commit-id: c328c1ad8d2fc12b739b6637ae7c0ec328c1ad8d2fc12b739b6637ae7c0ef58e1fe7b46637ae7c0ef58e1fe7b41632a126790b740cc760c321a387fcec5daf4cb088e24c35ef
2013-04-10 14:30:50 -05:00
Ben Steffensmeier
89a467ec1f
Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
...
Former-commit-id: aa7aa88ee526b8938242d727b93273aa7aa88ee526b8938242d727b93273d0070fcec4d727b93273d0070fcec4593b2db92e3c48093ab40ac1b41eebea7aa6d647bb96a2e866
2013-04-10 14:09:47 -05:00
Dustin Johnson
b4f0296480
Issue #1891 Fix sorting in pending subscription table
...
Amend: Rename getRowData() to getDisplayData()
Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa
Former-commit-id: ae7952ce648b6a9551a1d9544f3b73ae7952ce648b6a9551a1d9544f3b7336cdd94a65d9544f3b7336cdd94a6504eb46f448a4519615abf7505eefc26ee0d474f8919fda0e8c
2013-04-10 14:04:55 -05:00
Mike Duff
835be943a0
Issue #1786 - Initial checkin of https for thin client
...
Code review comments
Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e
Former-commit-id: 60a6fb451cf584e17aa7b9abbcdf3760a6fb451cf584e17aa7b9abbcdf370a33734e6fb9abbcdf370a33734e6f173c3e105a080bb15b65fd55f6ed42c1a7a62e5b657bb56bf0
2013-04-10 10:29:33 -05:00
Max Schenkelberg
872981ef0a
Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
...
Amend: Create copy on write for PluginFactory
Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f
Former-commit-id: cc26fc686f1bec335fd76e70b21f5fcc26fc686f1bec335fd76e70b21f5fb695de36986e70b21f5fb695de3698abb23e3ee8e369546b51f2a0f8223a0b2fed1f34f1617ea662
2013-04-10 10:04:17 -05:00
Bryan Kowal
864cda5268
Issue #1844 - declare table headers before sorting the table rows in qpid-queue-count.
...
Former-commit-id: 7c16aacfb071b443b525da7371618c7c16aacfb071b443b525da7371618cb956f09b37da7371618cb956f09b37212dd227cc77e2399fcf063f0ed761140a08b73aedf0b442cb
2013-04-09 16:09:40 -05:00
Bryan Kowal
b79d8cba44
Issue #1844 - updated the description for the "-s" argument in the usage message.
...
Former-commit-id: 843fd4bbbc214a9207ba42542eb9bb843fd4bbbc214a9207ba42542eb9bbe841aa070d42542eb9bbe841aa070dd6704111c932b95ce3df0e62fa85f6e856cfb85303ab0dcae3
2013-04-09 15:45:40 -05:00
Bryan Kowal
679ca0ca61
Issue #1844 - update qpid-queue-count and qpid-stat to use the new REST-based ws
...
- removed debug print statements
- currently, authenticating against the REST service is not supported; need to
setup a qpid that requires REST authentication to ensure proper implementation
Change-Id: I9790f7a6678f30892ee3e5a29bcc8f2b5606b478
Former-commit-id: df07748ab89aab25bdd4e5ee38d896df07748ab89aab25bdd4e5ee38d8966811a31cd5e5ee38d8966811a31cd5cd864eedf8f4c91f4abe02710de5655e92cd512c37461f1f7b
2013-04-09 14:21:09 -05:00
Dustin Johnson
ccc7e55122
Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription.
...
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6
Former-commit-id: 82f815752c7616bb80aabba356326582f815752c7616bb80aabba3563265ce96090763bba3563265ce9609076307176c47528c5d379b7208a08803fe0857b2766c1a743b6d9a
2013-04-09 11:43:53 -05:00
Dustin Johnson
511111545c
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: ba51d9a911f3526508f311fd2d676bba51d9a911f3526508f311fd2d676b6bc69df12711fd2d676b6bc69df127a93be0ad070578916ec1b78f56f1cab61292ce4d60e910e3d3
2013-04-09 11:40:25 -05:00
Bryan Kowal
26aea61095
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 1c225c3ad74c3dfc910c6beda99aee1c225c3ad74c3dfc910c6beda99aee837a65494f6beda99aee837a65494fd0c3abc6750da297e3bca4d8303e2d3a8e2159de9066cf854e
2013-04-09 09:56:38 -05:00
Steve Harris
b6db7821fa
13.3.1-19 baseline
...
Former-commit-id: 196767d525dc9fef33a99be238bcc4196767d525dc9fef33a99be238bcc4abaf9f12f99be238bcc4abaf9f12f9fe5020d315ed4150db5f340a2cfb237d763715367b7efd0bd1
2013-04-09 08:37:12 -05:00
Richard Peter
7225ebfc16
Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
...
Former-commit-id: 9cdbdbfd330abecda3d1aba25dc7c49cdbdbfd330abecda3d1aba25dc7c4e95911f615aba25dc7c4e95911f61562a78ea4f2c9afa907cdafef66b87e0c2f84de7fbde2fdcbf8
2013-04-08 14:20:09 -05:00
Bryan Kowal
155c0efbef
Issue #1293 - remove hdffileid and create delta script to update existing databases
...
- now in the 13.4.1 branch
Former-commit-id: 885dd56459e92e2712da4cc9a742c8885dd56459e92e2712da4cc9a742c8c08190a5864cc9a742c8c08190a586ea86a8ba59eea02ee97255f234c2d17bfabf4a4e4f8d471c5e
2013-04-08 14:04:05 -05:00
Steve Harris
1088d433a2
Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
...
Former-commit-id: 7266d7a21b2711be871a53492c29027266d7a21b2711be871a53492c290284370207a153492c290284370207a145c85dd1c95f5dd9a0310105f15306ee08ef663f0e857a47e9
2013-04-08 13:47:34 -05:00
Greg Armendariz
b12da8daff
Issue #1872 - Add Jensen's build fix
...
Former-commit-id: bde00389a18b2d3f7b00fba9de785dbde00389a18b2d3f7b00fba9de785d0e2b440b86fba9de785d0e2b440b8686ebf238ec274c0a9c26ea340322bb190d2b79add25ec9c02c
2013-04-08 12:26:20 -05:00
Dustin Johnson
e7301e95c9
Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
...
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.
Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf
Former-commit-id: 3a6d9209dfcef805e79a61346b13883a6d9209dfcef805e79a61346b1388f3bdede2c861346b1388f3bdede2c873a8bb7a024b4eb8e4068c52cd190ffefc0dca3b5958178516
2013-04-05 12:41:02 -05:00
Bryan Kowal
4ed0425a3f
Issue #1873 - reduce EDEX shutdown time
...
Former-commit-id: 18a90e6bcab252ca6506bec051d00a18a90e6bcab252ca6506bec051d00a82a1b0752ebec051d00a82a1b0752e2fc926dc40e05b72b17e3bd9819e59028596565782db2880b7
2013-04-04 17:36:09 -05:00
Dustin Johnson
ef062dc2a2
Issue #1872 Fix compile errors
...
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a
Former-commit-id: ff6f1dc67aec85cdcf8c7cf482512dff6f1dc67aec85cdcf8c7cf482512d06e6d842737cf482512d06e6d84273ba666a02169531e50cacadd67ae3dc64b2560d05bf97f2e7d2
2013-04-04 16:44:57 -05:00
Bryan Kowal
4accd3bbd4
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 84742433601ebf50c7ed52be309cac84742433601ebf50c7ed52be309cacdc522ede4452be309cacdc522ede44a5d79669d7607d5b205d04e22df174c97dccb62dce1f23692e
2013-04-04 16:16:53 -05:00
Roger Ferrel
34010df840
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: 50ffd4082b90dae591a6998714524d50ffd4082b90dae591a6998714524db00d64ec0a998714524db00d64ec0aef8461965e5c4a938c728c5f3fb8f7da4b43a4fc59bb22e52b
2013-04-04 13:22:10 -05:00
Max Schenkelberg
509942bffc
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Conflicts:
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
Former-commit-id: a5994b8983be574276f96d0960c4efa5994b8983be574276f96d0960c4efb042037a676d0960c4efb042037a67c8e0d2ca98fb1a6e203b1b81c79b1395e73c34f961f17d8d34
2013-04-04 13:21:35 -05:00
Mike Duff
5ab90cb5d7
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: b96f95173257146e3c9542fa10a859b96f95173257146e3c9542fa10a85915c4f5317242fa10a85915c4f5317254c3173f69c2e22945f6dd5dc7f0d2f7d644f051f159af03fa
2013-04-04 13:20:28 -05:00
Bryan Kowal
0b69be4a24
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: dd911d33bc7af4c80bab1000dac7addd911d33bc7af4c80bab1000dac7ad1cea2404c81000dac7ad1cea2404c8c9666aa9998c20b1f4bc22a2c082b85034964bfa0c862db6f9
2013-04-04 13:20:13 -05:00
Bryan Kowal
db7ae2aab9
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 52fc0c66c20d252800eea07f8076cf52fc0c66c20d252800eea07f8076cf3454fd030ba07f8076cf3454fd030b5cb707736a59b2e359283dadeb157d879b3bc84e078622476d
2013-04-04 13:12:07 -05:00
Roger Ferrel
257c281c0a
Issue #1735 Performance improvments for LLWSData.
...
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: 23d3ab925df6ccec22b00b224e9b8423d3ab925df6ccec22b00b224e9b8454daec6dc60b224e9b8454daec6dc63ba7a255df57bc235dbdd49314c184321b0dd55d7538be4d80
2013-04-04 13:11:59 -05:00
Dustin Johnson
7dbb9acf53
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java
Former-commit-id: af4da9286bdbeffa91fe375f0801a2af4da9286bdbeffa91fe375f0801a23c41127c42375f0801a23c41127c4294002b3be99a4f4431de0dc74710ce32da016541ce87841d63
2013-04-04 13:10:24 -05:00
Richard Peter
3abc53b70d
Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client
...
Merge local virtualHosts.xml back in with SLC change
Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b
Former-commit-id: 1d7d360f2c91d708eaacf77948929d1d7d360f2c91d708eaacf77948929d814bff6ddbf77948929d814bff6ddbd1369dbf29e9fe732dac4337abd873055440acda52533b4f49
2013-04-04 13:03:41 -05:00
Bryan Kowal
427f4b451e
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 978f55d0078c68c8f9cbbfb14b4ad6978f55d0078c68c8f9cbbfb14b4ad624dd9b550dbfb14b4ad624dd9b550def261700290a801c95ce122c085a62c053058d8f528d1a14c1
2013-04-04 13:03:20 -05:00
Bryan Kowal
2bc13fa033
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: ce08162045991de38661a8d4e8f6ecce08162045991de38661a8d4e8f6ec3d04b0f87ba8d4e8f6ec3d04b0f87b1147a05bcfa214ee536aa154e3b3cd040bf63b7ff785bd78aa
2013-04-04 13:03:08 -05:00
Roger Ferrel
7af3402ffc
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: 1fb0666a6924e5e7ff354e607bc7bf1fb0666a6924e5e7ff354e607bc7bf2cd455764b4e607bc7bf2cd455764be1d9065706df1c674ba097fdbb2477d5628c32919125683187
2013-04-04 13:02:58 -05:00
Bryan Kowal
2e44b94d90
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 685123f51d40dd190ecf40a4b38929685123f51d40dd190ecf40a4b389298187df486a40a4b389298187df486a710c23bd4cee25f748c13c70c5be2bd8fded4a6520774becca
2013-04-04 13:02:49 -05:00
Bryan Kowal
610235394c
Issue #1663 - updated libpq.so for the native hydro applications
...
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*
Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1
Former-commit-id: 1998c1e1cad899bea93a7dd4a884151998c1e1cad899bea93a7dd4a8841528bd0a772f7dd4a8841528bd0a772ff666b664f91b815aa845b6f3aecdc5e4f089bdef19eb071f04
2013-04-04 13:01:39 -05:00
Bryan Kowal
cec925409e
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: f81212d444d35246ef31267b2c4dfaf81212d444d35246ef31267b2c4dfa37d869ef60267b2c4dfa37d869ef6020d58ef4131ce9d407116eec333843872341596515ec53b037
2013-04-04 13:01:09 -05:00
Greg Armendariz
db25658b91
Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
...
Former-commit-id: 88a6a8abb36e0ced27dcd6d0e0131f88a6a8abb36e0ced27dcd6d0e0131f71d400e09fd6d0e0131f71d400e09ff0957645adf452a4582ad463555ca3d176c441e7df0146764b
2013-04-04 13:00:39 -05:00
David Gillingham
f93534ccda
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
Former-commit-id: aaddb9cd585ae3fbd325d24fcc85e2aaddb9cd585ae3fbd325d24fcc85e256235e370fd24fcc85e256235e370ffd639744bfb97b1766ee60e8146a18a49920c978cdba87a6f3
2013-04-04 13:00:36 -05:00
Bryan Kowal
0cbefb8b77
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: 321660e016211307edfd9e99447eee321660e016211307edfd9e99447eee4fd4786ae59e99447eee4fd4786ae5d6b11bacf0d40863c38ffcc7b102ad887b7d9c1aaab6cce629
2013-04-04 12:56:58 -05:00
Mike Duff
644d0582c8
Issue #1646 - Format the output
...
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6
Former-commit-id: ea0cd457ac2e424cd74a4ab07a31daea0cd457ac2e424cd74a4ab07a31dad5d4ed73274ab07a31dad5d4ed73276024d7fb5057fa0f2ef9aefbc4f54f0901f42fc9cbca9678b4
2013-04-04 12:56:44 -05:00
Bryan Kowal
a800e56338
Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
...
Former-commit-id: c5afa1883b70c8ed6bc03fac666de5c5afa1883b70c8ed6bc03fac666de564c54f21103fac666de564c54f2110b4e684ad086a6615809749ee55327ddda6a904edcc94b29199
2013-04-04 12:48:59 -05:00
David Gillingham
d1c9eafce6
Issue #1759 : Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
...
GfeScriptExecutor and GfeScript.
Change-Id: If3c789549a071e54f9020433f6221e688c51c44a
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
Former-commit-id: 493814adf505f52e6e54055c36ea41493814adf505f52e6e54055c36ea410969f85246055c36ea410969f85246bde4f4c03d2038a703ac8859674c70184bb9e9667eb15969fb
2013-04-04 12:46:21 -05:00
Bryan Kowal
53a2897d7a
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Conflicts:
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: bc227a5cb96f8ef422c8d585db3b99bc227a5cb96f8ef422c8d585db3b991e3e6e3f28d585db3b991e3e6e3f289041cb18ca45ee1fd607fdf99a56b273f078b4001e28ae19cc
2013-04-04 12:37:15 -05:00
Steve Harris
1eecca8712
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: d331abc9118b5b1d286b56410d2a04d331abc9118b5b1d286b56410d2a04731ed52cd656410d2a04731ed52cd64fc654dbf8a400879732a419f72b2d7c3bfa901b2dad0ec07e
2013-04-04 12:01:23 -05:00
Steve Harris
084125dd3c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 4dfea33cdd9879b94de98b607f82284dfea33cdd9879b94de98b607f82285c9a6b83cc8b607f82285c9a6b83ccbbfc0f76ef0f53c46d7aed8c0487fe7eda24c3b0a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
370fe32515
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: 55655fdab93487a41532ea34b1db1e55655fdab93487a41532ea34b1db1ed98a119f4dea34b1db1ed98a119f4d1a2b88cd383ea89862c01a91fd82fff0918ec8ade0eda90af4
2013-04-04 11:12:22 -05:00
Bryan Kowal
d60c0c39e1
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: a8fe170b53c44865106503a2e82b77a8fe170b53c44865106503a2e82b778d3c98eb5d03a2e82b778d3c98eb5d64dbc18c8e12e9b9d75b5816ddaf77bd47c627896032a8dd0c
2013-04-03 18:27:10 -05:00
Nate Jensen
0a621e8228
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: 59f084426cf43ac8bbc379a9d7691559f084426cf43ac8bbc379a9d7691573d86e892679a9d7691573d86e892691c6521d10e74f83d83ac87d157cbd5be8ef079eb151421989
2013-04-03 17:28:49 -05:00
Steve Harris
dd878fe749
13.2.1-21 baseline
...
Former-commit-id: 50106822eaa86d44584dd4358b93dc50106822eaa86d44584dd4358b93dc33bd359cfed4358b93dc33bd359cfe688327d3145c029bc4ac18d6fa4f4deb5258f0433d1d0a6a9c
2013-04-03 18:08:41 -04:00
Steve Harris
54f2f2b94a
13.2.1-20 baseline
...
Former-commit-id: 3aa43b1b0dad663b925c6a55bc5dff3aa43b1b0dad663b925c6a55bc5dff539faf0a716a55bc5dff539faf0a713be498b2fcb06237304812d4316b3a9c51f2d15ffbddfb5a25
2013-04-03 18:05:39 -04:00
Steve Harris
114eec390d
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 77c0dd0b552bc12f7a230f000f448577c0dd0b552bc12f7a230f000f4485327d05f3b50f000f4485327d05f3b5b2de6fd4c10342b648b6c7b9690456f22108c973dc0baf57ba
2013-04-03 15:52:19 -05:00
Ron Anderson
6ed11bbc88
Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
...
Former-commit-id: 492587b91cb880af3c48de856db77a492587b91cb880af3c48de856db77ac82968c1e6de856db77ac82968c1e60acc778948a633b96fdf237e414b5dfb76bf6d49e5252cf3a4
2013-04-03 15:25:52 -05:00
