Commit graph

5770 commits

Author SHA1 Message Date
Juliya Dynina
3221cafbd0 Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 92202928c9 [formerly d6a796c476 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]
Former-commit-id: d6a796c476
Former-commit-id: 2f3f953823
2014-05-07 14:18:01 -05:00
Ben Steffensmeier
4ae6884a41 Issue #3119 Optimize plot rendering.
Former-commit-id: 7274d01d64 [formerly d7cb05fd92 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]
Former-commit-id: d7cb05fd92
Former-commit-id: a19a5bf986
2014-05-07 13:27:48 -05:00
Brian.Dyke
dd9f977f4f Merged 13.5.5 -4 into 1412
Former-commit-id: 30bbd2d1cd [formerly f27d1b1efe [formerly 5644361dffaae25c63748a52c23506907210c741]]
Former-commit-id: f27d1b1efe
Former-commit-id: 5a6425b6b0
2014-05-07 13:07:15 -04:00
Nate Jensen
a66c157399 Issue #2060 log successful sat precip file creation
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1

Former-commit-id: 170106ad44 [formerly f06c77f5ad [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]
Former-commit-id: f06c77f5ad
Former-commit-id: 3c1f9693f2
2014-05-07 09:44:20 -05:00
Steve Harris
bffbcf61b8 Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]
Former-commit-id: c3509757f0
Former-commit-id: a7211a72f0
2014-05-07 08:45:41 -05:00
Nate Jensen
7193103faf Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 69b6c9426f [formerly ddb3610e24 [formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]
Former-commit-id: ddb3610e24
Former-commit-id: be75956418
2014-05-06 17:29:45 -05:00
Nate Jensen
e93e248f9a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]
Former-commit-id: d271dfb1a5
Former-commit-id: daac0701fc
2014-05-06 17:09:56 -05:00
Nate Jensen
3aa9bfdca1 Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]
Former-commit-id: 5191b61b30
Former-commit-id: 49d34cc4e4
2014-05-06 17:08:04 -05:00
Ben Steffensmeier
34c4ce1630 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]
Former-commit-id: bbbf957ba8
Former-commit-id: e70a6999b7
2014-05-06 16:19:58 -05:00
Nate Jensen
0b046a18e1 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 8f8ea5d014 [formerly a583493711 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]
Former-commit-id: a583493711
Former-commit-id: 26f47e3b00
2014-05-06 16:15:41 -05:00
Ron Anderson
5c0b04b00f Issue #3129 Change smartInit back to 1 thread on 64-bit
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038

Former-commit-id: 32c95e50a7 [formerly b43e6d64c3 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]
Former-commit-id: b43e6d64c3
Former-commit-id: 6c5f1a9ed3
2014-05-06 16:01:31 -05:00
Richard Peter
2044b64206 Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]
Former-commit-id: 03ab7599de
Former-commit-id: 884562700a
2014-05-06 15:54:23 -05:00
Ron Anderson
32a23a5d03 Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603

Former-commit-id: ba0c26edf6 [formerly b4815af7f8 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]
Former-commit-id: b4815af7f8
Former-commit-id: 93320d43c9
2014-05-06 15:09:25 -05:00
Nate Jensen
37b72c933b Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]
Former-commit-id: ff6c77420c
Former-commit-id: 7701820902
2014-05-06 13:10:48 -05:00
Nate Jensen
8b2c2d4be5 Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]
Former-commit-id: 0e3876de34
Former-commit-id: d83fad0054
2014-05-06 13:09:12 -05:00
Nate Jensen
1d38804eb2 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]
Former-commit-id: 71b4227061
Former-commit-id: 3719c41d2b
2014-05-06 12:26:21 -05:00
Brian.Dyke
341e5c86c6 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: e3b0b44b71 [formerly 238e8f7ba1 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]
Former-commit-id: 238e8f7ba1
Former-commit-id: 5461f75e41
2014-05-06 11:34:46 -04:00
Richard Peter
1a2d875bd0 Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823

