Steve Harris
5656ac11a1
Merge branch 'ss_builds' (12.9.1-5 forgotten bin files) into development_on_ss_builds
...
Conflicts:
edexOsgi/build.edex/esb/bin/linux-x86-64/wrapper
Former-commit-id: 13f70884f3
[formerly 13f70884f3
[formerly aa64613b0d04bca36310817989c79d12f0f107db]]
Former-commit-id: 9425f73c71
Former-commit-id: de16453f4f
2012-08-22 16:06:02 -05:00
Steve Harris
8f1120f6d8
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b8ab6066f6
[formerly b8ab6066f6
[formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
2012-08-22 16:00:33 -05:00
Steve Harris
445d1a6a0d
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: d38f8b80f0
[formerly d38f8b80f0
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
2012-08-21 16:17:58 -05:00
Steve Harris
9b5c2094ed
12.9.1-5 baseline
...
Former-commit-id: 61f269f54c
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Bryan Kowal
1078d7b553
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 44328f1702
[formerly 44328f1702
[formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]
Former-commit-id: 01e7976a52
Former-commit-id: 69a16eb369
2012-08-16 14:27:11 -05:00
Steve Harris
9e75c7e5f1
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: fa77df807d
[formerly fa77df807d
[formerly 55326667ca13a37c7802849484949382e65a6329]]
Former-commit-id: 596d19466b
Former-commit-id: 20fda57d37
2012-08-16 10:27:51 -05:00
root
d1f2ac6698
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 342bda7e5f
[formerly 342bda7e5f
[formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 6eec24180e
Former-commit-id: b3217ad886
2012-08-15 22:29:38 +00:00
root
64c3ccb4a4
Merge branch 'reconcile' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: b93989daaf
[formerly b93989daaf
[formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: ba40e18fb2
Former-commit-id: 3e9d1fa430
2012-08-15 22:29:07 +00:00
root
1792158ef8
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f57879
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
e23523ad80
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 72c63e1a6f
[formerly 72c63e1a6f
[formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 7bad34f906
Former-commit-id: 91493ee0b9
2012-08-15 16:22:39 -05:00
Nate Jensen
ca08f538e8
Merge "Issue #1033 do not load grib data on tileset creation but instead load allow it to load async." into development_on_ss_builds
...
Former-commit-id: 9c1597b554
[formerly 9c1597b554
[formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]
Former-commit-id: 6897b1d480
Former-commit-id: b7bc962da4
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
48a5389b2f
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: cb99170685
[formerly cb99170685
[formerly 97d786afadf136f75ffd6a440d35b628e144b888]]
Former-commit-id: b194a17abc
Former-commit-id: 74acf329c4
2012-08-15 15:25:46 -05:00
Steve Harris
de9b64b501
12.9.1-4 baseline
...
Former-commit-id: dcda3a2290
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
8c5c5ad6eb
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f60
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
2012-08-15 14:26:10 -05:00
Steve Harris
ed416f241e
12.9.1-2 baseline
...
Former-commit-id: d1d877d319
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: a198b3a807
Former-commit-id: 448ed038c2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
38bb2743e5
Issue #915 Set the user data.
...
Former-commit-id: 865136f6ef
[formerly 865136f6ef
[formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: e584d728f0
2012-08-15 14:05:50 -05:00
Steve Harris
63bcadf121
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea218
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Ron Anderson
13d7576686
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 71d74b1dcf
[formerly 71d74b1dcf
[formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 985167892d
Former-commit-id: 9bf0166f13
2012-08-14 16:20:23 -05:00
Nate Jensen
7961babdb2
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
...
Former-commit-id: 571e16bd23
[formerly 571e16bd23
[formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]
Former-commit-id: 80f1766f9a
Former-commit-id: b6e459615b
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
f50c979293
Issue #947 revert changes to dataTime format
...
Former-commit-id: ce689ad5fa
[formerly ce689ad5fa
[formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: 434193b34b
Former-commit-id: 15977fdba2
2012-08-14 16:12:02 -05:00
Lee Venable
5f180a03cc
Merge "Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
...
Former-commit-id: 457d099cca
[formerly 457d099cca
[formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: a3651c5813
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
e0561a1a35
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: c25c08c8e7
[formerly c25c08c8e7
[formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]
Former-commit-id: 09c412d754
Former-commit-id: ea551d3866
2012-08-14 13:44:21 -05:00
David Gillingham
2ba2b982a0
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: b587c1ea4f
[formerly b587c1ea4f
[formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]
Former-commit-id: f2795370d1
Former-commit-id: e51d931a5a
2012-08-14 13:36:51 -05:00
Nate Jensen
0df3ab80eb
Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
...
Former-commit-id: eeaa2c798f
[formerly eeaa2c798f
[formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]
Former-commit-id: 4211a8deac
Former-commit-id: 2cc3c63ba7
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
70f8f93f81
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 066a5af2a6
[formerly 066a5af2a6
[formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]
Former-commit-id: ad1415948f
Former-commit-id: 65c33256d9
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
8a006c6093
Issue #883 Sorted warning records and prevented altered entries to be in
...
the same frame as new entries.
Former-commit-id: 6507a97665
[formerly 6507a97665
[formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]
Former-commit-id: fa7795d17f
Former-commit-id: 7ad6329fe0
2012-08-09 08:26:21 -05:00
Nate Jensen
135239eaee
Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
...
Former-commit-id: a88d7bcedc
[formerly a88d7bcedc
[formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]
Former-commit-id: fbbf74eb50
Former-commit-id: 1214c05b72
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
726e934763
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 97ba96759c
[formerly 97ba96759c
[formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]
Former-commit-id: 5da238c8b9
Former-commit-id: b6cc71bf75
2012-08-08 14:41:33 -05:00
Steve Harris
e9f1fc444d
Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 1feb52683a
[formerly 1feb52683a
[formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]
Former-commit-id: a9b587019a
Former-commit-id: 805972e2fd
2012-08-08 13:59:52 -05:00
Steve Harris
9d5b631109
Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: bbf4b18204
[formerly bbf4b18204
[formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]
Former-commit-id: d538fd8913
Former-commit-id: 0ef9f1c86e
2012-08-08 13:57:46 -05:00
Nate Jensen
d2ae1cc27a
Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds
...
Former-commit-id: b704e8d3f4
[formerly b704e8d3f4
[formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]
Former-commit-id: 6c758b7c84
Former-commit-id: 81bba55a1e
2012-08-08 09:43:40 -05:00
Steve Harris
3eefb26e94
Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: 926ff5dc5a
[formerly 926ff5dc5a
[formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]
Former-commit-id: 9e2e0fa166
Former-commit-id: 15753699bd
2012-08-07 15:29:25 -05:00
Ben Steffensmeier
d645fc787e
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
...
Former-commit-id: c9774a4f03
[formerly c9774a4f03
[formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]
Former-commit-id: 83d6cde368
Former-commit-id: ea70488664
2012-08-07 12:03:13 -05:00
Steve Harris
57d749c037
Fixed merge of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: 6dae0398d3
[formerly 6dae0398d3
[formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 3f88fa9078
Former-commit-id: 9387e8b2d0
2012-08-07 10:04:39 -05:00
Steve Harris
e3da0259e8
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 32ee17d124
[formerly 32ee17d124
[formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]
Former-commit-id: 515c8ec596
Former-commit-id: 533d58b312
2012-08-06 12:57:56 -05:00
Steve Harris
0428530b73
Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: d90c5f989d
[formerly d90c5f989d
[formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]
Former-commit-id: f3babcf1a1
Former-commit-id: 62e9207ba7
2012-08-06 11:13:47 -05:00
Steve Harris
dcc56b8a23
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
...
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: f0b7d5e4c5
[formerly f0b7d5e4c5
[formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]
Former-commit-id: 85f82b18b3
Former-commit-id: b2432e096f
2012-08-06 09:38:26 -05:00
Steve Harris
46daa48f1c
12.8.1-10 baseline
...
Former-commit-id: b5e8fee24d
[formerly b5e8fee24d
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
549b50ea40
Issue #1006 Implemented urban areas.
...
Former-commit-id: dbd30e3b67
[formerly dbd30e3b67
[formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]
Former-commit-id: 62db15b6f4
Former-commit-id: f26cce33a9
2012-08-06 08:41:52 -05:00
Steve Harris
d507458b9b
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 24799cd93d
[formerly 24799cd93d
[formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: a1071e3204
Former-commit-id: 8f4ddad22c
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
b03eceb82a
Issue #988 set statem bits on underlieing image for GLDelegate Image
...
Former-commit-id: 0f7dd0f4cd
[formerly 0f7dd0f4cd
[formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]
Former-commit-id: 5fe65c6538
Former-commit-id: 6ccc09e0b4
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
42e01d8b1b
Issue #978 GChange GridResource to use its own times rather than descriptor times.
...
Former-commit-id: 8346805ed2
[formerly 8346805ed2
[formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 942b0e5315
2012-08-03 15:52:47 -05:00
Richard Peter
a096babf14
Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
...
Former-commit-id: fd051c19d4
[formerly fd051c19d4
[formerly 622e8119ab53ed34e5249c67186343203a56b821]]
Former-commit-id: 131ba842e9
Former-commit-id: c61f4f8245
2012-08-03 14:32:35 -05:00
James Korman
955e30950a
Issue #798 - Force interpolationLevels in derived satellite
...
Former-commit-id: 1bc1784478
[formerly 1bc1784478
[formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]
Former-commit-id: 317acc38fe
Former-commit-id: b27f4fb5e5
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
db95e6621b
Issue #1001 synchronize paint with add.
...
Former-commit-id: 2c9737ca5c
[formerly 2c9737ca5c
[formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]
Former-commit-id: 798d26e954
Former-commit-id: e9cde98072
2012-08-03 14:10:04 -05:00
Nate Jensen
5dc36127da
Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development
...
Former-commit-id: c74a54b9ed
[formerly c74a54b9ed
[formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]
Former-commit-id: 47920c3168
Former-commit-id: 528f6045e9
2012-08-03 10:43:39 -05:00
Bryan Kowal
ed6b7edbe1
Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
...
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7
Former-commit-id: e371bd14dd
[formerly e371bd14dd
[formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]
Former-commit-id: 08651d2c21
Former-commit-id: a70bbf3e4d
2012-08-02 16:13:58 -05:00
Bryan Kowal
f064d0cf6c
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
...
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: c6b2d65308
[formerly c6b2d65308
[formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: f295ee11ea
2012-08-02 10:33:55 -05:00
James Korman
af41598a7b
Issue #798 - Updates to satellite
...
Former-commit-id: 7928d912e1
[formerly 7928d912e1
[formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: 241303f9a0
2012-08-01 16:31:59 -05:00
Steve Harris
e892eb4628
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 6d77b94217
[formerly 6d77b94217
[formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
2012-08-01 12:43:12 -05:00