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

12 commits

Author SHA1 Message Date
Bryan Kowal
580172b47c Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 
Former-commit-id: 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: f92eb59a73
 2012-07-10 16:57:16 -05:00
Steve Harris
98447412f8 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: 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
 2012-05-09 13:19:47 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline 
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
 2012-05-01 18:06:13 -05:00
Steve Harris
dcdd7f0648 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: ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: fee53dea94
 2012-04-10 12:50:03 -05:00
Steve Harris
ce3b74c605 12.3.1-10 baseline 
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
 2012-03-30 08:38:33 -05:00
David Gillingham
2b5588bd1e Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. 
Former-commit-id: e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]
Former-commit-id: d433b7d4d6
 2012-03-13 12:31:38 -05:00
Bryan Kowal
638d2c964b Issue #202 - increment the awips2-qpid release so yum will update the qpid installation. 
Former-commit-id: fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]
Former-commit-id: b871752e3a
 2012-03-08 09:00:55 -06:00
David Gillingham
8a86e910aa Issue #361: Use queueCreator.sh to build the new ISC data receive QPID 
queue.

Former-commit-id: 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]
Former-commit-id: 78c7f29096
 2012-03-07 16:05:54 -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
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