Brian.Dyke
0f9fe8301a
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: fe85eb9f703d9a3de6e4fe85eb9f703d9a3de6e401dfe503f501dfe503f529364e2b9fc42733eb39a31d3d702e
2014-09-09 11:44:30 -04:00
Dave Hladky
f165391a1b
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
...
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 534b7848439c3b002990534b7848439c3b00299082fd7189b982fd7189b980d0e2594f9ac2a3adeec1bf96b142
2014-09-02 09:38:21 -05:00
Dave Hladky
7e763a5a22
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: 0ac4de6ad0333bf8b36d0ac4de6ad0333bf8b36dccaaa1cfeaccaaa1cfea93ca9cfe6a7611339cd8cb94f9fc97
2014-05-05 12:15:14 -05:00
Brian.Dyke
f16c305ae4
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: e56bd61ee6278aab6b6fe56bd61ee6278aab6b6f63137ed69c63137ed69cfcf13ae9f78160209e525d31c9ec9a
2014-04-30 12:57:09 -04:00
Richard Peter
a9525d5fd1
Merge changes Iaec4c848,I9a720b8d into development
...
* changes:
Issue #3046 Dupe checker for DD gridded retrievals got broken. Change-Id: Iaec4c848e0a9ef06610153ce03f7c4d45deb870a
Issue #2887 Previously missed check for start/end of sub (isExpired()). Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe
Former-commit-id: 1a8af91fe6d6e335b7661a8af91fe6d6e335b7666800a666176800a66617863ba17ab204f42e6f98bd71587987
2014-04-22 14:28:20 -05:00
Dave Hladky
1b01d0d06d
Issue #3046 Dupe checker for DD gridded retrievals got broken.
...
Change-Id: Iaec4c848e0a9ef06610153ce03f7c4d45deb870a
Former-commit-id: 83e43622fbaa8fdb1e5a83e43622fbaa8fdb1e5ab5a997054bb5a997054bb8ee6fb194f6a6467a9d83f8def438
2014-04-22 11:48:02 -05:00
Nate Jensen
403f4c3195
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 263611f905a37a2afe18263611f905a37a2afe185dfb6527755dfb6527753eddbf452dcdb932cc4d9ef0154104
2014-04-21 17:34:39 -05:00
Dave Hladky
4ce5dfcd92
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d4761fc2fea5191bd735d4761fc2fea5145059e722a45059e722a117a3953afae84d2991e6c83fd0929
2014-04-21 12:26:47 -05:00
Richard Peter
de624d87d3
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: e4be1f24e7dbba727f3de4be1f24e7dbba727f3d17196b5dcd17196b5dcdff87317bd48b279966d1b3fd8e5480
2014-04-14 13:10:11 -05:00
Dave Hladky
fedb08a7eb
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: 2d18b657a81671baaf102d18b657a81671baaf109479219b739479219b7386287bb5dff26450c40d577b6402da
2014-04-02 14:06:25 -05:00
Richard Peter
5fab51d41b
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 7bd6a079130e25ae35c17bd6a079130e25ae35c11c150e6e8b1c150e6e8b50a1b270c5f13c86bc3e9b3f8f9649
2014-02-27 15:18:26 -06:00
Dave Hladky
e030ac65b2
Issue #2469 Fixed default rules implementation
...
Former-commit-id: f9c6a396f01d256bfceef9c6a396f01d256bfcee45413d0db445413d0db4dc97eb7890ff5a5961db8a924bcc2c
2014-02-24 13:06:52 -06:00
Nate Jensen
93a740106d
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: c28085118f75ca70fba6c28085118f75ca70fba6fd43d9e095fd43d9e095c0256ac19e21119894979e09da8bb6
2014-02-10 16:48:29 -06:00
Dave Hladky
59590fdf36
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 7fb7e10cda6172c83afc7fb7e10cda6172c83afc39f97723d639f97723d639f55791032b998409f58e2eb4d255
2014-02-05 14:49:26 -06:00
Steve Harris
e3d1abe909
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: 14ba3b29f4173818550314ba3b29f417381855031aea63a1f61aea63a1f6d9cd003a5a1fd5b2255fec69a2c4f7
2014-01-29 09:41:57 -06:00
Brad Gonzales
7707be3dcd
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: afbaf72617e94023097eafbaf72617e94023097e02f9fd20dc02f9fd20dc71a32928d9a40afbe8acf7c3c8c83d
2014-01-26 20:31:38 -06:00
Lee Venable
4cbf1f4ff4
Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
...
Former-commit-id: e3e3c4feefa49cfc6a74e3e3c4feefa49cfc6a74d9d985eee4d9d985eee4f7dff455d2f387778dcef64efd9712
2014-01-26 19:17:04 -06:00
Dave Hladky
50cf7cbaeb
Issue #2741 Fixed nullpointers in Retrieval and BWM
...
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576
Former-commit-id: efbb7facedc06fd8317cefbb7facedc06fd8317c2e1d02fe212e1d02fe213bf1afdf7064991d004cc735006401
2014-01-26 18:15:09 -06:00
Dave Hladky
362f38157d
Issue #2584 Step one of versioning for DD
...
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: e15b9e2ba9523e100fd0e15b9e2ba9523e100fd0690b5b73cf690b5b73cfc87bd8b764dccf640640fa350b76c9
2014-01-24 14:44:12 -06:00
Steve Harris
69626ab704
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: a465718a0d24ab7cff49a465718a0d24ab7cff4969dc3d835b69dc3d835bb62efa9387252c7ee40a2a967fc9b5
2014-01-21 12:36:54 -06:00
Nate Jensen
2231328f77
Merge "Issue #2678 Fix for multiple threads grabbing a retrieval for processing." into omaha_14.2.1
...
Former-commit-id: 89163b6e3bd682bcee9389163b6e3bd682bcee93b90000df3eb90000df3e193825115d4999c205d7f9fb89dea3
2014-01-15 17:36:11 -06:00
Brad Gonzales
15bcc55822
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
...
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: a2fbcecef63e3fcfa9afa2fbcecef63e3fcfa9af46a2a5f70f46a2a5f70f7e608842b2a1429a3911d2fac3ed56
2014-01-15 17:16:47 -06:00
Dave Hladky
f38d77b307
Issue #2693 Data set information infrastructure for availability offset calculations
...
Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b
Former-commit-id: ef8eb701da129163bf87ef8eb701da129163bf87b64df5806ab64df5806ac05cbb5337682b06c89d83c4b031d6
2014-01-15 17:08:03 -06:00
Dave Hladky
097c4379f0
Issue #2679 Multiple regions for a single collector mapped to single WFS source
...
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: eddceed75608625addbaeddceed75608625addbac57c27c843c57c27c8439d136bb7d86069bb90c7abd5127160
2014-01-15 10:05:20 -06:00
Mike Duff
621bbe5ce6
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
...
Former-commit-id: 30b65a4fe7183ca614df30b65a4fe7183ca614dfa264cb06a1a264cb06a105b65082994620b69f084bd12c488b
2014-01-09 10:29:21 -06:00
Brad Gonzales
44cff7514d
Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
...
thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.
Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617
Former-commit-id: 02910c2a8c07a442059602910c2a8c07a442059612860c79f912860c79f95c85734e02be6f12e9c2a1ee60d16d
2014-01-08 13:37:17 -06:00
Max Schenkelberg
783391423f
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: b3aed9914216046a4ddeb3aed9914216046a4ddecc2080449ccc2080449c0ceaa43902f58795f460789a279475
2014-01-06 17:03:45 -06:00
Mike Duff
0bdb2c42e0
Issue #2636 - Changed delay to offset
...
Former-commit-id: 7fe007d482fa314e5eb67fe007d482fa314e5eb614d997852814d99785289f84482bb5b9b03657c53ffd506801
2013-12-18 15:35:47 -06:00
Mike Duff
aa1032c439
Issue #2636 - Calculate a data set availability delay for each dataset.
...
Former-commit-id: a4036f49a9f04e249e23a4036f49a9f04e249e23fb96084864fb9608486401a48c9f17a72fa7099221bda5926f
2013-12-18 14:52:11 -06:00
Mike Duff
671e43a228
Issue #2625 - fix no data errors in bandwidth utilization graph
...
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime
Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7
Former-commit-id: 4073f048d2d378d9194a4073f048d2d378d9194a34924369073492436907d83734f883bed189cc7b35def598bd
2013-12-11 11:29:38 -06:00
Richard Peter
90e23f5c6b
Issue #2170 : Update Plugin Notification Framework
...
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: 5905c5d08d2085a9cd335905c5d08d2085a9cd33fbda83aeb9fbda83aeb9670e63d0ddf7f9a4e57cff5fbcf012
2013-12-03 11:41:21 -06:00
Dave Hladky
2e254e0208
Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
...
Former-commit-id: 233238d8df04c7e2cffc233238d8df04c7e2cffca9a3973319a9a3973319cebf79ad44ebd6d5cbe154af53ffb4
2013-11-21 14:46:47 -06:00
Dave Hladky
6a9c0a6fa8
Issue #2448 fix scheduling for start/stop of subscription.
...
Former-commit-id: efa18426a1b6f1468b7eefa18426a1b6f1468b7e976eece1b1976eece1b13f5b80e5b3753b36cfeae410d1f44b
2013-11-12 10:58:50 -06:00
Brad Gonzales
837664eea1
Issue #2506 fixed issues with shared distributed ingest.
...
Amend: Updated comment in StoreRetrievedData.
Removed separate messageing to clear BandwidthSubscriptions.
Add fix and test case for SBN deserialization with content following the ending xml tag.
Removed unneeded changes.
Added XmlWMOMessage class.
Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd
Former-commit-id: 80fd8a2ad4fe15e874f780fd8a2ad4fe15e874f7e2fb158757e2fb158757e802b866dd28d8aa5151f017bee2f2
2013-11-08 15:29:05 -06:00
Mike Duff
8a8eb6ba4e
Issue #2450 - Send notifications to Notification Center when subscriptions expire.
...
peer review comments
Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653
Former-commit-id: 2a97da896d00bb57b4812a97da896d00bb57b481f3d07a9185f3d07a9185ecaef4d639cc3846be0b70fbb031a2
2013-11-06 12:23:09 -06:00
Richard Peter
6ba24ad909
Merge "Issue #2469 Refined deletion of adhoc subs." into development
...
Former-commit-id: 6cdbad069a1d852203636cdbad069a1d852203631b7b6f01341b7b6f01344b612a3fa0c27c764c613d812fdeb9
2013-10-29 12:18:55 -05:00
Dave Hladky
627dd4f2db
Issue #2469 Refined deletion of adhoc subs.
...
Former-commit-id: e02868bf2a988bb90523e02868bf2a988bb905236b5543501a6b5543501a05c2ce9bc314ea0393a1c552f899e3
2013-10-24 09:32:41 -05:00
Dave Hladky
ebcd1ef1b8
Issue #2454 Ice model, general ensemble model troubles, null cycle times
...
Former-commit-id: 7659bcd183ba2e1ed3fc7659bcd183ba2e1ed3fc94b5bd79f994b5bd79f9ba0bef4aa35ca57c8edd3cb7e1cfa8
2013-10-22 16:48:54 -05:00
Dave Hladky
33bd8d5cc4
Issue #2460 Product browser display of adhoc subscriptions
...
Change-Id: I9c045b781adb41468d395b67a837c9a862744447
Former-commit-id: 7b6ef7ee9a6076f465497b6ef7ee9a6076f46549477fbd3d59477fbd3d599880c82a36639019eff18a1f070927
2013-10-16 09:06:00 -05:00
Brad Gonzales
feef0a0b55
Issue #1797 Refactored registry Time objects to simplify serialization issues.
...
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: ac3d87c39725710edd9eac3d87c39725710edd9ebc87f2a168bc87f2a1685825fa41d6897fdfc2f632dce367a9
2013-10-11 10:36:53 -05:00
Brad Gonzales
af191df5cf
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
...
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 59f22b866a73e757c28459f22b866a73e757c28461448cc04a61448cc04aaff77aa14855d242b86db24299e301
2013-10-09 17:58:12 -05:00
Dave Hladky
de24cf3b9a
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
...
Former-commit-id: 4867082be1fbe4078bc54867082be1fbe4078bc5ad1bb73c70ad1bb73c70445d836fe6093b41499b7807722694
2013-10-08 10:25:36 -05:00
Brad Gonzales
0313e9c835
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
...
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: dc45b582e121acb75f24dc45b582e121acb75f24a6540d69eaa6540d69eae129c33bee9d981ab2f30f3b5172d4
2013-10-07 17:06:38 -05:00
Richard Peter
54dc5aa82c
Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
...
Former-commit-id: 9d424c212b2e062048e19d424c212b2e062048e1e2c7bb21d7e2c7bb21d780dd506d10e43cd4b3977ef56bfc43
2013-10-07 16:19:11 -05:00
Dave Hladky
ab9c5af250
Issue #1797 Separation of gridded time and abstract time object
...
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 4d4d93fc0ae0ec10d0734d4d93fc0ae0ec10d0731733834e741733834e7421239525ea89c341509c3ba8fd56f7
2013-10-04 10:36:27 -05:00
Nate Jensen
0c92f4eca1
Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
...
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7
Former-commit-id: f529c077c6effa4f4f26f529c077c6effa4f4f263e7dc7782f3e7dc7782fe1c35952c94e6f5afc57593700bd28
2013-10-01 11:25:45 -05:00
Richard Peter
0e76ca1472
Merge "Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests." into development
...
Former-commit-id: 06791d17fc693810a87706791d17fc693810a877626ead2ff7626ead2ff7bc397cb89d026b88afc563b556c295
2013-09-20 10:23:47 -05:00
Brad Gonzales
82c2f1fcc0
Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests.
...
Amend: Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
minor change. Added additional handling to start and end bucket calculation in
InMemoryBandwidthBucketDao. Addtional logging. Removed exception logging of
subscriptions.
Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c
Former-commit-id: b5669581d8c81825ce57b5669581d8c81825ce57d597d7f653d597d7f653e6247e83da6ddb9138293ca693fb89
2013-09-19 12:54:31 -05:00
Dave Hladky
5001c8f42e
Issue #2388 Multiple code jars in path, Nate's logger finds.
...
Former-commit-id: 3787da81a88e5d3d97423787da81a88e5d3d9742f184d2ba9cf184d2ba9c4360a23a0741ba230de0b98d037cdd
2013-09-19 10:59:07 -05:00
Dave Hladky
898e63c10e
Merge branch 'dd_pre_release_2.1' into development
...
Former-commit-id: e4e75ec268f1fc14ce90e4e75ec268f1fc14ce90329a40852c329a40852c2f3f1d88b4b0b51dbcb61348b91f27
2013-09-11 15:07:23 -05:00
