Bryan Kowal
893074643b
Merge "Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades." into omaha_13.4.1
...
Former-commit-id: 8e78666902
[formerly cce4b819c9
] [formerly a792a0246b
[formerly 655d6f29a5f9667dad6900a6dc2562968d8c8fcb]]
Former-commit-id: a792a0246b
Former-commit-id: 7f482f0335
2013-04-10 18:29:52 -05:00
Bryan Kowal
cfba1ca4a1
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: b4f51b7c46
[formerly c28286b9ef
] [formerly ef5dcf4489
[formerly f49bb80458be42996555e5692a3403f2befad77b]]
Former-commit-id: ef5dcf4489
Former-commit-id: 3baf4ada50
2013-04-10 18:27:52 -05:00
Richard Peter
2288cca1d4
Merge "Issue #1805 - incremented the python qpid release" into omaha_13.4.1
...
Former-commit-id: 8ce7032f07
[formerly d8a0b43df2
] [formerly 3fe70ff22c
[formerly ac8837195f4861988b39062b252e7e3fb7133ed5]]
Former-commit-id: 3fe70ff22c
Former-commit-id: a4c8810322
2013-04-10 16:58:17 -05:00
Richard Peter
8c91f737ba
Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
...
Former-commit-id: b29d274316
[formerly a244fe0cd0
] [formerly 7f25a86e4d
[formerly cd417d34a230322f80dd48eb59416c938697320d]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 830ec7274c
2013-04-10 16:57:38 -05:00
Bryan Kowal
1ac1d10e40
Issue #1805 - incremented the python qpid release
...
Former-commit-id: 12d16daeed
[formerly c146f1835b
] [formerly 2bfd416f13
[formerly f2c5c819d91ad851d82444865b4279f85e13f791]]
Former-commit-id: 2bfd416f13
Former-commit-id: 6c7cad26f0
2013-04-10 16:49:20 -05:00
Bryan Kowal
fa1e0a02b0
Issue #1874 - created external properties files for specifying the number of grib decode threads
...
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers
Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff
Former-commit-id: 4ef22f8e93
[formerly eb04d2b85f
] [formerly b5994702dc
[formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: b5994702dc
Former-commit-id: a60f14f5d6
2013-04-10 16:24:39 -05:00
Ron Anderson
73588e3289
Issue #1854 Fix for compatibility with PostGIS 2.0
...
Change-Id: I5b6ff34c823302b8db466d8e27130904bf4b82c3
Former-commit-id: f8a20529d7
[formerly dd10f6799b
] [formerly fcacf03de0
[formerly 06158e2d3486770e0aeda370f12e49356d15d440]]
Former-commit-id: fcacf03de0
Former-commit-id: 59990c15cf
2013-04-10 15:57:05 -05:00
Nate Jensen
099d6055e1
Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1
...
Former-commit-id: 1825e7a4fc
[formerly 2e6f8d874e
] [formerly e6c7729470
[formerly db2d869900335634e9976370b7154baad4415ab2]]
Former-commit-id: e6c7729470
Former-commit-id: 9ee54a18f7
2013-04-10 14:57:43 -05:00
Richard Peter
148776865f
Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
...
Former-commit-id: 429d562563
[formerly 060cf5b326
] [formerly a31dec3cc8
[formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]
Former-commit-id: a31dec3cc8
Former-commit-id: 558812ff6e
2013-04-10 14:40:36 -05:00
Nate Jensen
6e0a002fd2
Merge "Issue #1786 - Initial checkin of https for thin client Code review comments" into omaha_13.4.1
...
Former-commit-id: c291c9a61d
[formerly 7ca6107be4
] [formerly f59a8b3d4c
[formerly b4e2ee48a9ce2f5d751a2b18c0c945f51c162324]]
Former-commit-id: f59a8b3d4c
Former-commit-id: 891bcbe543
2013-04-10 14:35:06 -05:00
Ben Steffensmeier
0b740cc760
Issue #1896 Make FFMPResource work better with D2D time matcher.
...
Former-commit-id: 2fc12b739b
[formerly 6637ae7c0e
] [formerly f58e1fe7b4
[formerly 8253598d2f19321c86a1d2da2a6b634a5ae7cd31]]
Former-commit-id: f58e1fe7b4
Former-commit-id: c321a387fc
2013-04-10 14:30:50 -05:00
Ben Steffensmeier
3c48093ab4
Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
...
Former-commit-id: 26b8938242
[formerly d727b93273
] [formerly d0070fcec4
[formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]
Former-commit-id: d0070fcec4
Former-commit-id: 0ac1b41eeb
2013-04-10 14:09:47 -05:00
Mike Duff
080bb15b65
Issue #1786 - Initial checkin of https for thin client
...
Code review comments
Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e
Former-commit-id: f584e17aa7
[formerly b9abbcdf37
] [formerly 0a33734e6f
[formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]
Former-commit-id: 0a33734e6f
Former-commit-id: fd55f6ed42
2013-04-10 10:29:33 -05:00
Bryan Kowal
77e2399fcf
Issue #1844 - declare table headers before sorting the table rows in qpid-queue-count.
...
Former-commit-id: 71b443b525
[formerly da7371618c
] [formerly b956f09b37
[formerly 4f86b9cf6cf5e586199a08d2a470e232b1a8da1e]]
Former-commit-id: b956f09b37
Former-commit-id: 063f0ed761
2013-04-09 16:09:40 -05:00
Bryan Kowal
32b95ce3df
Issue #1844 - updated the description for the "-s" argument in the usage message.
...
Former-commit-id: 214a9207ba
[formerly 42542eb9bb
] [formerly e841aa070d
[formerly 87c038167dae3c211ec01615c007df24ae355704]]
Former-commit-id: e841aa070d
Former-commit-id: 0e62fa85f6
2013-04-09 15:45:40 -05:00
Bryan Kowal
f4c91f4abe
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: 9aab25bdd4
[formerly e5ee38d896
] [formerly 6811a31cd5
[formerly a45c818e6df529fb4e85f76cd5155a48c67fe0d9]]
Former-commit-id: 6811a31cd5
Former-commit-id: 02710de565
2013-04-09 14:21:09 -05:00
Bryan Kowal
0da297e3bc
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 4c3dfc910c
[formerly 6beda99aee
] [formerly 837a65494f
[formerly a0a625006c1fec5c6825e390b1dfd1e539ca318c]]
Former-commit-id: 837a65494f
Former-commit-id: a4d8303e2d
2013-04-09 09:56:38 -05:00
Steve Harris
ed4150db5f
13.3.1-19 baseline
...
Former-commit-id: dc9fef33a9
[formerly 9be238bcc4
] [formerly abaf9f12f9
[formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Richard Peter
c9afa907cd
Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
...
Former-commit-id: 0abecda3d1
[formerly aba25dc7c4
] [formerly e95911f615
[formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]
Former-commit-id: e95911f615
Former-commit-id: afef66b87e
2013-04-08 14:20:09 -05:00
Bryan Kowal
eea02ee972
Issue #1293 - remove hdffileid and create delta script to update existing databases
...
- now in the 13.4.1 branch
Former-commit-id: e92e2712da
[formerly 4cc9a742c8
] [formerly c08190a586
[formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]
Former-commit-id: c08190a586
Former-commit-id: 55f234c2d1
2013-04-08 14:04:05 -05:00
Steve Harris
5f5dd9a031
Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
...
Former-commit-id: 2711be871a
[formerly 53492c2902
] [formerly 84370207a1
[formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]
Former-commit-id: 84370207a1
Former-commit-id: 0105f15306
2013-04-08 13:47:34 -05:00
Greg Armendariz
274c0a9c26
Issue #1872 - Add Jensen's build fix
...
Former-commit-id: 8b2d3f7b00
[formerly fba9de785d
] [formerly 0e2b440b86
[formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]
Former-commit-id: 0e2b440b86
Former-commit-id: ea340322bb
2013-04-08 12:26:20 -05:00
Bryan Kowal
e05b72b17e
Issue #1873 - reduce EDEX shutdown time
...
Former-commit-id: b252ca6506
[formerly bec051d00a
] [formerly 82a1b0752e
[formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]
Former-commit-id: 82a1b0752e
Former-commit-id: 3bd9819e59
2013-04-04 17:36:09 -05:00
Dustin Johnson
9531e50cac
Issue #1872 Fix compile errors
...
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a
Former-commit-id: ec85cdcf8c
[formerly 7cf482512d
] [formerly 06e6d84273
[formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]
Former-commit-id: 06e6d84273
Former-commit-id: add67ae3dc
2013-04-04 16:44:57 -05:00
Roger Ferrel
5c4a938c72
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: 90dae591a6
[formerly 998714524d
] [formerly b00d64ec0a
[formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]
Former-commit-id: b00d64ec0a
Former-commit-id: 8c5f3fb8f7
2013-04-04 13:22:10 -05:00
Max Schenkelberg
fb1a6e203b
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: be574276f9
[formerly 6d0960c4ef
] [formerly b042037a67
[formerly ed981dc2487d169a502f7396520899fc55ff3299]]
Former-commit-id: b042037a67
Former-commit-id: 1b81c79b13
2013-04-04 13:21:35 -05:00
Mike Duff
c2e22945f6
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 57146e3c95
[formerly 42fa10a859
] [formerly 15c4f53172
[formerly 33f7392176acf8da158f309451557edd677c7805]]
Former-commit-id: 15c4f53172
Former-commit-id: dd5dc7f0d2
2013-04-04 13:20:28 -05:00
Bryan Kowal
8c20b1f4bc
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: 7af4c80bab
[formerly 1000dac7ad
] [formerly 1cea2404c8
[formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]
Former-commit-id: 1cea2404c8
Former-commit-id: 22a2c082b8
2013-04-04 13:20:13 -05:00
Bryan Kowal
59b2e35928
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 0d252800ee
[formerly a07f8076cf
] [formerly 3454fd030b
[formerly 790804146d4eade073e3250e1b1cd95e313b1a96]]
Former-commit-id: 3454fd030b
Former-commit-id: 3dadeb157d
2013-04-04 13:12:07 -05:00
Roger Ferrel
57bc235dbd
Issue #1735 Performance improvments for LLWSData.
...
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: f6ccec22b0
[formerly 0b224e9b84
] [formerly 54daec6dc6
[formerly 55230d49b580be00dcd092c80dca3ee7e37563c3]]
Former-commit-id: 54daec6dc6
Former-commit-id: d49314c184
2013-04-04 13:11:59 -05:00
Dustin Johnson
9a4f4431de
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: dbeffa91fe
[formerly 375f0801a2
] [formerly 3c41127c42
[formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]
Former-commit-id: 3c41127c42
Former-commit-id: 0dc74710ce
2013-04-04 13:10:24 -05:00
Richard Peter
e9fe732dac
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: 91d708eaac
[formerly f77948929d
] [formerly 814bff6ddb
[formerly 20bbd926451ce82c606d80b238c5fbc720164910]]
Former-commit-id: 814bff6ddb
Former-commit-id: 4337abd873
2013-04-04 13:03:41 -05:00
Bryan Kowal
0a801c95ce
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 8c68c8f9cb
[formerly bfb14b4ad6
] [formerly 24dd9b550d
[formerly f1551ef32c5e67358a60a6ba7d1ca2344afa0829]]
Former-commit-id: 24dd9b550d
Former-commit-id: 122c085a62
2013-04-04 13:03:20 -05:00
Bryan Kowal
a214ee536a
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: 991de38661
[formerly a8d4e8f6ec
] [formerly 3d04b0f87b
[formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]
Former-commit-id: 3d04b0f87b
Former-commit-id: a154e3b3cd
2013-04-04 13:03:08 -05:00
Roger Ferrel
df1c674ba0
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: 24e5e7ff35
[formerly 4e607bc7bf
] [formerly 2cd455764b
[formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]
Former-commit-id: 2cd455764b
Former-commit-id: 97fdbb2477
2013-04-04 13:02:58 -05:00
Bryan Kowal
ee25f748c1
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 40dd190ecf
[formerly 40a4b38929
] [formerly 8187df486a
[formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]
Former-commit-id: 8187df486a
Former-commit-id: 3c70c5be2b
2013-04-04 13:02:49 -05:00
Bryan Kowal
1b815aa845
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: d899bea93a
[formerly 7dd4a88415
] [formerly 28bd0a772f
[formerly 4febb7c32a33f18f17b29a166462a34fbe60edbb]]
Former-commit-id: 28bd0a772f
Former-commit-id: b6f3aecdc5
2013-04-04 13:01:39 -05:00
Bryan Kowal
1ce9d40711
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: d35246ef31
[formerly 267b2c4dfa
] [formerly 37d869ef60
[formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]
Former-commit-id: 37d869ef60
Former-commit-id: 6eec333843
2013-04-04 13:01:09 -05:00
David Gillingham
b97b1766ee
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: 5ae3fbd325
[formerly d24fcc85e2
] [formerly 56235e370f
[formerly 37020656f1502afee59e41ed7daf16775e200cbf]]
Former-commit-id: 56235e370f
Former-commit-id: 60e8146a18
2013-04-04 13:00:36 -05:00
Bryan Kowal
d40863c38f
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: 211307edfd
[formerly 9e99447eee
] [formerly 4fd4786ae5
[formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]
Former-commit-id: 4fd4786ae5
Former-commit-id: fcc7b102ad
2013-04-04 12:56:58 -05:00
Mike Duff
57fa0f2ef9
Issue #1646 - Format the output
...
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6
Former-commit-id: 2e424cd74a
[formerly 4ab07a31da
] [formerly d5d4ed7327
[formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]
Former-commit-id: d5d4ed7327
Former-commit-id: aefbc4f54f
2013-04-04 12:56:44 -05:00
David Gillingham
2038a703ac
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: 05f52e6e54
[formerly 055c36ea41
] [formerly 0969f85246
[formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]
Former-commit-id: 0969f85246
Former-commit-id: 8859674c70
2013-04-04 12:46:21 -05:00
Bryan Kowal
45ee1fd607
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Conflicts:
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 6f8ef422c8
[formerly d585db3b99
] [formerly 1e3e6e3f28
[formerly e95b6ade25a28b440d7283b5d162ff88f3671378]]
Former-commit-id: 1e3e6e3f28
Former-commit-id: fdf99a56b2
2013-04-04 12:37:15 -05:00
Steve Harris
3ea89862c0
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: 3487a41532
[formerly ea34b1db1e
] [formerly d98a119f4d
[formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a91fd82ff
2013-04-04 11:12:22 -05:00
Steve Harris
5c029bc4ac
13.2.1-21 baseline
...
Former-commit-id: a86d44584d
[formerly d4358b93dc
] [formerly 33bd359cfe
[formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: 33bd359cfe
Former-commit-id: 18d6fa4f4d
2013-04-03 18:08:41 -04:00
Steve Harris
b062373048
13.2.1-20 baseline
...
Former-commit-id: ad663b925c
[formerly 6a55bc5dff
] [formerly 539faf0a71
[formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 539faf0a71
Former-commit-id: 12d4316b3a
2013-04-03 18:05:39 -04:00
Steve Harris
0edd049e3b
13.3.1-18 baseline
...
Former-commit-id: f3e79bcc9d
[formerly a2b098d86d
] [formerly ce6a06a7e3
[formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
2013-04-03 14:58:29 -05:00
Steve Harris
ef413da5f7
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
6b75202d07
13.3.1-16 baseline
...
Former-commit-id: a262f22cee
[formerly 51380726d4
] [formerly 3066dd33e5
[formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
2013-04-01 11:39:08 -05:00
Steve Harris
2bf790aae3
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abb
[formerly eb1dab3864
] [formerly 3d8ed484be
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00