Dustin Johnson
07be638779
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: b1f365220ff5cc517f9adcfbb43eb3b1f365220ff5cc517f9adcfbb43eb38651ca3d76dcfbb43eb38651ca3d766adeb41238c55f2ce5590596d43d99dcc7e44250eb0f12b15f
2013-03-22 15:28:57 -05:00
Dustin Johnson
e2a6167de3
Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
...
Former-commit-id: efb12ce258ec42bd63ad11478e870defb12ce258ec42bd63ad11478e870ded017996a011478e870ded017996a0bd04bd2c8cf274b8cd5b9e63142576e4c51bad63087e01d4e4
2013-03-22 15:28:20 -05:00
Dustin Johnson
c5464667d5
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 34b969552f6fc42b07918956d1ac1734b969552f6fc42b07918956d1ac1704cbd3a24e8956d1ac1704cbd3a24e0dcc67bc5553291f71301b1bd69b89e39187c0ce0c92ddab72
2013-03-22 10:04:21 -05:00
Dustin Johnson
3e8624a3e8
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
...
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: ace2e517d5bd58534855f8870c8946ace2e517d5bd58534855f8870c8946c4d4e37cadf8870c8946c4d4e37cadccb959c68609d1d7b6cfd58306a92e0f4ec007904d41fca019
2013-03-21 16:14:49 -05:00
Greg Armendariz
e4d51820e2
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 65d6bc8cd71e1aea8a406af1a22e5665d6bc8cd71e1aea8a406af1a22e5685113a66b66af1a22e5685113a66b68550ade3ba1884b6dce3ccabddace6559136f546f9d1bfbb48
2013-03-21 12:55:59 -05:00
Dustin Johnson
71b739a546
Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
...
Former-commit-id: 9818775763a93b6f54c054bbf500de9818775763a93b6f54c054bbf500dec2373812bd54bbf500dec2373812bda7eb161d29e4758ccadfb822c6398fc23347b58d9426ee02af
2013-03-21 12:35:40 -05:00
Dustin Johnson
173cc2b457
Issue #1794 Use a queue to hold ncf retrieval transfers
...
Amend:
Peer review comments
Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21
Former-commit-id: e8c9726d513d87218f1ab29eb94780e8c9726d513d87218f1ab29eb94780ebce91c15db29eb94780ebce91c15db0a2a23c78e3a5458f1ac88d9dd6cf67f055ca39eaf2a061b5
2013-03-21 12:28:00 -05:00
Bryan Kowal
a9dd3bd622
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: 0ef2ee6e494d3731bf6dab135933da0ef2ee6e494d3731bf6dab135933da722d068105ab135933da722d068105854ae5b462ac0ef6e7b95ab931d15e5ca46505e00f5a5e71b7
2013-03-21 09:50:48 -05:00
Bryan Kowal
acfe04a074
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: cbffb4df4a820518ffb90479eb0cc1cbffb4df4a820518ffb90479eb0cc13baebb684b0479eb0cc13baebb684ba71e14882e63f7abc798374bd51fb05eae24b949ddf4c04e59
2013-03-20 16:53:18 -05:00
Steve Harris
616cddf60c
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: b7994fb77b0055a3213de2496455b2b7994fb77b0055a3213de2496455b20379be06d2e2496455b20379be06d20a86e74ea58db98c2d714fc2bb7bbaa91fcf98a2961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98
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: ea052b14bba9ced3a7effa15f03e1bea052b14bba9ced3a7effa15f03e1bdc419068f0fa15f03e1bdc419068f02cbd2a1bc9f4e26fd94d31044eabd18065161896c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9
13.3.1-10 baseline
...
Former-commit-id: 76ea9120d857f4676b6c073687d9a976ea9120d857f4676b6c073687d9a97078eec1b1073687d9a97078eec1b1dbeb388d72e9f03288087c2e617d26f2cc967a4fe6ab10cc26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
4a8a63253a
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: 9f4b102dc743341e7ad3c6db3ce43b9f4b102dc743341e7ad3c6db3ce43b26cfcd2af5c6db3ce43b26cfcd2af58732e302f7ec27a168582e10fd83f6924e27f51fa25ccc8c5c
2013-03-20 14:10:52 -05:00
Steve Harris
0929de5965
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: 8db22baf07310474ae9b36df63be5c8db22baf07310474ae9b36df63be5ccb5ea76f9836df63be5ccb5ea76f9896ba08115ad00dc0d174104e6e79e86d4512fa3a352c267fc9
2013-03-20 13:45:11 -05:00
Richard Peter
4e87891a64
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 0d35db042ed1e37c78033b8e2ff0d30d35db042ed1e37c78033b8e2ff0d3adbe7b91cc3b8e2ff0d3adbe7b91cc8805c42d1453d8ef7ed13bad342dcaff1b1598e6403879b5cf
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
ce8d190a49
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 41372ac1221203b7cee4ee7204c05c41372ac1221203b7cee4ee7204c05c82499f839dee7204c05c82499f839dd67d0ec6741b363a547c3e2a41d1d257d19b0d66a01b552f89
2013-03-20 13:26:33 -05:00
Dustin Johnson
0a4c9a3d33
Merge "Issue #1796 updated some headers, general cleanup" into development
...
Former-commit-id: 28cd17759ed584a7fb38e5bcff21cb28cd17759ed584a7fb38e5bcff21cbe7bfdebd41e5bcff21cbe7bfdebd413e3717c6db45ea31f4a6e3f3ce27734481b1e830f1337b3561
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
a503ef0938
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d765a2fcf0d9119a1c72b6aa863710d765a2fcf0d9119a1c72b6aa86371ed544fc17c2b6aa86371ed544fc17c4b0e7e77d3b201d9dee2646b61f653498d153e404cde2bd826
2013-03-20 13:05:54 -05:00
Dave Hladky
c290073444
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: 2cfb8f5ee0dc7b231bf090f7f2110b2cfb8f5ee0dc7b231bf090f7f2110b3cdbfa3f2590f7f2110b3cdbfa3f25a7462a512501c6ff12a0bd17b99bd18299b2872a1aef08f449
2013-03-20 12:41:33 -05:00
Dave Hladky
6e7e9a653b
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: c0250bb4e0958b897c215362771743c0250bb4e0958b897c21536277174338494cec16536277174338494cec161dcf1cd26069c6fdd8878a46d432167046f3135103219ce56a
2013-03-20 12:17:08 -05:00
Roger Ferrel
93a2c0586d
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: 8a26c525063acca75f82b32ac22ef88a26c525063acca75f82b32ac22ef84f889b6999b32ac22ef84f889b699921b81bfb04aba0067eeda838aa2d7471834c493c5907205c3c
2013-03-19 16:24:22 -05:00
David Gillingham
39e84043cc
Issue #1447 : Update MergeVTEC.py to be current with A1 DR 21434.
...
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9
Former-commit-id: 3ad6035189ab6944650a843f474af83ad6035189ab6944650a843f474af88ea6d7227b843f474af88ea6d7227b173ceacc0da8ed5199155f8c8a80f82e57b9f2623a70a07654
2013-03-19 16:06:25 -05:00
Steve Harris
5411621351
13.3.1-9 baseline
...
Former-commit-id: 6ebecda008c7b2ef2d8c468ae823056ebecda008c7b2ef2d8c468ae82305f2b3fddfe2468ae82305f2b3fddfe23c492badbc7e96d841d90375805e7965f522fc8737beeaab69
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
16a27f55fe
Issue #1804 Cache db queries in radar decoder.
...
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be
Former-commit-id: f828c49328337e450f947b83f6bdfaf828c49328337e450f947b83f6bdfa5d2d834cf77b83f6bdfa5d2d834cf70c1fe3d11f489a180622ff0e5696e8044eeebe9787b21c053d
2013-03-19 14:11:36 -05:00
Dustin Johnson
fec2db4a51
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: d1789b5141bc323d3f255b4035fb11d1789b5141bc323d3f255b4035fb118363eba4095b4035fb118363eba4092896b034a73c8e14edc7e0b6e6187e889953c71217fe9aee59
2013-03-19 13:09:48 -05:00
Dave Hladky
07b8f90014
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: 77472f704fd7e8709cdeddb23ae59f77472f704fd7e8709cdeddb23ae59f81ad1ce2edddb23ae59f81ad1ce2ede0d90738ad618f737fabf0244f54a464f8c46e64af0898807b
2013-03-19 13:08:14 -05:00
Ben Steffensmeier
02f7d8e3ab
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: be721b7da07b7b708eee6c741a9ab3be721b7da07b7b708eee6c741a9ab386dffab17d6c741a9ab386dffab17d89ec3e9ce7160b6a7040dfe8de96f2e176478c7af2466d6066
2013-03-18 17:16:44 -05:00
Steve Harris
4c10c7a5be
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: b64fbe549a28ef804e1bb8f0635ad6b64fbe549a28ef804e1bb8f0635ad67fcf9f1cb2b8f0635ad67fcf9f1cb2027eda5dce2a26783ba7900b9aadde22bb7ecd33481cee4c74
2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749
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: 3e69490ab227c418812f1a999fee5a3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c0e9919f6beea27f9cd17245afb28c8fc6748cb3e9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3
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: 4f808edba3a93dcff1b5b954bc17bf4f808edba3a93dcff1b5b954bc17bf7fd035256db954bc17bf7fd035256d9d8b41c8c73e8d5449fc66e2ed79ec56f2b3f0c281ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bdd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe202fd4ac939781a3f29afc5f492500ea0c94cc97fb1c2dffd66d
2013-03-18 15:43:32 -05:00
Dustin Johnson
f10956964f
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 1fb27b205a36cc80590cb7a5311dde1fb27b205a36cc80590cb7a5311dde7fe3c254fdb7a5311dde7fe3c254fdb4c83331db7afc4a083b55095f0041805c491c04225c664129
2013-03-15 16:14:17 -05:00
Nate Jensen
7a734502b3
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: 3b331be9f630ddd909bfe65267d5f33b331be9f630ddd909bfe65267d5f3235952a115e65267d5f3235952a115568f988ef94ea1508baadad08657aad622b8c12e499209754a
2013-03-15 16:10:11 -05:00
Max Schenkelberg
11d5047ab8
Issue #1638 Fixed Velocity templates for windows build
...
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a
Former-commit-id: 93c416e91407a6fd494d2c3ee8d35d93c416e91407a6fd494d2c3ee8d35dbeb801517e2c3ee8d35dbeb801517ef294d9aa8ac3232f2581582de5717caf973ff5a6286fc9a6ec
2013-03-15 12:16:59 -05:00
Dustin Johnson
090d1fe72a
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7fff7e7983fecb0d2c82665f87506b7fff7e7983fecb0d2c82643a9f608efecb0d2c82643a9f608efd8880e29b67adf94e9f61b82ad0dc4a08059dd3483034c3f43
2013-03-15 11:51:58 -05:00
Bryan Kowal
ff3b0b0645
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: f3835d85a0b0d31729e80d33c86abef3835d85a0b0d31729e80d33c86abe8c0ee91c5b0d33c86abe8c0ee91c5b21e0725cdcebaea489bce83033b314bc0c82dad8a897e41993
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
d74ac3e7f7
Issue #1777 fix subgridding range problems
...
Former-commit-id: 81f4bb55fc5e81f2154d5bd20414eb81f4bb55fc5e81f2154d5bd20414eb0daa5817d05bd20414eb0daa5817d0964fc25677d22cbc7ce9a6140145a4bc92e1be6b24b97d7625
2013-03-14 09:56:00 -05:00
Bryan Kowal
ce667ef7f5
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: 123f4a8de919b26c9f04dd811f674b123f4a8de919b26c9f04dd811f674b58316907aedd811f674b58316907aeb4316f574e8c91869c8e86c287bb3339ff5c7945851eb395f7
2013-03-14 09:54:11 -05:00
David Gillingham
c274c26346
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: e7a9930ee987013aad897c74510723e7a9930ee987013aad897c74510723566927980a7c74510723566927980ae79e4a7f7dd8dd50f2ba90b8c80837b121f9901534a1c7b784
2013-03-13 17:14:59 -05:00
Nate Jensen
f981b7b9b1
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: 4db98f508dd0db96df45dbd27293364db98f508dd0db96df45dbd2729336eaef235e8edbd2729336eaef235e8ed7696aa69215b3d5add6d881ab14424539ef8b58165fbf3646
2013-03-13 16:17:44 -05:00
Bryan Kowal
f1854dd760
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: 9e678feaf8db02ab18ed729bc9c4bb9e678feaf8db02ab18ed729bc9c4bb5e86ef080e729bc9c4bb5e86ef080e0b6a31d7caf6139755a558e035a0241e9054ce15ea0950d836
2013-03-13 14:44:05 -05:00
Dave Hladky
b111edeb8b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5765be278bb38b952a2207d2c1bc4d5765be278bb38b952a2205dc454c7ef38b952a2205dc454c7ef68114535f29e97fc9efe160e1594b8cb5ee4a7b8b85e19282b
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
f5d83f4c32
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 45cf2fd0ff51955a719a36b3c16a4245cf2fd0ff51955a719a36b3c16a42ddf2092bde36b3c16a42ddf2092bde6e0c60c210a1ca2ae2d7247c9f6c1f04882c798f15a16c8d81
2013-03-13 13:21:16 -05:00
Steve Harris
352658125b
13.3.1-7 baseline
...
Former-commit-id: 23faf8445597d2f521e4a72254cc7523faf8445597d2f521e4a72254cc75e12ed113aea72254cc75e12ed113ae45a2d0501ded5f1dbab631c0a97dca3084a860cd88b28c39c1
2013-03-13 09:50:28 -05:00
Dustin Johnson
71d6d82042
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: 2676e08fdd2983ed29e471365cd9452676e08fdd2983ed29e471365cd945193018303671365cd9451930183036fdaa9b5ce7f5a3b5710748a96911c806b39b848bbe4fe08b9d
2013-03-13 08:39:08 -05:00
Roger Ferrel
cef241d8f8
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: 82b526851af912d9ece3c5a2786c8482b526851af912d9ece3c5a2786c84b5743e8f9bc5a2786c84b5743e8f9bb2845a11d0a9a0a471f98bb9044e3a5546691fd6cf7b0e99f7
2013-03-12 16:58:06 -05:00
Nate Jensen
e2c7b0f918
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 33b73b008f37d996c64c4486bd994133b73b008f37d996c64c4486bd9941676b3c9d114486bd9941676b3c9d118778e9f945a4a5a1e94f33f185d021d0f70dafb340d5631842
2013-03-12 16:43:13 -05:00
Nate Jensen
80ccca5828
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 48170212cb5e545cc9c4863d4cf3df48170212cb5e545cc9c4863d4cf3dfcbf0343d72863d4cf3dfcbf0343d72f4b80d4b1535d0187e3db00ccd2b77d8197235fe52139d5bcf
2013-03-12 16:04:59 -05:00
Steve Harris
072065191b
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: 4c4c79036c36261cb095753a5213ab4c4c79036c36261cb095753a5213ab0cd7e56e65753a5213ab0cd7e56e6547cde9bd09bca46a1354d5bcdb00155232592cfa346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4
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: e17f8e05115c65862b8fa1006667e0e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b08491880eefd544e4b155903d1356ea95002de29ed641a13cdfbcc7136
2013-03-12 15:48:34 -05:00
