Commit graph

1787 commits

Author SHA1 Message Date
Richard Peter
28e249ce77 Merge "Issue #1537 - fixed the edex-environment build" into development
Former-commit-id: b45502cd45 [formerly 7fb59536c9] [formerly 36272799c6] [formerly b45502cd45 [formerly 7fb59536c9] [formerly 36272799c6] [formerly b5b1ea923a [formerly 36272799c6 [formerly aa7edb8004479dd71fb3863392ec78eb6830e657]]]]
Former-commit-id: b5b1ea923a
Former-commit-id: e652289c8a [formerly 28c56766fb] [formerly 9a6c3b0cc337364ee6f7c9e478e95bd025e553a1 [formerly fa22dd1557]]
Former-commit-id: 5c811446b147595ed01dae20363e5bebe9a10520 [formerly 2826f3469d]
Former-commit-id: 5deeb0fb6f
2013-01-29 10:34:20 -06:00
Richard Peter
9fef0449af Merge "Issue #1526 improved exception handling per code review comments" into development
Former-commit-id: 72021587e7 [formerly 565fbd1630] [formerly 80a750a72a] [formerly 72021587e7 [formerly 565fbd1630] [formerly 80a750a72a] [formerly a23fa4a1ae [formerly 80a750a72a [formerly bb9789c558f6abf2f75a146edc7a197784e3711b]]]]
Former-commit-id: a23fa4a1ae
Former-commit-id: 4d43c7518d [formerly b9b92baa12] [formerly 264f19cf2483ed87134297a74d668673d20b183c [formerly 641ae0393a]]
Former-commit-id: 80c0d0f33e8ad7a98332423574a5559e2f76358a [formerly 95d14fbdf0]
Former-commit-id: 5a9287ceda
2013-01-29 10:29:00 -06:00
Bryan Kowal
aa1f7e6364 Issue #1537 - fixed the edex-environment build
Former-commit-id: 792230a38e [formerly a960b34230] [formerly 7116bb86ef] [formerly 792230a38e [formerly a960b34230] [formerly 7116bb86ef] [formerly fa511e980b [formerly 7116bb86ef [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]]
Former-commit-id: fa511e980b
Former-commit-id: a8d1496454 [formerly f4e7bead66] [formerly 7a615a201ed2fac7d12eeef3455b28a530f92660 [formerly aefeada9d6]]
Former-commit-id: cd37885a8c1aaa8da5e718615e2a2a711aa7c798 [formerly 662f471e5e]
Former-commit-id: 1377ae600f
2013-01-29 09:51:54 -06:00
Nate Jensen
f747236a5b Issue #1526 improved exception handling per code review comments
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: 8e90784e71 [formerly d155f573c9] [formerly 471dd02143] [formerly 8e90784e71 [formerly d155f573c9] [formerly 471dd02143] [formerly 530fdbe151 [formerly 471dd02143 [formerly 6abffb7aeb4011db9f6380fc644312b408bb75fa]]]]
Former-commit-id: 530fdbe151
Former-commit-id: 894b6a574f [formerly 2c85ed97e3] [formerly ad1fb77c31579ecb8b7b6e3561db673a9d9913f2 [formerly d233055696]]
Former-commit-id: 6b8080823ded895c55609b070f30ce87d2f9096b [formerly d78dbb1390]
Former-commit-id: 2990d90bcb
2013-01-29 09:25:19 -06:00
Lee Venable
afeb942d45 Merge "Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes)." into development
Former-commit-id: fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly 078cc84047 [formerly 1c61671766 [formerly 9e32ad8949af4f1e1a4d163056d510c2572f0aec]]]]
Former-commit-id: 078cc84047
Former-commit-id: a4a40b2fa9 [formerly 65fc68e586] [formerly 42c4d71b42c286fb8b9898e7dbbd82f66a2e8380 [formerly 0ee108f806]]
Former-commit-id: 043540be9558d0f052f5de12adda84cf183f1c3e [formerly 6b415ceab0]
Former-commit-id: ee66eb1671
2013-01-29 09:19:56 -06:00
Steve Harris
57391f3fbd Merge branch '13.2.1_delivery' into development
Former-commit-id: 8b3a3f0325 [formerly ef2526ed44] [formerly 6bd7e027b6] [formerly 8b3a3f0325 [formerly ef2526ed44] [formerly 6bd7e027b6] [formerly b5b1823104 [formerly 6bd7e027b6 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]]
Former-commit-id: b5b1823104
Former-commit-id: 51c02cbee7 [formerly 27725703d5] [formerly be8acf0a7b8afdcee2035efbe867156750b66ce4 [formerly 0a31815c66]]
Former-commit-id: b41284cbb0c62378810cb115448c7f6a0e9ac7d1 [formerly fa305d03ba]
Former-commit-id: 7395af8e56
2013-01-28 16:28:58 -06:00
Richard Peter
aa305777de Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]]
Former-commit-id: 2946e97294
Former-commit-id: 0ae1b55321 [formerly 7c9b9b0237] [formerly 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]]
Former-commit-id: c079a8a182f031460dd573dd9af4bb06ff087f91 [formerly 4f61e88c6f]
Former-commit-id: 7a41e41ca9
2013-01-28 15:27:23 -06:00
Bryan Kowal
1ecf83c57c Issue #1503 - initial commit for build of Qpid 0.18 rpms
-created a qpid service script

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

