Steve Harris
|
f7e218e8f9
|
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: 7a10ca9766 [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc]
Former-commit-id: 92084b3f20
Former-commit-id: 5a96582f16
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
516722475b
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 8da36046de [formerly c8aae98741]
Former-commit-id: 8da36046de
Former-commit-id: 829d2791e9
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
88db31fc62
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 9995d22e25 [formerly 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 85075e6107 [formerly 94c2ea985b]
Former-commit-id: 85075e6107
Former-commit-id: a811ac888f
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
c83432c7f0
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: c268da57bc [formerly 4b76d22f77]
Former-commit-id: c268da57bc
Former-commit-id: d129eab241
|
2012-02-20 12:43:38 -06:00 |
|
Bryan Kowal
|
00e61b6a72
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 682c10767d [formerly 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d]
Former-commit-id: 5754f9dfd8
Former-commit-id: eda0f92b17
|
2012-02-17 12:17:14 -06:00 |
|
Steve Harris
|
7c76a37e72
|
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: 23cc9689de [formerly 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]
Former-commit-id: 221a02882a [formerly b9f4780fcb]
Former-commit-id: 221a02882a
Former-commit-id: 6d3d1066eb
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
73672e926e
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 1707b98721 [formerly 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]
Former-commit-id: 6aed9311a8 [formerly 7356d655da]
Former-commit-id: 6aed9311a8
Former-commit-id: c4ced8af2d
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
c38d8b0268
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: a91b01bfbe [formerly 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]
Former-commit-id: 74c156e508 [formerly 5e47f8c33a]
Former-commit-id: 74c156e508
Former-commit-id: e21fc62dd9
|
2012-02-15 12:54:54 -06:00 |
|
Ben Steffensmeier
|
c591d49c82
|
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: f65d86a06a [formerly 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]
Former-commit-id: 808846e237 [formerly 944e59e989]
Former-commit-id: 808846e237
Former-commit-id: 2edb2afe04
|
2012-02-14 15:46:11 -06:00 |
|
Bryan Kowal
|
2c96656dbc
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 7d21e3149e [formerly 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]]
Former-commit-id: 00c0ab406b [formerly 40c0e93995]
Former-commit-id: 00c0ab406b
Former-commit-id: 1b39ded6e4
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
8af8e1f1ae
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 2554090d0d [formerly b6a8534258 [formerly 998337f9f4] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]]
Former-commit-id: b6a8534258 [formerly 998337f9f4]
Former-commit-id: b6a8534258
Former-commit-id: d885bdcb6e
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
0213efde52
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: ea1c82452b [formerly 4453ad2d10 [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b]
Former-commit-id: 4453ad2d10
Former-commit-id: d537df4ab0
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
6bcbc7d8ef
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: 580e2938d7 [formerly 66be3bec40]
Former-commit-id: 580e2938d7
Former-commit-id: d8da2252c3
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
db3cafd0e2
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 9d64e1df12 [formerly 63f6f44fe1 [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]
Former-commit-id: 63f6f44fe1 [formerly 43c3807a32]
Former-commit-id: 63f6f44fe1
Former-commit-id: 48c7c3b950
|
2012-01-18 16:00:45 -06:00 |
|
root
|
2b462d8665
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: a02aeb236c [formerly 9f19e3f712]
Former-commit-id: a02aeb236c
Former-commit-id: 133dc97f67
|
2012-01-06 08:55:05 -06:00 |
|