1359 commits

Author	SHA1	Message	Date
Ron Anderson	d3a25be20d	Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development ... Former-commit-id: 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]] Former-commit-id: 7f41d701be Former-commit-id: 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c] Former-commit-id: 5858e8fc19	2013-05-30 13:08:26 -05:00
Everett Kladstrup	f78c5c3640	Issue #2052 Fix FeatureExplorer feature comparison ... * fixes complaint when feature A includes features B and C which both include feature D. Used to get error that plugin X is in feature D and feature D * Updated FeatureExplorer jar in build.edex to reflect change Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7 Former-commit-id: 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]] Former-commit-id: 4621271329 Former-commit-id: 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141] Former-commit-id: 282ec3b45f	2013-05-30 13:02:49 -05:00
Dustin Johnson	bf277cb980	Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development ... Former-commit-id: b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]] Former-commit-id: 9c9caf00d1 Former-commit-id: 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c] Former-commit-id: 48c37c972a	2013-05-30 11:32:09 -05:00
Ron Anderson	f9eeac331e	Issue #2028 Fixed date line issue in MakeHazardDialog ... Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287 Former-commit-id: ff6fe9e225 [formerly 165bc6c409] [formerly 6557515f64] [formerly 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]] Former-commit-id: 08e09382db Former-commit-id: 844223fb2342ed488da4564f04128cde03cba0ca [formerly c3363d43fa] Former-commit-id: 3f9cb35feb	2013-05-30 11:01:07 -05:00
Dustin Johnson	ac8c2784ae	Issue #2038 Remove unused schemas from datadelivery spring files ... Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26 Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]] Former-commit-id: b99a8bc4f9 Former-commit-id: 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450] Former-commit-id: 74d985af51	2013-05-30 09:49:09 -05:00
Brad Gonzales	c8811ff347	Issue #1965 Commit for purge and archive with tests. ... A lot of this ended up being duplication of Roger's code. Roger's changes should go first, and then this commit will be merged and refactored with his code in an amend. Amend: better test coverage, fixes to old other pattern integrated with Roger's changes. added header comments, deleted FileArchiveElement. removed search and filter code. Change-Id: I4e48842a75b9da27062349fee01099e1ea13f59e Former-commit-id: 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]] Former-commit-id: 321f153547 Former-commit-id: 34d580ade00224baada454c96f672dc4ee914ab2 [formerly bbc15413d4] Former-commit-id: cb69ca7e93	2013-05-30 09:34:18 -05:00
Bryan Kowal	cad451315d	Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution ... Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14 Former-commit-id: 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]] Former-commit-id: bd9251eba0 Former-commit-id: 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4] Former-commit-id: 5ee9c9f6a1	2013-05-29 21:52:10 -05:00
Ben Steffensmeier	c6150879d5	Issue #1869 ensure all uses ofdataURI in PDO use getter. ... Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f Former-commit-id: 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]] Former-commit-id: 191f93653d Former-commit-id: e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa] Former-commit-id: 9c415e2f19	2013-05-29 17:50:50 -05:00
Nate Jensen	fde771fa01	Issue #1989 remove unused schemas ... Change-Id: Ia040164481647fc384a264cd2126b8f9438df594 Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]] Former-commit-id: fc691cbb2f Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7] Former-commit-id: ab10e0072d	2013-05-29 16:19:28 -05:00
Dustin Johnson	efd95f253e	Issue #2038 Fix deleting of multiple subscription types ... Update test Spring configurations Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e Former-commit-id: 63ccc2c133 [formerly 21b8f03b1f] [formerly d2d50e7d8b] [formerly ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]] Former-commit-id: ecf3f2e300 Former-commit-id: 1540347e93b929ac41c7a779cb0a5461b2ed43ed [formerly 151df64a6e] Former-commit-id: d467832855	2013-05-29 15:54:06 -05:00
Steve Harris	70ecafa237	13.4.1-13 baseline ... Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]] Former-commit-id: de476791fb Former-commit-id: 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf] Former-commit-id: 418f8aef56	2013-05-29 16:30:09 -04:00
Nate Jensen	3a41ae85b4	Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh ... Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3 Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]] Former-commit-id: 3f3e0a788d Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f] Former-commit-id: b025262dc1	2013-05-29 14:49:43 -05:00
Nate Jensen	043cc9f661	Issue #1989 remove high memory mode, reorganize wrapper.conf ... Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]] Former-commit-id: 148b20f57c Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3] Former-commit-id: 47d2bf99b9	2013-05-29 12:06:15 -05:00
Benjamin Phillippe	a05a910ef9	Issue #2036 Implemented federated query capabilities ... Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69 Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319]] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]] Former-commit-id: d5263b2b75 Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794] Former-commit-id: c6af8b4d7c	2013-05-29 10:34:22 -05:00
Dustin Johnson	6567c1b6ef	Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development ... Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]] Former-commit-id: ac292f1242 Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56] Former-commit-id: b6c87f42b1	2013-05-29 09:27:30 -05:00
Nate Jensen	768a7dad60	Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables ... Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]] Former-commit-id: 36bc35b5c8 Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a] Former-commit-id: 452858b86f	2013-05-29 09:20:53 -05:00
Dustin Johnson	fb15a3e115	Issue #2038 More information when bandwidth manager can't schedule a subscription ... Amend: Peer review comments Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]] Former-commit-id: 31e01a9f9a Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef] Former-commit-id: fff0172786	2013-05-29 09:02:47 -05:00
Roger Ferrel	618feeda6d	Issue #1966 Changes to CategoryConfig to make parsing more efficent. ... Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87 Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]] Former-commit-id: 9263b54845 Former-commit-id: e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e] Former-commit-id: 838eacc802	2013-05-28 13:21:08 -05:00
Max Schenkelberg	ae669fec59	Issue #1638 Added support for null search constraints for updates ... Amend: Fixed comment, added SW history Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515 Former-commit-id: a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]] Former-commit-id: 807e4501c8 Former-commit-id: 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e] Former-commit-id: 6c9fedb312	2013-05-28 12:59:27 -05:00
Dustin Johnson	d8cdc3c8c5	Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development ... Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]] Former-commit-id: 197a5cef1b Former-commit-id: 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef] Former-commit-id: 8d00ba1978	2013-05-28 06:43:35 -05:00
Ben Steffensmeier	84eac56ea0	Issue #1869 Fix unique checking for things without dataURI and with subtables. ... Former-commit-id: c2ca1551f6 [formerly cdf8e7daaa] [formerly 37df42633ad7fbcc51bf28d03f3ac6f82040b570 [formerly 3b6156843e]] [formerly 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]] Former-commit-id: 7be9ad1f8b Former-commit-id: dc6540df2c7c7dee778134e44e92281971fe7bb5 [formerly 2a8a87e564] Former-commit-id: c71afc4198	2013-05-24 16:40:21 -05:00
Mike Duff	e7790088ac	Issue #2020 - Implement Shared Subscriptions Cave-side. ... Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 9cee487b71f7329909bd95a36c355637b4bb4978 [formerly 192ce891d0]] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]] Former-commit-id: b6b01c3e81 Former-commit-id: bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7] Former-commit-id: 6ee0ef55ff	2013-05-24 09:20:55 -05:00
Richard Peter	8289c96d1c	Merge "Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1 ... Former-commit-id: 7aec695890 [formerly 344765c61d] [formerly 979cc8c181] [formerly 732ae3c832 [formerly 979cc8c181 [formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]] Former-commit-id: 732ae3c832 Former-commit-id: e8b165061195e5604181a03f4c2901e70131c927 [formerly ec8c77f6f3] Former-commit-id: e65237b93f	2013-05-23 18:10:58 -05:00
Ron Anderson	0462d29a0f	Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1 ... Former-commit-id: f9bedd3aec [formerly 1eb1cffa15] [formerly c0fffc630d] [formerly 57c452b085 [formerly c0fffc630d [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]] Former-commit-id: 57c452b085 Former-commit-id: 782f51d6eb68810b024cac4035d52bed928b399f [formerly 59d823bf7b] Former-commit-id: 9cdf34184d	2013-05-23 12:12:39 -05:00
Richard Peter	d4eb77b248	Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period. ... Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]] Former-commit-id: 7349808131 Former-commit-id: 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966] Former-commit-id: 53190601f6	2013-05-23 11:50:34 -05:00
Nate Jensen	3b56918970	Issue #1989 remove activemq references from spring xml, fix deprecated javadoc ... Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61 Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]] Former-commit-id: 1fd2f8965f Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20] Former-commit-id: a84a6fe6ae	2013-05-23 11:20:40 -05:00
Nate Jensen	a9a2c23e23	Merge "Issue #1989 use camel's built-in DirectVm component" into development ... Former-commit-id: d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]] Former-commit-id: 3b058175fe Former-commit-id: 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef [formerly 71d9076fe2] Former-commit-id: 3287b6ace2	2013-05-23 10:43:15 -05:00
Richard Peter	b087cac180	Merge "Issue #1989 fix clustered routes suspending/starting" into development ... Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]] Former-commit-id: 9ca63e7d26 Former-commit-id: e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690] Former-commit-id: e150a51871	2013-05-23 10:10:51 -05:00
Nate Jensen	b8e6b1a083	Issue #1989 use camel's built-in DirectVm component ... Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31 Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]] Former-commit-id: d7b8e04bb7 Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d] Former-commit-id: 882296f823	2013-05-23 10:06:28 -05:00
Greg Armendariz	806a417f0f	Merge "Issue #1927 - patch ant includegen task" into development ... Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]] Former-commit-id: a4457f8c83 Former-commit-id: 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c] Former-commit-id: 7c97422501	2013-05-23 09:10:11 -05:00
Matt Nash	e9735dc410	Issue #1871 fix for 64 bit ints from Python to Java ... Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae Former-commit-id: 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]] Former-commit-id: 30c7ca8d36 Former-commit-id: 98364944a63f530252908f2eab510fc15f4a9823 [formerly ca208f913c] Former-commit-id: 230e3d149e	2013-05-23 09:07:56 -05:00
Roger Ferrel	3aa439216d	Issue #1966 Feature place holders for the dialogs. ... Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]] Former-commit-id: d35424df4f Former-commit-id: 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d] Former-commit-id: 760b0f3366	2013-05-23 07:36:15 -05:00
Bryan Kowal	0f23a3a390	Issue #1927 - patch ant includegen task ... Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]] Former-commit-id: 24c0728db9 Former-commit-id: 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83] Former-commit-id: e6cfad1759	2013-05-22 18:00:43 -05:00
Nate Jensen	1aa7bda4f9	Issue #1989 fix clustered routes suspending/starting ... Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]] Former-commit-id: a6d525ec96 Former-commit-id: b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d] Former-commit-id: 5525412779	2013-05-22 16:39:24 -05:00
Steve Harris	d477564678	Merge branch 'omaha_13.4.1' into development ... Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]] Former-commit-id: 3590310f17 Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d] Former-commit-id: 389eefd1f9	2013-05-22 16:13:08 -05:00
Steve Harris	a6bb8b38dd	Merge branch 'master_13.4.1' into omaha_13.4.1 ... Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]] Former-commit-id: 462652e31e Former-commit-id: 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202] Former-commit-id: 026674d0b2	2013-05-22 16:10:04 -05:00
David Gillingham	82e61b31f6	Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest. ... Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac Former-commit-id: 63ea2808eb [formerly cf1f45d77f] [formerly 8e8d71dc2f] [formerly d5895e23c7 [formerly 8e8d71dc2f [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]] Former-commit-id: d5895e23c7 Former-commit-id: 1cd8a6a6ca2d726353932c69d7adfc7def2761c1 [formerly 0e1135ac1f] Former-commit-id: 2e6f7c8250	2013-05-22 15:48:32 -05:00
Steve Harris	fb41995981	13.4.1-12 baseline ... Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]] Former-commit-id: e53ada66b8 Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859] Former-commit-id: b745b332ae	2013-05-22 16:42:39 -04:00
Benjamin Phillippe	09126056a6	Issue #2022 Removed data delivery project from feature ... Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd Former-commit-id: feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]] Former-commit-id: 3e9fe9892e Former-commit-id: fa6325803c190e9467895d087ac2f99cbe7f7004 [formerly ce20ead9e7] Former-commit-id: 8cae1b56f1	2013-05-22 12:49:46 -05:00
David Gillingham	60850d6f8a	Issue #1759: Fix regression to ISC request reply due to missing import. ... Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80 Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 5cba0f5e40]] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]] Former-commit-id: 801c659108 Former-commit-id: 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652] Former-commit-id: 1471a7fa34	2013-05-22 11:42:08 -05:00
Benjamin Phillippe	99ed99e6d3	Issue #2022 Added registry federation capabilities ... Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028 Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]] Former-commit-id: c3a376475b Former-commit-id: 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c] Former-commit-id: 1c50a8b9d3	2013-05-22 11:38:42 -05:00
Richard Peter	b3c32889b1	Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development ... Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]] Former-commit-id: b4344d3c04 Former-commit-id: 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1] Former-commit-id: 1bbddf8fdf	2013-05-21 13:07:51 -05:00
Richard Peter	ffe0b35085	Merge branch 'omaha_13.4.1' (13.4.1-11) into development ... Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]] Former-commit-id: 930ff50fb8 Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf] Former-commit-id: 76f11f00ae	2013-05-21 12:11:21 -05:00
Richard Peter	8e252f89f0	Merge branch 'master_13.4.1' into omaha_13.4.1 ... Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]] Former-commit-id: 77a08ebd31 Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878] Former-commit-id: 21b87e9ea7	2013-05-21 10:35:00 -05:00
Dustin Johnson	bf3f162fc9	Merge "Issue #2000 Subscription overlap configuration GUI" into development ... Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]] Former-commit-id: 8fcc958d84 Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967] Former-commit-id: bd65447c9f	2013-05-21 08:19:34 -05:00
Steve Harris	5db95cce55	13.4.1-11 baseline ... Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]] Former-commit-id: c0376ce9ed Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48] Former-commit-id: 4d88863515	2013-05-21 09:19:25 -04:00
Ben Steffensmeier	bd89419f5e	Issue #1869 Rewrite dataURI property mappings. ... Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9 Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]] Former-commit-id: 931e76ae59 Former-commit-id: b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4] Former-commit-id: 30eb486e45	2013-05-20 18:00:32 -05:00
Richard Peter	5efe58df0b	Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development ... Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]] Former-commit-id: 59c38fdb78 Former-commit-id: 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8] Former-commit-id: 72206676ee	2013-05-20 17:49:22 -05:00
Roger Ferrel	0db7741ce5	Issue #1966 Interim changes Brad needs for his work. ... Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]] Former-commit-id: dfd586fca6 Former-commit-id: 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe] Former-commit-id: 4a5073902f	2013-05-20 17:43:47 -05:00
Ben Steffensmeier	a075a5d665	Issue #1869 Remove DataURI column from sat plot types. ... Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb Former-commit-id: 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]] Former-commit-id: 885b106652 Former-commit-id: cbee870e9d200703dc59998e51a5ad2251e0852a [formerly 13b2b4afef] Former-commit-id: a03dbd284b	2013-05-20 17:27:15 -05:00