Former-commit-id: 7b4935a0ef [formerly ec584b4d4b] [formerly ff34587e94] [formerly 7b4935a0ef [formerly ec584b4d4b] [formerly ff34587e94] [formerly 54697ff658 [formerly ff34587e94 [formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]]
Former-commit-id: 54697ff658
Former-commit-id: f8e120a219 [formerly 45dd0b02ff] [formerly 32df1491d555132dea478823ea8d5513fb36a0d5 [formerly 0cf405d8d9]]
Former-commit-id: 82ecdb55cbcc1cd43992ca51e32b92ab48329fec [formerly ce2d246314]
Former-commit-id: b7f7312c7d
2013-01-28 11:21:24 -06:00
Roger Ferrel
afe50ac914 Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly dd41c60e3f [formerly 5a23770931 [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]]
Former-commit-id: dd41c60e3f
Former-commit-id: 5951b04a4f [formerly d4667e3909] [formerly 27165535226953b58522aeb5bae5425c31f9b2fa [formerly e6ff72765a]]
Former-commit-id: 1b66ee7d7d223607fa4b64a5ed56661b5ff5d880 [formerly 6a870cbd8d]
Former-commit-id: 9fc3f7151f
2013-01-28 08:39:36 -06:00
Steve Harris
02bc43a385 Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery
Former-commit-id: 6b74a9a34a [formerly 2e6b21b299] [formerly 3bb4d338f6] [formerly 6b74a9a34a [formerly 2e6b21b299] [formerly 3bb4d338f6] [formerly f0a495e095 [formerly 3bb4d338f6 [formerly a3d06df18373a0f8c69f07ef0eaf0b5c0ee76fd6]]]]
Former-commit-id: f0a495e095
Former-commit-id: c1ed23241b [formerly 089e0254d7] [formerly 5c24c3bca39a0e2f2f1775ff7a5a155253370404 [formerly 9ac3e4eacf]]
Former-commit-id: bba6f8424c9e11d773c47829a4590338a70ee08b [formerly 0c50d05552]
Former-commit-id: 291bc12185
2013-01-25 17:41:23 -06:00
Bryan Kowal
a7b254b60f Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 7e7b47d934 [formerly 2046255ef0 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]]
Former-commit-id: 7e7b47d934
Former-commit-id: 9476e45881 [formerly 0695fbbc8c] [formerly e666bdb02a0ffd5583e5c764ffe9c1384f870cba [formerly fc6feb2329]]
Former-commit-id: 3ef9594937130f311e556060b37975752c43c1c4 [formerly 3e9d683a7f]
Former-commit-id: 01ba5e0b5c
2013-01-25 16:19:54 -06:00
Steve Harris
8988ae04c2 Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly e8e8106d42 [formerly ffb536cd46 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]]
Former-commit-id: e8e8106d42
Former-commit-id: ed42a5c55e [formerly fe4b27913c] [formerly 044d35fb735acb469bfe8681ef7f37367cf2ac62 [formerly bac3f97ab6]]
Former-commit-id: 494c6bbd8e1a96c74b0631358776c560f4d385aa [formerly fe2ddb8fde]
Former-commit-id: 687b789b6b
2013-01-25 16:02:47 -06:00
Richard Peter
9e485ece8d Issue #1408: Merge branch 'ss_builds' (13.2.1) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.datadelivery.feature/feature.xml
	cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/UserSelectComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/services/DataDeliveryServices.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/DeleteGroupDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/GroupAddDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/RequestFromServerPermissionsService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubApprovalTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/presenter/CreateSubscriptionDlgPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/presenter/GriddedTimingSelectionPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/xml/SubsetXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/OperatorAdapter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/CreateEditRuleDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/Operator.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemLatencyTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemManagementDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemPriorityTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemRuleManager.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataSetFrequency.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/NotificationHandler.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/MenuLoader.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	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/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/utility/common_static/base/datadelivery/systemManagement/rules/latencyRules.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Ensemble.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSet.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSetMetaData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Parameter.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Provider.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/DataSizeUtils.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/LookupManager.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/SubscriptionNotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/MainSequenceCrawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/OPENDAPServiceConfig.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/harvester/NOMADS-harvester.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtility.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRequestBuilder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalGenerator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	nativeLib/org.apache.qpid/lib/libqpidclient.so
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	tests/.classpath
	tests/unit/com/raytheon/uf/common/datadelivery/registry/OpenDapGriddedDataSetFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderTest.java
	tests/unit/com/raytheon/uf/common/localization/TestPathManager.java
	tests/unit/com/raytheon/uf/common/registry/RegistryManagerTest.java
	tests/unit/com/raytheon/uf/common/stats/data/DataPointTest.java
	tests/unit/com/raytheon/uf/common/stats/data/StatsDataTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/harvester/CrawlerTest.java
	tests/unit/com/raytheon/uf/edex/stats/data/StatsDataAccumulatorTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXMLTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/utils/DataSizeUtilTest.java

