Commit graph

243 commits

Author SHA1 Message Date
Michael James
dfd78f520d typo fix sheer->shear in rary.ohd.util degrib 2016-10-17 17:30:14 -05:00
mjames-upc
20f9282351 ufpy->python-awips; runso binary; distribution file regex additions for thredds files; Hydro app defaults; purge rules for UCAR build
Former-commit-id: 18dfe4698dcffb0d9e625699581eb9f7d6c9fac6
2016-06-27 15:44:11 -05:00
mjames-upc
cbda80f565 remove files large than 50M
Former-commit-id: e53afad3cc2e60d9845b5b6b4471ef138d1b24b0
2016-06-27 15:35:21 -05:00
Steve Harris
ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
steve.naples
73cc70b791 ASM #18893 - Hydro: Remove ip address from config file and change it to template.
Change-Id: I5a4c278d4510d4dd3d7aa01439b3646c7d8766a6

Former-commit-id: 76a0b8a049adc075b3f5d69acb59f93b80b0587a
2016-04-21 18:24:47 +00:00
Shawn.Hooper
b1bdc885f7 ASM #17806 - Rebuilt library.ohd.pproc.so
Change-Id: Iadcb445947f4e9ca83d53be228ca3ecbfd4abe81

Former-commit-id: 694dd21950b19aecbc62a2e04791592882bb74e0
2016-04-14 16:43:44 -04:00
Shawn.Hooper
850ec358bf ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1

Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77

Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00
Keith.Steinfeld
7bd9a1a770 ASM #14539 - Fix the DPA decoder log files not being purged
Change-Id: I610e81b809bf5b495fd3c8c50f30931f660200ec

Former-commit-id: fcfb98a368901559fdd462917eca69399cc2e948
2016-03-18 12:25:39 -04:00
Steve Harris
11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	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/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Steve Harris
25cee1be8c Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Steve Harris
8a07970ba6 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java


Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
Shawn.Hooper
f3fafae42e Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ie67d751b1c68099a98826e6542ebff4cf0aae7e5

Former-commit-id: b9b551d68ed55536b2480b60ef1269bcf5402004
2016-01-04 16:47:59 -05:00
Richard Peter
3126e76d03 Omaha #4837 - Upgrade jasper to security patch 2
Change-Id: I29110bc4d8c8d762eb19b57899d2520e99d8b7f6

Former-commit-id: 646a336252f5f931ace17c43b6a14e2c54abcdfb
2015-12-08 17:16:36 -06:00
Shawn.Hooper
898858eba6 ASM #17806 - Update shared object for ohd pproc
Change-Id: I970c1808872db6e0803ef7b79cdea8231fdd74f1

Former-commit-id: 265e1d7159db467d867f00e4d65b9ec21000d49a
2015-12-03 17:03:30 -05:00
steve.naples
c154fe6ba7 ASM #15045 MPE: - Fix decode DPA script to use gather directory and decode all files.
Change-Id: Iec9f19c7be94a52a965217e278bf1e925c827af0

Former-commit-id: 996c06d957b43017e25e1d938ce0a2c1754e376b
2015-11-05 19:28:18 +00:00
Paul Tilles
1057811d5c VLab Issue #11929 - mpe_qpe_fieldtype can not be set to a dualpol mosaic; fixes #11929
Change-Id: I300990e285ba90d0f32a3c13aa32c574dc004bc5

Former-commit-id: 8c1998c95e08d89536d3648bae60d2a06a27bc68
2015-09-22 15:25:32 +00:00
Jingtao Deng
e8acc0e245 VLab Issue #11907 - HPE change to mean field bias logic; fixes #11907
Change-Id: I319ae69f3d1a92224c930821faf531af11235d87

Former-commit-id: 1eb7684f73712cd7d4fa8b7e34b7d06613c82f11
2015-09-22 14:15:10 +00:00
Paul Tilles
de112777bd VLab Issue #9986 - Revert VLab Issue #9986 - HPE change to mean field bias logic; fixes #9986
This reverts commit 4c1637974b [formerly d3388798e0f55a35f429347c24b408d0e8ae3b7f].

Change-Id: I76b2eb1e28297eed288555d056c88812fe76faac

Former-commit-id: 954250c0b33bab2538cceea77afa2946b0c19445
2015-09-21 17:24:08 +00:00
Jingtao Deng
4c1637974b VLab Issue #9986 - HPE change to mean field bias logic; fixes #9986
Change-Id: I9910f74182d40f3c5208b7f86e521fc4014fd665

