Mike Duff
|
efec4d0365
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
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/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 5d72795e1b [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
|
2013-03-26 09:19:39 -05:00 |
|
Ron Anderson
|
60c1c27225
|
Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: f4f180face [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]
Former-commit-id: 73678261b6
Former-commit-id: 7e6b601a09
|
2013-03-25 17:53:46 -05:00 |
|
Lee Venable
|
b329abb111
|
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: e467daec0c [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]
Former-commit-id: 05b4c2f913
Former-commit-id: d73b44fa67
|
2013-03-25 17:20:25 -05:00 |
|
Mike Duff
|
9a9d8f0503
|
Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: afd0de8b5b [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]
Former-commit-id: 88e75f4a90
Former-commit-id: b517ce9a9f
|
2013-03-25 16:03:18 -05:00 |
|
Jonathan Sanchez
|
dad851857d
|
Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 06cd161d0e [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
|
2013-03-25 14:41:55 -05:00 |
|
Lee Venable
|
cc0debe027
|
Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 25cf1cacfd [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]
Former-commit-id: d1c84de620
Former-commit-id: fc41aa82ca
|
2013-03-25 14:08:39 -05:00 |
|
Steve Harris
|
f1d156779a
|
13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
|
2013-03-25 13:27:13 -05:00 |
|
Jonathan Sanchez
|
6e02206355
|
Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: d00c88a38c [formerly d00c88a38c [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]
Former-commit-id: b77ed18eb4
Former-commit-id: 539c4dfa8e
|
2013-03-25 12:23:51 -05:00 |
|
Mike Duff
|
516965bea3
|
Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc
Former-commit-id: 593cb668bf [formerly 593cb668bf [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
|
2013-03-24 12:21:51 -05:00 |
|
David Gillingham
|
7a2c92efc7
|
Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 79a1520baf [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c3ce4058a0
|
2013-03-22 10:39:13 -05:00 |
|
Lee Venable
|
c733749c9f
|
Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: 489e04c235 [formerly 489e04c235 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]
Former-commit-id: c8523e9108
Former-commit-id: 0d1cba8eae
|
2013-03-21 19:27:02 -05:00 |
|
Mike Duff
|
8c1b60bae9
|
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: e4ffefa649 [formerly e4ffefa649 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]
Former-commit-id: 09feff70e0
Former-commit-id: a45389f735
|
2013-03-21 12:23:56 -05:00 |
|
Ben Steffensmeier
|
9feaaa1961
|
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: e69011cdd8 [formerly e69011cdd8 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]
Former-commit-id: de02fe7922
Former-commit-id: 6ce135a80a
|
2013-03-21 11:09:23 -05:00 |
|
Steve Harris
|
8065161896
|
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: fa15f03e1b [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
|
2013-03-20 16:06:20 -05:00 |
|
Steve Harris
|
f2cc967a4f
|
13.3.1-10 baseline
Former-commit-id: 073687d9a9 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
|
2013-03-20 15:53:01 -05:00 |
|
Richard Peter
|
ff1b1598e6
|
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: 3b8e2ff0d3 [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]
Former-commit-id: adbe7b91cc
Former-commit-id: 3bad342dca
|
2013-03-20 13:32:33 -05:00 |
|
Ben Steffensmeier
|
57d19b0d66
|
Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: ee7204c05c [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]
Former-commit-id: 82499f839d
Former-commit-id: 3e2a41d1d2
|
2013-03-20 13:26:33 -05:00 |
|
Ben Steffensmeier
|
498d153e40
|
Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 2b6aa86371 [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: ed544fc17c
Former-commit-id: 646b61f653
|
2013-03-20 13:05:54 -05:00 |
|
Dave Hladky
|
8299b2872a
|
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: 90f7f2110b [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
65f522fc87
|
13.3.1-9 baseline
Former-commit-id: 468ae82305 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
|
2013-03-19 14:22:56 -05:00 |
|
Richard Peter
|
1bf2c48011
|
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 4ce10bced9 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]
Former-commit-id: 3a92747518
Former-commit-id: c955b3b640
|
2013-03-19 13:24:28 -05:00 |
|
Mike Duff
|
144223ed9b
|
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: b115d3611c [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]
Former-commit-id: 058064ce0d
Former-commit-id: 7e66c8e46d
|
2013-03-19 10:10:01 -05:00 |
|
Ben Steffensmeier
|
e176478c7a
|
Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 6c741a9ab3 [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 86dffab17d
Former-commit-id: dfe8de96f2
|
2013-03-18 17:16:44 -05:00 |
|
Steve Harris
|
fc6748cb3e
|
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: 1a999fee5a [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
|
2013-03-18 16:43:22 -05:00 |
|
Steve Harris
|
0c94cc97fb
|
13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
|
2013-03-18 15:43:32 -05:00 |
|
Lee Venable
|
cac220879d
|
Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: 456fd056f4 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]
Former-commit-id: 93e99b64a6
Former-commit-id: 3a1dc41b50
|
2013-03-14 17:19:38 -05:00 |
|
Dave Hladky
|
5bf3f5f89f
|
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: 9b495681ec [formerly 9b495681ec [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]
Former-commit-id: c57d5574ef
Former-commit-id: db207a732c
|
2013-03-14 15:59:39 -05:00 |
|
Ron Anderson
|
e6ba869694
|
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: 16d93dab84 [formerly 16d93dab84 [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]
Former-commit-id: fc749ff3eb
Former-commit-id: 7087e1ebe7
|
2013-03-14 14:55:31 -05:00 |
|
Ben Steffensmeier
|
153a7dbd7d
|
Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 7aa8b2d3eb [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 364d6fd9ee
|
2013-03-14 13:26:08 -05:00 |
|
Greg Armendariz
|
8ea2042456
|
Removed merge code from the source code
Former-commit-id: 5511f0b3a6 [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]
Former-commit-id: 2f9136843b
Former-commit-id: 3a3486b0b7
|
2013-03-14 11:15:08 -05:00 |
|
Nate Jensen
|
363efaec00
|
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 29b4cd2fb5 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]
Former-commit-id: 490ffe2772
Former-commit-id: a933532ad9
|
2013-03-14 09:48:16 -05:00 |
|
Ben Steffensmeier
|
60bb04a055
|
Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: 22624ba5d3 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]
Former-commit-id: 52c167cf00
Former-commit-id: 8f6a7c0746
|
2013-03-13 18:52:52 -05:00 |
|
Ron Anderson
|
b1088415cd
|
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 3b65608373 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]
Former-commit-id: 61f74305e2
Former-commit-id: a7b6e1689b
|
2013-03-13 17:16:37 -05:00 |
|
Ben Steffensmeier
|
6d699f7713
|
Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 4c150b0fd6 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 89eb902284
Former-commit-id: 7abf3cfb39
|
2013-03-13 17:09:20 -05:00 |
|
Dave Hladky
|
cb5ee4a7b8
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 38b952a220 [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
3084a860cd
|
13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
|
2013-03-13 09:50:28 -05:00 |
|
Dave Hladky
|
29ed641a13
|
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e0 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
|
2013-03-12 15:48:34 -05:00 |
|
Lee Venable
|
b0e9ea9157
|
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: d5af1f02c5 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]
Former-commit-id: 28d74d91b0
Former-commit-id: e080fb5106
|
2013-03-12 09:08:44 -05:00 |
|
Mike Duff
|
659a2a4f4c
|
Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 6a6844fdaf [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]
Former-commit-id: cac9bd6119
Former-commit-id: caed059e23
|
2013-03-12 09:03:08 -05:00 |
|
Steve Harris
|
c6f379f59a
|
13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
|
2013-03-12 08:35:45 -05:00 |
|
Roger Ferrel
|
0bbe51355e
|
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 4deb731bd0 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
|
2013-03-11 13:00:44 -05:00 |
|
Dave Hladky
|
6fe48593f0
|
Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: 2a854d7c30 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: bb4c54eff0
Former-commit-id: 73c21a6ead
|
2013-03-08 09:58:17 -06:00 |
|
Nate Jensen
|
63eb6e6d21
|
Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: a7e9cfdb39 [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]
Former-commit-id: 163f93019b
Former-commit-id: d6c3c84d30
|
2013-03-06 09:36:00 -06:00 |
|
Jonathan Sanchez
|
1403713fab
|
Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 8f70214f66 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 6a3281c878
Former-commit-id: c2b021427b
|
2013-03-05 16:02:47 -06:00 |
|
Steve Harris
|
b630339eb7
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 305dd72969 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
|
2013-03-05 12:27:49 -06:00 |
|
Steve Harris
|
1f98e01c57
|
13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
0df35cc5ec
|
13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
|
2013-03-05 10:39:59 -06:00 |
|
Nate Jensen
|
bb5553abb1
|
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: b803ae3801 [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: a952d48b3e
Former-commit-id: e3db522be4
|
2013-03-05 09:10:52 -06:00 |
|
Richard Peter
|
6b08735982
|
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 070f62d08e [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
|
2013-03-04 17:48:05 -06:00 |
|
Dave Hladky
|
fc90d47619
|
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 680317d9c4 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
|
2013-03-04 17:41:11 -06:00 |
|