Commit graph

4616 commits

Author SHA1 Message Date
Ben Steffensmeier
eb65002cf6 Issue #2211 Fix data mapped sampling.
Former-commit-id: d219a687c9 [formerly 724bb85676] [formerly d219a687c9 [formerly 724bb85676] [formerly 3d76d6655b [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]
Former-commit-id: 3d76d6655b
Former-commit-id: a37a910f67 [formerly 6a95dd6242]
Former-commit-id: a8c075d7e3
2014-02-07 13:00:00 -06:00
Brad Gonzales
a8256a5202 Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: 9529c1d191 [formerly 9c50fb29fd] [formerly 9529c1d191 [formerly 9c50fb29fd] [formerly 704e466f28 [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]
Former-commit-id: 704e466f28
Former-commit-id: b59278f73f [formerly 0b211e8036]
Former-commit-id: 104625b66d
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
b6a5148b42 Issue #2762 Fix Satellite Data Access.
Former-commit-id: a26a150a69 [formerly 2166b5b696] [formerly a26a150a69 [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 270433f5f3 [formerly e7662de8db]
Former-commit-id: ad709c9692
2014-02-06 13:53:44 -06:00
Mike Duff
c9f53e2346 Issue #2636 - Fix for ncf spring config
Former-commit-id: 3707a4eabd [formerly 3f7defe563] [formerly 3707a4eabd [formerly 3f7defe563] [formerly e84ae26421 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]
Former-commit-id: e84ae26421
Former-commit-id: 9ec273fdcc [formerly 6210a6aa18]
Former-commit-id: af8013baa7
2014-02-06 09:29:20 -06:00
Richard Peter
8471e5dd46 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 82fc0a2ed3 [formerly 64f0cabaef] [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: c3c1205848 [formerly c965993d17]
Former-commit-id: 15c2f761be
2014-02-05 18:20:36 -06:00
Mike Duff
377beb33a8 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: bafe19bbd5 [formerly 101c08818d] [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 9edf591218 [formerly 6a2f75e8d5]
Former-commit-id: bb43ec00b1
2014-02-05 16:08:01 -06:00
Richard Peter
127ce1f397 Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1
Former-commit-id: d1546d42ce [formerly 7e69f192a5] [formerly d1546d42ce [formerly 7e69f192a5] [formerly 882544fec5 [formerly 1e91683c1df918a7405c2f847a6dc7397dbcc473]]]
Former-commit-id: 882544fec5
Former-commit-id: 963fb37e6c [formerly 945bcd895c]
Former-commit-id: db4783afa4
2014-02-05 14:57:16 -06:00
Dave Hladky
59590fdf36 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 7fb7e10cda [formerly 6172c83afc] [formerly 7fb7e10cda [formerly 6172c83afc] [formerly 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]
Former-commit-id: 39f97723d6
Former-commit-id: 39f5579103 [formerly 2b998409f5]
Former-commit-id: 8e2eb4d255
2014-02-05 14:49:26 -06:00
Steve Harris
a76e3cf17b Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1dbc316078 [formerly f24bc49703] [formerly 1dbc316078 [formerly f24bc49703] [formerly 74c87b95c3 [formerly cee2e11f4b3d74bee3ab254267f156a846801087]]]
Former-commit-id: 74c87b95c3
Former-commit-id: 4cab7709ec [formerly ab294b7652]
Former-commit-id: 41f8fd08d2
2014-02-05 09:12:40 -06:00
Richard Peter
1aaeaf0037 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 21b0a87d78 [formerly 8f844bc9ce] [formerly 21b0a87d78 [formerly 8f844bc9ce] [formerly e5af004993 [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]
Former-commit-id: e5af004993
Former-commit-id: d3f13fc4c7 [formerly 4309c55a5f]
Former-commit-id: 1b8aacc92f
2014-02-04 18:12:48 -06:00
Mike Duff
bd52f67e0c Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 2ca26aaa39 [formerly eee642ac9b] [formerly 2ca26aaa39 [formerly eee642ac9b] [formerly eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]
Former-commit-id: eb46191ba9
Former-commit-id: 38aeb23274 [formerly 684390e599]
Former-commit-id: e8dea0d0dc
2014-02-04 14:01:29 -06:00
Mike Duff
267f0aac0b Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 227eb23157 [formerly 04ee397f2b] [formerly 227eb23157 [formerly 04ee397f2b] [formerly ab9621698f [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]
Former-commit-id: ab9621698f
Former-commit-id: f7566298b2 [formerly e984863c1c]
Former-commit-id: bb919f7d09
2014-02-04 12:45:33 -06:00
Richard Peter
a7b90d781a Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
Former-commit-id: fe3963680d [formerly 844f05e1ef] [formerly fe3963680d [formerly 844f05e1ef] [formerly fb8d982ede [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]]
Former-commit-id: fb8d982ede
Former-commit-id: 99a7c7afd7 [formerly 4c361f2cff]
Former-commit-id: 05a1e52357
2014-02-04 12:22:19 -06:00
Benjamin Phillippe
d4adefdad8 Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 3f4b92fffb [formerly 1691c5a3ff] [formerly 3f4b92fffb [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]
Former-commit-id: fc589ed84d
Former-commit-id: 20d26dc5a0 [formerly cdaa7e32b4]
Former-commit-id: 01def4be4a
2014-02-04 10:24:11 -06:00
Richard Peter
d297b0c2f1 Merge "Issue #2745 - Don't display fulfilled or cancelled allocations" into omaha_14.2.1
Former-commit-id: fb67e4410a [formerly 995e0c538a] [formerly fb67e4410a [formerly 995e0c538a] [formerly e16212d24d [formerly d68e99735aab51fa7a5f335534e89141ba00c890]]]
Former-commit-id: e16212d24d
Former-commit-id: 2df813c4b8 [formerly 75ad3f3d2a]
Former-commit-id: b773518f3a
2014-02-04 09:45:08 -06:00
Mike Duff
a33c96d8fc Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: 4d529f5051 [formerly f81772f4be] [formerly 4d529f5051 [formerly f81772f4be] [formerly c9b98868d2 [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]
Former-commit-id: c9b98868d2
Former-commit-id: 8b3b5a688f [formerly 4a07f6fb4c]
Former-commit-id: 1065c56bde
2014-02-03 16:57:03 -06:00
Ben Steffensmeier
f81c6dd1b9 Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: 921401ffe9 [formerly 8865177c6b] [formerly 921401ffe9 [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]
Former-commit-id: 97a64f89f1
Former-commit-id: 1f34342948 [formerly 2be72739b5]
Former-commit-id: d05d31fa34
2014-02-03 14:07:07 -06:00
Steve Harris
08700a77b1 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 131af8538e [formerly b2032880ac] [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 6883c64744 [formerly 33aea09906]
Former-commit-id: d8989145ac
2014-02-03 10:26:11 -06:00
Brian.Dyke
a540be3064 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 89b824b846 [formerly 4e7b1b207f] [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 3fd2ef82ab [formerly dd183bc0e9]
Former-commit-id: df55ab5503
2014-01-31 08:28:09 -05:00
Greg Armendariz
af0af0920b Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1
Former-commit-id: 7fbfe85478 [formerly ed0c724860] [formerly 7fbfe85478 [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: b4d9ec0e46 [formerly 66e79f459e]
Former-commit-id: 677e6ac584
2014-01-30 13:04:40 -06:00
Nate Jensen
cfb4bdbb21 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: c18e66cc45 [formerly 327c588c9e] [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]
Former-commit-id: 906c679b4e
Former-commit-id: af0ac40f47 [formerly 7bd1d802be]
Former-commit-id: ed91c1d6f5
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
a00d385f2e Issue #2537 Fix modelsounding registration.
Former-commit-id: 12b989a34b [formerly 819369747e] [formerly 12b989a34b [formerly 819369747e] [formerly 1db0291792 [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]
Former-commit-id: 1db0291792
Former-commit-id: 17ed6c9664 [formerly 501aec2537]
Former-commit-id: d06eb22524
2014-01-29 15:36:05 -06:00
Ron Anderson
7e541f2f77 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 81f9709ae7 [formerly fb262fdad2] [formerly 81f9709ae7 [formerly fb262fdad2] [formerly 7c06f0b011 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 25123bdeb0 [formerly 64f55c6b02]
Former-commit-id: d2d7920575
2014-01-29 14:16:31 -06:00
Ron Anderson
2086f03c28 Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: ea12cecc04 [formerly ce28c6c47f] [formerly ea12cecc04 [formerly ce28c6c47f] [formerly 0f6e082769 [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]
Former-commit-id: 0f6e082769
Former-commit-id: 09335f5372 [formerly 5427d15150]
Former-commit-id: 280434a03f
2014-01-29 13:55:54 -06:00
David Gillingham
14326b8c8d Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: fc25bbe1e9 [formerly 5edfbaa4a5] [formerly fc25bbe1e9 [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]
Former-commit-id: c802315ddc
Former-commit-id: 04d6bc5a42 [formerly 17d38b4974]
Former-commit-id: 38333b45a7
2014-01-29 11:56:05 -06:00
Max Schenkelberg
6953e81887 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])

Former-commit-id: 122c3442f8 [formerly 0c840cf724] [formerly 122c3442f8 [formerly 0c840cf724] [formerly d566ed9927 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: e1717b2729 [formerly f5ff746126]
Former-commit-id: 1cdbdfceba
2014-01-29 10:15:38 -06:00
Stephen Gilbert
e60e1873c0 VLab Issue #2867 - Remove dependency on Mcidas dataplugin
Removed the dependency for mcidas dataplugin.  The ncep feature
dependencies don't allow for that causing an error in the build scripts.

Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09

Former-commit-id: beaee1eaf0 [formerly c9af367a72] [formerly beaee1eaf0 [formerly c9af367a72] [formerly 0e96169b6f [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]
Former-commit-id: 0e96169b6f
Former-commit-id: e0e74ad5fd [formerly 71e8735fdf]
Former-commit-id: f5327455c3
2014-01-29 09:58:10 -05:00
Ron Anderson
4512aadb1c Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
Former-commit-id: 6d33a83771 [formerly b7c10ddebf] [formerly 6d33a83771 [formerly b7c10ddebf] [formerly 20259f3554 [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]]
Former-commit-id: 20259f3554
Former-commit-id: 5f9706019e [formerly 604a4363a3]
Former-commit-id: 3a55c53d5b
2014-01-29 08:39:41 -06:00
Stephen Gilbert
39c149a747 VLab Issue #2867 - Add dependency for Mcidas dataplugin
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.

Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b

Former-commit-id: e60635f47d [formerly ac68b01bbc] [formerly e60635f47d [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]
Former-commit-id: f21b0f5d82
Former-commit-id: 29ca14c4b7 [formerly 486096ada2]
Former-commit-id: fb46c34d1c
2014-01-28 14:52:46 -05:00
Mike Duff
3495a67c27 Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 4440c27ff6 [formerly 6e01cdb78e] [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]
Former-commit-id: 1caacacfe3
Former-commit-id: a76507e04f [formerly f4da152d87]
Former-commit-id: 1f4cc8681d
2014-01-28 11:09:33 -06:00
Ron Anderson
b6624cf7ca Issue #2504 Fix ingestAT
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8

Former-commit-id: a78d1fcd6b [formerly bb2ef86d14] [formerly a78d1fcd6b [formerly bb2ef86d14] [formerly 045ebfe967 [formerly ccf63372764f767af99d93b4d0299f9b8d066ee6]]]
Former-commit-id: 045ebfe967
Former-commit-id: cca9be6e65 [formerly 89246e17c5]
Former-commit-id: 9dfa819625
2014-01-27 18:16:46 -06:00
Stephen Gilbert
202f929a5f Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 312a09983a [formerly 64c2460028] [formerly 312a09983a [formerly 64c2460028] [formerly 1af8bfa176 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 7f3e8b5c21 [formerly d62a9f3b08]
Former-commit-id: 05655af06b
2014-01-27 14:23:02 -05:00
Stephen Gilbert
21dea78fde Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: a7ce764b19 [formerly a70450b064] [formerly a7ce764b19 [formerly a70450b064] [formerly bf7fcc1952 [formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]]
Former-commit-id: bf7fcc1952
Former-commit-id: 48aeec0c17 [formerly 3a3f8a7be0]
Former-commit-id: f39c9fdaa4
2014-01-27 14:22:17 -05:00
Stephen Gilbert
f7c1bee352 Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 53fa8822e0 [formerly 6785474b17] [formerly 53fa8822e0 [formerly 6785474b17] [formerly b64adbed81 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]
Former-commit-id: b64adbed81
Former-commit-id: 511123b38c [formerly d947a0e7c1]
Former-commit-id: 4cd6847849
2014-01-27 14:20:47 -05:00
Brad Gonzales
7707be3dcd Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: afbaf72617 [formerly e94023097e] [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 71a32928d9 [formerly a40afbe8ac]
Former-commit-id: f7c3c8c83d
2014-01-26 20:31:38 -06:00
Lee Venable
4cbf1f4ff4 Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: e3e3c4feef [formerly a49cfc6a74] [formerly e3e3c4feef [formerly a49cfc6a74] [formerly d9d985eee4 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]]
Former-commit-id: d9d985eee4
Former-commit-id: f7dff455d2 [formerly f387778dce]
Former-commit-id: f64efd9712
2014-01-26 19:17:04 -06:00
Lee Venable
5480b898cf Merge "Issue #2459 - Last change from unscheduled to deactivated." into omaha_14.2.1
Former-commit-id: 5c9897edbd [formerly 7515cbcc6c] [formerly 5c9897edbd [formerly 7515cbcc6c] [formerly fefceb7c8f [formerly 2f969c1e6ef6dfa1e6ee83a0fd32d9983f8dfa88]]]
Former-commit-id: fefceb7c8f
Former-commit-id: a955b006c8 [formerly 63cc1ed3f5]
Former-commit-id: 2ea4cb1823
2014-01-26 19:16:46 -06:00
Mike Duff
5fb0034000 Issue #2636 - Fix point scheduling
Former-commit-id: 2c4f25ae81 [formerly af45ad9ac1] [formerly 2c4f25ae81 [formerly af45ad9ac1] [formerly c0e7aa2af3 [formerly 6291c630ca3c1999870eb6045c95131153b1d305]]]
Former-commit-id: c0e7aa2af3
Former-commit-id: e02576f737 [formerly f04058849f]
Former-commit-id: 190964c224
2014-01-26 18:59:10 -06:00
Mike Duff
c030596afe Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 3766f6a0f4 [formerly e46c226489] [formerly 3766f6a0f4 [formerly e46c226489] [formerly 81aa9ce0cb [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: ef5d3f370c [formerly 5fc96739b9]
Former-commit-id: 0b39c2977b
2014-01-26 18:57:26 -06:00
Dave Hladky
50cf7cbaeb Issue #2741 Fixed nullpointers in Retrieval and BWM
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576

Former-commit-id: efbb7faced [formerly c06fd8317c] [formerly efbb7faced [formerly c06fd8317c] [formerly 2e1d02fe21 [formerly 3c47b3cb0ee18e485082e8a53d43b38722c5dce4]]]
Former-commit-id: 2e1d02fe21
Former-commit-id: 3bf1afdf70 [formerly 64991d004c]
Former-commit-id: c735006401
2014-01-26 18:15:09 -06:00
Lee Venable
a33a533acc Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
Former-commit-id: 1ea52fdbcd [formerly 6c9a4394b7] [formerly 1ea52fdbcd [formerly 6c9a4394b7] [formerly 805f63c0ec [formerly b6d4e063c3f99ba78a933435a87090e813643836]]]
Former-commit-id: 805f63c0ec
Former-commit-id: d94aebebec [formerly f43d763ec6]
Former-commit-id: 6c64419546
2014-01-26 17:01:17 -06:00
Lee Venable
345a92738d Merge "Issue #2636 - Fix scheduling gaps at start and end of retrieval plan" into omaha_14.2.1
Former-commit-id: 6c03781d17 [formerly fc223f594a] [formerly 6c03781d17 [formerly fc223f594a] [formerly 5e8866a859 [formerly a332d62d6fddc831599bd1e0a6e2d1844e038953]]]
Former-commit-id: 5e8866a859
Former-commit-id: 2e7cc155ce [formerly 732bcab635]
Former-commit-id: 28f4eaa699
2014-01-26 13:26:39 -06:00
Lee Venable
139dac5ebc Merge "Issue #2695 removed old userRoles.xml file. Change-Id: Ib844e1ca6bf00559799115863212663373d330c3" into omaha_14.2.1
Former-commit-id: 8e161a1367 [formerly 362e141305] [formerly 8e161a1367 [formerly 362e141305] [formerly 41d4a17742 [formerly c5b13c4c667280049fe0e68df871f10f17903afc]]]
Former-commit-id: 41d4a17742
Former-commit-id: ff9f5120b7 [formerly 1498940899]
Former-commit-id: ad76f06135
2014-01-26 13:03:59 -06:00
Dave Hladky
0188e9c33c Issue #2695 removed old userRoles.xml file.
Change-Id: Ib844e1ca6bf00559799115863212663373d330c3

Former-commit-id: 368f58db92 [formerly b09e5f06c8] [formerly 368f58db92 [formerly b09e5f06c8] [formerly c15ff99aa9 [formerly d3f172910977cac03d472131cb517fdec29a4fa3]]]
Former-commit-id: c15ff99aa9
Former-commit-id: 40acc6c76a [formerly 373f1d7d15]
Former-commit-id: 4515c25222
2014-01-26 11:15:01 -06:00
Mike Duff
c9ca18c0ef Issue #2452 - Changed label based on feedback.
Former-commit-id: fb6194c464 [formerly 1da1285311] [formerly fb6194c464 [formerly 1da1285311] [formerly 6dcd1a7969 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: eaaab3b082 [formerly be59be53d4]
Former-commit-id: df6c94e317
2014-01-25 14:41:20 -06:00
Mike Duff
952c843d02 Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

Former-commit-id: a4a910daf1 [formerly 6f7cadba9f] [formerly a4a910daf1 [formerly 6f7cadba9f] [formerly 4334640c22 [formerly c0d49492af75d0411d6c0c2541af440302595b6a]]]
Former-commit-id: 4334640c22
Former-commit-id: c8e199569a [formerly 3e26dc54df]
Former-commit-id: a7eed82b28
2014-01-25 14:09:02 -06:00
Richard Peter
c5045ee06c Merge "Issue #2709 Fix for recurring subscription active period end." into omaha_14.2.1
Former-commit-id: a63e82c982 [formerly 2b53723507] [formerly a63e82c982 [formerly 2b53723507] [formerly e416759c3c [formerly 6f332c96aabf76c51d1ebb2bbb671ae14df8e408]]]
Former-commit-id: e416759c3c
Former-commit-id: c5f29e80d1 [formerly 63156262bb]
Former-commit-id: c9cc22050a
2014-01-24 17:18:42 -06:00
Ron Anderson
694ff599dd Issue #2504 Change other GFESuite scripts to use iscUtil.getLogger for consistency
Change-Id: I4ce123e8030075bf4a247152dd053ba16dad6987

Former-commit-id: c353c4aa74 [formerly c133dc5506] [formerly c353c4aa74 [formerly c133dc5506] [formerly a54c44a6fb [formerly b0357df1c4b82623f1345362ddd6ca57d514a1e6]]]
Former-commit-id: a54c44a6fb
Former-commit-id: 380f161220 [formerly a330f388b0]
Former-commit-id: a722dba9a0
2014-01-24 17:01:40 -06:00
Dave Hladky
362f38157d Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00

Former-commit-id: e15b9e2ba9 [formerly 523e100fd0] [formerly e15b9e2ba9 [formerly 523e100fd0] [formerly 690b5b73cf [formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]]]
Former-commit-id: 690b5b73cf
Former-commit-id: c87bd8b764 [formerly dccf640640]
Former-commit-id: fa350b76c9
2014-01-24 14:44:12 -06:00
Richard Peter
bc14ccd1f8 Merge "Issue #2359 printout shutdown of application to try and detect kills" into omaha_14.2.1
Former-commit-id: fa5336f508 [formerly 519c0a44c0] [formerly fa5336f508 [formerly 519c0a44c0] [formerly 3c68312dc8 [formerly af00a8b522160a498d168b88dc519d9cc006f21e]]]
Former-commit-id: 3c68312dc8
Former-commit-id: 6fc2bc4357 [formerly 7093e5a9c8]
Former-commit-id: e8b2d31b11
2014-01-24 12:32:51 -06:00