xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4313 commits 31 branches 40 tags 3.8 GiB
Commit graph

4313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
951c1ff2f3 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development 
Former-commit-id: 4f47800cae [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
 2013-11-18 11:39:12 -06:00
Steve Harris
c26818afe6 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: 0a36987a01 [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
 2013-11-15 13:15:25 -06:00
Steve Harris
7127a1e665 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: 1015e180f1 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: d97edb20d1
 2013-11-15 13:05:40 -06:00
Steve Harris
ea382798b5 14.1.1-9 baseline 
Former-commit-id: f8f995b697 [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
 2013-11-15 12:47:49 -05:00
Brad Gonzales
4499a8d1de 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: aa8fb36fc1 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]
Former-commit-id: 53d4de12d9
Former-commit-id: 490c95d010
 2013-11-15 08:00:47 -06:00
Nate Jensen
f2c777ff48 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: dd99aa3f47 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
 2013-11-14 17:41:24 -06:00
Mike Duff
0f2626f79f Issue #2548 - fix malformed comment 
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 414cb1cf68 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]
Former-commit-id: 95fda38cc5
Former-commit-id: 7be43c4a52
 2013-11-14 17:30:55 -06:00
Richard Peter
38d2c6564a Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development 
Former-commit-id: 14b1e924a1 [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
 2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52 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: cacdf313c5 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
 2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6 Issue #2548 - Add a subscription type slot for uniqueness. 
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 47011a70db [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
 2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development 
Former-commit-id: b4bcd14a85 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]
Former-commit-id: c2aacfc437
Former-commit-id: a8a1e396fe
 2013-11-14 16:34:28 -06:00
Richard Peter
e7d8e5e560 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 8fb79e7b73 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
 2013-11-14 14:56:59 -06:00
Lee Venable
ad77be1b44 Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development 
Former-commit-id: 834c2ac8da [formerly 834c2ac8da [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 7d04b2e4ce
 2013-11-14 14:43:18 -06:00
Mike Duff
cf077ed7f9 Issue #2538 - Check for existing adhoc queries in registry. 
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: 87a4b1bec4 [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]
Former-commit-id: a80964bc7c
Former-commit-id: 4557a06f42
 2013-11-14 14:40:33 -06:00
Richard Peter
e2a16fd876 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: 79bdd34f4f [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
 2013-11-14 14:40:23 -06:00
Lee Venable
84de0beae4 Merge "Issue #2540 - pure python module merge implementation" into development 
Former-commit-id: d431f3c0f4 [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]
Former-commit-id: bc7f5e556d
Former-commit-id: 17fef206fc
 2013-11-14 14:33:18 -06:00
Richard Peter
ace2a71092 Merge "Issue #2505 removed recco from deployment" into development 
Former-commit-id: 4d18c7d493 [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 3dc0ad184c
 2013-11-14 13:30:09 -06:00
Nate Jensen
e83a828209 Issue #2361 remove StyleManager's use of SerializationUtil and 
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: 9acda0b9f2 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: c5cf68cc45
Former-commit-id: a6be904c69
 2013-11-14 13:29:30 -06:00
Bryan Kowal
79045d620b 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: 2029c34f24 [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]
Former-commit-id: 7e35ea310f
Former-commit-id: a2261b9ff3
 2013-11-14 11:57:11 -06:00
Steve Harris
39e8f5ecc1 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 473488f5b8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]
Former-commit-id: 4d25eb11c8
Former-commit-id: ef852ac125
 2013-11-13 23:20:18 -06:00
Richard Peter
58c8106da8 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development 
Former-commit-id: 2f3eee1439 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]
Former-commit-id: e88f5777a7
Former-commit-id: 64afe42e74
 2013-11-13 16:43:26 -06:00
Greg Armendariz
977e0fab0e Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1 
Former-commit-id: 83ac36721b [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]
Former-commit-id: 3f6281fdbe
Former-commit-id: ce0a05242f
 2013-11-13 15:30:55 -06:00
Brian Clements
d94f44d406 Issue #2505 removed recco from deployment 
added update script to drop recco from db


Former-commit-id: 95f1621d3e [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 49c8bd5ee9
 2013-11-13 13:45:44 -06:00
Bryan Kowal
1a905e8a3c Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 0544b66f4e
Former-commit-id: 01735ca0c4
 2013-11-13 13:16:55 -06:00
Steve Harris
1fdc64c7e7 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: 0a37219d2a [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]
Former-commit-id: 2e7a594d51
Former-commit-id: bc45f3668b
 2013-11-13 11:34:17 -06:00
Steve Harris
42ece4fb6a 14.1.1-8 baseline 
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
 2013-11-13 12:32:17 -05:00
Benjamin Phillippe
64a37e7672 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query 
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 5cd030f096 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]
Former-commit-id: 1c46226a11
Former-commit-id: fe7c6886c4
 2013-11-13 10:52:07 -06:00
Brian Clements
ac221125f4 Issue #1314 fixed WFS output problem found when testing KeyLocker 
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: dfd88151e6 [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]
Former-commit-id: 37f4f41d2d
Former-commit-id: ef2acc6562
 2013-11-13 10:04:13 -06:00
Nate Jensen
b7085b0ed4 Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development 
Former-commit-id: 85923b0f7f [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]
Former-commit-id: c0ed705daf
Former-commit-id: a62e415724
 2013-11-13 09:01:09 -06:00
Brian Clements
b511453153 Issue #2546 added fix for TAFs that contain legacy valid times 
added unit test


Former-commit-id: 191ffc6e63 [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]
Former-commit-id: df1542a66c
Former-commit-id: 0e5d3e9e69
 2013-11-13 08:07:29 -06:00
Bryan Kowal
a575f41589 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1 
Former-commit-id: a51231058a [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: e3639da703
Former-commit-id: 48d5d8c3a1
 2013-11-12 19:57:25 -06:00
Bryan Kowal
8867114ff8 Issue #2297 - update build scripts to complete the full delta build 
Former-commit-id: 7cac007ef1 [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]
Former-commit-id: d76033ff3d
Former-commit-id: 084d772588
 2013-11-12 17:43:10 -06:00
Nate Jensen
633faf692b Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development 
Former-commit-id: accfefae6d [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]
Former-commit-id: f0b386b632
Former-commit-id: 80227c4750
 2013-11-12 16:55:31 -06:00
Nate Jensen
983afa0eea Merge "Issue #2361 better logging of viz spring initialization of bundles" into development 
Former-commit-id: 8cf1b752e0 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]
Former-commit-id: b1d376e238
Former-commit-id: 645e816d5d
 2013-11-12 16:48:32 -06:00
Dave Hladky
86363574b3 Issue #2542 Jetty upgraded 
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 643a150777 [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]
Former-commit-id: e3a259182c
Former-commit-id: 53866e481a
 2013-11-12 14:55:41 -06:00
Nate Jensen
a53cf1a079 Merge "Issue #2539 removed java 7 specific code from exception subclass" into development 
Former-commit-id: 5e02427d6e [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]
Former-commit-id: c60228c854
Former-commit-id: a1315f1072
 2013-11-12 14:41:34 -06:00
Greg Armendariz
3852935abf Issue #2512 - Remove dead code 
Former-commit-id: 4f4d59aa52 [formerly 4f4d59aa52 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]
Former-commit-id: 70c9a36826
Former-commit-id: fbcb810ab3
 2013-11-12 14:20:21 -06:00
Richard Peter
0cf51fce74 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development 
Former-commit-id: 9af1de07d4 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]
Former-commit-id: f12839a9e5
Former-commit-id: c8ff79a7f5
 2013-11-12 13:47:04 -06:00
Nate Jensen
5c7be238a0 Issue #2361 better logging of viz spring initialization of bundles 
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 692ea76d75 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]
Former-commit-id: a4ece1d116
Former-commit-id: 2e86520b53
 2013-11-12 13:02:49 -06:00
Nate Jensen
f618186c69 Merge "Issue #2448 fix scheduling for start/stop of subscription." into development 
Former-commit-id: 88af1ddfcb [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]
Former-commit-id: 64aa00bad6
Former-commit-id: 39679b0608
 2013-11-12 12:46:38 -06:00
Brad Gonzales
bad9b3242a 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: 8f70fb1d0c [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]
Former-commit-id: aea0e847aa
Former-commit-id: 866a11a9f0
 2013-11-12 12:42:16 -06:00
Brian Clements
94a9ea2ff0 Issue #2539 removed java 7 specific code from exception subclass 
Former-commit-id: 8b0e85f82c [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]
Former-commit-id: 4050eb5f3e
Former-commit-id: ba12c7467d
 2013-11-12 12:41:50 -06:00
Nate Jensen
1f4af0c06a Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development 
Former-commit-id: 3f86a3735e [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]
Former-commit-id: eed4c8604b
Former-commit-id: 18d790a423
 2013-11-12 12:13:58 -06:00
Richard Peter
c60b0849b3 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development 
Former-commit-id: 8afc87e570 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]
Former-commit-id: 61fc3eba44
Former-commit-id: b8b01f6305
 2013-11-12 11:18:56 -06:00
Richard Peter
c8ef435295 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 306bd6fae1 [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
 2013-11-12 11:11:36 -06:00
Nate Jensen
66ff41e961 Issue #2361 static lazy initialization of SubscriptionOverlapService's 
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: 1ee5d91af2 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 368d73449e
 2013-11-12 11:03:51 -06:00
Dave Hladky
e410d1f44b Issue #2448 fix scheduling for start/stop of subscription. 
Former-commit-id: b6f1468b7e [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]
Former-commit-id: 976eece1b1
Former-commit-id: 753b36cfea
 2013-11-12 10:58:50 -06:00
Nate Jensen
f1b25ed227 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development 
Former-commit-id: bca5793e3d [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]
Former-commit-id: da8a858727
Former-commit-id: d758e5ab57
 2013-11-12 10:55:40 -06:00
Brad Gonzales
1b084e4efa Issue #2506 Added subscription notification service to bandwidth manager. 
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: cd221e5263 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]
Former-commit-id: ff5edde334
Former-commit-id: efdc64b7b3
 2013-11-12 10:50:06 -06:00
Nate Jensen
f55aa5aea0 Merge "Issue #2377 fixed error handling in QPF config" into development 
Former-commit-id: 3054868350 [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 68866c322c
 2013-11-12 10:39:51 -06:00