Steve Harris
|
5e27d226f3
|
Merge branch 'master_14.2.2' (14.2.2-7) into omaha_14.2.2
Former-commit-id: 99442a6cee [formerly 030c3c1eb6] [formerly e6a7566eed] [formerly 99442a6cee [formerly 030c3c1eb6] [formerly e6a7566eed] [formerly c4bb2efdf4 [formerly e6a7566eed [formerly a0cde99cddfb1f1f397814ec045c8e5503210867]]]]
Former-commit-id: c4bb2efdf4
Former-commit-id: 2d3a02c6b1 [formerly 1d6c845c2f] [formerly ac2383e3251c752f4c91f55dbd722226a88f2e54 [formerly dfb7523f58]]
Former-commit-id: 1d19c1980eb22db617eefc966031d4138ff920c6 [formerly 31d9d18095]
Former-commit-id: ac53c1fed7
|
2014-05-05 09:11:58 -05:00 |
|
Steve Harris
|
55644af2ca
|
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: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
Shawn.Hooper
|
dce9554e76
|
ASM #131 - Additional fix for Lightning Data Decoder
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: 14d7d0d9c1 [formerly faa9f20f84] [formerly 76d4a7ac73] [formerly 14d7d0d9c1 [formerly faa9f20f84] [formerly 76d4a7ac73] [formerly d80a278cb7 [formerly 76d4a7ac73 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]]]
Former-commit-id: d80a278cb7
Former-commit-id: d7c9d002e4 [formerly 98631b46c8] [formerly 9b67c4e1a530eaeddd1ca8d655f855d1549c9c7e [formerly b5b0c01eb9]]
Former-commit-id: 5e08bac98d9b5a0a45521af2960f267e5996aae2 [formerly a58a5e95da]
Former-commit-id: 66e0a8cb74
|
2014-05-02 12:48:18 -04:00 |
|
David Gillingham
|
0de3daedfb
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f368412ef2 [formerly aa78ed1b69 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]]
Former-commit-id: f368412ef2
Former-commit-id: 2f1d7aeecd [formerly 3c4ee53300] [formerly f5f983e70edc8e09841a2c25cb10ec9abc9bffb2 [formerly b3a859fe39]]
Former-commit-id: 50c20dae3ab7e945eaa90db92077559d66ce1ed0 [formerly 64bd4b81dc]
Former-commit-id: da652d1c4a
|
2014-05-01 16:19:51 -05:00 |
|
Ben Steffensmeier
|
2ccf1ad701
|
Issue #3100 Time match mosaics on data update.
Former-commit-id: e712f37076 [formerly ae1af14ccd] [formerly d98bdd64d8] [formerly e712f37076 [formerly ae1af14ccd] [formerly d98bdd64d8] [formerly 897f67301c [formerly d98bdd64d8 [formerly 3655558c91224a57a31cfb25389cee33258e0227]]]]
Former-commit-id: 897f67301c
Former-commit-id: c6ccfcb8d9 [formerly c7343cad6b] [formerly 81232ce60daba55d6cd98c3aa21f06a4b18435e1 [formerly f4f158f228]]
Former-commit-id: 7c15a67fe97be00253b004e54a15057a9e69cc36 [formerly cfc21e1717]
Former-commit-id: 887c707fa5
|
2014-05-01 14:17:33 -05:00 |
|
Qinglu.Lin
|
15a8bc45e2
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly 13c81f9468 [formerly e489658072 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]]
Former-commit-id: 13c81f9468
Former-commit-id: 4c45207ae2 [formerly 895a652b4c] [formerly 5ecbbfe3f8d1edb9f4ce416b7a69ea39fbcab9d6 [formerly caf57dbabe]]
Former-commit-id: 27c17eceadf15fc08fbb4e8aeb1d2ee2b1ce1da9 [formerly 1bdf714eba]
Former-commit-id: f8c13f1d3b
|
2014-05-01 14:49:27 -04:00 |
|
brian.dyke
|
7e6aedd72e
|
Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: 71623932e4 [formerly 3bf22884a4] [formerly d56fab37e7] [formerly 71623932e4 [formerly 3bf22884a4] [formerly d56fab37e7] [formerly f3972ce929 [formerly d56fab37e7 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]]]]
Former-commit-id: f3972ce929
Former-commit-id: cfc45842b6 [formerly f83a3cda77] [formerly 0f9804aa7b0b5d140aca824e148a59c361edc39f [formerly 5f6646adde]]
Former-commit-id: 07b83c550d0e3be8700c3977cbe1e07ed03b86ca [formerly 04ef888bac]
Former-commit-id: e6d1e495c4
|
2014-04-30 14:21:11 -04:00 |
|
Ron Anderson
|
70dacd1553
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 5954a74787 [formerly 9bcd5d3f4a] [formerly 6210770d82431a108e71b3e2243051996167dc6d [formerly 8ba17da4df]]
Former-commit-id: 52d4a5cb088bfe7fe78ec51c870946dd048722c1 [formerly 453065268c]
Former-commit-id: 6fe1a0d1b7
|
2014-04-30 17:26:57 +00:00 |
|
Steve Harris
|
0a72a8d9cc
|
Merge branch 'master_14.2.2' (14.2.2-6) into omaha_14.2.2
Former-commit-id: 123fccd1d9 [formerly e5d5882125] [formerly d5c1663224] [formerly 123fccd1d9 [formerly e5d5882125] [formerly d5c1663224] [formerly 29905d5489 [formerly d5c1663224 [formerly 260bc939e0bbb957cc7d95c71723f72211cde533]]]]
Former-commit-id: 29905d5489
Former-commit-id: 3ed45768c6 [formerly 7906f0fa24] [formerly 0a72f50499b96632da2a06d2764c1c9bf970d282 [formerly f74143c3b0]]
Former-commit-id: 252fdd641e9af5ca29dabb9d11c743ece983fd93 [formerly 5ec2f55d98]
Former-commit-id: 2b749fedcd
|
2014-04-29 16:03:25 -05:00 |
|
Brian.Dyke
|
2e187af9e4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
|
2014-04-29 12:07:21 -04:00 |
|
Richard Peter
|
7187b3ea56
|
Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
Former-commit-id: cd3b0e9e00 [formerly b6befe18a6] [formerly a80d2981ba] [formerly cd3b0e9e00 [formerly b6befe18a6] [formerly a80d2981ba] [formerly ffa75b13ce [formerly a80d2981ba [formerly f3e957f70651f4c50693ba5296b633659671cf63]]]]
Former-commit-id: ffa75b13ce
Former-commit-id: dae2ddb92f [formerly c9e9f6d512] [formerly f85137a27c6283a1dfb3fe358f8c54bcf737f6bc [formerly 3217c86d80]]
Former-commit-id: 4c28c302307af27cd0db1aa431794c6ab511f197 [formerly fe10abe4ea]
Former-commit-id: aebf46cda5
|
2014-04-28 16:40:58 -05:00 |
|
Ben Steffensmeier
|
3f81503255
|
Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 1718bc0c82 [formerly 3601d1ff98] [formerly 25e4eee58a] [formerly 1718bc0c82 [formerly 3601d1ff98] [formerly 25e4eee58a] [formerly 9985f518b1 [formerly 25e4eee58a [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]]]]
Former-commit-id: 9985f518b1
Former-commit-id: 6bc8bdda40 [formerly 67bc21c089] [formerly 0568a1afa5d24347149bb4d4c739c2aa6b8b4fbe [formerly bd966b1fa5]]
Former-commit-id: 9e973ad2f1ce3acc2e350a4fc4d7198bae48b2fb [formerly 416a504a05]
Former-commit-id: bd1978f79f
|
2014-04-28 16:26:04 -05:00 |
|
Steve Harris
|
45ffea735c
|
Merge branch 'master_14.2.1' (14.2.1-21) into omaha_14.2.1
Former-commit-id: de988c3872 [formerly d95f261446] [formerly ccd49b08f0] [formerly de988c3872 [formerly d95f261446] [formerly ccd49b08f0] [formerly 88269840b6 [formerly ccd49b08f0 [formerly 077a9b72ccb0072634c7c63e241ba50e965b7ed8]]]]
Former-commit-id: 88269840b6
Former-commit-id: 71624a5deb [formerly 915ba9f80c] [formerly c037d691c7fa3be63c9c3b19d84b4784cfd25d51 [formerly 45d80b8b07]]
Former-commit-id: cdebf926de0f1dd980c130e8990e7762f8d0fb96 [formerly e5b5765c65]
Former-commit-id: 9baca8a8a1
|
2014-04-28 15:26:43 -05:00 |
|
brian.dyke
|
e072c40536
|
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: 7194790129 [formerly ddfc734c26] [formerly 6cc1c166f9] [formerly 7194790129 [formerly ddfc734c26] [formerly 6cc1c166f9] [formerly cbe7b3ec72 [formerly 6cc1c166f9 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]]]
Former-commit-id: cbe7b3ec72
Former-commit-id: 9cdf23b9e6 [formerly 40615bd734] [formerly 40f4736cbb836af409e19682b10e140fd2b58eba [formerly 149058069f]]
Former-commit-id: 619db0a52042739daa9a586adda61d5396abea68 [formerly 3df3d28a8b]
Former-commit-id: 72895ea055
|
2014-04-28 14:06:15 -04:00 |
|
Shawn.Hooper
|
562ec700f3
|
Merge "ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml" into asm_14.2.1
Former-commit-id: 7a6c186baa [formerly 54ef1b1ca7] [formerly 4d6af11742] [formerly 7a6c186baa [formerly 54ef1b1ca7] [formerly 4d6af11742] [formerly 57a9e0d586 [formerly 4d6af11742 [formerly 9d7862fb7e7f4c3a16ba42b65e9111087dc0c8b3]]]]
Former-commit-id: 57a9e0d586
Former-commit-id: 46baf17194 [formerly 79b8c0aeb0] [formerly 37150e2f5c021e7f2a32e21a08ff58f350056efb [formerly 7b498a3be0]]
Former-commit-id: 77c08caadf0f2bd3902dedee5a9bf1343538caf6 [formerly e58796bc1f]
Former-commit-id: 490c371e5a
|
2014-04-28 09:37:28 -05:00 |
|
Steve Harris
|
18b8b0d443
|
Merge branch 'master_14.2.2' (14.2.2-5) into omaha_14.2.2
Former-commit-id: c9381cd74a [formerly 82afa73cc2] [formerly 0d474430cc] [formerly c9381cd74a [formerly 82afa73cc2] [formerly 0d474430cc] [formerly 5742ac326a [formerly 0d474430cc [formerly 6fad1517d1bc35108d09af988d7a94cdc3f0f822]]]]
Former-commit-id: 5742ac326a
Former-commit-id: b00ccf46e8 [formerly aba6a54946] [formerly 48e13bc3471dafe385da6665eb316213ed608f16 [formerly 937bd9d052]]
Former-commit-id: 124e5495e1d01e0616d24a62cf654436a3f67b1e [formerly d0897b9409]
Former-commit-id: 718e97e5a3
|
2014-04-25 12:12:10 -05:00 |
|
Shawn.Hooper
|
2490ae23eb
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]]
Former-commit-id: b4597dc021
Former-commit-id: a18261fed2 [formerly 1e4aeb5842] [formerly a33e6c43b4f06a881d7c8dd2482f3b36b99ffad5 [formerly eeaba5539f]]
Former-commit-id: b7ce6a6c977382c082a9531f683d1cb8e9dab4e7 [formerly 947b31eb6e]
Former-commit-id: b8a3b168d2
|
2014-04-25 10:40:43 -04:00 |
|
Shawn.Hooper
|
a24a7f27a6
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 1c57e8aff3 [formerly 8ffe88d856] [formerly 09204a381c] [formerly 1c57e8aff3 [formerly 8ffe88d856] [formerly 09204a381c] [formerly 79db962a88 [formerly 09204a381c [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]]]]
Former-commit-id: 79db962a88
Former-commit-id: 582b427887 [formerly 896fe0691e] [formerly 26e91355d924022c1555e2525aa609d82fe0c107 [formerly c49eee4928]]
Former-commit-id: 692bf78cd5c67201c51aa8c49e34553b60097895 [formerly ceb1c711ea]
Former-commit-id: bfee40353b
|
2014-04-25 10:19:48 -04:00 |
|
Steve Harris
|
d5532eb2eb
|
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 3c02cbbcc9 [formerly 066515b7c5] [formerly 4f9620bb04] [formerly 3c02cbbcc9 [formerly 066515b7c5] [formerly 4f9620bb04] [formerly 18e79fe08d [formerly 4f9620bb04 [formerly 749922901de5a57c7344f29def844a5ecf90304a]]]]
Former-commit-id: 18e79fe08d
Former-commit-id: 0d94a5d469 [formerly 0a58f699aa] [formerly 43c434781aa54d801c9a66d21c80318942d18b4a [formerly 22d24534e4]]
Former-commit-id: 9496ec1c134804eef1a19f65c628afde98148030 [formerly 26475d2081]
Former-commit-id: a8a16c5c27
|
2014-04-25 09:09:38 -05:00 |
|
Brian.Dyke
|
2d59b52ed1
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ac74878ae2 [formerly a61af3e6d3 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]]
Former-commit-id: ac74878ae2
Former-commit-id: 4c6965a7b7 [formerly ae4aea9abf] [formerly 5d8cf396e99529f083d1d1c43f5d3d81d3281d10 [formerly c21644c87f]]
Former-commit-id: 5524fa83a931031b720fb2e7782ca93e2b562dc8 [formerly b3a733036c]
Former-commit-id: d6e931dd87
|
2014-04-24 13:28:31 -04:00 |
|
Brian.Dyke
|
f2993215f3
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]]
Former-commit-id: e82fc8f89c
Former-commit-id: f1ebebbac1 [formerly af2d8f5bad] [formerly 57b2a8a44845dea3266c201818f90765ddf026ee [formerly df6f06bef5]]
Former-commit-id: 43839e21018da6e40c7fe75ced0db2714eff9e66 [formerly 0fa669acce]
Former-commit-id: 378332d8bb
|
2014-04-24 13:01:50 -04:00 |
|
Brian.Dyke
|
83dce492e5
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 05c0e1ad1c [formerly 953236aad8] [formerly cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]]
Former-commit-id: 76c73f256e229c073a4ca79c01bc6c9e1abe965a [formerly 26cb172a04]
Former-commit-id: 2161c569ea
|
2014-04-23 14:05:50 -04:00 |
|
Ron Anderson
|
860054697f
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]]
Former-commit-id: 859d709a03
Former-commit-id: a6c8d0ceb2 [formerly 57e277dc69] [formerly ffdd8311439ceb4450211a9ab4304f0740a99b18 [formerly e8a07a2ebe]]
Former-commit-id: 9462575e90ac1b1dd9fd8b65be06f381662f260a [formerly 51bb78561c]
Former-commit-id: 0c7c52095e
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
593de6544a
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]]
Former-commit-id: 0177756f97
Former-commit-id: 5d43f374e6 [formerly d6edd56d34] [formerly 9f33fbaadba8e0a9341c8ae8af0ac30d2dc2b193 [formerly 358e7b2b54]]
Former-commit-id: d70b4f5ba087dbb9db3d7fe268b68edcd8be7c2f [formerly 7d00166b10]
Former-commit-id: 914803ff7a
|
2014-04-22 14:31:14 -04:00 |
|
Dave Hladky
|
13137a0a9a
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
|
2014-04-21 12:26:47 -05:00 |
|
Richard Peter
|
035ae1718c
|
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: b15fd4c2f5 [formerly dc41da4a65] [formerly 9dc957f1a1] [formerly b15fd4c2f5 [formerly dc41da4a65] [formerly 9dc957f1a1] [formerly 1e33125cb7 [formerly 9dc957f1a1 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]]]
Former-commit-id: 1e33125cb7
Former-commit-id: 38a49e1def [formerly 5dd87d4b5d] [formerly 40c6a9799a15c274aacb422a4ee8ce45b2d57506 [formerly 4e71d9e099]]
Former-commit-id: 016a8930369d4f9afc64131669d99ff45c557af2 [formerly 68df58fb03]
Former-commit-id: 8768811fde
|
2014-04-18 15:15:13 -05:00 |
|
Benjamin Phillippe
|
50fd573a75
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: f4169e4e0c [formerly b0d162ccba] [formerly b2686e46cf] [formerly f4169e4e0c [formerly b0d162ccba] [formerly b2686e46cf] [formerly b86fae838f [formerly b2686e46cf [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]]
Former-commit-id: b86fae838f
Former-commit-id: d44b84bdbc [formerly 1d600c8559] [formerly 6f37719194fea49780dffc9b608b92540757b08a [formerly d8408a9b3f]]
Former-commit-id: d6efca7ac67e33e080e4754a0bc9c5180bf53e82 [formerly 201f25eab3]
Former-commit-id: 160f48406a
|
2014-04-18 15:10:46 -05:00 |
|
Steve Harris
|
b9ab224885
|
Merge branch 'master_14.2.2' (14.2.2-4) into omaha_14.2.2
Former-commit-id: 3d9318b9d5 [formerly 159b520938] [formerly 06cf9aa40f] [formerly 3d9318b9d5 [formerly 159b520938] [formerly 06cf9aa40f] [formerly 5b9cbd8ce4 [formerly 06cf9aa40f [formerly 26e51b0d60276597388fb3ad49fed4dddaa8a2ca]]]]
Former-commit-id: 5b9cbd8ce4
Former-commit-id: 3dda7cac15 [formerly c855b11132] [formerly 77807af2372058ee1a3ed37d5cd3a6b94988249f [formerly 861a04a77a]]
Former-commit-id: 7b97d3a4b13480737533525b63bf25d0e02584f3 [formerly 01ff56473c]
Former-commit-id: 7a7033d0a1
|
2014-04-18 14:38:54 -05:00 |
|
Brian.Dyke
|
b52ab83c26
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 2d8d035b26 [formerly 3b90abdf7a] [formerly 880329e4ae] [formerly 2d8d035b26 [formerly 3b90abdf7a] [formerly 880329e4ae] [formerly 9943a331c3 [formerly 880329e4ae [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]]
Former-commit-id: 9943a331c3
Former-commit-id: 54e2d33607 [formerly 2c8e6ec2fc] [formerly 194874486fb70da3d52cfd624f3ead46e0ca7eef [formerly 62c2a8b843]]
Former-commit-id: e6549328a0648837593fbf13ac5bc4de370dc1f7 [formerly 989b873f6e]
Former-commit-id: ddee08368a
|
2014-04-18 07:53:10 -04:00 |
|
Brian.Dyke
|
abdefb3233
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 1aec3b3698 [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]]
Former-commit-id: 645fe64a4a
Former-commit-id: ec3c3b4bbe [formerly 66974e17b9] [formerly 02f862c461e30bc6f080ca3c5fa4bbbfae2b54a2 [formerly 4eb3317f80]]
Former-commit-id: 8defec1e49367a8a6ccd9f240a592024a450e538 [formerly 59cbfdf093]
Former-commit-id: 8275f3907f
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
143d9a143a
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
7c83f534f0
|
Issue #3018 addressing code review comments
Former-commit-id: f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly e327f5e0bf [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 88231d9166 [formerly 81f8f6f328] [formerly febf7868548bff0878f5de8197de931a5e194ca9 [formerly 8b6650c898]]
Former-commit-id: 04508ffd1ec150ee6f778136f2f7c1f5cffc1632 [formerly 3737ad85b6]
Former-commit-id: f607630d72
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
3c27a1e1ab
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly 1ba72371be [formerly f9a393172f [formerly 6813b32786289503950322c02e32803299566c5d]]]]
Former-commit-id: 1ba72371be
Former-commit-id: 8851b335fc [formerly 2139c2308e] [formerly 502045c662b12074a1036d22f9c1951ee22f1f8b [formerly 7d09397faa]]
Former-commit-id: 79b374e8ea7c63223f6f6f0f65a1234cdf694b0c [formerly 94f852cda7]
Former-commit-id: d704f90445
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
5e855a156a
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly c362af04f3 [formerly a085b71c81 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]]
Former-commit-id: c362af04f3
Former-commit-id: e4b0a48ace [formerly 1a40bc4824] [formerly 93fd911a8ce5140273cf8b6b105888dd69b75fea [formerly e1caa66625]]
Former-commit-id: caf2c5d766cd237a3542238be6f9bfec14088db0 [formerly e4aeb8394d]
Former-commit-id: de32624fdf
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
0382243dfe
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
|
2014-04-16 16:17:05 -05:00 |
|
Brian.Dyke
|
d2d085aa39
|
Merged 13.5.5-1 into 1412
Former-commit-id: 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]]
Former-commit-id: 35ad867281
Former-commit-id: 4808bb32bb [formerly c0266e8988] [formerly 8837283d998164da174b3d8f18d42dbebeeb1257 [formerly 72618c4214]]
Former-commit-id: 856567af7814ca29ea4e90337f3ec6c13981ce04 [formerly 737283b94a]
Former-commit-id: 73efa466f9
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
c40115ef80
|
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: ef5448e8f9 [formerly 736c2cc764] [formerly 77ce898f6def28352aefa08188156dd2bc89176b [formerly e0ffa7b6b4]]
Former-commit-id: 652809268dc177578cdc57e167bee3c9e728fe1b [formerly 700080e879]
Former-commit-id: 7031f73fe2
|
2014-04-16 08:41:54 -05:00 |
|
Ron Anderson
|
861aaf0dfa
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
76c12afbfe
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 68df2b0d29 [formerly 2f51d63032] [formerly 305f259935e7d3b0c4aa6d31fb2c63c47d11a7ad [formerly 3eebc7a864]]
Former-commit-id: 003a747a5ae4b41830eb3012aa75e88ce095a4b1 [formerly af826302a1]
Former-commit-id: 7dc8709a5b
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
1c13496912
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 1f3584ce15 [formerly 6ed279d306] [formerly 336570a6f023ec3889bbe8c27489ce1f1e14b5f5 [formerly c361ccd531]]
Former-commit-id: 6ae45c7f072308154e9a43cc9868ef69a835f969 [formerly 9be8c87f87]
Former-commit-id: ac077b24a1
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
372ecda418
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]]
Former-commit-id: 62062bf288
Former-commit-id: f731dbc847 [formerly 0b149f92d9] [formerly 9f938a2b9dba7afb0360199c813d48ea9302801b [formerly 035272360b]]
Former-commit-id: 001d47f93bc4e0c26d0f78e7d14ece5b5ef7a34f [formerly f6f51d3575]
Former-commit-id: f026a17b07
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
16be9500b9
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]]
Former-commit-id: a6708cc174
Former-commit-id: 627004af0a [formerly e8dffad9cb] [formerly c50a848c670c4b4d84b5ed17c503151cf6c6b7f1 [formerly 5b27f2987f]]
Former-commit-id: 4e673bda45fe4b6268410b72231d4d0d2ad7d4bb [formerly d148fbe645]
Former-commit-id: 6a5c7d7684
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
0f1a1e52a7
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]]
Former-commit-id: 9c18f60924
Former-commit-id: a8eaf88994 [formerly 3adcd5bca5] [formerly 0eb35c20c9f879386db51a895123b7b5435e2d64 [formerly 13808687c1]]
Former-commit-id: a1c719e81d4d018bd8ddb252c1e0303980194856 [formerly 7996e95745]
Former-commit-id: 2b0fd93679
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
ac40440ce5
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]]
Former-commit-id: 1a91b820d9
Former-commit-id: 531eea30e1 [formerly ab0c9a65d2] [formerly 3276287380788647756570a048989a84fecfcd89 [formerly c6d9a3926e]]
Former-commit-id: 2be119384e43516b510a208409a4f3c49e88e8d7 [formerly a94bf1a110]
Former-commit-id: a846d4c4f5
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
a9395dfffa
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: 2cb1541fe9 [formerly af5cbe3321] [formerly 192a5513df] [formerly 2cb1541fe9 [formerly af5cbe3321] [formerly 192a5513df] [formerly deff8ed340 [formerly 192a5513df [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]]]
Former-commit-id: deff8ed340
Former-commit-id: ef617f4b14 [formerly 4efe23ee2c] [formerly 0ef8524bde7ad6668bf5b80a53c989f07ef35dbe [formerly 97687e7217]]
Former-commit-id: 6f9575ccbac358f67a37524ffefb858676644ab7 [formerly 52efde1ca0]
Former-commit-id: 8cc1d09d35
|
2014-04-11 11:18:06 -04:00 |
|
brian.dyke
|
e205810cba
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 16a261d7f6 [formerly 88ddd667b6] [formerly f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]]
Former-commit-id: d5b0d90245289f70419c05b7aae730f0ee5d4f80 [formerly 1c4e02168c]
Former-commit-id: f299a28f9b
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
f77319aa5b
|
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: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
52a54f5e9f
|
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: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Steve Harris
|
5a8fc26d52
|
Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 72d410e74a [formerly 842e355cc7] [formerly ae196946b9] [formerly 72d410e74a [formerly 842e355cc7] [formerly ae196946b9] [formerly 2ea3d45ecc [formerly ae196946b9 [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: ea6d8ae184 [formerly cf3bc163b6] [formerly 8e513f10ddbee68e5bba5df62ddbfb95a58225de [formerly 2efe4d5c6f]]
Former-commit-id: c5f713e50a2bf54f11ce391145786ae2ac871c0c [formerly d2f3b72736]
Former-commit-id: bab730727e
|
2014-04-09 13:24:52 -05:00 |
|
Brian.Dyke
|
38a8f60a43
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
|
2014-04-09 11:39:07 -04:00 |
|