Commit graph

2760 commits

Author SHA1 Message Date
Dustin Johnson
b4e94bbebe Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: fdf3ac7897 [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]
Former-commit-id: db2e3cd9bb
Former-commit-id: 3447a3726b
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
7267acf078 Issue #1869 Get plots working without dataURI
Former-commit-id: a84c975426 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]
Former-commit-id: 79139629a6
Former-commit-id: 2ce2fc8a17
2013-05-14 14:42:47 -05:00
Roger Ferrel
ab2caee84c Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: 9f9f85f875 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]
Former-commit-id: 0a02d5e018
Former-commit-id: fad208e0ee
2013-05-14 13:49:53 -05:00
Richard Peter
3a6d627a69 Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 6c406d6a8e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]
Former-commit-id: 57d6790d5e
Former-commit-id: 7683bfd122
2013-05-14 09:40:21 -05:00
Richard Peter
012b3554a6 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: b76d402c98 [formerly 2f4b1d54a1 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]
Former-commit-id: 2f4b1d54a1
Former-commit-id: 9bf35d621a
2013-05-14 09:37:18 -05:00
Steve Harris
02dba50c00 13.4.1-8 baseline
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
2013-05-14 09:21:41 -04:00
Ben Steffensmeier
51d638c7d3 Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 1d900e6b94 [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]
Former-commit-id: f856d0e02b
Former-commit-id: 4d3f9ee7d0
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
d18ca94fe5 Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 8661bde0cc [formerly 2536042f6d [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]
Former-commit-id: 2536042f6d
Former-commit-id: 35da7528bf
2013-05-13 17:35:00 -05:00
Richard Peter
31a84fb91f Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: d4135dba62 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]
Former-commit-id: 99391cfe12
Former-commit-id: c63a4882e7
2013-05-13 17:16:57 -05:00
Richard Peter
207c17d5af Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: a12830f762
Former-commit-id: 2c009eb618
2013-05-13 17:11:05 -05:00
Richard Peter
b374309faf Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.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/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]
Former-commit-id: 8062c38b71
Former-commit-id: 4ae23b93d9
2013-05-13 16:33:50 -05:00
Dustin Johnson
8c31b75ff5 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: ab755981a9 [formerly 0b2bdf1848 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]
Former-commit-id: 0b2bdf1848
Former-commit-id: 23fa59f25b
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
04de3a97bf Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 4165759e58 [formerly 5a113f1c43 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]
Former-commit-id: 5a113f1c43
Former-commit-id: 037b40e59a
2013-05-13 15:20:28 -05:00
Steve Harris
81bc07bff4 13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 4c6ff79e71
Former-commit-id: 8072752c77
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
1823c1850c Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]
Former-commit-id: e5fc3f3835
Former-commit-id: 926da8983e
2013-05-13 11:42:54 -05:00
Richard Peter
bb6090df3f Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: 045a8c0b5d [formerly 18c5ad2727 [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]
Former-commit-id: 18c5ad2727
Former-commit-id: f8881f6e02
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
019f4ce7ef Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: baf051a27e [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]
Former-commit-id: 2b4dd1521b
Former-commit-id: 8e550124f4
2013-05-13 11:26:47 -05:00
Mike Duff
66f929fb14 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]
Former-commit-id: f887a41875
Former-commit-id: d087b03eb3
2013-05-10 09:58:02 -05:00
Dustin Johnson
54523a03ee Merge "Issue #1967 undo mistake" into development
Former-commit-id: 519d46724a [formerly e82d454167 [formerly f0529c591755d871796a6d5acae43c443c8c301c]]
Former-commit-id: e82d454167
Former-commit-id: 403ae0d458
2013-05-10 09:25:58 -05:00
Nate Jensen
5fffb10b86 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 47e402afc9 [formerly 250548dc66 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]
Former-commit-id: 250548dc66
Former-commit-id: f149e3f645
2013-05-10 09:20:17 -05:00
Bryan Kowal
4e902e0a03 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: c80ba9633e [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]
Former-commit-id: e7bc2fecc6
Former-commit-id: 6b7afdbb53
2013-05-09 19:51:32 -05:00
Bryan Kowal
47ae8f74c2 Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: baa6b26c34 [formerly 5844657522 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]]
Former-commit-id: 5844657522
Former-commit-id: 3ad9637805
2013-05-09 16:46:04 -05:00
David Gillingham
cb4a08c462 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: 36944298f4 [formerly 51063c7c53 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]
Former-commit-id: 51063c7c53
Former-commit-id: 11cb7b2295
2013-05-09 14:28:17 -05:00
Richard Peter
4ccc1fe35f Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development
Former-commit-id: b361674d5c [formerly ef69a8dbca [formerly 798845cfdf3356f5badae8cdd1cceb84094651c5]]
Former-commit-id: ef69a8dbca
Former-commit-id: 614b7633f9
2013-05-09 09:25:24 -05:00
Greg Armendariz
7c9207ddfe Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development
Former-commit-id: 19ead4eabe [formerly 1ce683a4d5 [formerly 5f7feb732c50c76075d682cc2c88be9a9eedfd3e]]
Former-commit-id: 1ce683a4d5
Former-commit-id: 465561f82c
2013-05-09 08:59:32 -05:00
Roger Ferrel
7636a7fcad Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen.
Change-Id: If8045d03084b9085b573cc11c42b6a2f93ffacc8

