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

4607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
91396bb5a7 Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development 
Former-commit-id: 1f5a26dc30 [formerly e2f9e86659] [formerly 1f5a26dc30 [formerly e2f9e86659] [formerly 738c70e8ea [formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]
Former-commit-id: 738c70e8ea
Former-commit-id: 96ad72aa9e [formerly 10f9feddba]
Former-commit-id: db7e3f7368
 2014-01-22 09:36:33 -06:00
Ben Steffensmeier
9a87e95aac Issue #2312 Add ability to export gif and image export dialog. 
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: b70faf1f7d [formerly fc1c56f9cb] [formerly b70faf1f7d [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: cd295e4172 [formerly 8b2e5a06bc]
Former-commit-id: 7d083a08c5
 2014-01-21 18:09:13 -06:00
Steve Harris
69626ab704 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: a465718a0d [formerly 24ab7cff49] [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: b62efa9387 [formerly 252c7ee40a]
Former-commit-id: 2a967fc9b5
 2014-01-21 12:36:54 -06:00
Richard Peter
17cf9406ad Issue #2724: Fix Airep/Pirep Autoboxing NPE 
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38

Former-commit-id: d831e8c692 [formerly c6206fd6a8] [formerly d831e8c692 [formerly c6206fd6a8] [formerly 57f6096833 [formerly cbdaaf4d6e28d7001df205ffb7d8d2d56bacd35f]]]
Former-commit-id: 57f6096833
Former-commit-id: ee5fce8be6 [formerly d372cf80f9]
Former-commit-id: 593d58322c
 2014-01-21 11:26:30 -06:00
Richard Peter
fdf49e950e Merge "Issue #2359 if satellite decode exception occurs, don't store half record" into omaha_14.2.1 
Former-commit-id: 0a81510f70 [formerly ace3c4c823] [formerly 0a81510f70 [formerly ace3c4c823] [formerly 9e38cdb0ba [formerly 8e244e50c6722a45e1c570684f46a88e40e6c1b9]]]
Former-commit-id: 9e38cdb0ba
Former-commit-id: 14b4263187 [formerly eb581f0181]
Former-commit-id: 404508ee24
 2014-01-21 09:42:07 -06:00
Nate Jensen
60d1b9ae2a Issue #2359 if satellite decode exception occurs, don't store half record 
Change-Id: Ia6cbf2513d3d3ec8f4c0a38b90ab5a8d30474ad8

Former-commit-id: aa70dfec91 [formerly 0a72df52a6] [formerly aa70dfec91 [formerly 0a72df52a6] [formerly 79d94e87cf [formerly 2cfa53b34097e0f1745fa2af85c30d1bb351eea0]]]
Former-commit-id: 79d94e87cf
Former-commit-id: 1e35ce4acb [formerly 70d9805434]
Former-commit-id: a0601969c4
 2014-01-21 09:07:18 -06:00
Mike Duff
e8d473b9c6 Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs. 
Former-commit-id: 9bd8e84b9f [formerly bdf6a002f6] [formerly 9bd8e84b9f [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: e929abf7d7 [formerly 9112366cae]
Former-commit-id: 8844bbbe2d
 2014-01-20 17:44:02 -06:00
Dave Hladky
0c8901b01d Issue #2398 Fixed scheduling outside of active period/ expired window 
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107

Former-commit-id: 470ce5269e [formerly ae45dee861] [formerly 470ce5269e [formerly ae45dee861] [formerly dfc0d6d9f5 [formerly d5e3fdf7bd51177d24312d9daa6af7a2a4920f06]]]
Former-commit-id: dfc0d6d9f5
Former-commit-id: 02d357c803 [formerly 986e0d7dbe]
Former-commit-id: 305697650e
 2014-01-20 17:35:44 -06:00
Lee Venable
916f05e2bd Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1 
Former-commit-id: d825d627bd [formerly b3928f4f49] [formerly d825d627bd [formerly b3928f4f49] [formerly dd12515ca2 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]
Former-commit-id: dd12515ca2
Former-commit-id: 82eafd385d [formerly 4e121d1261]
Former-commit-id: edab55763c
 2014-01-20 17:32:38 -06:00
Nate Jensen
8c247a36e6 Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1 
Former-commit-id: c598185130 [formerly d78dbb85d5] [formerly c598185130 [formerly d78dbb85d5] [formerly 54262ad318 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]
Former-commit-id: 54262ad318
Former-commit-id: 5b84b27087 [formerly f13cb9ae26]
Former-commit-id: 1ee13de1db
 2014-01-20 17:32:15 -06:00
Lee Venable
19d90c676f Issue #2291 - Fixed resizing of components. 
Former-commit-id: 39e8124ef7 [formerly 1927ba49ea] [formerly 39e8124ef7 [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: dad11aca88 [formerly b8520d1e12]
Former-commit-id: 9bf640f116
 2014-01-20 17:26:28 -06:00
Ron Anderson
385547a5e5 Issue #2717 Force use of legacy merge sort 
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: 34d1b95a79 [formerly de97ec032f] [formerly 34d1b95a79 [formerly de97ec032f] [formerly 66bbc99784 [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: 0048ef6a96 [formerly 61d8aec23c]
Former-commit-id: 841504f145
 2014-01-20 17:22:26 -06:00
Richard Peter
d0ef42d528 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1 
Former-commit-id: e6bc012925 [formerly 6b859c9a42] [formerly e6bc012925 [formerly 6b859c9a42] [formerly 29ba337367 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]
Former-commit-id: 29ba337367
Former-commit-id: 4796beec29 [formerly 4887054146]
Former-commit-id: b147653a66
 2014-01-20 17:21:21 -06:00
Nate Jensen
09a7251956 Merge "Issue #2712 - improved class merging in Python Overrider. Created PythonOverriderInterface." into development 
Former-commit-id: 4487c75c40 [formerly 86b8322391] [formerly 4487c75c40 [formerly 86b8322391] [formerly 517147005f [formerly 17528714e06a31a2397a9b485d4d83fcc91d1bb0]]]
Former-commit-id: 517147005f
Former-commit-id: 66ebd12fbb [formerly 9d848f27e1]
Former-commit-id: 7f407b7efd
 2014-01-20 16:09:54 -06:00
David Gillingham
c1fcd5f3af Issue #2418: Fix PHISH parameter name case issues discovered in test. 
Former-commit-id: 1179080434 [formerly c0065ec2a9] [formerly 1179080434 [formerly c0065ec2a9] [formerly 5401124a1f [formerly a33e5eb63fe0ad7b9d79e878a9877500065a05a8]]]
Former-commit-id: 5401124a1f
Former-commit-id: f2bc6abb80 [formerly cc9f2dcd27]
Former-commit-id: ce0d4cef69
 2014-01-20 15:37:52 -06:00
Nate Jensen
a0c7807b51 Merge "Issue #2359 fix ncep pirep decoding null pointer" into omaha_14.2.1 
Former-commit-id: 16dae5953e [formerly b49c25a46e] [formerly 16dae5953e [formerly b49c25a46e] [formerly 70f211a2f1 [formerly ca3abb631efec6159b1da0b4ab08a579a3f137fc]]]
Former-commit-id: 70f211a2f1
Former-commit-id: 689d12d439 [formerly 53862d8df5]
Former-commit-id: b7da338e2f
 2014-01-20 14:02:42 -06:00
Bryan Kowal
744084f871 Issue #2712 - improved class merging in Python Overrider. Created PythonOverriderInterface. 
Amend: Wrap ModuleUtil in try..finally to ensure changes to the path are undone
Amend: Fixed formatting in PythonOverriderCore

Change-Id: I8c4d2702ef634d2b038ba20ccffc610db8a6c580

Former-commit-id: db00372029 [formerly c85b151210] [formerly db00372029 [formerly c85b151210] [formerly d2e40770dd [formerly b788b07aecdc4039ef0ce657d7d9a04ab88e0069]]]
Former-commit-id: d2e40770dd
Former-commit-id: 5c5ccfc65d [formerly cf82007019]
Former-commit-id: 29b48d3ef6
 2014-01-20 14:02:07 -06:00
Max Schenkelberg
d99c6b49e3 Issue #2620 Fixed manifest issues for baseline p2 export 
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 1256748c42 [formerly 68aa666045] [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: 424f2282f0 [formerly 2574685291]
Former-commit-id: 9903335f77
 2014-01-20 13:54:27 -06:00
Richard Peter
d58f49b766 Merge "Issue #2710 Made MADIS window larger." into omaha_14.2.1 
Former-commit-id: 1c7d9db287 [formerly 76756b2025] [formerly 1c7d9db287 [formerly 76756b2025] [formerly 6bf4a3e8f4 [formerly 8f652e47f9398fa9367e19d7afd8029507b50afd]]]
Former-commit-id: 6bf4a3e8f4
Former-commit-id: 2a2b494d0b [formerly 726571e7d5]
Former-commit-id: 1fa9ca89c7
 2014-01-20 13:16:31 -06:00
Nate Jensen
283bcf652f Issue #2359 fix ncep pirep decoding null pointer 
Change-Id: Id255abcda2d8c661ce8d7d0b022addc69f7635ea

Former-commit-id: 7961052b41 [formerly 7f7f05b8ba] [formerly 7961052b41 [formerly 7f7f05b8ba] [formerly 5a860252ad [formerly 5f554ec21fcedc7f8ef5b3b00fc951527bb424bb]]]
Former-commit-id: 5a860252ad
Former-commit-id: 4b570ada33 [formerly c0d49c4b24]
Former-commit-id: 6809d67737
 2014-01-20 13:11:36 -06:00
Brad Gonzales
5ae1d35965 Issue #2678 Better fix for sbn retrieval queue init to null in wfo. Fix for bandwith graph data retrieve of sbn data. 
Amend:  updated commit comment in BandwidthGraphData.

Change-Id: Ic77130425e495330fe670086e5bbfad35e7b9287

Former-commit-id: 061884910d [formerly 0635a368c6] [formerly 061884910d [formerly 0635a368c6] [formerly 6b8da117e4 [formerly 253b19d5cd1c7950209521a708b5ad9abbf000f6]]]
Former-commit-id: 6b8da117e4
Former-commit-id: f7e01e3083 [formerly 8e307a22e6]
Former-commit-id: d5e7eaab4e
 2014-01-20 13:08:27 -06:00
Ben Steffensmeier
f88b3b7455 Issue #2648 Enhance hprof output for grids and UI activity. 
Former-commit-id: 31bbdb3d4d [formerly 91270be4f7] [formerly 31bbdb3d4d [formerly 91270be4f7] [formerly a401c4bed0 [formerly 80e4b1bdff46f8e1c77ba50b696e8bef5e53d51e]]]
Former-commit-id: a401c4bed0
Former-commit-id: eccaf37aee [formerly f4075f5fa5]
Former-commit-id: 911994f3ec
 2014-01-20 13:00:54 -06:00
Nate Jensen
8d701b62ca Issue #2359 better error messages in satellite decoder 
Change-Id: I81961ca49a18cf3c5b246216f9a48ea7ad67fd49

Former-commit-id: 13e18d4012 [formerly 36fd148cca] [formerly 13e18d4012 [formerly 36fd148cca] [formerly 831d960ca6 [formerly 9caeee451d284887660d1290eaa5331cbaa11eec]]]
Former-commit-id: 831d960ca6
Former-commit-id: a10034c5ee [formerly 99797a2816]
Former-commit-id: 3aa0eb454d
 2014-01-20 12:55:34 -06:00
Dave Hladky
30cbc03297 Issue #2710 Made MADIS window larger. 
Former-commit-id: 37ccd1d80d [formerly edb07269a9] [formerly 37ccd1d80d [formerly edb07269a9] [formerly 0094857d34 [formerly eddd50a0575d140eb05999889940a632f319438c]]]
Former-commit-id: 0094857d34
Former-commit-id: b225690c65 [formerly 78e3974527]
Former-commit-id: 93ec71aadb
 2014-01-20 12:04:08 -06:00
Steve Harris
ccd2f6cdaa Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 5fcccbff1b [formerly 454d557884] [formerly 5fcccbff1b [formerly 454d557884] [formerly 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 7ea285c48b [formerly 0ba307d616]
Former-commit-id: b5f7f35ccb
 2014-01-20 10:17:44 -06:00
Richard Peter
d8b0d46ad5 Merge "Issue #2613 Rewrote poorly written section of code in NotificationListenerImpl" into omaha_14.2.1 
Former-commit-id: 591590d945 [formerly 874dcf83f4] [formerly 591590d945 [formerly 874dcf83f4] [formerly d784a15287 [formerly d9abb690cc4ade1543a7cd654600d9413f247d17]]]
Former-commit-id: d784a15287
Former-commit-id: 5b5578deb8 [formerly 67e4d93352]
Former-commit-id: c1dd8bf566
 2014-01-20 09:40:18 -06:00
Nate Jensen
47477bc2c1 Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development 
Former-commit-id: d6862c2b02 [formerly e2dfdb01b7] [formerly d6862c2b02 [formerly e2dfdb01b7] [formerly 0bf6222d1e [formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: dcd1906332 [formerly 83c27d7025]
Former-commit-id: b168eff914
 2014-01-20 09:23:24 -06:00
Mike Duff
45bef29f75 Issue #2459 - Remove unscheduled status from UI 
Former-commit-id: 0cfa9ee36c [formerly 93cb80cfc7] [formerly 0cfa9ee36c [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: a492ec6a4d [formerly a04430e334]
Former-commit-id: dcb5b4a111
 2014-01-17 15:34:48 -06:00
Richard Peter
52e1cbf540 Issue #2125: Clean up hibernate warnings 
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e

Former-commit-id: f30181d730 [formerly e2d20753e1] [formerly f30181d730 [formerly e2d20753e1] [formerly 0c058f461c [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]]]
Former-commit-id: 0c058f461c
Former-commit-id: caa06ce1e1 [formerly 7054a06acb]
Former-commit-id: ed1bc96a63
 2014-01-17 14:12:34 -06:00
Benjamin Phillippe
95f30d148b Issue #2613 Rewrote poorly written section of code in NotificationListenerImpl 
Change-Id: Ibcdd415667f379a20799a4166b12cc8cc5e05ed4

Former-commit-id: d81f8ddf89 [formerly 6b0d25cf5c] [formerly d81f8ddf89 [formerly 6b0d25cf5c] [formerly 7516310ab1 [formerly 4d4c7837ad1084b8c6007c660c59e3bd29f757cc]]]
Former-commit-id: 7516310ab1
Former-commit-id: 760fb70dde [formerly 407687aeb3]
Former-commit-id: 9c5afce09a
 2014-01-17 12:07:34 -06:00
Ben Steffensmeier
ce8619b845 Issue #2651 Synchronize ResourceList.removeRsc. 
Former-commit-id: 15c08d7209 [formerly a580fc74b7] [formerly 15c08d7209 [formerly a580fc74b7] [formerly d8263b358d [formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]
Former-commit-id: d8263b358d
Former-commit-id: a4ce57502c [formerly 18437701d9]
Former-commit-id: 72ee36b365
 2014-01-17 11:58:00 -06:00
Nate Jensen
588fe6ffa3 Merge "Issue #2313 Image canvas rendering. Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417" into development 
Former-commit-id: 1bf74c5919 [formerly a431fa2bd9] [formerly 1bf74c5919 [formerly a431fa2bd9] [formerly 2d5dede634 [formerly f343371577210225865239aef14a40b529de86ad]]]
Former-commit-id: 2d5dede634
Former-commit-id: 4aa2dbfbc5 [formerly 1405fb3376]
Former-commit-id: 0faecb7c6e
 2014-01-17 11:36:30 -06:00
Nate Jensen
e378458687 Merge "Issue #2688 improved error logging in pypies repack" into development 
Former-commit-id: acf561910d [formerly f9358fff68] [formerly acf561910d [formerly f9358fff68] [formerly 89a932382c [formerly 21d4e9aa49cdd8b97461e214071f67de3129629c]]]
Former-commit-id: 89a932382c
Former-commit-id: 092ac4541a [formerly 98bf99a5f6]
Former-commit-id: 927049db2a
 2014-01-17 11:31:46 -06:00
Nate Jensen
40ee467a10 Merge "Issue #2646 Fix Drawing layer NPE." into development 
Former-commit-id: 211f7a1bf0 [formerly bad984f103] [formerly 211f7a1bf0 [formerly bad984f103] [formerly f85f54d2ae [formerly c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90]]]
Former-commit-id: f85f54d2ae
Former-commit-id: e8bfb55387 [formerly edc2c700c8]
Former-commit-id: 08ebba2423
 2014-01-17 10:50:38 -06:00
Nate Jensen
7f709e16f0 Merge "Issue #2359 fix annoying ncep null pointer" into omaha_14.2.1 
Former-commit-id: ff34eb99c8 [formerly a52587bdd1] [formerly ff34eb99c8 [formerly a52587bdd1] [formerly cde0d54b62 [formerly ec701d2b15a629bf58656b3566493afe8c28db0b]]]
Former-commit-id: cde0d54b62
Former-commit-id: 3e97d86000 [formerly c68447f9b2]
Former-commit-id: 76e405534f
 2014-01-17 10:50:03 -06:00
Nate Jensen
49e601d5da Merge "Issue #2581 fix yet another missing LSR event type" into omaha_14.2.1 
Former-commit-id: 7b1e9a1aac [formerly 355786a998] [formerly 7b1e9a1aac [formerly 355786a998] [formerly bab7e8fe26 [formerly 54ddc6ccc48ba57ceb52b3af62885fa12457a601]]]
Former-commit-id: bab7e8fe26
Former-commit-id: e233a76f50 [formerly eaddac1d4b]
Former-commit-id: 0c4dd583e5
 2014-01-17 10:49:49 -06:00
Brian Clements
89a4156614 Issue #2688 improved error logging in pypies repack 
Former-commit-id: eb3b2b66bf [formerly 5ff2f049d6] [formerly eb3b2b66bf [formerly 5ff2f049d6] [formerly 4b86d19055 [formerly 9b951cb9e28177a9ad702870724c5228c575f284]]]
Former-commit-id: 4b86d19055
Former-commit-id: b91f3828d0 [formerly 6bda60d2a7]
Former-commit-id: 926424bbb6
 2014-01-17 10:47:04 -06:00
Ben Steffensmeier
711472433f Issue #2646 Fix Drawing layer NPE. 
Former-commit-id: f31f7dc53a [formerly 068a9c6efb] [formerly f31f7dc53a [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: d43a97c51e [formerly e1fe6136ee]
Former-commit-id: 8a1de3a0bd
 2014-01-17 10:41:53 -06:00
Nate Jensen
0e7647cdc6 Issue #2359 fix annoying ncep null pointer 
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e

Former-commit-id: f46b6e0a8f [formerly c7addfbdbf] [formerly f46b6e0a8f [formerly c7addfbdbf] [formerly fa79f2aa14 [formerly 0cb0975786aa578e93fe06227c666feb759e0433]]]
Former-commit-id: fa79f2aa14
Former-commit-id: 09bc3382d6 [formerly 012ee681e5]
Former-commit-id: f00fb13946
 2014-01-17 10:24:10 -06:00
Nate Jensen
2ef5f3d320 Issue #2581 fix yet another missing LSR event type 
Change-Id: Ia71aa67038f7f9adc17f7d11e4d38990220e3916

Former-commit-id: 60652fe5a7 [formerly 7cbfaf7d7d] [formerly 60652fe5a7 [formerly 7cbfaf7d7d] [formerly 9c5a95e814 [formerly 6aac0862eb647a50b9f60cd290c3bb6f96807b3d]]]
Former-commit-id: 9c5a95e814
Former-commit-id: 5fded8bd27 [formerly 451d340bf1]
Former-commit-id: fd04d06605
 2014-01-17 09:46:26 -06:00
Richard Peter
f9b58971b5 Issue #2357: Close JmsSession when it has no producers or consumers 
Change-Id: Icd0d29c0e6a43109ac26a1d1ad1bbeef9d7aca5f

Former-commit-id: fe249a9fc2 [formerly 953ddccdb0] [formerly fe249a9fc2 [formerly 953ddccdb0] [formerly c3529a1769 [formerly 2a152d5ef2b0e3f54948f3679be74ecd717c02f9]]]
Former-commit-id: c3529a1769
Former-commit-id: 84f9abdeaf [formerly 31e2bd3555]
Former-commit-id: 7014a2af24
 2014-01-16 20:29:59 -06:00
Nate Jensen
1405804e48 Merge "Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages." into omaha_14.2.1 
Former-commit-id: 28281b799e [formerly 5a24f67ad9] [formerly 28281b799e [formerly 5a24f67ad9] [formerly bfd3cc7d16 [formerly b0bd165fde6dffc1064ea915440cd8d292eeb0c6]]]
Former-commit-id: bfd3cc7d16
Former-commit-id: adad7b744c [formerly 5e237af88e]
Former-commit-id: 0e519acb4c
 2014-01-16 18:28:06 -06:00
Nate Jensen
8378b17ed6 Merge "Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path" into development 
Former-commit-id: 00391f8efa [formerly bd5ff9706c] [formerly 00391f8efa [formerly bd5ff9706c] [formerly 4460b719f3 [formerly 85941bce1eda1ef2284e5ce4e3164086b9091125]]]
Former-commit-id: 4460b719f3
Former-commit-id: 0902caecb4 [formerly ce1473df8e]
Former-commit-id: 6b3c175096
 2014-01-16 18:27:50 -06:00
Nate Jensen
7f993b27b0 Merge "Issue #2660 Improved error logging in GetBrokerConnections.py" into omaha_14.2.1 
Former-commit-id: 1071d3dac3 [formerly 0ed6471054] [formerly 1071d3dac3 [formerly 0ed6471054] [formerly 055540bcff [formerly 7b07fb752c193bb2617fda5921116182fcd86379]]]
Former-commit-id: 055540bcff
Former-commit-id: 7b57a9bb89 [formerly bd319194d7]
Former-commit-id: 43ead9cb63
 2014-01-16 17:25:22 -06:00
Ben Steffensmeier
38024fb662 Issue #2313 Image canvas rendering. 
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 76414243ba [formerly 625aac3ed3] [formerly 76414243ba [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: 19930b7c8b [formerly 1973e5e015]
Former-commit-id: af39398ac3
 2014-01-16 17:05:16 -06:00
Brad Gonzales
d2629887bf Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages. 
Amend: Because of the files used specifically for InMemoryBandwidthManagerManager, added the SBN RetrievalPlan back to WFO.

Change-Id: Ibebd89a2dd0236c47e8060489eb67bec9fc8d583

Former-commit-id: b3f9678dba [formerly e308f2a6ee] [formerly b3f9678dba [formerly e308f2a6ee] [formerly ee4dc7068b [formerly b0c2fcb5e802815b886f669b633e516b022b55a3]]]
Former-commit-id: ee4dc7068b
Former-commit-id: 3f4785f450 [formerly 31705fddf5]
Former-commit-id: 7bb44e47ba
 2014-01-16 16:54:12 -06:00
Max Schenkelberg
74125016e0 Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path 
Change-Id: I4c6156080784c5fe9d2f9e9b8f8ea1594b919fb1

Former-commit-id: aad907e0b3 [formerly b2e5968d97] [formerly aad907e0b3 [formerly b2e5968d97] [formerly 65bbc5d6d5 [formerly 02ae43dcc86c7154af5629c20813bb542eb6cd6b]]]
Former-commit-id: 65bbc5d6d5
Former-commit-id: bb03f8707f [formerly 6e1d5b070f]
Former-commit-id: 8b5cb15ad2
 2014-01-16 14:50:34 -06:00
Lee Venable
39c7b5dffb Issue #2691 - Fixed null pointer exception when closing MPE perspective. 
Former-commit-id: 24a4cafd0c [formerly 8405e235e6] [formerly 24a4cafd0c [formerly 8405e235e6] [formerly b435fd3050 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: a859b50881 [formerly bc07967e3b]
Former-commit-id: a49baddf98
 2014-01-16 10:35:12 -06:00
Lee Venable
938f0c0b07 Merge "Issue #2459 - Add unscheduled as a slot attribute" into omaha_14.2.1 
Former-commit-id: c4fd162842 [formerly f599d2582f] [formerly c4fd162842 [formerly f599d2582f] [formerly 8c993338bb [formerly 1f8e60301301e4be3186ce09e569e7117a350a6d]]]
Former-commit-id: 8c993338bb
Former-commit-id: e45d202e2c [formerly ce4b2e6941]
Former-commit-id: c64d313a32
 2014-01-16 10:22:47 -06:00
Mike Duff
e6dfabc034 Issue #2459 - Add unscheduled as a slot attribute 
Former-commit-id: 292ef2c068 [formerly 0f655c96e3] [formerly 292ef2c068 [formerly 0f655c96e3] [formerly 47069bd7a4 [formerly 4cd670bc12e09f1acc778e8760615e92561e3ce3]]]
Former-commit-id: 47069bd7a4
Former-commit-id: 7fe25d02f0 [formerly fe012ebbd1]
Former-commit-id: cdd0245e24
 2014-01-16 10:06:17 -06:00