Dustin Johnson
|
e2a6167de3
|
Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly ed017996a0 [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]]
Former-commit-id: ed017996a0
Former-commit-id: bd04bd2c8c [formerly f274b8cd5b] [formerly 19450b614092a79e5518ae5c8a927c2aeb594359 [formerly 9e63142576]]
Former-commit-id: 3b9a725cb7e0fe573edc1ee175256ab462601148 [formerly e4c51bad63]
Former-commit-id: 087e01d4e4
|
2013-03-22 15:28:20 -05:00 |
|
Max Schenkelberg
|
971baf62b1
|
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 44f5bd04b6 [formerly 850c8995cc] [formerly b81da1853ef8773cba40a9f1ed03ab5d498966c2 [formerly d20958ae92]]
Former-commit-id: ae3d695d3cfd46a5aade2f00de5657f386699789 [formerly 34134b3c62]
Former-commit-id: 3ba217badb
|
2013-03-22 10:54:44 -05:00 |
|
David Gillingham
|
3b8f35d9bf
|
Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: 3fdecaec6e [formerly c8c7fb4129] [formerly 0957f6a5eec508c235f5324a4ce32b5064183a23 [formerly c3ce4058a0]]
Former-commit-id: 2f5d9615c33ca7ab3903f26aee8791ab3f06072b [formerly 7a2c92efc7]
Former-commit-id: 75a6163bf3
|
2013-03-22 10:39:13 -05:00 |
|
Dustin Johnson
|
c5464667d5
|
Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 0dcc67bc55 [formerly 53291f7130] [formerly 21a7a7505def7dce020a2a08ac7e2a12253adea8 [formerly 1b1bd69b89]]
Former-commit-id: 696e1ca91ff58627044275c70673d28ff343a7af [formerly e39187c0ce]
Former-commit-id: 0c92ddab72
|
2013-03-22 10:04:21 -05:00 |
|
Lee Venable
|
e49c13b61b
|
Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly c8523e9108 [formerly 489e04c235 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]]
Former-commit-id: c8523e9108
Former-commit-id: da4f91d1d1 [formerly a2e5e18810] [formerly a38c0aaf0d81c02c132fbf7d895fb2ae03642b5b [formerly 0d1cba8eae]]
Former-commit-id: 1ba20f23e5bc00158919a784aff5d9d1dc9ff3ac [formerly c733749c9f]
Former-commit-id: 9af40169f9
|
2013-03-21 19:27:02 -05:00 |
|
Nate Jensen
|
81588089fd
|
Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
Former-commit-id: d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly 44f8ba8943 [formerly e4c1e86d55 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]]]
Former-commit-id: 44f8ba8943
Former-commit-id: 39be82e701 [formerly fa0d772221] [formerly 73be7a5f1188b9b7409ec645d1ae325bb8766c2c [formerly 84e8a30ad7]]
Former-commit-id: cf5e15b22bd699c68e9f76cab8b5be49c72f0389 [formerly 4a8974e6a0]
Former-commit-id: 5f11e7d243
|
2013-03-21 17:06:37 -05:00 |
|
Dustin Johnson
|
3e8624a3e8
|
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]]
Former-commit-id: c4d4e37cad
Former-commit-id: ccb959c686 [formerly 09d1d7b6cf] [formerly e46190078db46b56cb5461797a9ab3f3c3ecb7f5 [formerly d58306a92e]]
Former-commit-id: abf3adf681b6aeddfe60c155ab334a33629028b4 [formerly 0f4ec00790]
Former-commit-id: 4d41fca019
|
2013-03-21 16:14:49 -05:00 |
|
Nate Jensen
|
da610f0b33
|
Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly 255b2dbd29 [formerly d6d7b081cf [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]]]
Former-commit-id: 255b2dbd29
Former-commit-id: 9b16df5be9 [formerly 7ce724d4fd] [formerly 028e5a5592ab805e137eef6932ddca1a7788aefa [formerly 7821b86e87]]
Former-commit-id: db55e36998070b6430ab80d1ab1ca7c25cf8776c [formerly 5d0194d7a3]
Former-commit-id: 0d0a93dd1c
|
2013-03-21 15:07:57 -05:00 |
|
Mike Duff
|
58bea82862
|
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 09feff70e0 [formerly e4ffefa649 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]]]
Former-commit-id: 09feff70e0
Former-commit-id: 01374e2b4e [formerly 524dfa985f] [formerly f337379307c42237568f779a8b1424b7176cd91b [formerly a45389f735]]
Former-commit-id: c309d4f1c03641f79757c4a06d8ad1bd3018605e [formerly 8c1b60bae9]
Former-commit-id: 31657d334c
|
2013-03-21 12:23:56 -05:00 |
|
Ben Steffensmeier
|
5fb8c37bab
|
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly de02fe7922 [formerly e69011cdd8 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]]
Former-commit-id: de02fe7922
Former-commit-id: 3e3e114898 [formerly 4323ea54d2] [formerly 53fc7d83e457d86a8b95d9126ec3adbb8909a627 [formerly 6ce135a80a]]
Former-commit-id: 0954e4a2a3a0f4503430e305acb1cc49e96ada47 [formerly 9feaaa1961]
Former-commit-id: 96fe46d7a3
|
2013-03-21 11:09:23 -05:00 |
|
Max Schenkelberg
|
ed0af29c23
|
Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
Amend: Added header comments and more unused code
Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686
Former-commit-id: 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 5109641194 [formerly b2e374c7fb [formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]]]
Former-commit-id: 5109641194
Former-commit-id: 5e108e1c4e [formerly 9aa8f9dd9e] [formerly dbdb63e7eaa979429543c7d3c35d70b666712d88 [formerly 21b8c130c2]]
Former-commit-id: 79ce073a98b67ba5787b628448c55abcdc1f9e0d [formerly 5175c821bd]
Former-commit-id: 3b032517ac
|
2013-03-20 17:38:02 -05:00 |
|
Bryan Kowal
|
acfe04a074
|
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]]
Former-commit-id: 3baebb684b
Former-commit-id: a71e14882e [formerly 63f7abc798] [formerly 5b50182da9b1d1bc0dc78315de3a77804b604894 [formerly 374bd51fb0]]
Former-commit-id: 90f1be518ad1b2127ca77166e14502c623f1acb5 [formerly 5eae24b949]
Former-commit-id: ddf4c04e59
|
2013-03-20 16:53:18 -05:00 |
|
Nate Jensen
|
39ef57981b
|
Issue #1808 perspective specific actions take priority
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: 9ff2d78022 [formerly 00f750ae06] [formerly c1ddc02b10] [formerly 9ff2d78022 [formerly 00f750ae06] [formerly c1ddc02b10] [formerly de3aea9afb [formerly c1ddc02b10 [formerly d69f2087948a54618c6f22878d575b6760950909]]]]
Former-commit-id: de3aea9afb
Former-commit-id: 84c537c0de [formerly 5acc1d6835] [formerly aaa39d3a5c60cd474b5e3dd4f5a7c452b536b7b0 [formerly a5f4b4f0ad]]
Former-commit-id: 58df4e0dfda8bda8edac084ee7d5ffa751d32e23 [formerly 54e7989366]
Former-commit-id: 95eeeedcb1
|
2013-03-20 16:27:31 -05:00 |
|
Steve Harris
|
616cddf60c
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
|
2013-03-20 16:09:26 -05:00 |
|
Steve Harris
|
2b05476c98
|
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
|
2013-03-20 16:06:20 -05:00 |
|
Steve Harris
|
1261f1dbf9
|
13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
|
2013-03-20 15:53:01 -05:00 |
|
Max Schenkelberg
|
4a8a63253a
|
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 8732e302f7 [formerly ec27a16858] [formerly 1d0bcac64713d401322363f780281a663de8cdab [formerly 2e10fd83f6]]
Former-commit-id: 0ea78b9e51d9a9b783beb7ba00499485ffe88ecd [formerly 924e27f51f]
Former-commit-id: a25ccc8c5c
|
2013-03-20 14:10:52 -05:00 |
|
Steve Harris
|
0929de5965
|
Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 96ba08115a [formerly d00dc0d174] [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]]
Former-commit-id: b81ab6022fde7cae7ff4586a3467e9e741b445f7 [formerly 6d4512fa3a]
Former-commit-id: 352c267fc9
|
2013-03-20 13:45:11 -05:00 |
|
Richard Peter
|
4e87891a64
|
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 8805c42d14 [formerly 53d8ef7ed1] [formerly 377061882220d7ca7878a9f6095ebe2307dd7ab4 [formerly 3bad342dca]]
Former-commit-id: a0d88bffdd2faa06fdd928fd3e8866b77e34ba8c [formerly ff1b1598e6]
Former-commit-id: 403879b5cf
|
2013-03-20 13:32:33 -05:00 |
|
Ben Steffensmeier
|
ce8d190a49
|
Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]]
Former-commit-id: 82499f839d
Former-commit-id: d67d0ec674 [formerly 1b363a547c] [formerly 048a16f2b52da3414fc5d576059d5543b43f69f9 [formerly 3e2a41d1d2]]
Former-commit-id: ce0f7dafa19ff3c41040e73684d15a758d74d293 [formerly 57d19b0d66]
Former-commit-id: a01b552f89
|
2013-03-20 13:26:33 -05:00 |
|
Ben Steffensmeier
|
a503ef0938
|
Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 4b0e7e77d3 [formerly b201d9dee2] [formerly b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]]
Former-commit-id: 054b143635c076ebd5e79c9bbfe409552cff76ec [formerly 498d153e40]
Former-commit-id: 4cde2bd826
|
2013-03-20 13:05:54 -05:00 |
|
Dave Hladky
|
c290073444
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: a7462a5125 [formerly 01c6ff12a0] [formerly d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]]
Former-commit-id: 230698475e3964c6e08fa5002b60e4edb7657b26 [formerly 8299b2872a]
Former-commit-id: 1aef08f449
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
5411621351
|
13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3c492badbc [formerly 7e96d841d9] [formerly 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]]
Former-commit-id: e83406d2275f6117c72406e8ae7298dd5995a819 [formerly 65f522fc87]
Former-commit-id: 37beeaab69
|
2013-03-19 14:22:56 -05:00 |
|
Richard Peter
|
2340c05137
|
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]]
Former-commit-id: 3a92747518
Former-commit-id: 26e2d62e99 [formerly eebd930070] [formerly 7532765e0a4316f68ebd2971adf3566334c5a08c [formerly c955b3b640]]
Former-commit-id: 1c0c5a83932631df486bbeffa3d0850087fe50b7 [formerly 1bf2c48011]
Former-commit-id: 5f09e66d4e
|
2013-03-19 13:24:28 -05:00 |
|
Dustin Johnson
|
fec2db4a51
|
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]]
Former-commit-id: 8363eba409
Former-commit-id: 2896b034a7 [formerly 3c8e14edc7] [formerly bf91004f3796358ffc74a0f0628be3abb249249e [formerly e0b6e6187e]]
Former-commit-id: 29c699a80c9e5e2a63781b6b624594e5c7c717ce [formerly 889953c712]
Former-commit-id: 17fe9aee59
|
2013-03-19 13:09:48 -05:00 |
|
Dave Hladky
|
07b8f90014
|
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: e0d90738ad [formerly 618f737fab] [formerly 71c2eba9b6609730384eaad2e834b311fb5eefb6 [formerly f0244f54a4]]
Former-commit-id: 7fb36c3c0bac714c21eadf0ce71c66d6f3e066cc [formerly 64f8c46e64]
Former-commit-id: af0898807b
|
2013-03-19 13:08:14 -05:00 |
|
Mike Duff
|
4943f6f2d8
|
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]]
Former-commit-id: 058064ce0d
Former-commit-id: e205993cba [formerly 3e1b4ba54b] [formerly f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]]
Former-commit-id: bda98ae3e9d9fb64c0dfddbd5de2cf785f5bcbb7 [formerly 144223ed9b]
Former-commit-id: c22d1962de
|
2013-03-19 10:10:01 -05:00 |
|
Bryan Kowal
|
162b0b1d40
|
Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly f0eb7d3285 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]]
Former-commit-id: f0eb7d3285
Former-commit-id: dc2dc31f7e [formerly fd68cd7a04] [formerly 8cd05408fb45131c5569dd6fe66f49be87474a71 [formerly 54113e9b29]]
Former-commit-id: fb3115642a2b5d3b64623250b34661ca2c9d12dd [formerly 959e8b717f]
Former-commit-id: 50e884aab0
|
2013-03-18 18:15:26 -05:00 |
|
Ben Steffensmeier
|
02f7d8e3ab
|
Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]]
Former-commit-id: 86dffab17d
Former-commit-id: 89ec3e9ce7 [formerly 160b6a7040] [formerly 3a15f3575a0d243b59b8d728d08f437b3b036330 [formerly dfe8de96f2]]
Former-commit-id: 008cac470dc86afbdf01474e5615c762263e40d6 [formerly e176478c7a]
Former-commit-id: f2466d6066
|
2013-03-18 17:16:44 -05:00 |
|
Steve Harris
|
4c10c7a5be
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
|
2013-03-18 16:52:00 -05:00 |
|
Steve Harris
|
c1bb0c2749
|
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
|
2013-03-18 16:43:22 -05:00 |
|
Bryan Kowal
|
33b56397a3
|
Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
|
2013-03-18 16:36:33 -05:00 |
|
Steve Harris
|
0b0c5e4bec
|
13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
|
2013-03-18 15:43:32 -05:00 |
|
Dustin Johnson
|
f10956964f
|
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: 1fb27b205a [formerly 36cc80590c] [formerly b7a5311dde] [formerly 1fb27b205a [formerly 36cc80590c] [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b7a5311dde [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: b4c83331db [formerly 7afc4a083b] [formerly 9bd17f5ccc6a8fce1d466bbffddc89e3dcf31e69 [formerly 55095f0041]]
Former-commit-id: f827fdbd3bb674e1c0ea6231337a8aa2c31c8ae0 [formerly 805c491c04]
Former-commit-id: 225c664129
|
2013-03-15 16:14:17 -05:00 |
|
Dustin Johnson
|
090d1fe72a
|
Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]]
Former-commit-id: 43a9f608ef
Former-commit-id: d8880e29b6 [formerly 7adf94e9f6] [formerly 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4]]
Former-commit-id: b520365a67b13e0f4c76818883c281e85883a6aa [formerly a08059dd34]
Former-commit-id: 83034c3f43
|
2013-03-15 11:51:58 -05:00 |
|
Roger Ferrel
|
2c0583b153
|
Issue #1790 changes for non-blocking StationLegendDlg.
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 24868f7ed5 [formerly dadf8a9e4c] [formerly 0089e24579] [formerly 24868f7ed5 [formerly dadf8a9e4c] [formerly 0089e24579] [formerly b01bb935c3 [formerly 0089e24579 [formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]]]
Former-commit-id: b01bb935c3
Former-commit-id: dfbd824211 [formerly 382bb7c16b] [formerly b11e4827ee12c6a982cc5d1a4fc3306a804a2efe [formerly 08990f97f8]]
Former-commit-id: 145489302fb20481be73e31f21174de8ac97472a [formerly 85f58a9e52]
Former-commit-id: ccc37c2b46
|
2013-03-15 10:26:30 -05:00 |
|
Roger Ferrel
|
c47f5629ee
|
Issue #1790 changes for non-blocking StaffGageDlg.
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 32ba1814f5 [formerly fcbda4e0de] [formerly 4230e1a9b8] [formerly 32ba1814f5 [formerly fcbda4e0de] [formerly 4230e1a9b8] [formerly 17a41bf063 [formerly 4230e1a9b8 [formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]]]
Former-commit-id: 17a41bf063
Former-commit-id: 3693e9dfeb [formerly e88e52e406] [formerly 183b27d474d2061440f4cf3fd19e327acad33523 [formerly 006062502e]]
Former-commit-id: ac30a4dd7448f55c70b4f50a34021c66bc9b9343 [formerly 47dac77059]
Former-commit-id: 1d2db27655
|
2013-03-15 09:00:00 -05:00 |
|
Roger Ferrel
|
08a01e5332
|
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: b6a18b2d96 [formerly 76507ebcc5] [formerly 015fc9b8f8] [formerly b6a18b2d96 [formerly 76507ebcc5] [formerly 015fc9b8f8] [formerly 34ea46099e [formerly 015fc9b8f8 [formerly ad772f0a3eb944117614f029a2c3659e5c774599]]]]
Former-commit-id: 34ea46099e
Former-commit-id: 269127174c [formerly 60e7b4be62] [formerly 08234f862f3dd3950c644ed09abf867def44c3c1 [formerly 7eae71038f]]
Former-commit-id: 732bd192282170bc35d3bb0a55c5ead58745fd44 [formerly 824b98527c]
Former-commit-id: 5f0b405866
|
2013-03-15 08:17:50 -05:00 |
|
Lee Venable
|
8f1459c938
|
Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]]
Former-commit-id: 93e99b64a6
Former-commit-id: a0298d4199 [formerly ba4673b99a] [formerly db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly 3a1dc41b50]]
Former-commit-id: ff4673c26bdfff1eb17037d089b4ee483eed5b65 [formerly cac220879d]
Former-commit-id: 0449fe84a6
|
2013-03-14 17:19:38 -05:00 |
|
Dave Hladky
|
5346a31c5b
|
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: f7ccf2e765 [formerly a1c4148918] [formerly 9b495681ec] [formerly f7ccf2e765 [formerly a1c4148918] [formerly 9b495681ec] [formerly c57d5574ef [formerly 9b495681ec [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]]
Former-commit-id: c57d5574ef
Former-commit-id: 19117f1851 [formerly 3ba473351b] [formerly a513fe6a10c22c44c2f7c793a12913414d1f9b36 [formerly db207a732c]]
Former-commit-id: fce61df1efff7105f52295e290f5cb6c3b74985f [formerly 5bf3f5f89f]
Former-commit-id: 871c4718ab
|
2013-03-14 15:59:39 -05:00 |
|
Roger Ferrel
|
69ecbd4f6f
|
Issue #1790 Changes for non-blocking TabularDisplayDlg.
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2 [formerly 818b856f97] [formerly c43b7777e1] [formerly a19092d5c2 [formerly 818b856f97] [formerly c43b7777e1] [formerly ebe57f1cbc [formerly c43b7777e1 [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: cec76b08bf [formerly 46428ed944] [formerly a4411b7fa0720ced4d24e4567246f0516fe411f4 [formerly ff944b4768]]
Former-commit-id: b1a23287bd793544df9c34418c58d4b414b4f70a [formerly 1cada5eec3]
Former-commit-id: d8000c1526
|
2013-03-14 15:38:08 -05:00 |
|
Ron Anderson
|
0b86852e99
|
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: 1864ba24e5 [formerly 60af3ad63e] [formerly 16d93dab84] [formerly 1864ba24e5 [formerly 60af3ad63e] [formerly 16d93dab84] [formerly fc749ff3eb [formerly 16d93dab84 [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]]
Former-commit-id: fc749ff3eb
Former-commit-id: c6598f3869 [formerly 97a38fd3c5] [formerly cdf68ae1b9e656919543c5343fa44ed63c766ab2 [formerly 7087e1ebe7]]
Former-commit-id: f83c5f140768ed2dd5877ad5d7e3a9d44e146b8a [formerly e6ba869694]
Former-commit-id: bd0618d53f
|
2013-03-14 14:55:31 -05:00 |
|
Ben Steffensmeier
|
ad0078d2e9
|
Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 55d80d760f [formerly e5b9e0ca46] [formerly 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee]]
Former-commit-id: 4fe3069a05c6bc069a0cd306a5134a66e8ba310c [formerly 153a7dbd7d]
Former-commit-id: 41e3ac3923
|
2013-03-14 13:26:08 -05:00 |
|
Greg Armendariz
|
166fcb78a9
|
Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]]
Former-commit-id: 2f9136843b
Former-commit-id: ef59159bb9 [formerly b79ecc28e3] [formerly 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]]
Former-commit-id: 0fe252f9bf5b69a3471bb0b71197934ca6b0d155 [formerly 8ea2042456]
Former-commit-id: cfc53af85e
|
2013-03-14 11:15:08 -05:00 |
|
Nate Jensen
|
f046b23f9b
|
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]]
Former-commit-id: 490ffe2772
Former-commit-id: b74d6315a6 [formerly e2e9a845d5] [formerly bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]]
Former-commit-id: 75207b52738316a6767eb046282fd34cc9c6c47c [formerly 363efaec00]
Former-commit-id: c710def06d
|
2013-03-14 09:48:16 -05:00 |
|
Roger Ferrel
|
be6fbede98
|
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: c6b64c828c [formerly c556928998] [formerly dae3fb5938] [formerly c6b64c828c [formerly c556928998] [formerly dae3fb5938] [formerly 62b241a548 [formerly dae3fb5938 [formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]]]
Former-commit-id: 62b241a548
Former-commit-id: 463545471a [formerly 3baa2e9220] [formerly 07c0e26a4def2d1580d95e8b371943bfc4d36663 [formerly 09f4c18b5c]]
Former-commit-id: 8d6e588257e9d52dfb94bca386cf5faa7e817a20 [formerly d808a33c51]
Former-commit-id: 80ee3e1d66
|
2013-03-14 08:22:05 -05:00 |
|
Ben Steffensmeier
|
6b3e6e703b
|
Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]]
Former-commit-id: 52c167cf00
Former-commit-id: a440445437 [formerly 2d622e6053] [formerly 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]]
Former-commit-id: e54de36cfb829c41843de14a87917d4b35e60c55 [formerly 60bb04a055]
Former-commit-id: 7266a995f9
|
2013-03-13 18:52:52 -05:00 |
|
Ron Anderson
|
86d85d75e8
|
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]]
Former-commit-id: 61f74305e2
Former-commit-id: 87cd340e38 [formerly de14cd0baa] [formerly f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]]
Former-commit-id: 4487e4817e53af625104ab94ce05c0bd8071ba49 [formerly b1088415cd]
Former-commit-id: 39e2d27a89
|
2013-03-13 17:16:37 -05:00 |
|
Ben Steffensmeier
|
1f4315a7ed
|
Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]]
Former-commit-id: 89eb902284
Former-commit-id: 7e998aa197 [formerly f5680beaa9] [formerly 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]]
Former-commit-id: f38c474fb547944154f869716e7a195f17c008a5 [formerly 6d699f7713]
Former-commit-id: f012dd8b0a
|
2013-03-13 17:09:20 -05:00 |
|
Dave Hladky
|
b111edeb8b
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
|
2013-03-13 13:56:33 -05:00 |
|