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

3354 commits

Author SHA1 Message Date
Steve Harris
77030c2fc3 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways. 
Former-commit-id: a804a071c0 [formerly ce2b030743] [formerly a804a071c0 [formerly ce2b030743] [formerly ff4a6b8122 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce [formerly 988ad59a0d]
Former-commit-id: 47991060bb
 2014-05-08 09:50:34 -05:00
Michael Gamazaychikov
b9d57aa0b4 ASM #526 - Duration menu disabled after creating text for a COR SVS. 
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf

Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
 2014-05-08 14:02:21 +01:00
Steve Harris
2b29fec8d6 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: ddd6e35478 [formerly e37e40ed19] [formerly ddd6e35478 [formerly e37e40ed19] [formerly b7a1bda98c [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2 [formerly 9591532ffd]
Former-commit-id: 049716e54d
 2014-05-07 16:01:53 -05:00
Juliya Dynina
547c86f36f Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1 
Former-commit-id: 2f3f953823 [formerly d6a796c476] [formerly 2f3f953823 [formerly d6a796c476] [formerly 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]
Former-commit-id: 92202928c9
Former-commit-id: 87433219cc [formerly 3be2acf831]
Former-commit-id: 5e9af9b47d
 2014-05-07 14:18:01 -05:00
Ben Steffensmeier
0d52351d27 Issue #3119 Optimize plot rendering. 
Former-commit-id: a19a5bf986 [formerly d7cb05fd92] [formerly a19a5bf986 [formerly d7cb05fd92] [formerly 7274d01d64 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]
Former-commit-id: 7274d01d64
Former-commit-id: bd08996223 [formerly 9701f68f40]
Former-commit-id: 9274027a7a
 2014-05-07 13:27:48 -05:00
Brian.Dyke
0daec2c83b Merged 13.5.5 -4 into 1412 
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe] [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 4155179c42 [formerly 8bf824a625]
Former-commit-id: e0cd200cee
 2014-05-07 13:07:15 -04:00
Nate Jensen
76750c319a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1 
Former-commit-id: daac0701fc [formerly d271dfb1a5] [formerly daac0701fc [formerly d271dfb1a5] [formerly 0f1cab916a [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 89621db281 [formerly 70f70371b1]
Former-commit-id: 12f88d14bf
 2014-05-06 17:09:56 -05:00
Ben Steffensmeier
b978e0fc1d Issue #3117 update satellite inventory for new sectors or elements. 
Former-commit-id: e70a6999b7 [formerly bbbf957ba8] [formerly e70a6999b7 [formerly bbbf957ba8] [formerly 70df0ee87e [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]
Former-commit-id: 70df0ee87e
Former-commit-id: 81916ecdb6 [formerly 945fe1db2f]
Former-commit-id: a39b05ac71
 2014-05-06 16:19:58 -05:00
Nate Jensen
3aa1481c98 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1 
Former-commit-id: 26f47e3b00 [formerly a583493711] [formerly 26f47e3b00 [formerly a583493711] [formerly 8f8ea5d014 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: 4f3570324a [formerly f1c48f10b1]
Former-commit-id: a20245a64d
 2014-05-06 16:15:41 -05:00
Nate Jensen
ad7a69f2e3 Issue #2060 fill in units on GridRecords created from URIs 
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
 2014-05-06 12:26:21 -05:00
Brian.Dyke
4f425f71e6 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1] [formerly 5461f75e41 [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91]
Former-commit-id: fe9aeb1961
 2014-05-06 11:34:46 -04:00
Brian.Dyke
9d60a1030a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1 
Former-commit-id: 0253aa5d7f [formerly 90fecdc71e] [formerly 0253aa5d7f [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 695bf96cef [formerly 884a1d2f2b]
Former-commit-id: 8f6a58d5c5
 2014-05-06 11:25:15 -04:00
Chip Gobs
47068a7939 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) 
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 4e4d00792d [formerly 65d2135ac2] [formerly 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e [formerly 593b36d722]
Former-commit-id: 1b7f762617
 2014-05-06 10:48:35 -04:00
Brian Clements
89f3a0a1d2 Issue #3076 added clear all to shared display sessions 
Former-commit-id: 729e717be1 [formerly f545c548cc] [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154 [formerly 5583c3903b]
Former-commit-id: 3a60b0db05
 2014-05-06 09:30:07 -05:00
Nate Jensen
c32e1bb9fe Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1 
Former-commit-id: db4fc0c4d2 [formerly 7d11e31b06] [formerly db4fc0c4d2 [formerly 7d11e31b06] [formerly 596b5268d0 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]
Former-commit-id: 596b5268d0
Former-commit-id: bff03681a4 [formerly bad26fdd7d]
Former-commit-id: 7e521c3e0b
 2014-05-05 16:58:44 -05:00
Lee Venable
46eb74e982 Issue #3109 - removed code that sets the Cave cursor. 
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: 550668cbf7 [formerly a6c2260dd1] [formerly 550668cbf7 [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a092fd45dc [formerly 631a8d3cb1]
Former-commit-id: f48d571cb6
 2014-05-05 16:13:31 -05:00
Steve Harris
b8b5300a9b Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (updated in ufcore):
	cave/com.raytheon.uf.viz.application.feature/feature.xml
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
	edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java


Former-commit-id: a8d3f4d885 [formerly 73ed3251bd] [formerly a8d3f4d885 [formerly 73ed3251bd] [formerly 83368e4b4e [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: ea24d1dadc [formerly caadbd3dd9]
Former-commit-id: 8cd5ed7a8e
 2014-05-05 16:04:09 -05:00
Brian Clements
9c7f4cd887 Omaha #3061 only shared display capable clients get payload in invite 
Former-commit-id: dec5159216 [formerly 1502354f87] [formerly dec5159216 [formerly 1502354f87] [formerly c61e30a422 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 9d25e9dcb8 [formerly 58f45fa7d0]
Former-commit-id: 1e3d29a3f3
 2014-05-05 15:29:06 -05:00
Melissa Porricel
9b7d84bfc4 ASM #481 - Add Guam GFSDNG to AWIPS 
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
 2014-05-05 14:56:58 -04:00
Dave Hladky
7e763a5a22 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
 2014-05-05 12:15:14 -05:00
Qinglu.Lin
03f7862321 ASM #514 - Line of Storms functionality behaving oddly in WarnGen 
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
 2014-05-05 11:54:56 -04:00
Nate Jensen
3eaaf56f8e Merge "Issue #2956 more safety checks" into omaha_14.3.1 
Former-commit-id: f233d104d7 [formerly e9b3041170] [formerly f233d104d7 [formerly e9b3041170] [formerly d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434 [formerly 8ee8937daf]
Former-commit-id: e8b7cec960
 2014-05-05 09:45:11 -05:00
Steve Harris
4fe84ba0fd Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22) 
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
 2014-05-05 08:21:02 -05:00
Juliya Dynina
35bbea77af Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1 
Former-commit-id: 1d2297e489 [formerly cf742e4dc0] [formerly 1d2297e489 [formerly cf742e4dc0] [formerly 9da4eaaad5 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]]
Former-commit-id: 9da4eaaad5
Former-commit-id: 2611615ee3 [formerly a9556d4d2e]
Former-commit-id: a7e8e4a9c4
 2014-05-02 12:37:00 -05:00
Xuezhi.Wei
2bc8a6c5fd ASM #545 Hydrobase IngestFilter GUI fixes 
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a647b1ddf3 [formerly c4fc2f169b] [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]
Former-commit-id: 071a1ae06a
Former-commit-id: f31f39a875 [formerly 1ce32e2be1]
Former-commit-id: 57a6bcfca6
 2014-05-02 16:55:36 +00:00
steve.naples
18c51dac23 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value. 
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: a7092ac01d [formerly b58b7d3d5a] [formerly a7092ac01d [formerly b58b7d3d5a] [formerly 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e [formerly d079dbcb7c]
Former-commit-id: 39437970c7
 2014-05-02 16:15:04 +00:00
Richard Peter
7481634fdb Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1 
Former-commit-id: 4e1bc16d70 [formerly 478cedd3a3] [formerly 4e1bc16d70 [formerly 478cedd3a3] [formerly d4a138c534 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]
Former-commit-id: d4a138c534
Former-commit-id: 160ce06137 [formerly 1b7dd13525]
Former-commit-id: 67eb0867ea
 2014-05-02 09:50:40 -05:00
Richard Peter
338b2c53d0 Issue #2854: Pack commons.lang for alertviz 
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 1738b065b8 [formerly a9b088146c] [formerly 1738b065b8 [formerly a9b088146c] [formerly bcd87195ee [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]
Former-commit-id: bcd87195ee
Former-commit-id: 926cd5f6d1 [formerly e1a2767f8f]
Former-commit-id: df422d1516
 2014-05-01 16:30:21 -05:00
Nate Jensen
42a27546f9 Issue #2956 more safety checks 
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: d759efcaa8 [formerly f4d20c41f4] [formerly d759efcaa8 [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 6f211aa9f8 [formerly f3b68178bd]
Former-commit-id: 3f9a33bf35
 2014-05-01 16:28:16 -05:00
Nate Jensen
562a70b8fb Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change 
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 3222914fde [formerly 137818d03a] [formerly 3222914fde [formerly 137818d03a] [formerly a73a310709 [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]
Former-commit-id: a73a310709
Former-commit-id: b245e49d53 [formerly 84dbedcff5]
Former-commit-id: c7ddb6d476
 2014-05-01 16:20:35 -05:00
David Gillingham
da652d1c4a Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization. 
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf

Former-commit-id: 850eecb1b9 [formerly aa78ed1b69] [formerly 850eecb1b9 [formerly aa78ed1b69] [formerly f368412ef2 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]
Former-commit-id: f368412ef2
Former-commit-id: 3c4ee53300 [formerly b3a859fe39]
Former-commit-id: 64bd4b81dc
 2014-05-01 16:19:51 -05:00
Matthew Howard
f99bcfc97f Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1 
Former-commit-id: 3b48dcc680 [formerly 55b1198186] [formerly 3b48dcc680 [formerly 55b1198186] [formerly 9e7a0e0a61 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]]]
Former-commit-id: 9e7a0e0a61
Former-commit-id: fce48ae3fd [formerly 571a45c6ea]
Former-commit-id: 4f5e129201
 2014-05-01 16:07:11 -05:00
Richard Peter
b8bdced87a Issue #2854: Fix features. 
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 25fd0e03f4 [formerly 4056f53fa2] [formerly 25fd0e03f4 [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]
Former-commit-id: a4fb460e17
Former-commit-id: f364f02f58 [formerly c3c7ebb146]
Former-commit-id: 472077fbd5
 2014-05-01 14:47:41 -05:00
brian.dyke
22ffaef982 Merge branch 'master_14.3.1-3' into asm_14.3.1 
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a] [formerly 2a934def82 [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1]
Former-commit-id: b72e2d4289
 2014-05-01 15:20:36 -04:00
Ben Steffensmeier
887c707fa5 Issue #3100 Time match mosaics on data update. 
Former-commit-id: ae1af14ccd [formerly d98bdd64d8] [formerly ae1af14ccd [formerly d98bdd64d8] [formerly 897f67301c [formerly 3655558c91224a57a31cfb25389cee33258e0227]]]
Former-commit-id: 897f67301c
Former-commit-id: c7343cad6b [formerly f4f158f228]
Former-commit-id: cfc21e1717
 2014-05-01 14:17:33 -05:00
Qinglu.Lin
f8c13f1d3b ASM #123 Zone UGC line not locked 
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c

Former-commit-id: b51bdd9107 [formerly e489658072] [formerly b51bdd9107 [formerly e489658072] [formerly 13c81f9468 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]
Former-commit-id: 13c81f9468
Former-commit-id: 895a652b4c [formerly caf57dbabe]
Former-commit-id: 1bdf714eba
 2014-05-01 14:49:27 -04:00
Steve Harris
523cf536e2 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1 
Former-commit-id: 9ecd871825 [formerly c8ba70a146] [formerly 9ecd871825 [formerly c8ba70a146] [formerly 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a6ab8c52f [formerly bdf6d0b6be]
Former-commit-id: d7c31fe4a9
 2014-05-01 13:25:15 -05:00
Brian Clements
36b2419ff1 Issue #2903 changed commons.lang to match other unpacking foss 
Former-commit-id: 93912625ea [formerly 3ca4f8cc52] [formerly 93912625ea [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: 3fd504f1de [formerly 2337d5ef56]
Former-commit-id: c7cea4b5f7
 2014-05-01 12:34:09 -05:00
Gang.Zhang
d4b87f3bad ASM #507 - Fix incorrect FFMP gap calculation 
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 090ed29386 [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]]]
Former-commit-id: 090ed29386
Former-commit-id: 3131e25e69 [formerly 7c7adbd77d]
Former-commit-id: 2b25e8c401
 2014-05-01 15:49:48 +01:00
Brian Clements
4c1a6b44c8 Issue #2903 set commons.lang to unpack in feature to fix odd bug 
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: fee0a858cb [formerly 873efa1c64] [formerly fee0a858cb [formerly 873efa1c64] [formerly f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: 20830253ba [formerly c187523782]
Former-commit-id: c3d2b4be86
 2014-04-30 17:52:43 -05:00
Richard Peter
cfb980db11 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1 
Former-commit-id: d28c4fdbae [formerly de9eb60629] [formerly d28c4fdbae [formerly de9eb60629] [formerly 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: d961ff6edc [formerly 6ecb5018b6]
Former-commit-id: dd54408a10
 2014-04-30 17:43:50 -05:00
Dave Hladky
a06db5a4e7 Issue #2992 Updated DD list of active registries 
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
 2014-04-30 17:38:28 -05:00
Juliya Dynina
bac2c83f58 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1 
Former-commit-id: 308e775017 [formerly d804167bb2] [formerly 308e775017 [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: cc93e11ce8 [formerly 6282dd45cb]
Former-commit-id: 80e6ae71d0
 2014-04-30 14:53:36 -05:00
Richard Peter
fe5fe5b587 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA 
Former-commit-id: 37a5292083 [formerly f80e16d0c9] [formerly 37a5292083 [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: f2d07ce35c [formerly 8ddc4eaffd]
Former-commit-id: 5d18fbe5d3
 2014-04-30 14:49:24 -05:00
Steve Harris
ae6eed5e0a Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core 
Former-commit-id: 31f17bbb51 [formerly b7272b3248] [formerly 31f17bbb51 [formerly b7272b3248] [formerly 1eb121595d [formerly 839a926dca01566419409138e9810f14e0e46b84]]]
Former-commit-id: 1eb121595d
Former-commit-id: a659f2bf1d [formerly 88a7777e79]
Former-commit-id: 2eed016efd
 2014-04-30 13:59:33 -05:00
Nate Jensen
eb5dd811ca Issue #2060 fix FFG processing 
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2d19ee46e5 [formerly 8cbea21f32] [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 9a2c674142 [formerly a33ca4e3ac]
Former-commit-id: 58618a1842
 2014-04-30 13:08:26 -05:00
Ron Anderson
6fe1a0d1b7 Issue #3097 Fix return type for SmartScript.getGrids() 
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: fcfd6e4c00 [formerly 374e8224f1] [formerly fcfd6e4c00 [formerly 374e8224f1] [formerly 613aa1e94a [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 9bcd5d3f4a [formerly 8ba17da4df]
Former-commit-id: 453065268c
 2014-04-30 17:26:57 +00:00
Brian.Dyke
f16c305ae4 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2) 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
 2014-04-30 12:57:09 -04:00
Steve Harris
d214c3174d Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (these moved to ufcore):
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
	edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
	edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.auth/build.properties
	edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
	edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
	edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
	edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java


Former-commit-id: 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 6ad5b5a9d7 [formerly f168d3dddb]
Former-commit-id: 98b93e364e
 2014-04-30 11:22:22 -05:00
Juliya Dynina
18c84c47bc Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1 
Former-commit-id: 00bbbf32c1 [formerly d37490acb1] [formerly 00bbbf32c1 [formerly d37490acb1] [formerly 78bb549533 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac [formerly d5290b8bbf]
Former-commit-id: a4073b805e
 2014-04-30 07:41:27 -05:00