Ben Steffensmeier
92a64b540d
Issue #2537 point data code cleanup.
...
Former-commit-id: 84dd9b10d642107fba5ca4e3a4a03b84dd9b10d642107fba5ca4e3a4a03b7889c14b35a4e3a4a03b7889c14b3565147cfb78a4e3bf34b862ca7b1df68c386a2aacb29fbe64a8
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
34939645e4
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: 7202b4a232cf6ef77d7808be03d3fa7202b4a232cf6ef77d7808be03d3fabdb0e111ea08be03d3fabdb0e111eada8d574656d8f5e957d3f7b1015dcab1de6a34eb5ee4468108
2013-11-25 12:17:36 -06:00
Nate Jensen
32448a0eb1
Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development
...
Former-commit-id: ea3e6928ac102e82445c00fa91223bea3e6928ac102e82445c00fa91223b38cc0b46f600fa91223b38cc0b46f690f2bffa08b48359ab38be4943ae3d7ffe17a73e441577fb39
2013-11-25 08:34:40 -06:00
Nate Jensen
995990107f
Issue #2359 add ability to ignore messages based on threads, ie ignore
...
shef
Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48
Former-commit-id: 00a1b179a5db842ce2e64a4f50155c00a1b179a5db842ce2e64a4f50155ced1b94ea074a4f50155ced1b94ea07a190895819c836673ac63b0ed49de4493f51eae7a858617b6c
2013-11-22 15:54:22 -06:00
Richard Peter
8ba48221d9
Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
...
Former-commit-id: 551ccf368d4b09affc7cb26e562845551ccf368d4b09affc7cb26e562845be7c2ef08eb26e562845be7c2ef08e26eb16cae1d1201473cdc51cc4bf1791fcef9d3f5bb7b93078
2013-11-22 12:38:05 -06:00
Nate Jensen
7c42c962ed
Merge "Issue #2361 fix style manager's jaxb context" into development
...
Former-commit-id: 591dcce82e38fdf1edcf9de7c7f434591dcce82e38fdf1edcf9de7c7f43449ce4d4be39de7c7f43449ce4d4be3873a26a6a7e049c8aca26ab6de441954c2d1e4203d4b802ead
2013-11-22 10:08:13 -06:00
Nate Jensen
3aab64af24
Issue #2361 fix style manager's jaxb context
...
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68
Former-commit-id: 905879ba902c61b8f4d616329ab06b905879ba902c61b8f4d616329ab06b328991e57716329ab06b328991e577bf3e9e95e624e99ec924ebc3efdf80b6748206e53e24b4827e
2013-11-22 09:15:24 -06:00
Dave Hladky
3f842ea0de
Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
...
Former-commit-id: 162dcb3f42233238d8df04c7e2cffc162dcb3f42233238d8df04c7e2cffca9a397331904c7e2cffca9a3973319ad8acfb5f4cebf79ad44ebd6d5cbe154af53ffb42e254e0208
2013-11-21 14:46:47 -06:00
Nate Jensen
41a4389e68
Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
...
Former-commit-id: 9c2398a7dd32cbfd6150ddb0eaf0ff9c2398a7dd32cbfd6150ddb0eaf0ffd851e6fc97ddb0eaf0ffd851e6fc97a95890a5c8f5a2c7298af60948fc36a5469c1d9ef3bbaa5362
2013-11-21 10:12:11 -06:00
Nate Jensen
c0dc7865fb
Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development
...
Former-commit-id: d4f4868d96ab96dde78a982a664301d4f4868d96ab96dde78a982a664301695262552f982a664301695262552f1627b502ff3d8c69c800198ff37bd7eb0f52cfcace8dd7468d
2013-11-21 08:36:59 -06:00
Nate Jensen
aa5f825c11
Issue #2033 fix plots working with multiple plotModels dirs contributed
...
by different plugins
Change-Id: I2d1ff75c62395ead5154398002610401faa4388d
Former-commit-id: 8a2c4ced39b3028b4f399371c63c418a2c4ced39b3028b4f399371c63c412b6799712d9371c63c412b6799712d68ac9daf6787dc5fb2613e88de72dc19b467c2083a5a066bf3
2013-11-20 17:33:53 -06:00
Brad Gonzales
10773a487c
Issue #2448 Fixed problem that set subscription start time to first cycle time.
...
Fixed problem that set subscription end time to end of day.
Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65
Former-commit-id: c27778c4dfc7959336f593b47ce68bc27778c4dfc7959336f593b47ce68bd2cfc5986a93b47ce68bd2cfc5986ae28ac634ee4a83ff797104d7bff78470f66e5f7a65eefe2846
2013-11-20 15:49:27 -06:00
Greg Armendariz
62b562ea67
Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development
...
Former-commit-id: 04e24a343a6efadcdeed93daf9aff404e24a343a6efadcdeed93daf9aff4bc6c4e2b3293daf9aff4bc6c4e2b3273d62a6589dd31a09cf9ce2ef25207c94e59646b5d5f7c9d44
2013-11-20 12:26:30 -06:00
Brad Gonzales
ef39175130
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 2f375344335576ac6134053f20c70b2f375344335576ac6134053f20c70b95a1914c71053f20c70b95a1914c713aa399c82e3c86e33ea404829d37e26e19c4dab1fc4850d7b2
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
f3fb127460
Issue #2532 Fix grid displays of grids larger than the world.
...
Former-commit-id: f98ccd8c976d878e3361d3ed1ba356f98ccd8c976d878e3361d3ed1ba35641753c40b5d3ed1ba35641753c40b57d6d7650817f441392b807743c43691bc4453a8d6cd151b427
2013-11-20 11:11:03 -06:00
Brian Clements
e7fb4b66f0
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: 42f7214967d35fc591d2fe58826a1e42f7214967d35fc591d2fe58826a1e0f40ae2b99fe58826a1e0f40ae2b996c28068d2110e63616ffb762864f882e4dc2000e6b8a853240
2013-11-20 08:40:12 -06:00
Bryan Kowal
7882f4c770
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: 9ac4bb7691c938d03debff968c98849ac4bb7691c938d03debff968c98840bdb25bf43ff968c98840bdb25bf436fd3e0873bbe5b0b83c9da148196ac91367f57b6ce6f126469
2013-11-19 17:11:36 -06:00
Lee Venable
62b59bc20a
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
...
Former-commit-id: 389f8c5e13b6321334e6f8f0a0e41e389f8c5e13b6321334e6f8f0a0e41ed42c36f365f8f0a0e41ed42c36f3651468a92082c680cc3ea9da5cfb3d8ed3b12f6973fd377ca4cc
2013-11-19 15:12:38 -06:00
Nate Jensen
036fa57da4
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
...
Former-commit-id: 87a792417cf7034f933ec6d6b07e3f87a792417cf7034f933ec6d6b07e3fa610825ef9c6d6b07e3fa610825ef937f4ecfe9e789f050b2704de350ae7ac93e079733cbf29226a
2013-11-19 14:11:01 -06:00
Richard Peter
5f779cd65c
Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
...
Former-commit-id: d7bc1d2975c82e143fe14c9bcf718ad7bc1d2975c82e143fe14c9bcf718ab296fd1d024c9bcf718ab296fd1d0269d4c311b993dbc58a93ba8fae576c8efa7a1512c5143e94e1
2013-11-19 13:18:05 -06:00
Nate Jensen
ca6de6494d
Issue #2361 don't initialize derived parameters on shutdown
...
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: cd44881c0883c28fd04bc90a7d7b3ccd44881c0883c28fd04bc90a7d7b3c5aee685557c90a7d7b3c5aee685557cee86da08948632a81b3e9adf706bacf87d1c3359cbe1a123e
2013-11-19 12:59:10 -06:00
Mike Duff
3d66f30af1
Issue #1531 - Made bandwidth utilization graph resizable.
...
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: 31964ce934c7c20c6ce8ed73a7e55a31964ce934c7c20c6ce8ed73a7e55a71093a685eed73a7e55a71093a685e4d18da04208f9b847eff437df90354fcc96787c3e380af2664
2013-11-19 12:51:06 -06:00
Nate Jensen
ca61ec3ac0
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 275bdc13ed50590a241f6927e960b2275bdc13ed50590a241f6927e960b25885d8027b6927e960b25885d8027b2cc539c3d3aba433c4bbbe3d016f930015c66955dcf7114d6b
2013-11-19 11:25:19 -06:00
Steve Harris
e167208631
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
...
Former-commit-id: ad200adacd920e06b8ffc37908caa8ad200adacd920e06b8ffc37908caa839ab54c912c37908caa839ab54c91269710c8f637b9bc1ae9094a60728ca77d9b628fe99232f6c6c
2013-11-19 10:08:45 -06:00
Mike Duff
7b285740e2
Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
...
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2
Former-commit-id: 7048853fd2f8d5563973c9086472597048853fd2f8d5563973c908647259665d9e7651c908647259665d9e7651fd5a8b283d8221f50e8a5afa90b967d254f954c4dd80768cc2
2013-11-19 08:55:27 -06:00
Nate Jensen
24bb2b914d
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: 629d611145accbd46ad6edf51dffc9629d611145accbd46ad6edf51dffc93d51d80170edf51dffc93d51d8017032737415fc7da95f7b57f07f543cd3a5abd4dad01926ac3647
2013-11-18 12:50:38 -06:00
Nate Jensen
88725bf57b
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: b64c20e99c493cdb287c0dbe79344ab64c20e99c493cdb287c0dbe79344a827b7f5a930dbe79344a827b7f5a93f640ecf96e3de7e3576b6900d4e47fb6fe32de06553a32f5a3
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
86418297ff
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 830a28498b6b6c46afa8105e3e359a830a28498b6b6c46afa8105e3e359ae7a068e595105e3e359ae7a068e5958e2b4353cc51c04680e2e605758e579bd35b793d9fa1dbbfa5
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
c49ae5d321
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 0a3d78555e15ae95075de392185d780a3d78555e15ae95075de392185d789ff1751f4ee392185d789ff1751f4e00088654a00788a82a991875f5669555f26e277f7de35d0111
2013-11-18 11:44:56 -06:00
Nate Jensen
64318dcc88
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 9740e25c5e93e93de7424f47800cae9740e25c5e93e93de7424f47800cae0146ae59df4f47800cae0146ae59dff9cdff25f0d9d0eb7354a238ba2ba3951c1ff2f37e76b097c7
2013-11-18 11:39:12 -06:00
Steve Harris
2d3311aace
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
...
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: f7878c44cb542a0946f20a36987a01f7878c44cb542a0946f20a36987a016d9efac6ef0a36987a016d9efac6ef3b074763ab3f9df61017869b505f80c26818afe687ce579deb
2013-11-15 13:15:25 -06:00
Steve Harris
1c4b82577c
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 117cac310bdc4f3b75941015e180f1117cac310bdc4f3b75941015e180f12f0d53c9b21015e180f12f0d53c9b2b1d82b9c2c156395b85bd97edb20d17127a1e665c4e9fe1c94
2013-11-15 13:05:40 -06:00
Steve Harris
e3de9e104e
14.1.1-9 baseline
...
Former-commit-id: ba884f2a27a32eadf384f8f995b697ba884f2a27a32eadf384f8f995b6975a0a40e67cf8f995b6975a0a40e67c7977f24d77eab5bb11478c136f202dea382798b5ed58bc7f71
2013-11-15 12:47:49 -05:00
Brad Gonzales
d72d725ba7
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
...
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: 437c29c7f4938683ba4daa8fb36fc1437c29c7f4938683ba4daa8fb36fc153d4de12d9aa8fb36fc153d4de12d966a8a300924ec5ee7f74490c95d0104499a8d1de2c7e62ee89
2013-11-15 08:00:47 -06:00
Nate Jensen
6b09f38258
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86757ca42a5fdd99aa3f47462878bf86757ca42a5fdd99aa3f4778b01f61c4dd99aa3f4778b01f61c4d8f4ecc2d7d0d712ec6fd96cdbe761f2c777ff482e81364691
2013-11-14 17:41:24 -06:00
Mike Duff
8f7fe5026c
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 24dc37f03b0d83797a4e414cb1cf6824dc37f03b0d83797a4e414cb1cf6895fda38cc5414cb1cf6895fda38cc5bc96849913a13aa64b657be43c4a520f2626f79f44c4259ccc
2013-11-14 17:30:55 -06:00
Richard Peter
448c6c570e
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 979fa16d04157e73962314b1e924a1979fa16d04157e73962314b1e924a10bb5e2a61e14b1e924a10bb5e2a61e586b11c80d65e8ad1a621a7dd7723b38d2c6564a8247da7774
2013-11-14 17:21:48 -06:00
Brian Clements
241564343a
Issue #2361 fixed ncwf hibernate pickup
...
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: e8c8314abe55682480e1cacdf313c5e8c8314abe55682480e1cacdf313c500490c2db2cacdf313c500490c2db27625e0ef16878a677d18ab24330f23e7c355df521a2b934e97
2013-11-14 17:12:02 -06:00
Mike Duff
0e3d39d133
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 223901d9cf8cc9c1de5947011a70db223901d9cf8cc9c1de5947011a70db47a047758747011a70db47a04775870f848918e844cc3d8776b929b7aa025fdf101af6769e81cd23
2013-11-14 17:07:54 -06:00
Nate Jensen
da110c93cc
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: 2d5752d3d63b11ea8c5bb4bcd14a852d5752d3d63b11ea8c5bb4bcd14a85c2aacfc437b4bcd14a85c2aacfc43731392685aaf0a0287230a8a1e396fe7ec18ba0b1f6abd529f7
2013-11-14 16:34:28 -06:00
Bryan Kowal
14b78c5952
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 8b274264c9782675951bbe78fab1168b274264c9782675951bbe78fab116ce16efc9a1be78fab116ce16efc9a1e810496889512fc1a7c1a6ea71d46f4275b195cebc25cbe7ad
2013-11-14 15:17:28 -06:00
Richard Peter
170aeb49af
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 9bebb21be8800effdc5a8fb79e7b739bebb21be8800effdc5a8fb79e7b73c42f9311188fb79e7b73c42f931118b9da33bceae5dc8e20272b95bcfb31e7d8e5e5602025e073ef
2013-11-14 14:56:59 -06:00
Lee Venable
71f7f7f52f
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: 2f134e6aa3bd81ec8807834c2ac8da2f134e6aa3bd81ec8807834c2ac8daf0ebee3bb3834c2ac8daf0ebee3bb30e326c2a12e9b8ee42c77d04b2e4cead77be1b44194a6760b7
2013-11-14 14:43:18 -06:00
Mike Duff
b4eaa45753
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: c3aee76403f6c4ca2bc087a4b1bec4c3aee76403f6c4ca2bc087a4b1bec4a80964bc7c87a4b1bec4a80964bc7cb27ee6803f48093514a64557a06f42cf077ed7f92b91b4b9ef
2013-11-14 14:40:33 -06:00
Richard Peter
d289419c40
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 6502f1f6952c753c427c79bdd34f4f6502f1f6952c753c427c79bdd34f4f0074b774f079bdd34f4f0074b774f0625647a717b4aac09ff496b4944b41e2a16fd876705339a320
2013-11-14 14:40:23 -06:00
Lee Venable
686d984163
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d42589d14f6086c06f66d431f3c0f4d42589d14f6086c06f66d431f3c0f4bc7f5e556dd431f3c0f4bc7f5e556db93b05165c69934b9b3217fef206fc84de0beae4ab512eaeb1
2013-11-14 14:33:18 -06:00
Richard Peter
24e58ea252
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 7c5e85a2885c5e71a01b4d18c7d4937c5e85a2885c5e71a01b4d18c7d4933f5c590c5f4d18c7d4933f5c590c5fdf3e6735af6af248f2123dc0ad184cace2a710927375a3b961
2013-11-14 13:30:09 -06:00
Nate Jensen
493fa54860
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68a4eb19fc799acda0b9f29517c96d68a4eb19fc799acda0b9f2c5cf68cc459acda0b9f2c5cf68cc45ddcca3463de41f57da67a6be904c69e83a8282096441290b40
2013-11-14 13:29:30 -06:00
Bryan Kowal
fde6569c34
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: 7b9c8a617448cc679bce2029c34f247b9c8a617448cc679bce2029c34f247e35ea310f2029c34f247e35ea310f8a0b0667de4759e48c5ca2261b9ff379045d620bae5e6b3927
2013-11-14 11:57:11 -06:00
Steve Harris
c214af60f6
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 361df767a877ea1782c3473488f5b8361df767a877ea1782c3473488f5b84d25eb11c8473488f5b84d25eb11c8d6ef4ae259a75acc5499ef852ac12539e8f5ecc18307fe3a9f
2013-11-13 23:20:18 -06:00
