Commit graph

16 commits

Author SHA1 Message Date
Bryan Kowal
861ca25a4e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 94d6af30f0 [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]
Former-commit-id: 47230422ce
2012-02-29 12:43:46 -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: e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: 9b67525e95
2012-02-27 15:58:49 -06:00
Steve Harris
8da36046de Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
85075e6107 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 94c2ea985b
2012-02-22 10:12:49 -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: 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]
Former-commit-id: b89ebc5e01
2012-02-20 16:38:06 -06:00
Bryan Kowal
5754f9dfd8 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 10a0ca252d
2012-02-17 12:17:14 -06:00
Steve Harris
6aed9311a8 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]
Former-commit-id: 7356d655da
2012-02-15 14:34:47 -06:00
Steve Harris
74c156e508 Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: 5e47f8c33a
2012-02-15 12:54:54 -06:00
Bryan Kowal
00c0ab406b Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 40c0e93995
2012-01-30 16:05:17 -06:00
Bryan Kowal
b6a8534258 Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 998337f9f4
2012-01-30 16:01:45 -06:00
Jonathan Sanchez
869de9a03b Issue #19 Committed changes to Wes2Bridge branch.
Former-commit-id: 4bce8e5ece [formerly c0a860f692ba514f9ea7566fb0e3c00de05d8c92]
Former-commit-id: 12a5931e75
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: bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]
Former-commit-id: c08293a1dc
2012-01-23 14:39:39 -06:00
Bryan Kowal
4453ad2d10 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: 65e1e4ee0b
2012-01-20 13:38:00 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
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: 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 43c3807a32
2012-01-18 16:00:45 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00