Former-commit-id: 938cd275cc [formerly d1a3e3dc2f [formerly b794f0b882d88cec6f552bf10f7f58096dfd5a69]]
Former-commit-id: d1a3e3dc2f
Former-commit-id: 3b27e54b31
2013-05-09 08:56:44 -05:00
Brad Gonzales
1268c61a9d Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: ed59927d62 [formerly 90d93e2a02 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]
Former-commit-id: 90d93e2a02
Former-commit-id: 36345cc166
2013-05-09 08:05:49 -05:00
Bryan Kowal
a2adff5984 Issue #1927 - handle the case where the python illusion does not exist.
Change-Id: I227b8fcb8a80e9e712c2b1b8a116324a604219b3

Former-commit-id: 7273b97aa4 [formerly 96f24ae69e [formerly 3af95f9f0a3449cbad2183a1ccda93c989c1e006]]
Former-commit-id: 96f24ae69e
Former-commit-id: 4a1c34e0f4
2013-05-08 21:27:43 -05:00
Nate Jensen
ef16da1c62 Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development
Former-commit-id: d2a108ed8a [formerly 19f0ca1fb0 [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]
Former-commit-id: 19f0ca1fb0
Former-commit-id: 6dae59d1ac
2013-05-08 18:42:28 -05:00
Nate Jensen
928953493d Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: e753329f47 [formerly 9e0f3acbc0 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]
Former-commit-id: 9e0f3acbc0
Former-commit-id: 11965c031f
2013-05-08 18:40:51 -05:00
Ben Steffensmeier
7c91a83521 Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 4209e014d8
Former-commit-id: dab2af2df5
2013-05-08 18:39:25 -05:00
Max Schenkelberg
76d2e27f3f Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication.
Amend: Deleted old DecisionTree

Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8

Former-commit-id: 40c76c2c82 [formerly ea2501abbb [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]
Former-commit-id: ea2501abbb
Former-commit-id: 14dba9a749
2013-05-08 17:58:19 -05:00
Richard Peter
c2dcbedf63 Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]
Former-commit-id: 4f3e86574b
Former-commit-id: ae84ced7be
2013-05-08 17:28:01 -05:00
Ron Anderson
2afb5d56d5 Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 65923ed892 [formerly 8a297d8e53 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]
Former-commit-id: 8a297d8e53
Former-commit-id: 0bb6152a7b
2013-05-08 15:08:40 -05:00
Richard Peter
289f73d1a4 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 785b402364 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]
Former-commit-id: f1f8260893
Former-commit-id: 615a1182ea
2013-05-08 14:55:43 -05:00
Bryan Kowal
a6d15fcb3c Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: 4513b65ad6 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]
Former-commit-id: bc39afbd24
Former-commit-id: a55331f29f
2013-05-08 14:53:29 -05:00
Ben Steffensmeier
a631b73aa9 Issue #1978 Perform variable substitution on subMenu IDs.
Former-commit-id: ef3086cf39 [formerly aec7e4200c [formerly d6ae38dcdde7984d5caebcb27c80780123599854]]
Former-commit-id: aec7e4200c
Former-commit-id: ff182c21e1
2013-05-08 14:43:59 -05:00
Ben Steffensmeier
c28d23be1c Issue #1980 Set paint status in GridResources for KML.
Former-commit-id: 28cdc018a5 [formerly 3d0e8a6e2d [formerly a0dc21599e1056a39ac28bac7269f605e50082fb]]
Former-commit-id: 3d0e8a6e2d
Former-commit-id: 56c8d14a34
2013-05-08 14:00:15 -05:00
Richard Peter
94b56278e5 Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: f59e4c9de9 [formerly ff60ca76f7 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]
Former-commit-id: ff60ca76f7
Former-commit-id: 96e2f1766c
2013-05-08 13:49:29 -05:00
Bryan Kowal
94a0b742be Issue #1952 - first modification; removed libraries and updated set_hydro_env
- libgofrtran is required by numpy so it will be installed at the standard location
- libjapser is provided by python
- libjvm is provided by the java; attempting to use the current version of libjvm


