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

186 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
Ron Anderson
57aacebeda Omaha #4522 Fix dynamic serialization errors 
Change-Id: I73c96d05d1381509b44b3bcd99907369da3e3259

Former-commit-id: 5d1ed08cb86930a3d0bfe16aacef215bf9a6004a
 2015-06-04 18:08:53 -05:00
Ron Anderson
38b8082aac Omaha #4027 Get GFE Formatter auto tests working with mixed case 
Change-Id: I55c2b34adca1c049116682be5ff40509729e16c0

Former-commit-id: c214e6cc22140b53ac8bd5514913b63a0850867a
 2015-05-07 14:41:49 -05:00
Ron Anderson
6b3a0d1478 Omaha #4027 More changes for Mixed Case 
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e

Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
 2015-04-29 13:18:27 -05:00
David Gillingham
fd5b270fdd Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status. 
NOTE: Service Backup features are broken until DR 4300 lands on this branch.

Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f

Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
 2015-03-19 16:13:56 -05:00
Steve Harris
2fd5ba420f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
 2015-03-18 09:29:01 -05:00
Fay.Liang
1138f48ee9 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.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.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
 2015-03-09 16:11:13 -04:00
Fay.Liang
059eb032b1 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.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.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
 2015-03-09 16:11:13 -04:00
Nathan Bowler
96bee79c06 Omaha #4174 Output full stacktrace 
Change-Id: Icf84265ea77aaa4438f192014f7d1d8ef87a2bb2

Former-commit-id: 077d6a987d0f37cfd18cbe2ed353a3826f449699
 2015-02-27 10:50:10 -05:00
David Gillingham
fb4cb8e67b Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly 1e86f4cb13 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]]
Former-commit-id: 1e86f4cb13
Former-commit-id: 632a6905a1
 2015-02-18 13:07:56 -06:00
David Gillingham
1e86f4cb13 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: dfbfd38194c88c70f3e75de06bfc7114c6bd3542
 2015-02-18 13:07:56 -06:00
David Gillingham
f743cba5a8 Omaha #4072: Remove uf.common.dataplugin.grib modules from pythonPackages project. 
Change-Id: Ibb512ca3d8c1f1ef83e51e70a70b6fba67b90922

Former-commit-id: 89a108e98c148429f574dae2abe4f5c5beacc323
 2015-02-09 13:07:39 -06:00
Steve Harris
79a5171143 Merge tag 'OB_14.3.1-32m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: a16abe1b8b
Former-commit-id: a8a97501ac
 2014-11-10 08:42:01 -06:00
Steve Harris
a16abe1b8b Merge tag 'OB_14.3.1-32m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
 2014-11-10 08:42:01 -06:00
Brian.Dyke
5cdd9f4256 Merge branch 'master_14.2.4' into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
 2014-11-06 12:55:21 -05:00
Brian.Dyke
aae68215c8 Merge branch 'master_14.2.4' into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
 2014-11-06 12:55:21 -05:00
Robert Blum
da4f5de40f Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml. 
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: f8661bdb73 [formerly 9bef0b91f8 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]
Former-commit-id: 9bef0b91f8
Former-commit-id: caee4eba19
 2014-10-08 13:05:23 -05:00
Robert Blum
9bef0b91f8 Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml. 
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: 8c609041f3cabc11588d282b0a91b514a569073a
 2014-10-08 13:05:23 -05:00
Ron Anderson
d25fb16e4a Issue #3684 Additional changes to keep IFPServers better synchronized 
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: bf5225906f [formerly 34eafba2da [formerly 8a8f82e5916d4a71fa639eb16057e2c68276ecff]]
Former-commit-id: 34eafba2da
Former-commit-id: de4015cee6
 2014-10-07 11:51:39 -05:00
Ron Anderson
34eafba2da Issue #3684 Additional changes to keep IFPServers better synchronized 
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
 2014-10-07 11:51:39 -05:00
Ron Anderson
c3d77cb778 Omaha #3623 Created command line utilities to activate/deactivate sites 
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: b09244975e [formerly e8db5a1bbf [formerly 670a9bd71874fbd6fecd0c9df5567ad342892333]]
Former-commit-id: e8db5a1bbf
Former-commit-id: f0e06502ee
 2014-09-17 14:35:47 -05:00
Ron Anderson
e8db5a1bbf Omaha #3623 Created command line utilities to activate/deactivate sites 
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: 670a9bd71874fbd6fecd0c9df5567ad342892333
 2014-09-17 14:35:47 -05:00
