Commit graph

4230 commits

Author SHA1 Message Date
Steve Harris
12fdbf66fa Issue #2422 - Fix edexBridge like in RHEL6
Former-commit-id: 2214ab8e80 [formerly 927b509334] [formerly a58f1f8d76] [formerly d6242c20a4 [formerly a58f1f8d76 [formerly de5cf0cd69ddcd92bcb1e1ff9ea2c2b0253b36bd]]]
Former-commit-id: d6242c20a4
Former-commit-id: 874a6fc5a7ef30f4765c328ae6fa870a0561027c [formerly 67217a7fc3]
Former-commit-id: 75d68f80d0
2013-12-02 15:16:42 -06:00
Steve Harris
1ea87a31c1 Issue #2297 - fixing build scripts
Former-commit-id: 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 6f8066380ee7e58d7dbf970e1cf56bc481bf84f2 [formerly b0516c0938]
Former-commit-id: 1914ddd079
2013-12-02 14:57:20 -06:00
Ben Steffensmeier
e3b84502cb Issue #2528 Allow geostationary data to display on an identical projection.
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 7dd3dd2332 [formerly 5369a757ce] [formerly 048f968147] [formerly 59d806fa7e [formerly 048f968147 [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]
Former-commit-id: 59d806fa7e
Former-commit-id: c7a36153bad0dfab90f971ef314e2c47b661772c [formerly 37f6acbb99]
Former-commit-id: a78188ecb9
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
56456894f1 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: dcfdc9a24b [formerly 8a7d3ceab1] [formerly 192772b92c8a86ee4d2a06670357a91aa3f822cd [formerly 927801985a]] [formerly 3696896b49 [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5]
Former-commit-id: ca5e771451
2013-11-25 11:31:57 -06:00
Ben Steffensmeier
1b022bfd31 Issue #2528 Add brute force method of calculating geostationary envelope intersections.
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf

Former-commit-id: 4d86af4f02 [formerly 9627cf0f6f] [formerly 30d125f95a] [formerly 00af766143 [formerly 30d125f95a [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: cacb3acbd0ce426c88a1a423cb2359588872f550 [formerly 6faafa2dfc]
Former-commit-id: abdb1c504c
2013-11-20 15:36:27 -06:00
Steve Harris
582813fab6 Merge branch 'master_13.5.3' into development_on_RHEL5
Former-commit-id: 5ef89f10a1 [formerly 58325f2c17] [formerly 47874034f5c951c29f2a6366891ede0a7d699ed0 [formerly be0f3bf912]] [formerly d810aacaaa [formerly be0f3bf912 [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]
Former-commit-id: d810aacaaa
Former-commit-id: 91838a405f0441744a78ba5ded1f77d0c0ed5f87 [formerly 8ca6f8d14b]
Former-commit-id: c86e70be8c
2013-11-15 13:19:01 -06:00
Steve Harris
c52a724799 13.5.3-8 baseline
Former-commit-id: ed8ef11cb8 [formerly e644eb9219] [formerly 4029c51fbf] [formerly b05ffb2108 [formerly 4029c51fbf [formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]
Former-commit-id: b05ffb2108
Former-commit-id: fecf6ab52aeb75463fdc9128c8ec88a97cf188f0 [formerly e86f211430]
Former-commit-id: 28e5c8f540
2013-11-15 09:28:00 -05:00
Lee Venable
0e326c2a12 Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 2f134e6aa3 [formerly bd81ec8807] [formerly 834c2ac8da] [formerly f0ebee3bb3 [formerly 834c2ac8da [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce]
Former-commit-id: e9b8ee42c7
2013-11-14 14:43:18 -06:00
Mike Duff
b27ee6803f Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42]
Former-commit-id: 48093514a6
2013-11-14 14:40:33 -06:00
Lee Venable
b93b05165c Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly bc7f5e556d [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc]
Former-commit-id: 69934b9b32
2013-11-14 14:33:18 -06:00
Richard Peter
df3e6735af Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c]
Former-commit-id: 6af248f212
2013-11-14 13:30:09 -06:00
Bryan Kowal
8a0b0667de Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]
Former-commit-id: 4759e48c5c
2013-11-14 11:57:11 -06:00
Richard Peter
42ac155685 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74]
Former-commit-id: ed258e9421
2013-11-13 16:43:26 -06:00
Brian Clements
b5b94646cf Issue #2505 removed recco from deployment
added update script to drop recco from db


Former-commit-id: 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9]
Former-commit-id: d2f0b73626
2013-11-13 13:45:44 -06:00
Benjamin Phillippe
7cbc9b4ef3 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly d1769bae732e9e8f04b6407fdf659ac6eeaae5c3 [formerly 5cd030f096]] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]
Former-commit-id: 1c46226a11
Former-commit-id: 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4]
Former-commit-id: 1a19965daf
2013-11-13 10:52:07 -06:00
Brian Clements
c399d0394f Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: 0991849617 [formerly 0d80fa7dc1] [formerly a1efb536e48a75742d84cd92212efeb7e692e012 [formerly dfd88151e6]] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562]
Former-commit-id: c3a0ea3400
2013-11-13 10:04:13 -06:00
Nate Jensen
df8ddb3eac Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly c0ed705daf [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]
Former-commit-id: c0ed705daf
Former-commit-id: 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724]
Former-commit-id: fad5c6d615
2013-11-13 09:01:09 -06:00
Brian Clements
381a274111 Issue #2546 added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly df1542a66c [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]
Former-commit-id: df1542a66c
Former-commit-id: 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69]
Former-commit-id: bca5149811
2013-11-13 08:07:29 -06:00
Bryan Kowal
d8a1e15951 Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]
Former-commit-id: d76033ff3d
Former-commit-id: 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588]
Former-commit-id: e9ff5e018b
2013-11-12 17:43:10 -06:00
Nate Jensen
793a7f6544 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly f0b386b632 [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]
Former-commit-id: f0b386b632
Former-commit-id: dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750]
Former-commit-id: ec073efd45
2013-11-12 16:55:31 -06:00
Nate Jensen
ad6d935205 Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly b1d376e238 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]
Former-commit-id: b1d376e238
Former-commit-id: 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d]
Former-commit-id: b0cfb6e836
2013-11-12 16:48:32 -06:00
Dave Hladky
b467763805 Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]
Former-commit-id: e3a259182c
Former-commit-id: a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a]
Former-commit-id: f2f670bc00
2013-11-12 14:55:41 -06:00
Nate Jensen
8dacce7f9b Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly c60228c854 [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]
Former-commit-id: c60228c854
Former-commit-id: 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072]
Former-commit-id: c6e10ebdef
2013-11-12 14:41:34 -06:00
Richard Peter
51f9a7fe54 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]
Former-commit-id: f12839a9e5
Former-commit-id: d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5]
Former-commit-id: 502d67591b
2013-11-12 13:47:04 -06:00
Nate Jensen
25047d10d5 Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly a4ece1d116 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]
Former-commit-id: a4ece1d116
Former-commit-id: bb48885fad4303574e632bfa0ef5cef5bf842c6d [formerly 2e86520b53]
Former-commit-id: 4b329513e5
2013-11-12 13:02:49 -06:00
Nate Jensen
f673de2e99 Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]
Former-commit-id: 64aa00bad6
Former-commit-id: 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608]
Former-commit-id: 7a5f716d70
2013-11-12 12:46:38 -06:00
Brad Gonzales
725742f4ec Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0]
Former-commit-id: 7747d901f7
2013-11-12 12:42:16 -06:00
Brian Clements
3351401cb6 Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly 4050eb5f3e [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 6cca22845871692e5d67bd3e6d781e22aab81c7d [formerly ba12c7467d]
Former-commit-id: 4d3c2f488c
2013-11-12 12:41:50 -06:00
Nate Jensen
0c999d40dd Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly eed4c8604b [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]
Former-commit-id: eed4c8604b
Former-commit-id: e300fc5ad7ce2f811eabeaaee0fd88234f5a7008 [formerly 18d790a423]
Former-commit-id: b0600c60ce
2013-11-12 12:13:58 -06:00
Richard Peter
be32cf8237 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 61fc3eba44 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]
Former-commit-id: 61fc3eba44
Former-commit-id: b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0 [formerly b8b01f6305]
Former-commit-id: d66aaa7746
2013-11-12 11:18:56 -06:00
Nate Jensen
e2db59a055 Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly 2cdc7e5e63 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 62f6799a9e992798bc661107dd6e08c64c9810c5 [formerly 368d73449e]
Former-commit-id: 98cbafe95c
2013-11-12 11:03:51 -06:00
Dave Hladky
3d5ca2453b Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]]
Former-commit-id: 976eece1b1
Former-commit-id: 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea]
Former-commit-id: 3f5b80e5b3
2013-11-12 10:58:50 -06:00
Nate Jensen
493d79f524 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly da8a858727 [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]
Former-commit-id: da8a858727
Former-commit-id: 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57]
Former-commit-id: ddebd81c73
2013-11-12 10:55:40 -06:00
Brad Gonzales
66d22943ed Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]
Former-commit-id: ff5edde334
Former-commit-id: 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3]
Former-commit-id: 1987184f87
2013-11-12 10:50:06 -06:00
Nate Jensen
d1e5b5e0dc Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly d8f2ffbceb [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c]
Former-commit-id: 5899801877
2013-11-12 10:39:51 -06:00
Nate Jensen
d2f15c928c Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: bf4406d124 [formerly cd5b0576b0] [formerly f1b8eecca7] [formerly 8c4608630d [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]
Former-commit-id: 8c4608630d
Former-commit-id: 7d794297e4516fd184a29fd40a964387c686691f [formerly b87efc6860]
Former-commit-id: f240b80d6f
2013-11-12 10:39:44 -06:00
Nate Jensen
f91ac1953e Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2]
Former-commit-id: 9bf83be7e9
2013-11-12 10:37:54 -06:00
Nate Jensen
d3cadd78d6 Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]
Former-commit-id: 23fe7de462
Former-commit-id: bbd9ec0c716072ceca26f944c7f0c8aec819db11 [formerly 90320ab47a]
Former-commit-id: c84ff18213
2013-11-12 09:29:46 -06:00
Bryan Kowal
5bfc4d4dda Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]
Former-commit-id: 75e6914df1
Former-commit-id: 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6]
Former-commit-id: 1a966d8ec2
2013-11-11 17:00:17 -06:00
Brian Clements
407884f08e Issue #2377 fixed error handling in QPF config
Former-commit-id: 6faded726a [formerly 23e9ac6aa8] [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]]
Former-commit-id: 684bd4dc50
Former-commit-id: a089b8911c036cdf25eb53efbf261c6116d81cf6 [formerly c6f8609b39]
Former-commit-id: 368223de1f
2013-11-11 16:18:16 -06:00
Nate Jensen
e62a756cbc Issue #2361 undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly a2935193b5 [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]
Former-commit-id: a2935193b5
Former-commit-id: 32cf218a7d8218d000be9f55fd45198a966abf60 [formerly 9dc69e316f]
Former-commit-id: e1138809e7
2013-11-11 16:14:35 -06:00
Brian Clements
9c04028981 Issue #2539 added GZIP support to WFS REST
small code cleanup in providers


