Richard Peter
7ceb1bb9ab
Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
edexOsgi/com.raytheon.uf.common.archive/build.properties
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java
Former-commit-id: 53258be797
[formerly 53258be797
[formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]
Former-commit-id: 582f38bdd4
Former-commit-id: 1757da59ee
2013-06-30 23:46:32 -05:00
Brad Gonzales
c4daf04c32
Issue #1965 added edex archive to the build.edex build.xml.
...
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b
Former-commit-id: ba661b9e39
[formerly ba661b9e39
[formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]
Former-commit-id: add108398a
Former-commit-id: 5c9ce05ce3
2013-06-28 13:25:46 -05:00
Steve Harris
c183e08922
13.5.1-4 baseline
...
Former-commit-id: 70e4ff30a6
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Brad Gonzales
f51c74e2d4
Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
...
Amend: Added archive feature to the viz product build.
Added archive feature to the viz developer product.
Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07
Former-commit-id: c28d1e5d4d
[formerly c28d1e5d4d
[formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]
Former-commit-id: f4bb78381c
Former-commit-id: d842d8d9d0
2013-06-27 17:40:07 -05:00
Brad Gonzales
d047e6a137
Issue #1965 added File filtering by file date extension in archive purge.
...
Amend: updated purge cron time to once every hour.
moved archive.purge.cron to cron.properties.
removed purge code from DataArchiver.
added back isHoursToKeep in DataArchiver.
updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
updates from peer review.
updated test cases to work with Roger's refactoring.
fixes for ArchiveConfigManager createArchive.
clean up of ArchiveConfigManager purgeFile.
Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519
Former-commit-id: 137c66539e
[formerly 137c66539e
[formerly 2094b7f9fde97873c759da217498bcf62254a287]]
Former-commit-id: 276f05233f
Former-commit-id: 4f54596904
2013-06-27 11:46:44 -05:00
Dave Hladky
2a57eea47f
Issue #2096 First steps to getting CAVE to display MADIS data
...
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9
Former-commit-id: f5d3a5f012
[formerly f5d3a5f012
[formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]
Former-commit-id: ee50b5c7be
Former-commit-id: 2b90920d8f
2013-06-27 11:07:27 -05:00
Roger Ferrel
bec6928ea9
Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
...
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3
Former-commit-id: ee409c0819
[formerly ee409c0819
[formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]
Former-commit-id: f66681f62b
Former-commit-id: 45dcfe3ad8
2013-06-27 07:51:56 -05:00
Dave Hladky
ecf2849566
Issue #2146 Deleted uneeded jars from crawl4j plugin
...
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01
Former-commit-id: d92e039e72
[formerly d92e039e72
[formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]
Former-commit-id: d298749486
Former-commit-id: 00ed2353ad
2013-06-26 14:59:22 -05:00
Richard Peter
575405b14e
Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
...
Former-commit-id: 3a3dc3d208
[formerly 3a3dc3d208
[formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]
Former-commit-id: 67d052307c
Former-commit-id: 208b01a167
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
0d2f556144
Issue #1869 Fix plot sampling.
...
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b
Former-commit-id: 8c14a34f46
[formerly 8c14a34f46
[formerly 42b779a7695635414764b3c491ba24c0d70983b5]]
Former-commit-id: 6db28c32a5
Former-commit-id: f26a72afe9
2013-06-26 13:24:13 -05:00
Nate Jensen
b4c6a79741
Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
...
Former-commit-id: a60afe6640
[formerly a60afe6640
[formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]
Former-commit-id: 10baafed63
Former-commit-id: 214fd8689c
2013-06-26 11:14:03 -05:00
Richard Peter
46ef5c884a
Merge "Issue #2144 Switched hibernate to Post GIS config" into development
...
Former-commit-id: 8a9feffa82
[formerly 8a9feffa82
[formerly d59f39da96caaf163ceb5bc7055b0412e118875b]]
Former-commit-id: ad91edf3de
Former-commit-id: dedc9ecda0
2013-06-25 18:22:09 -05:00
Jonathan Sanchez
c4ce4831c2
Issue #2139 Run async job for loading maps in warngen.
...
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a
Former-commit-id: 81aad09d06
[formerly 81aad09d06
[formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]
Former-commit-id: e4c0188c14
Former-commit-id: 47505aa013
2013-06-25 15:29:08 -05:00
Roger Ferrel
b681d07346
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 2cfff5c563
[formerly 2cfff5c563
[formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]
Former-commit-id: c10f5c8d65
Former-commit-id: ee52f0281c
2013-06-25 13:44:30 -05:00
Dave Hladky
c038109d5d
Issue #2144 Switched hibernate to Post GIS config
...
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725
Former-commit-id: 5aee30a473
[formerly 5aee30a473
[formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]
Former-commit-id: fe5cde7afd
Former-commit-id: 671b6ee566
2013-06-25 13:31:37 -05:00
Dustin Johnson
c2ed1495ad
Issue #2106 Fix transactional semantics
...
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: fac7d3a9d9
[formerly fac7d3a9d9
[formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: 69c09e530f
Former-commit-id: f67d02a394
2013-06-25 08:33:55 -05:00
Richard Peter
8f49eea08f
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: d262c02612
[formerly d262c02612
[formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: b007d4a302
Former-commit-id: af1099b3fb
2013-06-24 18:51:56 -05:00
Richard Peter
4b582fef50
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: 744eb64856
[formerly 744eb64856
[formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]
Former-commit-id: 37645245e5
Former-commit-id: a7594f8c93
2013-06-24 18:36:15 -05:00
Ron Anderson
740542cd56
Issue #2122 Fix the build
...
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a
Former-commit-id: f75554f1f7
[formerly f75554f1f7
[formerly bf3b00be422d690aa9646462556607335ef85fc0]]
Former-commit-id: f06a8baf2d
Former-commit-id: 6740c9e40f
2013-06-24 18:03:52 -05:00
Richard Peter
f55e67c3ad
Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
...
Former-commit-id: 5f85aefff6
[formerly 5f85aefff6
[formerly ed31841e537d54ead391013919a94c879afd6f77]]
Former-commit-id: a19a946a24
Former-commit-id: 8481dd6bce
2013-06-24 17:20:10 -05:00
Max Schenkelberg
20caab72f9
Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
...
Amend: Added fix for issue 2103
Amend: Added software history
Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b
Former-commit-id: 47b55981c8
[formerly 47b55981c8
[formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]
Former-commit-id: 2f03c38ca0
Former-commit-id: bc4ebb4f08
2013-06-24 15:48:37 -05:00
Bryan Kowal
6cff1f63bb
Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
...
Former-commit-id: 5b85217ca2
[formerly 5b85217ca2
[formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]
Former-commit-id: cd2af684ca
Former-commit-id: 7ebee00dc9
2013-06-24 14:08:47 -05:00
Nate Jensen
3b22e752aa
Merge "Issue #2122 Cleaned up dependencies for satellite" into development
...
Former-commit-id: 6541a89bf5
[formerly 6541a89bf5
[formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]
Former-commit-id: 0479cea2e6
Former-commit-id: a2c5c2a1a3
2013-06-24 09:12:12 -05:00
Nate Jensen
1c9458d595
Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development
...
Former-commit-id: b1bd29e784
[formerly b1bd29e784
[formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]
Former-commit-id: 69eec45f13
Former-commit-id: a44073cce6
2013-06-24 09:10:01 -05:00
Steve Harris
1e939939b5
13.5.1-3 baseline
...
Former-commit-id: 63803c1424
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
2013-06-24 09:29:43 -04:00
Mike Duff
a8a4393c82
Issue #2132 - Fix drawing lat/long box for madis point data
...
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96
Former-commit-id: f685e73bd2
[formerly f685e73bd2
[formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]
Former-commit-id: 14bd577f6c
Former-commit-id: 65faaadc7c
2013-06-21 14:59:03 -05:00
Dave Hladky
fe71c9133d
Issue #2129 mkdirs call added to create directories at instantiation.
...
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d
Former-commit-id: 26398f6fb7
[formerly 26398f6fb7
[formerly b8ae6705e92e8816385cb2fce87175bbb4687d6d]]
Former-commit-id: 0544a0cf88
Former-commit-id: 57caa68867
2013-06-21 11:13:04 -05:00
David Gillingham
3a78e38ae5
Issue #2111 : Prevent possible NullPointerException in GridCanvas's mouse
...
handler when attempting to display context menu.
Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee
Former-commit-id: 6b696c9e6a
[formerly 6b696c9e6a
[formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]
Former-commit-id: 4f6c293a7e
Former-commit-id: 8b7a998bbf
2013-06-20 16:31:43 -05:00
Dustin Johnson
6987235067
Issue #2106 Fix setting of data size on gridded subscriptions
...
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925
Former-commit-id: b486e5f2fe
[formerly b486e5f2fe
[formerly c9138bb9d844ed7c38df420734c2723321ad450b]]
Former-commit-id: 554b43807e
Former-commit-id: eaa3e47877
2013-06-20 16:00:08 -05:00
Dustin Johnson
87e4d9269d
Issue #1802 Fix event processing in regards to transaction commits/rollbacks
...
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22
Former-commit-id: ecae75ecd8
[formerly ecae75ecd8
[formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]
Former-commit-id: a331cd2958
Former-commit-id: d2faa3b600
2013-06-20 13:53:04 -05:00
Dave Hladky
806fb4f3db
Issue #2120 Fixed SSL connection problem
...
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c
Former-commit-id: ffc9dc1ac9
[formerly ffc9dc1ac9
[formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]
Former-commit-id: 47d18e42ab
Former-commit-id: 5d37e710d7
2013-06-20 12:51:30 -05:00
Ben Steffensmeier
be0c2f2a6f
Issue #2128 ensure setDataURI sets the dataURI.
...
Former-commit-id: f02b073cc8
[formerly f02b073cc8
[formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]
Former-commit-id: 68bb07f5fa
Former-commit-id: 69f1d9d812
2013-06-20 11:11:37 -05:00
Lee Venable
ae73cbab32
Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1
...
Former-commit-id: 377bc28f63
[formerly 377bc28f63
[formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]
Former-commit-id: 8b92b564d5
Former-commit-id: 9b564bef6a
2013-06-20 09:22:36 -05:00
Matt Nash
dc54f30149
Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests
...
Change-Id: I8ede8f8149be84e58d10d30066e08d3c80d543e5
Former-commit-id: 54a114d789
[formerly 54a114d789
[formerly 95ec6db9b349890a29bd13860193ada39b43c294]]
Former-commit-id: 99e9194921
Former-commit-id: 4fa399c710
2013-06-20 06:59:05 -05:00
Nate Jensen
65157cd1de
Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1
...
Former-commit-id: b7b2602271
[formerly b7b2602271
[formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]
Former-commit-id: ba5c49fa61
Former-commit-id: 622e1298d2
2013-06-19 17:45:41 -05:00
Max Schenkelberg
11f0bc708f
Issue #2122 Cleaned up dependencies for satellite
...
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e
Former-commit-id: 262d72b786
[formerly 262d72b786
[formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]
Former-commit-id: c57439e5ef
Former-commit-id: 959639d118
2013-06-19 17:24:30 -05:00
Richard Peter
1a6d67bd16
Merge "Issue #2125 clean up AnnotationBinder warning" into development
...
Former-commit-id: 479ae9bf21
[formerly 479ae9bf21
[formerly bb65ab2f617ce671bfdc7231956956e881fc6deb]]
Former-commit-id: 7eb4d39903
Former-commit-id: 8c26fe8be2
2013-06-19 16:41:39 -05:00
Richard Peter
71e960607d
Merge "Issue #1966 Check for modifications on close." into omaha_13.5.1
...
Former-commit-id: 36ed7d5d2b
[formerly 36ed7d5d2b
[formerly 3c19aebeb235e8bf24e286007b27d5e8263731c6]]
Former-commit-id: 1fd38812ec
Former-commit-id: fd3cdedf8e
2013-06-19 16:41:27 -05:00
Ben Steffensmeier
fa9d23798e
Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective.
...
Former-commit-id: 0e6f3ff5e6
[formerly 0e6f3ff5e6
[formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]
Former-commit-id: 6de9e86090
Former-commit-id: accd308f8b
2013-06-19 16:35:41 -05:00
Roger Ferrel
c549efa0c1
Issue #2119 Added check when no selected lid.
...
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac
Former-commit-id: dc5059f06b
[formerly dc5059f06b
[formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]
Former-commit-id: e7dc1184b1
Former-commit-id: 440ea0fc25
2013-06-19 16:25:01 -05:00
Nate Jensen
aa5cac2799
Issue #2125 clean up AnnotationBinder warning
...
Change-Id: I5cd92a9d82527c0b2f3dd68e0f79c10c2db98b0f
Former-commit-id: 3f1fc8b367
[formerly 3f1fc8b367
[formerly 8c1e060a42576ce0b5d9048f8e93ae07ef03e73b]]
Former-commit-id: 2bcaafac83
Former-commit-id: bdda4a11d5
2013-06-19 15:56:32 -05:00
Bryan Kowal
0185fa1b02
Issue #1956 - dependency updates for EDEX dpa
...
- relocated certain localization files based on the plugins that used them; when more than one plugin used the localization it was
moved to the plugin that was a dependency of the other plugin that used it
- added the edex and common datadelivery service plugins to the core feature since there spring files are included in the dpa mode
Change-Id: Id1582abaa3e89a86289ce9ae615ac0997f60582d
Former-commit-id: 8f479a2536
[formerly 8f479a2536
[formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]
Former-commit-id: a877e9589c
Former-commit-id: 09c48506e7
2013-06-19 13:43:16 -05:00
Roger Ferrel
b9244cb214
Issue #2110 RequestRouter.route(req) changed the class returned.
...
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f
Former-commit-id: f3a1c68d40
[formerly f3a1c68d40
[formerly cda40b66492abf6a0064d28484b03e05500f7bed]]
Former-commit-id: 4443dfd11a
Former-commit-id: 7c7b1264d1
2013-06-19 11:25:55 -05:00
Roger Ferrel
301fdd43ae
Issue #1966 Check for modifications on close.
...
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83
Former-commit-id: 784a56f2ce
[formerly 784a56f2ce
[formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]
Former-commit-id: 67362de877
Former-commit-id: 259a66ac85
2013-06-19 11:09:44 -05:00
Dustin Johnson
34313c9d20
Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development
...
Former-commit-id: de7d8fc970
[formerly de7d8fc970
[formerly 39973de8b36242d0a979e484e77822a68db289ed]]
Former-commit-id: 4993a17306
Former-commit-id: 235b75021b
2013-06-19 10:37:02 -05:00
Nate Jensen
73c0514c3d
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
...
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: 81fc4fa753
[formerly 81fc4fa753
[formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]
Former-commit-id: c4283b0336
Former-commit-id: a9c077f0a9
2013-06-19 10:16:06 -05:00
Dustin Johnson
aa2c2516ee
Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
...
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576
Former-commit-id: 6f8246262b
[formerly 6f8246262b
[formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]
Former-commit-id: 314331c9a4
Former-commit-id: dab308afc8
2013-06-19 08:56:43 -05:00
Dave Hladky
039c7f6dec
Issue #2120 Updates to retrieval to fix time processing
...
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b
Former-commit-id: f2177d48f6
[formerly f2177d48f6
[formerly 5686d945729c28407e16625548050937158f9c65]]
Former-commit-id: 6110467a30
Former-commit-id: e466f536d0
2013-06-19 08:35:50 -05:00
Bryan Kowal
224944e8bb
Issue #1956 - spring changes for minimal EDEX DPA install.
...
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904
Former-commit-id: 2896039f9f
[formerly 2896039f9f
[formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]
Former-commit-id: a3736d3b87
Former-commit-id: 5495e6e77f
2013-06-18 17:21:21 -05:00
Dustin Johnson
1e95673d90
Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
...
Former-commit-id: 8d139f3325
[formerly 8d139f3325
[formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]
Former-commit-id: 2e1d54e686
Former-commit-id: 728f54c6ea
2013-06-18 13:55:51 -05:00