Bryan Kowal
49a30a5b1a
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 1e3e31a657c2cd292c32
2012-02-23 16:46:48 -06:00
Bryan Kowal
5c86773a77
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: bae0cb555ee135f4508d
2012-02-23 14:20:50 -06:00
Steve Harris
938dc5b21c
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: dcadf7baa486e586befe
2012-02-23 12:38:55 -06:00
Steve Harris
3d511fe719
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: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
33483f3960
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: cabf9fd9565e9d2dd367
2012-02-20 13:03:39 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Bryan Kowal
2ba23624b4
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 10a0ca252d682c10767d
2012-02-17 12:17:14 -06:00
Steve Harris
ad402655f4
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 272ba87883c1129dbd00
2012-02-15 15:08:58 -06:00
Steve Harris
a2e3aabc60
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: b9f4780fcb23cc9689de
2012-02-15 14:39:43 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
Steve Harris
39b13d7102
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: 5e47f8c33aa91b01bfbe
2012-02-15 12:54:54 -06:00
Steve Harris
cb3371ee28
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2119a1513e2e29bc8ee2
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
d00572c122
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: 944e59e989f65d86a06a
2012-02-14 15:46:11 -06:00
Bryan Kowal
27c4557e0a
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 7ca62dc7d61855bbcbee
2012-02-09 12:14:37 -06:00
Bryan Kowal
e9d85fc09c
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
...
Former-commit-id: 40c0e939957d21e3149e
2012-01-30 16:05:17 -06:00
Bryan Kowal
2745f9cac7
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: 998337f9f42554090d0d
2012-01-30 16:01:45 -06:00
Bryan Kowal
7f1b468010
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: 65e1e4ee0bea1c82452b
2012-01-20 13:38:00 -06:00
Matt Nash
1faae42484
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40c83e5ff474
2012-01-19 11:53:12 -06:00
Bryan Kowal
06187b93be
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 43c3807a329d64e1df12
2012-01-18 16:00:45 -06:00
root
3360eb6c5f
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f71206a8b51d6d
2012-01-06 08:55:05 -06:00
