xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2051 commits 31 branches 40 tags 3.8 GiB
Commit graph

88 commits

Author SHA1 Message Date
Steve Harris
7e48d3e684 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
 2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline 
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
 2013-02-20 16:19:40 -06:00
Ben Steffensmeier
9c889bcc37 Issue #1598 fix GridParamInfo keys. 
Former-commit-id: 4370018cbf [formerly 7d4b065a23] [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 1ab9f7bd1f [formerly 33da1c48a76b468b9fee4e05de835295c7393672]]]
Former-commit-id: c1b8ceecf1
Former-commit-id: a3eea6c6923a0758fd9d051e07105c75b85536a9 [formerly 48e6ffe392]
Former-commit-id: cde7275a2a
 2013-02-19 14:06:26 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
 2013-02-19 12:22:00 -06:00
Richard Peter
24f36419b3 Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development 
Former-commit-id: 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly f364af584d [formerly 77157e3c6c [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]
Former-commit-id: f364af584d
Former-commit-id: 6929b91f2a2d234b16abab0c3bdda8ad2a62bffb [formerly 623020926e]
Former-commit-id: d42a0b9f0d
 2013-02-18 15:36:41 -06:00
Ben Steffensmeier
f945303603 Issue #1598 Make GridParamInfoLookup filter on extension. 
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly d2e17d1473 [formerly 63a725718d [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 11155351011bccb8beb1a89d0e39e1bd4e8881b5 [formerly 5ada0b2c2a]
Former-commit-id: 47090eccc1
 2013-02-18 10:36:47 -06:00
Steve Harris
db02d32440 13.2.1-8 baseline 
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
 2013-02-18 09:09:41 -06:00
Ron Anderson
12f2ac0171 Issue #1608 Fixed group deletes in H5pyDataStore.py 
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]
Former-commit-id: d69d628450
 2013-02-15 09:03:41 -06:00
Ron Anderson
529ccebc50 Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging. 
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485

Former-commit-id: 324aca72bc [formerly 95d18f9283] [formerly 771296a845] [formerly b6a9b42094 [formerly 771296a845 [formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]]
Former-commit-id: b6a9b42094
Former-commit-id: f8caae29e53d83233de67abe2c11f92d50f8420b [formerly 12b0fbdab8]
Former-commit-id: c862db5513
 2013-02-11 17:16:48 -06:00
Steve Harris
5027d2365b 13.2.1-6 baseline 
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]
Former-commit-id: bbe92e6824
 2013-02-07 16:00:39 -06:00
Brad Gonzales
3e4338339b Issue #1517 Added SPC Prob menu changes. 
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]
Former-commit-id: 8fc5c18ebd
 2013-02-04 08:52:33 -06:00
Steve Harris
41b14f0fa2 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
 2013-01-31 10:19:14 -06:00
Steve Harris
c9bc690eca Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
 2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae 13.2.1-3 baseline 
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
 2013-01-29 15:52:43 -06:00
Steve Harris
51c02cbee7 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 8b3a3f0325 [formerly ef2526ed44] [formerly cc0cfaa165c374895aa9647e3fb34fce2187f60e [formerly 6bd7e027b6]] [formerly b5b1823104 [formerly 6bd7e027b6 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: be8acf0a7b8afdcee2035efbe867156750b66ce4 [formerly 0a31815c66]
Former-commit-id: 27725703d5
 2013-01-28 16:28:58 -06:00
Richard Peter
5071a1181e 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 81f14729ae [formerly 116ed10973 [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 6d92a3ebba31fa453ea1f58923ba6feb92785d9f [formerly d0e3bbf826]
Former-commit-id: 74b80fdc81
 2013-01-25 15:54:27 -06:00
Steve Harris
0f4fcd0ba8 13.2.1-2 baseline 
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
 2013-01-25 09:07:12 -06:00
Steve Harris
d069467e81 13.2.1-3 baseline 
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]
Former-commit-id: 9d248cff7a
 2013-01-23 11:24:17 -05:00
Steve Harris
ce726fadc7 13.2.1-2 baseline 
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
 2013-01-23 11:18:44 -05:00
Ron Anderson
896cea5586 Issue #1504 Fix merge error 
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: a73d824233 [formerly c165cd4e3b] [formerly b5fd4e6226] [formerly cac86a904d [formerly b5fd4e6226 [formerly 71aca907a76084392402160005bbeb157cfddfc4]]]
Former-commit-id: cac86a904d
Former-commit-id: f86057cf80982d74b3fed381444651b47020a449 [formerly 68af35c524]
Former-commit-id: cfeab572a2
 2013-01-22 18:22:19 -06:00
Ron Anderson
02ddcfecf9 Issue #1504 Fix merge error 
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 5e5d27a9a7 [formerly 5c6af0d0a1] [formerly c83667e9b5] [formerly 2f4badad98 [formerly c83667e9b5 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]
Former-commit-id: 2f4badad98
Former-commit-id: 813ef0be1d506471a55ae9362d82d11f346967aa [formerly 8e15531e08]
Former-commit-id: cb3e710d4c
 2013-01-22 16:54:04 -06:00
Steve Harris
7d6a1a7e3a Merge branch '13.2.1_delivery' into development 
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]
Former-commit-id: 8b578c10dc
 2013-01-22 16:45:48 -06:00
Ron Anderson
c74a5b5be3 Issue #1504 GFE: Model data not always appearing automatically without CAVE restart 
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: f07e79b0f531baa1e312a1c9871c441ba527ac16 [formerly 44807ba0d5]
Former-commit-id: 8e575db69c
 2013-01-22 14:47:37 -06:00
Bryan Kowal
49b121ed3a Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict. 
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly 300e157b3c8dfc3a1f2f1580d6046fcedc74aed2 [formerly e2a12845d3]] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]
Former-commit-id: 38480e46b1
 2013-01-15 14:56:01 -06:00
Richard Peter
c889337379 Issue #1472: Fix GFE queryByD2DParmId to include required level in query 
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]
Former-commit-id: e23ffee8bd
 2013-01-11 11:03:42 -06:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
 2013-01-09 17:55:05 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline 
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
 2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline 
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
 2013-01-06 14:32:24 -06:00
Ben Steffensmeier
2a86c290c7 Issue #1438 move all gfe processing out of the grib plugin. 
Former-commit-id: 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly fe0a8b60c6 [formerly 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: 4c95d1279cc2d643fa5e3100b8491e31f64b88bb [formerly c6032b1950]
Former-commit-id: ca4e39df79
 2012-12-19 11:26:40 -06:00
Richard Peter
bcf2592bf1 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore 
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]
Former-commit-id: 08919e73c3
Former-commit-id: a2ffba67b6efe6ed162228db4c9f67b3e99a3233 [formerly f7859723e5]
Former-commit-id: e2007e61e1
 2012-12-13 11:02:07 -06:00
Steve Harris
88f9070c93 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development 
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]
Former-commit-id: 15849ae72a
 2012-12-11 08:56:54 -06:00
