Commit graph

4034 commits

Author SHA1 Message Date
Richard Peter
5ee9b1ce9d Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: bfc87a0607 [formerly fe45d2b7e6] [formerly bfc87a0607 [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]
Former-commit-id: b6ffed0066
Former-commit-id: 5baa99e9c9 [formerly 4765eaefad]
Former-commit-id: f1d5148c49
2013-10-29 12:15:35 -05:00
Bryan Kowal
fba7e48970 Issue #2268 - fix CAVE installation error
Former-commit-id: 203c5d7288 [formerly 7772aca092] [formerly 203c5d7288 [formerly 7772aca092] [formerly 5bc115c56c [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]
Former-commit-id: 5bc115c56c
Former-commit-id: a89499f399 [formerly a34d7b254f]
Former-commit-id: 893a2cf334
2013-10-29 11:44:48 -05:00
Ben Steffensmeier
f7f75c86da Issue #2489 Fix SfcObs NPE.
Former-commit-id: 59d8afc639 [formerly f9ee49fac5] [formerly 59d8afc639 [formerly f9ee49fac5] [formerly ddf506ceac [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]
Former-commit-id: ddf506ceac
Former-commit-id: 32427d8b3d [formerly ca5a125829]
Former-commit-id: bab495ab35
2013-10-29 10:59:36 -05:00
Bryan Kowal
819cb0bcb7 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: df575b7be1 [formerly a6d7822698] [formerly df575b7be1 [formerly a6d7822698] [formerly cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 27d2e33769 [formerly cc0f6832c9]
Former-commit-id: 2615ad7324
2013-10-28 14:50:28 -05:00
Nate Jensen
b2072949f9 Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: 4cd0b3fed7 [formerly ac65672cb2] [formerly 4cd0b3fed7 [formerly ac65672cb2] [formerly f62f7dc851 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 9dc4378fc4 [formerly 87917f3548]
Former-commit-id: 98118ccced
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
c0ba7d0acc Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 4e86bb8e5f [formerly 65522e83c9] [formerly 4e86bb8e5f [formerly 65522e83c9] [formerly 5b439696df [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: 54a39977f5 [formerly 6866344496]
Former-commit-id: e3e621660f
2013-10-28 13:16:23 -05:00
Ron Anderson
643624f1a9 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: dd3ef2844c [formerly fa5b6dce02] [formerly dd3ef2844c [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 3575496955 [formerly dda2eb89c1]
Former-commit-id: 1daa0f8649
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
47d3fb8249 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f [formerly 1f33a1997e]
Former-commit-id: 0c3bb6ef3e
2013-10-28 10:14:08 -05:00
Nate Jensen
5d8c27a87a Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: b8d194e4cd [formerly ca2e057635] [formerly b8d194e4cd [formerly ca2e057635] [formerly cda57ce742 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: 4938d287fe [formerly fad56e0c5f]
Former-commit-id: b48d5d53c3
2013-10-28 09:31:28 -05:00
Nate Jensen
91cb555abd Issue #2359 fix for extra long messages
Former-commit-id: e7763c0864 [formerly 665e224c75] [formerly e7763c0864 [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: 3d10b22fe1 [formerly 8ad85c297c]
Former-commit-id: e96edbb80a
2013-10-28 09:15:20 -05:00
Nate Jensen
8feeb6be16 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 13eafc05c2 [formerly 4b19d287ea] [formerly 13eafc05c2 [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: 8aa02150c4 [formerly aa0e2ca80a]
Former-commit-id: 2741cb4348
2013-10-28 09:07:04 -05:00
Nate Jensen
80e84760aa Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: f98764cfb6 [formerly 5840b34e67] [formerly f98764cfb6 [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: e46c285eed [formerly 68a8dbe064]
Former-commit-id: 6dcd593f32
2013-10-28 09:05:01 -05:00
Nate Jensen
f9f35fbc77 Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 8ca435c9e7 [formerly 6dd1198fdf] [formerly 8ca435c9e7 [formerly 6dd1198fdf] [formerly 70421fd756 [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]]
Former-commit-id: 70421fd756
Former-commit-id: 9e64c8d7a2 [formerly 1ed235de97]
Former-commit-id: b4ba3c1aa4
2013-10-28 09:04:12 -05:00
Ben Steffensmeier
ddd58aa99c Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 3b68ce8d72 [formerly 2a83b45f93] [formerly 3b68ce8d72 [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 4eea088717 [formerly fbdcadb456]
Former-commit-id: 5645da0b45
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
5e0fc1b98a Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: a629f974a5 [formerly 88ad284e71] [formerly a629f974a5 [formerly 88ad284e71] [formerly 3150d960e8 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: 237d947086 [formerly 4311d8ea4c]
Former-commit-id: 39768a50c1
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
7f38aac48c Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: f34bfc1e5b [formerly c14cc609a8] [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: ce9653ab15 [formerly a06bdc56d6]
Former-commit-id: 3955ac729f
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
0fd0580788 Issue #2491 fix d2d xy bundles.
Former-commit-id: 9922b11f75 [formerly 5b6e32f47e] [formerly 9922b11f75 [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: 8248ea2b3b [formerly ddf45e1cf4]
Former-commit-id: 7272087374
2013-10-25 14:46:43 -05:00
Nate Jensen
8cb574a419 Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 540d0ee576 [formerly 5f457fbad6] [formerly 540d0ee576 [formerly 5f457fbad6] [formerly 68150f49ef [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]
Former-commit-id: 68150f49ef
Former-commit-id: 403ba0f9cb [formerly 2002f94568]
Former-commit-id: c2f1e3f838
2013-10-24 20:06:08 -05:00
Nate Jensen
213478f84b Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 3a453d5442 [formerly 002005139f] [formerly 3a453d5442 [formerly 002005139f] [formerly 5a99163569 [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: b511177fa1 [formerly cf63b37257]
Former-commit-id: c4161d09ba
2013-10-24 20:02:18 -05:00
Nate Jensen
9dc852ba9c Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: 408ea200fc [formerly b17fc59a5a] [formerly 408ea200fc [formerly b17fc59a5a] [formerly b1244552e4 [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 3a1856b168 [formerly 803c9a8217]
Former-commit-id: 9b582b0d83
2013-10-24 19:52:13 -05:00
Nate Jensen
f73752af0e Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: b2cdbd6fc5 [formerly 5d96feb00e] [formerly b2cdbd6fc5 [formerly 5d96feb00e] [formerly 298114500c [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]
Former-commit-id: 298114500c
Former-commit-id: 39e7b0fd95 [formerly fc1898234d]
Former-commit-id: 797002f959
2013-10-24 19:51:49 -05:00
Dave Hladky
7f8ff13d44 Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 577e2b84e9 [formerly 3c33f6e5ea] [formerly 577e2b84e9 [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: db33e9cafa [formerly 2b5ffeab74]
Former-commit-id: 916f035c87
2013-10-24 13:52:45 -05:00
Jonathan Sanchez
61af6aaa1d Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: c289f77965 [formerly ec2f7c8ce7] [formerly c289f77965 [formerly ec2f7c8ce7] [formerly cb5ac5c835 [formerly 0946721292171cc2d14b173a60c273731b73af12]]]
Former-commit-id: cb5ac5c835
Former-commit-id: d8e14ca6e9 [formerly 2420f1a231]
Former-commit-id: 4586b85ef6
2013-10-24 12:22:02 -05:00
Ben Steffensmeier
d1d057ae57 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: a935ffadf7 [formerly bfc3faf08f] [formerly a935ffadf7 [formerly bfc3faf08f] [formerly fa0a0619bc [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 09a3276d51 [formerly d927e6b2d7]
Former-commit-id: 5971562d1a
2013-10-24 11:28:06 -05:00
Brad Gonzales
3ad2195c50 Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.

Amend: Added excludes to sbnSimulator modes.
       Updated FileUtil.listPaths to close the stream and use a LinkedList.
       Added additional logging to SbnSimulator.

Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af

Former-commit-id: 5145ec3dfe [formerly bd7e5d8940] [formerly 5145ec3dfe [formerly bd7e5d8940] [formerly f7a635ebef [formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]
Former-commit-id: f7a635ebef
Former-commit-id: 88a20aeae1 [formerly c36cbae577]
Former-commit-id: 9215426279
2013-10-23 18:44:41 -05:00
Richard Peter
25e3b7e114 Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: 32131b3b27 [formerly 2220ce9aa3] [formerly 32131b3b27 [formerly 2220ce9aa3] [formerly b5072746fe [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]
Former-commit-id: b5072746fe
Former-commit-id: feb1655ae3 [formerly f71d65d257]
Former-commit-id: ea9b5e6c4a
2013-10-23 16:57:28 -05:00
Richard Peter
e6751dfe4d Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 859dd8272d [formerly 5fc3956337] [formerly 859dd8272d [formerly 5fc3956337] [formerly 1750224476 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]]
Former-commit-id: 1750224476
Former-commit-id: bf7a5b48b1 [formerly 383a774fad]
Former-commit-id: 7c9a2c614c
2013-10-23 16:53:22 -05:00
Richard Peter
6a8ab9eacc Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 2e7836431e [formerly 7ec76c0634] [formerly 2e7836431e [formerly 7ec76c0634] [formerly 6b4c675600 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]
Former-commit-id: 6b4c675600
Former-commit-id: 3843947a17 [formerly 109474aec7]
Former-commit-id: 58cb0638dc
2013-10-23 16:41:57 -05:00
Richard Peter
8ebc9c6523 Merge "Issue #1538 Reworked registry database connection strategy" into development
Former-commit-id: b6541dfb40 [formerly 58d4da8db6] [formerly b6541dfb40 [formerly 58d4da8db6] [formerly ffb7a6e6ae [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]]
Former-commit-id: ffb7a6e6ae
Former-commit-id: a8f9146990 [formerly 1b74f629f7]
Former-commit-id: f7c66ea100
2013-10-23 16:33:29 -05:00
Ron Anderson
ee845f3634 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 680ba97826 [formerly 002bb6ab89] [formerly 680ba97826 [formerly 002bb6ab89] [formerly cc28fca175 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 0d9df14596 [formerly 20fcbd322e]
Former-commit-id: b9c5d96961
2013-10-23 16:02:40 -05:00
Nate Jensen
cf8083e0d1 Merge "Issue #2361 remove dependencies on mesowest and delete dead grichardson code" into development
Former-commit-id: 12b3aea7bf [formerly 334e1d4da7] [formerly 12b3aea7bf [formerly 334e1d4da7] [formerly dc11d7be9e [formerly 1c3b27e873403cd9a78d3ef38948ba41511cbebd]]]
Former-commit-id: dc11d7be9e
Former-commit-id: b09296f045 [formerly 5e4985d6fa]
Former-commit-id: e20d761603
2013-10-23 15:58:44 -05:00
Bryan Kowal
55f25948a4 Issue #2476 - recompiled Jep for Windows
Former-commit-id: 243ffb4b93 [formerly 0e1c5b51ba] [formerly 243ffb4b93 [formerly 0e1c5b51ba] [formerly 79f2f2694f [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]]
Former-commit-id: 79f2f2694f
Former-commit-id: 752061e05f [formerly 1737a11d53]
Former-commit-id: 214f089bfb
2013-10-23 15:12:42 -05:00
Bryan Kowal
b1d11306ae Issue #2476 - recompiled jep for Linux
Former-commit-id: 701b9de382 [formerly a3cfae3510] [formerly 701b9de382 [formerly a3cfae3510] [formerly 9fe5429068 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]]
Former-commit-id: 9fe5429068
Former-commit-id: 855abcd044 [formerly 46f5db6284]
Former-commit-id: 12e7425440
2013-10-23 15:12:42 -05:00
Nate Jensen
41dab56b49 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: 65d7d4dac9 [formerly 477c64c8bd] [formerly 65d7d4dac9 [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: 2419a99ac7 [formerly 1adac8829f]
Former-commit-id: c9cdcc056a
2013-10-23 14:52:29 -05:00
Brad Gonzales
f71babda9a Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: df1e60b078 [formerly 60d7a13afd] [formerly df1e60b078 [formerly 60d7a13afd] [formerly e3883dba15 [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]
Former-commit-id: e3883dba15
Former-commit-id: 086dfe9ebc [formerly b8cd1d5446]
Former-commit-id: 5b5bb8975d
2013-10-23 14:13:03 -05:00
Nate Jensen
4b379c871a Issue #2359 better email addresses
Former-commit-id: fd55a9792d [formerly a609706b5e] [formerly fd55a9792d [formerly a609706b5e] [formerly b56c67a8fb [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]]
Former-commit-id: b56c67a8fb
Former-commit-id: e56a3b633d [formerly cf4f6c3d4b]
Former-commit-id: e36fef6dba
2013-10-23 14:02:31 -05:00
Nate Jensen
987fb48cf3 Merge "Issue #2361 once again try to remove more common ISerializableObject" into development
Former-commit-id: d3a21bc431 [formerly 4c7bee41a7] [formerly d3a21bc431 [formerly 4c7bee41a7] [formerly 65962ae15a [formerly 5ec014c2fccf9b5e417738310b50beccd70ee62d]]]
Former-commit-id: 65962ae15a
Former-commit-id: 56be5c199e [formerly 6bd779e459]
Former-commit-id: 1b0be1ed64
2013-10-23 14:00:28 -05:00
Benjamin Phillippe
be2d06cefc Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: 9f03f26ad6 [formerly 22c8ed7add] [formerly 9f03f26ad6 [formerly 22c8ed7add] [formerly 3a3fb00f78 [formerly b3ef0276414f5009f79e55e3b08c58daeeb56e26]]]
Former-commit-id: 3a3fb00f78
Former-commit-id: 7eadbf5175 [formerly c07e7fac10]
Former-commit-id: 5538c94240
2013-10-23 13:03:25 -05:00
Nate Jensen
fd99fccc73 Issue #2361 once again try to remove more common ISerializableObject
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09

Former-commit-id: 46edfda4da [formerly 40d8e42b87] [formerly 46edfda4da [formerly 40d8e42b87] [formerly 4b80a31f22 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]]]
Former-commit-id: 4b80a31f22
Former-commit-id: 1742f9a3fa [formerly f782d20320]
Former-commit-id: 4cc5c62aef
2013-10-23 11:40:13 -05:00
Benjamin Phillippe
88d6b81fe2 Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: 0400391864 [formerly cd55f3e328] [formerly 0400391864 [formerly cd55f3e328] [formerly 68eeb03630 [formerly 18737abc6781a353b831d9c012cc293f60731f89]]]
Former-commit-id: 68eeb03630
Former-commit-id: c20c08dc73 [formerly 84d5c28331]
Former-commit-id: 37098e59f7
2013-10-23 11:05:38 -05:00
Benjamin Phillippe
720b125c30 Issue #1538 Reworked registry database connection strategy
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: 16cf053ba9 [formerly b192fd81c4] [formerly 16cf053ba9 [formerly b192fd81c4] [formerly ef0d0e2393 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]]
Former-commit-id: ef0d0e2393
Former-commit-id: e2383dc624 [formerly 5aa04a9a43]
Former-commit-id: bbd690038f
2013-10-23 10:48:40 -05:00
Richard Peter
dedb3cb902 Merge "Issue #1682 Delta script for ebxml registry query changes" into development
Former-commit-id: 6fb995ca9f [formerly d371192e2b] [formerly 6fb995ca9f [formerly d371192e2b] [formerly 598c254561 [formerly 07df23bc04234340a3c2386c3279195c45cdb427]]]
Former-commit-id: 598c254561
Former-commit-id: 796f929418 [formerly e08fa014d0]
Former-commit-id: 7aa870767f
2013-10-23 10:02:12 -05:00
Benjamin Phillippe
32113dbdbc Issue #1682 Delta script for ebxml registry query changes
Change-Id: I84a3007a3c23697c333e5862d8fd4a4aba9f23a2

Former-commit-id: d0c3d9575a [formerly 0c56d5e859] [formerly d0c3d9575a [formerly 0c56d5e859] [formerly 02dc390b98 [formerly 9b6a0ce7404017dcd29cd0a14f0dba5d30e480b1]]]
Former-commit-id: 02dc390b98
Former-commit-id: 15a92382c2 [formerly 99b1cee644]
Former-commit-id: 3eec43afdb
2013-10-23 10:01:34 -05:00
Richard Peter
19445c191f Merge "Issue #1538 Made http timeouts configurable on registry service http connections" into development
Former-commit-id: d7036ceeb4 [formerly 4776e83979] [formerly d7036ceeb4 [formerly 4776e83979] [formerly 9cf347fe7f [formerly a12bc6ddd2fd4388fc541015926e2e51aa40e090]]]
Former-commit-id: 9cf347fe7f
Former-commit-id: 1724640945 [formerly 7e171abbb8]
Former-commit-id: bf84025536
2013-10-23 10:01:00 -05:00
Benjamin Phillippe
75acddc7b7 Issue #1538 Made http timeouts configurable on registry service http connections
Change-Id: I2f91b713475027a3e514d0fd98605fc83bdac447

Former-commit-id: 71168e4791 [formerly dd57ea1cd4] [formerly 71168e4791 [formerly dd57ea1cd4] [formerly 2c39b78ded [formerly cf9f51098a2778f747984940a764ab5089afd231]]]
Former-commit-id: 2c39b78ded
Former-commit-id: d9fbb6737e [formerly 16b21fe41c]
Former-commit-id: db84abd517
2013-10-23 09:57:52 -05:00
Lee Venable
ce35925120 Issue #2483 - Fixed image memory leak.
Former-commit-id: 73caae724c [formerly a2f75e547d] [formerly 73caae724c [formerly a2f75e547d] [formerly 3d6547d644 [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]
Former-commit-id: 3d6547d644
Former-commit-id: 25c7bd679f [formerly 74603afd97]
Former-commit-id: 8f1956da81
2013-10-23 08:26:49 -05:00
Dave Hladky
ebcd1ef1b8 Issue #2454 Ice model, general ensemble model troubles, null cycle times
Former-commit-id: 7659bcd183 [formerly ba2e1ed3fc] [formerly 7659bcd183 [formerly ba2e1ed3fc] [formerly 94b5bd79f9 [formerly 5fd82b153d87228037e594c838dc3c445c8874aa]]]
Former-commit-id: 94b5bd79f9
Former-commit-id: ba0bef4aa3 [formerly 5ca57c8edd]
Former-commit-id: 3cb7e1cfa8
2013-10-22 16:48:54 -05:00
Nate Jensen
3726903ddc Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: 0e5ea7744e [formerly ced02a508a] [formerly 0e5ea7744e [formerly ced02a508a] [formerly 88ca2a78de [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]
Former-commit-id: 88ca2a78de
Former-commit-id: 250f553532 [formerly 173e28b9d9]
Former-commit-id: 00307deae3
2013-10-22 13:05:22 -05:00
Nate Jensen
4a1d2cfad5 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: e65d392677 [formerly 5e2ebbaad8] [formerly e65d392677 [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]
Former-commit-id: 938e4a3073
Former-commit-id: 621eaab03a [formerly d1ff15485c]
Former-commit-id: 4f4af22201
2013-10-22 12:42:41 -05:00
Slav Korolev
3324392dad Issue #2455. Fixed error from test.
Former-commit-id: f64d667715 [formerly 359c281b1e] [formerly f64d667715 [formerly 359c281b1e] [formerly 981544290e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]
Former-commit-id: 981544290e
Former-commit-id: d0aa6f6f26 [formerly 263244b606]
Former-commit-id: 0ea9efa8dc
2013-10-22 12:34:34 -04:00