Commit graph

546 commits

Author SHA1 Message Date
Fay.Liang
c2e75f305b Merge tag 'OB_14.3.4-3' into master_14.4.1
14.3.4-3


Former-commit-id: 065c9ac4ce [formerly c1166790f4 [formerly 0313242112db9c9e70e6692c1c31816b0f3432d3]]
Former-commit-id: c1166790f4
Former-commit-id: 99adcdaac4
2015-05-29 10:43:59 -04:00
Fay.Liang
cab1ea9f60 Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: f89b10d668 [formerly c31ba8cc50 [formerly cbc4c0821a4a87299904755c0aceb1176a8c4370]]
Former-commit-id: c31ba8cc50
Former-commit-id: 76f6fd22e6
2015-05-29 09:45:45 -04:00
Sarah Pontius
8575aed094 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I92d26a9b7c5cde54dd42b911bfc3bf68d9e60288

Former-commit-id: cefbbce1d3 [formerly 3d42a79911 [formerly c399d95d34f8ce74263d736158e980a0c97836e2]]
Former-commit-id: 3d42a79911
Former-commit-id: 9a292f69b2
2015-05-28 07:57:58 -06:00
Fay.Liang
c1f576d374 Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2


Former-commit-id: 78e5fba897 [formerly 9e651a81c3 [formerly ab0f58ebd6b4ce61525b1ec768fb6b293098cd91]]
Former-commit-id: 9e651a81c3
Former-commit-id: cacdfc2c5f
2015-05-22 14:52:28 -04:00
Fay.Liang
bb0b1b0b67 Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: 3524773132 [formerly e0629c3f7b [formerly a381e2a184cb2096237abfe4156fb96126e5d7ef]]
Former-commit-id: e0629c3f7b
Former-commit-id: dbfb935ec4
2015-05-22 14:02:53 -04:00
Ana Rivera
78a7978ffa VLab Issue #8325 - DR17502 WFO TCV can fail due to InundationMax and InundationTiming differences; fixes #8325
Change-Id: I363f2bdb7694a504ac907ee0e99f06712d314c0b

Former-commit-id: 0d176d661f [formerly 33a5f527fb [formerly ed825a5536074139ad20d83d0f34ac667a33f516]]
Former-commit-id: 33a5f527fb
Former-commit-id: b88444559c
2015-05-22 15:58:50 +00:00
Sarah Pontius
c0de25ff34 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I54d0740a09530a026565fc5ee13c7fa82e29ab20

Former-commit-id: 0766392b54 [formerly f30c30c494 [formerly 241aadab209b03647f761115958e0628b2611794]]
Former-commit-id: f30c30c494
Former-commit-id: 45f4652513
2015-05-21 15:51:38 -06:00
Fay.Liang
2f6c1b20d1 Merge tag 'OB_14.3.4-1' into master_14.4.1
14.3.4-1


Former-commit-id: 765314b286 [formerly 1fd568dc33 [formerly eef689433b22c30462372f95aab8eedac80265ff]]
Former-commit-id: 1fd568dc33
Former-commit-id: fcbd4f36c1
2015-05-21 08:48:15 -04:00
Ron Anderson
9ba314bd1b Issue #4503 Fix nwrwaves trigger in TPCWatchSrv to only trigger on non-national TCV/HLS products
Change-Id: Iaaae5a35b94fd0c4edacd3d23e5913de9faf7f26

Former-commit-id: ff46482c6b [formerly 24d5e05d91 [formerly 268605b812cfd76c6b88a85226c1b018c9ba7034]]
Former-commit-id: 24d5e05d91
Former-commit-id: a688146166
2015-05-19 15:42:55 -05:00
Fay.Liang
a2f42a667f Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: ab0463196e [formerly d7b97885b9 [formerly 6ed022aa9af53df391b32a295d6560c9f55750f2]]
Former-commit-id: d7b97885b9
Former-commit-id: 50555e22fe
2015-05-13 23:06:56 -04:00
Ana Rivera
76bc52e652 VLab Issue #8178 - NWPS: serverConfig fix for Great Lakes; fixes; #8178
Change-Id: I31af422aa9db81366eec58082f43691e6a1424d8

Former-commit-id: b0c829baf1 [formerly 3a266cd5d4 [formerly a63ed7e729a11be90fd02382b5e120df9da7b438]]
Former-commit-id: 3a266cd5d4
Former-commit-id: 4ee68d9b86
2015-05-13 20:28:37 +00:00
Fay.Liang
a0a10bd1f6 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 246f03bd49 [formerly 2fd558f002 [formerly 7d519b960886064d91d818a0f7f7e37e6d0595c7]]
Former-commit-id: 2fd558f002
Former-commit-id: 8b4ccfcf52
2015-05-12 17:19:15 -04:00
Ana Rivera
48dc50ca97 VLab Issue #8158 - NWPS: fix serverConfig, restore Wave10 and Period10; fixes; #8158
Change-Id: I24e80b9d897dcf0bf7cd2d6a3df1a481505930c8

