Commit graph

2267 commits

Author SHA1 Message Date
David Gillingham
6217915221 Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 54511a95db [formerly c5c7e31983 [formerly 497aa460d6119f13bf6870b78454237252b68752]]]]
Former-commit-id: 54511a95db
Former-commit-id: 5a14c2c503 [formerly 040dc9075c] [formerly b6aa9ae88e412bb4092b5bc723955201a2eb5e12 [formerly 6188c8bd40]]
Former-commit-id: 27ea1ac82b9914961dd76c70ee612b121337a3f6 [formerly 9dd92e0fd2]
Former-commit-id: ebfc7f22b2
2013-03-26 12:14:22 -05:00
Richard Peter
89f11bd069 Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 7a35c6472a [formerly 260b159f1b] [formerly 0f15b13b86] [formerly 7a35c6472a [formerly 260b159f1b] [formerly 0f15b13b86] [formerly f062e43f8c [formerly 0f15b13b86 [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]]]
Former-commit-id: f062e43f8c
Former-commit-id: 8a91d33cea [formerly 88b147cb1b] [formerly d84c175057b2d9f99132aa7bb9b7233c8c016172 [formerly 02ecf31edb]]
Former-commit-id: dade1a38a0831b2363e5b7cca9075c2acd51c633 [formerly 323d0f69a6]
Former-commit-id: 4af3d6dafe
2013-03-26 10:53:50 -05:00
Steve Harris
81a8604bfe Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
2013-03-26 10:12:34 -05:00
Mike Duff
868a6c3ddf Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 1314976753 [formerly b366778df0] [formerly 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]]
Former-commit-id: 428a7b37d44680f4388cb79776fa256ccd460279 [formerly efec4d0365]
Former-commit-id: 493014d466
2013-03-26 09:19:39 -05:00
Ron Anderson
da92cce2d9 Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 73678261b6 [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]]
Former-commit-id: 73678261b6
Former-commit-id: 8bf2b31f8e [formerly e4c4862938] [formerly 32aeedbcfe97a863092752841be20ed818c5c741 [formerly 7e6b601a09]]
Former-commit-id: 8fd6002117f54d2deed45eecdba91b1e6e8a577e [formerly 60c1c27225]
Former-commit-id: 3750bb7dba
2013-03-25 17:53:46 -05:00
Lee Venable
4cd2fa74a5 Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 05b4c2f913 [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]]
Former-commit-id: 05b4c2f913
Former-commit-id: a6a431a20b [formerly b1ce5603a0] [formerly 29ce5b07df9351fe829c6342326979e9ac25ddc4 [formerly d73b44fa67]]
Former-commit-id: 4ec69f806699f23ac3bd572dc3ac75b1672038bb [formerly b329abb111]
Former-commit-id: e03985901f
2013-03-25 17:20:25 -05:00
Lee Venable
5536f2fdb8 Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
Former-commit-id: 77a6696ca9 [formerly 952a8073fd] [formerly 74188d09ad] [formerly 77a6696ca9 [formerly 952a8073fd] [formerly 74188d09ad] [formerly d10f1c818d [formerly 74188d09ad [formerly f0ed09e300f81dcf425df64aefcd33b670b7bdd5]]]]
Former-commit-id: d10f1c818d
Former-commit-id: b40c38b297 [formerly aa4aecec66] [formerly a6c5de1383e1de456b399265a40bf38abbecf2be [formerly a444924a18]]
Former-commit-id: 5830ba6e64ad0271604fbda80f943082c770dcf4 [formerly 78c361f7a8]
Former-commit-id: cde556ff50
2013-03-25 17:02:06 -05:00
Bryan Kowal
e7229e6124 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 21fa510eaa [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]]]
Former-commit-id: 21fa510eaa
Former-commit-id: 154bedca1d [formerly f8fafc8d4a] [formerly 1488501309286ce57335dc6761ded04fe446c3fa [formerly db39a45c88]]
Former-commit-id: 011a44105665b50f56331fc21dda723ff864dd90 [formerly 01d571a088]
Former-commit-id: 2d5d41e214
2013-03-25 16:52:33 -05:00
Mike Duff
6a469ef4b7 Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]]
Former-commit-id: 88e75f4a90
Former-commit-id: 0c3527a58c [formerly fc0b126eee] [formerly 0265f807aa71c3ad5de9c0f866b4c6f9d30d772c [formerly b517ce9a9f]]
Former-commit-id: 21877c828f64a97e03f91ac68a6643a55a33a622 [formerly 9a9d8f0503]
Former-commit-id: ac7bb442f4
2013-03-25 16:03:18 -05:00
Richard Peter
228453439d Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 5c92140024 [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]]]
Former-commit-id: 5c92140024
Former-commit-id: d33b9859c2 [formerly 072bc7affc] [formerly 76ef672a3d495ecff9dda9924de866473ac56ce0 [formerly 351f08dba3]]
Former-commit-id: 77d040b2214a8a9c514a25092b9dd5acf0743cce [formerly bcb5b0b73e]
Former-commit-id: af956fe92d
2013-03-25 15:37:18 -05:00
Bryan Kowal
a1de8e0a67 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 6758a9a50d [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]]
Former-commit-id: 6758a9a50d
Former-commit-id: f1b0e60b8e [formerly 1eba8622d4] [formerly b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d]]
Former-commit-id: 0741dba9cedb08ccd4a8faa71fb209bc0dbf6617 [formerly e41f926ac2]
Former-commit-id: d5c958b2f8
2013-03-25 15:23:32 -05:00
Bryan Kowal
7ef1b5e065 Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 5012e869e3 [formerly 2093c6a495] [formerly 1710b26cc53566e26fc66c7ee6bcd14b0dbcbc08 [formerly c4cec34e47]]
Former-commit-id: 31db227b7bdc186a52966c1efdd832477bc27159 [formerly 99a3e25b3d]
Former-commit-id: 3728413ecf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
e7ea63963d Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
b83ebf6691 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 75c8d46901 [formerly 4621133ff1 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]]]
Former-commit-id: 75c8d46901
Former-commit-id: e67855df4f [formerly e722fa0723] [formerly a6da43b603f6c650bb2b2ea9df487300a1c5efb7 [formerly 04028b0136]]
Former-commit-id: 01f6e04d980b175810fe8822f4d6f0b3bc3bc97d [formerly c48c98266d]
Former-commit-id: 7a334d3417
2013-03-25 15:09:23 -05:00
Ben Steffensmeier
a5bef3f0a4 Issue #1821 Make grib2 decoding more multithreaded
Former-commit-id: 6756174e95 [formerly 842ee7a78f] [formerly f824e298b6] [formerly 6756174e95 [formerly 842ee7a78f] [formerly f824e298b6] [formerly cf7d8378dd [formerly f824e298b6 [formerly 4441b32d3ec153a2cf767b8e109c014f9efc3ed8]]]]
Former-commit-id: cf7d8378dd
Former-commit-id: a28a443a10 [formerly 53b0411753] [formerly 020c59197a731ffeafb2696b01077da1354bfaf4 [formerly f61630599f]]
Former-commit-id: d795be4292825530609940cd5b7e5129b8eb22ea [formerly 35ecc7cbd2]
Former-commit-id: 0e7c26008d
2013-03-25 14:48:42 -05:00
Richard Peter
771da3295b Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly 3239c176fa [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]]]
Former-commit-id: 3239c176fa
Former-commit-id: 25263a5042 [formerly 516bb024bb] [formerly 796dc63ca754008f87cdac9906820fb992597f43 [formerly 911a371329]]
Former-commit-id: f9d4a1edf08b99373c2258e36d85b2b9fe8420bd [formerly fecf49708c]
Former-commit-id: 917621b347
2013-03-25 14:45:06 -05:00
Jonathan Sanchez
3cbe90eea4 Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: f4bb8f1f84 [formerly 3ca4cc9dcf] [formerly 06cd161d0e] [formerly f4bb8f1f84 [formerly 3ca4cc9dcf] [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]]]
Former-commit-id: ddcb4f3451
Former-commit-id: de39c398f1 [formerly cd1095fb29] [formerly 754ef39c309a748adb8063b8b937a6a19b5bd89c [formerly c9295e6762]]
Former-commit-id: bb0e91ca8084171bb09445e1bfa612b2799f6e84 [formerly dad851857d]
Former-commit-id: d50e3af938
2013-03-25 14:41:55 -05:00
Lee Venable
19a21cc8df Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 1e99eceb62 [formerly 5d7055ad53] [formerly 25cf1cacfd] [formerly 1e99eceb62 [formerly 5d7055ad53] [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]]]
Former-commit-id: d1c84de620
Former-commit-id: 8b01a775e9 [formerly 4caa21aa69] [formerly b5aa6af106e2733245abbd54fa5e8d0b37332c11 [formerly fc41aa82ca]]
Former-commit-id: 4cd8b32d8588839148a7680c9616a8b7bb01b851 [formerly cc0debe027]
Former-commit-id: efc8488ca4
2013-03-25 14:08:39 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
5475d95f5f 13.3.1-11 baseline
Former-commit-id: 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]]
Former-commit-id: 373d13df39
Former-commit-id: c37e88ac4a [formerly 11baf4c2f0] [formerly 5e334c606f97e4e1517274a870990e91b9366443 [formerly d868003067]]
Former-commit-id: 08684e579497450790c8171b039c08f89d82117d [formerly b5e3a7dda6]
Former-commit-id: 72151c0e6a
2013-03-25 13:20:03 -05:00
Lee Venable
535b98ad02 Merge "Issue #1818 - Added an isDisposed check to the Attributes Dialog open action" into omaha_13.3.1
Former-commit-id: f15d17a3f0 [formerly ccceb78dbb] [formerly 65c2791e1a] [formerly f15d17a3f0 [formerly ccceb78dbb] [formerly 65c2791e1a] [formerly 5c661c1891 [formerly 65c2791e1a [formerly e0923bcf2c95de163118e2f8f6667f9c84df1cb2]]]]
Former-commit-id: 5c661c1891
Former-commit-id: 6c935cdc81 [formerly 4177573a65] [formerly 3a8cca1fbcc357e0c7878a07abda38273cd1b61a [formerly 531e26e097]]
Former-commit-id: 35ef9e65b2ae68abb9dee6c62deadce949ab7b3e [formerly 1ffc4943b8]
Former-commit-id: a2721b2b1f
2013-03-25 12:53:10 -05:00
Jonathan Sanchez
8123677e62 Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 135c1a1fce [formerly 2d6be3d3da] [formerly d00c88a38c] [formerly 135c1a1fce [formerly 2d6be3d3da] [formerly d00c88a38c] [formerly b77ed18eb4 [formerly d00c88a38c [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]]]
Former-commit-id: b77ed18eb4
Former-commit-id: 43435c33e5 [formerly e01d47acfa] [formerly ab25164008201e73cdd8c75fd057496bcfd40937 [formerly 539c4dfa8e]]
Former-commit-id: 4175b5da0ae94636b839880b8f0b2c10a7ff5995 [formerly 6e02206355]
Former-commit-id: 08c9302110
2013-03-25 12:23:51 -05:00
Mike Duff
4b3bc7d648 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: dddf5d8210 [formerly 86e0184414] [formerly 593cb668bf] [formerly dddf5d8210 [formerly 86e0184414] [formerly 593cb668bf] [formerly 7118f04843 [formerly 593cb668bf [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]]
Former-commit-id: 7118f04843
Former-commit-id: 9ec1b05c27 [formerly fcb46897e3] [formerly 827d31242f9064d6e8560408c9a9b79ef351dad1 [formerly c682fb2e9a]]
Former-commit-id: d4525b1df7938b113c5e439da8fab2340b4f7cfa [formerly 516965bea3]
Former-commit-id: e126320f82
2013-03-24 12:21:51 -05:00
Dave Hladky
30dc356683 Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly f2e13c8078 [formerly a53797bc2f [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]]
Former-commit-id: f2e13c8078
Former-commit-id: b401967738 [formerly a997706b72] [formerly 7262596460876e4be6f35b9c3b9a662ae067405d [formerly 05ae375e08]]
Former-commit-id: 7067eafc09f5f2a62e39521cd47c896056bc7767 [formerly fc7c4f2d90]
Former-commit-id: 20a24d3e8c
2013-03-22 16:37:20 -05:00
Richard Peter
cbc371109c Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
Former-commit-id: e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]]
Former-commit-id: 3de0400969
Former-commit-id: 5989bc1894 [formerly d1b4d899be] [formerly e50e5d685426dd553ea338be6ee39be5bcda1f72 [formerly 50254dc8d1]]
Former-commit-id: dac4b40d3584b9d3d92e15ab278064d6922885e0 [formerly 66a28e9315]
Former-commit-id: 1084723e4b
2013-03-22 16:26:52 -05:00
Dave Hladky
edde66e8f2 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly d114302b06 [formerly 58a37d1e44 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]]
Former-commit-id: d114302b06
Former-commit-id: 5f8ac1e458 [formerly 150cd54602] [formerly a6c0cfd63967b9b4f31e6242a2aad2a654b52cbe [formerly 3cdd8f8ed2]]
Former-commit-id: 66bc0011dbc6bee573d6a149bc3641646c869ad2 [formerly bc2a1a20e1]
Former-commit-id: 4eec5881e9
2013-03-22 16:21:45 -05:00
Dustin Johnson
07be638779 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly 8651ca3d76 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]]
Former-commit-id: 8651ca3d76
Former-commit-id: 6adeb41238 [formerly c55f2ce559] [formerly 972f2290f05ee741a20729ef834101416b95b220 [formerly 0596d43d99]]
Former-commit-id: a42de8d20be8a050fdacc4249ee7b490fcd62a7b [formerly dcc7e44250]
Former-commit-id: eb0f12b15f
2013-03-22 15:28:57 -05:00
Dustin Johnson
e2a6167de3 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly ed017996a0 [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]]
Former-commit-id: ed017996a0
Former-commit-id: bd04bd2c8c [formerly f274b8cd5b] [formerly 19450b614092a79e5518ae5c8a927c2aeb594359 [formerly 9e63142576]]
Former-commit-id: 3b9a725cb7e0fe573edc1ee175256ab462601148 [formerly e4c51bad63]
Former-commit-id: 087e01d4e4
2013-03-22 15:28:20 -05:00
Max Schenkelberg
971baf62b1 Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 44f5bd04b6 [formerly 850c8995cc] [formerly b81da1853ef8773cba40a9f1ed03ab5d498966c2 [formerly d20958ae92]]
Former-commit-id: ae3d695d3cfd46a5aade2f00de5657f386699789 [formerly 34134b3c62]
Former-commit-id: 3ba217badb
2013-03-22 10:54:44 -05:00
David Gillingham
3b8f35d9bf Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: 3fdecaec6e [formerly c8c7fb4129] [formerly 0957f6a5eec508c235f5324a4ce32b5064183a23 [formerly c3ce4058a0]]
Former-commit-id: 2f5d9615c33ca7ab3903f26aee8791ab3f06072b [formerly 7a2c92efc7]
Former-commit-id: 75a6163bf3
2013-03-22 10:39:13 -05:00
Dustin Johnson
c5464667d5 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 0dcc67bc55 [formerly 53291f7130] [formerly 21a7a7505def7dce020a2a08ac7e2a12253adea8 [formerly 1b1bd69b89]]
Former-commit-id: 696e1ca91ff58627044275c70673d28ff343a7af [formerly e39187c0ce]
Former-commit-id: 0c92ddab72
2013-03-22 10:04:21 -05:00
Lee Venable
e49c13b61b Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly c8523e9108 [formerly 489e04c235 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]]
Former-commit-id: c8523e9108
Former-commit-id: da4f91d1d1 [formerly a2e5e18810] [formerly a38c0aaf0d81c02c132fbf7d895fb2ae03642b5b [formerly 0d1cba8eae]]
Former-commit-id: 1ba20f23e5bc00158919a784aff5d9d1dc9ff3ac [formerly c733749c9f]
Former-commit-id: 9af40169f9
2013-03-21 19:27:02 -05:00
Richard Peter
e62f6880db Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c [formerly 4b386ccd1c] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -05:00
Nate Jensen
81588089fd Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
Former-commit-id: d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly 44f8ba8943 [formerly e4c1e86d55 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]]]
Former-commit-id: 44f8ba8943
Former-commit-id: 39be82e701 [formerly fa0d772221] [formerly 73be7a5f1188b9b7409ec645d1ae325bb8766c2c [formerly 84e8a30ad7]]
Former-commit-id: cf5e15b22bd699c68e9f76cab8b5be49c72f0389 [formerly 4a8974e6a0]
Former-commit-id: 5f11e7d243
2013-03-21 17:06:37 -05:00
Dustin Johnson
3e8624a3e8 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]]
Former-commit-id: c4d4e37cad
Former-commit-id: ccb959c686 [formerly 09d1d7b6cf] [formerly e46190078db46b56cb5461797a9ab3f3c3ecb7f5 [formerly d58306a92e]]
Former-commit-id: abf3adf681b6aeddfe60c155ab334a33629028b4 [formerly 0f4ec00790]
Former-commit-id: 4d41fca019
2013-03-21 16:14:49 -05:00
Nate Jensen
da610f0b33 Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly 255b2dbd29 [formerly d6d7b081cf [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]]]
Former-commit-id: 255b2dbd29
Former-commit-id: 9b16df5be9 [formerly 7ce724d4fd] [formerly 028e5a5592ab805e137eef6932ddca1a7788aefa [formerly 7821b86e87]]
Former-commit-id: db55e36998070b6430ab80d1ab1ca7c25cf8776c [formerly 5d0194d7a3]
Former-commit-id: 0d0a93dd1c
2013-03-21 15:07:57 -05:00
Greg Armendariz
e4d51820e2 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]]
Former-commit-id: 85113a66b6
Former-commit-id: 8550ade3ba [formerly 1884b6dce3] [formerly 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6]]
Former-commit-id: 8865116ee2a1c8adf793566471920cb0699d0ba9 [formerly 559136f546]
Former-commit-id: f9d1bfbb48
2013-03-21 12:55:59 -05:00
Richard Peter
af57e770bb Merge "Issue #1785 Adding performance logging for bufrua, grib, obs, radar, redbook, sfcobs, and satellite." into omaha_13.3.1
Former-commit-id: 871c8ad8ab [formerly b7081a7ccb] [formerly d2b176ba76] [formerly 871c8ad8ab [formerly b7081a7ccb] [formerly d2b176ba76] [formerly f803dcaf46 [formerly d2b176ba76 [formerly 0ca3a30d5b43d0168ac3e6bc22d64daaf0c432ed]]]]
Former-commit-id: f803dcaf46
Former-commit-id: 79a7576969 [formerly 71405932fd] [formerly df5c68cbebcccd847e7a010b9fe62bd17851c3c5 [formerly d185c10b8e]]
Former-commit-id: 9253c42cad85cf9e25377386209266df5a43efe5 [formerly 8531ba2a4a]
Former-commit-id: 155cafe8d2
2013-03-21 12:50:06 -05:00
Dustin Johnson
71b739a546 Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
Former-commit-id: 9818775763 [formerly a93b6f54c0] [formerly 54bbf500de] [formerly 9818775763 [formerly a93b6f54c0] [formerly 54bbf500de] [formerly c2373812bd [formerly 54bbf500de [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]]]
Former-commit-id: c2373812bd
Former-commit-id: a7eb161d29 [formerly e4758ccadf] [formerly 297220ad9237a9ff4113192018dfe7ba5461763f [formerly b822c6398f]]
Former-commit-id: 381df66a1a30931b0a71fd691ccfcd2f9580d63b [formerly c23347b58d]
Former-commit-id: 9426ee02af
2013-03-21 12:35:40 -05:00
Dustin Johnson
173cc2b457 Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly ebce91c15d [formerly b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]]
Former-commit-id: ebce91c15d
Former-commit-id: b0a2a23c78 [formerly e3a5458f1a] [formerly 28f3f246d64f321b17586c020ec5a8677085f92c [formerly c88d9dd6cf]]
Former-commit-id: 2a47b90eb6d779af665719641e4d0655f79997c0 [formerly 67f055ca39]
Former-commit-id: eaf2a061b5
2013-03-21 12:28:00 -05:00
Mike Duff
58bea82862 Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234

