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

2401 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Duff
c143b356ef Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors 
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 1beb6e4fa5 [formerly 1958700112] [formerly 302dbf2cfb [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]
Former-commit-id: 302dbf2cfb
Former-commit-id: 3d1c1b146c
 2013-03-27 10:38:59 -05:00
Richard Peter
6923e10550 Issue #1833: Add performance log file to ingest and ingestGrib 
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 25d4905570 [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]
Former-commit-id: b75ceeeeb3
Former-commit-id: f99242f539
 2013-03-26 20:55:42 -05:00
Nate Jensen
0cf9a03133 Issue #1832 fix getNumPy() error handling 
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405

Former-commit-id: dc53db5181 [formerly e4cdfe0ca9] [formerly 74b21dc1b4 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]
Former-commit-id: 74b21dc1b4
Former-commit-id: 494a673c37
 2013-03-26 18:30:19 -05:00
Nate Jensen
6d32957638 Merge "Issue #1735 Performance improvments for LLWSData." into development 
Former-commit-id: 5624e303a8 [formerly ff7631d847] [formerly b44db0bc2c [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]
Former-commit-id: b44db0bc2c
Former-commit-id: 314c5dcb2e
 2013-03-26 16:28:38 -05:00
Nate Jensen
30bd797879 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1 
Former-commit-id: 807d8773ad [formerly f3fd91c311] [formerly c895ee60fa [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]
Former-commit-id: c895ee60fa
Former-commit-id: 5701030750
 2013-03-26 16:15:27 -05:00
Richard Peter
4f326d5c39 Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1 
Former-commit-id: ac3619cc77 [formerly fa7fb4765f] [formerly cbf915093f [formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]
Former-commit-id: cbf915093f
Former-commit-id: f941b97c06
 2013-03-26 15:33:33 -05:00
Lee Venable
cb683bec2a Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1 
Former-commit-id: ad1983ff8d [formerly 1a59204892] [formerly 049e955db9 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]
Former-commit-id: 049e955db9
Former-commit-id: f8d2fdacea
 2013-03-26 15:01:51 -05:00
Roger Ferrel
7244b4d23c Issue #1828 Fix intlsigmets and text pattern. 
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: 6a4bd66abc [formerly 19074d3053] [formerly 74389834de [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]
Former-commit-id: 74389834de
Former-commit-id: 4c5aa32169
 2013-03-26 14:47:48 -05:00
Ben Steffensmeier
6d17d01f8c Issue #1791 Fix problems in SmartScript when there is no data. 
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 18311b0d18
Former-commit-id: 69879c51df
 2013-03-26 14:46:11 -05:00
Lee Venable
013748405d Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1 
Former-commit-id: 68e767daaa [formerly c86daf885b] [formerly c1adce3a11 [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
 2013-03-26 14:33:24 -05:00
Richard Peter
9c5ce8e741 Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1 
Former-commit-id: ce83569845 [formerly b947a52604] [formerly 7ee513dfed [formerly b1acf59c03ab308b86843a314d4795f6392de844]]
Former-commit-id: 7ee513dfed
Former-commit-id: 45a2f3f3dd
 2013-03-26 12:59:47 -05:00
Steve Harris
5bb29627dc Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 4e54025fcd [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
 2013-03-26 12:47:40 -05:00
Steve Harris
02147470db Merge branch 'master_13.3.1' into omaha_13.3.1 
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
 2013-03-26 12:44:24 -05:00
Steve Harris
4f2e9aec0d 13.3.1-13 baseline 
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
 2013-03-26 12:43:07 -05:00
Jonathan Sanchez
a579da7646 Issue #1819 Added precision fields for point source configuration. 
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
 2013-03-26 12:29:18 -05:00
Steve Harris
ee009dc2d8 Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development 
Former-commit-id: 9ed8f85b79 [formerly 1f28f6b807] [formerly 305994e220 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]
Former-commit-id: 305994e220
Former-commit-id: b1071636a7
 2013-03-26 12:27:54 -05:00
David Gillingham
040dc9075c Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge. 
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 6fe3d5dc28 [formerly c5c7e31983] [formerly 54511a95db [formerly 497aa460d6119f13bf6870b78454237252b68752]]
Former-commit-id: 54511a95db
Former-commit-id: 6188c8bd40
 2013-03-26 12:14:22 -05:00
Ben Steffensmeier
f983e5d705 Issue #1782 fix merge problems related to graphics API. 
Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
 2013-03-26 12:06:45 -05:00
Ben Steffensmeier
e79778366c Issue #1799 Fix pan/zoom when in views. 
Former-commit-id: d06f011de0 [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 5a1171f111
 2013-03-26 11:44:23 -05:00
Richard Peter
b4965ae08d Issue #1783: Update DatabaseArchiver to stream deserialization of previous records 
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44

Former-commit-id: 9773208ff5 [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]
Former-commit-id: 69ffe80046
Former-commit-id: 643ac75965
 2013-03-26 11:40:24 -05:00
Ron Anderson
758b81f9a2 Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1 
Former-commit-id: f272034fde [formerly 57c919bc7b] [formerly f65989454a [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]
Former-commit-id: f65989454a
Former-commit-id: 510b090090
 2013-03-26 11:33:15 -05:00
Richard Peter
88b147cb1b Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development 
Former-commit-id: 260b159f1b [formerly 0f15b13b86] [formerly f062e43f8c [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]
Former-commit-id: f062e43f8c
Former-commit-id: 02ecf31edb
 2013-03-26 10:53:50 -05:00
Ben Steffensmeier
ae27d029a1 Issue #1821 Optimize FFG version query. 
Former-commit-id: 54b9d0d949 [formerly 3049bc94c9] [formerly 7bde9f6d32 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]
Former-commit-id: 7bde9f6d32
Former-commit-id: 39259b1b0b
 2013-03-26 10:37:40 -05:00
David Gillingham
bf196a7782 Issue #1823: Trigger SAT smart inits based only on sector id and physical element. 
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: ad357638b3 [formerly 1df8d39919] [formerly bebfc60317 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]
Former-commit-id: bebfc60317
Former-commit-id: 07487a27dc
 2013-03-26 10:33:42 -05:00
Steve Harris
02105701a0 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
 2013-03-26 10:12:34 -05:00
Mike Duff
b366778df0 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
 2013-03-26 09:19:39 -05:00
Ron Anderson
e4c4862938 Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1 
Former-commit-id: 6ab9303526 [formerly f4f180face] [formerly 73678261b6 [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]
Former-commit-id: 73678261b6
Former-commit-id: 7e6b601a09
 2013-03-25 17:53:46 -05:00
Lee Venable
b1ce5603a0 Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1 
Former-commit-id: a84ef2d2c3 [formerly e467daec0c] [formerly 05b4c2f913 [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]
Former-commit-id: 05b4c2f913
Former-commit-id: d73b44fa67
 2013-03-25 17:20:25 -05:00
Lee Venable
aa4aecec66 Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1 
Former-commit-id: 952a8073fd [formerly 74188d09ad] [formerly d10f1c818d [formerly f0ed09e300f81dcf425df64aefcd33b670b7bdd5]]
Former-commit-id: d10f1c818d
Former-commit-id: a444924a18
 2013-03-25 17:02:06 -05:00
Bryan Kowal
f8fafc8d4a Issue #1750 - include the qpidd service script in the rpm installations 
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 233f2c54be [formerly c3936dd50e] [formerly 21fa510eaa [formerly c96c45074c220140b8774e1fceeab2b79820f033]]
Former-commit-id: 21fa510eaa
Former-commit-id: db39a45c88
 2013-03-25 16:52:33 -05:00
Mike Duff
fc0b126eee Issue #1781 - Constrain the tabular TS query by time. 
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 3d783c54be [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]
Former-commit-id: 88e75f4a90
Former-commit-id: b517ce9a9f
 2013-03-25 16:03:18 -05:00
Roger Ferrel
912e5020d7 Issue #1735 Performance improvments for LLWSData. 
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: b5fc495b61 [formerly feadd01ad9] [formerly 549650c05c [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]
Former-commit-id: 549650c05c
Former-commit-id: daecc7b7f4
 2013-03-25 15:41:01 -05:00
Max Schenkelberg
8d1b555c39 Issue #1638 Made Map scales more generalized for use outside of D2D 
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: dabffdbf79 [formerly fd375314cd] [formerly e17d691400 [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]
Former-commit-id: e17d691400
Former-commit-id: 36e80c267e
 2013-03-25 15:38:36 -05:00
Richard Peter
072bc7affc Merge "Issue #1802 Refactored DD transaction management" into development 
Former-commit-id: b3631390d2 [formerly c3268aa02c] [formerly 5c92140024 [formerly b8516f99386ded052745e766911094edfd57d7ec]]
Former-commit-id: 5c92140024
Former-commit-id: 351f08dba3
 2013-03-25 15:37:18 -05:00
Bryan Kowal
1eba8622d4 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode. 
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 09263dbf8c [formerly 9e647beded] [formerly 6758a9a50d [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]
Former-commit-id: 6758a9a50d
Former-commit-id: 4c02dabb3d
 2013-03-25 15:23:32 -05:00
Bryan Kowal
2093c6a495 Issue #1661 - yajsw will now log to both the console and log file indefinitely 
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 541d096faf [formerly c55efaadb0] [formerly a6cd17feeb [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]
Former-commit-id: a6cd17feeb
Former-commit-id: c4cec34e47
 2013-03-25 15:23:31 -05:00
Benjamin Phillippe
541646148b Issue #1802 Refactored DD transaction management 
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]
Former-commit-id: af05feb5a7
Former-commit-id: 4d1a8805ab
 2013-03-25 15:15:38 -05:00
Ben Steffensmeier
e722fa0723 Issue #1821 Reshape grib data arrays in place to improve performance. 
Former-commit-id: 5d01725fea [formerly 4621133ff1] [formerly 75c8d46901 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]
Former-commit-id: 75c8d46901
Former-commit-id: 04028b0136
 2013-03-25 15:09:23 -05:00
Ben Steffensmeier
53b0411753 Issue #1821 Make grib2 decoding more multithreaded 
Former-commit-id: 842ee7a78f [formerly f824e298b6] [formerly cf7d8378dd [formerly 4441b32d3ec153a2cf767b8e109c014f9efc3ed8]]
Former-commit-id: cf7d8378dd
Former-commit-id: f61630599f
 2013-03-25 14:48:42 -05:00
Richard Peter
516bb024bb Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development 
Former-commit-id: c7dd6365d2 [formerly 7b8931ed16] [formerly 3239c176fa [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]
Former-commit-id: 3239c176fa
Former-commit-id: 911a371329
 2013-03-25 14:45:06 -05:00
Jonathan Sanchez
cd1095fb29 Issue #1605 Check if storm location is over an urban bound area. 
Former-commit-id: 3ca4cc9dcf [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
 2013-03-25 14:41:55 -05:00
Lee Venable
4caa21aa69 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1 
Former-commit-id: 5d7055ad53 [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]
Former-commit-id: d1c84de620
Former-commit-id: fc41aa82ca
 2013-03-25 14:08:39 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline 
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
 2013-03-25 13:27:13 -05:00
Steve Harris
11baf4c2f0 13.3.1-11 baseline 
Former-commit-id: 2edab61540 [formerly 9cdd90e382] [formerly 373d13df39 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 373d13df39
Former-commit-id: d868003067
 2013-03-25 13:20:03 -05:00
Lee Venable
4177573a65 Merge "Issue #1818 - Added an isDisposed check to the Attributes Dialog open action" into omaha_13.3.1 
Former-commit-id: ccceb78dbb [formerly 65c2791e1a] [formerly 5c661c1891 [formerly e0923bcf2c95de163118e2f8f6667f9c84df1cb2]]
Former-commit-id: 5c661c1891
Former-commit-id: 531e26e097
 2013-03-25 12:53:10 -05:00
Jonathan Sanchez
e01d47acfa Issue #1810 Accepted other values/types for useDirs. 
Former-commit-id: 2d6be3d3da [formerly d00c88a38c] [formerly b77ed18eb4 [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]
Former-commit-id: b77ed18eb4
Former-commit-id: 539c4dfa8e
 2013-03-25 12:23:51 -05:00
Mike Duff
fcb46897e3 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action 
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
 2013-03-24 12:21:51 -05:00
Dave Hladky
a997706b72 Issue #1813 Stats for FFMP were broken by memory updates. 
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: dee8d745a3 [formerly a53797bc2f] [formerly f2e13c8078 [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]
Former-commit-id: f2e13c8078
Former-commit-id: 05ae375e08
 2013-03-22 16:37:20 -05:00
Richard Peter
d1b4d899be Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development 
Former-commit-id: bb2be2d6a7 [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]
Former-commit-id: 3de0400969
Former-commit-id: 50254dc8d1
 2013-03-22 16:26:52 -05:00
Dave Hladky
150cd54602 Issue #1817 BOX issue with only having HUC0 in template 
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: c2b9bd1024 [formerly 58a37d1e44] [formerly d114302b06 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]
Former-commit-id: d114302b06
Former-commit-id: 3cdd8f8ed2
 2013-03-22 16:21:45 -05:00