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

13 commits

Author SHA1 Message Date
Bryan Kowal
21e8618852 Merge branch '11-Collaboration' into development 
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
 2012-06-18 11:16:28 -05:00
Ben Steffensmeier
6e66b88dd5 Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api. 
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23

Former-commit-id: e629fcb15b [formerly f63d2bc7c2] [formerly dd353747d0 [formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]
Former-commit-id: dd353747d0
Former-commit-id: af82c0a52a
 2012-06-14 16:30:34 -05:00
David Gillingham
e779d44a4e Issue #646: Ensure radar obs use TimeTools to set reftime. 
Former-commit-id: f12f83c80b [formerly 4f9061fcea] [formerly 091e0325ea [formerly c6c83792c753be9c248e951462830983d5a3ee2e]]
Former-commit-id: 091e0325ea
Former-commit-id: ea06b163b9
 2012-05-18 16:31:16 -05:00
Steve Harris
53d2822329 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: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
 2012-05-09 13:19:47 -05:00
David Gillingham
cf74c74cc2 Issue #473: Properly archive text plugin records, 
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: 8592a9a50d [formerly 526abfd36e] [formerly 04ab5d619b [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 04ab5d619b
Former-commit-id: 36717c7a3e
 2012-04-25 17:08:21 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline 
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
 2012-04-18 15:18:16 -05:00
Steve Harris
dd3a5a8d88 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: ec0f1aebfc [formerly b89ebc5e01] [formerly 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
 2012-02-20 16:38:06 -06:00
Steve Harris
b12f5e5d75 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: d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
 2012-02-20 13:03:39 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
 2012-02-17 10:55:02 -06:00
Ben Steffensmeier
cb2addec0c Issue #176 pull changes to insert and persist time from the WES2Bridge branch. 
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 4179defc4f [formerly f016be988e] [formerly 73f6e9e322 [formerly 500f3f03f5260cff3417021776204ccf6c035415]]
Former-commit-id: 73f6e9e322
Former-commit-id: 7bcbf3e3bc
 2012-02-03 17:33:32 -06:00
David Gillingham
ea7a55ad8d Issue #20: Merge all changes from previous SVN repo to GIT. 
Former-commit-id: b31f40ec9d [formerly 845e6c19af] [formerly b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
 2012-01-26 17:38:43 -06:00
Matt Nash
82300ccdcf Moving 12.1.1 into ss_sync 
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
 2012-01-19 11:53:12 -06:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
 2012-01-06 08:55:05 -06:00