Former-commit-id: b2ebea951c [formerly 094fab7d16] [formerly 116ed10973] [formerly b2ebea951c [formerly 094fab7d16] [formerly 116ed10973] [formerly 81f14729ae [formerly 116ed10973 [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]]
Former-commit-id: 81f14729ae
Former-commit-id: 5071a1181e [formerly 74b80fdc81] [formerly 6d92a3ebba31fa453ea1f58923ba6feb92785d9f [formerly d0e3bbf826]]
Former-commit-id: 8818b6f20902f4a740d3203a18d3b81767a61a5a [formerly 1058dba963]
Former-commit-id: f810e098d0
2013-01-25 15:54:27 -06:00
Brad Gonzales
7ffc2b8280 Issue #1448 added updated i386-pc-linux-gnu.tar
Change-Id: I183703485a11cc2a1c074a692870f3fcdf308870

Former-commit-id: 96b01dca30 [formerly 86f1b0468a] [formerly 98e13b532f] [formerly 96b01dca30 [formerly 86f1b0468a] [formerly 98e13b532f] [formerly 5953d64009 [formerly 98e13b532f [formerly e25a8de4563afdac9b53430f61ab81db1bcca2b2]]]]
Former-commit-id: 5953d64009
Former-commit-id: bf242d7443 [formerly 0efff32b53] [formerly 96bbf76cb66b4162c9ec154de227c7e4d79b688b [formerly aafb4c3d48]]
Former-commit-id: 88e0b4eb5a69f80a6c565d5b896f36f8f3ad62f0 [formerly f59e83aa10]
Former-commit-id: b61db07075
2013-01-25 11:37:43 -06:00
Steve Harris
379a9dd95c Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]
Former-commit-id: 827611474f
Former-commit-id: 1397f8a811 [formerly a85c81289e] [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]]
Former-commit-id: f2d8f7cd1be3a2bba4584db2da805b450fce002a [formerly 895b25bac4]
Former-commit-id: a7d7847b06
2013-01-25 10:54:51 -06:00
Lee Venable
4e75151272 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
Former-commit-id: 5759947256 [formerly 8d19ab695a] [formerly 79fca0b122] [formerly 5759947256 [formerly 8d19ab695a] [formerly 79fca0b122] [formerly e49a718462 [formerly 79fca0b122 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]]]
Former-commit-id: e49a718462
Former-commit-id: fccba2eb96 [formerly 4c07c59837] [formerly 25562daeb4ca7d1904a42978195b51ed2158e7a3 [formerly d04924fd3a]]
Former-commit-id: 7b0e3c9cc1ad701c2a3510f40986dbe7b5287463 [formerly 45eaf08797]
Former-commit-id: c959752c76
2013-01-25 10:46:40 -06:00
Steve Harris
5d7a0ba9af 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8 [formerly 251a9c0195] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb]
Former-commit-id: eafa141b90
2013-01-25 09:07:12 -06:00
Lee Venable
11b68b58cc Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]]
Former-commit-id: e4142b63c9
Former-commit-id: e2f088c003 [formerly 4bf28dd204] [formerly 3db7896ccb9207afe3cea12b611de87c2bb0fbeb [formerly 063ffa26eb]]
Former-commit-id: 5135eb50e84a401433131b96424fedf34d2d06a3 [formerly 18f8246019]
Former-commit-id: 4a9d05e1f0
2013-01-24 16:52:17 -06:00
Nate Jensen
20549bfc31 Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 9fb144f73e [formerly 04a397866a] [formerly 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]]
Former-commit-id: fab84284a623721ba923b4339c1fe692ec1f2c99 [formerly 8726a77052]
Former-commit-id: ddf1360954
2013-01-24 16:41:02 -06:00
Bryan Kowal
98ab0506ce Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly 117028c632 [formerly 09735415c5 [formerly 293dd0c762884f285e455d94708b6e9fcc82023f]]]]
Former-commit-id: 117028c632
Former-commit-id: 7214b65ccf [formerly 473368e0c8] [formerly 042aa3503e2052385e138273b071ed7d19fad917 [formerly a90266a49f]]
Former-commit-id: f3f8581e4b203c81cdb09bf4705d1671bc146bc7 [formerly 1154a1187e]
Former-commit-id: 9c8071e3a1
2013-01-24 15:50:09 -06:00
Lee Venable
b33566385e Merge "Issue #1357 - fix for data plotting in the x direction." into 13.2.1_delivery
Former-commit-id: a6f3236f18 [formerly 4bc2a37f0c] [formerly bf8517d554] [formerly a6f3236f18 [formerly 4bc2a37f0c] [formerly bf8517d554] [formerly e271e38bb3 [formerly bf8517d554 [formerly a202522b96ddcbca7eb39c14ba8a40073f13cf6e]]]]
Former-commit-id: e271e38bb3
Former-commit-id: aaaa26e749 [formerly e3f5c9f08c] [formerly 34979c3b9a0bcee8647c7b647094a77c12fca29c [formerly 931c1454cd]]
Former-commit-id: 6af40487f39df38137d74a87ac6c8b742a5ddf2f [formerly 1451af2ff8]
Former-commit-id: 1de6a16dc4
2013-01-24 15:37:51 -06:00
Steve Harris
19f386e56a Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly 267d860cd1 [formerly ca23ba06e5 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]]
Former-commit-id: 267d860cd1
Former-commit-id: 7b1dbd3c56 [formerly bd1393541a] [formerly 88968d3e3fb4d249efd67cec63084edac1ce39bb [formerly 9b3713763d]]
Former-commit-id: 3eb7fc866b9a49a2ecd259d1e6589cc96dd10f2b [formerly ec2aaf2005]
Former-commit-id: db11a51d8c
2013-01-24 15:02:36 -06:00
Benjamin Phillippe
1424969ceb Issue #1525 Improved Dataset Discovery Browser query performance
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1