Former-commit-id: 9934916ec7 [formerly 02ab14579f] [formerly a888aad0046cac205c889c6486de64c7defb47fe [formerly 36a0be2db1]] [formerly 061515b485 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]]
Former-commit-id: 061515b485
Former-commit-id: 0196637c33858fef7c310554bbe9d076877097b6 [formerly 24905af3c4]
Former-commit-id: 7cba0ca3c1
2013-11-11 16:08:09 -06:00
Steve Harris
6c1b10ef38 Merge branch 'omaha_13.5.3' into development
Former-commit-id: 3046218ffa [formerly 51af205d06] [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]
Former-commit-id: 66f99f3974
Former-commit-id: 0a548e3ee4a8da8b1016d683c486d04b1f3f4cdd [formerly 9f1d93a2cf]
Former-commit-id: 48997c36f0
2013-11-11 15:40:45 -06:00
Steve Harris
dffea727be Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 1a49b03f89 [formerly 00a64f061d] [formerly c1dcded2bd] [formerly e0d2de3a19 [formerly c1dcded2bd [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]]
Former-commit-id: e0d2de3a19
Former-commit-id: 7ef46b17621b2c5d7650aa762a0c86f5ec0633aa [formerly 0d4e6712f8]
Former-commit-id: 5b789ef8b0
2013-11-11 15:39:27 -06:00
Steve Harris
c698e151f2 13.5.3-7 baseline
Former-commit-id: 130ad51d0c [formerly 36af5686bd] [formerly 0bde7454557dc9d790321a4bc1383621f270a531 [formerly 21bed95fa4]] [formerly 47102ee47b [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]
Former-commit-id: 47102ee47b
Former-commit-id: 06258f044b934f4063d605764f82c7d974d58d0b [formerly 3599d7f09b]
Former-commit-id: 142f1201b3
2013-11-11 16:33:51 -05:00
Nate Jensen
bdfe31ca9d Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development
Former-commit-id: a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]]
Former-commit-id: 05ee46c4bc
Former-commit-id: bde810fa0fc654c54b6988c3f5dabe5ab75424e3 [formerly 64df0d8d8f]
Former-commit-id: 208cc6a534
2013-11-11 14:05:11 -06:00
Richard Peter
9600b1a10e Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 51649b56e5 [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]]
Former-commit-id: 51649b56e5
Former-commit-id: 01640204f77e3bf9716a94b6d6df69c22e18cadd [formerly 8db2d589e3]
Former-commit-id: 0e1ec70a0d
2013-11-11 13:09:24 -06:00
Steve Harris
ef183dd7af Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f]
Former-commit-id: 4e09ce78c8
2013-11-11 11:45:35 -06:00
Steve Harris
73966efbac Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 4190ddf39b [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]]
Former-commit-id: 4190ddf39b
Former-commit-id: 97466112f596932da4595e1e089695d5218ac848 [formerly 590d7de15d]
Former-commit-id: 0822dd1682
2013-11-11 11:40:03 -06:00
Steve Harris
155831d8d2 13.5.3-6 baseline
Former-commit-id: aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly 5fa893d37b [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 2ec2397f40dee7ff2d4d5b8e509eb1e661a33c78 [formerly f31112871c]
Former-commit-id: 8705c4779b
2013-11-11 12:34:10 -05:00