xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4658 commits 31 branches 40 tags 3.8 GiB
Commit graph

4658 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Friedman
c00bffe1f9 ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: d7db4bf632 [formerly b8aadf1781] [formerly 103fece7b7] [formerly 103fece7b7 [formerly 2c1a3442d6]] [formerly d7db4bf632 [formerly b8aadf1781] [formerly 103fece7b7] [formerly 103fece7b7 [formerly 2c1a3442d6]] [formerly a58f3cb7df [formerly 103fece7b7 [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]]]
Former-commit-id: a58f3cb7df
Former-commit-id: a1738767f4 [formerly 951bd668ae] [formerly 91b22ff9bb] [formerly f2e81550b0af2068d152eb149f81e903079629fe [formerly 38bf85175bedb3976ea85ab928e8bdea8f6e4a64] [formerly 91b22ff9bb [formerly 2a4a92c223]]]
Former-commit-id: 9085352f659bfa05328334cffbd2b49251e97a23 [formerly e4fe776694b8d4beb5605017347016019fb2ec75] [formerly 2eb0b3dfb0 [formerly ab5f533c72]]
Former-commit-id: 2eb0b3dfb0
Former-commit-id: 87ed26568e
 2014-03-07 14:58:09 +00:00
David Friedman
a7c3399e93 ASM #74 - Fix RadarServer configuration import utility JAR dependency 
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: e88dd49d06 [formerly e7def94c5f] [formerly fa849dfefa] [formerly fa849dfefa [formerly 11d0d191fd]] [formerly e88dd49d06 [formerly e7def94c5f] [formerly fa849dfefa] [formerly fa849dfefa [formerly 11d0d191fd]] [formerly d08597a0d4 [formerly fa849dfefa [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]]]
Former-commit-id: d08597a0d4
Former-commit-id: 4576be93a6 [formerly 3d09743022] [formerly 7efff2943c] [formerly ddfcc80ebdfc75765aee7fcbd90fcbb1b8420dde [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a] [formerly 7efff2943c [formerly 591ce333dc]]]
Former-commit-id: edbdcefcd8029e078b6865581a69a3f544376263 [formerly 89fc9937b925fbd68ad74bb2b24a9bffae38c3df] [formerly 3dde8aeda7 [formerly 89b6f79565]]
Former-commit-id: 3dde8aeda7
Former-commit-id: b62acbc154
 2014-03-06 17:07:23 +00:00
Brian.Dyke
55615cdd00 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: af1aec8dde [formerly 9158806dd2] [formerly 363403fb34] [formerly 363403fb34 [formerly 2faab606e5]] [formerly af1aec8dde [formerly 9158806dd2] [formerly 363403fb34] [formerly 363403fb34 [formerly 2faab606e5]] [formerly 1a8a0b703e [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 26b98fb80d [formerly 6b1b6d38e3] [formerly 73a1c238f4] [formerly 42296588ba3dfa4fcd8427134926b0c727849a35 [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c] [formerly 73a1c238f4 [formerly 227131e5f1]]]
Former-commit-id: 2c378e9e28b03ef7052c734a063ef36b991058bb [formerly b22adde77eff6179b00b4c7389d58bbde1684f4b] [formerly 0bcf7c89b8 [formerly 38829b9014]]
Former-commit-id: 0bcf7c89b8
Former-commit-id: 9db7ca881a
 2014-02-24 14:51:00 -05:00
Brian.Dyke
fdeafd6666 ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev) 
Former-commit-id: 4c41a363dc [formerly 45cf129ad7] [formerly 5f3ca0a3f4] [formerly 5f3ca0a3f4 [formerly 2f79cc486e]] [formerly 4c41a363dc [formerly 45cf129ad7] [formerly 5f3ca0a3f4] [formerly 5f3ca0a3f4 [formerly 2f79cc486e]] [formerly 916f657e04 [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]]]
Former-commit-id: 916f657e04
Former-commit-id: 601c4644ca [formerly 1fc3b18abb] [formerly 9ce06f52c4] [formerly 3c8881ff68e1b111a9abeb0274379796346e67b4 [formerly b55df208e18a858dd848c1f37a3594d57d916867] [formerly 9ce06f52c4 [formerly e36ae1dd7f]]]
Former-commit-id: 08bd1e738924e0194f9a8fec0a8a21387c1120a5 [formerly 2f25bb8be4842d117064095d696ba2c535e07c96] [formerly 176c56b8ea [formerly f89f664f50]]
Former-commit-id: 176c56b8ea
Former-commit-id: 1882ad8be8
 2014-02-20 15:50:50 -05:00
David Gillingham
39f273ff60 Issue #2783: Rewrite run_report_alarm script into EDEX service. 
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 08666de26c [formerly 43733c77eb] [formerly 607ce13c19] [formerly 607ce13c19 [formerly 32719432ff]] [formerly 08666de26c [formerly 43733c77eb] [formerly 607ce13c19] [formerly 607ce13c19 [formerly 32719432ff]] [formerly de12904c7a [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]]]
Former-commit-id: de12904c7a
Former-commit-id: 96a7bfc7ce [formerly b373d71852] [formerly a83191356d] [formerly e47c636c3e9bc57823b42b4f9527f3e9e2c22cf0 [formerly d751bcbb04dc8d77626c940f99e5f7ad3f73874d] [formerly a83191356d [formerly 1520317c24]]]
Former-commit-id: ad200513e423245d6870c785dc4073f1eeb2aedc [formerly dccf95a720d831ceee3c0b64bcf95676cd281af5] [formerly 5911f4b2d4 [formerly 474dda75de]]
Former-commit-id: 5911f4b2d4
Former-commit-id: da665e15b0
 2014-02-18 13:24:37 -06:00
Richard Peter
bf3ce91985 Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1 
Former-commit-id: cf68af4dd8 [formerly 4dcb9b321d] [formerly c666adb530] [formerly c666adb530 [formerly 3ed6ad64ce]] [formerly cf68af4dd8 [formerly 4dcb9b321d] [formerly c666adb530] [formerly c666adb530 [formerly 3ed6ad64ce]] [formerly d19e464a1a [formerly c666adb530 [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]]]
Former-commit-id: d19e464a1a
Former-commit-id: 850efa1187 [formerly ba1cb2a9cf] [formerly f7e43bdabd] [formerly 1557292f739b62f42bb8b439ceb16e922be07058 [formerly 342727148b90c7cfc603e2659e805e35a76103ca] [formerly f7e43bdabd [formerly 3c4e188037]]]
Former-commit-id: c9c5f1fdcb95d09700cc09e9338e5d953e1b76fe [formerly 0946878bb5aee9e4ba8c1d55fee28dd46686ac45] [formerly bbce2567a7 [formerly ccd90f2d86]]
Former-commit-id: bbce2567a7
Former-commit-id: fac7168aac
 2014-02-18 12:44:57 -06:00
Lee Venable
5bbea13ba9 Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1 
Former-commit-id: 6306949659 [formerly f81d0d88b8] [formerly e9226e7140] [formerly e9226e7140 [formerly 0cf2dba731]] [formerly 6306949659 [formerly f81d0d88b8] [formerly e9226e7140] [formerly e9226e7140 [formerly 0cf2dba731]] [formerly 4e7c3c0cbe [formerly e9226e7140 [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 65e7fc525e [formerly ab57d3efe7] [formerly 46dbd967a5] [formerly ffc1c056ac9b61206eaba539b3eb83f3a131f144 [formerly acd1e7e5cccd9c772e69add2efbbd68d034964ff] [formerly 46dbd967a5 [formerly 6fc9dcb3b1]]]
Former-commit-id: cdb88bbf063204cc678adaf17ed43da77eea2916 [formerly 999e96801ebb27fa8bfb43cbde945a0c58ce1874] [formerly 0bd01db3cc [formerly 28b0809a1c]]
Former-commit-id: 0bd01db3cc
Former-commit-id: 80ef62e8fd
 2014-02-18 12:19:41 -06:00
Brad Gonzales
29ba66a1f4 Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues. 
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: fc18c805ee [formerly b0f71efecc] [formerly 49ddffc99b] [formerly 49ddffc99b [formerly 36a24c1cb5]] [formerly fc18c805ee [formerly b0f71efecc] [formerly 49ddffc99b] [formerly 49ddffc99b [formerly 36a24c1cb5]] [formerly 794bbc3c9b [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 4e3a5dcc97 [formerly 2330bf10b2] [formerly 3bb9975728] [formerly 12171d1f3b063d80005d8378e272d6df8e3ba968 [formerly 156a80d9ff219de8a2827577a58910cefd208d71] [formerly 3bb9975728 [formerly 90d34f7386]]]
Former-commit-id: 1f96b4d2e827bd07ec266f737aa9dc2b2f9968f7 [formerly f42b463f576142d80cc6c0dbb6de2708378d5614] [formerly d50a8cd7a5 [formerly b99b5d9373]]
Former-commit-id: d50a8cd7a5
Former-commit-id: d899777a6d
 2014-02-18 12:11:02 -06:00
Mike Duff
bc15433bd9 Issue #2636 - Change how retrieval plan is updated over time. 
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 1ce1e4ef54 [formerly c125b9d044] [formerly 33f81d8822] [formerly 33f81d8822 [formerly 89bd047283]] [formerly 1ce1e4ef54 [formerly c125b9d044] [formerly 33f81d8822] [formerly 33f81d8822 [formerly 89bd047283]] [formerly 911789b910 [formerly 33f81d8822 [formerly 89bd047283] [formerly 911789b910 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]]]
Former-commit-id: 911789b910
Former-commit-id: 01070838f9 [formerly cddd263edc] [formerly 42e6591bc8] [formerly 4d07e043ae64ac66d246e1f88386597d24788352 [formerly 63198d978b2d9ab9f18c26071e586f7a38cac365] [formerly 42e6591bc8 [formerly 5f9d913c6d]]]
Former-commit-id: b4c928f5d4539a50c818986c3a104d6a53929496 [formerly f2a50ed00c3b42b132cd818df4e07da12380595e] [formerly 2467a11a7e [formerly d277c1caf1]]
Former-commit-id: 2467a11a7e
Former-commit-id: 08bd755af0
 2014-02-18 12:05:26 -06:00
Brad Gonzales
dc1c756bf1 Issue #2771 For Data Delivery CAVE now request current id from 
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: ba2beb13e4 [formerly 1d57e9f5f7] [formerly 379c0fb46c] [formerly 379c0fb46c [formerly 19460ed0d7]] [formerly ba2beb13e4 [formerly 1d57e9f5f7] [formerly 379c0fb46c] [formerly 379c0fb46c [formerly 19460ed0d7]] [formerly ba4e308328 [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]]
Former-commit-id: ba4e308328
Former-commit-id: 14638f8acd [formerly ae35320dd6] [formerly 1b76488111] [formerly 23c9485efdeda3553cf63009f87ce21e784ec278 [formerly eab08c6056f77a408245754e016c16a1db9d08f4] [formerly 1b76488111 [formerly 3be3380944]]]
Former-commit-id: 887cabbd6abdfcd642b42b9105d5bd6297b1e926 [formerly 367c8f66061868a52d255ea46c57bb8c2dc11b5f] [formerly b0421675ff [formerly 9aa1cb299e]]
Former-commit-id: 6dbce89dbefc66b2da9736a80d0483adc39bc920 [formerly b0421675ff]
Former-commit-id: e906d71ac4
 2014-02-18 11:10:44 -06:00
Ron Anderson
300ee8f7bf Merge branch 'master_14.1.1' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 70cab4177f [formerly 410f956cff] [formerly e7f2b6883d] [formerly e7f2b6883d [formerly 32bcf9d0d0]] [formerly 70cab4177f [formerly 410f956cff] [formerly e7f2b6883d] [formerly e7f2b6883d [formerly 32bcf9d0d0]] [formerly 14a082a4e9 [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 6d5b4e33fc [formerly 8779564e3a] [formerly 0135771eec] [formerly 572fdd2e8ec23449d4870a10516fccf9d12e37ee [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108] [formerly 0135771eec [formerly d4ba9eba94]]]
Former-commit-id: 653811d0034708c8159a5df794d1016bd2142150 [formerly 55baedb811a56a020df3ba68f97e40ee6307fb4c] [formerly 8a7af092f2 [formerly 68e03bf02f]]
Former-commit-id: 8a7af092f2
Former-commit-id: c3b687b9a5
 2014-02-18 10:45:20 -06:00
Dave Hladky
1490d221a4 Issue #2786 Pending subscriptions don't work. 
Former-commit-id: 29f3ea4513 [formerly c8711269fa] [formerly 24a4fab603] [formerly 24a4fab603 [formerly 5c11dd09bb]] [formerly 29f3ea4513 [formerly c8711269fa] [formerly 24a4fab603] [formerly 24a4fab603 [formerly 5c11dd09bb]] [formerly 7ee101d7c7 [formerly 24a4fab603 [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 8145135f8b [formerly b0849517aa] [formerly 012619f05f] [formerly efc21e8e2211fba7c0a08b866f8d527c7b5c2d94 [formerly 8cc48c2dd72749fa9b1d02eaf6673400410fa283] [formerly 012619f05f [formerly 78d41d01bb]]]
Former-commit-id: 026eb6a776ec08e9a9e3d6c17d939e17cf60305e [formerly ef97cd1ab357557ce1ca31b9265c978f0586073f] [formerly 51b644bf0c [formerly 9ccf06c4f4]]
Former-commit-id: 6d1182245e4288035d464b79c46a344a74bcadb2 [formerly 51b644bf0c]
Former-commit-id: 2708c918de
 2014-02-18 09:14:38 -06:00
Nate Jensen
2ae05bf624 Issue #2704 fix alertviz connectivity checks 
Former-commit-id: 50324f7ac7 [formerly 742217ded0] [formerly 0160ab0464] [formerly 0160ab0464 [formerly 0c4de50218]] [formerly 50324f7ac7 [formerly 742217ded0] [formerly 0160ab0464] [formerly 0160ab0464 [formerly 0c4de50218]] [formerly 4d68994525 [formerly 0160ab0464 [formerly 0c4de50218] [formerly 4d68994525 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]]]
Former-commit-id: 4d68994525
Former-commit-id: 2c96f85d50 [formerly 60fd298721] [formerly 121bcd184a] [formerly 22d68c06f9a646d23279dc0ccb882779157695cb [formerly 4ab3a27b137394410a2b8da012bfe21a237dd4b6] [formerly 121bcd184a [formerly 228ab8dd60]]]
Former-commit-id: b0a3ced7f857dc65eb4f3dbc6bd5f1c3d66b4caf [formerly 38e7719aa70d69e4f2268ba3d82ba8df10a7cace] [formerly 0dd9cd1094 [formerly 944df080f4]]
Former-commit-id: 0dd9cd1094
Former-commit-id: 8e8e9141e7
 2014-02-17 17:10:07 -06:00
Nate Jensen
16ced6f169 Issue #2812 made getHostname() use getWsId().getHostname for consistency 
and working on windows


Former-commit-id: e623c612c1 [formerly 34c7c3cba1] [formerly c8e70cd6b1] [formerly c8e70cd6b1 [formerly 15ff4ab5d7]] [formerly e623c612c1 [formerly 34c7c3cba1] [formerly c8e70cd6b1] [formerly c8e70cd6b1 [formerly 15ff4ab5d7]] [formerly 2486e39192 [formerly c8e70cd6b1 [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]]]
Former-commit-id: 2486e39192
Former-commit-id: 8496e8a0da [formerly 62739b7936] [formerly b801b36ca7] [formerly ad8ceebab282041e9bb96218296d9e32666fc950 [formerly 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0] [formerly b801b36ca7 [formerly 0314d61773]]]
Former-commit-id: 85dd426d81db163cc65029ed3d091f41de9e8db6 [formerly 991546c580399668225c99bbb7a4506b93bf17d6] [formerly 695d03b815 [formerly e6dae7a23c]]
Former-commit-id: 21b86a72f0179db9ec4739cc05d6abaeeaf15c8a [formerly 695d03b815]
Former-commit-id: 9c67149bf9
 2014-02-17 11:58:04 -06:00
Nate Jensen
757a9b9480 Issue #2813 fix xml serialization of subscriptions 
Former-commit-id: 406e2563de [formerly e42eb1940d] [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly 4583814741 [formerly be75cc3731]]] [formerly 406e2563de [formerly e42eb1940d] [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly 4583814741 [formerly be75cc3731]]] [formerly 83e9226419 [formerly 4583814741 [formerly be75cc3731] [formerly 83e9226419 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]]]
Former-commit-id: 83e9226419
Former-commit-id: 6266be78f6 [formerly fd8e2126b1] [formerly e9bbdfdf89] [formerly ed01dfbc55624a31e138918bf76aca59999a0664 [formerly 814fc7ae6232206fb29b52f95a6d3c32f51b62c5] [formerly e9bbdfdf89 [formerly 30bbc788ce]]]
Former-commit-id: 50fe34112d99d7562362a6fede379b4ce6ca2ab4 [formerly 97227c6baf4c9b880f984a88d56c645160f85e93] [formerly c6b270f084 [formerly 39b3824ae3]]
Former-commit-id: c6b270f084
Former-commit-id: 0bca06ef1a
 2014-02-17 11:37:48 -06:00
Steve Harris
0b0707f1af Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 83e59a7e77 [formerly 1b7e02636d] [formerly d0352c69d4] [formerly d0352c69d4 [formerly 267cc881a4]] [formerly 83e59a7e77 [formerly 1b7e02636d] [formerly d0352c69d4] [formerly d0352c69d4 [formerly 267cc881a4]] [formerly 9fcc5ad930 [formerly d0352c69d4 [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: bc730dfaf0 [formerly 1fbbb6e73f] [formerly 146412a8bd] [formerly b3513b7858c9a6a28695dd28e0e2f99631e0255c [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98] [formerly 146412a8bd [formerly e115197bb7]]]
Former-commit-id: 4cf35f5e9a3a42b07f625cfdb4f158e25cec4fbe [formerly 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486] [formerly 7805eac857 [formerly 28aa3dd195]]
Former-commit-id: 0c43c88c587e0f89141fc4f249efeb46de1967da [formerly 7805eac857]
Former-commit-id: a5d78a7f44
 2014-02-17 08:54:34 -06:00
Ron Anderson
e5de412dc5 Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1 
Former-commit-id: 6156e8acf4 [formerly 4b2981b74f] [formerly ce8d59e075] [formerly ce8d59e075 [formerly fae824482b]] [formerly 6156e8acf4 [formerly 4b2981b74f] [formerly ce8d59e075] [formerly ce8d59e075 [formerly fae824482b]] [formerly 769c56bf08 [formerly ce8d59e075 [formerly fae824482b] [formerly 769c56bf08 [formerly ddb195c3032b80221e63f21eb113eaab5d50b124]]]]]
Former-commit-id: 769c56bf08
Former-commit-id: 2fe75a58ce [formerly facdf2b779] [formerly 8434f5cc65] [formerly df69c8ecf060f1ba45b0234fda9ea72e69175639 [formerly 3283dd7794029e5cfa8c585c129c8e58899e8c04] [formerly 8434f5cc65 [formerly 29e24081a6]]]
Former-commit-id: e608e9cab1018cd9e26b25107d3330b9623ef480 [formerly 667f4a40a90358e21feeac640544b0572c5aca54] [formerly 7972a652b0 [formerly f4d0632cb2]]
Former-commit-id: 7972a652b0
Former-commit-id: 8a3fa8f03e
 2014-02-17 08:56:48 -06:00
Mike Duff
d177f432f9 Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site. 
Former-commit-id: 392ffc44bf [formerly b34c9eedd0] [formerly 43ea3b0918] [formerly 43ea3b0918 [formerly ac62d322ed]] [formerly 392ffc44bf [formerly b34c9eedd0] [formerly 43ea3b0918] [formerly 43ea3b0918 [formerly ac62d322ed]] [formerly 346dc4afff [formerly 43ea3b0918 [formerly ac62d322ed] [formerly 346dc4afff [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]]]
Former-commit-id: 346dc4afff
Former-commit-id: b41b557890 [formerly fad65749a8] [formerly 6601dff483] [formerly baf2231ab1021952c01f113b35561655736c5888 [formerly 2be8bfeadfd1af814a97057e7cfe23152263de88] [formerly 6601dff483 [formerly 5b3a55d11f]]]
Former-commit-id: f86c39b0fbdd703ba45c2d234c5e5fd66372ccce [formerly 3add04f6f2835f888f0452d213544d97cca8f1c0] [formerly fe38928d33 [formerly c5f33b0ed0]]
Former-commit-id: fe38928d33
Former-commit-id: 8f8300320c
 2014-02-14 08:53:40 -06:00
Ben Steffensmeier
c1584a6961 Issue #2528 Fix display of data on somewhat identical projections. 
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: d7b364f17c [formerly 94f0b52344] [formerly 2b30269ac9] [formerly 2b30269ac9 [formerly 54a17c012d]] [formerly d7b364f17c [formerly 94f0b52344] [formerly 2b30269ac9] [formerly 2b30269ac9 [formerly 54a17c012d]] [formerly 23694f5e0c [formerly 2b30269ac9 [formerly 54a17c012d] [formerly 23694f5e0c [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]]]
Former-commit-id: 23694f5e0c
Former-commit-id: 88eb99d21a [formerly bc38342841] [formerly be00537d6d] [formerly c881756c962e7be5181f96f644292e5d51d9205d [formerly 9216d693916f99cccb2708677c47ef641c0cf7d1] [formerly be00537d6d [formerly bedf3cf45d]]]
Former-commit-id: 4e9f94310a06bf57c287bcb6224fddf7a3fc57f0 [formerly d7ddd5a4a6a966a25cee41eb29c97f5337897152] [formerly 1e96945cb8 [formerly c8feeebbbd]]
Former-commit-id: 1e96945cb8
Former-commit-id: f686048ddc
 2014-02-13 13:27:32 -06:00
Ron Anderson
ba67a5091f Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1 
Former-commit-id: 6615932d6c [formerly ce72867ab9] [formerly 21e95cc2f0] [formerly 21e95cc2f0 [formerly 51c9d27a39]] [formerly 6615932d6c [formerly ce72867ab9] [formerly 21e95cc2f0] [formerly 21e95cc2f0 [formerly 51c9d27a39]] [formerly 42fd9c8f9a [formerly 21e95cc2f0 [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: ba58e9ab98 [formerly c2e56111c1] [formerly ca11555427] [formerly 2293dfc6a271afa003eb03c01bfe1820a2949c62 [formerly c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a] [formerly ca11555427 [formerly b84a83eb6f]]]
Former-commit-id: 011b0f416085c6799c786ac74e11dbae0b94d797 [formerly 038e150875b793ce7a2afd8a7cfae08a2e921c3f] [formerly 3598139635 [formerly 828738b81f]]
Former-commit-id: 3598139635
Former-commit-id: 52aac6e855
 2014-02-13 10:46:27 -06:00
Ron Anderson
77fed952cb Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 8ef94ea216 [formerly 69ee4792ad] [formerly 3e78908bb5] [formerly 3e78908bb5 [formerly fcf45916f4]] [formerly 8ef94ea216 [formerly 69ee4792ad] [formerly 3e78908bb5] [formerly 3e78908bb5 [formerly fcf45916f4]] [formerly 2f067699f2 [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 434d5c4c6c [formerly 4d8ebf6712] [formerly d9b82b4ebe] [formerly d520f8d08747355126bced1207a4b6b823b314ac [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c] [formerly d9b82b4ebe [formerly 2d7c87ac84]]]
Former-commit-id: 8b2bd0d00634c1dda881c7a9a5d7f715d123b0df [formerly d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc] [formerly 7447a71c10 [formerly d298aabe40]]
Former-commit-id: 7447a71c10
Former-commit-id: 86f067bac9
 2014-02-13 10:10:34 -06:00
Lee Venable
5fc14da617 Issue #2773 - added code to help prevent eclipse bug from occurring. 
Former-commit-id: f31faf094c [formerly 328aebb4a6] [formerly 8073fd22b1] [formerly 8073fd22b1 [formerly 7099472204]] [formerly f31faf094c [formerly 328aebb4a6] [formerly 8073fd22b1] [formerly 8073fd22b1 [formerly 7099472204]] [formerly ce08022db7 [formerly 8073fd22b1 [formerly 7099472204] [formerly ce08022db7 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]]]
Former-commit-id: ce08022db7
Former-commit-id: e7c6e09994 [formerly c17a417cbe] [formerly a7302a3232] [formerly 97cfab70e9ff4b4c11255a05563c4d8cf006aa54 [formerly 1b4a9c2bf36e763585bfbc84e3a5a6ce5dbd03e0] [formerly a7302a3232 [formerly c74ae6b83d]]]
Former-commit-id: f019535af9900d3ea8ad94ea7106fdf9e534ba67 [formerly cd29c83d449fdcaba1122415142340d3b6f1881f] [formerly 3a195bd22e [formerly 5ae2a544ca]]
Former-commit-id: 3a195bd22e
Former-commit-id: 06eb20431a
 2014-02-12 13:47:20 -06:00
Ron Anderson
d8fcc7f778 Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1 
Former-commit-id: e0e72005ab [formerly cf7281ba3c] [formerly 8ba331e7fb] [formerly 8ba331e7fb [formerly af4f8de839]] [formerly e0e72005ab [formerly cf7281ba3c] [formerly 8ba331e7fb] [formerly 8ba331e7fb [formerly af4f8de839]] [formerly d906b780e8 [formerly 8ba331e7fb [formerly af4f8de839] [formerly d906b780e8 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]]]
Former-commit-id: d906b780e8
Former-commit-id: 3278b026f7 [formerly e0403fd81d] [formerly 2fdcef7338] [formerly d8ee12a53af565a46d2efac585b38fcef0e909ac [formerly 33d7dc6d66fee245851700ef94b840f31e915bc0] [formerly 2fdcef7338 [formerly 361881dfda]]]
Former-commit-id: 0c1978780c07ed08abc06d643432eb64b7231f1e [formerly 64ebb3c14ee6f0c360a86bff0fcf037a49b4d01a] [formerly 79a635bc9e [formerly 2e1f7c8199]]
Former-commit-id: 79a635bc9e
Former-commit-id: 303a1b1786
 2014-02-11 17:16:07 -06:00
Ron Anderson
e73b65174c Issue #2719 Update NHA GFE domain 
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 7d2bc33d97 [formerly 0b73d0703e] [formerly 0f9b44ff94] [formerly 0f9b44ff94 [formerly a665530831]] [formerly 7d2bc33d97 [formerly 0b73d0703e] [formerly 0f9b44ff94] [formerly 0f9b44ff94 [formerly a665530831]] [formerly ee89463d27 [formerly 0f9b44ff94 [formerly a665530831] [formerly ee89463d27 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]]
Former-commit-id: ee89463d27
Former-commit-id: ee4bf614e0 [formerly 07fdb410c6] [formerly 1ca9c95567] [formerly 3a5d00290c43e4eb8644bcf9a384b6669843a5db [formerly 92ba98108868529a68af7962661c0c08a1eade14] [formerly 1ca9c95567 [formerly bfa65ed39e]]]
Former-commit-id: b2b0b390c100b064c3b5fe070769ba6e0479b8ae [formerly 738332a4bfc2ad7f86c63c6827a2be4e66627c41] [formerly 454ce0268d [formerly dd597e8349]]
Former-commit-id: 454ce0268d
Former-commit-id: 3d1cd70b57
 2014-02-11 17:07:01 -06:00
Brian.Dyke
dce599ed47 14.1.1-18 baseline 
Former-commit-id: 1029a34bfb [formerly 1f27652aa3] [formerly f05a2220cd] [formerly f05a2220cd [formerly 575e328123]] [formerly 1029a34bfb [formerly 1f27652aa3] [formerly f05a2220cd] [formerly f05a2220cd [formerly 575e328123]] [formerly 1d6a9456b7 [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: c465982c29 [formerly 1c7bf39f73] [formerly d61ae6c5f4] [formerly 673beee0d0b01bc69a4ad14a3a68f869a345e932 [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05] [formerly d61ae6c5f4 [formerly c5857c30f2]]]
Former-commit-id: ec150c0b90835cc423916ac75ab1c42ebedc91c4 [formerly 48b7eeaa6cb834b10db17643ac629aaa112f6878] [formerly f47dd3ef59 [formerly d1db845406]]
Former-commit-id: f47dd3ef59
Former-commit-id: fc21d2dee4
 2014-02-11 15:52:50 -05:00
Ben Steffensmeier
70d3b93030 Issue #2765 Fix aliases for probability parameters. 
Former-commit-id: eb9364e6e3 [formerly 89d47e3243] [formerly 2952ae37a6] [formerly 2952ae37a6 [formerly 43a8b80ef2]] [formerly eb9364e6e3 [formerly 89d47e3243] [formerly 2952ae37a6] [formerly 2952ae37a6 [formerly 43a8b80ef2]] [formerly 0bb18f2cd7 [formerly 2952ae37a6 [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: aad885ea62 [formerly be4d0f1c88] [formerly c0dbdb9906] [formerly d2d5d85f8df0357e763b64c43e7a025e01a2aa1c [formerly 63b3cde2a263f269c8044495d613aae2f31b7980] [formerly c0dbdb9906 [formerly eb9c4ef999]]]
Former-commit-id: b467405a6d3933b8bc87759ae6bb0e7a765b82d2 [formerly fa23535348a4984a61c61d93acbf80e9954fa499] [formerly d69ac764db [formerly 8a4c3686f8]]
Former-commit-id: d69ac764db
Former-commit-id: ee421748c3
 2014-02-11 11:35:03 -06:00
Lee Venable
543b8078c5 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1 
Former-commit-id: 96f435cb15 [formerly 6773d174ec] [formerly c7cfd49622] [formerly c7cfd49622 [formerly 5c256dc19c]] [formerly 96f435cb15 [formerly 6773d174ec] [formerly c7cfd49622] [formerly c7cfd49622 [formerly 5c256dc19c]] [formerly f078971b5d [formerly c7cfd49622 [formerly 5c256dc19c] [formerly f078971b5d [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]]]
Former-commit-id: f078971b5d
Former-commit-id: eca72576a9 [formerly f8ae04bce2] [formerly ab6fab4199] [formerly 1a23c65c1857b4cd8c4fb852e0a0c9d073a7a3e5 [formerly fb3d041cae5b972726c8f92403f7ef7c6570c7bf] [formerly ab6fab4199 [formerly 42fdfa4964]]]
Former-commit-id: 3b5ff93b498bd950fc6c4d7f7ce8336495d28850 [formerly fbc5baf5f9b34b3a8ed1c177ca437f4840d40632] [formerly c1543acd86 [formerly 22aab74e8d]]
Former-commit-id: c1543acd86
Former-commit-id: bd92b85084
 2014-02-11 09:15:44 -06:00
Nate Jensen
c0662a0fe6 Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly fd43d9e095 [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 693defa040 [formerly 1dcb3a77c3] [formerly c0256ac19e] [formerly e414d7ae99d7b0b7973c924dbc575dede0b1ac56 [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486] [formerly c0256ac19e [formerly 2111989497]]]
Former-commit-id: dff40f4a0faab54f6550e22441c70ca2210f96cc [formerly 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5] [formerly 93a740106d [formerly 9e09da8bb6]]
Former-commit-id: 93a740106d
Former-commit-id: aba5c50bfe
 2014-02-10 16:48:29 -06:00
Max Schenkelberg
f25707d6ca Issue #2680 fixed samplers in structs issues with GLSL spec. 
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: f767ffa2f7 [formerly 7de6ff30da] [formerly 3c1fafe328] [formerly 3c1fafe328 [formerly 7822511754]] [formerly f767ffa2f7 [formerly 7de6ff30da] [formerly 3c1fafe328] [formerly 3c1fafe328 [formerly 7822511754]] [formerly a8a67634f9 [formerly 3c1fafe328 [formerly 7822511754] [formerly a8a67634f9 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]]]
Former-commit-id: a8a67634f9
Former-commit-id: 8c74e384f0 [formerly 8ddc6b95e4] [formerly dd872433c7] [formerly 6f44e3a20218f869b117735bd474c8f8f6a83c56 [formerly a6667b70df86f17d8dea3939535e720a8767c67d] [formerly dd872433c7 [formerly e2e9eaaf35]]]
Former-commit-id: 726ab2e327cb30b50e1f88307f1890db8fa65cb7 [formerly 724e3e430da7d1dade1094fde0ea1cb4e6b99344] [formerly 560bc77a16 [formerly 9d6d418d48]]
Former-commit-id: 560bc77a16
Former-commit-id: 75cde90e40
 2014-02-10 13:43:16 -06:00
Lee Venable
f2e8915e52 Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1 
Former-commit-id: a2b920fff0 [formerly b90abb03c1] [formerly d6fa79f1a7] [formerly d6fa79f1a7 [formerly 27be4297e6]] [formerly a2b920fff0 [formerly b90abb03c1] [formerly d6fa79f1a7] [formerly d6fa79f1a7 [formerly 27be4297e6]] [formerly 88a9d20316 [formerly d6fa79f1a7 [formerly 27be4297e6] [formerly 88a9d20316 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]]]
Former-commit-id: 88a9d20316
Former-commit-id: 3dd8d4f30b [formerly e9e5667274] [formerly 65e6fa1963] [formerly 687cf962cd07daecfb2038a42a9e2c876a998a85 [formerly e7218f6aecd2d4898858f31ff591b76d092b3d14] [formerly 65e6fa1963 [formerly d975dcf01e]]]
Former-commit-id: 8355ea96ac954880b0382467d14d792742a13884 [formerly 2aa0d25045e6db0c7585d4a56307a543da16bf81] [formerly 1a8f530d0d [formerly 78df434dba]]
Former-commit-id: e63654bcb9c2571b21e594da3547f33ad3ee9415 [formerly 1a8f530d0d]
Former-commit-id: f41d73618d
 2014-02-10 11:50:07 -06:00
Nate Jensen
b2c09c2cf2 Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1 
Former-commit-id: 50ab778a5a [formerly fb8ce8da65] [formerly d16d679809] [formerly d16d679809 [formerly 5c7c14a6c4]] [formerly 50ab778a5a [formerly fb8ce8da65] [formerly d16d679809] [formerly d16d679809 [formerly 5c7c14a6c4]] [formerly a48c1c6783 [formerly d16d679809 [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]]]
Former-commit-id: a48c1c6783
Former-commit-id: e9da80bcbe [formerly c65669a6bf] [formerly 3047063c6e] [formerly 3e813a2899bd8a6e5955d49c6e3b57c1de924e70 [formerly 56b6cef3203d3700e7f7c9be8f7525f5d508e9c2] [formerly 3047063c6e [formerly 57aa678883]]]
Former-commit-id: b3ba09c4c692324b6a97a17aa30a69aaba8e9f0b [formerly 2745a51d0fadc11fe20353c3bf2ba06fabdef183] [formerly 2effa29507 [formerly 9459523de9]]
Former-commit-id: 2effa29507
Former-commit-id: 46442acd0f
 2014-02-10 09:53:41 -06:00
Ron Anderson
bbfbddfa19 Merge "Issue #2509: Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1 
Former-commit-id: 1cd4e29c03 [formerly 40f316bcf8] [formerly 42850542af] [formerly 42850542af [formerly 2170fb5615]] [formerly 1cd4e29c03 [formerly 40f316bcf8] [formerly 42850542af] [formerly 42850542af [formerly 2170fb5615]] [formerly 0476a288db [formerly 42850542af [formerly 2170fb5615] [formerly 0476a288db [formerly ec8c9e963137ec7b7201558c5ddd00d2affb3aa3]]]]]
Former-commit-id: 0476a288db
Former-commit-id: e8cb875ae8 [formerly bbd44e89ba] [formerly 9e775c7d28] [formerly 9eb0db497779882f21202a2bda21ab8440824e78 [formerly ab1744ee16b0c46f3fb2df37d047c16d38148eab] [formerly 9e775c7d28 [formerly 3cb44b9a12]]]
Former-commit-id: 389a4db33c8a6057200598e7eac66b3a82bf269f [formerly 7765ad4ac343c6540933d6d51fdafed158f09f18] [formerly eadbc302b6 [formerly ec9713e4bc]]
Former-commit-id: fe35daac679e48ad0c211e40d6ae93a294ee5ae5 [formerly eadbc302b6]
Former-commit-id: fa00f7d686
 2014-02-10 08:31:31 -06:00
Mike Duff
49ae822ccf Issue #2453 - Notification Center refactor 
Former-commit-id: de074c4a7a [formerly c20018d0ba] [formerly 61c57d2254] [formerly 61c57d2254 [formerly eeb78f7f20]] [formerly de074c4a7a [formerly c20018d0ba] [formerly 61c57d2254] [formerly 61c57d2254 [formerly eeb78f7f20]] [formerly 2c9d603e50 [formerly 61c57d2254 [formerly eeb78f7f20] [formerly 2c9d603e50 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]]]
Former-commit-id: 2c9d603e50
Former-commit-id: c345d495d4 [formerly b62abd4219] [formerly 7535b51fe7] [formerly 1c5d465dc60b0c68ed485aa84c6d3603108354c7 [formerly 54e4296d2e02deec8772b1aa27026f2486ecd7da] [formerly 7535b51fe7 [formerly 4a87525df0]]]
Former-commit-id: 04e7a842f239c710ecdfa4d497c572d2bcbd300f [formerly 22f20d75e586ec99c087bbc87cae6dd9e95f7f6d] [formerly a87ce0b532 [formerly f005aa3d8d]]
Former-commit-id: a87ce0b532
Former-commit-id: 239b4a038f
 2014-02-07 16:50:50 -06:00
Ben Steffensmeier
66e408dd20 Issue #2211 Fix data mapped sampling. 
Former-commit-id: 286017fb02 [formerly e7baa5b186] [formerly d219a687c9] [formerly d219a687c9 [formerly 724bb85676]] [formerly 286017fb02 [formerly e7baa5b186] [formerly d219a687c9] [formerly d219a687c9 [formerly 724bb85676]] [formerly 3d76d6655b [formerly d219a687c9 [formerly 724bb85676] [formerly 3d76d6655b [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]]]
Former-commit-id: 3d76d6655b
Former-commit-id: 581a76e009 [formerly 7f8ff5efc0] [formerly a37a910f67] [formerly c7fb208ea0e932d9489cdea9c603b40545e78d7f [formerly 6fc70ed6daf823669783c4000e189cbb10a17f8d] [formerly a37a910f67 [formerly 6a95dd6242]]]
Former-commit-id: 3277a141ccddf5c85bb4b9552a61b89f7f324622 [formerly 9362efc90ebebf4fffc157294abf0ea1f20992bc] [formerly eb65002cf6 [formerly a8c075d7e3]]
Former-commit-id: eb65002cf6
Former-commit-id: f2b9191863
 2014-02-07 13:00:00 -06:00
David Gillingham
5849a1b0cd Issue #2509: Fix baseline merge breakage to ifpIMAGE. 
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: 857b1148d0 [formerly dc8f0dde25] [formerly b12e29dd7c] [formerly b12e29dd7c [formerly 03d36b8309]] [formerly 857b1148d0 [formerly dc8f0dde25] [formerly b12e29dd7c] [formerly b12e29dd7c [formerly 03d36b8309]] [formerly e8ffc73893 [formerly b12e29dd7c [formerly 03d36b8309] [formerly e8ffc73893 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]]]
Former-commit-id: e8ffc73893
Former-commit-id: 24af697174 [formerly 8cdf1ce158] [formerly ad8c40032f] [formerly 060544f01dcdc271ad6bbfa0bbdb54b0f620d3f0 [formerly bcf359e669db6d450eb89b007e4262c8f81e5b91] [formerly ad8c40032f [formerly 94ec272ab2]]]
Former-commit-id: 310e3e16f6d2fa7e4d333cc1dd796db5148e39b8 [formerly 6d66a54db19d8e116fa26979efe8601acefd73a2] [formerly e20060f1da [formerly 06d68cc0be]]
Former-commit-id: e20060f1da
Former-commit-id: cc3256e77a
 2014-02-07 09:51:42 -06:00
Brad Gonzales
31430a12d8 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: e004acc383 [formerly c275da6725] [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9529c1d191 [formerly 9c50fb29fd]]] [formerly e004acc383 [formerly c275da6725] [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9529c1d191 [formerly 9c50fb29fd]]] [formerly 704e466f28 [formerly 9529c1d191 [formerly 9c50fb29fd] [formerly 704e466f28 [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]]]
Former-commit-id: 704e466f28
Former-commit-id: b73fb6be62 [formerly e57abad188] [formerly b59278f73f] [formerly a40f0331acac9df6fd21d774b932bf57cb09b618 [formerly fce69a5a63e582579ba583e885690b5aed2ab58f] [formerly b59278f73f [formerly 0b211e8036]]]
Former-commit-id: d4a00697167f79a27b2555cf236f421290ab8bfa [formerly ce3bd1dae0d4336304304ae2262d659cba06e09c] [formerly a8256a5202 [formerly 104625b66d]]
Former-commit-id: a8256a5202
Former-commit-id: 304704a39d
 2014-02-07 09:35:36 -06:00
Ben Steffensmeier
bc11f1a365 Issue #2762 Fix Satellite Data Access. 
Former-commit-id: bcc1be4325 [formerly 89105e1257] [formerly a26a150a69] [formerly a26a150a69 [formerly 2166b5b696]] [formerly bcc1be4325 [formerly 89105e1257] [formerly a26a150a69] [formerly a26a150a69 [formerly 2166b5b696]] [formerly ed2c1a0329 [formerly a26a150a69 [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 5fecea829b [formerly 7954587c40] [formerly 270433f5f3] [formerly 25ce926463d0c07f4f7040d17764dc5f9211ecf5 [formerly 7fbc07009858ae2446c648b08c7b4a17103a905c] [formerly 270433f5f3 [formerly e7662de8db]]]
Former-commit-id: eb9ff16455d15df3249ec16bba9f3c6176ac36c8 [formerly 4bfd34ac775c1575790378406f289cb7e821653f] [formerly b6a5148b42 [formerly ad709c9692]]
Former-commit-id: 0adf276b165e1ec872a4b993a5ab34c1c36036a5 [formerly b6a5148b42]
Former-commit-id: 58cdbe5b37
 2014-02-06 13:53:44 -06:00
Mike Duff
978ee70e35 Issue #2636 - Fix for ncf spring config 
Former-commit-id: 1f5a2cec5c [formerly e69e8c4615] [formerly 3707a4eabd] [formerly 3707a4eabd [formerly 3f7defe563]] [formerly 1f5a2cec5c [formerly e69e8c4615] [formerly 3707a4eabd] [formerly 3707a4eabd [formerly 3f7defe563]] [formerly e84ae26421 [formerly 3707a4eabd [formerly 3f7defe563] [formerly e84ae26421 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]]]
Former-commit-id: e84ae26421
Former-commit-id: 6aa6c2ab54 [formerly a63fdead0c] [formerly 9ec273fdcc] [formerly 85b3df8f649b2071f4b2eaf8feb53921393da648 [formerly d951ae7e0460f11e17e732248e01e37ce6a521fa] [formerly 9ec273fdcc [formerly 6210a6aa18]]]
Former-commit-id: bea344d1a1b59d8e3338b22bb5b54d097d5fcb28 [formerly 4baf28cf015acd819e9c7ef99bf29aae41b460c7] [formerly c9f53e2346 [formerly af8013baa7]]
Former-commit-id: c9f53e2346
Former-commit-id: e5a2e9c6d2
 2014-02-06 09:29:20 -06:00
Richard Peter
0fa4aa1d59 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1 
Former-commit-id: 619cc969f9 [formerly 8ad3c5857b] [formerly 82fc0a2ed3] [formerly 82fc0a2ed3 [formerly 64f0cabaef]] [formerly 619cc969f9 [formerly 8ad3c5857b] [formerly 82fc0a2ed3] [formerly 82fc0a2ed3 [formerly 64f0cabaef]] [formerly 36d3d21b57 [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]]]
Former-commit-id: 36d3d21b57
Former-commit-id: 459d39f362 [formerly 5a7e7af23b] [formerly c3c1205848] [formerly 4855ee33cede74049a09e59e4d4f84612f7253f3 [formerly 15e05c73cb80bc97c2edc96c60ee1065b9f736b4] [formerly c3c1205848 [formerly c965993d17]]]
Former-commit-id: 0699bc8016bab7e33c70d1337af1b6e2649368ed [formerly 34784310173da5accc225bf38ea0abccf3c639e4] [formerly 8471e5dd46 [formerly 15c2f761be]]
Former-commit-id: 8471e5dd46
Former-commit-id: 1956e06576
 2014-02-05 18:20:36 -06:00
Mike Duff
177453f8d2 Issue #2677 - Don't do overlap checks when updating subs to deactivated. 
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: fc06cc7e9e [formerly 3691146e34] [formerly bafe19bbd5] [formerly bafe19bbd5 [formerly 101c08818d]] [formerly fc06cc7e9e [formerly 3691146e34] [formerly bafe19bbd5] [formerly bafe19bbd5 [formerly 101c08818d]] [formerly 6b01c2957f [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]]]
Former-commit-id: 6b01c2957f
Former-commit-id: d24861e38e [formerly 229efa7c5b] [formerly 9edf591218] [formerly 3880007951eba67bb873437e12df6a037f2f6bad [formerly c5c924842a196e06e1a50bd0c39e0bc05f4fb139] [formerly 9edf591218 [formerly 6a2f75e8d5]]]
Former-commit-id: d8d2a63e277d26a0ce994e40f67350c782e82777 [formerly 48997d15c589f0dd6cb352af2ea838edf7a6e2dd] [formerly 377beb33a8 [formerly bb43ec00b1]]
Former-commit-id: 377beb33a8
Former-commit-id: 6f00321a11
 2014-02-05 16:08:01 -06:00
Richard Peter
f4fca07fdf Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1 
Former-commit-id: 88e04976b4 [formerly 0ebd0009e5] [formerly d1546d42ce] [formerly d1546d42ce [formerly 7e69f192a5]] [formerly 88e04976b4 [formerly 0ebd0009e5] [formerly d1546d42ce] [formerly d1546d42ce [formerly 7e69f192a5]] [formerly 882544fec5 [formerly d1546d42ce [formerly 7e69f192a5] [formerly 882544fec5 [formerly 1e91683c1df918a7405c2f847a6dc7397dbcc473]]]]]
Former-commit-id: 882544fec5
Former-commit-id: e85e3f5fa2 [formerly f4e9afceee] [formerly 963fb37e6c] [formerly 836b4c3f65988dc4b99233f44d8c962936b7f3f2 [formerly 29ff8293b807402f79b124b428ec48ebeb5fb99e] [formerly 963fb37e6c [formerly 945bcd895c]]]
Former-commit-id: 177ece5f0ba44809a1a1d1c29678da2239e0c1bd [formerly ff10958606ea091de1602c98af8922163f4d5379] [formerly 127ce1f397 [formerly db4783afa4]]
Former-commit-id: 127ce1f397
Former-commit-id: e94660bed9
 2014-02-05 14:57:16 -06:00
Dave Hladky
f3c9512ae2 Issue #2686 Refactor of retrieval 
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: cc5178d58b [formerly 1c8f6fb36d] [formerly 7fb7e10cda] [formerly 7fb7e10cda [formerly 6172c83afc]] [formerly cc5178d58b [formerly 1c8f6fb36d] [formerly 7fb7e10cda] [formerly 7fb7e10cda [formerly 6172c83afc]] [formerly 39f97723d6 [formerly 7fb7e10cda [formerly 6172c83afc] [formerly 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 6d515e02fa [formerly 14f2c99e46] [formerly 39f5579103] [formerly b6d46a59068b22a1e77d012039eae1b75d6f8498 [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de] [formerly 39f5579103 [formerly 2b998409f5]]]
Former-commit-id: eb329a2dfd9d98a8bae08185e259ccd68269c368 [formerly d275e71a9e574bd23d396da26d9a5eaa6435dea7] [formerly 59590fdf36 [formerly 8e2eb4d255]]
Former-commit-id: 59590fdf36
Former-commit-id: 36bc408bc2
 2014-02-05 14:49:26 -06:00
Steve Harris
ac06c30291 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 5f2e44ed71 [formerly 66e76b7de6] [formerly 1dbc316078] [formerly 1dbc316078 [formerly f24bc49703]] [formerly 5f2e44ed71 [formerly 66e76b7de6] [formerly 1dbc316078] [formerly 1dbc316078 [formerly f24bc49703]] [formerly 74c87b95c3 [formerly 1dbc316078 [formerly f24bc49703] [formerly 74c87b95c3 [formerly cee2e11f4b3d74bee3ab254267f156a846801087]]]]]
Former-commit-id: 74c87b95c3
Former-commit-id: abea8d4a53 [formerly d8f7d14d95] [formerly 4cab7709ec] [formerly d7b9af6259c5b154cfdfd9fa9e4a0da81a817b21 [formerly b16ae4f42a3b6d0b7ffd0b0b6cace39fdfd151b8] [formerly 4cab7709ec [formerly ab294b7652]]]
Former-commit-id: d6c219d73766af64613019d685ab07325537aca2 [formerly de50906aaf29d067b26a049403c828e1dad195ce] [formerly a76e3cf17b [formerly 41f8fd08d2]]
Former-commit-id: a76e3cf17b
Former-commit-id: c64e6a75da
 2014-02-05 09:12:40 -06:00
Richard Peter
92ca49e937 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1 
Former-commit-id: ed54f022a1 [formerly 176bee122b] [formerly 21b0a87d78] [formerly 21b0a87d78 [formerly 8f844bc9ce]] [formerly ed54f022a1 [formerly 176bee122b] [formerly 21b0a87d78] [formerly 21b0a87d78 [formerly 8f844bc9ce]] [formerly e5af004993 [formerly 21b0a87d78 [formerly 8f844bc9ce] [formerly e5af004993 [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]]]
Former-commit-id: e5af004993
Former-commit-id: c276e260ea [formerly 0c66686f19] [formerly d3f13fc4c7] [formerly f2514f9c28b918a1f37117987c09085a76ced6c0 [formerly 221df5c8f19958cdb7f96c8c47eb4903283decbe] [formerly d3f13fc4c7 [formerly 4309c55a5f]]]
Former-commit-id: 2d34b79cf9b18d3445b7fefde5330516a8ee9843 [formerly cd20d2699e4537618b026ece7d62e0cb6723221f] [formerly 1aaeaf0037 [formerly 1b8aacc92f]]
Former-commit-id: 1aaeaf0037
Former-commit-id: 793aabd17e
 2014-02-04 18:12:48 -06:00
Brian.Dyke
78ffcf460c Issue #224 
Former-commit-id: f1150522af [formerly cd80c22b5c] [formerly ed476a583f] [formerly ed476a583f [formerly 3f86a80d7e]] [formerly f1150522af [formerly cd80c22b5c] [formerly ed476a583f] [formerly ed476a583f [formerly 3f86a80d7e]] [formerly dad6f2896b [formerly ed476a583f [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]]]
Former-commit-id: dad6f2896b
Former-commit-id: 02afbd43f6 [formerly 896375c47b] [formerly 17e3464377] [formerly a3496338df08ab6d35329c67e19892f8b7040aa7 [formerly 70f7b0213878f981680926bd20a81de54dadf205] [formerly 17e3464377 [formerly 610cf76a29]]]
Former-commit-id: b6d4f9046b4232749e86659c4c142a9e31e51612 [formerly 24eddc155397c6806dc89bb2fd48417fee4403c3] [formerly a9af4960f0 [formerly 6e57eae922]]
Former-commit-id: a9af4960f0
Former-commit-id: 90edefdb00
 2014-02-04 17:05:12 -05:00
Brian.Dyke
58b3b5fcb6 Issue #124 
Former-commit-id: e126426e05 [formerly 6d35a4b1bc] [formerly 3ba93b175e] [formerly 3ba93b175e [formerly 439f053309]] [formerly e126426e05 [formerly 6d35a4b1bc] [formerly 3ba93b175e] [formerly 3ba93b175e [formerly 439f053309]] [formerly 0cc11ddfd3 [formerly 3ba93b175e [formerly 439f053309] [formerly 0cc11ddfd3 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 9775f544f0 [formerly d274021768] [formerly e1d788683d] [formerly 6d669dbc2a110b252c6164ca47755d776fe9cb6b [formerly 1e605ca4a47aef453131de36960bb5a057128099] [formerly e1d788683d [formerly 90b4e7ebf0]]]
Former-commit-id: c8244529ae77178ad21d4569d4ec241793d6df2a [formerly 5a34ed2e1d56f086517b4572c3b7029b51000d64] [formerly 4b9bccad66 [formerly ff2ccb40e4]]
Former-commit-id: 4b9bccad66
Former-commit-id: 99b2a226bc
 2014-02-04 16:56:47 -05:00
Brian.Dyke
1516f9077c Issue #179 
Former-commit-id: 3ecbb21282 [formerly ea0a5bebfd] [formerly 6b3ebc4fef] [formerly 6b3ebc4fef [formerly a0626cdc00]] [formerly 3ecbb21282 [formerly ea0a5bebfd] [formerly 6b3ebc4fef] [formerly 6b3ebc4fef [formerly a0626cdc00]] [formerly b23c6f59f7 [formerly 6b3ebc4fef [formerly a0626cdc00] [formerly b23c6f59f7 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 4f68bf8aad [formerly 9ec4a820d2] [formerly 2955d5c9f0] [formerly 095543419d9734569749eaf97e2b08f36abbdf25 [formerly 8058c8a62e584fe650039e4e4c28cf04d7762dbc] [formerly 2955d5c9f0 [formerly 6d58d8c016]]]
Former-commit-id: 4cfa02cef6767981fc4daa53d90cbe93e0fb4227 [formerly b05a7a4faaca4fe7c20692df3b825b74112613e7] [formerly cc4a735533 [formerly 5ac5774552]]
Former-commit-id: cc4a735533
Former-commit-id: aab63d8758
 2014-02-04 16:53:34 -05:00
Brian.Dyke
ee06dd16d8 Issue #131 
Former-commit-id: 3dceafaa23 [formerly fc1aa5076a] [formerly dea5f087d3] [formerly dea5f087d3 [formerly bd5db64b5b]] [formerly 3dceafaa23 [formerly fc1aa5076a] [formerly dea5f087d3] [formerly dea5f087d3 [formerly bd5db64b5b]] [formerly 35b25ee2a9 [formerly dea5f087d3 [formerly bd5db64b5b] [formerly 35b25ee2a9 [formerly 4167f33801ee2450502231438955e72c4428fbcc]]]]]
Former-commit-id: 35b25ee2a9
Former-commit-id: 198318d453 [formerly 62b86ef345] [formerly 6882fc8d52] [formerly 139f4a3a1d155e02faebe5a836abe080cad43600 [formerly d654aee4c9b0ffe10c4a2fc5e721d01175827f46] [formerly 6882fc8d52 [formerly 4701088670]]]
Former-commit-id: df1a4424ba88a15baea8f245444ae38e2961f385 [formerly fd1f65e5f7267bcd6fc2575e9769fb6fd7418b7d] [formerly d099529ef7 [formerly 41b079e7fe]]
Former-commit-id: d099529ef7
Former-commit-id: f1e47c71e6
 2014-02-04 16:36:11 -05:00
Brian.Dyke
86c305d10c Issue #88 
Former-commit-id: 747f4bc321 [formerly 6510e6da5a] [formerly d56bdce6ff] [formerly d56bdce6ff [formerly 643ef1a1a6]] [formerly 747f4bc321 [formerly 6510e6da5a] [formerly d56bdce6ff] [formerly d56bdce6ff [formerly 643ef1a1a6]] [formerly edccef5569 [formerly d56bdce6ff [formerly 643ef1a1a6] [formerly edccef5569 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]]]
Former-commit-id: edccef5569
Former-commit-id: 5112472ee8 [formerly 9cf763cd13] [formerly cdb408daf8] [formerly 564f7a7b7e23524df88f00d7e15ff3ca64cd1dea [formerly 99d3c8608feda52225fe2dd85b896e03bfe99a30] [formerly cdb408daf8 [formerly a5606c86c7]]]
Former-commit-id: f5e57f653386dd82e2e77952c903ab359f37400a [formerly 4ab0b8424f27ebdbb06be07987bd8f71c6cdee8a] [formerly 904ffbd83e [formerly 83ebe8826f]]
Former-commit-id: 904ffbd83e
Former-commit-id: 97bf17521e
 2014-02-04 16:34:40 -05:00
Brian.Dyke
50b6d213e9 Issue #83 
Former-commit-id: 87134a01c4 [formerly 89422cef7c] [formerly f2e56b268c] [formerly f2e56b268c [formerly 484119f6b0]] [formerly 87134a01c4 [formerly 89422cef7c] [formerly f2e56b268c] [formerly f2e56b268c [formerly 484119f6b0]] [formerly fb15dd5dfb [formerly f2e56b268c [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 97f548a3e4 [formerly 8e78870c71] [formerly 3c160bb05e] [formerly 3204231c5365b96bce9697cad04f8964ef623fb8 [formerly 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1] [formerly 3c160bb05e [formerly f088dab5ef]]]
Former-commit-id: 92478418e2aecbd6558a271d4821205072322fdf [formerly 799ac9274e6dd53615f019c76b975281bd597c94] [formerly 42e17bf5f3 [formerly 870b355263]]
Former-commit-id: 42e17bf5f3
Former-commit-id: 2bc1fcbaa2
 2014-02-04 16:32:42 -05:00