Former-commit-id: 8bad25fac2 [formerly eaeceb82cf] [formerly 49c66d2e47] [formerly 8bad25fac2 [formerly eaeceb82cf] [formerly 49c66d2e47] [formerly bcd7e5629f [formerly 49c66d2e47 [formerly b112d2eba2395f693beedd64ca97c140cba161f1]]]]
Former-commit-id: bcd7e5629f
Former-commit-id: 3c6d7f5ad0 [formerly 98cd7c4339] [formerly a06a2afe6499ad3423c21a24b4326a5bdbcc606d [formerly 4042027a25]]
Former-commit-id: 917882078afa3c993390f9939fac7a609a70f1a6 [formerly ea083fe6f9]
Former-commit-id: 6f937c7cc0
2013-01-24 13:17:28 -06:00
Mike Duff
27a9b15eea Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: a09e8c5570 [formerly 05e9b88566] [formerly 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]]
Former-commit-id: ef3455ec3540faf3e7ca24232e1af94de307fd18 [formerly f9b7cae879]
Former-commit-id: 0752ecb4f1
2013-01-24 12:39:12 -06:00
Mike Duff
a681ae43de Issue #1357 - fix for data plotting in the x direction.
Former-commit-id: 4d17e05653 [formerly d4d80b0206] [formerly da22ae4a5f] [formerly 4d17e05653 [formerly d4d80b0206] [formerly da22ae4a5f] [formerly b283362a2f [formerly da22ae4a5f [formerly 862ca86596fb59ce5c0b6cbcce320303f6cda3b3]]]]
Former-commit-id: b283362a2f
Former-commit-id: 309bb57f14 [formerly 4e30dc629a] [formerly 4adca58722a1673adcbc0170eae7beb1f06a40ae [formerly da2c03f0ae]]
Former-commit-id: e2fb3722933e3b727f67b1d42b4c83d243a74923 [formerly eb6789534e]
Former-commit-id: 2b936f62dc
2013-01-24 11:37:23 -06:00
Ben Steffensmeier
7a297d8963 Issue #1495 fix fens regex.
Former-commit-id: 314f90d933 [formerly 37d712231a] [formerly e28749bc03] [formerly 314f90d933 [formerly 37d712231a] [formerly e28749bc03] [formerly 2cb3fe3dc2 [formerly e28749bc03 [formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]]]
Former-commit-id: 2cb3fe3dc2
Former-commit-id: 7633292992 [formerly 07d1695d81] [formerly 84248b3ab25b0a8d2618c7df04bb826cfc3172c5 [formerly 243af2b479]]
Former-commit-id: 82ed300c1aca200a28d3fbd8baee3c4085380f3a [formerly df72441e79]
Former-commit-id: 9e304a42da
2013-01-24 10:53:51 -06:00
Max Schenkelberg
f6a854755a Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly b6a29c38a5 [formerly 9655d64069 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]]
Former-commit-id: b6a29c38a5
Former-commit-id: c709c91154 [formerly ecce9be8ce] [formerly 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff]]
Former-commit-id: 75e5474b19b240758634d24dabc0961fd75c2813 [formerly 12318158c2]
Former-commit-id: 8bfa47f929
2013-01-23 16:50:17 -06:00
Ron Anderson
949b2a86ab Merge "Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads." into development
Former-commit-id: 0f79427f2a [formerly d8878cfd97] [formerly 237b728039] [formerly 0f79427f2a [formerly d8878cfd97] [formerly 237b728039] [formerly ed1e096a11 [formerly 237b728039 [formerly 1f809b6b94e9a0d3d96542bea9781cbc6397572d]]]]
Former-commit-id: ed1e096a11
Former-commit-id: 21d235ccf3 [formerly dd437f3df4] [formerly 5c5fc269cf44177b7d1f6983e2f3b2b305109bfc [formerly ee4c0568bf]]
Former-commit-id: 020457a33d56f3a505d3da3a6e6b16d6dec81f04 [formerly 86c52667ae]
Former-commit-id: f24c9b9456
2013-01-23 16:46:42 -06:00
Ron Anderson
1a2e4d477f Issue #1524 Fix discrete color bar.
Former-commit-id: 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 718f1da85b [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]]
Former-commit-id: 358c8bdf07
Former-commit-id: 250fd1d223 [formerly 6f7fa3e4e5] [formerly d49ec924e070578e004c1ea1c0c50d561de56ceb [formerly 3ccfdbc4bb]]
Former-commit-id: 19981c45dbc5b6d1e94c052f0ca8f7899de755b7 [formerly 01f80e2ff2]
Former-commit-id: 259871dfd8
2013-01-23 16:37:56 -06:00
Ben Steffensmeier
ae9f2caa73 Issue #1479 fix mod families
Former-commit-id: dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly a7989d4638 [formerly 13fd813660 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]]
Former-commit-id: a7989d4638
Former-commit-id: d06eb6312e [formerly 3dfe43caac] [formerly 17cbebf191acc2d92271b74e20f9bb5df587b7a1 [formerly fbd614258f]]
Former-commit-id: ddd0166886969a5e01fb56ad440b559e700f192c [formerly d5e0e015b3]
Former-commit-id: 2c863705f7
2013-01-23 15:47:30 -06:00
Mike Duff
0dabecaa48 Issue #1523 - Fix for count
Former-commit-id: d4b36b98f7 [formerly adbabb6765] [formerly 229a0c77fa] [formerly d4b36b98f7 [formerly adbabb6765] [formerly 229a0c77fa] [formerly 3c20aab166 [formerly 229a0c77fa [formerly 35fbd9ce448a17d761bd4f745fd2f1339d82537b]]]]
Former-commit-id: 3c20aab166
Former-commit-id: 9c8e53e0d4 [formerly 028fe6cea9] [formerly f8373eb1bbc61919c49e5d861d7a5ce2c29b0d77 [formerly cb268b76e4]]
Former-commit-id: 5c47d87113bb3712bdaf77184a9566230257cc5f [formerly 646282d82f]
Former-commit-id: 3fa52f2d43
2013-01-23 15:15:08 -06:00
Mike Duff
a49d3917f1 Issue #1386 - Remove Save Stats Graph Menu Item.
Former-commit-id: 008014c61d [formerly c52ed8a476] [formerly 8c2789a1a7] [formerly 008014c61d [formerly c52ed8a476] [formerly 8c2789a1a7] [formerly dc46923886 [formerly 8c2789a1a7 [formerly a201a22bb4271c94b1fda7f4eaa1f1b74b9d1859]]]]
Former-commit-id: dc46923886
Former-commit-id: dfbaec400e [formerly a7dfd070fd] [formerly d03b741e0705a2829aae7d11b7012e5dde6b0336 [formerly 2b4ec75a2c]]
Former-commit-id: 100beef690480a42e7e517e79d77cdc2a9dc1d20 [formerly 28658f155b]
Former-commit-id: 006f964dbe
2013-01-23 15:02:36 -06:00
Mike Duff
e20b1d8538 Issue #1523 - Finalize registry and data delivery stats
Former-commit-id: 4186b10583 [formerly cbfd355219] [formerly 9c033e6484] [formerly 4186b10583 [formerly cbfd355219] [formerly 9c033e6484] [formerly 561e83454f [formerly 9c033e6484 [formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]]]
Former-commit-id: 561e83454f
Former-commit-id: 4ab0eecfa0 [formerly 7e421afc03] [formerly f8db6cdbac08b1f47e17566c905c303288aef176 [formerly 29939914a2]]
Former-commit-id: 791bd487a82d7c311992391dac0aea88f3c72fe4 [formerly c000ee3cd9]
Former-commit-id: ff6de982ca
2013-01-23 14:40:23 -06:00
Roger Ferrel
04e20890ea Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: 7dad868adf [formerly 3abb6f1026] [formerly ff09ee32ab] [formerly 7dad868adf [formerly 3abb6f1026] [formerly ff09ee32ab] [formerly 470abe2495 [formerly ff09ee32ab [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]]]
Former-commit-id: 470abe2495
Former-commit-id: 9d57e63501 [formerly 3daf0c7b37] [formerly 74c0f2f92451f0a414ebfbb04887d41f50debf92 [formerly 58e3bbbe97]]
Former-commit-id: 7604f050d118297b35ef8a8d6731fe102bc5cfe5 [formerly e0c01d6c04]
Former-commit-id: 067198ca1f
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
e448ec38f4 Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: 4c552e9078 [formerly bd32a947c7] [formerly a19b51cf2e] [formerly 4c552e9078 [formerly bd32a947c7] [formerly a19b51cf2e] [formerly 3032dc2189 [formerly a19b51cf2e [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]]
Former-commit-id: 3032dc2189
Former-commit-id: 46d0780052 [formerly e59bb3c914] [formerly e8a187a94b2904c946afa1581a0b3a5ec4094308 [formerly 2e907f4a0e]]
Former-commit-id: d7a2f467400dc618241d654534b0a4b09966dc1f [formerly fc7b0393c5]
Former-commit-id: 20a08fcc2c
2013-01-23 11:39:52 -06:00
Mike Duff
5cf904ba6f Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: aa26a4d5d2 [formerly dfcce57a0a] [formerly 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]]
Former-commit-id: 9fd21a8ac89c2efd5bc6d198d4f4290003357cb3 [formerly ac9f95d1d0]
Former-commit-id: df41fe4395
2013-01-23 11:17:36 -06:00
David Gillingham
b03363cfc4 Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

Former-commit-id: a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly 88e518725e [formerly bf6230441f [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]]
Former-commit-id: 88e518725e
Former-commit-id: b96532e8ba [formerly faedefb85d] [formerly 9daae29bca1ae2c2c15295eb3aeae98bbeae7fa5 [formerly a1fd2bd32f]]
Former-commit-id: 502a3d2e982cabefa0c8afd0ea5107730be09c23 [formerly 5e6d400e79]
Former-commit-id: a4db386f6e
2013-01-23 10:09:39 -06:00
Mike Duff
aa3c0782ff Issue #1520 - Change delete notifications to hide.
Remove accelerators

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

Former-commit-id: bf9354054d [formerly bbc998d372] [formerly ddcd0f8222] [formerly bf9354054d [formerly bbc998d372] [formerly ddcd0f8222] [formerly 8efd37da79 [formerly ddcd0f8222 [formerly 0378ff80cc3592379ec3d49efc895adafa05109a]]]]
Former-commit-id: 8efd37da79
Former-commit-id: d2f8846060 [formerly 14bfeb0732] [formerly 026641ddcd51a6b5f16ed20fe1e5055ed89bac01 [formerly 243c1e15e9]]
Former-commit-id: 0d2e39094e1feb87e3471c5f0225cf6a5b6e7f6b [formerly ad1c7c604d]
Former-commit-id: a14438b10a
2013-01-23 09:14:48 -06:00
Dustin Johnson
1e301478b9 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]]
Former-commit-id: f730422834
Former-commit-id: 70bce9d505 [formerly 2e09d46fea] [formerly 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]]
Former-commit-id: ba860324a0a7e30cd96383cd383eb22a2db70a82 [formerly 7918b009ff]
Former-commit-id: 4cec3d4356
2013-01-23 08:06:52 -06:00
Steve Harris
b30f963db9 Merge branch '13.2.1_delivery' into development
Former-commit-id: 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]]
Former-commit-id: 9b6cc68601
Former-commit-id: b33edc1373 [formerly 764efdb8b8] [formerly 85fb1ad709c9c553a8e608e531581ff213d0b779 [formerly c7148da94d]]
Former-commit-id: f23a16bd0977557a616aa8dd06c01d27db2c4f5b [formerly 6964c16be7]
Former-commit-id: 7063a0c8d2
2013-01-22 21:47:09 -06:00
Ron Anderson
3059eb3540 Issue #1504 Fix merge error
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: a73d824233 [formerly c165cd4e3b] [formerly b5fd4e6226] [formerly a73d824233 [formerly c165cd4e3b] [formerly b5fd4e6226] [formerly cac86a904d [formerly b5fd4e6226 [formerly 71aca907a76084392402160005bbeb157cfddfc4]]]]
Former-commit-id: cac86a904d
Former-commit-id: 896cea5586 [formerly cfeab572a2] [formerly f86057cf80982d74b3fed381444651b47020a449 [formerly 68af35c524]]
Former-commit-id: 83401cfccdf7434bcd234a7a809651412419e39a [formerly af348cb53a]
Former-commit-id: 33bd709957
2013-01-22 18:22:19 -06:00
Nate Jensen
28f3fa9148 Merge "Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized." into 13.2.1_delivery
Former-commit-id: a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 2059b9a962 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]]
Former-commit-id: 6e89f547e5
Former-commit-id: 998bbc254d [formerly 0ede688235] [formerly ee1703ba3eeb2bcd70c9bcd684bd2ba428f46711 [formerly ab30ace9ce]]
Former-commit-id: a9a641a7111433362c3df6fd61569058c3952e47 [formerly 9494e5b520]
Former-commit-id: d61e8b9cdb
2013-01-22 18:05:00 -06:00
Ron Anderson
a6b9f085d7 Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
Former-commit-id: d2a7bb20e6 [formerly abb36c3114] [formerly a1d7a1cbc9] [formerly d2a7bb20e6 [formerly abb36c3114] [formerly a1d7a1cbc9] [formerly b7abb8d4e4 [formerly a1d7a1cbc9 [formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]]]
Former-commit-id: b7abb8d4e4
Former-commit-id: a660c63e37 [formerly e9855ab55a] [formerly 796f7b8150dc43e27e559e8c5cea3a5559df55b4 [formerly 8fb70d5ddc]]
Former-commit-id: 09cabfac4c08475e6e690428241e47f4dcc50761 [formerly 05de6bdf6b]
Former-commit-id: 38e4a75c49
2013-01-22 17:50:40 -06:00
Ron Anderson
4076898ff9 Issue #1504 Fix merge error
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 5e5d27a9a7 [formerly 5c6af0d0a1] [formerly c83667e9b5] [formerly 5e5d27a9a7 [formerly 5c6af0d0a1] [formerly c83667e9b5] [formerly 2f4badad98 [formerly c83667e9b5 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]]
Former-commit-id: 2f4badad98
Former-commit-id: 02ddcfecf9 [formerly cb3e710d4c] [formerly 813ef0be1d506471a55ae9362d82d11f346967aa [formerly 8e15531e08]]
Former-commit-id: 228ae3c61b17392845a86458ba90cb7f51d2ad84 [formerly 6b2815a40c]
Former-commit-id: cb3ccc4533
2013-01-22 16:54:04 -06:00
Steve Harris
4ed4f88644 Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 7d6a1a7e3a [formerly 8b578c10dc] [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]]
Former-commit-id: f741fd6472c315f672ab76f7a397d383205c6f95 [formerly b03d5ce450]
Former-commit-id: c60051d5df
2013-01-22 16:45:48 -06:00
Lee Venable
fae811f020 Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
Former-commit-id: f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]]
Former-commit-id: b945ce9e6e
Former-commit-id: 96dcd20dc6 [formerly bc10a17c9f] [formerly bc549afb6b1466a867632b29624f84bc92b91365 [formerly 511a7d9753]]
Former-commit-id: 05b41b8c1713e389184b369d7596dc8376607363 [formerly 1dd4ad4b00]
Former-commit-id: fdd9368038
2013-01-22 16:26:48 -06:00
Ron Anderson
eeae7aa9ce Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource.
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6

