Commit graph

1076 commits

Author SHA1 Message Date
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: 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]]
Former-commit-id: b00d64ec0a
Former-commit-id: ef8461965e [formerly 5c4a938c72] [formerly 3ba9851638529124c64d3eb3b31a74ca7dd0db71 [formerly 8c5f3fb8f7]]
Former-commit-id: af45db73b891a4a828963709b4fdc2c7e21c4347 [formerly da4b43a4fc]
Former-commit-id: 59bb22e52b
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: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]]
Former-commit-id: b042037a67
Former-commit-id: c8e0d2ca98 [formerly fb1a6e203b] [formerly 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13]]
Former-commit-id: b54658d12950068a772a67b068d99d660f27a3a9 [formerly 95e73c34f9]
Former-commit-id: 61f17d8d34
2013-04-04 13:21:35 -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: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]]
Former-commit-id: 3c41127c42
Former-commit-id: 94002b3be9 [formerly 9a4f4431de] [formerly 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]]
Former-commit-id: 3bc02ea1c6075b3b5e6394a15bdba67e6052ad17 [formerly 32da016541]
Former-commit-id: ce87841d63
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: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]]
Former-commit-id: 814bff6ddb
Former-commit-id: d1369dbf29 [formerly e9fe732dac] [formerly ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]]
Former-commit-id: f0de5f6f544fadd3b91519c8f6322d053c734a6f [formerly 055440acda]
Former-commit-id: 52533b4f49
2013-04-04 13:03:41 -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: ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: 1147a05bcf [formerly a214ee536a] [formerly 98c4ccb22060dd1661aa24f92d73ea9c175710d4 [formerly a154e3b3cd]]
Former-commit-id: ae924e9e5aad49a5024c850fb5b892c8ea59c34b [formerly 040bf63b7f]
Former-commit-id: f785bd78aa
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: 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 2cd455764b [formerly 4e607bc7bf [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]]]
Former-commit-id: 2cd455764b
Former-commit-id: e1d9065706 [formerly df1c674ba0] [formerly 2c437b337b3e7accdbe6bd644d0cb84ad0153430 [formerly 97fdbb2477]]
Former-commit-id: 21e45aae935e3c8e9d886eadc4e91174180fc3a6 [formerly d5628c3291]
Former-commit-id: 9125683187
2013-04-04 13:02:58 -05:00
Bryan Kowal
cec925409e Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 267b2c4dfa [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]]
Former-commit-id: 37d869ef60
Former-commit-id: 20d58ef413 [formerly 1ce9d40711] [formerly f85c6a8bcab56873e52500a8858a7ccc31a3523f [formerly 6eec333843]]
Former-commit-id: cbfeab4cef29cec446efad18a407e90e393d4266 [formerly 8723415965]
Former-commit-id: 15ec53b037
2013-04-04 13:01:09 -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: aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly 56235e370f [formerly d24fcc85e2 [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]]
Former-commit-id: 56235e370f
Former-commit-id: fd639744bf [formerly b97b1766ee] [formerly 0808d1706a10907ff236663e85686c504930a1cb [formerly 60e8146a18]]
Former-commit-id: 81927e913ca50f9b6ae9e04730c6d1253d5dc832 [formerly a49920c978]
Former-commit-id: cdba87a6f3
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: 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: d6b11bacf0 [formerly d40863c38f] [formerly dced69266300d616b3126d8ab0a9ce82349c7fc0 [formerly fcc7b102ad]]
Former-commit-id: df080e66e266ed5db77210502282ac3ed02a0060 [formerly 887b7d9c1a]
Former-commit-id: aab6cce629
2013-04-04 12:56:58 -05:00
Mike Duff
644d0582c8 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 4ab07a31da [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 6024d7fb50 [formerly 57fa0f2ef9] [formerly 44825e8261549149e51d6e8f7a6835db9fa371e9 [formerly aefbc4f54f]]
Former-commit-id: d60de1114b3cb0cc087cb065d38f913c47f4d49c [formerly 0901f42fc9]
Former-commit-id: cbca9678b4
2013-04-04 12:56:44 -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: 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 0969f85246 [formerly 055c36ea41 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]]
Former-commit-id: 0969f85246
Former-commit-id: bde4f4c03d [formerly 2038a703ac] [formerly e974a975769591433b0e949683524759177531b9 [formerly 8859674c70]]
Former-commit-id: 6e1a2c4d26a3a7eaeff11a8731cdb9124c405871 [formerly 184bb9e966]
Former-commit-id: 7eb15969fb
2013-04-04 12:46:21 -05:00
Steve Harris
084125dd3c Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: bbfc0f76ef [formerly 0f53c46d7a] [formerly 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]]
Former-commit-id: 55bdcb43db4e6090118e9aec0586c1a76860abe3 [formerly 7eda24c3b0]
Former-commit-id: a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
114eec390d Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1 [formerly 0342b648b6] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Richard Peter
f03594dc87 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]]
Former-commit-id: 6d73e25290
Former-commit-id: dcc6ca7202 [formerly 8ac6ae3539] [formerly dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23]]
Former-commit-id: 54bea0b83fc5bd1c3cc475f07d09468710cce778 [formerly 0548ee285d]
Former-commit-id: 75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]]
Former-commit-id: cfcacd20e9
Former-commit-id: bddc4b1bdf [formerly d973d83519] [formerly a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7]]
Former-commit-id: 3332bf3bb5bf9062085e62fc233a2fd0b8b7dbdc [formerly d2dd57fee4]
Former-commit-id: aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Bryan Kowal
aab5a08bdb Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: ea6a9687f7 [formerly b60bea920c] [formerly 75de255c33338b2c6a36abb8a97bd7559baa6968 [formerly 344237d9ee]]
Former-commit-id: a0d42e4f89e75d56e4c9f0549bc21f3da3691e6b [formerly 962755143e]
Former-commit-id: 1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 42ab5f4244 [formerly 939ff752e8 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]]
Former-commit-id: 42ab5f4244
Former-commit-id: e618c4833f [formerly 93cd16508c] [formerly 95d11ada8c00865cd2e0c7fefde5e05c93de384a [formerly 4fe7bace99]]
Former-commit-id: 0c7c37575eec14f586dc5a62f5d1c1ee24b0f946 [formerly e709933a4f]
Former-commit-id: 6ab8e23421
2013-04-03 14:03:18 -05:00
Ron Anderson
8a2c181df6 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]]
Former-commit-id: b703b4779e
Former-commit-id: a0c34f1750 [formerly 0d57a752dc] [formerly 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389]]
Former-commit-id: f6906d6c665fe19cb44286fdb8ff6ebb5d58db5c [formerly 2222201f43]
Former-commit-id: 3be7ce8bab
2013-04-03 14:01:18 -05:00
Roger Ferrel
89be749f8d 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: e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]]
Former-commit-id: d2aae617b2
Former-commit-id: 3248f4bcf2 [formerly 2b4b10d643] [formerly 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec]]
Former-commit-id: 718544292ebcdbe6476ea274620a8961444112e5 [formerly ad658b46bf]
Former-commit-id: 2cad51c18f
2013-04-03 12:48:18 -05:00
Greg Armendariz
2b710f3540 Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]]
Former-commit-id: 54f56fde29
Former-commit-id: 2bfe8fccfd [formerly e3cf306ce4] [formerly d64b8f0c79380e97b0125bf494b7ba124b119a98 [formerly 02e79dfe8a]]
Former-commit-id: 3273e25181a10873df7356911fe3ccbe0a321fe3 [formerly 9ca713f588]
Former-commit-id: e389a3bf6a
2013-04-02 15:00:26 -05:00
Nate Jensen
b65824a812 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: c82a67f378 [formerly 1ad5bb1a52] [formerly 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]]
Former-commit-id: da64965f81585567559fad5d0cd0833628607d59 [formerly d1f53fb57e]
Former-commit-id: e0cb68cc06
2013-04-02 14:29:15 -05:00
Dustin Johnson
b6c2c0194c Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
Amend:
   Use TimeUtil.newGmtCalendar() and remove whitespace only change
   Add TODO for point data types.

Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3

