Brian.Dyke
|
9426ddb9a9
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 8c2cccb930 [formerly e5f951bf89 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]
Former-commit-id: e5f951bf89
Former-commit-id: 88a5ecefaa
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
c9ef80beeb
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: abf0f995cd [formerly 545e7f6ce9 [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]
Former-commit-id: 545e7f6ce9
Former-commit-id: 8435ace4f8
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
99e1c53457
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: dcd238c6a3 [formerly 3183283e99 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]
Former-commit-id: 3183283e99
Former-commit-id: c2afc26206
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
f9a40a24e3
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]
Former-commit-id: b066572041
Former-commit-id: 2de7de6378
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
ac7b375d91
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]
Former-commit-id: 81a1affe22
Former-commit-id: 08f69fd3a1
|
2014-05-15 14:16:38 -04:00 |
|
Dave Hladky
|
0e73a4d2a8
|
Issue #3168 Move DD retrieval distibution to correct feature/RPM
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: 783cd9e308 [formerly c72be97b9b [formerly d94e7f139573caa508b260902870c9f745080bb8]]
Former-commit-id: c72be97b9b
Former-commit-id: 3b544c74b6
|
2014-05-14 16:13:57 -05:00 |
|
Dave Hladky
|
6a80ab5dfb
|
Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id: 15366714ed [formerly ca644b93ee [formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]]
Former-commit-id: ca644b93ee
Former-commit-id: 40c24180cf
|
2014-05-14 11:12:55 -05:00 |
|
Steve Harris
|
2441e29987
|
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
Former-commit-id: 70b95c7636 [formerly c2efe26c11 [formerly 2627e4d38b3dcee82dcf7a6032d692170d50d9ad]]
Former-commit-id: c2efe26c11
Former-commit-id: 462609aa3f
|
2014-05-13 15:23:57 -05:00 |
|
Brian.Dyke
|
e705786d12
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]
Former-commit-id: e95bc87a19
Former-commit-id: 5a2e0c7e1b
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
343444715e
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: cf62cf4a6e
Former-commit-id: 848519177d
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
82ce970ad6
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 386ec058e1
Former-commit-id: 3aa2f7974b
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
b2d89eae80
|
Issue #2289 Fix TempOfTe at small pressure values.
Former-commit-id: 102d560686 [formerly 2754326906 [formerly a114bf15018ab86ec1511c13704fd6e1e3feed99]]
Former-commit-id: 2754326906
Former-commit-id: d051416c76
|
2014-05-12 10:11:34 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
brian.dyke
|
71623932e4
|
Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: f3972ce929 [formerly d56fab37e7 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]]
Former-commit-id: d56fab37e7
Former-commit-id: 3bf22884a4
|
2014-04-30 14:21:11 -04:00 |
|
Ben Steffensmeier
|
1718bc0c82
|
Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 9985f518b1 [formerly 25e4eee58a [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]]
Former-commit-id: 25e4eee58a
Former-commit-id: 3601d1ff98
|
2014-04-28 16:26:04 -05:00 |
|
brian.dyke
|
7194790129
|
Merge branch 'master_14.2.1' into asm_14.2.1
Merge (master_14.2.1-21) into asm_14.2.1
Former-commit-id: cbe7b3ec72 [formerly 6cc1c166f9 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]
Former-commit-id: 6cc1c166f9
Former-commit-id: ddfc734c26
|
2014-04-28 14:06:15 -04:00 |
|
Shawn.Hooper
|
1c57e8aff3
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 79db962a88 [formerly 09204a381c [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]
Former-commit-id: 09204a381c
Former-commit-id: 8ffe88d856
|
2014-04-25 10:19:48 -04:00 |
|
Steve Harris
|
3c02cbbcc9
|
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 18e79fe08d [formerly 4f9620bb04 [formerly 749922901de5a57c7344f29def844a5ecf90304a]]
Former-commit-id: 4f9620bb04
Former-commit-id: 066515b7c5
|
2014-04-25 09:09:38 -05:00 |
|
Brian.Dyke
|
ba9db6701e
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ac74878ae2 [formerly a61af3e6d3 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]
Former-commit-id: a61af3e6d3
Former-commit-id: a5c9321a8d
|
2014-04-24 13:28:31 -04:00 |
|
Brian.Dyke
|
81d39113fe
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]
Former-commit-id: a19f01c620
Former-commit-id: eff27f5504
|
2014-04-24 13:01:50 -04:00 |
|
Ron Anderson
|
6d77ebe181
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]
Former-commit-id: b12a6cd828
Former-commit-id: db978fff9a
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
f32bb4e4f4
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]
Former-commit-id: e1d5aa284d
Former-commit-id: f16936223a
|
2014-04-22 14:31:14 -04:00 |
|
Dave Hladky
|
7295635379
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]
Former-commit-id: 61fc2fea51
Former-commit-id: 91bd735d47
|
2014-04-21 12:26:47 -05:00 |
|
Richard Peter
|
b15fd4c2f5
|
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: 1e33125cb7 [formerly 9dc957f1a1 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]
Former-commit-id: 9dc957f1a1
Former-commit-id: dc41da4a65
|
2014-04-18 15:15:13 -05:00 |
|
Benjamin Phillippe
|
f4169e4e0c
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b86fae838f [formerly b2686e46cf [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]
Former-commit-id: b2686e46cf
Former-commit-id: b0d162ccba
|
2014-04-18 15:10:46 -05:00 |
|
Brian.Dyke
|
2d8d035b26
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9943a331c3 [formerly 880329e4ae [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]
Former-commit-id: 880329e4ae
Former-commit-id: 3b90abdf7a
|
2014-04-18 07:53:10 -04:00 |
|
Brian.Dyke
|
9075808d0a
|
Merged 13.5.5-1 into 1412
Former-commit-id: 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]
Former-commit-id: 188d84cc87
Former-commit-id: 65ad515a6e
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
52e4a94bb3
|
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]
Former-commit-id: d121f07e76
Former-commit-id: 9ebedf0b98
|
2014-04-16 08:41:54 -05:00 |
|
Ron Anderson
|
d2b4d70702
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]
Former-commit-id: 6e0147169f
Former-commit-id: 2a68e875a5
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
2c5ef01980
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]
Former-commit-id: ecbe6fd2d7
Former-commit-id: 49ca556b33
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
9ff3077435
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]
Former-commit-id: eb2f2865fe
Former-commit-id: 9132d9004e
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
575caa6238
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]
Former-commit-id: 3db751fc5b
Former-commit-id: 490413551b
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
33274850e3
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]
Former-commit-id: fb1c399d4d
Former-commit-id: 5fc07cafc8
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
a153f7218e
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]
Former-commit-id: 0b499061da
Former-commit-id: f5877f5fb0
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
8e54cb2958
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]
Former-commit-id: 009c6e067a
Former-commit-id: 48ee7712c7
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
b6e4e23394
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]
Former-commit-id: 8c2f601b59
Former-commit-id: 73be1016c0
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
efd1003a50
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
7de936dfba
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]
Former-commit-id: 947194c998
Former-commit-id: e4136f79dd
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
2eec862ebb
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
|
2014-04-04 12:57:32 -04:00 |
|
Richard Peter
|
9536a08425
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]
Former-commit-id: 53d5000261
Former-commit-id: bfba75f73f
|
2014-04-01 14:44:05 -05:00 |
|
David Gillingham
|
d14aee89aa
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]
Former-commit-id: a529bc8cad
Former-commit-id: 402adfeddb
|
2014-03-31 15:49:33 -05:00 |
|
Brian.Dyke
|
7ca114f7f1
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]
Former-commit-id: 6346c9776b
Former-commit-id: a1b980a15d
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
e621e81f20
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]
Former-commit-id: 4879520391
Former-commit-id: 9cf3600ff6
|
2014-03-26 15:51:32 -05:00 |
|
Richard Peter
|
d4c67a0f8c
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]
Former-commit-id: 390e73af44
Former-commit-id: 6236137635
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
912c7e2d12
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]
Former-commit-id: 3ac04dd071
Former-commit-id: 39343e1801
|
2014-03-24 08:27:12 -05:00 |
|