Dave Hladky
766d9f09a7
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 7d244313a50ac4de6ad0333bf8b36d7d244313a50ac4de6ad0333bf8b36dccaaa1cfea333bf8b36dccaaa1cfead9243205e493ca9cfe6a7611339cd8cb94f9fc977e763a5a22
2014-05-05 12:15:14 -05:00
Brian.Dyke
f4856aae4d
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 2e687fbfb7e56bd61ee6278aab6b6f2e687fbfb7e56bd61ee6278aab6b6f63137ed69c278aab6b6f63137ed69c624606c9ddfcf13ae9f78160209e525d31c9ec9af16c305ae4
2014-04-30 12:57:09 -04:00
Dave Hladky
15f50d3f36
Issue #2887 Previously missed check for start/end of sub (isExpired()).
...
Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe
Former-commit-id: a3d2d3d6c8f51497a3ce5bc1f147c9a3d2d3d6c8f51497a3ce5bc1f147c90d785464345bc1f147c90d785464348e538ffe3c8745a877c5b1ec77c64e909646ec3c6e961f7010
2014-04-21 15:30:45 -05:00
Dave Hladky
13137a0a9a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 729563537991bd735d4761fc2fea51729563537991bd735d4761fc2fea5145059e722a61fc2fea5145059e722a883febe498117a3953afae84d2991e6c83fd09294ce5dfcd92
2014-04-21 12:26:47 -05:00
Richard Peter
0fc963bbc8
Merge "Issue #2810 Added comparator to BandwidthAllocations Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85" into development
...
Former-commit-id: 4ba272b0717acdf727ce545203a8334ba272b0717acdf727ce545203a8337093d6ff0e545203a8337093d6ff0ee7cc3044e7b3dd0a933cdc429091daecc9eb526821b77c1310
2014-04-04 14:39:46 -05:00
Dave Hladky
3f342820ee
Issue #2810 Added comparator to BandwidthAllocations
...
Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85
Former-commit-id: ed6412446c49d2b31fab78bae7e97bed6412446c49d2b31fab78bae7e97bfb642de10978bae7e97bfb642de10955f4e46b9303722fb48f5c866b074f4e2bb04e5d3c534127ce
2014-04-03 14:05:42 -05:00
Richard Peter
f73d41c0b4
Merge "Issue #2789 Implement Version transformations Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c" into development
...
Former-commit-id: 440d0b0cf22323545c096c3a453491440d0b0cf22323545c096c3a4534917c879fe6f06c3a4534917c879fe6f0aa23c1b4b296089b8c786251f08212fcbcd2f5d5accc6a7e19
2014-04-03 13:08:05 -05:00
Dave Hladky
ea0aa8d72b
Issue #2789 Implement Version transformations
...
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: cb3d8690d74fab01e109e80005a1c4cb3d8690d74fab01e109e80005a1c45064730dfae80005a1c45064730dfa06d1b231307e34763fcdae13afc1c6f692a99403c49b22c94d
2014-04-03 09:44:14 -05:00
Dave Hladky
50c77e0a2f
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: ec2c3b4af22d18b657a81671baaf10ec2c3b4af22d18b657a81671baaf109479219b731671baaf109479219b73b908654a8386287bb5dff26450c40d577b6402dafedb08a7eb
2014-04-02 14:06:25 -05:00
Ron Anderson
9accd00e1f
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: d752e068c7ab69d3e3181c727465eed752e068c7ab69d3e3181c727465eebcfaf40ebf1c727465eebcfaf40ebfcbd408ce4e06b0b5b6844b2a3886284ffc16ce5398e22f6e59
2014-03-13 11:11:53 -05:00
Benjamin Phillippe
eb7e448d08
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: ea31c5b370d339e232f4ed050996a2ea31c5b370d339e232f4ed050996a25483d6d7aeed050996a25483d6d7ae71d5fbda33603e43305415a5e7c4a4090dbe3918719b90e1e7
2014-03-03 10:57:16 -06:00
Lee Venable
80ef62e8fd
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: f81d0d88b8e9226e71400cf2dba731f81d0d88b8e9226e71400cf2dba7314e7c3c0cbe0cf2dba7314e7c3c0cbeab57d3efe746dbd967a56fc9dcb3b128b0809a1c0bd01db3cc
2014-02-18 12:19:41 -06:00
Mike Duff
08bd755af0
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: c125b9d04433f81d882289bd047283c125b9d04433f81d882289bd047283911789b91089bd047283911789b910cddd263edc42e6591bc85f9d913c6dd277c1caf12467a11a7e
2014-02-18 12:05:26 -06:00
Dave Hladky
2708c918de
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: c8711269fa24a4fab6035c11dd09bbc8711269fa24a4fab6035c11dd09bb7ee101d7c75c11dd09bb7ee101d7c7b0849517aa012619f05f78d41d01bb9ccf06c4f451b644bf0c
2014-02-18 09:14:38 -06:00
Richard Peter
1956e06576
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 8ad3c5857b82fc0a2ed364f0cabaef8ad3c5857b82fc0a2ed364f0cabaef36d3d21b5764f0cabaef36d3d21b575a7e7af23bc3c1205848c965993d1715c2f761be8471e5dd46
2014-02-05 18:20:36 -06:00
Mike Duff
6f00321a11
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 3691146e34bafe19bbd5101c08818d3691146e34bafe19bbd5101c08818d6b01c2957f101c08818d6b01c2957f229efa7c5b9edf5912186a2f75e8d5bb43ec00b1377beb33a8
2014-02-05 16:08:01 -06:00
Dave Hladky
36bc408bc2
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 1c8f6fb36d7fb7e10cda6172c83afc1c8f6fb36d7fb7e10cda6172c83afc39f97723d66172c83afc39f97723d614f2c99e4639f55791032b998409f58e2eb4d25559590fdf36
2014-02-05 14:49:26 -06:00
Mike Duff
451406c3c5
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: 75faeae7e42ca26aaa39eee642ac9b75faeae7e42ca26aaa39eee642ac9beb46191ba9eee642ac9beb46191ba9b7b0bdbfdd38aeb23274684390e599e8dea0d0dcbd52f67e0c
2014-02-04 14:01:29 -06:00
Mike Duff
80bc52c4e7
Issue #2636 - Changed subscription code to use gmt calendar.
...
Former-commit-id: 6be7c7f19d4440c27ff66e01cdb78e6be7c7f19d4440c27ff66e01cdb78e1caacacfe36e01cdb78e1caacacfe372add752c4a76507e04ff4da152d871f4cc8681d3495a67c27
2014-01-28 11:09:33 -06:00
Brad Gonzales
7e84f1a451
Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
...
Amend: update from peer review.
Change-Id: I1986de99319fdecd21a94579c499266b048d382a
Former-commit-id: 208d18e28eafbaf72617e94023097e208d18e28eafbaf72617e94023097e02f9fd20dce94023097e02f9fd20dc07eac8a84d71a32928d9a40afbe8acf7c3c8c83d7707be3dcd
2014-01-26 20:31:38 -06:00
Lee Venable
b1d34fdb1e
Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
...
Former-commit-id: ae3cf2d2311ea52fdbcd6c9a4394b7ae3cf2d2311ea52fdbcd6c9a4394b7805f63c0ec6c9a4394b7805f63c0ec0d484d1268d94aebebecf43d763ec66c64419546a33a533acc
2014-01-26 17:01:17 -06:00
Dave Hladky
a7e3c8728a
Issue #2584 Step one of versioning for DD
...
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: c8af2af177e15b9e2ba9523e100fd0c8af2af177e15b9e2ba9523e100fd0690b5b73cf523e100fd0690b5b73cf415f804868c87bd8b764dccf640640fa350b76c9362f38157d
2014-01-24 14:44:12 -06:00
Brad Gonzales
37df5d341b
Issue #2709 Fix for recurring subscription active period end.
...
Change-Id: I05778e95fe703c7301205ad14909c843d720fd2e
Former-commit-id: ff34546eb12fb15c41bae1e7f1c250ff34546eb12fb15c41bae1e7f1c250fa10363d40e1e7f1c250fa10363d40e8f345a7b320e042483e661f0c98f129c7f0d81418368092bf
2014-01-24 08:38:42 -06:00
Mike Duff
0672db6081
Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
...
Former-commit-id: 4038246f939bd8e84b9fbdf6a002f64038246f939bd8e84b9fbdf6a002f69a2d2af4a9bdf6a002f69a2d2af4a97e3e76e9dae929abf7d79112366cae8844bbbe2de8d473b9c6
2014-01-20 17:44:02 -06:00
Dave Hladky
940945ebcf
Issue #2398 Fixed scheduling outside of active period/ expired window
...
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107
Former-commit-id: 8e3f8b878c470ce5269eae45dee8618e3f8b878c470ce5269eae45dee861dfc0d6d9f5ae45dee861dfc0d6d9f537a34e450e02d357c803986e0d7dbe305697650e0c8901b01d
2014-01-20 17:35:44 -06:00
Mike Duff
67bab78c2f
Issue #2459 - Remove unscheduled status from UI
...
Former-commit-id: e6efbf56630cfa9ee36c93cb80cfc7e6efbf56630cfa9ee36c93cb80cfc725d1d39fc293cb80cfc725d1d39fc25097ed2ad7a492ec6a4da04430e334dcb5b4a11145bef29f75
2014-01-17 15:34:48 -06:00
Mike Duff
f3fec350fb
Issue #2459 - Add unscheduled as a slot attribute
...
Former-commit-id: 1078c7dbec292ef2c0680f655c96e31078c7dbec292ef2c0680f655c96e347069bd7a40f655c96e347069bd7a439e90e653e7fe25d02f0fe012ebbd1cdd0245e24e6dfabc034
2014-01-16 10:06:17 -06:00
Nate Jensen
9081058ca2
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
...
Former-commit-id: 26ce19331e9028260386ae1012971326ce19331e9028260386ae101297139d529b3b21ae101297139d529b3b219f4360fdda98e1bf91941be41d69c63d6d9118ea86b9311ed4
2014-01-15 17:36:30 -06:00
Brad Gonzales
69f2e8a94a
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
...
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: dd09d84c73a2fbcecef63e3fcfa9afdd09d84c73a2fbcecef63e3fcfa9af46a2a5f70f3e3fcfa9af46a2a5f70f26c902d9577e608842b2a1429a3911d2fac3ed5615bcc55822
2014-01-15 17:16:47 -06:00
Mike Duff
5ea95dbca9
Issue #2459 - Refactor the subscription status
...
Former-commit-id: 43810aa5f5d03c012a54f94593867e43810aa5f5d03c012a54f94593867e245d76358ef94593867e245d76358ec5f28e0f379a45b95db6d96a9d29373c0634b1e8c8f7edbcad
2014-01-15 09:21:30 -06:00
Brad Gonzales
d5d66b8731
Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
...
RecurringSubscription. Add environment configuration files to unit tests setup. Changed the
devRegistry debug port to the same port as registry.
Amend: Updates from peer review.
Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a
Former-commit-id: 2c0c6fbcc78eeb3dc4124537513df72c0c6fbcc78eeb3dc4124537513df7343a2495e54537513df7343a2495e56868d8d12df57529be9b4049af96308b362ee404b8c7be1225
2014-01-10 16:37:09 -06:00
Mike Duff
f5d13adc34
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
...
Former-commit-id: 99d7e5145630b65a4fe7183ca614df99d7e5145630b65a4fe7183ca614dfa264cb06a1183ca614dfa264cb06a1f6d58f761505b65082994620b69f084bd12c488b621bbe5ce6
2014-01-09 10:29:21 -06:00
Mike Duff
ee3b1eb497
Issue #2636 - Changed delay to offset
...
Former-commit-id: e1d7f8c0fc7fe007d482fa314e5eb6e1d7f8c0fc7fe007d482fa314e5eb614d9978528fa314e5eb614d9978528a3abca76e79f84482bb5b9b03657c53ffd5068010bdb2c42e0
2013-12-18 15:35:47 -06:00
Mike Duff
c2a9e2c4f4
Issue #2636 - Calculate a data set availability delay for each dataset.
...
Former-commit-id: 45a03a53f2a4036f49a9f04e249e2345a03a53f2a4036f49a9f04e249e23fb96084864f04e249e23fb960848646c88d8936801a48c9f17a72fa7099221bda5926faa1032c439
2013-12-18 14:52:11 -06:00
Benjamin Phillippe
05697b7d21
Issue #1829 Refactored EBXML registry objects
...
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d
Former-commit-id: da4f658b7aed890ce9d90b0e70b667da4f658b7aed890ce9d90b0e70b667ed77440c280b0e70b667ed77440c282165a9059a7051d101407ed61955363d7c4732418c1e55db1f
2013-12-05 10:20:24 -06:00
Dave Hladky
4d222b0a16
Issue #1736 Add registry bandwidth tracking
...
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: bce11dec146607e5fe30483ec5d22fbce11dec146607e5fe30483ec5d22f593f24023d483ec5d22f593f24023d36f601253e09aa3a6c624060748634dc5f5f3c8725745e2782
2013-12-04 11:58:49 -06:00
Benjamin Phillippe
aaf5dfbd62
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 67f6ee0999f4144fca06212bbeb37967f6ee0999f4144fca06212bbeb37931b53f4ad9212bbeb37931b53f4ad9615b5ce605495f70a5cf2fa17aab7f878f9fe3eab39ef6ca2b
2013-11-27 12:07:59 -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
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
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
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
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
Brad Gonzales
0aa3b220bf
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: 50fb18601c62e4cafa278f70fb1d0c50fb18601c62e4cafa278f70fb1d0caea0e847aa8f70fb1d0caea0e847aa725742f4ec7747d901f7866a11a9f0bad9b3242aa626b240ce
2013-11-12 12:42:16 -06:00
Benjamin Phillippe
676b343d51
Issue #1678 Added support for stored query publishing and invocation on the registry
...
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f
Former-commit-id: 8f30c4f79a0abf405014b84235a80a8f30c4f79a0abf405014b84235a80ab5db1f38c3b84235a80ab5db1f38c3e5b40456adbd3e4778c01a492a564b093b5eda6fb7b5787b5b
2013-11-07 18:36:46 -06:00
Benjamin Phillippe
32725adb31
Issue #1538 Moved data delivery specific web services out of registry plugins
...
-- Added registry federation admin page
-- Made registry service clients non-static
Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad
Former-commit-id: 311fa3237798b56cf02aa7e53870fb311fa3237798b56cf02aa7e53870fbd8de923f8ba7e53870fbd8de923f8be9b49b288f7cb19682c1221d197c0173c53ed846c3f684e7fb
2013-11-01 09:20:00 -05:00
Dave Hladky
128a7c3854
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
...
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: f79ba58a3a0eba787d3e4227f3a59ff79ba58a3a0eba787d3e4227f3a59f91619628134227f3a59f9161962813ea17726866ba31efaf03d55d68fe5a85003bf022e30272c56b
2013-11-01 08:23:16 -05:00
Mike Duff
e48beadbc6
Issue #2292 - refactor and move overlap/duplicate checks to edex.
...
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899c1bd170f8af123fa11f5fbcf271899c1bd170f8af123fa11f53fc811102ef123fa11f53fc811102ece2afdf1b3b0c54d7c174da064846126ca1b4d725ff3fe2791
2013-10-31 09:22:50 -05:00
Nate Jensen
f76f5e9257
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
...
Former-commit-id: 9e65845da013eafc05c24b19d287ea9e65845da013eafc05c24b19d287eae4aa2b8a944b19d287eae4aa2b8a94fa1bd6b2a48aa02150c4aa0e2ca80a2741cb43488feeb6be16
2013-10-28 09:07:04 -05:00
Dave Hladky
dbdd2b4b2a
Issue #2484 Added originatingSite to id for Subscription registry objects.
...
Former-commit-id: 68002da957577e2b84e93c33f6e5ea68002da957577e2b84e93c33f6e5ea36d7c609143c33f6e5ea36d7c60914e44f20606edb33e9cafa2b5ffeab74916f035c877f8ff13d44
2013-10-24 13:52:45 -05:00
Dave Hladky
d296520f09
Issue #2454 Ice model, general ensemble model troubles, null cycle times
...
Former-commit-id: 589f99beb87659bcd183ba2e1ed3fc589f99beb87659bcd183ba2e1ed3fc94b5bd79f9ba2e1ed3fc94b5bd79f99f5d35cb7fba0bef4aa35ca57c8edd3cb7e1cfa8ebcd1ef1b8
2013-10-22 16:48:54 -05:00
