Commit graph

3554 commits

Author SHA1 Message Date
Ron Anderson
3d87784ba6 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: c4d27803cc [formerly d7e0d21d27] [formerly c4d27803cc [formerly d7e0d21d27] [formerly e0b9900a50 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]]
Former-commit-id: e0b9900a50
Former-commit-id: 9e61a12c32 [formerly 3d7d560a9e]
Former-commit-id: c34aa4047a
2014-12-04 15:44:46 -06:00
Roger Ferrel
eb2b8da234 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 24c969a249 [formerly 462e0d85c0] [formerly 24c969a249 [formerly 462e0d85c0] [formerly 597fdb8280 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]]]
Former-commit-id: 597fdb8280
Former-commit-id: 2d0ce5952d [formerly c9f619028d]
Former-commit-id: ab0c6581b2
2014-12-04 12:52:22 -06:00
Fay.Liang
c4434a7051 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 6e9ff9e139 [formerly 028d6bdc33] [formerly 6e9ff9e139 [formerly 028d6bdc33] [formerly f5095bed4e [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]]
Former-commit-id: f5095bed4e
Former-commit-id: 05120de669 [formerly 2c766a5b28]
Former-commit-id: 5bccfb2329
2014-12-04 13:47:03 -05:00
Fay.Liang
5f6842175d Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: f327b9dd5a [formerly 83a4987188] [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: 19194e0aa3
Former-commit-id: 3404290a55 [formerly 19d1be03e0]
Former-commit-id: d3c8b8a470
2014-12-04 13:46:31 -05:00
Bruce.Hundermark
f0134c1830 ASM #631 - GFE: smartInit file baseline error with LAPS sky cover
Change-Id: Ice58a2e695e91efacb4adb39d47af50dd7bb6d78

Former-commit-id: 996854ae7f [formerly e1e453138f] [formerly 996854ae7f [formerly e1e453138f] [formerly f89ff6da89 [formerly de639a90c9858e2d85ccfbbc7dba8bee6c0380be]]]
Former-commit-id: f89ff6da89
Former-commit-id: d082a10bad [formerly d6496120a7]
Former-commit-id: b2e95e9c9c
2014-12-04 16:46:09 +00:00
Ron Anderson
3be3ae232b Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: fd25fe9efc [formerly 5169e7181f] [formerly fd25fe9efc [formerly 5169e7181f] [formerly 2417d5a2a7 [formerly 16e32018de233fb128a7518415b84e032074932f]]]
Former-commit-id: 2417d5a2a7
Former-commit-id: 2d30089bbe [formerly a882a8f0d1]
Former-commit-id: 89ce99fde1
2014-12-04 10:01:18 -06:00
Nate Jensen
580f9e803b Omaha #3549 fix developer deploy
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd

Former-commit-id: 36d8702286 [formerly 0ffdb0ff98] [formerly 36d8702286 [formerly 0ffdb0ff98] [formerly 99fa52c311 [formerly a713b9c70f48995fa52fc76a4d6db8712e3257e7]]]
Former-commit-id: 99fa52c311
Former-commit-id: b3665bebea [formerly 3e45aa78db]
Former-commit-id: 27a14f3a1b
2014-12-04 09:05:54 -06:00
Nate Jensen
0bb18f02d0 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
2014-12-03 15:47:10 -06:00
Nate Jensen
4514e47abd Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
Former-commit-id: bb05069c21 [formerly 55817ea845] [formerly bb05069c21 [formerly 55817ea845] [formerly 3b0fdec2e5 [formerly 306c64193d02d065bba1c792e13aa34bafb6e9c3]]]
Former-commit-id: 3b0fdec2e5
Former-commit-id: a28ff122d1 [formerly 23f34891a9]
Former-commit-id: 9e23d82ad0
2014-12-03 14:14:36 -06:00
Dave Hladky
18b9975708 Omaha #3831 Alleviate memory usage in Template creation
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2

Former-commit-id: 53d1b4a0c3 [formerly 3c2f18f454] [formerly 53d1b4a0c3 [formerly 3c2f18f454] [formerly 45ebc9cd05 [formerly dd40b635fa20789be1f4a8502530e00f264c7966]]]
Former-commit-id: 45ebc9cd05
Former-commit-id: 8d8d9ae712 [formerly c8ca0f8cc0]
Former-commit-id: 89dc7ffa97
2014-12-03 12:39:04 -06:00
Sarah Pontius
36803469fe VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565

Former-commit-id: 2b37fe2994 [formerly 171a802190] [formerly 2b37fe2994 [formerly 171a802190] [formerly 5d696b412d [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]]
Former-commit-id: 5d696b412d
Former-commit-id: 8e424a1790 [formerly 854434c095]
Former-commit-id: ad108902c5
2014-12-03 11:19:06 -07:00
David Friedman
60c0d30adb ASM #16859 - Text decoder processes collectives inefficiently
Change-Id: Ib38ca77d66eccc84b7ffb64901b2eef64ee82af4

Former-commit-id: 71570b1360 [formerly 61e3f4493a] [formerly 71570b1360 [formerly 61e3f4493a] [formerly 47f151fe85 [formerly dac7434202e9d5b5aafc4784f6a9201b5a9f0394]]]
Former-commit-id: 47f151fe85
Former-commit-id: 14af0ec02f [formerly 1b6093d7f3]
Former-commit-id: 822c0db26c
2014-12-03 15:44:27 +00:00
Lee Venable
f0ee690d53 Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
Former-commit-id: d43c20b408 [formerly 18e8976193] [formerly d43c20b408 [formerly 18e8976193] [formerly 7aba701fdd [formerly d4e460721777642fed02c3bdd8cc49964ba2b4ba]]]
Former-commit-id: 7aba701fdd
Former-commit-id: a788ee02a4 [formerly 60e959c77d]
Former-commit-id: 07c95313bb
2014-12-02 17:49:54 -06:00
Nate Jensen
a4d6a6b2e7 Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 22d6b8ce65 [formerly 8bf1cdc69f] [formerly 22d6b8ce65 [formerly 8bf1cdc69f] [formerly 0211262227 [formerly 0d05a028c3137cf7b1b289e403e58c006ada7d3c]]]
Former-commit-id: 0211262227
Former-commit-id: c1b5f6242a [formerly 8ff10d37bf]
Former-commit-id: 0d64677b42
2014-12-02 15:25:58 -06:00
mjames-upc
d6e83aead4 checkout NCEP grib table updates from remotes/origin/ncep_14.3.1
Former-commit-id: 7be22bf19c
2014-12-02 12:08:27 -07:00
Ron Anderson
7528731249 Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae

Former-commit-id: f6e374db79 [formerly 4efd17db74] [formerly f6e374db79 [formerly 4efd17db74] [formerly ebeb4440ef [formerly e656ec3ccf20ae4a9eae23040e1a08d7032ee42a]]]
Former-commit-id: ebeb4440ef
Former-commit-id: b07622b4b3 [formerly c2f16e991d]
Former-commit-id: 44b648517c
2014-12-02 11:45:05 -06:00
Ana Rivera
a9619b5bca VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f

Former-commit-id: edfb394f22 [formerly 709d571947] [formerly edfb394f22 [formerly 709d571947] [formerly fe5bfbaa73 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 985e612d6d [formerly 8eaeb7b322]
Former-commit-id: ccbb684974
2014-12-02 15:44:07 +00:00
Slav Korolev
f4d9f7fb90 Omaha #3841 - Updated the dialogs for adding and editing a new zone/station.
Former-commit-id: f20361a507 [formerly 8763f67abf] [formerly f20361a507 [formerly 8763f67abf] [formerly dc1722a8b7 [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]]]
Former-commit-id: dc1722a8b7
Former-commit-id: 76f0dab0ca [formerly c69cbc10be]
Former-commit-id: 8560c35c26
2014-12-02 09:09:05 -05:00
Ana Rivera
d2a979a0e5 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: eb0253f820 [formerly 0e8473e91e] [formerly eb0253f820 [formerly 0e8473e91e] [formerly 5abf37ea62 [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]]
Former-commit-id: 5abf37ea62
Former-commit-id: 79b19d6368 [formerly 7c3dd12351]
Former-commit-id: 899a9d762d
2014-12-02 13:43:03 +00:00
Nate Jensen
6a53100fb7 Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8

Former-commit-id: a4a3cc6deb [formerly faf88fc3cb] [formerly a4a3cc6deb [formerly faf88fc3cb] [formerly 731cf6fdbe [formerly b594cd797b675120634454ffffccbb785fd917ae]]]
Former-commit-id: 731cf6fdbe
Former-commit-id: d903df671b [formerly d28b902955]
Former-commit-id: 77892d1ba0
2014-12-01 15:23:48 -06:00
mjames-upc
77c8e56416 NCP composite resource group updates. ACARS ingest turned off in pqact.conf. Default ESB modes updated. Minor cleanup for McIDAS decoder.
Former-commit-id: e566c367c5
2014-12-01 12:16:47 -07:00
Richard Peter
c9bc7ef69b Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
Former-commit-id: 1a88edfa4f [formerly 6d046826dc] [formerly 1a88edfa4f [formerly 6d046826dc] [formerly 6759ffa76c [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]]]
Former-commit-id: 6759ffa76c
Former-commit-id: 394674436a [formerly 25407d6fdd]
Former-commit-id: 30f04ed077
2014-11-26 10:13:40 -06:00
Roger Ferrel
c9e9fc7bd0 Omaha #3870 Updated table to include missing elements.
Former-commit-id: 0ae4219196 [formerly c4cf624d04] [formerly 0ae4219196 [formerly c4cf624d04] [formerly fedc4aae8a [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]]]
Former-commit-id: fedc4aae8a
Former-commit-id: a170a1318d [formerly e3d4250f65]
Former-commit-id: be828d05e5
2014-11-25 14:31:05 -06:00
Roger Ferrel
c79c325df6 Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: da25f4588d [formerly 9b986c7cf8] [formerly da25f4588d [formerly 9b986c7cf8] [formerly 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]]
Former-commit-id: 0df840602e
Former-commit-id: 2d763dc64a [formerly 4ba718da37]
Former-commit-id: 975ee3aba9
2014-11-25 10:01:30 -06:00
mjames-upc
17a42e46ad moved CAVE core dumps from /data/fxa/
Former-commit-id: 56d86b7539
2014-11-21 11:34:23 -07:00
mjames-upc
cbf3fa37a8 build updates: binlightning removed from feature.uframe, flag added to *.product to fix cairo/GTK crashing Java on RHEL 6.6, default modes updated to remove datadelivery from ingest JVM
Former-commit-id: 78c6975fea
2014-11-21 11:33:26 -07:00
Ying-Lian.Shi
721eb16f24 ASM #98 GFE: ifpnetCDF no longer gives an error code in some cases
Change-Id: I74e78b7d64fef4538ded4ed0e4e4b13d1950363a

Former-commit-id: 261177ee7c [formerly a0bfede4e0] [formerly 261177ee7c [formerly a0bfede4e0] [formerly 7c99c63441 [formerly 98c99131445b4b9fa727a9ea09fc4df8906aa90b]]]
Former-commit-id: 7c99c63441
Former-commit-id: cfb854914d [formerly 0a2c6b0f66]
Former-commit-id: a861c7f04e
2014-11-21 15:38:25 +00:00
Ana Rivera
eb1f2809b0 Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb

Former-commit-id: 02e630bc93 [formerly 1645ccd9ca] [formerly 02e630bc93 [formerly 1645ccd9ca] [formerly 1999049d90 [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]]
Former-commit-id: 1999049d90
Former-commit-id: 0fcfcbc05b [formerly 95b016ef4e]
Former-commit-id: e5f6dae5bd
2014-11-21 14:23:49 +00:00
Fay.Liang
d7f86a9a63 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: acdabae0ab [formerly 7aa08b8ba4]
Former-commit-id: 59f64b29b1
2014-11-20 13:32:25 -05:00
Shawn Hooper
6699c18a7a VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2f954d65be [formerly 330eae9f9e]
Former-commit-id: b6d1f3aef4
2014-11-20 13:12:16 -05:00
Fay.Liang
5c3a6d006c Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]
Former-commit-id: 45b80432d6
Former-commit-id: a75d5d336d [formerly de4ab82df7]
Former-commit-id: e61707aefc
2014-11-19 22:07:54 -05:00
Ana Rivera
b776357dad Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 419dc9ff10 [formerly 7dacc070d2] [formerly 419dc9ff10 [formerly 7dacc070d2] [formerly 40855f4ebd [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]]
Former-commit-id: 40855f4ebd
Former-commit-id: 168fe90936 [formerly ae6d3b9e33]
Former-commit-id: babb82777c
2014-11-19 16:27:03 -05:00
Ana Rivera
b9cdd89b29 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: befcdc96f9 [formerly 2c388bd379] [formerly befcdc96f9 [formerly 2c388bd379] [formerly af00fd8a98 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]]
Former-commit-id: af00fd8a98
Former-commit-id: 28033b25f7 [formerly dd4a60d370]
Former-commit-id: 9a2763a294
2014-11-19 20:29:42 +00:00
Ron Anderson
727b5f7c57 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: f88fc45470 [formerly bb451e58c3] [formerly f88fc45470 [formerly bb451e58c3] [formerly 9104023408 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]]
Former-commit-id: 9104023408
Former-commit-id: 72e6e56c75 [formerly 0991f722ec]
Former-commit-id: 2e14733f66
2014-11-19 11:31:49 -06:00
Roger Ferrel
4006dd2e2b Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]
Former-commit-id: b88300a5fc
Former-commit-id: b86d906a5a [formerly 83c738abd9]
Former-commit-id: 6e58de9ef0
2014-11-18 17:42:39 -06:00
Mike Duff
4116e82f67 Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: edb85525d0 [formerly 9be37bb41e] [formerly edb85525d0 [formerly 9be37bb41e] [formerly f841f1eda9 [formerly 5a3ccbadbf08957a4f68a0cb7118c765ca44f849]]]
Former-commit-id: f841f1eda9
Former-commit-id: 1f1436a0da [formerly f1c4463316]
Former-commit-id: f30552c6de
2014-11-18 13:54:17 -06:00
Steve Harris
4bbeef346b Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: bab60d0d89 [formerly e1106f77eb] [formerly bab60d0d89 [formerly e1106f77eb] [formerly 1d18722dca [formerly 9c77ee7c19b87501983acf88279205644e1692f2]]]
Former-commit-id: 1d18722dca
Former-commit-id: 602bd4ce21 [formerly c2309d6d4a]
Former-commit-id: d887ad316f
2014-11-17 14:31:43 -06:00
Fay.Liang
1def1c0d2e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: e78e70cb81 [formerly 766685c4ec] [formerly e78e70cb81 [formerly 766685c4ec] [formerly 8ced3a4c73 [formerly 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc]]]
Former-commit-id: 8ced3a4c73
Former-commit-id: fc4643d2eb [formerly b7da8368d3]
Former-commit-id: 72a92ec456
2014-11-14 12:47:46 -05:00
Lee Venable
06c35b4096 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: 2bcf529bd9 [formerly f198da3f4d] [formerly 2bcf529bd9 [formerly f198da3f4d] [formerly 9fde70a354 [formerly b6d35ac4e3aa430de7057a16f9d5516584833150]]]
Former-commit-id: 9fde70a354
Former-commit-id: 58cf38e8f0 [formerly aba5c0cc19]
Former-commit-id: 521a4549f7
2014-11-14 11:14:16 -06:00
Ana Rivera
75bce54e24 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 499c58a253 [formerly 061fd0af28] [formerly 499c58a253 [formerly 061fd0af28] [formerly e54f3305d8 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]]
Former-commit-id: e54f3305d8
Former-commit-id: e49972bfcd [formerly 23b3f1bc77]
Former-commit-id: c7e3d0197c
2014-11-14 16:58:11 +00:00
Mark Peters
367f14a388 Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496

Former-commit-id: 36ebe9468c [formerly a3725b43bc] [formerly 36ebe9468c [formerly a3725b43bc] [formerly 7ae2b9524b [formerly fa93950435431248bd5790788e3a6936b4f4de2b]]]
Former-commit-id: 7ae2b9524b
Former-commit-id: e6e0af04c3 [formerly ee766624c5]
Former-commit-id: 47410b9117
2014-11-13 13:34:42 -06:00
Fay.Liang
51c57e8b48 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: aef63b4991 [formerly 3ed251486c] [formerly aef63b4991 [formerly 3ed251486c] [formerly cfe2f18790 [formerly 3f94c7f0ddbf580576b435a715366e3b9f3d9a53]]]
Former-commit-id: cfe2f18790
Former-commit-id: cc1cda2e98 [formerly e3c647e49e]
Former-commit-id: 2730ff96c6
2014-11-13 11:50:16 -05:00
Lee Venable
f9fdd8ac05 Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: f18c963895 [formerly 6b127b488d] [formerly f18c963895 [formerly 6b127b488d] [formerly f5bcc5b2c2 [formerly 389c35bce7c456154321605c3415c43431a46c7b]]]
Former-commit-id: f5bcc5b2c2
Former-commit-id: 630c2c7e7a [formerly 3a05aecbd6]
Former-commit-id: 29e2674ed5
2014-11-13 09:31:57 -06:00
Mike Duff
5cc3280353 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: b43c8557cd [formerly 8503cc25a7] [formerly b43c8557cd [formerly 8503cc25a7] [formerly 15f9d1ef50 [formerly 8d30af1c970cca70fe74560d3157e754e1164785]]]
Former-commit-id: 15f9d1ef50
Former-commit-id: 9cec2bd0e6 [formerly 4ede0f150c]
Former-commit-id: 04b7ae9256
2014-11-12 18:34:32 -06:00
Ron Anderson
66c29416f7 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: 80670c1b7a [formerly 04b8ffbcd2] [formerly 80670c1b7a [formerly 04b8ffbcd2] [formerly fe531a33e5 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]]
Former-commit-id: fe531a33e5
Former-commit-id: 19800d6f27 [formerly 0a6164461a]
Former-commit-id: 692de129af
2014-11-12 14:50:21 -06:00
Ben Steffensmeier
29d60f4f53 Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin.
Former-commit-id: 0a0cad6ed5 [formerly 11966fc0de] [formerly 0a0cad6ed5 [formerly 11966fc0de] [formerly 5c65750e82 [formerly 9bbd3f9f8dea46b14d77b796d0ea00285628ea75]]]
Former-commit-id: 5c65750e82
Former-commit-id: ec4f90760a [formerly 14f666f8e8]
Former-commit-id: f979b530d0
2014-11-12 12:50:17 -06:00
Ron Anderson
3f2d2840d2 Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 755fdd1950 [formerly a60e3465f4] [formerly 755fdd1950 [formerly a60e3465f4] [formerly 654c831b4e [formerly 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0]]]
Former-commit-id: 654c831b4e
Former-commit-id: dac3e5320a [formerly 47be7dc5a8]
Former-commit-id: 018fa61174
2014-11-12 11:25:32 -06:00
Mark Peters
47d615fdb4 Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f

Former-commit-id: abc4361a65 [formerly 9498a60e7b] [formerly abc4361a65 [formerly 9498a60e7b] [formerly 31701eeb9c [formerly e156d9527a0dd5fb25aca0264f1fddf546e60acf]]]
Former-commit-id: 31701eeb9c
Former-commit-id: 50ce1c6db6 [formerly c1ca8b1301]
Former-commit-id: 942daea6c7
2014-11-11 17:16:51 -06:00
Nate Jensen
415684bb4f Merge "Omaha #3760 Moved derived parameters with grid models to grid plugin" into omaha_14.4.1
Former-commit-id: fb577a5a04 [formerly f1c0b33254] [formerly fb577a5a04 [formerly f1c0b33254] [formerly c62edc0486 [formerly c2d32105c4cd1e7acb52b84ba23d119720888c96]]]
Former-commit-id: c62edc0486
Former-commit-id: b10471c457 [formerly d1e6159f2d]
Former-commit-id: 4c48956280
2014-11-11 17:09:08 -06:00
Mark Peters
5142772560 Omaha #3760 Moved derived parameters with grid models to grid plugin
Change-Id: I7ac459804b50872203103eb0e2b8a833aa1015ba

Former-commit-id: f60b1ac8ae [formerly 805bc7c7bc] [formerly f60b1ac8ae [formerly 805bc7c7bc] [formerly cea38f3162 [formerly 314e0cd90be176af62c452d44ea53587a2408c5d]]]
Former-commit-id: cea38f3162
Former-commit-id: 6974f6f099 [formerly df329c59fe]
Former-commit-id: 014043307e
2014-11-11 15:21:02 -06:00