Ben Steffensmeier
|
d307af23eb
|
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 8a7d3ceab1 [formerly 927801985a ] [formerly 8a7d3ceab1 [formerly 927801985a ] [formerly 3696896b49 [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: ca5e771451 [formerly 70ca78c7b5 ]
Former-commit-id: a3f5fcabf6
|
2013-11-25 11:31:57 -06:00 |
|
Ben Steffensmeier
|
67b724a541
|
Issue #2528 Add brute force method of calculating geostationary envelope intersections.
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf
Former-commit-id: 9627cf0f6f [formerly 30d125f95a ] [formerly 9627cf0f6f [formerly 30d125f95a ] [formerly 00af766143 [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: abdb1c504c [formerly 6faafa2dfc ]
Former-commit-id: c742abd06e
|
2013-11-20 15:36:27 -06:00 |
|
Steve Harris
|
f3604b2fc8
|
Merge branch 'master_13.5.3' into development_on_RHEL5
Former-commit-id: 58325f2c17 [formerly be0f3bf912 ] [formerly 58325f2c17 [formerly be0f3bf912 ] [formerly d810aacaaa [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]
Former-commit-id: d810aacaaa
Former-commit-id: c86e70be8c [formerly 8ca6f8d14b ]
Former-commit-id: 4f6e7095a3
|
2013-11-15 13:19:01 -06:00 |
|
Steve Harris
|
e494984ce7
|
13.5.3-8 baseline
Former-commit-id: e644eb9219 [formerly 4029c51fbf ] [formerly e644eb9219 [formerly 4029c51fbf ] [formerly b05ffb2108 [formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]
Former-commit-id: b05ffb2108
Former-commit-id: 28e5c8f540 [formerly e86f211430 ]
Former-commit-id: d1bf24b8b0
|
2013-11-15 09:28:00 -05:00 |
|
Lee Venable
|
194a6760b7
|
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: bd81ec8807 [formerly 834c2ac8da ] [formerly bd81ec8807 [formerly 834c2ac8da ] [formerly f0ebee3bb3 [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: e9b8ee42c7 [formerly 7d04b2e4ce ]
Former-commit-id: ad77be1b44
|
2013-11-14 14:43:18 -06:00 |
|
Mike Duff
|
2b91b4b9ef
|
Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: f6c4ca2bc0 [formerly 87a4b1bec4 ] [formerly f6c4ca2bc0 [formerly 87a4b1bec4 ] [formerly a80964bc7c [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 48093514a6 [formerly 4557a06f42 ]
Former-commit-id: cf077ed7f9
|
2013-11-14 14:40:33 -06:00 |
|
Lee Venable
|
ab512eaeb1
|
Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: 6086c06f66 [formerly d431f3c0f4 ] [formerly 6086c06f66 [formerly d431f3c0f4 ] [formerly bc7f5e556d [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 69934b9b32 [formerly 17fef206fc ]
Former-commit-id: 84de0beae4
|
2013-11-14 14:33:18 -06:00 |
|
Richard Peter
|
7375a3b961
|
Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 5c5e71a01b [formerly 4d18c7d493 ] [formerly 5c5e71a01b [formerly 4d18c7d493 ] [formerly 3f5c590c5f [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 6af248f212 [formerly 3dc0ad184c ]
Former-commit-id: ace2a71092
|
2013-11-14 13:30:09 -06:00 |
|
Bryan Kowal
|
ae5e6b3927
|
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: 48cc679bce [formerly 2029c34f24 ] [formerly 48cc679bce [formerly 2029c34f24 ] [formerly 7e35ea310f [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 4759e48c5c [formerly a2261b9ff3 ]
Former-commit-id: 79045d620b
|
2013-11-14 11:57:11 -06:00 |
|
Richard Peter
|
0581cc53e5
|
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: adc30e817e [formerly 2f3eee1439 ] [formerly adc30e817e [formerly 2f3eee1439 ] [formerly e88f5777a7 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: ed258e9421 [formerly 64afe42e74 ]
Former-commit-id: 58c8106da8
|
2013-11-13 16:43:26 -06:00 |
|
Brian Clements
|
09101ca5ac
|
Issue #2505 removed recco from deployment
added update script to drop recco from db
Former-commit-id: 3551b731e0 [formerly 95f1621d3e ] [formerly 3551b731e0 [formerly 95f1621d3e ] [formerly 8cbe2c06a8 [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: d2f0b73626 [formerly 49c8bd5ee9 ]
Former-commit-id: d94f44d406
|
2013-11-13 13:45:44 -06:00 |
|
Benjamin Phillippe
|
7ae33612c5
|
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: c294d5d77a [formerly 5cd030f096 ] [formerly c294d5d77a [formerly 5cd030f096 ] [formerly 1c46226a11 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]
Former-commit-id: 1c46226a11
Former-commit-id: 1a19965daf [formerly fe7c6886c4 ]
Former-commit-id: 64a37e7672
|
2013-11-13 10:52:07 -06:00 |
|
Brian Clements
|
eb9764b77b
|
Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 0d80fa7dc1 [formerly dfd88151e6 ] [formerly 0d80fa7dc1 [formerly dfd88151e6 ] [formerly 37f4f41d2d [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: c3a0ea3400 [formerly ef2acc6562 ]
Former-commit-id: ac221125f4
|
2013-11-13 10:04:13 -06:00 |
|
Nate Jensen
|
1c92fc757b
|
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 51ba5f770c [formerly 85923b0f7f ] [formerly 51ba5f770c [formerly 85923b0f7f ] [formerly c0ed705daf [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]
Former-commit-id: c0ed705daf
Former-commit-id: fad5c6d615 [formerly a62e415724 ]
Former-commit-id: b7085b0ed4
|
2013-11-13 09:01:09 -06:00 |
|
Brian Clements
|
1d41861c3c
|
Issue #2546 added fix for TAFs that contain legacy valid times
added unit test
Former-commit-id: b0a5192dfa [formerly 191ffc6e63 ] [formerly b0a5192dfa [formerly 191ffc6e63 ] [formerly df1542a66c [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]
Former-commit-id: df1542a66c
Former-commit-id: bca5149811 [formerly 0e5d3e9e69 ]
Former-commit-id: b511453153
|
2013-11-13 08:07:29 -06:00 |
|
Bryan Kowal
|
d83504922b
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 631c03601c [formerly 7cac007ef1 ] [formerly 631c03601c [formerly 7cac007ef1 ] [formerly d76033ff3d [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]
Former-commit-id: d76033ff3d
Former-commit-id: e9ff5e018b [formerly 084d772588 ]
Former-commit-id: 8867114ff8
|
2013-11-12 17:43:10 -06:00 |
|
Nate Jensen
|
6b4284ec55
|
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: f2f778c042 [formerly accfefae6d ] [formerly f2f778c042 [formerly accfefae6d ] [formerly f0b386b632 [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]
Former-commit-id: f0b386b632
Former-commit-id: ec073efd45 [formerly 80227c4750 ]
Former-commit-id: 633faf692b
|
2013-11-12 16:55:31 -06:00 |
|
Nate Jensen
|
abf56dec05
|
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: 8df2c48648 [formerly 8cf1b752e0 ] [formerly 8df2c48648 [formerly 8cf1b752e0 ] [formerly b1d376e238 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]
Former-commit-id: b1d376e238
Former-commit-id: b0cfb6e836 [formerly 645e816d5d ]
Former-commit-id: 983afa0eea
|
2013-11-12 16:48:32 -06:00 |
|
Dave Hladky
|
fa2238778d
|
Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 5313c8b68d [formerly 643a150777 ] [formerly 5313c8b68d [formerly 643a150777 ] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]
Former-commit-id: e3a259182c
Former-commit-id: f2f670bc00 [formerly 53866e481a ]
Former-commit-id: 86363574b3
|
2013-11-12 14:55:41 -06:00 |
|
Nate Jensen
|
73d6499cc0
|
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: edb2b6d217 [formerly 5e02427d6e ] [formerly edb2b6d217 [formerly 5e02427d6e ] [formerly c60228c854 [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]
Former-commit-id: c60228c854
Former-commit-id: c6e10ebdef [formerly a1315f1072 ]
Former-commit-id: a53cf1a079
|
2013-11-12 14:41:34 -06:00 |
|
Richard Peter
|
7855a8f000
|
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: c25ba19514 [formerly 9af1de07d4 ] [formerly c25ba19514 [formerly 9af1de07d4 ] [formerly f12839a9e5 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]
Former-commit-id: f12839a9e5
Former-commit-id: 502d67591b [formerly c8ff79a7f5 ]
Former-commit-id: 0cf51fce74
|
2013-11-12 13:47:04 -06:00 |
|
Nate Jensen
|
ec0025a309
|
Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: 6707d1aadf [formerly 692ea76d75 ] [formerly 6707d1aadf [formerly 692ea76d75 ] [formerly a4ece1d116 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]
Former-commit-id: a4ece1d116
Former-commit-id: 4b329513e5 [formerly 2e86520b53 ]
Former-commit-id: 5c7be238a0
|
2013-11-12 13:02:49 -06:00 |
|
Nate Jensen
|
db3a33864f
|
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: db61d36b4e [formerly 88af1ddfcb ] [formerly db61d36b4e [formerly 88af1ddfcb ] [formerly 64aa00bad6 [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]
Former-commit-id: 64aa00bad6
Former-commit-id: 7a5f716d70 [formerly 39679b0608 ]
Former-commit-id: f618186c69
|
2013-11-12 12:46:38 -06:00 |
|
Brad Gonzales
|
a626b240ce
|
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: 62e4cafa27 [formerly 8f70fb1d0c ] [formerly 62e4cafa27 [formerly 8f70fb1d0c ] [formerly aea0e847aa [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 7747d901f7 [formerly 866a11a9f0 ]
Former-commit-id: bad9b3242a
|
2013-11-12 12:42:16 -06:00 |
|
Brian Clements
|
b970c720de
|
Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: 9f7e85450d [formerly 8b0e85f82c ] [formerly 9f7e85450d [formerly 8b0e85f82c ] [formerly 4050eb5f3e [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 4d3c2f488c [formerly ba12c7467d ]
Former-commit-id: 94a9ea2ff0
|
2013-11-12 12:41:50 -06:00 |
|
Nate Jensen
|
6185a257df
|
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: b71f2463da [formerly 3f86a3735e ] [formerly b71f2463da [formerly 3f86a3735e ] [formerly eed4c8604b [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]
Former-commit-id: eed4c8604b
Former-commit-id: b0600c60ce [formerly 18d790a423 ]
Former-commit-id: 1f4af0c06a
|
2013-11-12 12:13:58 -06:00 |
|
Richard Peter
|
24eb06f591
|
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 4d82382054 [formerly 8afc87e570 ] [formerly 4d82382054 [formerly 8afc87e570 ] [formerly 61fc3eba44 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]
Former-commit-id: 61fc3eba44
Former-commit-id: d66aaa7746 [formerly b8b01f6305 ]
Former-commit-id: c60b0849b3
|
2013-11-12 11:18:56 -06:00 |
|
Nate Jensen
|
b92c73f16f
|
Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: 6c016a6bb6 [formerly 1ee5d91af2 ] [formerly 6c016a6bb6 [formerly 1ee5d91af2 ] [formerly 2cdc7e5e63 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 98cbafe95c [formerly 368d73449e ]
Former-commit-id: 66ff41e961
|
2013-11-12 11:03:51 -06:00 |
|
Dave Hladky
|
6a9c0a6fa8
|
Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: efa18426a1 [formerly b6f1468b7e ] [formerly efa18426a1 [formerly b6f1468b7e ] [formerly 976eece1b1 [formerly de110d3747096601a122f64cc5d6037823213e92]]]
Former-commit-id: 976eece1b1
Former-commit-id: 3f5b80e5b3 [formerly 753b36cfea ]
Former-commit-id: e410d1f44b
|
2013-11-12 10:58:50 -06:00 |
|
Nate Jensen
|
83c9d010c4
|
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: 3480148f14 [formerly bca5793e3d ] [formerly 3480148f14 [formerly bca5793e3d ] [formerly da8a858727 [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]
Former-commit-id: da8a858727
Former-commit-id: ddebd81c73 [formerly d758e5ab57 ]
Former-commit-id: f1b25ed227
|
2013-11-12 10:55:40 -06:00 |
|
Brad Gonzales
|
b7fca60f7d
|
Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: cbdb9dfb4f [formerly cd221e5263 ] [formerly cbdb9dfb4f [formerly cd221e5263 ] [formerly ff5edde334 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]
Former-commit-id: ff5edde334
Former-commit-id: 1987184f87 [formerly efdc64b7b3 ]
Former-commit-id: 1b084e4efa
|
2013-11-12 10:50:06 -06:00 |
|
Nate Jensen
|
1ed84f8f63
|
Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 74d7dfd7da [formerly 3054868350 ] [formerly 74d7dfd7da [formerly 3054868350 ] [formerly d8f2ffbceb [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 5899801877 [formerly 68866c322c ]
Former-commit-id: f55aa5aea0
|
2013-11-12 10:39:51 -06:00 |
|
Nate Jensen
|
fd3fdf9b16
|
Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: cd5b0576b0 [formerly f1b8eecca7 ] [formerly cd5b0576b0 [formerly f1b8eecca7 ] [formerly 8c4608630d [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]
Former-commit-id: 8c4608630d
Former-commit-id: f240b80d6f [formerly b87efc6860 ]
Former-commit-id: 81749eac08
|
2013-11-12 10:39:44 -06:00 |
|
Nate Jensen
|
273eb805c0
|
Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 2c0c20f01e [formerly b52bdb1cec ] [formerly 2c0c20f01e [formerly b52bdb1cec ] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 9bf83be7e9 [formerly 5427e68fd2 ]
Former-commit-id: 80c38e1433
|
2013-11-12 10:37:54 -06:00 |
|
Nate Jensen
|
47e4b7e7e6
|
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 8ff0d1129a [formerly 3ed50ff500 ] [formerly 8ff0d1129a [formerly 3ed50ff500 ] [formerly 23fe7de462 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]
Former-commit-id: 23fe7de462
Former-commit-id: c84ff18213 [formerly 90320ab47a ]
Former-commit-id: da95b6f03e
|
2013-11-12 09:29:46 -06:00 |
|
Bryan Kowal
|
adf5ac93ae
|
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: 6b5f93117e [formerly 8e1c0fb8eb ] [formerly 6b5f93117e [formerly 8e1c0fb8eb ] [formerly 75e6914df1 [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]
Former-commit-id: 75e6914df1
Former-commit-id: 1a966d8ec2 [formerly 5c38f0bfd6 ]
Former-commit-id: 2565306c95
|
2013-11-11 17:00:17 -06:00 |
|
Brian Clements
|
39f4ee7d0d
|
Issue #2377 fixed error handling in QPF config
Former-commit-id: 23e9ac6aa8 [formerly e2ac7ae212 ] [formerly 23e9ac6aa8 [formerly e2ac7ae212 ] [formerly 684bd4dc50 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]]
Former-commit-id: 684bd4dc50
Former-commit-id: 368223de1f [formerly c6f8609b39 ]
Former-commit-id: 6b051e1513
|
2013-11-11 16:18:16 -06:00 |
|
Nate Jensen
|
cad09aed0b
|
Issue #2361 undo earlier changes that potentially break uengine based
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: bb93c18e7d [formerly 8628b7755e ] [formerly bb93c18e7d [formerly 8628b7755e ] [formerly a2935193b5 [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]
Former-commit-id: a2935193b5
Former-commit-id: e1138809e7 [formerly 9dc69e316f ]
Former-commit-id: 5c30fd5b5c
|
2013-11-11 16:14:35 -06:00 |
|
Brian Clements
|
6a34b316d6
|
Issue #2539 added GZIP support to WFS REST
small code cleanup in providers
Former-commit-id: 02ab14579f [formerly 36a0be2db1 ] [formerly 02ab14579f [formerly 36a0be2db1 ] [formerly 061515b485 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]]
Former-commit-id: 061515b485
Former-commit-id: 7cba0ca3c1 [formerly 24905af3c4 ]
Former-commit-id: 587c9ad61c
|
2013-11-11 16:08:09 -06:00 |
|
Steve Harris
|
b8cf485614
|
Merge branch 'omaha_13.5.3' into development
Former-commit-id: 51af205d06 [formerly 9dabbc7b8e ] [formerly 51af205d06 [formerly 9dabbc7b8e ] [formerly 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]
Former-commit-id: 66f99f3974
Former-commit-id: 48997c36f0 [formerly 9f1d93a2cf ]
Former-commit-id: 92cf79a7cc
|
2013-11-11 15:40:45 -06:00 |
|
Steve Harris
|
b39bff6544
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 00a64f061d [formerly c1dcded2bd ] [formerly 00a64f061d [formerly c1dcded2bd ] [formerly e0d2de3a19 [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]]
Former-commit-id: e0d2de3a19
Former-commit-id: 5b789ef8b0 [formerly 0d4e6712f8 ]
Former-commit-id: f4638935b7
|
2013-11-11 15:39:27 -06:00 |
|
Steve Harris
|
889db4bc7b
|
13.5.3-7 baseline
Former-commit-id: 36af5686bd [formerly 21bed95fa4 ] [formerly 36af5686bd [formerly 21bed95fa4 ] [formerly 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]
Former-commit-id: 47102ee47b
Former-commit-id: 142f1201b3 [formerly 3599d7f09b ]
Former-commit-id: 0c54c50443
|
2013-11-11 16:33:51 -05:00 |
|
Nate Jensen
|
3ef3e4453d
|
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: a3fd84d9ef [formerly 7dda17a660 ] [formerly a3fd84d9ef [formerly 7dda17a660 ] [formerly 05ee46c4bc [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]]
Former-commit-id: 05ee46c4bc
Former-commit-id: 208cc6a534 [formerly 64df0d8d8f ]
Former-commit-id: 175cc8dd74
|
2013-11-11 14:05:11 -06:00 |
|
Richard Peter
|
a053714acf
|
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: d55e99dc2d [formerly 13989d9c6e ] [formerly d55e99dc2d [formerly 13989d9c6e ] [formerly 51649b56e5 [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]]
Former-commit-id: 51649b56e5
Former-commit-id: 0e1ec70a0d [formerly 8db2d589e3 ]
Former-commit-id: a40c837424
|
2013-11-11 13:09:24 -06:00 |
|
Steve Harris
|
c9bbd30adf
|
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: 33e02b548d [formerly fbfe1a5faf ] [formerly 33e02b548d [formerly fbfe1a5faf ] [formerly 8a2e9f1725 [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: 4e09ce78c8 [formerly b4fe17406f ]
Former-commit-id: 76ca0835e7
|
2013-11-11 11:45:35 -06:00 |
|
Steve Harris
|
d9479c586d
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 9923b2c71a [formerly b62ab264f0 ] [formerly 9923b2c71a [formerly b62ab264f0 ] [formerly 4190ddf39b [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]]
Former-commit-id: 4190ddf39b
Former-commit-id: 0822dd1682 [formerly 590d7de15d ]
Former-commit-id: d4f5c58a4c
|
2013-11-11 11:40:03 -06:00 |
|
Steve Harris
|
32ed33056b
|
13.5.3-6 baseline
Former-commit-id: 11ca17a63c [formerly 77a45660d5 ] [formerly 11ca17a63c [formerly 77a45660d5 ] [formerly 5fa893d37b [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 8705c4779b [formerly f31112871c ]
Former-commit-id: 49b0919cf0
|
2013-11-11 12:34:10 -05:00 |
|
Max Schenkelberg
|
7383be61c1
|
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.
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: 2f794486e3 [formerly e58a5df04b ] [formerly 2f794486e3 [formerly e58a5df04b ] [formerly bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]
Former-commit-id: bd903f6641
Former-commit-id: 3f3b244b0d [formerly c85532a180 ]
Former-commit-id: 60616f7ef0
|
2013-11-11 11:09:00 -06:00 |
|
Nate Jensen
|
baca6de835
|
Merge "Issue #1314 removed common.spatial plugin" into development
Former-commit-id: 0c25fe98bd [formerly 0dbc31b756 ] [formerly 0c25fe98bd [formerly 0dbc31b756 ] [formerly 06acf1b8a0 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]]]
Former-commit-id: 06acf1b8a0
Former-commit-id: 06c24325c1 [formerly de2623e273 ]
Former-commit-id: f15ae53437
|
2013-11-11 08:48:44 -06:00 |
|
Brad Gonzales
|
c9ba669d05
|
Issue #2506 Refactored RegistryEvent constructors.
Amend: Added call to default constructor in Event initialization constructor.
Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454
Former-commit-id: adc09b748d [formerly 9e8420b216 ] [formerly adc09b748d [formerly 9e8420b216 ] [formerly d80183edc1 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]]]
Former-commit-id: d80183edc1
Former-commit-id: 04c4b2a4cd [formerly 86f5c2b6ec ]
Former-commit-id: 0e64d5f7fd
|
2013-11-08 15:46:40 -06:00 |
|