Steve Harris
377804398b Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
 2012-12-11 08:45:53 -06:00
Richard Peter
7b1b12b339 Issue #1394: Reduce GFE Grid Database calls 
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd

Former-commit-id: 60ddf30dd4 [formerly ac41861f0b] [formerly 3c3c695f24] [formerly 0670ac79fa [formerly 3c3c695f24 [formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]]]
Former-commit-id: 0670ac79fa
Former-commit-id: e9c2437eeac73fd970730932c9a3fa052ffe5455 [formerly 0cdb86b6ac]
Former-commit-id: 912b2ec928
 2012-12-10 11:59:54 -06:00
Steve Harris
79b0e973ef 12.12.1-12 baseline 
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]
Former-commit-id: 69ab975fab
 2012-12-06 09:18:28 -06:00
Max Schenkelberg
91607fb03e Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors. 
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]
Former-commit-id: 5aa26e4f13
 2012-11-14 16:19:37 -06:00
Ben Steffensmeier
1fe90be139 Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb 
Former-commit-id: af2808c4f4 [formerly 6e6823d62d] [formerly 42bbc21a3fb7c54af8002d5868fa85bcb7c56443 [formerly 5a1a6f2fdb]] [formerly 1b4236ccc5 [formerly 5a1a6f2fdb [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 5960908c4df2a4a5a484c956e47d7a5861f6bc10 [formerly 159817f538]
Former-commit-id: 5367f936f4
 2012-11-14 11:05:42 -06:00
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml 
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
 2012-11-12 16:46:21 -06:00
Dustin Johnson
cd5faf58bf Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
 2012-11-08 09:57:16 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline 
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
 2012-11-07 12:41:20 -06:00
David Gillingham
5c300c8a66 Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge. 
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: 6cd39983d5 [formerly 4237143dd0] [formerly 11f109976e] [formerly e0c7243c74 [formerly 11f109976e [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]]
Former-commit-id: e0c7243c74
Former-commit-id: 5356d22a44516841823c50737da389c199e73bce [formerly 73c592ccdc]
Former-commit-id: d6bbcbe863
 2012-11-05 14:00:15 -06:00
Ron Anderson
eb5a6daf10 Issue #1260 Added an extra grid cell around the slab to improve interpolation results. 
Change-Id: I9ffaa42402aa4527946bcc973577bfc7b2232f57

Former-commit-id: 479980293b [formerly 76d15a4749] [formerly c311b0568e] [formerly 5a51e70456 [formerly c311b0568e [formerly 51bbb17d43e7e458e75f3229ec1521ecc04517e9]]]
Former-commit-id: 5a51e70456
Former-commit-id: 29806233ca7a739af17203ba6ecfc2bd578d9378 [formerly b888425935]
Former-commit-id: 039c04f464
 2012-11-02 14:43:32 -05:00
Ben Steffensmeier
7f501ce30a Issue #189 fix gfe retrieval of static data 
Former-commit-id: 7e5589720a [formerly 2cb23de522] [formerly a663497d5b] [formerly 743b2b89e3 [formerly a663497d5b [formerly d08a637535547c0b037f3a50d86cc0c16ee0ad62]]]
Former-commit-id: 743b2b89e3
Former-commit-id: 2b029a0100b394f7aaf3c28772e1c10a7a503c5f [formerly 1c704a98f5]
Former-commit-id: 1348c2d512
 2012-11-01 18:30:05 -05:00
Dustin Johnson
fe8a2a3b09 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
 2012-11-01 13:36:06 -05:00
Ben Steffensmeier
0ee5726a56 merge branch Unifeid_Grid into developement 
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]
Former-commit-id: 1d94435220
 2012-10-30 12:24:54 -05:00
Steve Harris
0084fee62b Merge branch 'ss_builds' into development 
Former-commit-id: eb8a05a414 [formerly 340ce53e22] [formerly fb46bb053d] [formerly afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: cd588b3fe1018ebb8f94ece1f068009b87ded0d7 [formerly 048c0c88cd]
Former-commit-id: e211bfc043
 2012-10-29 12:17:12 -05:00
Steve Harris
89940e8fed 12.11.1-12 baseline 
Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]
Former-commit-id: d8b6157aab
 2012-10-29 12:15:56 -05:00
Ron Anderson
238a1aa07e Issue #1260 Fix data loading from NetCDF databases. 
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: a982185c63 [formerly 1767d945fc] [formerly 3874ac688b] [formerly ffc8f1567d [formerly 3874ac688b [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]]]
Former-commit-id: ffc8f1567d
Former-commit-id: 0c12e001b4c984752c15275ec5ae8741dd1287c7 [formerly 141c47d4e0]
Former-commit-id: 6c4264972f
 2012-10-25 16:59:25 -05:00
Ben Steffensmeier
a02048de74 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid 
Former-commit-id: 12eb4c8246 [formerly 7734a983f5] [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: e669b6159338d2ec7600fa9890fb7e959ebc9cec [formerly 54f414a7e0]
Former-commit-id: 45cc834fc3
 2012-10-25 16:17:54 -05:00
Ben Steffensmeier
24de750932 merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]
Former-commit-id: 9b8f2bcdbd
 2012-10-25 12:22:11 -05:00
Steve Harris
e7a5f938d5 12.11.1-10 baseline 
Former-commit-id: 7779b584c0 [formerly 63dddc5f5f] [formerly e845c605e6] [formerly 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 6fcb4f94c3d3270f1daa5300ab582f30625bdf7c [formerly cc21977c35]
Former-commit-id: 61224dec54
 2012-10-24 15:13:57 -05:00