Richard Peter
cbc371109c
Merge "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." into development
...
Former-commit-id: e492d8c351
[formerly bb2be2d6a7
] [formerly 1b7e9e41ce
] [formerly e492d8c351
[formerly bb2be2d6a7
] [formerly 1b7e9e41ce
] [formerly 3de0400969
[formerly 1b7e9e41ce
[formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]]
Former-commit-id: 3de0400969
Former-commit-id: 5989bc1894
[formerly d1b4d899be
] [formerly e50e5d685426dd553ea338be6ee39be5bcda1f72 [formerly 50254dc8d1
]]
Former-commit-id: dac4b40d3584b9d3d92e15ab278064d6922885e0 [formerly 66a28e9315
]
Former-commit-id: 1084723e4b
2013-03-22 16:26:52 -05:00
Dave Hladky
edde66e8f2
Issue #1817 BOX issue with only having HUC0 in template
...
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8
Former-commit-id: 611f180e72
[formerly c2b9bd1024
] [formerly 58a37d1e44
] [formerly 611f180e72
[formerly c2b9bd1024
] [formerly 58a37d1e44
] [formerly d114302b06
[formerly 58a37d1e44
[formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]]
Former-commit-id: d114302b06
Former-commit-id: 5f8ac1e458
[formerly 150cd54602
] [formerly a6c0cfd63967b9b4f31e6242a2aad2a654b52cbe [formerly 3cdd8f8ed2
]]
Former-commit-id: 66bc0011dbc6bee573d6a149bc3641646c869ad2 [formerly bc2a1a20e1
]
Former-commit-id: 4eec5881e9
2013-03-22 16:21:45 -05:00
Dustin Johnson
07be638779
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: b1f365220f
[formerly f5cc517f9a
] [formerly dcfbb43eb3
] [formerly b1f365220f
[formerly f5cc517f9a
] [formerly dcfbb43eb3
] [formerly 8651ca3d76
[formerly dcfbb43eb3
[formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]]
Former-commit-id: 8651ca3d76
Former-commit-id: 6adeb41238
[formerly c55f2ce559
] [formerly 972f2290f05ee741a20729ef834101416b95b220 [formerly 0596d43d99
]]
Former-commit-id: a42de8d20be8a050fdacc4249ee7b490fcd62a7b [formerly dcc7e44250
]
Former-commit-id: eb0f12b15f
2013-03-22 15:28:57 -05:00
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
Richard Peter
e62f6880db
Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client
...
Merge local virtualHosts.xml back in with SLC change
Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b
Former-commit-id: d6a8b05c22
[formerly ead48007cb
] [formerly 9fdeb37a48
] [formerly d6a8b05c22
[formerly ead48007cb
] [formerly 9fdeb37a48
] [formerly 4c3fcf3b67
[formerly 9fdeb37a48
[formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c
[formerly 4b386ccd1c
] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5
]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a
]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -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
Greg Armendariz
e4d51820e2
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 65d6bc8cd7
[formerly 1e1aea8a40
] [formerly 6af1a22e56
] [formerly 65d6bc8cd7
[formerly 1e1aea8a40
] [formerly 6af1a22e56
] [formerly 85113a66b6
[formerly 6af1a22e56
[formerly 7403214a115b0b856f94da1e86288307af952d77]]]]
Former-commit-id: 85113a66b6
Former-commit-id: 8550ade3ba
[formerly 1884b6dce3
] [formerly 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6
]]
Former-commit-id: 8865116ee2a1c8adf793566471920cb0699d0ba9 [formerly 559136f546
]
Former-commit-id: f9d1bfbb48
2013-03-21 12:55:59 -05:00
Dustin Johnson
71b739a546
Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
...
Former-commit-id: 9818775763
[formerly a93b6f54c0
] [formerly 54bbf500de
] [formerly 9818775763
[formerly a93b6f54c0
] [formerly 54bbf500de
] [formerly c2373812bd
[formerly 54bbf500de
[formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]]]
Former-commit-id: c2373812bd
Former-commit-id: a7eb161d29
[formerly e4758ccadf
] [formerly 297220ad9237a9ff4113192018dfe7ba5461763f [formerly b822c6398f
]]
Former-commit-id: 381df66a1a30931b0a71fd691ccfcd2f9580d63b [formerly c23347b58d
]
Former-commit-id: 9426ee02af
2013-03-21 12:35:40 -05:00
Dustin Johnson
173cc2b457
Issue #1794 Use a queue to hold ncf retrieval transfers
...
Amend:
Peer review comments
Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21
Former-commit-id: e8c9726d51
[formerly 3d87218f1a
] [formerly b29eb94780
] [formerly e8c9726d51
[formerly 3d87218f1a
] [formerly b29eb94780
] [formerly ebce91c15d
[formerly b29eb94780
[formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]]
Former-commit-id: ebce91c15d
Former-commit-id: b0a2a23c78
[formerly e3a5458f1a
] [formerly 28f3f246d64f321b17586c020ec5a8677085f92c [formerly c88d9dd6cf
]]
Former-commit-id: 2a47b90eb6d779af665719641e4d0655f79997c0 [formerly 67f055ca39
]
Former-commit-id: eaf2a061b5
2013-03-21 12:28:00 -05:00
Brad Gonzales
7cba304bd9
Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
...
redbook, sfcobs, and satellite.
Amend: Made decoder performance logging consistent. Cleaned up other logging.
Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4
Former-commit-id: 237dc5ea14
[formerly f7debfc55f
] [formerly cd39fcf122
] [formerly 237dc5ea14
[formerly f7debfc55f
] [formerly cd39fcf122
] [formerly 8c309840a3
[formerly cd39fcf122
[formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]]
Former-commit-id: 8c309840a3
Former-commit-id: 954314d74d
[formerly 2de2221a35
] [formerly dc7990ac7d34c4a007a93ed196275f6c5dbbe1f1 [formerly 9f9248bcd9
]]
Former-commit-id: 53ad836ca917276b31c1641cf833b2d5ea883f8f [formerly 9503aa5a60
]
Former-commit-id: 4b93b146fd
2013-03-21 10:58:26 -05:00
Bryan Kowal
a9dd3bd622
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: 0ef2ee6e49
[formerly 4d3731bf6d
] [formerly ab135933da
] [formerly 0ef2ee6e49
[formerly 4d3731bf6d
] [formerly ab135933da
] [formerly 722d068105
[formerly ab135933da
[formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462
[formerly ac0ef6e7b9
] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e
]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0
]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Richard Peter
f5996d41b9
Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
...
Former-commit-id: 3d93bf69c0
[formerly 510e56c67f
] [formerly d747686fa1
] [formerly 3d93bf69c0
[formerly 510e56c67f
] [formerly d747686fa1
] [formerly bcf676f5dd
[formerly d747686fa1
[formerly 855f05b2121c17c71d13495c9aacb12878757af6]]]]
Former-commit-id: bcf676f5dd
Former-commit-id: f3bdacf035
[formerly 855dd1a664
] [formerly 53f7b48f88e617a35ecf463838269e6f2d614469 [formerly ac58a04170
]]
Former-commit-id: 78f90e8fa626d39ab8bdeac8481d9da7c3d992b3 [formerly d46fbf9f2a
]
Former-commit-id: 4b0c9c10d6
2013-03-20 17:26:31 -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
Ben Steffensmeier
bdab31e123
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: d573574ac6
[formerly ecf93b40cc
] [formerly 4c3438e160
] [formerly d573574ac6
[formerly ecf93b40cc
] [formerly 4c3438e160
] [formerly 85b509b13e
[formerly 4c3438e160
[formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]]]]
Former-commit-id: 85b509b13e
Former-commit-id: 681c4d87f1
[formerly 5261f1f567
] [formerly f0480af6eba21536855c791031ffb586f7ee7444 [formerly 5cb197eebd
]]
Former-commit-id: bdcb52c27b7d7ebe864b79b9e8599fe728dc053b [formerly 7bf75df8fd
]
Former-commit-id: f84059441c
2013-03-20 16:37:47 -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
Dustin Johnson
0a4c9a3d33
Merge "Issue #1796 updated some headers, general cleanup" into development
...
Former-commit-id: 28cd17759e
[formerly d584a7fb38
] [formerly e5bcff21cb
] [formerly 28cd17759e
[formerly d584a7fb38
] [formerly e5bcff21cb
] [formerly e7bfdebd41
[formerly e5bcff21cb
[formerly 327283da3d779b976d1fdc118c74f00047d79062]]]]
Former-commit-id: e7bfdebd41
Former-commit-id: 3e3717c6db
[formerly 45ea31f4a6
] [formerly d9ebf39289a57c3f87f863b6f513154ab23c1b26 [formerly e3f3ce2773
]]
Former-commit-id: a1957d227976dc603301d94993a39f0b3d6dd558 [formerly 4481b1e830
]
Former-commit-id: f1337b3561
2013-03-20 13:17:10 -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
Dave Hladky
6e7e9a653b
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: c0250bb4e0
[formerly 958b897c21
] [formerly 5362771743
] [formerly c0250bb4e0
[formerly 958b897c21
] [formerly 5362771743
] [formerly 38494cec16
[formerly 5362771743
[formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]]
Former-commit-id: 38494cec16
Former-commit-id: 1dcf1cd260
[formerly 69c6fdd887
] [formerly e6da29d245a87c028da77d809a837030c9a35209 [formerly 8a46d43216
]]
Former-commit-id: 4c1441e90920503c6c0241e46989c32fc0db41cd [formerly 7046f31351
]
Former-commit-id: 03219ce56a
2013-03-20 12:17:08 -05:00
Roger Ferrel
93a2c0586d
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: 8a26c52506
[formerly 3acca75f82
] [formerly b32ac22ef8
] [formerly 8a26c52506
[formerly 3acca75f82
] [formerly b32ac22ef8
] [formerly 4f889b6999
[formerly b32ac22ef8
[formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]]]
Former-commit-id: 4f889b6999
Former-commit-id: 21b81bfb04
[formerly aba0067eed
] [formerly 25ccf4e495f06112c67009f618f3d499e05f536b [formerly a838aa2d74
]]
Former-commit-id: 6daeacba61a8733baac24c881acb2072aabc760a [formerly 71834c493c
]
Former-commit-id: 5907205c3c
2013-03-19 16:24:22 -05:00
David Gillingham
39e84043cc
Issue #1447 : Update MergeVTEC.py to be current with A1 DR 21434.
...
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9
Former-commit-id: 3ad6035189
[formerly ab6944650a
] [formerly 843f474af8
] [formerly 3ad6035189
[formerly ab6944650a
] [formerly 843f474af8
] [formerly 8ea6d7227b
[formerly 843f474af8
[formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 173ceacc0d
[formerly a8ed519915
] [formerly 15ae015d4e8d837d34c8ef660c79da6b2290ef2d [formerly 5f8c8a80f8
]]
Former-commit-id: 31167e00f2dfb2abafb3357856550ddd88213c13 [formerly 2e57b9f262
]
Former-commit-id: 3a70a07654
2013-03-19 16:06:25 -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
Ben Steffensmeier
16a27f55fe
Issue #1804 Cache db queries in radar decoder.
...
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be
Former-commit-id: f828c49328
[formerly 337e450f94
] [formerly 7b83f6bdfa
] [formerly f828c49328
[formerly 337e450f94
] [formerly 7b83f6bdfa
] [formerly 5d2d834cf7
[formerly 7b83f6bdfa
[formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 0c1fe3d11f
[formerly 489a180622
] [formerly 6c97a1e140c30a4f6f7ccde142ee0a06b355c751 [formerly ff0e5696e8
]]
Former-commit-id: d1ae7c5b3a95206a0ebd1156d304e26ebd7b4e2e [formerly 044eeebe97
]
Former-commit-id: 87b21c053d
2013-03-19 14:11:36 -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
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
Nate Jensen
7a734502b3
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: 3b331be9f6
[formerly 30ddd909bf
] [formerly e65267d5f3
] [formerly 3b331be9f6
[formerly 30ddd909bf
] [formerly e65267d5f3
] [formerly 235952a115
[formerly e65267d5f3
[formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]]
Former-commit-id: 235952a115
Former-commit-id: 568f988ef9
[formerly 4ea1508baa
] [formerly 322940c9800f51152a2cd23a4f14a10dee589147 [formerly dad08657aa
]]
Former-commit-id: 3e00bfb092b747d3a0792b45f6f63ff35470bf34 [formerly d622b8c12e
]
Former-commit-id: 499209754a
2013-03-15 16:10:11 -05:00
Max Schenkelberg
11d5047ab8
Issue #1638 Fixed Velocity templates for windows build
...
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a
Former-commit-id: 93c416e914
[formerly 07a6fd494d
] [formerly 2c3ee8d35d
] [formerly 93c416e914
[formerly 07a6fd494d
] [formerly 2c3ee8d35d
] [formerly beb801517e
[formerly 2c3ee8d35d
[formerly da9666be71adf84f394f255406a66afa6c3f28be]]]]
Former-commit-id: beb801517e
Former-commit-id: f294d9aa8a
[formerly c3232f2581
] [formerly 1728f5f643c879365568ae1dc33fadaaaaa596c0 [formerly 582de5717c
]]
Former-commit-id: 674a9be4dc2da4c1c061afd222692adb68d3eb79 [formerly af973ff5a6
]
Former-commit-id: 286fc9a6ec
2013-03-15 12:16:59 -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
Bryan Kowal
ff3b0b0645
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: f3835d85a0
[formerly b0d31729e8
] [formerly 0d33c86abe
] [formerly f3835d85a0
[formerly b0d31729e8
] [formerly 0d33c86abe
] [formerly 8c0ee91c5b
[formerly 0d33c86abe
[formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: 21e0725cdc
[formerly ebaea489bc
] [formerly 59d9eafff7a1f7424f1ff366a16e0923edbc8e89 [formerly e83033b314
]]
Former-commit-id: 09091a45851f5017a3373897df85539afa1505f0 [formerly bc0c82dad8
]
Former-commit-id: a897e41993
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
d74ac3e7f7
Issue #1777 fix subgridding range problems
...
Former-commit-id: 81f4bb55fc
[formerly 5e81f2154d
] [formerly 5bd20414eb
] [formerly 81f4bb55fc
[formerly 5e81f2154d
] [formerly 5bd20414eb
] [formerly 0daa5817d0
[formerly 5bd20414eb
[formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 964fc25677
[formerly d22cbc7ce9
] [formerly 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4
]]
Former-commit-id: cf39e0dc082aed64da92558a4c063831fc9ebdb9 [formerly bc92e1be6b
]
Former-commit-id: 24b97d7625
2013-03-14 09:56:00 -05:00
Bryan Kowal
ce667ef7f5
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: 123f4a8de9
[formerly 19b26c9f04
] [formerly dd811f674b
] [formerly 123f4a8de9
[formerly 19b26c9f04
] [formerly dd811f674b
] [formerly 58316907ae
[formerly dd811f674b
[formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]]
Former-commit-id: 58316907ae
Former-commit-id: b4316f574e
[formerly 8c91869c8e
] [formerly 5a526894932882f5beada1042dc714d09a4e90c4 [formerly 86c287bb33
]]
Former-commit-id: e5013bbbea796da871243b85a1f893100b7f1a4e [formerly 39ff5c7945
]
Former-commit-id: 851eb395f7
2013-03-14 09:54:11 -05:00
David Gillingham
c274c26346
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Former-commit-id: e7a9930ee9
[formerly 87013aad89
] [formerly 7c74510723
] [formerly e7a9930ee9
[formerly 87013aad89
] [formerly 7c74510723
] [formerly 566927980a
[formerly 7c74510723
[formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]]]
Former-commit-id: 566927980a
Former-commit-id: e79e4a7f7d
[formerly d8dd50f2ba
] [formerly 07b617a330b24e8266d4259815c46e96ac32f768 [formerly 90b8c80837
]]
Former-commit-id: 788c23cfd8404383ca37105cb8ff85c42e716b52 [formerly b121f99015
]
Former-commit-id: 34a1c7b784
2013-03-13 17:14:59 -05:00
Nate Jensen
f981b7b9b1
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: 4db98f508d
[formerly d0db96df45
] [formerly dbd2729336
] [formerly 4db98f508d
[formerly d0db96df45
] [formerly dbd2729336
] [formerly eaef235e8e
[formerly dbd2729336
[formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]]
Former-commit-id: eaef235e8e
Former-commit-id: d7696aa692
[formerly 15b3d5add6
] [formerly 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442
]]
Former-commit-id: 5e309f9fa3e25596f11809c78831943947e408ed [formerly 4539ef8b58
]
Former-commit-id: 165fbf3646
2013-03-13 16:17:44 -05:00
Bryan Kowal
f1854dd760
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: 9e678feaf8
[formerly db02ab18ed
] [formerly 729bc9c4bb
] [formerly 9e678feaf8
[formerly db02ab18ed
] [formerly 729bc9c4bb
] [formerly 5e86ef080e
[formerly 729bc9c4bb
[formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 0b6a31d7ca
[formerly f6139755a5
] [formerly 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024
]]
Former-commit-id: 53b06b05ba798c5f2f0c58de3b9cd5f1c88b5850 [formerly 1e9054ce15
]
Former-commit-id: ea0950d836
2013-03-13 14:44:05 -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