Commit graph

2716 commits

Author SHA1 Message Date
Richard Peter
04be1d3807 Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: b687ddef04 [formerly f1d65e7028] [formerly b687ddef04 [formerly f1d65e7028] [formerly 48b67522d5 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]
Former-commit-id: 48b67522d5
Former-commit-id: 11b33a5b14 [formerly aa3ef28527]
Former-commit-id: 3e60ceec03
2013-05-15 12:44:28 -05:00
Ben Steffensmeier
1846170387 Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 507ce28888 [formerly 62b85f3afe] [formerly 507ce28888 [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]
Former-commit-id: dd320f2a56
Former-commit-id: 884922687e [formerly 27b0b4a289]
Former-commit-id: 7ce819184a
2013-05-15 11:45:51 -05:00
Dustin Johnson
dbde58d5eb Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: a00364b294 [formerly 8a70a773d5] [formerly a00364b294 [formerly 8a70a773d5] [formerly c88be3579c [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]
Former-commit-id: c88be3579c
Former-commit-id: bd7c38a160 [formerly 8c26413d23]
Former-commit-id: 8276c2a9c9
2013-05-15 10:50:53 -05:00
Dustin Johnson
7240a99ce7 Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: b700ef7a95 [formerly e38e8d7dc5] [formerly b700ef7a95 [formerly e38e8d7dc5] [formerly e374011c49 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]
Former-commit-id: e374011c49
Former-commit-id: b6a3c3ae80 [formerly 98d99250b2]
Former-commit-id: c2c849fe7e
2013-05-15 10:24:33 -05:00
Richard Peter
a9a4b2cfcc Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: 1a7fbec35e [formerly f1920eb8d9] [formerly 1a7fbec35e [formerly f1920eb8d9] [formerly 47124d2411 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]
Former-commit-id: 47124d2411
Former-commit-id: 1a5bb1a9d5 [formerly f4974ebd19]
Former-commit-id: 6cc24d855f
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
2ffe811d07 Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: cad31c0ce6 [formerly 026a824e60] [formerly cad31c0ce6 [formerly 026a824e60] [formerly fabbc29fe8 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]]
Former-commit-id: fabbc29fe8
Former-commit-id: 6acaa99256 [formerly 3f540d16f0]
Former-commit-id: 5dc7de691b
2013-05-15 09:40:05 -05:00
Nate Jensen
338bbc4216 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 0c718e1cd1 [formerly 5280b54277] [formerly 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]
Former-commit-id: 4e63b88031
Former-commit-id: 65fdf84101 [formerly 1e059ee8d9]
Former-commit-id: 4973acb807
2013-05-15 09:22:16 -05:00
Nate Jensen
122aea2c8e Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: ce19737a49 [formerly d894aca768] [formerly ce19737a49 [formerly d894aca768] [formerly 958ed1f6a2 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]]
Former-commit-id: 958ed1f6a2
Former-commit-id: a121523049 [formerly 1b62b066c9]
Former-commit-id: 58eeca454a
2013-05-14 18:27:00 -05:00
Nate Jensen
8ca2d65342 Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: 8c03ad79d6 [formerly a6f8174d0c] [formerly 8c03ad79d6 [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: eb75eaf6ce [formerly e7f638ce3b]
Former-commit-id: dc98eb524f
2013-05-14 16:36:47 -05:00
Nate Jensen
befeae603d Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 521420916e [formerly 6c42b5af64] [formerly 521420916e [formerly 6c42b5af64] [formerly 661482f1dd [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]]
Former-commit-id: 661482f1dd
Former-commit-id: 9680f63df2 [formerly 301b294d66]
Former-commit-id: 851885b8c5
2013-05-14 16:23:00 -05:00
Nate Jensen
0080d492e2 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: dac803ca07 [formerly 22c23492c4]
Former-commit-id: 925339b84c
2013-05-14 16:16:13 -05:00
Dustin Johnson
bf3655da4c Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: c302fafbd2 [formerly 341ce0c8c2] [formerly c302fafbd2 [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]
Former-commit-id: a5a0e3e280
Former-commit-id: 66126d5411 [formerly 21e66394be]
Former-commit-id: f625b26373
2013-05-14 15:48:58 -05:00
Dustin Johnson
1503e4c8e5 Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: 3447a3726b [formerly db2e3cd9bb] [formerly 3447a3726b [formerly db2e3cd9bb] [formerly fdf3ac7897 [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]
Former-commit-id: fdf3ac7897
Former-commit-id: 5f2de42ebe [formerly 085058e788]
Former-commit-id: aa591995c6
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
98bb0ea551 Issue #1869 Get plots working without dataURI
Former-commit-id: 2ce2fc8a17 [formerly 79139629a6] [formerly 2ce2fc8a17 [formerly 79139629a6] [formerly a84c975426 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]]
Former-commit-id: a84c975426
Former-commit-id: 9ebbfb262d [formerly 2dfb65b594]
Former-commit-id: 8a1b518934
2013-05-14 14:42:47 -05:00
Roger Ferrel
4dbb2fda4a Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: fad208e0ee [formerly 0a02d5e018] [formerly fad208e0ee [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]
Former-commit-id: 9f9f85f875
Former-commit-id: fb15e2d0a6 [formerly ab75cd5107]
Former-commit-id: 532787c043
2013-05-14 13:49:53 -05:00
Richard Peter
5f097830db Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 7683bfd122 [formerly 57d6790d5e] [formerly 7683bfd122 [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: b4e46593a8 [formerly 3309e0c3b7]
Former-commit-id: a734c8594a
2013-05-14 09:40:21 -05:00
Richard Peter
848cd582e9 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 9bf35d621a [formerly 2f4b1d54a1] [formerly 9bf35d621a [formerly 2f4b1d54a1] [formerly b76d402c98 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]]
Former-commit-id: b76d402c98
Former-commit-id: 824407f930 [formerly 17407e863a]
Former-commit-id: b7fc98ce28
2013-05-14 09:37:18 -05:00
Ben Steffensmeier
81f1cbfdbd Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 4d3f9ee7d0 [formerly f856d0e02b] [formerly 4d3f9ee7d0 [formerly f856d0e02b] [formerly 1d900e6b94 [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]]
Former-commit-id: 1d900e6b94
Former-commit-id: edcd8df871 [formerly d0e1ff7ce3]
Former-commit-id: 386ba183bf
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
ba5555930e Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 35da7528bf [formerly 2536042f6d] [formerly 35da7528bf [formerly 2536042f6d] [formerly 8661bde0cc [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]]
Former-commit-id: 8661bde0cc
Former-commit-id: c6d8809f87 [formerly 039a92d9b9]
Former-commit-id: d78e7bcd78
2013-05-13 17:35:00 -05:00
Richard Peter
c7755a649b 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: 2c009eb618 [formerly a12830f762] [formerly 2c009eb618 [formerly a12830f762] [formerly c5040038d3 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 6c09ab9bdf [formerly bcf4dcc810]
Former-commit-id: f7470fbd8f
2013-05-13 17:11:05 -05:00
Richard Peter
9623d4c82e 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: 4ae23b93d9 [formerly 8062c38b71] [formerly 4ae23b93d9 [formerly 8062c38b71] [formerly ba590e2f93 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: faf22cc925 [formerly 8e5929406c]
Former-commit-id: 4b5869684b
2013-05-13 16:33:50 -05:00
Dustin Johnson
c284d00e3d Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 23fa59f25b [formerly 0b2bdf1848] [formerly 23fa59f25b [formerly 0b2bdf1848] [formerly ab755981a9 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]]
Former-commit-id: ab755981a9
Former-commit-id: 82a35120b8 [formerly 0796694014]
Former-commit-id: a6532af8c9
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
38caf6c225 Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 037b40e59a [formerly 5a113f1c43] [formerly 037b40e59a [formerly 5a113f1c43] [formerly 4165759e58 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]]
Former-commit-id: 4165759e58
Former-commit-id: 9768a187f9 [formerly 2768c62541]
Former-commit-id: b8a47cc9be
2013-05-13 15:20:28 -05:00
Steve Harris
c7c6ea343e 13.4.1-7 baseline
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: ff7a21ac37 [formerly b35027f661]
Former-commit-id: dffa6d3bdc
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
85eda2ea78 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 926da8983e [formerly e5fc3f3835] [formerly 926da8983e [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: bb257fc9e5 [formerly b4c645f99f]
Former-commit-id: 62db2bdcd3
2013-05-13 11:42:54 -05:00
Richard Peter
aa83bde84c Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: f8881f6e02 [formerly 18c5ad2727] [formerly f8881f6e02 [formerly 18c5ad2727] [formerly 045a8c0b5d [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]]
Former-commit-id: 045a8c0b5d
Former-commit-id: e6c820c2c5 [formerly c598cd3be0]
Former-commit-id: 570a330497
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
c917c7f592 Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 8e550124f4 [formerly 2b4dd1521b] [formerly 8e550124f4 [formerly 2b4dd1521b] [formerly baf051a27e [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]
Former-commit-id: baf051a27e
Former-commit-id: c862d04d57 [formerly 9aab9c6034]
Former-commit-id: e17c6f6857
2013-05-13 11:26:47 -05:00
Mike Duff
3df65a2ad9 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: d087b03eb3 [formerly f887a41875] [formerly d087b03eb3 [formerly f887a41875] [formerly 7874521269 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 311ce09129 [formerly d262dc63f0]
Former-commit-id: 83304c3e4c
2013-05-10 09:58:02 -05:00
Dustin Johnson
dc30897353 Merge "Issue #1967 undo mistake" into development
Former-commit-id: 403ae0d458 [formerly e82d454167] [formerly 403ae0d458 [formerly e82d454167] [formerly 519d46724a [formerly f0529c591755d871796a6d5acae43c443c8c301c]]]
Former-commit-id: 519d46724a
Former-commit-id: 6ffe9cd833 [formerly b3be6bb88b]
Former-commit-id: da159a9c31
2013-05-10 09:25:58 -05:00
Nate Jensen
d4789e5e87 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: f149e3f645 [formerly 250548dc66] [formerly f149e3f645 [formerly 250548dc66] [formerly 47e402afc9 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]]
Former-commit-id: 47e402afc9
Former-commit-id: af2fded870 [formerly f8cd2effdf]
Former-commit-id: f3989b7187
2013-05-10 09:20:17 -05:00
Bryan Kowal
067fabb8eb Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: 6b7afdbb53 [formerly e7bc2fecc6] [formerly 6b7afdbb53 [formerly e7bc2fecc6] [formerly c80ba9633e [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]]
Former-commit-id: c80ba9633e
Former-commit-id: 0292eb3b03 [formerly 7cd6653d71]
Former-commit-id: 7896fa119b
2013-05-09 19:51:32 -05:00
Bryan Kowal
8850ac004b Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

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

Former-commit-id: 11cb7b2295 [formerly 51063c7c53] [formerly 11cb7b2295 [formerly 51063c7c53] [formerly 36944298f4 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]
Former-commit-id: 36944298f4
Former-commit-id: c5983413a0 [formerly d475d8f07b]
Former-commit-id: 65e64221d5
2013-05-09 14:28:17 -05:00
Richard Peter
618f813b9d Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development
Former-commit-id: 614b7633f9 [formerly ef69a8dbca] [formerly 614b7633f9 [formerly ef69a8dbca] [formerly b361674d5c [formerly 798845cfdf3356f5badae8cdd1cceb84094651c5]]]
Former-commit-id: b361674d5c
Former-commit-id: 03d18c9482 [formerly 7ca31bd7ce]
Former-commit-id: e1b58893c2
2013-05-09 09:25:24 -05:00
Greg Armendariz
2c2273fb82 Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development
Former-commit-id: 465561f82c [formerly 1ce683a4d5] [formerly 465561f82c [formerly 1ce683a4d5] [formerly 19ead4eabe [formerly 5f7feb732c50c76075d682cc2c88be9a9eedfd3e]]]
Former-commit-id: 19ead4eabe
Former-commit-id: e21b6476f4 [formerly 09c6ccd54e]
Former-commit-id: bb2272a1b3
2013-05-09 08:59:32 -05:00
Brad Gonzales
6421017e65 Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

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

Former-commit-id: 4a1c34e0f4 [formerly 96f24ae69e] [formerly 4a1c34e0f4 [formerly 96f24ae69e] [formerly 7273b97aa4 [formerly 3af95f9f0a3449cbad2183a1ccda93c989c1e006]]]
Former-commit-id: 7273b97aa4
Former-commit-id: 854081e77b [formerly 8b35bf6bda]
Former-commit-id: f545c14592
2013-05-08 21:27:43 -05:00
Nate Jensen
5070778f06 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: 6dae59d1ac [formerly 19f0ca1fb0] [formerly 6dae59d1ac [formerly 19f0ca1fb0] [formerly d2a108ed8a [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]]
Former-commit-id: d2a108ed8a
Former-commit-id: fce991dac7 [formerly a5bedd2a27]
Former-commit-id: 825c46815a
2013-05-08 18:42:28 -05:00
Nate Jensen
b638a10153 Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: 11965c031f [formerly 9e0f3acbc0] [formerly 11965c031f [formerly 9e0f3acbc0] [formerly e753329f47 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]]
Former-commit-id: e753329f47
Former-commit-id: 84caf44a0c [formerly 2299e22de2]
Former-commit-id: 747163abc1
2013-05-08 18:40:51 -05:00
Ben Steffensmeier
d9da19b7d2 Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: dab2af2df5 [formerly 4209e014d8] [formerly dab2af2df5 [formerly 4209e014d8] [formerly 79015595ee [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]
Former-commit-id: 79015595ee
Former-commit-id: 9cf071338e [formerly 1c51f0b5f2]
Former-commit-id: 7e721fb860
2013-05-08 18:39:25 -05:00
Max Schenkelberg
4a9f001831 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: 14dba9a749 [formerly ea2501abbb] [formerly 14dba9a749 [formerly ea2501abbb] [formerly 40c76c2c82 [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]]
Former-commit-id: 40c76c2c82
Former-commit-id: 48a283f0f2 [formerly fc27ac4a30]
Former-commit-id: 1d3e653520
2013-05-08 17:58:19 -05:00
Richard Peter
a2cfd38f6a Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: ae84ced7be [formerly 4f3e86574b] [formerly ae84ced7be [formerly 4f3e86574b] [formerly 697297803c [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]
Former-commit-id: 697297803c
Former-commit-id: 139c234452 [formerly cfaeeaff5f]
Former-commit-id: dfba22e206
2013-05-08 17:28:01 -05:00
Ron Anderson
78d3efbbac 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: 0bb6152a7b [formerly 8a297d8e53] [formerly 0bb6152a7b [formerly 8a297d8e53] [formerly 65923ed892 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]]
Former-commit-id: 65923ed892
Former-commit-id: 697c149281 [formerly 532c740ce4]
Former-commit-id: a331ec539f
2013-05-08 15:08:40 -05:00
Richard Peter
a731dea1c1 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 615a1182ea [formerly f1f8260893] [formerly 615a1182ea [formerly f1f8260893] [formerly 785b402364 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]]
Former-commit-id: 785b402364
Former-commit-id: 394018accf [formerly 4e878364c3]
Former-commit-id: 92c4c493b8
2013-05-08 14:55:43 -05:00
Bryan Kowal
145b97a88b Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: a55331f29f [formerly bc39afbd24] [formerly a55331f29f [formerly bc39afbd24] [formerly 4513b65ad6 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]]
Former-commit-id: 4513b65ad6
Former-commit-id: ecac3f4403 [formerly 0c511e1d87]
Former-commit-id: 95aa897f3e
2013-05-08 14:53:29 -05:00
Ben Steffensmeier
0e0882b8fa Issue #1978 Perform variable substitution on subMenu IDs.
Former-commit-id: ff182c21e1 [formerly aec7e4200c] [formerly ff182c21e1 [formerly aec7e4200c] [formerly ef3086cf39 [formerly d6ae38dcdde7984d5caebcb27c80780123599854]]]
Former-commit-id: ef3086cf39
Former-commit-id: 13913892fa [formerly dd72b5cab1]
Former-commit-id: 9b79e5e6cc
2013-05-08 14:43:59 -05:00
Ben Steffensmeier
7c8c42a70e Issue #1980 Set paint status in GridResources for KML.
Former-commit-id: 56c8d14a34 [formerly 3d0e8a6e2d] [formerly 56c8d14a34 [formerly 3d0e8a6e2d] [formerly 28cdc018a5 [formerly a0dc21599e1056a39ac28bac7269f605e50082fb]]]
Former-commit-id: 28cdc018a5
Former-commit-id: ced7f55d63 [formerly 37a96c2f4f]
Former-commit-id: fcda1fcb5e
2013-05-08 14:00:15 -05:00
Richard Peter
91b98e2a00 Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: 96e2f1766c [formerly ff60ca76f7] [formerly 96e2f1766c [formerly ff60ca76f7] [formerly f59e4c9de9 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]]
Former-commit-id: f59e4c9de9
Former-commit-id: 1174ffe848 [formerly 30fc52f742]
Former-commit-id: 3129e77a4d
2013-05-08 13:49:29 -05:00
Bryan Kowal
16987f7641 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: 30d6d39db1 [formerly de588e9749] [formerly 30d6d39db1 [formerly de588e9749] [formerly b40f36b341 [formerly 2afcf9e6e48da20ccf9cffd8cdcf4ba2fd7aff1d]]]
Former-commit-id: b40f36b341
Former-commit-id: e6155a73af [formerly fc67858e0f]
Former-commit-id: 07d2000a41
2013-05-08 13:41:08 -05:00
Nate Jensen
654ecedcb4 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: 2ab4ae9d16 [formerly 48d0829957] [formerly 2ab4ae9d16 [formerly 48d0829957] [formerly edcd6c851c [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]]
Former-commit-id: edcd6c851c
Former-commit-id: 435ebdd199 [formerly c52c101f14]
Former-commit-id: 64fc831eb0
2013-05-08 13:09:59 -05:00