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

2220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dustin Johnson
4d41fca019 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: bd58534855 [formerly f8870c8946] [formerly bd58534855 [formerly f8870c8946] [formerly c4d4e37cad [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]
Former-commit-id: c4d4e37cad
Former-commit-id: 09d1d7b6cf [formerly d58306a92e]
Former-commit-id: 0f4ec00790
 2013-03-21 16:14:49 -05:00
Dustin Johnson
9426ee02af Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development 
Former-commit-id: a93b6f54c0 [formerly 54bbf500de] [formerly a93b6f54c0 [formerly 54bbf500de] [formerly c2373812bd [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]]
Former-commit-id: c2373812bd
Former-commit-id: e4758ccadf [formerly b822c6398f]
Former-commit-id: c23347b58d
 2013-03-21 12:35:40 -05:00
Dustin Johnson
eaf2a061b5 Issue #1794 Use a queue to hold ncf retrieval transfers 
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: 3d87218f1a [formerly b29eb94780] [formerly 3d87218f1a [formerly b29eb94780] [formerly ebce91c15d [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]
Former-commit-id: ebce91c15d
Former-commit-id: e3a5458f1a [formerly c88d9dd6cf]
Former-commit-id: 67f055ca39
 2013-03-21 12:28:00 -05:00
Bryan Kowal
17c46599a4 Issue #1750 - add clean scriptlet to pgadmin3 rpm specification 
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 574f6cf4ad [formerly 4e37fa6627] [formerly 574f6cf4ad [formerly 4e37fa6627] [formerly 5b15c6fcaa [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 88b0c2e120 [formerly 8141f49211]
Former-commit-id: 6e9c94566c
 2013-03-21 10:04:29 -05:00
Bryan Kowal
ddf4c04e59 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 820518ffb9 [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]
Former-commit-id: 3baebb684b
Former-commit-id: 63f7abc798 [formerly 374bd51fb0]
Former-commit-id: 5eae24b949
 2013-03-20 16:53:18 -05:00
Steve Harris
961c0b56a7 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 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]
Former-commit-id: 0379be06d2
Former-commit-id: 8db98c2d71 [formerly 4fc2bb7bba]
Former-commit-id: a91fcf98a2
 2013-03-20 16:09:26 -05:00
Steve Harris
c129fed15e 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 a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
 2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline 
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
 2013-03-20 15:53:01 -05:00
Max Schenkelberg
a25ccc8c5c 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 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: ec27a16858 [formerly 2e10fd83f6]
Former-commit-id: 924e27f51f
 2013-03-20 14:10:52 -05:00
Steve Harris
352c267fc9 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 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: d00dc0d174 [formerly 104e6e79e8]
Former-commit-id: 6d4512fa3a
 2013-03-20 13:45:11 -05:00
Richard Peter
403879b5cf 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 d1e37c7803 [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 53d8ef7ed1 [formerly 3bad342dca]
Former-commit-id: ff1b1598e6
 2013-03-20 13:32:33 -05:00
Ben Steffensmeier
a01b552f89 Issue #1804 Remove empty data structures from radar hdf5. 
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 1203b7cee4 [formerly ee7204c05c] [formerly 1203b7cee4 [formerly ee7204c05c] [formerly 82499f839d [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 1b363a547c [formerly 3e2a41d1d2]
Former-commit-id: 57d19b0d66
 2013-03-20 13:26:33 -05:00
Dustin Johnson
f1337b3561 Merge "Issue #1796 updated some headers, general cleanup" into development 
Former-commit-id: d584a7fb38 [formerly e5bcff21cb] [formerly d584a7fb38 [formerly e5bcff21cb] [formerly e7bfdebd41 [formerly 327283da3d779b976d1fdc118c74f00047d79062]]]
Former-commit-id: e7bfdebd41
Former-commit-id: 45ea31f4a6 [formerly e3f3ce2773]
Former-commit-id: 4481b1e830
 2013-03-20 13:17:10 -05:00
Ben Steffensmeier
4cde2bd826 Issue #1804 Switch bzip2 cots package to jbzip2. 
Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b201d9dee2 [formerly 646b61f653]
Former-commit-id: 498d153e40
 2013-03-20 13:05:54 -05:00
Dave Hladky
1aef08f449 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 dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
 2013-03-20 12:41:33 -05:00
Dave Hladky
03219ce56a Issue #1796 updated some headers, general cleanup 
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 958b897c21 [formerly 5362771743] [formerly 958b897c21 [formerly 5362771743] [formerly 38494cec16 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]
Former-commit-id: 38494cec16
Former-commit-id: 69c6fdd887 [formerly 8a46d43216]
Former-commit-id: 7046f31351
 2013-03-20 12:17:08 -05:00
Richard Peter
5e9a5412f2 Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development 
Former-commit-id: 0bb02996e4 [formerly 15c2a0af44] [formerly 0bb02996e4 [formerly 15c2a0af44] [formerly 4ffeeded42 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]]]
Former-commit-id: 4ffeeded42
Former-commit-id: 09cca538be [formerly a96ae13475]
Former-commit-id: b07fe81ec7
 2013-03-20 10:01:51 -05:00
Greg Armendariz
4dbe6c28f6 Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development 
Former-commit-id: ffb307c7b3 [formerly 65e9035d82] [formerly ffb307c7b3 [formerly 65e9035d82] [formerly 82af4a9f5c [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]]]
Former-commit-id: 82af4a9f5c
Former-commit-id: fec8dd5bc2 [formerly 7943b05ea6]
Former-commit-id: f524f52f0b
 2013-03-20 09:55:49 -05:00
Dave Hladky
9391c2fb54 Issue #1796 Fixed the test 
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: a624cc49c7 [formerly d9078b438a] [formerly a624cc49c7 [formerly d9078b438a] [formerly b4eb7b17a9 [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]]
Former-commit-id: b4eb7b17a9
Former-commit-id: de43e4fc66 [formerly b43c821a33]
Former-commit-id: 87728badf5
 2013-03-19 17:22:00 -05:00
Roger Ferrel
5907205c3c Issue #1807 Change DbQueryHandler to include order by informaton in the query. 
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 3acca75f82 [formerly b32ac22ef8] [formerly 3acca75f82 [formerly b32ac22ef8] [formerly 4f889b6999 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]]
Former-commit-id: 4f889b6999
Former-commit-id: aba0067eed [formerly a838aa2d74]
Former-commit-id: 71834c493c
 2013-03-19 16:24:22 -05:00
David Gillingham
3a70a07654 Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434. 
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: ab6944650a [formerly 843f474af8] [formerly ab6944650a [formerly 843f474af8] [formerly 8ea6d7227b [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: a8ed519915 [formerly 5f8c8a80f8]
Former-commit-id: 2e57b9f262
 2013-03-19 16:06:25 -05:00
Richard Peter
3c37f0f171 Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1 
Former-commit-id: 26aa93a6f4 [formerly 6046872ab5] [formerly 26aa93a6f4 [formerly 6046872ab5] [formerly a421cfe73e [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]]
Former-commit-id: a421cfe73e
Former-commit-id: 845a04fd54 [formerly cf395cfb39]
Former-commit-id: 6852771ec6
 2013-03-19 15:34:36 -05:00
Steve Harris
37beeaab69 13.3.1-9 baseline 
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 7e96d841d9 [formerly 0375805e79]
Former-commit-id: 65f522fc87
 2013-03-19 14:22:56 -05:00
Ben Steffensmeier
87b21c053d Issue #1804 Cache db queries in radar decoder. 
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 337e450f94 [formerly 7b83f6bdfa] [formerly 337e450f94 [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 489a180622 [formerly ff0e5696e8]
Former-commit-id: 044eeebe97
 2013-03-19 14:11:36 -05:00
Bryan Kowal
b05b21401f Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base 
Former-commit-id: 448518579a [formerly cbe9b30266] [formerly 448518579a [formerly cbe9b30266] [formerly 74b4bb0891 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]]
Former-commit-id: 74b4bb0891
Former-commit-id: 6b8538f7f5 [formerly 7628860bfe]
Former-commit-id: cb78a6af53
 2013-03-19 13:27:38 -05:00
Richard Peter
5f09e66d4e Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1 
Former-commit-id: 2fdbc96342 [formerly 4ce10bced9] [formerly 2fdbc96342 [formerly 4ce10bced9] [formerly 3a92747518 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]
Former-commit-id: 3a92747518
Former-commit-id: eebd930070 [formerly c955b3b640]
Former-commit-id: 1bf2c48011
 2013-03-19 13:24:28 -05:00
Dustin Johnson
17fe9aee59 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development 
Former-commit-id: bc323d3f25 [formerly 5b4035fb11] [formerly bc323d3f25 [formerly 5b4035fb11] [formerly 8363eba409 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]
Former-commit-id: 8363eba409
Former-commit-id: 3c8e14edc7 [formerly e0b6e6187e]
Former-commit-id: 889953c712
 2013-03-19 13:09:48 -05:00
Dave Hladky
af0898807b Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development! 
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: 618f737fab [formerly f0244f54a4]
Former-commit-id: 64f8c46e64
 2013-03-19 13:08:14 -05:00
Mike Duff
c22d1962de Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen 
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 70efff8f0a [formerly b115d3611c] [formerly 70efff8f0a [formerly b115d3611c] [formerly 058064ce0d [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: 3e1b4ba54b [formerly 7e66c8e46d]
Former-commit-id: 144223ed9b
 2013-03-19 10:10:01 -05:00
Bryan Kowal
50e884aab0 Issue #1805 - slightly modified viz feature build order 
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 6106369d4c [formerly f325038538] [formerly 6106369d4c [formerly f325038538] [formerly f0eb7d3285 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]
Former-commit-id: f0eb7d3285
Former-commit-id: fd68cd7a04 [formerly 54113e9b29]
Former-commit-id: 959e8b717f
 2013-03-18 18:15:26 -05:00
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5. 
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
 2013-03-18 17:16:44 -05:00
Steve Harris
481cee4c74 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 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
 2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe 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 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
 2013-03-18 16:43:22 -05:00
Bryan Kowal
81ebbd5a5b 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 a93dcff1b5 [formerly b954bc17bf] [formerly 7fd035256d [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]
Former-commit-id: 7fd035256d
Former-commit-id: 3e8d5449fc [formerly 66e2ed79ec]
Former-commit-id: 56f2b3f0c2
 2013-03-18 16:36:33 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
 2013-03-18 15:43:32 -05:00
Dustin Johnson
225c664129 Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development 
Former-commit-id: 36cc80590c [formerly b7a5311dde] [formerly 36cc80590c [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 7afc4a083b [formerly 55095f0041]
Former-commit-id: 805c491c04
 2013-03-15 16:14:17 -05:00
Nate Jensen
499209754a Issue #1795 speed up publish by optimizing publish time updates in grid histories 
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 30ddd909bf [formerly e65267d5f3] [formerly 30ddd909bf [formerly e65267d5f3] [formerly 235952a115 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]
Former-commit-id: 235952a115
Former-commit-id: 4ea1508baa [formerly dad08657aa]
Former-commit-id: d622b8c12e
 2013-03-15 16:10:11 -05:00
Nate Jensen
9bd1f201e3 Merge "Issue #1638 Fixed Velocity templates for windows build" into development 
Former-commit-id: cab8a23ebd [formerly f3fbae64b3] [formerly cab8a23ebd [formerly f3fbae64b3] [formerly d14dfe215c [formerly 640eb368b7026651de34db2154fb955930d65040]]]
Former-commit-id: d14dfe215c
Former-commit-id: 74df582fac [formerly 0191c8bff0]
Former-commit-id: 7cae3e296e
 2013-03-15 13:49:56 -05:00
Max Schenkelberg
286fc9a6ec Issue #1638 Fixed Velocity templates for windows build 
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a

Former-commit-id: 07a6fd494d [formerly 2c3ee8d35d] [formerly 07a6fd494d [formerly 2c3ee8d35d] [formerly beb801517e [formerly da9666be71adf84f394f255406a66afa6c3f28be]]]
Former-commit-id: beb801517e
Former-commit-id: c3232f2581 [formerly 582de5717c]
Former-commit-id: af973ff5a6
 2013-03-15 12:16:59 -05:00
Dustin Johnson
83034c3f43 Issue #1794 Consolidate common filename filters into FilenameFilters class 
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]
Former-commit-id: 43a9f608ef
Former-commit-id: 7adf94e9f6 [formerly 1b82ad0dc4]
Former-commit-id: a08059dd34
 2013-03-15 11:51:58 -05:00
Roger Ferrel
ccc37c2b46 Issue #1790 changes for non-blocking StationLegendDlg. 
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d

Former-commit-id: dadf8a9e4c [formerly 0089e24579] [formerly dadf8a9e4c [formerly 0089e24579] [formerly b01bb935c3 [formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]]
Former-commit-id: b01bb935c3
Former-commit-id: 382bb7c16b [formerly 08990f97f8]
Former-commit-id: 85f58a9e52
 2013-03-15 10:26:30 -05:00
Roger Ferrel
1d2db27655 Issue #1790 changes for non-blocking StaffGageDlg. 
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092

Former-commit-id: fcbda4e0de [formerly 4230e1a9b8] [formerly fcbda4e0de [formerly 4230e1a9b8] [formerly 17a41bf063 [formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]]
Former-commit-id: 17a41bf063
Former-commit-id: e88e52e406 [formerly 006062502e]
Former-commit-id: 47dac77059
 2013-03-15 09:00:00 -05:00
Roger Ferrel
5f0b405866 Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg. 
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c

Former-commit-id: 76507ebcc5 [formerly 015fc9b8f8] [formerly 76507ebcc5 [formerly 015fc9b8f8] [formerly 34ea46099e [formerly ad772f0a3eb944117614f029a2c3659e5c774599]]]
Former-commit-id: 34ea46099e
Former-commit-id: 60e7b4be62 [formerly 7eae71038f]
Former-commit-id: 824b98527c
 2013-03-15 08:17:50 -05:00
Lee Venable
0449fe84a6 Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1 
Former-commit-id: 57d7559797 [formerly 456fd056f4] [formerly 57d7559797 [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: ba4673b99a [formerly 3a1dc41b50]
Former-commit-id: cac220879d
 2013-03-14 17:19:38 -05:00
Dave Hladky
871c4718ab Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table 
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: 3ba473351b [formerly db207a732c]
Former-commit-id: 5bf3f5f89f
 2013-03-14 15:59:39 -05:00
Roger Ferrel
d8000c1526 Issue #1790 Changes for non-blocking TabularDisplayDlg. 
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d

Former-commit-id: 818b856f97 [formerly c43b7777e1] [formerly 818b856f97 [formerly c43b7777e1] [formerly ebe57f1cbc [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: 46428ed944 [formerly ff944b4768]
Former-commit-id: 1cada5eec3
 2013-03-14 15:38:08 -05:00
Ron Anderson
bd0618d53f Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1 
Former-commit-id: 60af3ad63e [formerly 16d93dab84] [formerly 60af3ad63e [formerly 16d93dab84] [formerly fc749ff3eb [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]
Former-commit-id: fc749ff3eb
Former-commit-id: 97a38fd3c5 [formerly 7087e1ebe7]
Former-commit-id: e6ba869694
 2013-03-14 14:55:31 -05:00
Lee Venable
093fcee46f Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development 
Former-commit-id: 966497c2a9 [formerly 03f81c4f49] [formerly 966497c2a9 [formerly 03f81c4f49] [formerly 7c9ce3dfb9 [formerly 27b25500f8346d73b0a12ca8597e7b0a6282ad0c]]]
Former-commit-id: 7c9ce3dfb9
Former-commit-id: 9125432046 [formerly 21c657ce8a]
Former-commit-id: ecc0ee05a5
 2013-03-14 13:44:15 -05:00
Ben Steffensmeier
41e3ac3923 Issue #1793 Performance improvements for TCMWindTool 
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 7335a2336e [formerly 7aa8b2d3eb] [formerly 7335a2336e [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: e5b9e0ca46 [formerly 364d6fd9ee]
Former-commit-id: 153a7dbd7d
 2013-03-14 13:26:08 -05:00
Greg Armendariz
cfc53af85e Removed merge code from the source code 
Former-commit-id: 2bb407ea8b [formerly 5511f0b3a6] [formerly 2bb407ea8b [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: b79ecc28e3 [formerly 3a3486b0b7]
Former-commit-id: 8ea2042456
 2013-03-14 11:15:08 -05:00