Former-commit-id: 668ddcde23 [formerly 11943d5c3c [formerly 33323cbb1caf28df056d42efd887ae438cc9cdc7]]
Former-commit-id: 11943d5c3c
Former-commit-id: 2d8e0eb57a
2015-05-12 21:07:42 +00:00
Fay.Liang
e538d9de9d Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: ef0105405a [formerly e9cc682f36 [formerly f8110ed06adfb284d7b45e719593f35d54733864]]
Former-commit-id: e9cc682f36
Former-commit-id: 7c2db98f64
2015-05-12 16:57:12 -04:00
Matthew Foster
e45ae17038 VLab Issue #8157 - NWPS update: serverConfig; fixes #8157
Change-Id: Icfac5278cc1f8ecc9bb951696afcf92de810d3b6

Former-commit-id: 9d777b839c [formerly ac546884aa [formerly ae4e0800e2c31fca04e009b6d43299232cdf9650]]
Former-commit-id: ac546884aa
Former-commit-id: 1490ca6ea7
2015-05-12 20:35:38 +00:00
David Gillingham
aa6ab9bc74 Omaha #4384 (and 4385): Fix volume browser menus for NWPS models, display vector arrows for all mag values greater than 1.0.
Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e

Former-commit-id: 6754cf45a4 [formerly 96f3b85b57 [formerly bc3abb1effa93ff76c8287f59b64dd73017f3ad8]]
Former-commit-id: 96f3b85b57
Former-commit-id: 81fd8d7391
2015-05-11 14:57:00 -05:00
Rici.Yu
484a1a0902 ASM #17421 - Fix missing storm total snow phrase issue
Change-Id: I231808bc7a9c8762efd2bf70dbc5a1e9dbb9d5e5

Former-commit-id: 662f40abab [formerly 213853ccaa [formerly c3e17145980c3ce036862691ef22d6347e6bbbb1]]
Former-commit-id: 213853ccaa
Former-commit-id: a99dc0efaa
2015-05-01 11:11:27 -04:00
Rici.Yu
22f132003c ASM #17435 - Fix hibernate query syntax issue
Change-Id: I2bfd5e927fe97c3348d7366320dc535b6e67f590

Former-commit-id: 7c66a2a356 [formerly 590af514a5 [formerly 4c70c322956fa4a356e06e908a43b80611ae273f]]
Former-commit-id: 590af514a5
Former-commit-id: 60e9ee0bed
2015-04-28 16:21:43 -04:00
Shawn.Hooper
4a34651671 Merge branch 'master_14.4.1' into asm_14.4.1
Merge up to 14.4.1-28

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I94021611ed076207a6632895925f20cc0edd4888

Former-commit-id: bfeceac493 [formerly 1e2a6f0dcb [formerly 12eaf1024c288cfbe746d70336f13268587848ad]]
Former-commit-id: 1e2a6f0dcb
Former-commit-id: 0479064ded
2015-04-24 16:27:06 -04:00
David Gillingham
6fd4a86fe1 Omaha #4414: Fix display of nwpsTrkngCG0 D2D and smart init data for GFE.
Change-Id: I466dd123c9a438b8c0d012c66a1ed1af042964fb

Former-commit-id: 740938ee59 [formerly 59161e1b48 [formerly 467a37cb5da18eafb8c5aa1fe0a3851cf10ff0be]]
Former-commit-id: 59161e1b48
Former-commit-id: a754cf5751
2015-04-20 14:05:35 -05:00
Fay.Liang
6865b55584 Merge branch 'master_14.4.1' into asm_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0cff7c362f [formerly bc522178d8 [formerly bce50b8501f52597f5dc66b767a3c9fd241fe256]]
Former-commit-id: bc522178d8
Former-commit-id: 6c900c9924
2015-04-17 16:59:06 -04:00
Fay.Liang
197a0d9316 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6dd4acc2c2 [formerly 5606e3cfa0 [formerly 03e663afae6eb0998892e2921566652f42196e1f]]
Former-commit-id: 5606e3cfa0
Former-commit-id: f28633c1d4
2015-04-16 23:06:25 -04:00
Yun.Teng
aca33216b6 ASM #17383 - Fixed error that time constraint being off
Change-Id: I7b00a4b0d1bd7822cd3f751264badfa62afc3bcb

