880 commits

Author	SHA1	Message	Date
Greg Armendariz	1884b6dce3	Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development ... Former-commit-id: 1e1aea8a40 [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 7403214a115b0b856f94da1e86288307af952d77]] Former-commit-id: 85113a66b6 Former-commit-id: ccabddace6	2013-03-21 12:55:59 -05:00
Dustin Johnson	e4758ccadf	Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development ... Former-commit-id: a93b6f54c0 [formerly 54bbf500de] [formerly c2373812bd [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]] Former-commit-id: c2373812bd Former-commit-id: b822c6398f	2013-03-21 12:35:40 -05:00
Dustin Johnson	e3a5458f1a	Issue #1794 Use a queue to hold ncf retrieval transfers ... Amend: Peer review comments Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21 Former-commit-id: 3d87218f1a [formerly b29eb94780] [formerly ebce91c15d [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]] Former-commit-id: ebce91c15d Former-commit-id: c88d9dd6cf	2013-03-21 12:28:00 -05:00
Brad Gonzales	2de2221a35	Issue #1785 Adding performance logging for bufrua, grib, obs, radar, ... redbook, sfcobs, and satellite. Amend: Made decoder performance logging consistent. Cleaned up other logging. Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4 Former-commit-id: f7debfc55f [formerly cd39fcf122] [formerly 8c309840a3 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]] Former-commit-id: 8c309840a3 Former-commit-id: 9f9248bcd9	2013-03-21 10:58:26 -05:00
Bryan Kowal	ac0ef6e7b9	Issue #1663 - awips2-database will no longer install site-specific databases. ... - removed the sql scripts for the obsolete hydro databases - the hydro databases will now be installed by the site-specific localization rpms - the database imports and associated db files that are not actually part of localization will be purged by the localization rpm once it is finished with them Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6 Former-commit-id: 4d3731bf6d [formerly ab135933da] [formerly 722d068105 [formerly e4181aff738a926738ccabcd2c09706670a43924]] Former-commit-id: 722d068105 Former-commit-id: 5ab931d15e	2013-03-21 09:50:48 -05:00
Richard Peter	855dd1a664	Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1 ... Former-commit-id: 510e56c67f [formerly d747686fa1] [formerly bcf676f5dd [formerly 855f05b2121c17c71d13495c9aacb12878757af6]] Former-commit-id: bcf676f5dd Former-commit-id: ac58a04170	2013-03-20 17:26:31 -05:00
Bryan Kowal	63f7abc798	Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development ... Former-commit-id: 820518ffb9 [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]] Former-commit-id: 3baebb684b Former-commit-id: 374bd51fb0	2013-03-20 16:53:18 -05:00
Ben Steffensmeier	5261f1f567	Issue #1804 Switch all radar decompressing to be in memory. ... Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221 Former-commit-id: ecf93b40cc [formerly 4c3438e160] [formerly 85b509b13e [formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]] Former-commit-id: 85b509b13e Former-commit-id: 5cb197eebd	2013-03-20 16:37:47 -05:00
Steve Harris	8db98c2d71	Merge branch 'omaha_13.3.1' into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]] Former-commit-id: 0379be06d2 Former-commit-id: 4fc2bb7bba	2013-03-20 16:09:26 -05:00
Steve Harris	f4e26fd94d	Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 ... Conflicts: cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]] Former-commit-id: dc419068f0 Former-commit-id: 31044eabd1	2013-03-20 16:06:20 -05:00
Steve Harris	e9f0328808	13.3.1-10 baseline ... Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]] Former-commit-id: 7078eec1b1 Former-commit-id: 7c2e617d26	2013-03-20 15:53:01 -05:00
Max Schenkelberg	ec27a16858	Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE. ... Change-Id: I177804512c34603bae0027edfa420de47d23138e Former-commit-id: 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]] Former-commit-id: 26cfcd2af5 Former-commit-id: 2e10fd83f6	2013-03-20 14:10:52 -05:00
Steve Harris	d00dc0d174	Merge branch 'omaha_13.3.1' into development ... Conflicts (auto resolved): cave/com.raytheon.uf.viz.cots.feature/feature.xml edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml Former-commit-id: 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]] Former-commit-id: cb5ea76f98 Former-commit-id: 104e6e79e8	2013-03-20 13:45:11 -05:00
Richard Peter	53d8ef7ed1	Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1 ... Former-commit-id: d1e37c7803 [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]] Former-commit-id: adbe7b91cc Former-commit-id: 3bad342dca	2013-03-20 13:32:33 -05:00
Ben Steffensmeier	1b363a547c	Issue #1804 Remove empty data structures from radar hdf5. ... Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d Former-commit-id: 1203b7cee4 [formerly ee7204c05c] [formerly 82499f839d [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]] Former-commit-id: 82499f839d Former-commit-id: 3e2a41d1d2	2013-03-20 13:26:33 -05:00
Dustin Johnson	45ea31f4a6	Merge "Issue #1796 updated some headers, general cleanup" into development ... Former-commit-id: d584a7fb38 [formerly e5bcff21cb] [formerly e7bfdebd41 [formerly 327283da3d779b976d1fdc118c74f00047d79062]] Former-commit-id: e7bfdebd41 Former-commit-id: e3f3ce2773	2013-03-20 13:17:10 -05:00
Ben Steffensmeier	b201d9dee2	Issue #1804 Switch bzip2 cots package to jbzip2. ... Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]] Former-commit-id: ed544fc17c Former-commit-id: 646b61f653	2013-03-20 13:05:54 -05:00
Dave Hladky	01c6ff12a0	Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1 ... Conflicts: edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]] Former-commit-id: 3cdbfa3f25 Former-commit-id: bd17b99bd1	2013-03-20 12:41:33 -05:00
Dave Hladky	69c6fdd887	Issue #1796 updated some headers, general cleanup ... Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6 Former-commit-id: 958b897c21 [formerly 5362771743] [formerly 38494cec16 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]] Former-commit-id: 38494cec16 Former-commit-id: 8a46d43216	2013-03-20 12:17:08 -05:00
Roger Ferrel	aba0067eed	Issue #1807 Change DbQueryHandler to include order by informaton in the query. ... Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48 Former-commit-id: 3acca75f82 [formerly b32ac22ef8] [formerly 4f889b6999 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]] Former-commit-id: 4f889b6999 Former-commit-id: a838aa2d74	2013-03-19 16:24:22 -05:00
David Gillingham	a8ed519915	Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434. ... Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9 Former-commit-id: ab6944650a [formerly 843f474af8] [formerly 8ea6d7227b [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]] Former-commit-id: 8ea6d7227b Former-commit-id: 5f8c8a80f8	2013-03-19 16:06:25 -05:00
Steve Harris	7e96d841d9	13.3.1-9 baseline ... Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]] Former-commit-id: f2b3fddfe2 Former-commit-id: 0375805e79	2013-03-19 14:22:56 -05:00
Ben Steffensmeier	489a180622	Issue #1804 Cache db queries in radar decoder. ... Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be Former-commit-id: 337e450f94 [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]] Former-commit-id: 5d2d834cf7 Former-commit-id: ff0e5696e8	2013-03-19 14:11:36 -05:00
Dustin Johnson	3c8e14edc7	Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development ... Former-commit-id: bc323d3f25 [formerly 5b4035fb11] [formerly 8363eba409 [formerly 9761b41160000713d00113c5267badafc9613a0d]] Former-commit-id: 8363eba409 Former-commit-id: e0b6e6187e	2013-03-19 13:09:48 -05:00
Dave Hladky	618f737fab	Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development! ... Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]] Former-commit-id: 81ad1ce2ed Former-commit-id: f0244f54a4	2013-03-19 13:08:14 -05:00
Ben Steffensmeier	160b6a7040	Issue #1804 Remove AlphanumericValues from radar HDF5. ... Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]] Former-commit-id: 86dffab17d Former-commit-id: dfe8de96f2	2013-03-18 17:16:44 -05:00
Steve Harris	2a26783ba7	Merge branch 'omaha_13.3.1' into development ... Conflicts: 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/dialogs/formatterlauncher/ZoneCombinerComp.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]] Former-commit-id: 7fcf9f1cb2 Former-commit-id: 900b9aadde	2013-03-18 16:52:00 -05:00
Steve Harris	ea27f9cd17	Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 ... Conflicts (just history comments): cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]] Former-commit-id: c18b96dc4c Former-commit-id: 245afb28c8	2013-03-18 16:43:22 -05:00
Bryan Kowal	3e8d5449fc	Issue #1741 - what was once two is now one ... - a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature - this rpm will install the CAVE and/or EDEX artifacts Former-commit-id: a93dcff1b5 [formerly b954bc17bf] [formerly 7fd035256d [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]] Former-commit-id: 7fd035256d Former-commit-id: 66e2ed79ec	2013-03-18 16:36:33 -05:00
Steve Harris	81a3f29afc	13.3.1-8 baseline ... Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]] Former-commit-id: c15b3ffe20 Former-commit-id: 5f492500ea	2013-03-18 15:43:32 -05:00
Dustin Johnson	7afc4a083b	Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development ... Former-commit-id: 36cc80590c [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]] Former-commit-id: 7fe3c254fd Former-commit-id: 55095f0041	2013-03-15 16:14:17 -05:00
Nate Jensen	4ea1508baa	Issue #1795 speed up publish by optimizing publish time updates in grid histories ... Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8 Former-commit-id: 30ddd909bf [formerly e65267d5f3] [formerly 235952a115 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]] Former-commit-id: 235952a115 Former-commit-id: dad08657aa	2013-03-15 16:10:11 -05:00
Max Schenkelberg	c3232f2581	Issue #1638 Fixed Velocity templates for windows build ... Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a Former-commit-id: 07a6fd494d [formerly 2c3ee8d35d] [formerly beb801517e [formerly da9666be71adf84f394f255406a66afa6c3f28be]] Former-commit-id: beb801517e Former-commit-id: 582de5717c	2013-03-15 12:16:59 -05:00
Dustin Johnson	7adf94e9f6	Issue #1794 Consolidate common filename filters into FilenameFilters class ... Change-Id: I29d7267d79164e005e3c202a23267767c853bf36 Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]] Former-commit-id: 43a9f608ef Former-commit-id: 1b82ad0dc4	2013-03-15 11:51:58 -05:00
Bryan Kowal	ebaea489bc	Issue #1663 - name the default geometry column ... Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27 Former-commit-id: b0d31729e8 [formerly 0d33c86abe] [formerly 8c0ee91c5b [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]] Former-commit-id: 8c0ee91c5b Former-commit-id: e83033b314	2013-03-14 10:37:20 -05:00
Ben Steffensmeier	d22cbc7ce9	Issue #1777 fix subgridding range problems ... Former-commit-id: 5e81f2154d [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]] Former-commit-id: 0daa5817d0 Former-commit-id: a6140145a4	2013-03-14 09:56:00 -05:00
Bryan Kowal	8c91869c8e	Issue #1772 - remove references to the DEV_MODE jvm parameter ... - removed ScriptLibraryManager.java Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e Former-commit-id: 19b26c9f04 [formerly dd811f674b] [formerly 58316907ae [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]] Former-commit-id: 58316907ae Former-commit-id: 86c287bb33	2013-03-14 09:54:11 -05:00
David Gillingham	d8dd50f2ba	Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request ... implementations, convert request handlers to use new python concurrent framework, excise GfeScript and GfeScriptExecutor from the system. Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152 Former-commit-id: 87013aad89 [formerly 7c74510723] [formerly 566927980a [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]] Former-commit-id: 566927980a Former-commit-id: 90b8c80837	2013-03-13 17:14:59 -05:00
Nate Jensen	15b3d5add6	Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1 ... Former-commit-id: d0db96df45 [formerly dbd2729336] [formerly eaef235e8e [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]] Former-commit-id: eaef235e8e Former-commit-id: d881ab1442	2013-03-13 16:17:44 -05:00
Bryan Kowal	f6139755a5	Issue #1663 - PostgreSQL Upgrade ... - we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source - we are building pgadmin3 1.16.1 from source - we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3 - the following extensions are also built with PostgreSQL: * geos 3.3.7 * postgis 2.0.2 * proj 4.8.0 * gdal 1.9.2 - database creation scripts and configuration have been updated for compatibility - removed remaining references to prefixed psql and postgresql rpms - removed unused sql scripts from the baseline - we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file - updated the postgresql jdbc drivers Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8 Former-commit-id: db02ab18ed [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]] Former-commit-id: 5e86ef080e Former-commit-id: 58e035a024	2013-03-13 14:44:05 -05:00
Dave Hladky	9e97fc9efe	Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 ... Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]] Former-commit-id: 5dc454c7ef Former-commit-id: 160e1594b8	2013-03-13 13:56:33 -05:00
Ben Steffensmeier	a1ca2ae2d7	Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing. ... Former-commit-id: 51955a719a [formerly 36b3c16a42] [formerly ddf2092bde [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]] Former-commit-id: ddf2092bde Former-commit-id: 247c9f6c1f	2013-03-13 13:21:16 -05:00
Steve Harris	ed5f1dbab6	13.3.1-7 baseline ... Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]] Former-commit-id: e12ed113ae Former-commit-id: 31c0a97dca	2013-03-13 09:50:28 -05:00
Dustin Johnson	f5a3b57107	Issue #1784 Move NCF bandwidth manager code to data delivery repo ... Amend: Publish JUnit test reports as XML, in support of Jenkins. Fix build/merge of 13.3.1 code so it compiles. Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4 Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]] Former-commit-id: 1930183036 Former-commit-id: 48a96911c8	2013-03-13 08:39:08 -05:00
Roger Ferrel	a9a0a471f9	Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList. ... Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4 Former-commit-id: f912d9ece3 [formerly c5a2786c84] [formerly b5743e8f9b [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]] Former-commit-id: b5743e8f9b Former-commit-id: 8bb9044e3a	2013-03-12 16:58:06 -05:00
Nate Jensen	a4a5a1e94f	Merge "Issue #1638 fix velocity on windows" into development ... Former-commit-id: 37d996c64c [formerly 4486bd9941] [formerly 676b3c9d11 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]] Former-commit-id: 676b3c9d11 Former-commit-id: 33f185d021	2013-03-12 16:43:13 -05:00
Nate Jensen	35d0187e3d	Issue #1638 fix velocity on windows ... Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a Former-commit-id: 5e545cc9c4 [formerly 863d4cf3df] [formerly cbf0343d72 [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]] Former-commit-id: cbf0343d72 Former-commit-id: b00ccd2b77	2013-03-12 16:04:59 -05:00
Steve Harris	bca46a1354	Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]] Former-commit-id: 0cd7e56e65 Former-commit-id: d5bcdb0015	2013-03-12 16:04:23 -05:00
Dave Hladky	155903d135	Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 ... Conflicts: 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 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java ncep/com.raytheon.uf.edex.ncep.feature/feature.xml Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227 Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]] Former-commit-id: 4b08491880 Former-commit-id: 6ea95002de	2013-03-12 15:48:34 -05:00
Dustin Johnson	d63cdbfd17	Issue #1778 Watch for bandwidth configuration changes ... Amend: Peer review comments Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e Former-commit-id: 6eed493b3e [formerly 4c7f7801fa] [formerly 794812fb23 [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]] Former-commit-id: 794812fb23 Former-commit-id: 33fe353252	2013-03-12 12:02:09 -05:00