Commit graph

1761 commits

Author SHA1 Message Date
Lee Venable
6025fa2b5f Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: 66aab3680d [formerly c3dec53498] [formerly 7009876544] [formerly 66aab3680d [formerly c3dec53498] [formerly 7009876544] [formerly a3a7dc44c9 [formerly 7009876544 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: 9d53072b41 [formerly baa5496a72] [formerly fdd917cd63082600218ba6b454499b49789ae013 [formerly 4e2b009db0]]
Former-commit-id: dcd813e94b8797a6e59a43eb7e56c6cc4f0f14b9 [formerly 4c2353f110]
Former-commit-id: 6101a97ad0
2013-01-14 17:47:59 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Richard Peter
252cdf4ed2 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 809c981306 [formerly 997ab69bf0] [formerly acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b]]
Former-commit-id: b03f2f7ac9211a133637c5710d1b71c02e3b6c48 [formerly bdc637110a]
Former-commit-id: c7f02b18c5
2013-01-14 17:34:31 -06:00
Richard Peter
cccc6f7918 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]]
Former-commit-id: 8192515b06
Former-commit-id: c056fd25cb [formerly 9154383e5a] [formerly e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda]]
Former-commit-id: c079d32f41e54072fc4ab430c0fe1b6e348e1723 [formerly a1517b8daa]
Former-commit-id: ad6bd4ace8
2013-01-14 17:34:17 -06:00
Richard Peter
4a40ce8ff3 Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 99414fa1f0 [formerly 461a503837] [formerly 32d4bc3d9f] [formerly 99414fa1f0 [formerly 461a503837] [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly 32d4bc3d9f [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]]
Former-commit-id: 69c6cfd196
Former-commit-id: 715d5bd5f2 [formerly ab38a1f89b] [formerly 7eb1dd62e445e03b2b2d4d9248f1dfaad042460e [formerly a634690867]]
Former-commit-id: 50b664ee5697ea7be4c3ca78699ddcf60f9947eb [formerly 2f507e1245]
Former-commit-id: 9cf234df1e
2013-01-14 17:33:22 -06:00
Richard Peter
97c1ff58a1 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]]
Former-commit-id: 19d923f387
Former-commit-id: 7af4fc10a8 [formerly f1262388ce] [formerly 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]]
Former-commit-id: 1fd01bf080c7430697622a86c36545061e29af0c [formerly 2575e4e4ea]
Former-commit-id: e59ea72456
2013-01-14 16:53:05 -06:00
Ben Steffensmeier
2d845671d7 Issue #1482 ignore malformed gribModel files
Former-commit-id: beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]]
Former-commit-id: 9cfa09e507
Former-commit-id: b2029cc48a [formerly 80e307c96e] [formerly 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29]]
Former-commit-id: f3128381541f4e049435ad97f2894e64711267b2 [formerly cc70fe7a41]
Former-commit-id: e65ba73968
2013-01-14 15:10:56 -06:00
Brad Gonzales
c40e21ef4e Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 7391e3c0fe [formerly 1644eee264] [formerly 5bbe5d5dbf] [formerly 7391e3c0fe [formerly 1644eee264] [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 5bbe5d5dbf [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]]
Former-commit-id: 72cb336592
Former-commit-id: eacfe73d3f [formerly bd8eaa6dc8] [formerly bbcec7aca93cd7df0525463803027bc994288c8e [formerly 881cc10e84]]
Former-commit-id: 94049ee66283e52cd6e49a6c792aab7027e8b1eb [formerly 063551fb18]
Former-commit-id: 7be1cf3631
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
0c5c4cb9a9 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]]
Former-commit-id: ac9ba67919
Former-commit-id: dea702c873 [formerly c1ae999c81] [formerly c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]]
Former-commit-id: 73a388037366997d5eca653a47b9832fd79df51c [formerly 6b95c98e8e]
Former-commit-id: 08311ccdf5
2013-01-14 14:30:17 -06:00
Richard Peter
4d9700d5c0 Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: 16ccbec7fa [formerly fe28e371a6] [formerly 65715d4154] [formerly 16ccbec7fa [formerly fe28e371a6] [formerly 65715d4154] [formerly e180a2ff86 [formerly 65715d4154 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]]
Former-commit-id: e180a2ff86
Former-commit-id: 8c0a79611e [formerly 62d3bd6837] [formerly bb8dc777c2dc2e01f0556a7a8c7253bf8db95622 [formerly 712fb1cb05]]
Former-commit-id: be0a6da2438c909117f34d5121582156ee98bf74 [formerly f298a42853]
Former-commit-id: e2207bce78
2013-01-14 11:56:33 -06:00
Richard Peter
bcda9dfe27 Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: b731360a84 [formerly 621a4cd147] [formerly 0f705ac355] [formerly b731360a84 [formerly 621a4cd147] [formerly 0f705ac355] [formerly e176fcbf06 [formerly 0f705ac355 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]]
Former-commit-id: e176fcbf06
Former-commit-id: 4b57dccb57 [formerly 521e7cf5af] [formerly 668863fe0d8c1e551660ffd2408217fac215e66b [formerly 157e75f7aa]]
Former-commit-id: 37d54cbca25d1b22fbd99ed787701ede5ecef694 [formerly d446c490ba]
Former-commit-id: 6825617baf
2013-01-14 11:55:35 -06:00
Dave Hladky
073f3c8bcf Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]]
Former-commit-id: c9160ac945
Former-commit-id: bd45e9af0f [formerly e746688671] [formerly ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a]]
Former-commit-id: 969e08441cecb98cce422486ce46b9039e08656b [formerly 936d0f143d]
Former-commit-id: 64c293c460
2013-01-14 11:38:45 -06:00
Ben Steffensmeier
1e3deb8b95 Issue #1464 fix saving of spatial subsets.
Former-commit-id: e787fdcaf9 [formerly 0933461f40] [formerly bc5233748a] [formerly e787fdcaf9 [formerly 0933461f40] [formerly bc5233748a] [formerly c8ef480815 [formerly bc5233748a [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]]
Former-commit-id: c8ef480815
Former-commit-id: 19104e6cbf [formerly 053b673790] [formerly c53d9b72c0b2f445296e31570c1b1f5aa26bb092 [formerly 4fd3d47385]]
Former-commit-id: d3a8d70bd817c9a98b61b458fee623eff2adc3f6 [formerly 244de069da]
Former-commit-id: 1ffcc3ada2
2013-01-14 10:49:14 -06:00
Richard Peter
d52760585c Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]]
Former-commit-id: e71db46db9
Former-commit-id: c9dd98496b [formerly c68dcf4554] [formerly 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17]]
Former-commit-id: d855f4ef5ec0d3316d0d953a526e3365257185a4 [formerly 58d09ab54b]
Former-commit-id: bd03eaff5f
2013-01-14 09:59:28 -06:00
Richard Peter
234e4844c7 Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development
Former-commit-id: 7e14eb1840 [formerly 854bd1d4e0] [formerly d2a1388b0e] [formerly 7e14eb1840 [formerly 854bd1d4e0] [formerly d2a1388b0e] [formerly 061fa21537 [formerly d2a1388b0e [formerly 888b839152d86c536b249e795666c596a213da86]]]]
Former-commit-id: 061fa21537
Former-commit-id: b933bd56c7 [formerly fdf83d8623] [formerly 4731e8fe09be84df4c8258189e64a2405c94b0a5 [formerly 6176588496]]
Former-commit-id: 005f315c4545cbf3012b1cd58c82bc18ba4c1449 [formerly a82f86b26b]
Former-commit-id: f0dcd53a2c
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
b58728e366 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
Former-commit-id: d92f2de0c3 [formerly 83cf6ec05c] [formerly 5c5b2e3c20] [formerly d92f2de0c3 [formerly 83cf6ec05c] [formerly 5c5b2e3c20] [formerly 52f55e6d3a [formerly 5c5b2e3c20 [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: b9baedab39 [formerly 0a5da321d6] [formerly 13be1753e7eb83458858e4291537dbb830a7ef05 [formerly c617b3cc70]]
Former-commit-id: a97a34f8dca999162c33a2d1d7f77afd6a4b848f [formerly 79d9115a7a]
Former-commit-id: 1d91b721d1
2013-01-11 16:26:14 -06:00
Steve Harris
32c48861de 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Mike Duff
ac03c3993c Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 135fd5c13d [formerly d3ed6f6148] [formerly 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164]]
Former-commit-id: 0e71292ea44022ed0f31fa4514b8529d747d49a7 [formerly 772154de38]
Former-commit-id: 66dc038d02
2013-01-11 14:38:34 -06:00
Richard Peter
33bbd393bd Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: cf8483486b [formerly 74092ae046] [formerly bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020]]
Former-commit-id: 85903a4d7fd36b124d852701aa63c2f9da2782b5 [formerly da60306633]
Former-commit-id: d72901c86c
2013-01-11 12:53:37 -06:00
Dustin Johnson
80af42fd9e Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

Former-commit-id: 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly f44a2f6ea9 [formerly 7d10c7fac5 [formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: bce1b88d26 [formerly 5e4a1b7bd9] [formerly 1f7651d3448a20469f46b569fcc7d279b6bb1842 [formerly bd8dbc39e7]]
Former-commit-id: f255756970b2d5c0475ee469843208550ee7f07c [formerly 69c42d3e72]
Former-commit-id: b462fe0286
2013-01-11 12:39:00 -06:00
Richard Peter
038b214887 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f [formerly cf815a4c72] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Richard Peter
0de34fe804 Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: 7f595074ae [formerly c309d2dc1e] [formerly a595356025] [formerly 7f595074ae [formerly c309d2dc1e] [formerly a595356025] [formerly f9e39660d4 [formerly a595356025 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]]
Former-commit-id: f9e39660d4
Former-commit-id: b0050959af [formerly ff1dc7e236] [formerly 1c18c0a235839ef85ff98f2d1031b2307daefd8d [formerly b9e409357d]]
Former-commit-id: f5590213954b4c72b51639d919b1736f4c8f3d5e [formerly feeea305a9]
Former-commit-id: 23899a125f
2013-01-11 12:25:54 -06:00
Richard Peter
85aac54d9a Merge "Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab. Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a" into development
Former-commit-id: 3ef137ee36 [formerly 31c1c5e71b] [formerly 130e9151d2] [formerly 3ef137ee36 [formerly 31c1c5e71b] [formerly 130e9151d2] [formerly a3429f5ca1 [formerly 130e9151d2 [formerly 3afdc1e33555448ab7863858cc1d6496b545b5c8]]]]
Former-commit-id: a3429f5ca1
Former-commit-id: 0be75cba3c [formerly d01c8c70b4] [formerly 26c3d3ceb7c0b959420d9211713244167a32b8e3 [formerly c0655734e7]]
Former-commit-id: 38e0b245a3088cb552a809003f4cc6f3b8c71305 [formerly 9eee7d176e]
Former-commit-id: c695421365
2013-01-11 12:25:20 -06:00
Dustin Johnson
f275418843 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]]
Former-commit-id: c4068d27bf
Former-commit-id: 2a306b4122 [formerly a4414d409a] [formerly c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]]
Former-commit-id: 3330a60d2df34bd1b8732593f276c83b6d1c1c02 [formerly 9b3cf3308f]
Former-commit-id: ef31fc45a9
2013-01-11 12:23:15 -06:00
Mike Duff
e543c1470a Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab.
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: c12824d7bf [formerly 16a86f47e6] [formerly 35d73f0354] [formerly c12824d7bf [formerly 16a86f47e6] [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 35d73f0354 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]]
Former-commit-id: 4cbe807a52
Former-commit-id: d5f9aefec0 [formerly c498087b96] [formerly 076bb9b030781d1f36bd984fff6daf176073a6f4 [formerly 98ec2a5269]]
Former-commit-id: 305985d00a3939dbc096e5010d42e544fe026820 [formerly 855af43259]
Former-commit-id: ad0f7088af
2013-01-11 12:22:47 -06:00
Dave Hladky
87ae3ccfb8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 59c349ac77 [formerly fe486b4889] [formerly 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]]
Former-commit-id: 57ac28b8518a3193cbd3b4125cd190f547bac07f [formerly a51f8f449b]
Former-commit-id: b5ea7aaff8
2013-01-11 11:59:36 -06:00
Richard Peter
66011a3e07 Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: d3bb78a262 [formerly eaf0cbc118] [formerly dd2f1044c2] [formerly d3bb78a262 [formerly eaf0cbc118] [formerly dd2f1044c2] [formerly c5338da7be [formerly dd2f1044c2 [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]]]
Former-commit-id: c5338da7be
Former-commit-id: ed2e9c59e1 [formerly 6c5c815c0b] [formerly 93b5bc836fb851dfa8b1af7af168a935aaef9ded [formerly afbc50da00]]
Former-commit-id: c3d11b11b3ea7c16c622eb185f4e046a4192d1c7 [formerly 159e963c88]
Former-commit-id: 27535c8f2f
2013-01-11 11:55:23 -06:00
Dustin Johnson
2598fc06d8 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]
Former-commit-id: 446f65776e
Former-commit-id: 6984791be8 [formerly 7bf029eb7e] [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]]
Former-commit-id: 4b7dc8fbd66d90306e884b8ea9c8af6f53371156 [formerly 6fb6bc8f87]
Former-commit-id: f269969791
2013-01-11 11:53:02 -06:00
Ben Steffensmeier
27622d6418 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]]
Former-commit-id: a1afabe4e3
Former-commit-id: 3f17e60975 [formerly 3b72ea7f19] [formerly b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]]
Former-commit-id: 46afb2158f8811cd347ebf0a531a9452e01d8c91 [formerly d2667da4b9]
Former-commit-id: cbebc15454
2013-01-11 11:46:32 -06:00
Richard Peter
cda4eef641 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: c889337379 [formerly e23ffee8bd] [formerly 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]]
Former-commit-id: 2953ad3d7fd0d19919b0dda10049c53590a3862c [formerly f7b8b095cc]
Former-commit-id: 8286fb0351
2013-01-11 11:03:42 -06:00
Matt Nash
a76854077a Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 3f6ffe12e3 [formerly 0a8448cfed] [formerly 90fa08596e] [formerly 3f6ffe12e3 [formerly 0a8448cfed] [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 90fa08596e [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: 0e04e3e1d2 [formerly 1ab332b654] [formerly dc95ddec2b8f59c1d1a2eb1f098a077fdf7a1dd2 [formerly addac12b84]]
Former-commit-id: 071a886d9726875eef4b75105ef39cddfecc209a [formerly e85d6610e4]
Former-commit-id: e5379c7c15
2013-01-11 10:48:06 -06:00
Dustin Johnson
4aa6e6fb69 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly f316320b06 [formerly ede32c8d3e [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]]
Former-commit-id: f316320b06
Former-commit-id: 25a4e68f25 [formerly f274ce63e9] [formerly b6ddfc6f49195136d5d7d440c3e182fdd9538e9b [formerly 35409872a6]]
Former-commit-id: 21dac9178560e3afc5725c50138e5a9f1bef619c [formerly adc46ddeef]
Former-commit-id: 9f2c0db712
2013-01-11 08:56:39 -06:00
Richard Peter
87419490ed Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: cea19a313a [formerly 942140cca5] [formerly cffe035019] [formerly cea19a313a [formerly 942140cca5] [formerly cffe035019] [formerly e91b5bd035 [formerly cffe035019 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]]
Former-commit-id: e91b5bd035
Former-commit-id: 60392a7a7c [formerly c4c2ae3256] [formerly 4a63d9342225528410d684780a44036549f31886 [formerly 6857211fc6]]
Former-commit-id: 0b6463b2b4afa0bd915b6e8615c6bc07edb5c7dc [formerly 9492e77036]
Former-commit-id: 9312478e41
2013-01-10 17:25:09 -06:00
Richard Peter
d842cfe57e Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]]
Former-commit-id: 73263e270e
Former-commit-id: 9d0c8ff714 [formerly 4a097586f6] [formerly 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]]
Former-commit-id: 033eff671dc64886d6f95f0a1a920fd9a98bc449 [formerly 49da28ead4]
Former-commit-id: 4552b5f71a
2013-01-10 17:17:58 -06:00
Mike Duff
220f100def Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: 7ba0d71d7c [formerly d2981a8275] [formerly 9526199a9c] [formerly 7ba0d71d7c [formerly d2981a8275] [formerly 9526199a9c] [formerly 78440f2b5a [formerly 9526199a9c [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]]
Former-commit-id: 78440f2b5a
Former-commit-id: c21d02d8fb [formerly f2da1df6e6] [formerly c2ca6a0936930afda3caca73c5ca608bee2b795a [formerly bde6be532e]]
Former-commit-id: 63b6642e27b9e9154a9263d35b4fa3db440b7d2b [formerly ae8eecc95b]
Former-commit-id: d23c9266d8
2013-01-10 15:35:33 -06:00
Mike Duff
bb5d45c06b Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 38aae63ee3 [formerly 674ddfedb2] [formerly 02bfe05a27] [formerly 38aae63ee3 [formerly 674ddfedb2] [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 02bfe05a27 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]]
Former-commit-id: b72c2e4b04
Former-commit-id: f167689caf [formerly 8b23902cea] [formerly 6d7445bf13f8b180941b8fd9b135ad41b909c4c8 [formerly b42395d6ea]]
Former-commit-id: 11f7b7af0ee7038d96e8e0f49078e0d30550ea51 [formerly 910401bd23]
Former-commit-id: 7b76dbba46
2013-01-10 12:26:59 -06:00
Dustin Johnson
bb444602ec Merge "Issue #1441 Break net.dods dependency on AWIPS code" into development
Former-commit-id: a40a0fc79b [formerly 5a861267aa] [formerly 7d67bd5949] [formerly a40a0fc79b [formerly 5a861267aa] [formerly 7d67bd5949] [formerly d5fcc68163 [formerly 7d67bd5949 [formerly 45b7e01839ef90c8623c3c5b8f2c873997e90111]]]]
Former-commit-id: d5fcc68163
Former-commit-id: 2c21da07a8 [formerly 048606bae5] [formerly e3e253eb0720cac3fa541b01c0f9dc5674f3e281 [formerly c6609e8ea8]]
Former-commit-id: 7c94f035431882eabb9784a429774a125d4d528d [formerly f1161422d7]
Former-commit-id: c1988cbf3f
2013-01-10 12:25:04 -06:00
Dustin Johnson
283acaab90 Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: 3c2ace6854 [formerly 3ebe0cf1ca] [formerly ddcc816bba] [formerly 3c2ace6854 [formerly 3ebe0cf1ca] [formerly ddcc816bba] [formerly c00f5f394a [formerly ddcc816bba [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]]
Former-commit-id: c00f5f394a
Former-commit-id: 773a3303da [formerly 59a209e77d] [formerly 4fdeee1cd88dd8b672dbfac13924276692db343f [formerly c29d2e2e71]]
Former-commit-id: df764faee1a820d7e1c3135dff3105e8c7cec707 [formerly 4aa7257146]
Former-commit-id: 24d1f60c83
2013-01-10 12:06:39 -06:00
Ron Anderson
8399eabc05 Merge "Issue #1395 Fixed dynamic update of opacity." into development
Former-commit-id: d8dfa9bbe3 [formerly bbc314f50c] [formerly 9d3405dd68] [formerly d8dfa9bbe3 [formerly bbc314f50c] [formerly 9d3405dd68] [formerly 001bdc84b9 [formerly 9d3405dd68 [formerly f3a9eed298a3b776f8b2b83416e8f98981d92912]]]]
Former-commit-id: 001bdc84b9
Former-commit-id: e7183ae0e3 [formerly cd33ded3e7] [formerly 795b0d31396f9a41839a015e5e8cc8e5ecf706db [formerly c0e80aa175]]
Former-commit-id: ff59b6f4276a222639312a6b2d5a4c4ad1ecefa3 [formerly 9464c329e9]
Former-commit-id: d7fbeb15d7
2013-01-10 11:40:43 -06:00
Richard Peter
0efa0a7461 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]]
Former-commit-id: c0e712f682
Former-commit-id: d3c6e55c17 [formerly 9524f5a52b] [formerly 97734a3cd0f5afa0b7002ff04016137bde675235 [formerly 9543d23d23]]
Former-commit-id: 87ffeb3ac45703ad2f69f430f100670c9c2a1380 [formerly 6dbbf56c1d]
Former-commit-id: c8c4f68603
2013-01-10 10:51:28 -06:00
Nate Jensen
1f724217ca Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly a3e10f6dcd [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]]
Former-commit-id: 62f89e6189
Former-commit-id: cce4bebbe5 [formerly ef3468acd4] [formerly d12f5df726ebd0677bc478849410246bfac0e228 [formerly 5733a44770]]
Former-commit-id: fc2bdf799b307430f81e2eb541330216b1e02446 [formerly 4d91741212]
Former-commit-id: 3fff3b0d0b
2013-01-10 10:31:05 -06:00
Richard Peter
81dfb3f961 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: a4491237e5 [formerly 27a06e14b8] [formerly 6a4957abee715c7f29e3637d9ceac8248e81d07d [formerly 46faa0f68d]]
Former-commit-id: b288c623ea0a30a1e7f08150ba10db89ed72d914 [formerly 58a28b4193]
Former-commit-id: a9a245dfe2
2013-01-10 10:18:39 -06:00
Ron Anderson
dc5fa4c736 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 3df3cf7f7b [formerly 145665c496 [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 1b4acc66e9 [formerly 2c364744bb] [formerly 394db5ca0b53e186b2f8d6e2619a70bcb1da53e8 [formerly 1f298b87b5]]
Former-commit-id: 8396f507c830310fd1ab818538d4d58fee56ff7c [formerly d855e9ada0]
Former-commit-id: b6bb0a5319
2013-01-10 10:00:56 -06:00
Richard Peter
a4dd8e63a2 Merge "Issue #1465 fix import derived parameter." into development
Former-commit-id: 9c8e6f4821 [formerly 856959f0d5] [formerly 9293a7e3f7] [formerly 9c8e6f4821 [formerly 856959f0d5] [formerly 9293a7e3f7] [formerly 86f5fec292 [formerly 9293a7e3f7 [formerly cfc04313c76c75db5a5bd7bc1bd32577a4615974]]]]
Former-commit-id: 86f5fec292
Former-commit-id: a087382c29 [formerly fa41b57e14] [formerly b23d495cfd926780e9fd7dc20182c74bf12ff64a [formerly 68f8878d4f]]
Former-commit-id: e36f1a5709d6e863424005c63d5b62bca248e045 [formerly 5e75d7409e]
Former-commit-id: e81e4c0593
2013-01-10 09:35:16 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Ron Anderson
9dac4c8041 Issue #1468 Make DataStoreResource update labels when magnification is changed.
Change-Id: I1337db46d620aba6cc8939f4f42b25322dc81a98

Former-commit-id: e9a688e184 [formerly 56364be3ce] [formerly 3acf0edad0] [formerly e9a688e184 [formerly 56364be3ce] [formerly 3acf0edad0] [formerly 5918458b70 [formerly 3acf0edad0 [formerly 473cfc2dbd3406a1602f84daf1ca320228b3b1ed]]]]
Former-commit-id: 5918458b70
Former-commit-id: bb30c11f3d [formerly 65327a9221] [formerly fdc6cbba5506d5e5653610c8effa3ea62d68d224 [formerly 0476d4ccc6]]
Former-commit-id: 6eb462f6430a72f062babd82d4373fc965914e6d [formerly 19b6b94e67]
Former-commit-id: afef7ce174
2013-01-09 15:52:08 -06:00
Dustin Johnson
834a16e4bc Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly a354bac4da [formerly b7ed75896b [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]]
Former-commit-id: a354bac4da
Former-commit-id: a010315743 [formerly 424a70dbfe] [formerly 53baf13d05630029a4556dcb8562eff91b689c93 [formerly 0d5bb5ba95]]
Former-commit-id: f99fcc7f473dbe7b10a2d765f054c5b16bffbc0b [formerly 09a33ab8ac]
Former-commit-id: d4d1a95461
2013-01-09 15:40:36 -06:00
Bryan Kowal
e1524f86bc Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 0645a9fe40 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]]
Former-commit-id: 73bdd66283
Former-commit-id: 21649e9b6a [formerly 777b804edc] [formerly 5758de40a9aee192d431736f923321adb98c10b9 [formerly e9dd794082]]
Former-commit-id: faa201033f5f1cf0a73924306cedff5f4d426c74 [formerly 4f1a822578]
Former-commit-id: b6ceffe69a
2013-01-09 13:03:38 -06:00