1086 commits

Author	SHA1	Message	Date
Roger Ferrel	a9a0a471f9	Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList. ... Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4 Former-commit-id: f912d9ece3 [formerly c5a2786c84] [formerly b5743e8f9b [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]] Former-commit-id: b5743e8f9b Former-commit-id: 8bb9044e3a	2013-03-12 16:58:06 -05:00
Nate Jensen	a4a5a1e94f	Merge "Issue #1638 fix velocity on windows" into development ... Former-commit-id: 37d996c64c [formerly 4486bd9941] [formerly 676b3c9d11 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]] Former-commit-id: 676b3c9d11 Former-commit-id: 33f185d021	2013-03-12 16:43:13 -05:00
Nate Jensen	35d0187e3d	Issue #1638 fix velocity on windows ... Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a Former-commit-id: 5e545cc9c4 [formerly 863d4cf3df] [formerly cbf0343d72 [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]] Former-commit-id: cbf0343d72 Former-commit-id: b00ccd2b77	2013-03-12 16:04:59 -05:00
Steve Harris	bca46a1354	Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]] Former-commit-id: 0cd7e56e65 Former-commit-id: d5bcdb0015	2013-03-12 16:04:23 -05:00
Dave Hladky	155903d135	Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java ncep/com.raytheon.uf.edex.ncep.feature/feature.xml Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227 Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]] Former-commit-id: 4b08491880 Former-commit-id: 6ea95002de	2013-03-12 15:48:34 -05:00
Dustin Johnson	d63cdbfd17	Issue #1778 Watch for bandwidth configuration changes ... Amend: Peer review comments Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e Former-commit-id: 6eed493b3e [formerly 4c7f7801fa] [formerly 794812fb23 [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]] Former-commit-id: 794812fb23 Former-commit-id: 33fe353252	2013-03-12 12:02:09 -05:00
Mike Duff	f1f79fc498	Issue #1646 - Format the output ... Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6 Former-commit-id: 75b6040ff6 [formerly d1d694e1db] [formerly ec0d814aa6 [formerly bdda0e529ccab13fab63e08330b3dcfcef330318]] Former-commit-id: ec0d814aa6 Former-commit-id: 7fbc376ec4	2013-03-12 10:42:13 -05:00
Steve Harris	6fe4b16924	13.3.1-6 baseline ... Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]] Former-commit-id: 566b677d09 Former-commit-id: 4ed21b702b	2013-03-12 08:35:45 -05:00
Roger Ferrel	0deb290c24	Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. ... Code review changes 3. Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]] Former-commit-id: b421c97d86 Former-commit-id: 334f2c4a57	2013-03-11 13:00:44 -05:00
Roger Ferrel	7e5bb824d9	Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. ... Code review changes 3. Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]] Former-commit-id: 9e8472bab6 Former-commit-id: 3684c7efed	2013-03-11 11:16:22 -05:00
David Gillingham	b0665586e1	Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use ... GfeScriptExecutor and GfeScript. Change-Id: If3c789549a071e54f9020433f6221e688c51c44a Former-commit-id: 6b695c6a5e [formerly 4459ecfa78] [formerly 1518c0b53c [formerly a3918b30452a829a8f0cd562021959246bf1144a]] Former-commit-id: 1518c0b53c Former-commit-id: 251da90765	2013-03-07 17:25:14 -06:00
Nate Jensen	21863c5db5	Issue #1773 log publish times ... Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85 Former-commit-id: 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 392feade3f36680edcdb135f7c061be172210c26]] Former-commit-id: 5c59a61cef Former-commit-id: d7902aba68	2013-03-07 16:49:40 -06:00
Dustin Johnson	f808444d6b	Issue #1647 Write out data targeted for the SBN as hidden, then rename ... Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e Former-commit-id: 84642b4f33 [formerly 959e7e39d3] [formerly 2a6edae82b [formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]] Former-commit-id: 2a6edae82b Former-commit-id: e5670ffdb4	2013-03-07 14:39:34 -06:00
David Gillingham	94bccc87a3	Issue #1447: Implement active table fetching, make bug fixes ... to active table sharing from testing. Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d Former-commit-id: 75e82d9fca [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]] Former-commit-id: 0a79d08dd8 Former-commit-id: 5ad72e2a7f	2013-03-06 14:23:00 -06:00
Dustin Johnson	ec0e13e509	Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development ... Former-commit-id: def94b337f [formerly 2262872d2d] [formerly 90b18cc477 [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]] Former-commit-id: 90b18cc477 Former-commit-id: c28f99971c	2013-03-05 15:01:02 -06:00
Dustin Johnson	b88a1eefc1	Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1 ... Former-commit-id: 21abece1f2 [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly 6fd60728a421630cea913d11db02b48f7940554e]] Former-commit-id: 3eddb2d286 Former-commit-id: bfed4555a2	2013-03-05 13:32:04 -06:00
Steve Harris	4a0b8772ec	Merge branch 'omaha_13.3.1' into development ... Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]] Former-commit-id: aa0e9acefd Former-commit-id: b9563da8a8	2013-03-05 12:29:44 -06:00
Steve Harris	b423579e4a	Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 ... Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]] Former-commit-id: 57f42761d7 Former-commit-id: a8e1557c62	2013-03-05 12:27:49 -06:00
Dustin Johnson	8c99bc1f17	Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks ... Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd Former-commit-id: 2bd62ad4b6 [formerly 8107f76d98] [formerly 547780f9a3 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]] Former-commit-id: 547780f9a3 Former-commit-id: 043f122356	2013-03-05 11:39:42 -06:00
Mike Duff	af84910ac6	Issue #1752 - Lock down user admin dialog ... Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb Former-commit-id: 9d99eea617 [formerly 6809cb6f80] [formerly 193cf1e54f [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]] Former-commit-id: 193cf1e54f Former-commit-id: 775a0e3edd	2013-03-05 11:26:54 -06:00
Steve Harris	a240379588	13.3.1-5 baseline ... Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]] Former-commit-id: e26f7eb151 Former-commit-id: a40c9136fe	2013-03-05 10:47:06 -06:00
Steve Harris	3e0614b43a	13.3.1-4 baseline ... Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]] Former-commit-id: 2edca90902 Former-commit-id: 5e55ded3a9	2013-03-05 10:39:59 -06:00
Nate Jensen	70c75b3bcd	Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development ... Former-commit-id: c21079cc06 [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]] Former-commit-id: 8d44b9ea05 Former-commit-id: 910b8c7d25	2013-03-05 09:10:31 -06:00
Dustin Johnson	9932db9b09	Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development ... Former-commit-id: 9a6b647989 [formerly c6137e89e7] [formerly ef632b7bfa [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]] Former-commit-id: ef632b7bfa Former-commit-id: b3f7f77bf6	2013-03-05 08:53:09 -06:00
Richard Peter	a4bf42628a	Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1 ... Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]] Former-commit-id: 784cd2145f Former-commit-id: 180540eb47	2013-03-04 17:48:05 -06:00
Dave Hladky	0f3c9ba997	Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw. ... Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4 Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]] Former-commit-id: fc36146f48 Former-commit-id: 1260b40307	2013-03-04 17:41:11 -06:00
Bryan Kowal	8512836953	Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build ... Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a Former-commit-id: eb4d75de7f [formerly 862f97a19b] [formerly cd08f88c43 [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]] Former-commit-id: cd08f88c43 Former-commit-id: d9c1a92b8e	2013-03-04 15:52:07 -06:00
Dustin Johnson	67d6a4ac99	Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions ... Amend: Use isEmpty() where possible in BandwidthManager. Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec Former-commit-id: 73f884753a [formerly 1161125c84] [formerly 54c3980cba [formerly 28c97849800c624bdaa161f05777703ee2a510ac]] Former-commit-id: 54c3980cba Former-commit-id: c0a1ae396a	2013-03-04 14:55:50 -06:00
Steve Harris	f70ff93d2c	Issue #1744 - Revert "Issue #1744 fix deadlock" ... This reverts commit c5600acf79 [formerly f7ffa22c7c] [formerly f4cccabc07] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]. Former-commit-id: 7ffb42d6e6 [formerly 28391884a7] [formerly fcb48a7280 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]] Former-commit-id: fcb48a7280 Former-commit-id: 9e87721b85	2013-03-04 13:03:19 -06:00
Steve Harris	ee2452f5d3	Issue #1744 - Revert "Issue #1744 actually fix deadlock this time" ... This reverts commit 348f5f0f41 [formerly 33da766f63] [formerly 35007e0460] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]. Former-commit-id: 870972fb90 [formerly 88e633934d] [formerly bba410a330 [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]] Former-commit-id: bba410a330 Former-commit-id: 7d2286aea7	2013-03-04 13:02:32 -06:00
Dustin Johnson	bbba19a26f	Issue #1647 Configure NCF and WFO retrieval tasks ... Change-Id: I038a8c297587982b98ca419311b4e38894947ed4 Former-commit-id: 527ed01fec [formerly de7f387248] [formerly bf9eefe961 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]] Former-commit-id: bf9eefe961 Former-commit-id: 81fcd0bc65	2013-03-04 10:22:16 -06:00
Nate Jensen	75366a9e5a	Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1 ... Former-commit-id: 6bf2eefa2a [formerly a90a2fe857] [formerly 677908868e [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]] Former-commit-id: 677908868e Former-commit-id: 216e3d6ad3	2013-03-01 13:43:50 -06:00
David Gillingham	622700dee9	Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to ... VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to serverConfig.py, project configs. Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510 Former-commit-id: ca81ae4a71 [formerly 50744c1f92] [formerly 9351f33c1c [formerly 1e72fe30d97504f70352a181de35805a197e50f4]] Former-commit-id: 9351f33c1c Former-commit-id: 77a3f33fd5	2013-03-01 11:05:02 -06:00
Ben Steffensmeier	8f4c2f2a39	Issue #1731 Optimize construction of scan resource. ... Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b Former-commit-id: b0870c55f6 [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]] Former-commit-id: 9263ff1846 Former-commit-id: 5a149c5dfa	2013-03-01 11:03:11 -06:00
Nate Jensen	348f5f0f41	Issue #1744 actually fix deadlock this time ... Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb Former-commit-id: 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]] Former-commit-id: 35007e0460 Former-commit-id: 33da766f63	2013-03-01 10:48:03 -06:00
Nate Jensen	c5600acf79	Issue #1744 fix deadlock ... Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f Former-commit-id: e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]] Former-commit-id: f4cccabc07 Former-commit-id: f7ffa22c7c	2013-03-01 10:12:56 -06:00
Bryan Kowal	c4709b1bfb	Issue #1739 - updates for recent CAVE and EDEX feature-refactoring ... - resolved EDEX rpm naming conflict - resolved CAVE junit dependency issue Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc Former-commit-id: f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]] Former-commit-id: 4faf8aefbe Former-commit-id: 497bf33892	2013-02-28 18:09:25 -06:00
Ben Steffensmeier	334af0001b	Issue #1532 Delete uf.common.image and clean up the mess it left behind. ... Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]] Former-commit-id: 2ca86633d6 Former-commit-id: 5068b18c6a	2013-02-28 17:00:56 -06:00
Dustin Johnson	ad9d95ef08	Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development ... Former-commit-id: 64cfd1c51d [formerly 44140d1e0f] [formerly 59212a8241 [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]] Former-commit-id: 59212a8241 Former-commit-id: c7d5feb7d6	2013-02-28 16:24:21 -06:00
Benjamin Phillippe	1314c47acf	Issue #1738: Removed unused project com.raytheon.uf.edex.ebxml ... Change-Id: I87783b45692c84cf851fb5695dae7efa79308655 Former-commit-id: fd5302a619 [formerly e0033900cf] [formerly e01ae283f7 [formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]] Former-commit-id: e01ae283f7 Former-commit-id: 3940bf0a6d	2013-02-28 15:01:53 -06:00
Benjamin Phillippe	aaacef1396	Issue #1673: Moved data delivery specific files from minDB configuration where possible ... Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585 Former-commit-id: b2da92ac85 [formerly 29e2b0fd9e] [formerly d3d5886233 [formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]] Former-commit-id: d3d5886233 Former-commit-id: 3802541578	2013-02-28 14:56:31 -06:00
Max Schenkelberg	fc58e7431a	Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance ... Change-Id: I3f336969a48764785ac148c9d67799e228e66d62 Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]] Former-commit-id: 547c593dec Former-commit-id: 13a4056335	2013-02-27 16:19:58 -06:00
Bryan Kowal	65fb00c3c3	Issue #1662 - wrapper parameters can now be used to specify the order ... of jvm parameters since yajsw does not enforce the ordering or uniqueness of jvm argument parameters Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c Former-commit-id: 5b3478d6c7 [formerly 8bf5e3ffad] [formerly 44349717fb [formerly aae64b29491d8da0001cf1182a357683546d4593]] Former-commit-id: 44349717fb Former-commit-id: 4f7fed259c	2013-02-27 12:46:48 -06:00
Max Schenkelberg	41706c42f2	Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database. ... Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79 Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]] Former-commit-id: 38bba3705f Former-commit-id: 6ebc058df4	2013-02-27 12:26:32 -06:00
Max Schenkelberg	5617dfaa67	Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects ... Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719 Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]] Former-commit-id: e0ba97d547 Former-commit-id: 6b1426dd34	2013-02-27 11:50:38 -06:00
Ron Anderson	541557e0b0	Issue #1597 Code cleanup and logging improvement for GFE Performance metrics ... Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765 Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]] Former-commit-id: f37999b1eb Former-commit-id: 77fbbb6a61	2013-02-26 18:44:51 -06:00
Nate Jensen	652ac25d12	Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development ... Former-commit-id: a020438c99 [formerly 58957d30e5] [formerly 24c94ef55b [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]] Former-commit-id: 24c94ef55b Former-commit-id: b6fc51a18c	2013-02-26 18:00:50 -06:00
Richard Peter	ea806139d3	Issue #1642: Fix QPID Deadlock scenario ... - Address peer review comments Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462 Former-commit-id: 7d4206420c [formerly 9a0177861f] [formerly 5b2650599d [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]] Former-commit-id: 5b2650599d Former-commit-id: 4deaf372a1	2013-02-26 16:01:25 -06:00
Dustin Johnson	94300e0c1d	Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file. ... Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7 Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]] Former-commit-id: 88a9b953b6 Former-commit-id: cc0254ba03	2013-02-26 15:06:04 -06:00
Nate Jensen	b173d34ba9	Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development ... Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]] Former-commit-id: 36d4eff2c6 Former-commit-id: 5c33098315	2013-02-26 13:53:40 -06:00