Former-commit-id: b40f36b341 [formerly de588e9749 [formerly 2afcf9e6e48da20ccf9cffd8cdcf4ba2fd7aff1d]]
Former-commit-id: de588e9749
Former-commit-id: 30d6d39db1
2013-05-08 13:41:08 -05:00
Nate Jensen
10025c2174 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: edcd6c851c [formerly 48d0829957 [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]
Former-commit-id: 48d0829957
Former-commit-id: 2ab4ae9d16
2013-05-08 13:09:59 -05:00
Nate Jensen
e40d94e3b1 Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: 8ad319d0f6 [formerly bc1d029bd4 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]
Former-commit-id: bc1d029bd4
Former-commit-id: 7eb8725c69
2013-05-08 13:09:17 -05:00
Nate Jensen
4ba59ef95e Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 02464ba2d5 [formerly cdf07833b9 [formerly 7bf591249ed0495be49813e77c6c5111c0c9b0b4]]
Former-commit-id: cdf07833b9
Former-commit-id: 13201bdc1c
2013-05-08 13:03:50 -05:00
Nate Jensen
25c86dea79 Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 744aaa14d6 [formerly 653f4b2a0d [formerly 129d546951798a7c839b420eb847baf1cebff2e2]]
Former-commit-id: 653f4b2a0d
Former-commit-id: ff7cf78d17
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
c653b26b26 Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: 7b96ccbf0e [formerly 52845da6a8 [formerly c4eec589218d1c1265fd596646abd9dc2322fd74]]
Former-commit-id: 52845da6a8
Former-commit-id: dcf4c3cb6e
2013-05-08 12:34:46 -05:00
Ron Anderson
345ac8a298 Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 4b91905eaf [formerly 4e63cd7a70 [formerly 790a0c78c95414ddec13294b68905b1d7bbb60a9]]
Former-commit-id: 4e63cd7a70
Former-commit-id: dd303701a1
2013-05-08 12:21:28 -05:00
Ben Steffensmeier
85326d4eb5 Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 6f0fadbfbf [formerly dbb6e1abbf [formerly 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a]]
Former-commit-id: dbb6e1abbf
Former-commit-id: b323f1f266
2013-05-08 12:14:29 -05:00
Richard Peter
d2a407fe49 Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: 68a83a56e0 [formerly 9b9c19c96f [formerly 54afaa408fc663ed1d88883c843ce92ee41ac0cd]]
Former-commit-id: 9b9c19c96f
Former-commit-id: 05298c29be
2013-05-08 11:28:58 -05:00
David Gillingham
38b8a03b40 Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9

Former-commit-id: 8140f0f00f [formerly 110c7d2571 [formerly d0ef15027759d301e16a4897b8ddc4a6670de2fb]]
Former-commit-id: 110c7d2571
Former-commit-id: fb5996c663
2013-05-08 11:14:23 -05:00
Nate Jensen
20a4a40167 Issue #1967 fix for 64 bit edex
Change-Id: I28acbfa8dea794629968f50b83d82530fcb04e19

Former-commit-id: c92acc0ef1 [formerly d29aeb14ff [formerly 1c6b8e2c50b96a78709ea0aa7925f8244cd604c8]]
Former-commit-id: d29aeb14ff
Former-commit-id: 8a044f6dea
2013-05-08 10:01:04 -05:00