Former-commit-id: d3388798e0f55a35f429347c24b408d0e8ae3b7f
2015-09-21 10:31:22 -04:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Steve Harris
11d147911d Merge tag 'OB_15.1.1-20' into omaha_16.1.1
15.1.1-20

 Conflicts:
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py


Former-commit-id: d3fc25a0bc4136a28efcd024dd272373982b2c9d
2015-07-06 09:48:19 -05:00
steve.naples
8dce16d886 ASM #15002 Fixed issue with apps_dir token in set_hydro_env not being set at RFCs properly.
Change-Id: I28a96953acf2ae5e3355d933627309e06312ab9a

Former-commit-id: db5a86e09418f642b7e69382f51e4b4bb95ae6f1
2015-07-01 18:48:16 +00:00
Fay.Liang
e321770a07 Merge tag 'OB_14.4.1-53' into int_15.1.1
14.4.1-53


Former-commit-id: a86e1e2195be886ecac70299b0b0aebf3e519ab6
2015-06-23 21:28:09 -04:00
Shawn.Hooper
25f8ca9be0 ASM #17630 - Update with patched thrift libraries
Change-Id: Ibde2e2fb283f9b21360de4a013706409a7f941f1

Former-commit-id: ce6c9e536cd45d030b74d9cedf66b4a8cdb18bb3
2015-06-19 11:24:23 -04:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Shawn.Hooper
003c528458 ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39

Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Fay.Liang
18d8746429 ASM #17476 - Add 64bit libthrift libraries
Change-Id: I8c7bb826c9688950ad09092bb22f27414cadfae2

Former-commit-id: 6131f8ff469989c607a61edd471c4129a23dca8a
2015-05-10 01:25:59 -04:00
Fay.Liang
95ab6a74b1 ASM #17476 - HWR: Certain marine observations missing from product
Change-Id: Ib289f53e3f8cb2f82df3ac512540917eae072a08

Former-commit-id: 272927b1a4e27e59ff82353ed12de68634efd7da
2015-05-10 00:07:16 -04:00
Nate Jensen
f072f3bbca Omaha #4259 remove old jep from nativeLib
our jep changes have been merged into main jep
jep 3.3 will move into AWIPS2_build repo
JavaImporter is no longer necessary, uses jep/hook.py now

Change-Id: I0eb6714e90f21e2accadf5286d3f768fa5be3926

Former-commit-id: 852bc57217e03a11cb329b90f83d5be63e315920
2015-04-30 14:23:44 -05:00
Nate Jensen
15b501ce07 Omaha #4259 speed up get_jtype, ensure correct jep types are chosen
Change-Id: I11a7c072f8b460d2728cf2a4a018932159c0e1b0

Former-commit-id: c13284d74b6c561cd305cf714722e4904b4ab0bf
2015-04-30 12:39:54 -05:00
Nate Jensen
9c71fb1bee Omaha #4259 improved class checking
when return type of Java method is Object, check for arrays
simplified get_jtype to actually make sense

Change-Id: Ibfc22699f3121a7980527e7bca8e578d85016699

Former-commit-id: 36954eaeb93f0d3e24aba0be8cea90f6d1a8deee
2015-04-29 16:45:36 -05:00
Nate Jensen
e4f1679510 Omaha #4259 cache frequent jclass usages for speedup
Change-Id: I8e27110c9c9b2a901560c547f8729870d3e992bf

Former-commit-id: e663c39f1e1e225c63109f24d294902e90afb621
2015-04-28 12:19:36 -05:00
Nate Jensen
d14c8c7e7a Omaha #4259 tie IllegalArgumentException to ValueError
Change-Id: I742fbe53cba7356941bab3f88441e8d47507c3e8

Former-commit-id: 8716dde5c659c5afa80e9c57aad2120ae0e56bb5
2015-04-27 17:41:16 -05:00
Nate Jensen
5b25c39afd Omaha #4259 even more advanced exception handling
Change-Id: Ib483fbc7d6eedc4ae087577edcc45c273c3f0ff5

Former-commit-id: c86279d50c1a75bba4d32291b028fe56ad2b7721
2015-04-27 15:33:49 -05:00
Nate Jensen
6318d1122d Omaha #4259 implement hash() on pyjobject
Change-Id: I6298245a467a2f73caf8b4a2a03918790c409d80