Former-commit-id: ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly ce3d102cf9 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: eb41c05f54 [formerly 1062e54d2f] [formerly 6a1f7a195cac8a4aa1dc0ea06b509c23bb7d1264 [formerly 953f86348e]]
Former-commit-id: abb64f565a3863c0d0978b024482a211c0dd49c0 [formerly 48099589c0]
Former-commit-id: d0d1b62ab7
2013-01-22 16:12:16 -06:00
Mike Duff
d9b0dcc7a4 Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

Former-commit-id: 01126a7f47 [formerly e5e7bc1047] [formerly fc4a6264f6] [formerly 01126a7f47 [formerly e5e7bc1047] [formerly fc4a6264f6] [formerly 96e2192585 [formerly fc4a6264f6 [formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]]]
Former-commit-id: 96e2192585
Former-commit-id: 1a20fb912f [formerly 0ffc71147e] [formerly 625bda49088a61c6686cec5dab572c2f285226bf [formerly d62088cb0c]]
Former-commit-id: e9e982ac5ff0b4bbc29b23591f939f87ea59efa6 [formerly 8f388537eb]
Former-commit-id: 3f25b13a11
2013-01-22 14:57:23 -06:00
Ron Anderson
e528aaab4c Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]]
Former-commit-id: 20b0761048
Former-commit-id: c74a5b5be3 [formerly 8e575db69c] [formerly f07e79b0f531baa1e312a1c9871c441ba527ac16 [formerly 44807ba0d5]]
Former-commit-id: 98d55e81fb58419062f53ea5506a70c8a9c2a3fb [formerly cb23960f0e]
Former-commit-id: 64d4baf536
2013-01-22 14:47:37 -06:00
Ben Steffensmeier
3da37240b6 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: b5667ba11a [formerly cea067868c] [formerly 3c62be59c8] [formerly b5667ba11a [formerly cea067868c] [formerly 3c62be59c8] [formerly 1569f5af5d [formerly 3c62be59c8 [formerly 2c3ced7beb526f534083ff7b292b7523c76534a9]]]]
Former-commit-id: 1569f5af5d
Former-commit-id: 4b89940e78 [formerly ad1ca2feb5] [formerly 41d7f8ab0a267426604fd59eefcc34d75a3e0eec [formerly 1057580201]]
Former-commit-id: c9bb94fc06a16d7460a87e5f91659c16dfa72521 [formerly 18296e08da]
Former-commit-id: c770b2bd32
2013-01-22 12:12:18 -06:00