Steve Harris
|
7a10ca9766
|
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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
54be9660f1
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
9995d22e25
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
496cc6a06b
|
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: 85082f273a85a3967d54d4a489b6ea973d0688be
|
2012-02-20 16:38:06 -06:00 |
|
Steve Harris
|
5e9d2dd367
|
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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
cc66c8be24
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
|
2012-02-20 12:43:38 -06:00 |
|
Bryan Kowal
|
682c10767d
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
|
2012-02-17 12:17:14 -06:00 |
|
Steve Harris
|
c1129dbd00
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
23cc9689de
|
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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
1707b98721
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
a91b01bfbe
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: ab787c94408e85afe2d92c3f860b7b9bd271c616
|
2012-02-15 12:54:54 -06:00 |
|
Steve Harris
|
2e29bc8ee2
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
|
2012-02-14 15:54:46 -06:00 |
|
Ben Steffensmeier
|
f65d86a06a
|
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: 518db101f2ec18afa31a5b12fbaab3bbb903013b
|
2012-02-14 15:46:11 -06:00 |
|
Bryan Kowal
|
1855bbcbee
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
7d21e3149e
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 3038b2fc0d69236267db13eeb88e6f803cc6215a
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
2554090d0d
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462
|
2012-01-30 16:01:45 -06:00 |
|
Jonathan Sanchez
|
4bce8e5ece
|
Issue #19 Committed changes to Wes2Bridge branch.
Former-commit-id: c0a860f692ba514f9ea7566fb0e3c00de05d8c92
|
2012-01-24 10:20:28 -06:00 |
|
Bryan Kowal
|
bda5954b3c
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
ea1c82452b
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
9d64e1df12
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 40f016a9f9e605b039d41ed44a59a269caf8a024
|
2012-01-18 16:00:45 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|