Former-commit-id: 2719830ac6dc2e33c73f7d730892b8c496b555d1
2015-04-25 19:25:34 -05:00
Nate Jensen
944c2e0863 Omaha #4259 fix import of java classes
Change-Id: If27267eaa0e57ffe7e73500bbb9affc333b2f1bc

Former-commit-id: d80f1339af7eed3994ce2b274b3936649a631dc6
2015-04-22 17:14:32 -05:00
Nate Jensen
2ea379d4d8 Omaha #4259 clean up compiler warnings
Change-Id: I9cd7342519eb0d8f6da1cbf51be44e3ea309fcf2

Former-commit-id: c43051254a546f387c3e2b4589e6b0ab8371dd6f
2015-04-21 13:53:58 -05:00
Nate Jensen
b5dc8b814f Omaha #4259 convenience constructor for NDArray
Change-Id: I0cc978a0f4086fff997fab6791980360e7e2389e

Former-commit-id: 8ef33c85e7c4ff7a933ca013e1abe61f1aea905d
2015-04-16 16:54:38 -05:00
Nate Jensen
e189166a34 Omaha #4259 fix missed compiler warning
Change-Id: Id63d86e74d2dee0e99c01e9c467855bd276a67df

Former-commit-id: 46d0a687a7a3e15320e4ea85f8f2bab0bbbd0320
2015-04-16 15:21:13 -05:00
Nate Jensen
a51643fe7d Omaha #4259 clean up compiler warnings
Change-Id: I1592d1b527a5c36dcd58e32d2e8fb1561aab904d

Former-commit-id: a47e86c9683ee54ddf10542c43e1ef97124fe273
2015-04-16 14:49:08 -05:00
Nate Jensen
eabd52c620 Omaha #4259 fix jep unit test threading unsafety
Change-Id: I13f58d8dcf3e3d074c3586d2682ad3fa9809a3fe

Former-commit-id: 24922b47c679227489740da2979d10d9f81088bf
2015-04-15 17:47:57 -05:00
Nate Jensen
460f1a7429 Omaha #4259 fix compiler issues
Change-Id: I16fe1f201bc3676fcf6079743112d8cbaddb0892

Former-commit-id: 4741e21ae3f1b3e0904980b75d2c1dd82aace7ad
2015-04-15 12:00:20 -05:00
Nate Jensen
a6491bd9d8 Omaha #4259 more cleanup of jep
Change-Id: I84a44ea8219132033f60ed3534fe0f00d9b5bbca

Former-commit-id: 022055f57c46cafe125cd407c2e384c46a5a8ead
2015-04-14 11:06:51 -05:00
Nate Jensen
b1f34b0eab Omaha #4259 cleanup based on code review comments and tests
Change-Id: I2be78c10ba89d43ba0fb498037764805e287b12e

Former-commit-id: 36c0b8679d6af895ff91b7dcfb4c4cef7f04ffe6
2015-04-13 16:21:43 -05:00
Nate Jensen
d320075a73 Merge "Omaha #4259 fixed uncovered issues, code review comments" into omaha_16.1.1
Former-commit-id: 33161fce6267d536c36557137351c8ff612652f3
2015-04-13 13:50:13 -05:00
Steve Harris
7ec7cdf232 Merge tag 'OB_15.1.1-4' into omaha_16.1.1
15.1.1-4


Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Nate Jensen
2cc9a82f54 Omaha #4259 fixed uncovered issues, code review comments
Change-Id: If6a253f157d131669e22915f440a8364ee62f19c

Former-commit-id: 1c3825d99fe792c45a78a1942cc30aa0d17e4716
2015-04-10 15:27:45 -05:00
Nate Jensen
bcba6c956b Merge "Omaha #4259 merging most of the rest of JEP updates with our changes" into omaha_16.1.1
Former-commit-id: 0d309effe01d50a323e1a6799632c7cf3efb4b5e
2015-04-10 13:39:02 -05:00
Nate Jensen
cb64093e9d Omaha #4259 last of the jep java merges
Change-Id: I3c82218dfc3cf5fc5d4bca13d3423123c5836b46

Former-commit-id: 8a14388a49813a9dfae394a8c14dfe4c4ca56a84
2015-04-09 20:17:54 -05:00