Commit graph

16 commits

Author SHA1 Message Date
Steve Harris
43ff909553 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: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
2012-02-23 10:06:18 -06:00
Steve Harris
3a4af24369 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594 [formerly 610fdf3f4e] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d]
Former-commit-id: 01d72ca3c9
2012-02-22 10:12:49 -06:00
Steve Harris
33aafe9ce0 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4 [formerly dd911bed4d] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00]
Former-commit-id: 60bf5aeced
2012-02-20 12:43:38 -06:00
Bryan Kowal
3476936eac Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]]
Former-commit-id: 682c10767d
Former-commit-id: e326a29d2f [formerly cc8c6597a2] [formerly a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]]
Former-commit-id: 177408d3d8058b38f3b908359601d7498ff2db8c [formerly 8403801a2b]
Former-commit-id: ce9165ce58
2012-02-17 12:17:14 -06:00
Steve Harris
6618009c1d Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: c4ced8af2d [formerly 6aed9311a8] [formerly 7356d655da] [formerly c4ced8af2d [formerly 6aed9311a8] [formerly 7356d655da] [formerly 1707b98721 [formerly 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]]
Former-commit-id: 1707b98721
Former-commit-id: 89aae82ed1 [formerly de85613a99] [formerly 93362db30561096d2866d511737a68309011a825 [formerly db1e3b1215]]
Former-commit-id: eb4d2045ca82ab5ff3c3501bed0d3d8a2c55bbbf [formerly a1462275f7]
Former-commit-id: 604b6c1f10
2012-02-15 14:34:47 -06:00
Ben Steffensmeier
dc6c9bb96e Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 9f0a74d808 [formerly 44debb13a3] [formerly 0d9fa5ea6c] [formerly 9f0a74d808 [formerly 44debb13a3] [formerly 0d9fa5ea6c] [formerly 83fbf80c98 [formerly 0d9fa5ea6c [formerly 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0]]]]
Former-commit-id: 83fbf80c98
Former-commit-id: dfd37b6bf8 [formerly d9a74d7a76] [formerly 6fc44fe46f98238613a95f5b004d4bad4c1c8b65 [formerly 3d3f73118b]]
Former-commit-id: 54533aa0aaa921aca2ce10344908c3fa2a651e4f [formerly b9d633b902]
Former-commit-id: 102decb6a6
2012-02-01 17:39:14 -06:00
Nate Jensen
d29b557612 Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: 0dea704a93 [formerly e61ff490b1] [formerly 1b32446288] [formerly 0dea704a93 [formerly e61ff490b1] [formerly 1b32446288] [formerly f3ba2258df [formerly 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]]]
Former-commit-id: f3ba2258df
Former-commit-id: 2dec5b706e [formerly 6bdb96c7ca] [formerly f80cae6694c70fd33d6dc36a7beadcfa8acd394a [formerly 50e735ce0c]]
Former-commit-id: e772b70631c0034dfafc04e1149bb6b652b31cae [formerly 81e6aa8183]
Former-commit-id: 90fdbcfea8
2012-01-31 09:45:27 -06:00
Nate Jensen
6192fc1634 Issue #181 fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: e831de315f [formerly 769731f21b] [formerly 0301af999e] [formerly e831de315f [formerly 769731f21b] [formerly 0301af999e] [formerly 50c6816fa9 [formerly 0301af999e [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]]]]
Former-commit-id: 50c6816fa9
Former-commit-id: 1a53d8e998 [formerly 121a29bdd1] [formerly 8ca0afabd47b3ee479204f1a0d18506eadf1f7c9 [formerly ab7f9e5a56]]
Former-commit-id: 5d2667a88c4f133a0fcfc965eed161b3a47f66d0 [formerly 13518e7659]
Former-commit-id: cc6b982138
2012-01-30 15:56:50 -06:00
Bryan Kowal
6beb1f62eb Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: da5e9f5bba [formerly c8dde3b1f6] [formerly f0b31d25f6] [formerly da5e9f5bba [formerly c8dde3b1f6] [formerly f0b31d25f6] [formerly 71d08b6916 [formerly f0b31d25f6 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]]]
Former-commit-id: 71d08b6916
Former-commit-id: 406c4ad5b3 [formerly ee70b7909c] [formerly 2b8ed7b794d5a320a8d0151eb8c6237c27c1f71a [formerly 1f254d0e0f]]
Former-commit-id: b53597bd7a0e265c15e91d4512e6483e971d7864 [formerly 9efacb47fe]
Former-commit-id: fd1af4b5ea
2012-01-26 17:38:17 -06:00
Bryan Kowal
8c6ad5f573 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: 4f1c75af04 [formerly e314799f44] [formerly c690ba1e13] [formerly 4f1c75af04 [formerly e314799f44] [formerly c690ba1e13] [formerly bdf268a621 [formerly c690ba1e13 [formerly 23e05be1b40d5bd0cc969bd2c01ba4420fa7c644]]]]
Former-commit-id: bdf268a621
Former-commit-id: 55b89fa2a1 [formerly d1797687ab] [formerly 638f0e0e81f2cabdf06e646fbd863c281c621c8e [formerly 2f2b824273]]
Former-commit-id: 348889b0074b3c3c249696318e459aa1a6330a25 [formerly eed9a2c619]
Former-commit-id: afbbc1bd7a
2012-01-26 17:26:07 -06:00
Nate Jensen
a2bcb9d289 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]]
Former-commit-id: 33756de9c8
Former-commit-id: bf2e1850f3 [formerly 7301ad5c66] [formerly 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41]]
Former-commit-id: 378c9f2dfbf1104a0ce3d7135ab45d92a28d77a0 [formerly ef5349fb63]
Former-commit-id: 532df5ba35
2012-01-24 09:59:50 -06:00
Nate Jensen
94dab66b8d Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: adb8188f98 [formerly 873469f771] [formerly f96e6a822b] [formerly adb8188f98 [formerly 873469f771] [formerly f96e6a822b] [formerly a015cc136b [formerly f96e6a822b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]]]
Former-commit-id: a015cc136b
Former-commit-id: c1ca48ab19 [formerly ba529c4a12] [formerly bf42c95476b1354c34e606131e248046867b8dff [formerly e951995736]]
Former-commit-id: f60380ded6afa42e94c88200debeda6c9ca5f67b [formerly df4f492e7d]
Former-commit-id: 503584ebb4
2012-01-24 09:49:27 -06:00
Bryan Kowal
5609d47b35 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
2012-01-20 11:37:38 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00