Bryan Kowal
b805f1db0d
Omaha #3475 - PostgreSQL Upgrade.
...
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting
Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3
Former-commit-id: a2be914331
[formerly f6bc96829e
[formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]
Former-commit-id: f6bc96829e
Former-commit-id: 3d68ae0c78
2014-08-12 15:10:39 -05:00
Mark Peters
4ab3b14b30
Omaha #3504 Replace Raytheon references to IODataPreparer
...
Change-Id: I376f430154996944bd49c2e72d89e57537b68084
Former-commit-id: 5b3893c56f
[formerly ca0df210d9
[formerly 08621067f8046b4260e87583d16950fee1e741de]]
Former-commit-id: ca0df210d9
Former-commit-id: 70a7f2215f
2014-08-12 12:15:35 -05:00
Benjamin Phillippe
5b6104a8ad
Omaha #3509 Aded support for custom XACML policies
...
Change-Id: I37c0aac34cbcc30be2a48876cef27cdf97c35a33
Former-commit-id: e9c310b4d8
[formerly 1410dc479e
[formerly 1b1cd7789f835fd73dbc0d939df03f6417600154]]
Former-commit-id: 1410dc479e
Former-commit-id: b68b812dbc
2014-08-12 10:31:49 -05:00
Brian Clements
73b2585d80
Omaha #3477 changed plot info locations to floats
...
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61
Former-commit-id: 8738e9cece
[formerly f8a1e79288
[formerly 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5]]
Former-commit-id: f8a1e79288
Former-commit-id: 3b97fd15a7
2014-08-11 13:43:22 -05:00
Nate Jensen
63fcba10af
Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1
...
Former-commit-id: 310f314b81
[formerly fed30c111e
[formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]
Former-commit-id: fed30c111e
Former-commit-id: de91441935
2014-08-11 13:25:17 -05:00
Richard Peter
03b926741e
Merge "Omaha #3503 common.serialization changes" into omaha_14.4.1
...
Former-commit-id: 62b4b9458d
[formerly c2997b1e02
[formerly 797f86abfbfa65f33826fd95e2967a17e91ba2bd]]
Former-commit-id: c2997b1e02
Former-commit-id: c4d9f519e8
2014-08-11 12:02:04 -05:00
Mark Peters
68f61a9454
Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump
...
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e
Former-commit-id: 490f7ea209
[formerly a73ca1f8c1
[formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]
Former-commit-id: a73ca1f8c1
Former-commit-id: 5121ddaa12
2014-08-11 10:08:38 -05:00
Brian Clements
49c5275ea8
Omaha #3502 removed common.convert from rcm feature
...
Change-Id: Ide8208d497a2054d8e2ed2a9d37a3aebdcfe174e
Former-commit-id: a1ab0d0e26
[formerly b93d4be8dd
[formerly 5b81fd2b345855c7642654d2fd5481ae07e1052b]]
Former-commit-id: b93d4be8dd
Former-commit-id: d1552244bf
2014-08-11 09:56:53 -05:00
Brian Clements
8d499b9101
Omaha #3502 added common.convert to alertviz and rcm features
...
Change-Id: I504f85bedf1a53c6016a1b73a93549ccf3161aac
Former-commit-id: a0e9de7745
[formerly 96b496c98a
[formerly b4de3831bd44735d3648d93129a4eeaf406a70d0]]
Former-commit-id: 96b496c98a
Former-commit-id: a28a3d626a
2014-08-11 08:21:26 -05:00
Richard Peter
a848bb1819
Merge "Omaha #3502 common.util changes" into omaha_14.4.1
...
Former-commit-id: ddf406d1fd
[formerly 30e4033081
[formerly ba40f480460358435192de6c8aad771b10682eaa]]
Former-commit-id: 30e4033081
Former-commit-id: cf9f83502d
2014-08-08 18:05:07 -05:00
Brian Clements
81144aa9e2
Omaha #3503 common.serialization changes
...
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: 415f2dff64
[formerly 90d492c1dc
[formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]
Former-commit-id: 90d492c1dc
Former-commit-id: 9c09de5779
2014-08-08 12:50:06 -05:00
Richard Peter
ccade18bbe
Merge "Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be built into an RPM for Work Assignments." into omaha_14.4.1
...
Former-commit-id: a009e70cdf
[formerly 69dfcbe39e
[formerly 1db96f8ae03936ea8d3ce43e95fc9940485b040c]]
Former-commit-id: 69dfcbe39e
Former-commit-id: c98cfef25c
2014-08-07 16:49:37 -05:00
Brian Clements
d7defbe7ca
Omaha #3502 common.util changes
...
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: fc322a74b2
[formerly c3e1b5c9a2
[formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]
Former-commit-id: c3e1b5c9a2
Former-commit-id: 4d3bb07573
2014-08-07 16:48:57 -05:00
Nate Jensen
4784a3175d
Merge "Omaha #3483 Split Volume Browser fields menus into multiple reusable components." into omaha_14.4.1
...
Former-commit-id: 07bb8808cc
[formerly 58bb6bbe07
[formerly 9996ecfcbb3074f571163cc195118d5254f24c6c]]
Former-commit-id: 58bb6bbe07
Former-commit-id: 2df0a00989
2014-08-07 11:22:45 -05:00
Nate Jensen
2232117e58
Merge "Omaha #3478 removed PointDataDescription.Type.Double from code and config" into omaha_14.4.1
...
Former-commit-id: 98db472128
[formerly 9c6e850045
[formerly d432ac935d2fff4e729ea29dec8c5babe4ffd6e7]]
Former-commit-id: 9c6e850045
Former-commit-id: d315ccd78d
2014-08-07 11:12:29 -05:00
Brian Clements
3e75cc1897
Omaha #3478 removed PointDataDescription.Type.Double from code and config
...
Change-Id: I85eabcbe7afc0543c98d23e2c194b9e30a14db13
Former-commit-id: a46c71bbfb
[formerly 9374355af3
[formerly b548a88c6850a558c021a55657edaa6466d57e51]]
Former-commit-id: 9374355af3
Former-commit-id: 1538c88955
2014-08-07 10:40:14 -05:00
Mark Peters
ae58a69d25
Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
...
Change-Id: I68c4757365ad1bcb6254f78fe26b98b333cf7b5a
Former-commit-id: 3ef2459491
[formerly dd85085986
[formerly fbebe6213718025ecf2288c0d57627df53e4bc5e]]
Former-commit-id: dd85085986
Former-commit-id: f7205e8a31
2014-08-07 10:00:34 -05:00
Nate Jensen
436a1859d7
Merge "Omaha #3185 only import java DAF support classes when they're actually used" into omaha_14.4.1
...
Former-commit-id: 2c942239bb
[formerly e814b8b302
[formerly 6d2d12891f1ca1b7cf3dcc492c5418d5ff10b2e3]]
Former-commit-id: e814b8b302
Former-commit-id: f55ac6a1ba
2014-08-07 09:11:17 -05:00
Bryan Kowal
0999a2c431
Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be
...
built into an RPM for Work Assignments.
Former-commit-id: 1ad9e31075
[formerly 2687b16d49
[formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]]
Former-commit-id: 2687b16d49
Former-commit-id: 5ec6da9f31
2014-08-06 17:46:39 -05:00
Nate Jensen
4af502b88a
Omaha #3185 only import java DAF support classes when they're actually used
...
Change-Id: Ie7db12940fb0b6a0efbd3e43566cc2f647cd40ec
Former-commit-id: e929584e65
[formerly ed409784ed
[formerly eb435ae129753ea739d236a2d24165a4b3bbe109]]
Former-commit-id: ed409784ed
Former-commit-id: 414b8ab56c
2014-08-06 17:31:06 -05:00
Mark Peters
421b592791
Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
...
Change-Id: I708204d02f566c6e2ce8b7867908ea200aa07baa
Former-commit-id: f930f1032f
[formerly 53586ec52c
[formerly f44418a1e872dfea47a94325306198b65e5e0214]]
Former-commit-id: 53586ec52c
Former-commit-id: 42cfd9018d
2014-08-06 16:35:32 -05:00
Brian Clements
c6fa6d0103
Omaha #3499 added sparse array memory optimization to grid
...
Change-Id: I1db409a565e371fe5aa90f3dc7f921ea1004baa9
Former-commit-id: fcb130e3f8
[formerly 8dc30a64de
[formerly 3b6b13dcf270aac9d19dee095dfd6bd78f13137d]]
Former-commit-id: 8dc30a64de
Former-commit-id: 9b4a50cef9
2014-08-06 16:23:33 -05:00
Nate Jensen
41f9aa07f0
Merge "Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14" into omaha_14.4.1
...
Former-commit-id: 75e8c49fba
[formerly 317548b267
[formerly 1a6f8e111a7f160bc50fd160356187e23c055da7]]
Former-commit-id: 317548b267
Former-commit-id: 64c365e198
2014-08-06 15:57:20 -05:00
Lee Venable
8067807354
Merge "Omaha #3453 Refreshing the viewer on every spell check job to correctly update underlining." into omaha_14.4.1
...
Former-commit-id: 73eb3e7bbb
[formerly 5059f537d9
[formerly 12b398f07485e5c12b3f8970732720814eee2987]]
Former-commit-id: 5059f537d9
Former-commit-id: cbc6b73ee0
2014-08-06 15:26:08 -05:00
Robert Blum
0b67acf5ee
Omaha #3453 Refreshing the viewer on every spell check job to correctly update underlining.
...
Change-Id: I5e037a7b3e85fd794966bd351ae37777abb0d193
Former-commit-id: 6d49b0f7ae
[formerly 8b6fd81e10
[formerly f27b34bc0aa50d13415dde6153676d3a9484c9ab]]
Former-commit-id: 8b6fd81e10
Former-commit-id: fc1487a56b
2014-08-06 15:09:17 -05:00
Nathan Bowler
7727ac1fd2
Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
...
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10
Former-commit-id: 2cede8a84f
[formerly 3f2c4818d9
[formerly 661677010f27b455c19677d22a27f42e3dba184e]]
Former-commit-id: 3f2c4818d9
Former-commit-id: a2dc4559dd
2014-08-06 14:41:01 -04:00
Nate Jensen
63710135df
Merge "Omaha #3157 Fix merge issue in ActiveTable.py" into omaha_14.4.1
...
Former-commit-id: d7b2aafc28
[formerly a0e549548e
[formerly 23531f3f952d0c1f00502e446b10350400e26953]]
Former-commit-id: a0e549548e
Former-commit-id: 0dd86d4ba8
2014-08-06 12:49:55 -05:00
Ron Anderson
9feb625df5
Omaha #3157 Fix merge issue in ActiveTable.py
...
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514
Former-commit-id: 0f20f6d251
[formerly 6393d231e1
[formerly 295f52411e700afddc04390b7016e627d7c676bd]]
Former-commit-id: 6393d231e1
Former-commit-id: 49988ea258
2014-08-06 09:59:14 -05:00
Greg Armendariz
4cfb1933ea
Omaha #3327 - update topo rpm to include gmted2010.h5
...
Former-commit-id: 7f7c443494
[formerly f6842be3ed
[formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]]
Former-commit-id: f6842be3ed
Former-commit-id: b369662fd9
2014-08-06 09:46:45 -05:00
Nate Jensen
ee4c4fd502
Merge "Omaha #3328 Merged it.geosolutions into org.geotools." into omaha_14.4.1
...
Former-commit-id: 3c7013475b
[formerly a70659b106
[formerly 026b22dcb808198ae3bc59aa3d6884da80a3073e]]
Former-commit-id: a70659b106
Former-commit-id: 5d667a7248
2014-08-05 18:00:03 -05:00
Mark Peters
64bd91788b
Omaha #3489 Replace Raytheon plugin calls to deprecated IGraphicsTarget.getStringBounds()
...
Change-Id: Ie4c6093ff96e88332b719b9f88434bdd128770ea
Former-commit-id: 7d82d522e4
[formerly 1b5b707601
[formerly 331b5994cc4bcd95138b15461b5040004f03d3fd]]
Former-commit-id: 1b5b707601
Former-commit-id: 90be52aac1
2014-08-05 14:30:06 -05:00
Nate Jensen
6f8270f014
Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
...
Former-commit-id: 5e8797ef77
[formerly 04083235ad
[formerly 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae]]
Former-commit-id: 04083235ad
Former-commit-id: 7165ef7f12
2014-08-05 10:33:40 -05:00
Nate Jensen
2924215c63
Merge "Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui since those plugins don't even have buddy policies" into omaha_14.4.1
...
Former-commit-id: 69a7955015
[formerly 0873be5eac
[formerly 4e837f409cdc55d597b8fcd019381353a5bd5b29]]
Former-commit-id: 0873be5eac
Former-commit-id: a6ac3609a9
2014-08-05 10:33:29 -05:00
Nate Jensen
b77d2ba410
Omaha #3356 remove unreferenced registered buddy policies
...
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6
Former-commit-id: 7fb8a476f7
[formerly cc56bc4b3b
[formerly 9ff58fb62685fbb2f9322842ecdab40c78a8536e]]
Former-commit-id: cc56bc4b3b
Former-commit-id: 69d1481634
2014-08-05 09:27:10 -05:00
Steve Harris
d606269c5b
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: bf9a0fa5de
[formerly 0fb743ec44
[formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
2014-08-04 22:20:29 -05:00
Nate Jensen
f83883f478
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
...
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: f8d9235104
[formerly 6e94ea9d2b
[formerly 4f691341c0368c3e015c73f25aab0cf8877802ac]]
Former-commit-id: 6e94ea9d2b
Former-commit-id: 92b1fb11e5
2014-08-04 18:03:15 -05:00
Steve Harris
9c145d8e2e
Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
...
Former-commit-id: 7a8cdaea54
[formerly 941efaf857
[formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]]
Former-commit-id: 941efaf857
Former-commit-id: 3a10442f6e
2014-08-04 16:04:11 -05:00
Nate Jensen
9b617fb455
Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1
...
Former-commit-id: 61654ad2d1
[formerly b3af25916c
[formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]
Former-commit-id: b3af25916c
Former-commit-id: c30297b1b0
2014-08-04 14:49:57 -05:00
Nate Jensen
f3bc675b03
Merge "Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()" into omaha_14.4.1
...
Former-commit-id: 163da01258
[formerly 3d742ecce7
[formerly 6192b481a59657fea18c2a2e19a7decb717972a9]]
Former-commit-id: 3d742ecce7
Former-commit-id: 28f6f0b924
2014-08-04 14:02:06 -05:00
Nate Jensen
618fe64b52
Merge "Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode" into omaha_14.4.1
...
Former-commit-id: 478216de93
[formerly 9cfc0e27d5
[formerly 1858a9b22e9b34c5fbe167ab8636c1a03e820a5e]]
Former-commit-id: 9cfc0e27d5
Former-commit-id: 1df98fb269
2014-08-04 13:57:11 -05:00
Nate Jensen
9dfd6cde3f
Merge "Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()" into omaha_14.4.1
...
Former-commit-id: 5a15ce6706
[formerly 105cfe7208
[formerly 6e832a42daf9c235a8f5df9c99efc3862cf99cbf]]
Former-commit-id: 105cfe7208
Former-commit-id: ccf1c4296c
2014-08-04 13:57:00 -05:00
Nate Jensen
0039bd4e6a
Merge "Omaha #3427 decoder interface now takes full path to jar" into omaha_14.4.1
...
Former-commit-id: f697efd6be
[formerly 964582d277
[formerly 8587fe7d4577fc1667c75e79535e81129b871e35]]
Former-commit-id: 964582d277
Former-commit-id: 549b05fd37
2014-08-04 13:56:37 -05:00
Mark Peters
1342f67614
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
...
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 88b334cf14
[formerly 22c077d77f
[formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]
Former-commit-id: 22c077d77f
Former-commit-id: 9be02c8dfe
2014-08-04 13:27:45 -05:00
Richard Peter
2ad35a3d11
Merge "Omaha #3474 AWIPS2-Development portion of DD #2752 " into omaha_14.4.1
...
Former-commit-id: d9f5afd301
[formerly 620e7c52f9
[formerly e56490121bf24585f7836705745aec9df7c08ef7]]
Former-commit-id: 620e7c52f9
Former-commit-id: f0322219fd
2014-08-04 13:22:14 -05:00
Nate Jensen
9f0bd349b6
Omaha #3356 remove unnecessary usage of ext and global buddy policies
...
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d
Former-commit-id: 857f1b70cc
[formerly 06a64080e7
[formerly 41306351920aee44bdf2d9648616ddc8a4511632]]
Former-commit-id: 06a64080e7
Former-commit-id: 41eb72aefd
2014-08-04 12:30:55 -05:00
Brian.Dyke
590e37a8f2
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 270d2b0ddb
[formerly 9abb02ea8a
[formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
2014-08-04 13:10:13 -04:00
Mark Peters
96da09a65a
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
...
Change-Id: If0ada7c887b532e98c7d0d6df56c5b1b195c9d8b
Former-commit-id: dbc0015671
[formerly b15b09ee50
[formerly 3bae11d54bee5bf3b4a650bce02b85902ced1cbc]]
Former-commit-id: b15b09ee50
Former-commit-id: 22f86459ae
2014-08-04 12:10:02 -05:00
Mark Peters
e8e3c7858e
Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode
...
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd
Former-commit-id: cf2a2d47b9
[formerly de149c4a4f
[formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]
Former-commit-id: de149c4a4f
Former-commit-id: 7aee990658
2014-08-04 10:24:08 -05:00
Brian Clements
d745579877
Omaha #3427 decoder interface now takes full path to jar
...
Change-Id: I8212017cce74cb70314a2a6f72fad72f59ff19fb
Former-commit-id: 516575c326
[formerly 32d46b0155
[formerly 1aee051869b8aac10a233a142f758fdca82c11ab]]
Former-commit-id: 32d46b0155
Former-commit-id: cdd64aa7ea
2014-08-04 09:23:59 -05:00
Greg Armendariz
af2a2e15ff
Merge "Omaha #3318 split deltascript one for dx1 the other for dx2." into omaha_14.4.1
...
Former-commit-id: 45c070c2d9
[formerly 122cf829d1
[formerly 8e9c405183b7f85fc72f1d5a3bbbfd3e02e026b3]]
Former-commit-id: 122cf829d1
Former-commit-id: 32cbdfff27
2014-08-01 15:43:36 -05:00