Former-commit-id: dd5fd66fa5 [formerly 11cb7cd526 [formerly d0e8d057f765d95c65ef121e784152d05bd1187c]]
Former-commit-id: 11cb7cd526
Former-commit-id: ea15319947
2015-04-16 17:57:45 +01:00
Fay.Liang
484b1c8650 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 8b31206de4 [formerly 1561ee6439 [formerly ff79e4fdaf62c76f39b0e1948d33e0b84df77011]]
Former-commit-id: 1561ee6439
Former-commit-id: d4abbbdb37
2015-04-09 10:18:40 -04:00
David Gillingham
d29e51e8e4 Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr.
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358

Former-commit-id: 2f5d67f093 [formerly ccfda63e1d [formerly b6660c446ee92a6bf82b935920ee1c6def7f7699]]
Former-commit-id: ccfda63e1d
Former-commit-id: 6c6d9f5a3e
2015-04-03 12:00:45 -05:00
Fay.Liang
16d64528c5 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 60fd384f94 [formerly c174a5ff27 [formerly a8eb3c2346609e0ca351c494c5bdfa2090423019]]
Former-commit-id: c174a5ff27
Former-commit-id: d7c0354880
2015-04-02 11:33:37 -04:00
Fay.Liang
5e1c980eba Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 08b89e7978 [formerly 5ad29ee888 [formerly 4a76f9bb72ade29ca23a158c0cb2ef038905fd07]]
Former-commit-id: 5ad29ee888
Former-commit-id: adf70ee1c5
2015-03-31 15:02:33 -04:00
Ana Rivera
7fcd856455 VLab Issue #7280 - NWPS:Add missing smartinit file (nwpsTrkngCG0.py) and remove extra parenthesis in nwpsCG1.py
Change-Id: I4dd0e31e936720c07b40a905017958d3f4def649

Former-commit-id: 9172a3bdd4 [formerly 628d228957 [formerly e3b0aef8afd48c54a3d947e5bbbe67c238f1fdd2]]
Former-commit-id: 628d228957
Former-commit-id: fa72c10a98
2015-03-30 20:51:57 +00:00
Yun.Teng
4726f0dde4 ASM #17206 - Change some parametes that are not rate parameters
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f

Former-commit-id: db554cf9ce [formerly e40e907797 [formerly 23927a6c91076fedc6d53eb5ba2882166814134a]]
Former-commit-id: e40e907797
Former-commit-id: 58e4a5df28
2015-03-30 16:39:34 +01:00
Fay.Liang
ec294fd11c Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 3233640aa2 [formerly 6f8f2f5398 [formerly 42d435f739134ec29a021415ed96b6c3406fc021]]
Former-commit-id: 6f8f2f5398
Former-commit-id: 8db78cb400
2015-03-18 14:54:46 -04:00
Steve Harris
fdf751fa90 Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java


Former-commit-id: 9b749e134d [formerly 19f99823a6 [formerly 390c7ec5c261717f6e0b2053761e12e1fcb68215]]
Former-commit-id: 19f99823a6
Former-commit-id: bda107f32a
2015-03-18 13:09:03 -05:00
Fay.Liang
384f40d63a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e4269dfba4 [formerly 7a62d03b55 [formerly ff4a350eca07ea0f158ca0c3082890faa5bda368]]
Former-commit-id: 7a62d03b55
Former-commit-id: 7873b16eac
2015-03-13 15:58:28 -04:00
Richard Peter
3a066de36c Merge "Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together." into omaha_14.4.1
Former-commit-id: ca6249346d [formerly 10811f4612 [formerly 99f2b2f693e2e30903399ffc94a7f4d6a84e0fed]]
Former-commit-id: 10811f4612
Former-commit-id: b3add60cee
2015-03-12 20:03:41 -05:00
David Gillingham
f70cefd6b7 Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together.
Change-Id: Ib97d20bdd26b413648727101da26fee8449cb7ba

Former-commit-id: e713928f7c [formerly cc99fbdb0a [formerly d242c9cc22d53dca873e62787f6ab3234dd2b7df]]
Former-commit-id: cc99fbdb0a
Former-commit-id: e6512aa181
2015-03-12 10:17:01 -05:00
Ron Anderson
99da4d09a4 Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c

Former-commit-id: bf2ff2d80f [formerly 9200772cff [formerly fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c]]
Former-commit-id: 9200772cff
Former-commit-id: 8bc5f56bce
2015-03-12 09:47:36 -05:00
Michael Gamazaychikov
56d6e13307 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I7b0f6b3974e8a8e4072fa530dce7443a9d85244a

