Commit graph

11 commits

Author SHA1 Message Date
Bryan Kowal
81a360d139 Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]
Former-commit-id: 31f989ecb4
2012-03-21 16:49:38 -05:00
Steve Harris
40d7357165 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: 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: e5b56c99ab
2012-02-27 15:58:49 -06:00
Steve Harris
4450cf8963 Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: 54be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
4a93298877 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: b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]
Former-commit-id: 496cc6a06b
2012-02-20 16:38:06 -06:00
Steve Harris
39b13d7102 Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: a91b01bfbe
2012-02-15 12:54:54 -06:00
Jonathan Sanchez
67dd0f65d6 Issue #19 Committed changes to Wes2Bridge branch.
Former-commit-id: 12a5931e75 [formerly c0a860f692ba514f9ea7566fb0e3c00de05d8c92]
Former-commit-id: 4bce8e5ece
2012-01-24 10:20:28 -06:00
Bryan Kowal
6a07f850bd Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: c08293a1dc [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]
Former-commit-id: bda5954b3c
2012-01-23 14:39:39 -06:00
Bryan Kowal
7f1b468010 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: ea1c82452b
2012-01-20 13:38:00 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
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: 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 9d64e1df12
2012-01-18 16:00:45 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00