Steve Harris
d7f7c26582
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: 31b3e87ffa092efd6072
2012-05-09 13:19:47 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a68300
2012-04-18 15:18:16 -05:00
Steve Harris
c90ce9d54e
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: fee53dea94ed26e06df2
2012-04-10 12:50:03 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd94068f5295f
2012-03-30 08:38:33 -05:00
Steve Harris
0665862abe
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: a0abcf812070357d90bc
2012-03-29 10:03:05 -05:00
Bryan Kowal
5ba68624c5
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 31f989ecb48a4c883e0b
2012-03-21 16:49:38 -05:00
Bryan Kowal
d4142689c9
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
...
Former-commit-id: c803afd4544d8d3d4d00
2012-03-07 10:22:40 -06:00
Steve Harris
24059a5b4e
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: e5b56c99ab9b67525e95
2012-02-27 15:58:49 -06:00
Steve Harris
92084b3f20
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
8da36046de
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
ec0f1aebfc
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 496cc6a06bb89ebc5e01
2012-02-20 16:38:06 -06:00
Steve Harris
221a02882a
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 23cc9689deb9f4780fcb
2012-02-15 14:39:43 -06:00
Steve Harris
74c156e508
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: a91b01bfbe5e47f8c33a
2012-02-15 12:54:54 -06:00
Ben Steffensmeier
808846e237
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: f65d86a06a944e59e989
2012-02-14 15:46:11 -06:00
Jonathan Sanchez
869de9a03b
Issue #19 Committed changes to Wes2Bridge branch.
...
Former-commit-id: 4bce8e5ece12a5931e75
2012-01-24 10:20:28 -06:00
Bryan Kowal
a37509adf3
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
...
Former-commit-id: bda5954b3cc08293a1dc
2012-01-23 14:39:39 -06:00
Bryan Kowal
4453ad2d10
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: ea1c82452b65e1e4ee0b
2012-01-20 13:38:00 -06:00
Matt Nash
580e2938d7
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff47466be3bec40
2012-01-19 11:53:12 -06:00
Bryan Kowal
63f6f44fe1
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 9d64e1df1243c3807a32
2012-01-18 16:00:45 -06:00
root
a02aeb236c
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d9f19e3f712
2012-01-06 08:55:05 -06:00