Former-commit-id: 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 09feff70e0 [formerly e4ffefa649 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]]]
Former-commit-id: 09feff70e0
Former-commit-id: 01374e2b4e [formerly 524dfa985f] [formerly f337379307c42237568f779a8b1424b7176cd91b [formerly a45389f735]]
Former-commit-id: c309d4f1c03641f79757c4a06d8ad1bd3018605e [formerly 8c1b60bae9]
Former-commit-id: 31657d334c
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
5fb8c37bab Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51

Former-commit-id: 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly de02fe7922 [formerly e69011cdd8 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]]
Former-commit-id: de02fe7922
Former-commit-id: 3e3e114898 [formerly 4323ea54d2] [formerly 53fc7d83e457d86a8b95d9126ec3adbb8909a627 [formerly 6ce135a80a]]
Former-commit-id: 0954e4a2a3a0f4503430e305acb1cc49e96ada47 [formerly 9feaaa1961]
Former-commit-id: 96fe46d7a3
2013-03-21 11:09:23 -05:00
Brad Gonzales
7cba304bd9 Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
redbook, sfcobs, and satellite.

Amend: Made decoder performance logging consistent.  Cleaned up other logging.

Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4

Former-commit-id: 237dc5ea14 [formerly f7debfc55f] [formerly cd39fcf122] [formerly 237dc5ea14 [formerly f7debfc55f] [formerly cd39fcf122] [formerly 8c309840a3 [formerly cd39fcf122 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]]
Former-commit-id: 8c309840a3
Former-commit-id: 954314d74d [formerly 2de2221a35] [formerly dc7990ac7d34c4a007a93ed196275f6c5dbbe1f1 [formerly 9f9248bcd9]]
Former-commit-id: 53ad836ca917276b31c1641cf833b2d5ea883f8f [formerly 9503aa5a60]
Former-commit-id: 4b93b146fd
2013-03-21 10:58:26 -05:00
Bryan Kowal
fc836cda4f Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 95b9e9b751 [formerly 88b0c2e120] [formerly 77e7359cd424f1e3096c107873683b66ceb81137 [formerly 8141f49211]]
Former-commit-id: 1800cbc92a8918b59f5980df4cafec6fab28acd7 [formerly 6e9c94566c]
Former-commit-id: 17c46599a4
2013-03-21 10:04:29 -05:00
Bryan Kowal
a9dd3bd622 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Max Schenkelberg
ed0af29c23 Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
Amend: Added header comments and more unused code

Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686

Former-commit-id: 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 5109641194 [formerly b2e374c7fb [formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]]]
Former-commit-id: 5109641194
Former-commit-id: 5e108e1c4e [formerly 9aa8f9dd9e] [formerly dbdb63e7eaa979429543c7d3c35d70b666712d88 [formerly 21b8c130c2]]
Former-commit-id: 79ce073a98b67ba5787b628448c55abcdc1f9e0d [formerly 5175c821bd]
Former-commit-id: 3b032517ac
2013-03-20 17:38:02 -05:00
Richard Peter
876b776443 Merge "Issue #1809 - update for yajsw compatibility" into omaha_13.3.1
Former-commit-id: 4f4bea3fc6 [formerly 93c44c94cb] [formerly 13d063234a] [formerly 4f4bea3fc6 [formerly 93c44c94cb] [formerly 13d063234a] [formerly 0ec6fc8870 [formerly 13d063234a [formerly 655d80f004cfcdb5de6ba46d3d6272e6e5373abe]]]]
Former-commit-id: 0ec6fc8870
Former-commit-id: 5be0b04905 [formerly b24027301d] [formerly 4113153584dbfccc486b2df95d43a5967309ddcb [formerly 5f45bbf005]]
Former-commit-id: b39230cefc3f839272f707011895da75272d8ef3 [formerly 02c8bd2538]
Former-commit-id: b6beaff67a
2013-03-20 17:27:20 -05:00
Richard Peter
f5996d41b9 Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
Former-commit-id: 3d93bf69c0 [formerly 510e56c67f] [formerly d747686fa1] [formerly 3d93bf69c0 [formerly 510e56c67f] [formerly d747686fa1] [formerly bcf676f5dd [formerly d747686fa1 [formerly 855f05b2121c17c71d13495c9aacb12878757af6]]]]
Former-commit-id: bcf676f5dd
Former-commit-id: f3bdacf035 [formerly 855dd1a664] [formerly 53f7b48f88e617a35ecf463838269e6f2d614469 [formerly ac58a04170]]
Former-commit-id: 78f90e8fa626d39ab8bdeac8481d9da7c3d992b3 [formerly d46fbf9f2a]
Former-commit-id: 4b0c9c10d6
2013-03-20 17:26:31 -05:00
Bryan Kowal
acfe04a074 Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]]
Former-commit-id: 3baebb684b
Former-commit-id: a71e14882e [formerly 63f7abc798] [formerly 5b50182da9b1d1bc0dc78315de3a77804b604894 [formerly 374bd51fb0]]
Former-commit-id: 90f1be518ad1b2127ca77166e14502c623f1acb5 [formerly 5eae24b949]
Former-commit-id: ddf4c04e59
2013-03-20 16:53:18 -05:00
Bryan Kowal
9aba2c43d0 Issue #1809 - update for yajsw compatibility
Former-commit-id: 67f2ca23e7 [formerly 2411a400f4] [formerly dd8d462790] [formerly 67f2ca23e7 [formerly 2411a400f4] [formerly dd8d462790] [formerly 0e46dc35e2 [formerly dd8d462790 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]]]]
Former-commit-id: 0e46dc35e2
Former-commit-id: 5d1cab4bdb [formerly 1f5e019852] [formerly a5e7ec737f85d935d5bf1bfc470224d8f5ad6ec6 [formerly 585f7858bd]]
Former-commit-id: 1ddb23df4009765335471aaf048f382ffe5d8a1d [formerly 5933b30f81]
Former-commit-id: ecf8436e50
2013-03-20 16:46:03 -05:00