Former-commit-id: b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]
Former-commit-id: 501980904d
Former-commit-id: 2668f09447
2014-05-06 10:32:31 -05:00
Brian.Dyke
c6f84d017a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 04b8da6f73 [formerly 90fecdc71e [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]
Former-commit-id: 90fecdc71e
Former-commit-id: 0253aa5d7f
2014-05-06 11:25:15 -04:00
Chip Gobs
a95de2211a 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: e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]
Former-commit-id: 65d2135ac2
Former-commit-id: 4e4d00792d
2014-05-06 10:48:35 -04:00
Richard Peter
f76ed476c8 Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]
Former-commit-id: b148d11ec9
Former-commit-id: 8ae9cfba55
2014-05-06 09:46:41 -05:00
Brian Clements
02c921ed12 Issue #3076 added clear all to shared display sessions
Former-commit-id: 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]
Former-commit-id: f545c548cc
Former-commit-id: 729e717be1
2014-05-06 09:30:07 -05:00
Lee Venable
a57f0e338d Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]
Former-commit-id: a6c2260dd1
Former-commit-id: 550668cbf7
2014-05-05 16:13:31 -05:00
Melissa Porricel
1adfd7ea51 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 92231e051d [formerly 42c36a5e80 [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]
Former-commit-id: 42c36a5e80
Former-commit-id: a91a4ed137
2014-05-05 14:56:58 -04:00
Sathya.Sankarasubbu
faa48d1691 ASM #560 - LDM 6.11.5 GRIB library causing crash
Modified Release number in component.spce from 10 to 11

Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966

Former-commit-id: 1246776d3e [formerly edd543c48d [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]
Former-commit-id: edd543c48d
Former-commit-id: 23102eaa8f
2014-05-05 14:33:20 -04:00
Nate Jensen
f76ace3c9b Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]
Former-commit-id: 0cf0f724f4
Former-commit-id: 2b6c30e67d
2014-05-05 13:06:08 -05:00
Dave Hladky
7d244313a5 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: ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]
Former-commit-id: 333bf8b36d
Former-commit-id: 0ac4de6ad0
2014-05-05 12:15:14 -05:00
Qinglu.Lin
d3220c8e71 ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]
Former-commit-id: 18e92f03c1
Former-commit-id: 5f0e0bda69
2014-05-05 11:54:56 -04:00
Nate Jensen
a2607513bf Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]
Former-commit-id: e9b3041170
Former-commit-id: f233d104d7
2014-05-05 09:45:11 -05:00
Steve Harris
010301045d 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: 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 6ef3b9f1e5
Former-commit-id: 9e149df799
2014-05-05 08:21:02 -05:00
Xuezhi.Wei
338d479d1e ASM #579 Shef Ingest ProcessUtil configuration update
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150

Former-commit-id: e3b1ee759d [formerly fb359316c8 [formerly ddda775e85dd8cba5f4342de330d1446647c621c]]
Former-commit-id: fb359316c8
Former-commit-id: b017e1c390
2014-05-02 19:48:55 +00:00
Juliya Dynina
f0dca1136d Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: 9da4eaaad5 [formerly cf742e4dc0 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]
Former-commit-id: cf742e4dc0
Former-commit-id: 1d2297e489
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
ab05520404 ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: 071a1ae06a [formerly c4fc2f169b [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]
Former-commit-id: c4fc2f169b
Former-commit-id: a647b1ddf3
2014-05-02 16:55:36 +00:00
Shawn.Hooper
14d7d0d9c1 ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72

Former-commit-id: d80a278cb7 [formerly 76d4a7ac73 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]
Former-commit-id: 76d4a7ac73
Former-commit-id: faa9f20f84
2014-05-02 12:48:18 -04:00
steve.naples
b98b7f41b1 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: 8a00348730 [formerly b58b7d3d5a [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]
Former-commit-id: b58b7d3d5a
Former-commit-id: a7092ac01d
2014-05-02 16:15:04 +00:00
Richard Peter
98fa705dd0 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]
Former-commit-id: dc0b598fd4
Former-commit-id: f38816d168
2014-05-02 10:05:59 -05:00
Richard Peter
39467f210d Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]
Former-commit-id: 51ba60d62b
Former-commit-id: 6bb353a05d
2014-05-02 10:05:29 -05:00
Richard Peter
aeebf17373 Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]
Former-commit-id: 478cedd3a3
Former-commit-id: 4e1bc16d70
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
80104eaf42 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]
Former-commit-id: 6bdaba048c
Former-commit-id: 956f62a6ec
2014-05-01 18:02:08 -05:00
Richard Peter
36d579c206 Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

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

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

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

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

Former-commit-id: a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]
Former-commit-id: 4056f53fa2
Former-commit-id: 25fd0e03f4
2014-05-01 14:47:41 -05:00
brian.dyke
736a317b34 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: d5c3f112c1 [formerly 5d7b8eca6a [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]
Former-commit-id: 5d7b8eca6a
Former-commit-id: 2a934def82
2014-05-01 15:20:36 -04:00
Ben Steffensmeier
e712f37076 Issue #3100 Time match mosaics on data update.
Former-commit-id: 897f67301c [formerly d98bdd64d8 [formerly 3655558c91224a57a31cfb25389cee33258e0227]]
Former-commit-id: d98bdd64d8
Former-commit-id: ae1af14ccd
2014-05-01 14:17:33 -05:00
Qinglu.Lin
deb29531b6 ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c

Former-commit-id: 13c81f9468 [formerly e489658072 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]
Former-commit-id: e489658072
Former-commit-id: b51bdd9107
2014-05-01 14:49:27 -04:00
Steve Harris
d2905e51d4 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]
Former-commit-id: c8ba70a146
Former-commit-id: 9ecd871825
2014-05-01 13:25:15 -05:00
Nate Jensen
dba33e281e Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]
Former-commit-id: b7536a398b
Former-commit-id: ba9ed2aba3
2014-05-01 12:40:41 -05:00