Stephen Gilbert
|
2bbab2ceec
|
Merge branch 'ncep_14.2.2-n' into ncep_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/dao/NcUairToRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.gempak/src/gov/noaa/nws/ncep/viz/gempak/util/GempakGrid.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
tests/.classpath
Former-commit-id: b2ef5aac55 [formerly 96760cc97a] [formerly da55d4cf8d] [formerly da55d4cf8d [formerly 33c9f191b4]] [formerly b2ef5aac55 [formerly 96760cc97a] [formerly da55d4cf8d] [formerly da55d4cf8d [formerly 33c9f191b4]] [formerly 0911e5a4ef [formerly da55d4cf8d [formerly 33c9f191b4] [formerly 0911e5a4ef [formerly 09ae4e1dc5063df9f94d802f2630632d4c856fff]]]]]
Former-commit-id: 0911e5a4ef
Former-commit-id: ff4459226b [formerly 639c5a3d82] [formerly ac5103c25f] [formerly bee2d049228bcee37ce6a553c6c09e3418d2bfa1 [formerly 6f4c24d80fb76a5c5cfaed814d034eeb660cf3ed] [formerly ac5103c25f [formerly 93d92085ec]]]
Former-commit-id: 7f6e60cce8e2f1024c41b32a635a078b4dc70efc [formerly 9d4ab9056f77e51bcdf4d31044abfa1b2b6cf9f4] [formerly 6dcc6de7b9 [formerly b6b587a86f]]
Former-commit-id: 6dcc6de7b9
Former-commit-id: e9779e9018
|
2014-12-16 13:06:21 -05:00 |
|
Stephen Gilbert
|
79af11fbfb
|
VLab Issue #4001 - Fix Ncuair decoder for dropsondes
Change-Id: I88646f0d3f981e8b5c1902362636f48e130c8dd3
Former-commit-id: 8d6f14a81a [formerly 48d8075211] [formerly d775c0931a] [formerly d775c0931a [formerly 034f028db0]] [formerly 8d6f14a81a [formerly 48d8075211] [formerly d775c0931a] [formerly d775c0931a [formerly 034f028db0]] [formerly f87cc6e7fb [formerly d775c0931a [formerly 034f028db0] [formerly f87cc6e7fb [formerly 929b1977b350abc7f271ee7cd3ee8e65be4efe85]]]]]
Former-commit-id: f87cc6e7fb
Former-commit-id: 8f90e68d7b [formerly 61a6eaf97a] [formerly b0dbfa8485] [formerly ae6699e8ad18724a2b0b1abbfcba56f1fb2afcc0 [formerly 00d5ce225a70fce67588b9a5c9e669bf091453ab] [formerly b0dbfa8485 [formerly 70f60dc8b9]]]
Former-commit-id: 32e2645bd28abf062024ee96c382dfe639b589b7 [formerly 2278c48fd3460342476c11d5232b746c30c617c1] [formerly 8cc31fa403 [formerly dbf2f42af1]]
Former-commit-id: 8cc31fa403
Former-commit-id: 6a1f4dcdb8
|
2014-12-01 16:06:41 -05:00 |
|
Chris Cody
|
3e693a321b
|
Omaha #3365 Realign AWIPS2_baseline tests
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f
Former-commit-id: 67d58098e5 [formerly c1468c97fb] [formerly 9397356128] [formerly 9397356128 [formerly 98b767f573]] [formerly 67d58098e5 [formerly c1468c97fb] [formerly 9397356128] [formerly 9397356128 [formerly 98b767f573]] [formerly 1f9c825de5 [formerly 9397356128 [formerly 98b767f573] [formerly 1f9c825de5 [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]]]]
Former-commit-id: 1f9c825de5
Former-commit-id: 004e0706cf [formerly 31fbd06912] [formerly c6b1ff4e90] [formerly 07218dd3da3a790b32977624b8dab6b45bae09a3 [formerly 62a7ea8c47bc0ed51d1ffff50aaf9436e4370625] [formerly c6b1ff4e90 [formerly 0d677d1aca]]]
Former-commit-id: fea064ddc27450cc96172b59499163635f4f00ae [formerly dca085578a33d714dae7b307df993171ea3bf283] [formerly d480271aeb [formerly 503a27310c]]
Former-commit-id: d480271aeb
Former-commit-id: 239db8b8c8
|
2014-09-30 12:53:20 -05:00 |
|
Stephen Gilbert
|
fd60ce31cd
|
VLab Issue #4552 - Grid Resource to recognize sub-hourly forecasts
This commit fixes #4552
Change-Id: Ic7f456b03ac4d00e551d3012f5b7a6034af33266
Former-commit-id: cb4d6d07d0 [formerly 6fac23e853] [formerly d62c732105] [formerly d62c732105 [formerly 1a8f79820d]] [formerly cb4d6d07d0 [formerly 6fac23e853] [formerly d62c732105] [formerly d62c732105 [formerly 1a8f79820d]] [formerly e024656cc7 [formerly d62c732105 [formerly 1a8f79820d] [formerly e024656cc7 [formerly 960e36e6fe39425be6e17b492dbf7bebf059db39]]]]]
Former-commit-id: e024656cc7
Former-commit-id: b78fbf6272 [formerly 1beed7d838] [formerly 0707e178ae] [formerly 9277098276c5bb9bc035223b054efa8c2087803a [formerly b0ec5a0771beb6706a4633cb614f87d61edc9682] [formerly 0707e178ae [formerly 006bbfb872]]]
Former-commit-id: 92528e2c67f4b2ddc21576c855941bdb59a9f685 [formerly c40365926a20dd3f09565ca805e204e510077e8c] [formerly 19b0991d11 [formerly e87440a876]]
Former-commit-id: 19b0991d11
Former-commit-id: 1b32941799
|
2014-09-23 13:32:21 -04:00 |
|
Chris Cody
|
70eddaee16
|
Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48
Former-commit-id: ee4257112a [formerly c5e477e8ff] [formerly 39887a4b9c] [formerly 39887a4b9c [formerly f4445d24cd]] [formerly ee4257112a [formerly c5e477e8ff] [formerly 39887a4b9c] [formerly 39887a4b9c [formerly f4445d24cd]] [formerly 9e823a47d6 [formerly 39887a4b9c [formerly f4445d24cd] [formerly 9e823a47d6 [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 9e46197c7e [formerly 6cbf1ca60f] [formerly 62780e001b] [formerly 4ed66524c152c777e4ff1e410f00635e25254756 [formerly 89f7e5b5e0785657e607962b04e7b8bc89780fa6] [formerly 62780e001b [formerly 57c689eee6]]]
Former-commit-id: 5020d20199a790b054dc6ded8942d4ebe0c2e533 [formerly 1498d09d3c03b48413fb2e19cc7696d99a5f8a7e] [formerly 97d6b67891 [formerly 0564fa8bf9]]
Former-commit-id: 97d6b67891
Former-commit-id: 213b019a8f
|
2014-09-05 10:14:14 -05:00 |
|
Stephen Gilbert
|
91b738b913
|
Merge branch 'ncep_14.2.1-n' into ncep_14.2.2-n
Former-commit-id: 8756591c81 [formerly 2a0d12d6bc] [formerly 24948862d5] [formerly 24948862d5 [formerly 4d2c788c55]] [formerly 8756591c81 [formerly 2a0d12d6bc] [formerly 24948862d5] [formerly 24948862d5 [formerly 4d2c788c55]] [formerly b3564f7131 [formerly 24948862d5 [formerly 4d2c788c55] [formerly b3564f7131 [formerly 13a8016d570ac39d22b9a1fa4b043ed20f5475ea]]]]]
Former-commit-id: b3564f7131
Former-commit-id: 41108ccd20 [formerly f027643609] [formerly d3f1be7c4a] [formerly 9a29ab0f26129175be7b95b68e11d003ca2c37c6 [formerly 63e6a4b2abe74eb1f0691ae4f17085bb7626e6db] [formerly d3f1be7c4a [formerly 0580c95605]]]
Former-commit-id: e244c946e24a8e804a5b251f819501404239930e [formerly e3e520a1a9425e410cf50a7ff98b6ce166b73686] [formerly aedd038e2b [formerly bec66e8565]]
Former-commit-id: aedd038e2b
Former-commit-id: bb9d85077b
|
2014-09-04 13:31:46 -04:00 |
|
Chris Cody
|
033d19cf27
|
Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline
Conflicts:
tests/unit/com/raytheon/uf/common/serialization/comm/RequestRouterTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/request/ServerPrivilegedRequestHandlerTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/router/RemoteServerRequestRouterTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/router/ServerRequestRouterTest.java
Change-Id: Ib1cec696e6c31b4a3292174a3557fe72b86ce4ff
Former-commit-id: b3217d98a6 [formerly ca9b294052] [formerly 13bc309688] [formerly 13bc309688 [formerly 005c0c0b10]] [formerly b3217d98a6 [formerly ca9b294052] [formerly 13bc309688] [formerly 13bc309688 [formerly 005c0c0b10]] [formerly 7dfcf245bf [formerly 13bc309688 [formerly 005c0c0b10] [formerly 7dfcf245bf [formerly 5161931ed5438b78a936f204a588a742c9768f8a]]]]]
Former-commit-id: 7dfcf245bf
Former-commit-id: fec468638e [formerly a04c612b74] [formerly 58b663b788] [formerly 88e2329fdcb8a1bc33af2fb6fc795c36492d3dc1 [formerly b0112725d58e787e56a877fdc2bbb7baa7290cfb] [formerly 58b663b788 [formerly 41c12afc1d]]]
Former-commit-id: 3aaabd8d42814e5fe10defa1442991689247b2c8 [formerly 362871a5abad18a941982e7192a4f89e040d2305] [formerly cfc713d6ea [formerly 7cb8e16a5e]]
Former-commit-id: 9f1735656a85aa78c275ff6dd182c6586b33e343 [formerly cfc713d6ea]
Former-commit-id: e8e6e8d667
|
2014-09-03 09:54:46 -05:00 |
|
Chris Cody
|
3640696390
|
Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
tests/.classpath
Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c
Former-commit-id: 512290692e [formerly bbf1fd8aa8] [formerly 91fde6ab60] [formerly 91fde6ab60 [formerly f8faec0526]] [formerly 512290692e [formerly bbf1fd8aa8] [formerly 91fde6ab60] [formerly 91fde6ab60 [formerly f8faec0526]] [formerly 529377618f [formerly 91fde6ab60 [formerly f8faec0526] [formerly 529377618f [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]]]]
Former-commit-id: 529377618f
Former-commit-id: d834375730 [formerly 3600dd6c14] [formerly 8e340e4b05] [formerly 79bb41da9fa46ac1a0c81642d1d9e42d97bdf71d [formerly 6cf763b4bcebd242e12b9f707dca3961b380f686] [formerly 8e340e4b05 [formerly 3fc1103d07]]]
Former-commit-id: b82797d43e1846a55e1b9655f37611891bb1e67b [formerly e0511bef5739066d89b259e00b68fd3c5caca1bd] [formerly c2ff252400 [formerly f025c02ec6]]
Former-commit-id: c2ff252400
Former-commit-id: 49c91cec7c
|
2014-09-03 09:50:50 -05:00 |
|
Max Schenkelberg
|
632549b75a
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 5c157bf266 [formerly 0419aeea52] [formerly 88ea402947] [formerly 88ea402947 [formerly 896e353950]] [formerly 5c157bf266 [formerly 0419aeea52] [formerly 88ea402947] [formerly 88ea402947 [formerly 896e353950]] [formerly e90bdb6fce [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]]]
Former-commit-id: e90bdb6fce
Former-commit-id: 1d8ff90d7d [formerly 9da9d7fe27] [formerly ee4d9a965c] [formerly 9a1549b052d2b3667c9f64f995ea6c2a68f18516 [formerly 2cd1dab291464f00d51c5d42351d92f81defb05b] [formerly ee4d9a965c [formerly 68221174c4]]]
Former-commit-id: a15ffb71b6c1ad293cbe4f57502a3a457bdcefc5 [formerly e6903f6858697e0f9f7137372b3aac308d58ed18] [formerly 395dcaa255 [formerly e864d8a275]]
Former-commit-id: 395dcaa255
Former-commit-id: 3fe9b3a357
|
2014-08-22 13:15:42 -05:00 |
|
Richard Peter
|
9435beb69c
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 94dfb1d2b8 [formerly ed38bf2372] [formerly 6636b301e5] [formerly 6636b301e5 [formerly 93bbd98cbc]] [formerly 94dfb1d2b8 [formerly ed38bf2372] [formerly 6636b301e5] [formerly 6636b301e5 [formerly 93bbd98cbc]] [formerly 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 0d7f87bb5b [formerly 948e0cd011] [formerly 552ac6d640] [formerly 3802e1ae7885edfbc70e2a3fa559bbd04ab6bec5 [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e] [formerly 552ac6d640 [formerly fc27824dbc]]]
Former-commit-id: bed0154ec372a35b775bee7dca9e16376b10aef8 [formerly 98c7362b289abd5b8e115f957b14dcd73116b99a] [formerly 342192e967 [formerly 0fefdc7cd6]]
Former-commit-id: 342192e967
Former-commit-id: 0b0b58e89c
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7a29f74a3d
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 020a525bfd [formerly d70da4127e] [formerly 7fb4663d75] [formerly 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75 [formerly dcbab5621f]]]
Former-commit-id: 9365f3461acd78bd354b2cc5cd317b9d8c76d98e [formerly 8343b8e876918b72044e0b509f5b5b8afdbd53e2] [formerly 8fb747ad27 [formerly 71357da9d2]]
Former-commit-id: 8fb747ad27
Former-commit-id: 1bbbdc9c62
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
eca5b25817
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: 8e58645759 [formerly bab435f286] [formerly af06c5a890] [formerly a279361a319d31856e62ae271287fe2634f63eea [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31] [formerly af06c5a890 [formerly 66d30e59a3]]]
Former-commit-id: e21ac397453f253cbebf9ec8143ee59c17397567 [formerly 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53] [formerly 196f53e609 [formerly 935542914d]]
Former-commit-id: 196f53e609
Former-commit-id: 7e7529e482
|
2014-06-20 14:01:55 -04:00 |
|
Steve Harris
|
384d2fa312
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly dc74953978 [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]]
Former-commit-id: dc74953978
Former-commit-id: 2ede564cdb [formerly aa133cc8a3] [formerly 0e9d0b2ef5] [formerly 0d288d370383d89f0fd9b620c1af2bfa831fc49c [formerly b7d992179f759d29da9804b9ffcafec8048bcefa] [formerly 0e9d0b2ef5 [formerly 713cfeffc7]]]
Former-commit-id: cc2e29627bf192e53143f9beb0749c892244949a [formerly 4b80090552f8712feaf5137c27c2f010cda148e2] [formerly 5fda99b1fe [formerly 6412cc1427]]
Former-commit-id: 5fda99b1fe
Former-commit-id: 86d6a0cd4d
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
e93d032f05
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
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_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_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_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 3b16bbafb1 [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 7bb35319b2 [formerly 9458ea3648] [formerly bfa4255eea] [formerly 71416a84ea07f551a8d4b12b7a5193d78a44f0d8 [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc] [formerly bfa4255eea [formerly 9b98b41cd4]]]
Former-commit-id: 5123ae7b27223de3c9b15a6ffa2edecab6105980 [formerly a54e34e905540883ccd6d6eb5c78370ac905f651] [formerly 172cca39d9 [formerly 144354c369]]
Former-commit-id: 172cca39d9
Former-commit-id: cf2950abdb
|
2014-05-27 14:48:24 -04:00 |
|
Steve Harris
|
f3e824ee03
|
Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
Former-commit-id: 4151401e1a [formerly 3f2efef88b] [formerly 498ff9235d] [formerly 498ff9235d [formerly 211e5f8197]] [formerly 4151401e1a [formerly 3f2efef88b] [formerly 498ff9235d] [formerly 498ff9235d [formerly 211e5f8197]] [formerly 7da3d7461f [formerly 498ff9235d [formerly 211e5f8197] [formerly 7da3d7461f [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]]]]
Former-commit-id: 7da3d7461f
Former-commit-id: 0409a25f61 [formerly 824eb11153] [formerly aebe44aec5] [formerly 2c1563cfc638a9d67e018fc1fffe429335858324 [formerly 08df29f1cc64520e9b71c8db098f68e178c58dc1] [formerly aebe44aec5 [formerly 51f8c81f33]]]
Former-commit-id: 2fcbb648921b10ec02f29967f87b28e90df42ab5 [formerly 17aaec26cd3ab7556f3298d1f906282ab43f4373] [formerly e8a843b719 [formerly 0b84c2ea74]]
Former-commit-id: e8a843b719
Former-commit-id: ac4d38ceea
|
2014-05-23 08:16:43 -05:00 |
|
Stephen Gilbert
|
fda89c2940
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: c824f5120f [formerly 94a1a64ef0] [formerly 14258764bd] [formerly 14258764bd [formerly 91d469eb90]] [formerly c824f5120f [formerly 94a1a64ef0] [formerly 14258764bd] [formerly 14258764bd [formerly 91d469eb90]] [formerly 7992a6b15b [formerly 14258764bd [formerly 91d469eb90] [formerly 7992a6b15b [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]]]]
Former-commit-id: 7992a6b15b
Former-commit-id: d0955cccf7 [formerly 4297d1f4a1] [formerly 86953e803e] [formerly 3ac0a6a2f5c4ee8a89f9087e41380a5dc5881b33 [formerly 7d9adad19d0ed205e605a53d17ac72dfe7e55e8a] [formerly 86953e803e [formerly 7aaf3f44bc]]]
Former-commit-id: 24d1b7ad88d00f312aa07f0f25d05038a68a88a7 [formerly 93a80fa925256b902175fdfdcd66bdd73bab30f9] [formerly fc4715cc46 [formerly adf872f445]]
Former-commit-id: fc4715cc46
Former-commit-id: 452bfa9d84
|
2014-05-22 12:39:09 -04:00 |
|
Stephen Gilbert
|
50082a6d93
|
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans
Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c
Former-commit-id: 1c8656f5cf [formerly f68dd77088] [formerly 5885bff027] [formerly 5885bff027 [formerly 57cf6c4bd7]] [formerly 1c8656f5cf [formerly f68dd77088] [formerly 5885bff027] [formerly 5885bff027 [formerly 57cf6c4bd7]] [formerly e1b0c5f102 [formerly 5885bff027 [formerly 57cf6c4bd7] [formerly e1b0c5f102 [formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]]]]
Former-commit-id: e1b0c5f102
Former-commit-id: f3f6b8bf14 [formerly cba8b1a043] [formerly 042ca4e3ac] [formerly 8587ad9e982c85978eff539df6f3a7a3e06c39f4 [formerly 0d91c5d0a324d8adfbae13dd01caa6ab04972096] [formerly 042ca4e3ac [formerly 66295d65c5]]]
Former-commit-id: f680b2e3863a7a0d61146b37b18ccca6d827f8f1 [formerly b75bf4c3fb2ddd36a8e78f589932630ac1ec6283] [formerly c133eb60b0 [formerly f62acd10cc]]
Former-commit-id: c133eb60b0
Former-commit-id: fff3809e18
|
2014-05-15 18:31:17 -04:00 |
|
Stephen Gilbert
|
10edb27ed1
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 86ee4b88ee [formerly 80c8dae07c] [formerly 4602f86f47] [formerly 4602f86f47 [formerly bd2dad11b5]] [formerly 86ee4b88ee [formerly 80c8dae07c] [formerly 4602f86f47] [formerly 4602f86f47 [formerly bd2dad11b5]] [formerly ca9b7c8dfc [formerly 4602f86f47 [formerly bd2dad11b5] [formerly ca9b7c8dfc [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]]]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: 10672107f6 [formerly e325f8681e] [formerly da02372ba6] [formerly ee826c033710f4b1424d1d0b4ed86b00c0755c51 [formerly 14374ef5541f62dc41754f884fecd9cb2dab8bd0] [formerly da02372ba6 [formerly 4e5968d7b6]]]
Former-commit-id: 4f0cc6cb49e70e2026171a88bec2cfc4937d216e [formerly 1a4c235707b872790ae8769be83f713f6dd05c30] [formerly 47658e4f9b [formerly 7730224fe9]]
Former-commit-id: 47658e4f9b
Former-commit-id: 4e6957b497
|
2014-05-15 17:20:52 -04:00 |
|
Stephen Gilbert
|
f731c0a505
|
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans
Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c
Former-commit-id: 0c6c4a227e [formerly 458b5eedec] [formerly 1b1996c2be] [formerly 1b1996c2be [formerly dc67d789ca]] [formerly 0c6c4a227e [formerly 458b5eedec] [formerly 1b1996c2be] [formerly 1b1996c2be [formerly dc67d789ca]] [formerly 2ed94d9f2a [formerly 1b1996c2be [formerly dc67d789ca] [formerly 2ed94d9f2a [formerly 6833256be339a9512e9ba11fc018b037ca67f6d9]]]]]
Former-commit-id: 2ed94d9f2a
Former-commit-id: 173472bc9c [formerly dd7387fb5f] [formerly 4f531eac7d] [formerly 48c8773af7b29080daa009a08170865458823da9 [formerly 436d573f68e8170c7ae2c94a06af1bb4cdf63bc8] [formerly 4f531eac7d [formerly 00a0156b9a]]]
Former-commit-id: b8dfbf8456603f380edcc82073568ed3e5a41e09 [formerly 97c26b0b5c08d1a49ed077e19891aaac947fcdc5] [formerly 163aae52c2 [formerly 02110bee2c]]
Former-commit-id: 9150d4e169a8f22e3395646c4848cf402f2ce309 [formerly 163aae52c2]
Former-commit-id: d769cb7e7f
|
2014-05-15 16:18:36 -04:00 |
|
Stephen Gilbert
|
7cd47b2897
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 88bd253a25 [formerly 4e38223698] [formerly 7acac4244f] [formerly 7acac4244f [formerly ff4da2f31e]] [formerly 88bd253a25 [formerly 4e38223698] [formerly 7acac4244f] [formerly 7acac4244f [formerly ff4da2f31e]] [formerly 67b526b9ff [formerly 7acac4244f [formerly ff4da2f31e] [formerly 67b526b9ff [formerly ff3f1d5997b1a87d3dddc7ca3b3893602eba510e]]]]]
Former-commit-id: 67b526b9ff
Former-commit-id: 8a52b8e79d [formerly 723fcd474a] [formerly 26843256a6] [formerly 50a7a7d31cb258342d8daa5e47315e6aa358d225 [formerly 3ff45b7888ac2a37f80701f021fe2005858318ec] [formerly 26843256a6 [formerly 952cabb05b]]]
Former-commit-id: 7fb3aeb5997c131353d130142ff88900ffe49271 [formerly 756c8b385a1cb8a3cea3bba273f50f5618004a09] [formerly 53cf0c9d35 [formerly f43b96d202]]
Former-commit-id: 7f07bee1a0b5925a63fe82ceb96cddba20efad12 [formerly 53cf0c9d35]
Former-commit-id: 9e86c2cd5f
|
2014-05-15 14:50:35 -04:00 |
|
Brian Clements
|
fb1a9879c7
|
Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: 55103a72f5 [formerly 95a233a3a0] [formerly 437d9bb781] [formerly 437d9bb781 [formerly 2b1c7eaa37]] [formerly 55103a72f5 [formerly 95a233a3a0] [formerly 437d9bb781] [formerly 437d9bb781 [formerly 2b1c7eaa37]] [formerly 6bd43f79ff [formerly 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: a1d481654d [formerly f291884a77] [formerly abd29bf492] [formerly 0a6c63157fff72ed05c2605dc73a9bdfe3035ad0 [formerly b75f809dcbc407fb62db7fd2cd75e86e51c75269] [formerly abd29bf492 [formerly ee9757ea39]]]
Former-commit-id: ec136f1c399782bb8dc287c07f0cecc8cc69a733 [formerly 2b23fa6944d3b14df8bcd8b466b79df2877328aa] [formerly 7473191ba6 [formerly e9ee0bcbde]]
Former-commit-id: 7473191ba6
Former-commit-id: 2a628638f3
|
2014-05-14 13:45:09 -05:00 |
|
Steve Harris
|
47e779535f
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 93e28a9b99 [formerly 343444715e] [formerly 848519177d] [formerly 848519177d [formerly cf62cf4a6e]] [formerly 93e28a9b99 [formerly 343444715e] [formerly 848519177d] [formerly 848519177d [formerly cf62cf4a6e]] [formerly fc2bf6b45c [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 0fe3e0e53a [formerly ae2d525c8a] [formerly 32f255cada] [formerly 54629300a022d16ca1c8949bd8338320b17fb201 [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2] [formerly 32f255cada [formerly 233922471a]]]
Former-commit-id: 76181884912bc0ec139d4cc2c5e8c2b491e54254 [formerly d12e1920a9ce76da64ae45fed23fe5b2ed9fa884] [formerly 82045e2409 [formerly 74a325ce74]]
Former-commit-id: aaaf2fb1e902ff58192d1760a921860967488e87 [formerly 82045e2409]
Former-commit-id: 24df80c520
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
0a1757b58e
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: f09b247cf5 [formerly 82ce970ad6] [formerly 3aa2f7974b] [formerly 3aa2f7974b [formerly 386ec058e1]] [formerly f09b247cf5 [formerly 82ce970ad6] [formerly 3aa2f7974b] [formerly 3aa2f7974b [formerly 386ec058e1]] [formerly 41ba5fc348 [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 488300a935 [formerly 4004b627e2] [formerly dc5bc1d2a4] [formerly c8a4e30a5f995566fb1802d4777610dbce947436 [formerly 3193dce8b50276edb5c6e0829236339aa91b9172] [formerly dc5bc1d2a4 [formerly 2f704c898d]]]
Former-commit-id: 760c45c6db604172a2d2f98f66a3cf622dd859d2 [formerly 4b5ff1e5a8372daadb66b3b58132714ed0a54eae] [formerly 464cc1a479 [formerly 82663c0ab6]]
Former-commit-id: 464cc1a479
Former-commit-id: 9bc1055c87
|
2014-05-12 14:07:11 -04:00 |
|
Mike Duff
|
b769f3b939
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 5febea53ba [formerly 03a2c17f36] [formerly a6e0ed67d1] [formerly a6e0ed67d1 [formerly b23473ee8a]] [formerly 5febea53ba [formerly 03a2c17f36] [formerly a6e0ed67d1] [formerly a6e0ed67d1 [formerly b23473ee8a]] [formerly 335c02d2c6 [formerly a6e0ed67d1 [formerly b23473ee8a] [formerly 335c02d2c6 [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]]]
Former-commit-id: 335c02d2c6
Former-commit-id: c220a38faf [formerly 69e7cfa1ed] [formerly 0df3f51c87] [formerly 8971a2bedd77e551b8f1eab7c63d094a9c7dbce1 [formerly 66a76d720a0c13b3fdb3b03633d297e5d51e2487] [formerly 0df3f51c87 [formerly 16a973372e]]]
Former-commit-id: b9e198a161a30536eb0e180dd7b07c6b58bf51dc [formerly 5303ea642886a0d2399938a4719d496c60301888] [formerly 718fc22e25 [formerly 1dc95cf8de]]
Former-commit-id: 718fc22e25
Former-commit-id: f924c12ec6
|
2014-05-08 15:02:54 -05:00 |
|
Mike Duff
|
80397df8dc
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly 6a67638a94 [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]]
Former-commit-id: 6a67638a94
Former-commit-id: c2d2af733d [formerly 3966697849] [formerly f49192936a] [formerly 56a6c16ea4f1a3f74d2d52a263379061fd77a4d6 [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9] [formerly f49192936a [formerly 70c8135fde]]]
Former-commit-id: d91f1f7b692155a2393eef571952efd1878f2133 [formerly 79e94a80e7729225dba251b67e17c3517adc7fc5] [formerly 4adf657556 [formerly 916d90ee64]]
Former-commit-id: 4adf657556
Former-commit-id: 8904d8a501
|
2014-05-08 14:36:54 -05:00 |
|
Dave Hladky
|
b2b7ecd19f
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: fcb80a2b11 [formerly a14cb8c45f] [formerly e2a4bb6755] [formerly e2a4bb6755 [formerly c352643c79]] [formerly fcb80a2b11 [formerly a14cb8c45f] [formerly e2a4bb6755] [formerly e2a4bb6755 [formerly c352643c79]] [formerly 3b00ae03cc [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 1174c27f8c [formerly 5fc17cf3b8] [formerly ea791b5ca5] [formerly 7a0ec71e79da5fa2b51e6043955d28c246d5ea12 [formerly 271120a82cffba35438f0b9830c3a47c736fcb73] [formerly ea791b5ca5 [formerly bf42c8d740]]]
Former-commit-id: 630016c2f6f9e6fa6981721b0c411b2ba16af6b7 [formerly 966b34bc10a6cb76f151b577b0acae7fb953d804] [formerly a06db5a4e7 [formerly 5b11e45636]]
Former-commit-id: a06db5a4e7
Former-commit-id: 5fa53b22dc
|
2014-04-30 17:38:28 -05:00 |
|
Roger Ferrel
|
db035cb39c
|
Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig,
Former-commit-id: eb7ddbe973 [formerly 109a576c84] [formerly 8a1c15d7dc] [formerly 8a1c15d7dc [formerly 1f6c21885d]] [formerly eb7ddbe973 [formerly 109a576c84] [formerly 8a1c15d7dc] [formerly 8a1c15d7dc [formerly 1f6c21885d]] [formerly e07f655d1d [formerly 8a1c15d7dc [formerly 1f6c21885d] [formerly e07f655d1d [formerly aa99ca1708590f17f498651e86fe0ef8ea61e1e0]]]]]
Former-commit-id: e07f655d1d
Former-commit-id: 02a892115e [formerly 03ada5556d] [formerly 90a7ae6733] [formerly 6932876d7a44635b48430adeec23974d64d9934a [formerly dfcd11c48ac666952848082996545c7c4255e4e9] [formerly 90a7ae6733 [formerly 4c879a876c]]]
Former-commit-id: cc3689173cefe55859453863bfdc48819948bbb3 [formerly 413ed13d50d9d29e3c6ae47c622a837fa8575762] [formerly 785586d0b7 [formerly 80c1c3fae7]]
Former-commit-id: 785586d0b7
Former-commit-id: 60b6be8237
|
2014-04-17 16:40:38 -05:00 |
|
Roger Ferrel
|
4ade5599bc
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 31d48a6497 [formerly 84c10d3cd2] [formerly dc25ece75f] [formerly dc25ece75f [formerly 8ce590c31c]] [formerly 31d48a6497 [formerly 84c10d3cd2] [formerly dc25ece75f] [formerly dc25ece75f [formerly 8ce590c31c]] [formerly 3af564a653 [formerly dc25ece75f [formerly 8ce590c31c] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]]]
Former-commit-id: 3af564a653
Former-commit-id: 2f54b2ecae [formerly c1a0504758] [formerly 56da257816] [formerly e391f638bca60537fc36db55f039be32d2f5edcb [formerly 927fe825a123966e78c6c609abe7894b1787733e] [formerly 56da257816 [formerly 1214aac2a2]]]
Former-commit-id: 50fc522c0addbd75d76f43662b9a5e2de0267df1 [formerly 5ee188363d05f8c09d1fef8033e5b13d60428d1d] [formerly 25c92e4b11 [formerly 2e98b24e91]]
Former-commit-id: 25c92e4b11
Former-commit-id: a05ca67230
|
2014-04-17 08:57:15 -05:00 |
|
Mike Duff
|
7e454d7b0c
|
Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a
Former-commit-id: ded55c402c [formerly 150479174c] [formerly 9c690f8ecc] [formerly 9c690f8ecc [formerly 8d5486d1ff]] [formerly ded55c402c [formerly 150479174c] [formerly 9c690f8ecc] [formerly 9c690f8ecc [formerly 8d5486d1ff]] [formerly a072ce72bb [formerly 9c690f8ecc [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]]]]
Former-commit-id: a072ce72bb
Former-commit-id: 6b299fd4c0 [formerly b2826656af] [formerly f749f9b8d6] [formerly 43f349b9db7348b57d0d5df4a5e302e845b57f46 [formerly 26877de5811915ce716d7845fc18f7b421b67ccd] [formerly f749f9b8d6 [formerly 25eff8dcf5]]]
Former-commit-id: f980dc84d2bb9d2f03b4bdf25b2b50b695e82975 [formerly 56f0b7261a11ceab601a0eb11735f6c04f239269] [formerly 0a77645dc2 [formerly 62d94d740b]]
Former-commit-id: 0a77645dc2
Former-commit-id: 078becc022
|
2014-04-15 09:34:05 -05:00 |
|
Dave Hladky
|
cae43238a1
|
Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: 62ba92ce09 [formerly ec2c3b4af2] [formerly 2d18b657a8] [formerly 2d18b657a8 [formerly 1671baaf10]] [formerly 62ba92ce09 [formerly ec2c3b4af2] [formerly 2d18b657a8] [formerly 2d18b657a8 [formerly 1671baaf10]] [formerly 9479219b73 [formerly 2d18b657a8 [formerly 1671baaf10] [formerly 9479219b73 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]]]
Former-commit-id: 9479219b73
Former-commit-id: 07173bb624 [formerly b908654a83] [formerly 86287bb5df] [formerly b07d7d87fb17a3d9eeb21d7edd89ba29607d45a5 [formerly 6f17881da511134df9f83e5fdfe37fa16d15481a] [formerly 86287bb5df [formerly f26450c40d]]]
Former-commit-id: af5a69c7b95c511abdbe49ffab52d95a9a3e4f7b [formerly f804771d0b0a2e246911a4aba55370426917839a] [formerly fedb08a7eb [formerly 577b6402da]]
Former-commit-id: fedb08a7eb
Former-commit-id: 50c77e0a2f
|
2014-04-02 14:06:25 -05:00 |
|
Nate Jensen
|
816c97b641
|
Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe
Former-commit-id: ab2afd10f4 [formerly 0597c51f2e] [formerly 692ec623b2] [formerly 692ec623b2 [formerly 087307a781]] [formerly ab2afd10f4 [formerly 0597c51f2e] [formerly 692ec623b2] [formerly 692ec623b2 [formerly 087307a781]] [formerly cc1cb28eed [formerly 692ec623b2 [formerly 087307a781] [formerly cc1cb28eed [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]]]
Former-commit-id: cc1cb28eed
Former-commit-id: b6488c843f [formerly 235d98173d] [formerly 027a141c94] [formerly a52fb240fb25be2a1096b3696908c6eb5cd8a49d [formerly 613b1f0300b324dd34716e78d0468f23f6b5842b] [formerly 027a141c94 [formerly daf6997a59]]]
Former-commit-id: 6a0b4cf79746dc7f911bf5378bcde407e5b58f92 [formerly 5a7d08b0fbbf547a71e9f7dae7f3514bf2f92cc7] [formerly b1b0f40cdf [formerly 1485f7ff48]]
Former-commit-id: b1b0f40cdf
Former-commit-id: 288848e15b
|
2014-03-13 12:23:35 -05:00 |
|
Ron Anderson
|
05f4df9ae0
|
Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: 778001a035 [formerly d752e068c7] [formerly ab69d3e318] [formerly ab69d3e318 [formerly 1c727465ee]] [formerly 778001a035 [formerly d752e068c7] [formerly ab69d3e318] [formerly ab69d3e318 [formerly 1c727465ee]] [formerly bcfaf40ebf [formerly ab69d3e318 [formerly 1c727465ee] [formerly bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 8dfd2f2c7a [formerly cbd408ce4e] [formerly 06b0b5b684] [formerly e4634298a5e490a03e4933559cb0ff075da790bc [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66] [formerly 06b0b5b684 [formerly 4b2a388628]]]
Former-commit-id: 3690a965a5b6406fd20f8fd1793d16752aebdb3c [formerly cfe7b7159bee965bab52438c7b1f622e5351016b] [formerly 98e22f6e59 [formerly 4ffc16ce53]]
Former-commit-id: 98e22f6e59
Former-commit-id: 9accd00e1f
|
2014-03-13 11:11:53 -05:00 |
|
Brad Gonzales
|
62bd267aa4
|
Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: eb26a5fff4 [formerly 39afe190e0] [formerly b6e2ce4b74] [formerly b6e2ce4b74 [formerly 783afb1585]] [formerly eb26a5fff4 [formerly 39afe190e0] [formerly b6e2ce4b74] [formerly b6e2ce4b74 [formerly 783afb1585]] [formerly 8b2b50baaf [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: 47caba6828 [formerly c364269fae] [formerly f57f472f6a] [formerly da76109010e2d969c0bb3f0c1daffe7163befcd6 [formerly 0b393405d83191a17ccf6537e803d672cbc79eae] [formerly f57f472f6a [formerly 5ce1939d01]]]
Former-commit-id: 975783355735b7d7b23f0f9936145f02963c3f15 [formerly 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c] [formerly aa2d8b76a1 [formerly f4513d0e64]]
Former-commit-id: aa2d8b76a1
Former-commit-id: ac050068d5
|
2014-02-25 09:22:08 -06:00 |
|
Brad Gonzales
|
29ba66a1f4
|
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: fc18c805ee [formerly b0f71efecc] [formerly 49ddffc99b] [formerly 49ddffc99b [formerly 36a24c1cb5]] [formerly fc18c805ee [formerly b0f71efecc] [formerly 49ddffc99b] [formerly 49ddffc99b [formerly 36a24c1cb5]] [formerly 794bbc3c9b [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 4e3a5dcc97 [formerly 2330bf10b2] [formerly 3bb9975728] [formerly 12171d1f3b063d80005d8378e272d6df8e3ba968 [formerly 156a80d9ff219de8a2827577a58910cefd208d71] [formerly 3bb9975728 [formerly 90d34f7386]]]
Former-commit-id: 1f96b4d2e827bd07ec266f737aa9dc2b2f9968f7 [formerly f42b463f576142d80cc6c0dbb6de2708378d5614] [formerly d50a8cd7a5 [formerly b99b5d9373]]
Former-commit-id: d50a8cd7a5
Former-commit-id: d899777a6d
|
2014-02-18 12:11:02 -06:00 |
|
Nate Jensen
|
c0662a0fe6
|
Issue #2704 smarter thin client connectivity dialog and connection
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly fd43d9e095 [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 693defa040 [formerly 1dcb3a77c3] [formerly c0256ac19e] [formerly e414d7ae99d7b0b7973c924dbc575dede0b1ac56 [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486] [formerly c0256ac19e [formerly 2111989497]]]
Former-commit-id: dff40f4a0faab54f6550e22441c70ca2210f96cc [formerly 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5] [formerly 93a740106d [formerly 9e09da8bb6]]
Former-commit-id: 93a740106d
Former-commit-id: aba5c50bfe
|
2014-02-10 16:48:29 -06:00 |
|
Dave Hladky
|
f3c9512ae2
|
Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: cc5178d58b [formerly 1c8f6fb36d] [formerly 7fb7e10cda] [formerly 7fb7e10cda [formerly 6172c83afc]] [formerly cc5178d58b [formerly 1c8f6fb36d] [formerly 7fb7e10cda] [formerly 7fb7e10cda [formerly 6172c83afc]] [formerly 39f97723d6 [formerly 7fb7e10cda [formerly 6172c83afc] [formerly 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 6d515e02fa [formerly 14f2c99e46] [formerly 39f5579103] [formerly b6d46a59068b22a1e77d012039eae1b75d6f8498 [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de] [formerly 39f5579103 [formerly 2b998409f5]]]
Former-commit-id: eb329a2dfd9d98a8bae08185e259ccd68269c368 [formerly d275e71a9e574bd23d396da26d9a5eaa6435dea7] [formerly 59590fdf36 [formerly 8e2eb4d255]]
Former-commit-id: 59590fdf36
Former-commit-id: 36bc408bc2
|
2014-02-05 14:49:26 -06:00 |
|
Mike Duff
|
26b1e1aecd
|
Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: 41dde4ff18 [formerly 75faeae7e4] [formerly 2ca26aaa39] [formerly 2ca26aaa39 [formerly eee642ac9b]] [formerly 41dde4ff18 [formerly 75faeae7e4] [formerly 2ca26aaa39] [formerly 2ca26aaa39 [formerly eee642ac9b]] [formerly eb46191ba9 [formerly 2ca26aaa39 [formerly eee642ac9b] [formerly eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]]]
Former-commit-id: eb46191ba9
Former-commit-id: 2b50639797 [formerly b7b0bdbfdd] [formerly 38aeb23274] [formerly f679b4915b1a3b3451120fee468a1329a6cffe05 [formerly faacb82cc4cbe77a20073a957c9af17454152fba] [formerly 38aeb23274 [formerly 684390e599]]]
Former-commit-id: 125bc8c062ec33249fd48458e7521a181120fcb5 [formerly 9ebb64c46709c9a6c6431598e44ae990be200fb2] [formerly bd52f67e0c [formerly e8dea0d0dc]]
Former-commit-id: bd52f67e0c
Former-commit-id: 451406c3c5
|
2014-02-04 14:01:29 -06:00 |
|
Mike Duff
|
b17099779b
|
Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 22f021c814 [formerly 6be7c7f19d] [formerly 4440c27ff6] [formerly 4440c27ff6 [formerly 6e01cdb78e]] [formerly 22f021c814 [formerly 6be7c7f19d] [formerly 4440c27ff6] [formerly 4440c27ff6 [formerly 6e01cdb78e]] [formerly 1caacacfe3 [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]]]
Former-commit-id: 1caacacfe3
Former-commit-id: bb80dae449 [formerly 72add752c4] [formerly a76507e04f] [formerly 5167876268e2ab04f01aafdd88dcb74bdbbc4ffc [formerly 90eb5dfcc392c5bf771336615dc907357a6e0670] [formerly a76507e04f [formerly f4da152d87]]]
Former-commit-id: 8968e44ffcacac483698792e0b8734c3595e6543 [formerly 9da424eeb82f536b9d2ca78ee2c3cd261b97de50] [formerly 3495a67c27 [formerly 1f4cc8681d]]
Former-commit-id: 3495a67c27
Former-commit-id: 80bc52c4e7
|
2014-01-28 11:09:33 -06:00 |
|
Brad Gonzales
|
39f16fc69e
|
Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.
Change-Id: I1986de99319fdecd21a94579c499266b048d382a
Former-commit-id: 869c67af39 [formerly 208d18e28e] [formerly afbaf72617] [formerly afbaf72617 [formerly e94023097e]] [formerly 869c67af39 [formerly 208d18e28e] [formerly afbaf72617] [formerly afbaf72617 [formerly e94023097e]] [formerly 02f9fd20dc [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 22e6f77bfa [formerly 07eac8a84d] [formerly 71a32928d9] [formerly 4e2dbe9a0b721f28b40d49ba016e1a9fc7f528e3 [formerly 44dcb29c662d33832c30a88262faccc81d37a10a] [formerly 71a32928d9 [formerly a40afbe8ac]]]
Former-commit-id: 3f82aeacfa993cda4ec1aa5babf8e2898005e149 [formerly e98e41995555ae6eff555a6489dfa8be21dda1aa] [formerly 7707be3dcd [formerly f7c3c8c83d]]
Former-commit-id: 7707be3dcd
Former-commit-id: 7e84f1a451
|
2014-01-26 20:31:38 -06:00 |
|
Lee Venable
|
e1ef9e1595
|
Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
Former-commit-id: 65e208cfad [formerly ae3cf2d231] [formerly 1ea52fdbcd] [formerly 1ea52fdbcd [formerly 6c9a4394b7]] [formerly 65e208cfad [formerly ae3cf2d231] [formerly 1ea52fdbcd] [formerly 1ea52fdbcd [formerly 6c9a4394b7]] [formerly 805f63c0ec [formerly 1ea52fdbcd [formerly 6c9a4394b7] [formerly 805f63c0ec [formerly b6d4e063c3f99ba78a933435a87090e813643836]]]]]
Former-commit-id: 805f63c0ec
Former-commit-id: 1189c0ae60 [formerly 0d484d1268] [formerly d94aebebec] [formerly a361b08d0f266bea07bf5b03bcabe3c4648e8c59 [formerly 67a965ba9d9faed6e9ff353fb98752e5ac47a589] [formerly d94aebebec [formerly f43d763ec6]]]
Former-commit-id: 9b456e7102990af77592d12533d7548154af8677 [formerly a92ba185f4403086281b4a0a5aa0cee00fecc52e] [formerly a33a533acc [formerly 6c64419546]]
Former-commit-id: a33a533acc
Former-commit-id: b1d34fdb1e
|
2014-01-26 17:01:17 -06:00 |
|
Mike Duff
|
a8a939e32b
|
Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b
Former-commit-id: 7b775206e3 [formerly 439f0ab55a] [formerly a4a910daf1] [formerly a4a910daf1 [formerly 6f7cadba9f]] [formerly 7b775206e3 [formerly 439f0ab55a] [formerly a4a910daf1] [formerly a4a910daf1 [formerly 6f7cadba9f]] [formerly 4334640c22 [formerly a4a910daf1 [formerly 6f7cadba9f] [formerly 4334640c22 [formerly c0d49492af75d0411d6c0c2541af440302595b6a]]]]]
Former-commit-id: 4334640c22
Former-commit-id: 187a08ce2b [formerly 82ea159287] [formerly c8e199569a] [formerly 5bc5ae59fd18d29f4d13b9508eb2265d7d2b5eb3 [formerly ee5e22e05d90a6bf7102e085b4c3e6311e5a6121] [formerly c8e199569a [formerly 3e26dc54df]]]
Former-commit-id: a6749b19a7b39d558f8f8e6c083bba014699184e [formerly bf35956d28e0d66ed96bc4d2006f484c68071f63] [formerly 952c843d02 [formerly a7eed82b28]]
Former-commit-id: 952c843d02
Former-commit-id: 645998a25d
|
2014-01-25 14:09:02 -06:00 |
|
Dave Hladky
|
16becc0137
|
Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: a876043b7f [formerly c8af2af177] [formerly e15b9e2ba9] [formerly e15b9e2ba9 [formerly 523e100fd0]] [formerly a876043b7f [formerly c8af2af177] [formerly e15b9e2ba9] [formerly e15b9e2ba9 [formerly 523e100fd0]] [formerly 690b5b73cf [formerly e15b9e2ba9 [formerly 523e100fd0] [formerly 690b5b73cf [formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]]]]]
Former-commit-id: 690b5b73cf
Former-commit-id: 3bfc7f7c1c [formerly 415f804868] [formerly c87bd8b764] [formerly 02909013235963e7e3fd2a70ffef1e40d38918c5 [formerly 980f786bfb20e2cd526cc5a268a6de91237106d0] [formerly c87bd8b764 [formerly dccf640640]]]
Former-commit-id: 9f87d7450356e3d66fa3da7eccba24caf4a286f7 [formerly 907d1ea8d4446ef2d8111f61c5890cb05dc25cd8] [formerly 362f38157d [formerly fa350b76c9]]
Former-commit-id: 362f38157d
Former-commit-id: a7e3c8728a
|
2014-01-24 14:44:12 -06:00 |
|
Nate Jensen
|
728655bfb6
|
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: a0d6a58fa5 [formerly 26ce19331e] [formerly 9028260386] [formerly 9028260386 [formerly ae10129713]] [formerly a0d6a58fa5 [formerly 26ce19331e] [formerly 9028260386] [formerly 9028260386 [formerly ae10129713]] [formerly 9d529b3b21 [formerly 9028260386 [formerly ae10129713] [formerly 9d529b3b21 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 4d321739ea [formerly 9f4360fdda] [formerly 98e1bf9194] [formerly 4cf5053692185b2c257bfb70e053617804fecc75 [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9] [formerly 98e1bf9194 [formerly 1be41d69c6]]]
Former-commit-id: f8bd89c4d01d13a953925e32e798fb5361dde538 [formerly d4f72fd00fd9496a9587b235b75d9efcd7bc6b81] [formerly 86b9311ed4 [formerly 3d6d9118ea]]
Former-commit-id: 86b9311ed4
Former-commit-id: 9081058ca2
|
2014-01-15 17:36:30 -06:00 |
|
Brad Gonzales
|
08052a7632
|
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: e897eb1636 [formerly dd09d84c73] [formerly a2fbcecef6] [formerly a2fbcecef6 [formerly 3e3fcfa9af]] [formerly e897eb1636 [formerly dd09d84c73] [formerly a2fbcecef6] [formerly a2fbcecef6 [formerly 3e3fcfa9af]] [formerly 46a2a5f70f [formerly a2fbcecef6 [formerly 3e3fcfa9af] [formerly 46a2a5f70f [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]]]
Former-commit-id: 46a2a5f70f
Former-commit-id: ecf9a0bacc [formerly 26c902d957] [formerly 7e608842b2] [formerly ccb26b36229facdcd16307d739bfdd0b98730150 [formerly 4a9c736666cc3f62be99481509da930add8b7094] [formerly 7e608842b2 [formerly a1429a3911]]]
Former-commit-id: 96e338f50a3e06aeb6d8930980e94f5b1be301fe [formerly 89b9939480bd370d75e57032e518294ed0d2c802] [formerly 15bcc55822 [formerly d2fac3ed56]]
Former-commit-id: 98812d1f2fc770481dc28d116f365bcfaf6b5c4a [formerly 15bcc55822]
Former-commit-id: 69f2e8a94a
|
2014-01-15 17:16:47 -06:00 |
|
Mike Duff
|
61ed7074b8
|
Issue #2459 - Refactor the subscription status
Former-commit-id: 30d0eb8552 [formerly 43810aa5f5] [formerly d03c012a54] [formerly d03c012a54 [formerly f94593867e]] [formerly 30d0eb8552 [formerly 43810aa5f5] [formerly d03c012a54] [formerly d03c012a54 [formerly f94593867e]] [formerly 245d76358e [formerly d03c012a54 [formerly f94593867e] [formerly 245d76358e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]]
Former-commit-id: 245d76358e
Former-commit-id: bf473938c1 [formerly c5f28e0f37] [formerly 9a45b95db6] [formerly 2930082feeaef4294301d37aa40710da24a29a9e [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1] [formerly 9a45b95db6 [formerly d96a9d2937]]]
Former-commit-id: 7b40453ef855f5b1cef31d7883ff7634b4a33179 [formerly 86f4629abcfe03116c78ec209c22d6df91eac0b9] [formerly c8f7edbcad [formerly 3c0634b1e8]]
Former-commit-id: c8f7edbcad
Former-commit-id: 5ea95dbca9
|
2014-01-15 09:21:30 -06:00 |
|
Dave Hladky
|
c194389e0f
|
Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 58cd2d5dd7 [formerly 19cbf638a6] [formerly 56b0f4274d] [formerly 56b0f4274d [formerly fee9c183f9]] [formerly 58cd2d5dd7 [formerly 19cbf638a6] [formerly 56b0f4274d] [formerly 56b0f4274d [formerly fee9c183f9]] [formerly 8a6a386410 [formerly 56b0f4274d [formerly fee9c183f9] [formerly 8a6a386410 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]]]]
Former-commit-id: 8a6a386410
Former-commit-id: 8c5a72aee2 [formerly c2bb3ee199] [formerly 5cf9c5bd1c] [formerly 0f911b5e9188cae4b56697513969e36bd36d0ef0 [formerly a001b689127d9b92213eb6050018ef7a8258e0a4] [formerly 5cf9c5bd1c [formerly 79e5b19f31]]]
Former-commit-id: e1c6c2627a052045b7797463308e047a263f92ac [formerly 745af6f55324ec395ec49d15edf5bdbb524c063c] [formerly 30516610ca [formerly 6a708e4cd6]]
Former-commit-id: 30516610ca
Former-commit-id: 8f841bfd4b
|
2014-01-14 15:29:15 -06:00 |
|
Brad Gonzales
|
ccfaf13162
|
Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription. Add environment configuration files to unit tests setup. Changed the
devRegistry debug port to the same port as registry.
Amend: Updates from peer review.
Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a
Former-commit-id: d71450a7a2 [formerly 2c0c6fbcc7] [formerly 8eeb3dc412] [formerly 8eeb3dc412 [formerly 4537513df7]] [formerly d71450a7a2 [formerly 2c0c6fbcc7] [formerly 8eeb3dc412] [formerly 8eeb3dc412 [formerly 4537513df7]] [formerly 343a2495e5 [formerly 8eeb3dc412 [formerly 4537513df7] [formerly 343a2495e5 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]]]
Former-commit-id: 343a2495e5
Former-commit-id: b6a5a49cc3 [formerly 6868d8d12d] [formerly f57529be9b] [formerly 6aa1c689e8c9f765b88ca40292720f6e4c73778f [formerly 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0] [formerly f57529be9b [formerly 4049af9630]]]
Former-commit-id: 306f7041bc89c7891288bb790cf1e9d47873a27b [formerly 2c41b1048f19e32de7cfb868829f77a4d1b22782] [formerly b8c7be1225 [formerly 8b362ee404]]
Former-commit-id: b8c7be1225
Former-commit-id: d5d66b8731
|
2014-01-10 16:37:09 -06:00 |
|
Mike Duff
|
535cbe71e7
|
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 1c2129636c [formerly 99d7e51456] [formerly 30b65a4fe7] [formerly 30b65a4fe7 [formerly 183ca614df]] [formerly 1c2129636c [formerly 99d7e51456] [formerly 30b65a4fe7] [formerly 30b65a4fe7 [formerly 183ca614df]] [formerly a264cb06a1 [formerly 30b65a4fe7 [formerly 183ca614df] [formerly a264cb06a1 [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]]
Former-commit-id: a264cb06a1
Former-commit-id: a4649801bb [formerly f6d58f7615] [formerly 05b6508299] [formerly 1d53589aae333bfbef17fe6c7cd4ba79441d556e [formerly 1723170c25ee5bf976e58a1096d080a768d79925] [formerly 05b6508299 [formerly 4620b69f08]]]
Former-commit-id: fff79c1b223ada153a1ef5fb82e2273e31f8f30b [formerly eda2ee87762a8696e1f7816588a6c03614038065] [formerly 621bbe5ce6 [formerly 4bd12c488b]]
Former-commit-id: 621bbe5ce6
Former-commit-id: f5d13adc34
|
2014-01-09 10:29:21 -06:00 |
|
Ben Steffensmeier
|
1cf47cf537
|
Issue #2619 Fix rare dateline bug.
Former-commit-id: 3ce459f964 [formerly 1b99b5aca0] [formerly 45e4b4bbad] [formerly 45e4b4bbad [formerly 399c579671]] [formerly 3ce459f964 [formerly 1b99b5aca0] [formerly 45e4b4bbad] [formerly 45e4b4bbad [formerly 399c579671]] [formerly 607b5edb69 [formerly 45e4b4bbad [formerly 399c579671] [formerly 607b5edb69 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]]]
Former-commit-id: 607b5edb69
Former-commit-id: 7c16bac8d9 [formerly 6a35407957] [formerly 58dabbfc87] [formerly 50acce836f5bcd5e02b9bf1ec878892a22765b0b [formerly fc52d111900f81c3257ff7f1b3c079e152fb00d3] [formerly 58dabbfc87 [formerly d0f4b18b78]]]
Former-commit-id: dc15c6aa8ae863a3fef637a4f88cbf90e932cc49 [formerly 9fc0459f3f576463d2cc040689f06ba824bcec45] [formerly 463ad8e8fa [formerly a92f15a8fa]]
Former-commit-id: 463ad8e8fa
Former-commit-id: c41c64ce5b
|
2013-12-12 10:30:22 -06:00 |
|
Brad Gonzales
|
541539390d
|
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 77762db912 [formerly 310597d856] [formerly 3d34764022] [formerly 3d34764022 [formerly 410a00c72a]] [formerly 77762db912 [formerly 310597d856] [formerly 3d34764022] [formerly 3d34764022 [formerly 410a00c72a]] [formerly 72df38075f [formerly 3d34764022 [formerly 410a00c72a] [formerly 72df38075f [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]]
Former-commit-id: 72df38075f
Former-commit-id: f598eecc2f [formerly fa097589d0] [formerly e18f7b2380] [formerly af503b4cfde578d15368ce0beaa496ee596e6091 [formerly d6d85c281b70c2e07827f44bc42368ab797e8062] [formerly e18f7b2380 [formerly c54fe467a3]]]
Former-commit-id: cb07a4bb3a147795a5b47c0fd4501839fdcffa8c [formerly e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58] [formerly 143e160eae [formerly 3d592d0b38]]
Former-commit-id: d5d341a8f6bbcb4641fe09422e5de6618d27677f [formerly 143e160eae]
Former-commit-id: d1fa8c738b
|
2013-12-05 15:17:14 -06:00 |
|