Brian Clements
dfb0cf3671 Omaha #2926 switched text subscription to thrift client 
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: 0087580736 [formerly ac811b666c [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]
Former-commit-id: ac811b666c
Former-commit-id: d8b2da2900
 2014-09-05 16:52:38 -05:00
Brian Clements
ac811b666c Omaha #2926 switched text subscription to thrift client 
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: 410ef2954d6cfff11a4718056983ccaecf186fd3
 2014-09-05 16:52:38 -05:00
Brian Clements
652f170810 Omaha #2926 moved TextDBRequest to common 
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: c77b4f4e8b [formerly 1b248efb54 [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]
Former-commit-id: 1b248efb54
Former-commit-id: c89a74943e
 2014-09-05 12:56:04 -05:00
Brian Clements
1b248efb54 Omaha #2926 moved TextDBRequest to common 
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: 924e512c327c838d866b353ec8da8f7e5534db49
 2014-09-05 12:56:04 -05:00
Brian Clements
8a930b582a Omaha #2926 switched textdb to thrift client 
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1

Former-commit-id: c05e535cc8 [formerly 1bbf5d7346 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]
Former-commit-id: 1bbf5d7346
Former-commit-id: 344ba01102
 2014-08-25 10:28:48 -05:00
Brian Clements
1bbf5d7346 Omaha #2926 switched textdb to thrift client 
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1

Former-commit-id: 856ef48bab005bdb7de9dd4145fafc7fe12084f5
 2014-08-25 10:28:48 -05:00
Nathan Bowler
10f163ec37 Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts. 
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6

Former-commit-id: 8fdc47855e [formerly 2fcc25bb9b [formerly 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8]]
Former-commit-id: 2fcc25bb9b
Former-commit-id: f70776903c
 2014-08-21 10:55:28 -04:00
Nathan Bowler
2fcc25bb9b Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts. 
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6

Former-commit-id: 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8
 2014-08-21 10:55:28 -04:00
Matt Nash
2ecfd2dfe1 Omaha #3529 move Authentication data dstype to match the new location for the Java version 
Former-commit-id: bcf3358782 [formerly 3958c3f610 [formerly 7a33780536c91f8be04cd12366b368248533cd89]]
Former-commit-id: 3958c3f610
Former-commit-id: f9197aea91
 2014-08-15 09:11:36 -05:00
Matt Nash
3958c3f610 Omaha #3529 move Authentication data dstype to match the new location for the Java version 
Former-commit-id: 7a33780536c91f8be04cd12366b368248533cd89
 2014-08-15 09:11:36 -05:00
Nate Jensen
3a9c29fa88 Omaha #3184 renamed valid identifiers to optional 
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81

Former-commit-id: 857179e08d [formerly 3c1ae47a76 [formerly d0e68c2fa1cc531263622410e4364b87f222139f]]
Former-commit-id: 3c1ae47a76
Former-commit-id: 77d0661861
 2014-07-31 09:45:01 -05:00
Nate Jensen
3c1ae47a76 Omaha #3184 renamed valid identifiers to optional 
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81

Former-commit-id: d0e68c2fa1cc531263622410e4364b87f222139f
 2014-07-31 09:45:01 -05:00
Nate Jensen
d2a047b6dc Omaha #3185 support for new DAF methods from pure python 
Change-Id: Ic39128a015da3a1d6ae5489b7f9b2f600123b013

Former-commit-id: 4925b57609 [formerly 342a0e795b [formerly 04a79146b012db8641461413f7aad9b52465161a]]
Former-commit-id: 342a0e795b
Former-commit-id: 27a6ad9e58
 2014-07-24 09:17:03 -05:00
Nate Jensen
342a0e795b Omaha #3185 support for new DAF methods from pure python 
Change-Id: Ic39128a015da3a1d6ae5489b7f9b2f600123b013

Former-commit-id: 04a79146b012db8641461413f7aad9b52465161a
 2014-07-24 09:17:03 -05:00
Ron Anderson
56389537c2 Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response 
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: 24faa48233 [formerly 8d50f9d15a [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]
Former-commit-id: 8d50f9d15a
Former-commit-id: fd16321f82
 2014-07-07 09:02:14 -05:00
Ron Anderson
8d50f9d15a Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response 
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: 1e9e5abc477785c5b8cda9dd214da7de83532b9f
 2014-07-07 09:02:14 -05:00
Matt Nash
fef75e5df3 Omaha #3096 fix DataTime to match the Python version 
Former-commit-id: 407ac96c93 [formerly e32adf1ee4 [formerly d7e4329d0d9decf946b463bf40c64f4e968c871f]]
Former-commit-id: e32adf1ee4
Former-commit-id: 91720a1420
 2014-06-26 15:12:39 -05:00
Matt Nash
e32adf1ee4 Omaha #3096 fix DataTime to match the Python version 
Former-commit-id: d7e4329d0d9decf946b463bf40c64f4e968c871f
 2014-06-26 15:12:39 -05:00
Brian.Dyke
362d882b40 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
 2014-04-25 11:06:11 -04:00
Brian.Dyke
fb1f5aa593 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
 2014-04-25 11:06:11 -04:00
David Gillingham
41393ac5a1 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]
Former-commit-id: c8a6dc8769
Former-commit-id: 1c7e650e6a
 2014-04-10 11:24:40 -05:00
David Gillingham
c8a6dc8769 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 6c5e65e538e145d31c84d2f81f7b41202ae41ad0
 2014-04-10 11:24:40 -05:00
Richard Peter
efd1003a50 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Richard Peter
95eba8dcf6 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
 2014-04-09 16:00:54 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
Brian.Dyke
6a28fcb156 Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
 2014-04-04 12:57:32 -04:00
Nate Jensen
6389e2fb02 Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development 
Former-commit-id: 9b94434a78 [formerly 3afd14e1eb [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]
Former-commit-id: 3afd14e1eb
Former-commit-id: 92e8393915
 2014-03-04 11:42:51 -06:00
Nate Jensen
3afd14e1eb Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development 
Former-commit-id: eb07c44098abe7f72b578e24a4a7ea7e92dc655c
 2014-03-04 11:42:51 -06:00