Former-commit-id: 12304947c6 [formerly 24d10369ab [formerly a437417c6a07fc069e194cd08d515c6984d15616]]
Former-commit-id: 24d10369ab
Former-commit-id: 006d437d17
2015-03-10 13:18:09 -04:00
Fay.Liang
1138f48ee9 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
2015-03-09 16:11:13 -04:00
Steve Harris
701501ad9e Merge tag 'OB_14.4.1-16m' into omaha_14.4.1
14.4.1-16m


Former-commit-id: 62527097b4 [formerly b5f51e446c [formerly ed67f8932f910a858b32b503fc8009e39dac03ab]]
Former-commit-id: b5f51e446c
Former-commit-id: 651a86512c
2015-03-09 11:39:50 -05:00
Ron Anderson
6dd6433471 Merge "Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1
Former-commit-id: 8a51d088bc [formerly d2d0d0f573 [formerly 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733]]
Former-commit-id: d2d0d0f573
Former-commit-id: 43c476b825
2015-03-05 11:52:13 -06:00
Fay.Liang
67165a8923 Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 51cce67ca8 [formerly 97d25e8c8b [formerly cbed951a6854af1afe4e4e1d14bedfda1534b21f]]
Former-commit-id: 97d25e8c8b
Former-commit-id: 8b08da8fa1
2015-03-05 12:48:18 -05:00
David Gillingham
bb3928c0f5 Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop().
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc

Former-commit-id: 154e56e186 [formerly 3fc30a2584 [formerly 92b8782bb0c874e78e00d848c71c8140ff71e6ac]]
Former-commit-id: 3fc30a2584
Former-commit-id: 335c923d71
2015-03-05 10:08:14 -06:00
Fay.Liang
654d618fc5 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 211d9bb8eb [formerly aa2fa72260 [formerly 10b981ac5353585985f450b849006bd6514fe057]]
Former-commit-id: aa2fa72260
Former-commit-id: 7398f8fb7b
2015-03-05 10:39:44 -05:00
Ron Anderson
6fcf5636ab Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990

Former-commit-id: 893de08048 [formerly 0f7f415204 [formerly 30bfaf9432481328ed9d23ef56568a857cf775c7]]
Former-commit-id: 0f7f415204
Former-commit-id: ea5dd120e2
2015-03-05 08:56:48 -06:00
Ron Anderson
1d5a9b4cd8 Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: e08d469768 [formerly a6167718b2 [formerly eaecbaa0b66153b43bfe59f96c43a1876b9e235f]]
Former-commit-id: a6167718b2
Former-commit-id: e315d9811d
2015-03-04 16:06:41 -06:00
Ron Anderson
c18c4dbbad Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc

Former-commit-id: 1b2258ed00 [formerly 3468d2ee60 [formerly 009e56509930c8fdf2eacd250903260a13a6f3ca]]
Former-commit-id: 3468d2ee60
Former-commit-id: f299aab920
2015-03-04 15:37:22 -06:00
Shawn.Hooper
4261f6843f ASM #16946 - Update typo from dateFile to dataFile
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2

Former-commit-id: 08f7a7ef1c [formerly f3f48cf71f [formerly 13fbcbd0a2cb70228a47d63839640c7612caaa2a]]
Former-commit-id: f3f48cf71f
Former-commit-id: e30935d13d
2015-03-04 14:07:01 -05:00
David Gillingham
1d45c1f80f Omaha #4128: Ensure active table sharing is configured before enabling it.
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937

Former-commit-id: 46e371f7e6 [formerly 07805e808c [formerly 3ebb60db47fc74a77eea56ae7738b5f7b405fb19]]
Former-commit-id: 07805e808c
Former-commit-id: 0ced2f9067
2015-03-03 16:46:39 -06:00
Michael Gamazaychikov
140ceb8df5 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e

Former-commit-id: 9db91abd8a [formerly 6897cfd7b9 [formerly ab0f7f0f627ab3926a219940f1267dc460e74e14]]
Former-commit-id: 6897cfd7b9
Former-commit-id: b6fab0df30
2015-03-03 09:38:34 -05:00
David Gillingham
fde97e61b3 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 63139c2f38 [formerly d7c0000508 [formerly 5d962bf6cf7a3e40ee152bc98817daf116633f60]]
Former-commit-id: d7c0000508
Former-commit-id: cdb695e517
2015-02-26 15:57:47 -06:00
Steve Harris
20e23e0a9f Merge tag 'OB_14.4.1-13m' into omaha_14.4.1
14.4.1-13


Former-commit-id: 0de5743e1f [formerly 12929f7412 [formerly c75f0f600cc312a83275b767165471b458da18b7]]
Former-commit-id: 12929f7412
Former-commit-id: fedaf58f2a
2015-02-20 09:57:49 -06:00