Former-commit-id: 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]]
Former-commit-id: 6129d86be4
Former-commit-id: c42ca22867 [formerly 644ed2396d] [formerly e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]]
Former-commit-id: 4466a4fe3eec25da0716798d2d3f9beb6bb0d4f0 [formerly 15ed8a6f58]
Former-commit-id: e57b8314d8
2013-04-01 15:35:51 -05:00
Max Schenkelberg
bb8e2cf3e1 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]]
Former-commit-id: 547190329b
Former-commit-id: 984e67acda [formerly ba262e2bc5] [formerly a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]]
Former-commit-id: 27d68b81294fdcff628db2407a3b0b00c4165e1d [formerly 80b0f7c159]
Former-commit-id: ee60a2a80c
2013-04-01 12:41:50 -05:00
Steve Harris
6a3f6359d6 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8]
Former-commit-id: ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
622caf8d93 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
2013-04-01 11:33:20 -05:00
Max Schenkelberg
aeb8a97b02 Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]]
Former-commit-id: 51d976e5e2
Former-commit-id: af56d47973 [formerly 8de3a70962] [formerly e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]]
Former-commit-id: 62b962b1d377e7f942551913bb5a435bea8c88c7 [formerly 01c2d29c1b]
Former-commit-id: a29eff544b
2013-04-01 10:19:36 -05:00
Ron Anderson
92a156fe0f Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]]
Former-commit-id: 679bb01764
Former-commit-id: 6cd8d1e8ee [formerly d5e3976dc4] [formerly 905f44a12ebe7347d47fb3a96c6a47ac28a6024f [formerly 96e8f63679]]
Former-commit-id: 4a42a154f1df90e4b82ead30ff3b512563ee1f14 [formerly 22f633b2a1]
Former-commit-id: 1eede44aac
2013-03-29 10:07:37 -05:00
Greg Armendariz
4b042a145d Fix merge issue
Former-commit-id: 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 7382b92b41 [formerly dcd36e64a6] [formerly 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2]]
Former-commit-id: aabec0ec4490b2d78130b37cfd26e0a7ec9b56dd [formerly 57eff9d7bf]
Former-commit-id: 9a8ce1af9e
2013-03-29 09:52:46 -05:00
Greg Armendariz
54fef6c68f Change package location of import
Former-commit-id: 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]]
Former-commit-id: 27345f6edf
Former-commit-id: 54231d5bcc [formerly 05af592718] [formerly 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6]]
Former-commit-id: 8c8f0c979cc0dab06aa749a105aa5767bce4b2d6 [formerly 87e37c990e]
Former-commit-id: 63d746dd77
2013-03-29 09:09:32 -05:00
David Gillingham
7fdc3419ec Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: acc3ac1c03 [formerly fddd42615d] [formerly 9f4cd32b5571d903c6b3f5e023a5fb8faddecd4f [formerly dbec0fa00f]]
Former-commit-id: 90bc9337ad9dafe74c0cc603a354d9e435dfdd1e [formerly 0b155a5788]
Former-commit-id: 4c1c4e665e
2013-03-28 17:18:43 -05:00
Steve Harris
20ece0647e Issue #1782 - restore FFPMGenerator.java
Former-commit-id: 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]]
Former-commit-id: 3953f8368b
Former-commit-id: cf60c00cb2 [formerly bec6e9099f] [formerly 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5]]
Former-commit-id: e85be3d04a48ce9d094adad6cc0f9c59b3b531da [formerly 92aa705ebc]
Former-commit-id: ef1e593ebd
2013-03-28 16:06:54 -05:00
Max Schenkelberg
e6e93dbc2a Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly a308b27c2f [formerly e91406ab10 [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]]
Former-commit-id: a308b27c2f
Former-commit-id: 232655183c [formerly 623c49c3cc] [formerly e4d956e4004a3d775c7a86d2f7a9ed188361fc67 [formerly d9a481f542]]
Former-commit-id: 73b5d3c96bf8dd9ba37e4ab2e38562564605d6ee [formerly 58a5bebb80]
Former-commit-id: b30b72252b
2013-03-28 15:45:31 -05:00
Ron Anderson
80ce55bd3a Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]]
Former-commit-id: b65ecfc151
Former-commit-id: 65dd075089 [formerly 33bcf5fee8] [formerly 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]]
Former-commit-id: 378adfc06dd24afcb2243ae4d39d879540f2cf23 [formerly 5eb1885dbd]
Former-commit-id: bef17d4f03
2013-03-28 13:37:29 -05:00
Steve Harris
0528a1c5d2 Revert "Replaced with formatted version"
This reverts commit 911496b339 [formerly 20c9d653c8] [formerly 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]] [formerly 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]].


Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]]
Former-commit-id: 8400028e11
Former-commit-id: c9dd652973 [formerly 7bd478fc41] [formerly 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]]
Former-commit-id: 7785f0f8379983a18ed3a8ce49a49f5cee5bbfcc [formerly 0074c522bb]
Former-commit-id: 938243eb0b
2013-03-28 13:08:16 -05:00
Dustin Johnson
e275e220bb Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
Former-commit-id: c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]]]
Former-commit-id: 3991df64ff
Former-commit-id: d37764f722 [formerly 3896cf42f1] [formerly 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4]]
Former-commit-id: d71448462cb9ab117673ae34b2e4a8163533ee0f [formerly 9c4030ea37]
Former-commit-id: be22a59736
2013-03-28 13:07:20 -05:00
Greg Armendariz
911496b339 Replaced with formatted version
Former-commit-id: 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]
Former-commit-id: 18019c07a4
Former-commit-id: 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]
Former-commit-id: 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]
Former-commit-id: 20c9d653c8
2013-03-28 12:59:43 -05:00
Dustin Johnson
1b7986e692 Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development
Former-commit-id: 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 51bf00bf1c [formerly 8583a5f785 [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: a5bb46da22 [formerly ee26b669e3] [formerly 9d4afc316993b2f4357647dcee834eee6af6bfcd [formerly db5a8b9865]]
Former-commit-id: df99689cde8a53890c2c8b1ce2780d68fd331f83 [formerly 1cf371cd41]
Former-commit-id: 520b9f2a69
2013-03-28 12:25:12 -05:00
Dustin Johnson
847503d736 Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly a4e4df02b0 [formerly ab42673848 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]]
Former-commit-id: a4e4df02b0
Former-commit-id: ce4b93027c [formerly 85d6a19a5e] [formerly 150bcdf38ca3c079cb25192b6b11f9b215ca5226 [formerly 902986256d]]
Former-commit-id: 6d266d55ab153a947bbe33826514f5c88ba00752 [formerly f135c0d948]
Former-commit-id: a5009cb271
2013-03-28 12:14:47 -05:00
Dustin Johnson
8f7c7adf90 Issue #1840 Fix merge error that removed .classpath
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

Former-commit-id: e28ea4d3ef [formerly 5e0073f1f9] [formerly 680d2984e1] [formerly e28ea4d3ef [formerly 5e0073f1f9] [formerly 680d2984e1] [formerly 695c83669e [formerly 680d2984e1 [formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]]
Former-commit-id: 695c83669e
Former-commit-id: 65f6842341 [formerly d0056996cd] [formerly 49686481ddfb365c4542534bf9b1daede1aa694b [formerly 25b6eb0eb9]]
Former-commit-id: 099c2ace4d8824649134e43cbeb7b4520268aa4a [formerly fddc41bb6e]
Former-commit-id: 3850e46c2c
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
7b0b82d34a Issue #1802: Eliminated a call to new on StatsDao in AggregateManager
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: c63337ac35 [formerly ec880b7923] [formerly ed9cb5f8f6] [formerly c63337ac35 [formerly ec880b7923] [formerly ed9cb5f8f6] [formerly 6640a65a51 [formerly ed9cb5f8f6 [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]]
Former-commit-id: 6640a65a51
Former-commit-id: 8bfd5868ca [formerly af5827f1de] [formerly 3ca6f8d97c36c44404ce7fb69a9938ea70b43c36 [formerly c4496475a6]]
Former-commit-id: 81f0ba984561fbca0381870836ee4853cc303c7d [formerly 5ec3ffed77]
Former-commit-id: cca60522c4
2013-03-28 12:08:57 -05:00
Dustin Johnson
22a62fea55 Issue #1839 Change build.edex build.xml to support building work assignment features after main build
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 1365d5c9af [formerly 3be6669f1b [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 6ad3355dad [formerly 1960bcbf11] [formerly c88cf84fe3b042c261af4f646c01752674a7c487 [formerly 83f6fb720c]]
Former-commit-id: db422ebb6e9f3dceaec4bd0424043a548411b890 [formerly f817dbe495]
Former-commit-id: 9d04ba83a5
2013-03-28 11:43:24 -05:00
Ben Steffensmeier
7446339aff Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly efbdd3aa8c [formerly a9cec71222 [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: 7b4a3d369a [formerly e1a619e030] [formerly c4ade474503e6a9399c1f1ee86362c6279fef943 [formerly 403da9bfb9]]
Former-commit-id: 3c7fe12b069b4ef0a323be77b83958d6cde2b41b [formerly 94dcd159d4]
Former-commit-id: 67b3b92712
2013-03-28 10:16:11 -05:00
Greg Armendariz
6a115c344f Add source variable
Former-commit-id: 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly d0d889f11d [formerly 8800080d2a [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]]
Former-commit-id: d0d889f11d
Former-commit-id: 8d335839e6 [formerly 44fcd1a8db] [formerly da1c2ea08a80b36673131e488158b2c4a2af18db [formerly 24fea6f45d]]
Former-commit-id: e10fee20c3429fa2de5343bfd74d936e7a2fc6d7 [formerly 344c5b41b3]
Former-commit-id: 0ab3b9d7f9
2013-03-28 08:56:50 -05:00
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Richard Peter
6e9eee551c Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 2b207fc6ec [formerly 3ba331e9f5 [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: 52459fd3cc [formerly b061ba5595] [formerly 422f89b43e649e651ca02e3a954f92499144263f [formerly d8cbd1ff39]]
Former-commit-id: 7d5128c91b6fd53bd9edd1c800ecb49af4574ae5 [formerly c2896a01d2]
Former-commit-id: 6bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly 6c4f279623 [formerly 7992b43a7a [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]]
Former-commit-id: 6c4f279623
Former-commit-id: 28c463775b [formerly ce746d6228] [formerly 55be6e5f32264ac772c6926e10bae527eaa7a2cd [formerly e68173e147]]
Former-commit-id: 4a5aa05d01f86c1540aab9a3efbffb6f5581f05f [formerly 17a9c008d0]
Former-commit-id: 97a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00