Steve Harris
|
2a7a7bfe2b
|
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: bdf8d89d33 [formerly fbe4210245] [formerly 13f70884f3] [formerly bdf8d89d33 [formerly fbe4210245] [formerly 13f70884f3] [formerly 9425f73c71 [formerly 13f70884f3 [formerly aa64613b0d04bca36310817989c79d12f0f107db]]]]
Former-commit-id: 9425f73c71
Former-commit-id: cef1cd081f [formerly 3e9ee884ab] [formerly f6fea8385be99f0d8a7dfa5a524af6d134db5dc0 [formerly de16453f4f]]
Former-commit-id: 5fb55cc355cf3a4d7f80e83f63c1bdbee59a4df8 [formerly 5656ac11a1]
Former-commit-id: 36d0af113d
|
2012-08-22 16:06:02 -05:00 |
|
Steve Harris
|
d5bb93d38f
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]]
Former-commit-id: b77a4d40d7
Former-commit-id: fffd905412 [formerly 34fa4b5804] [formerly 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb]]
Former-commit-id: f3c30482814339d1bee25e242cd37c19e921ea03 [formerly 8f1120f6d8]
Former-commit-id: d404638d82
|
2012-08-22 16:00:33 -05:00 |
|
Steve Harris
|
598fdb5d07
|
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: 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: a6797a478a [formerly b335416e06] [formerly 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]]
Former-commit-id: 7d1b3c075694ece999044bcdceef8462a2a837fe [formerly 445d1a6a0d]
Former-commit-id: 85533bdd24
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
c836458e84
|
Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 01e7976a52 [formerly 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]]
Former-commit-id: 01e7976a52
Former-commit-id: 3e500e71a6 [formerly f81ba4737c] [formerly f928d8f3a6488da251855ae1cb97a15af51db335 [formerly 69a16eb369]]
Former-commit-id: 5cba2e23bd383fa1e73e130f34545fcf8c145d4c [formerly 1078d7b553]
Former-commit-id: 29e1bc9993
|
2012-08-16 14:27:11 -05:00 |
|
Steve Harris
|
48947cc945
|
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 1bcd43a447 [formerly 735ed2ecd9] [formerly fa77df807d] [formerly 1bcd43a447 [formerly 735ed2ecd9] [formerly fa77df807d] [formerly 596d19466b [formerly fa77df807d [formerly 55326667ca13a37c7802849484949382e65a6329]]]]
Former-commit-id: 596d19466b
Former-commit-id: 4d2094072e [formerly b0b8a13e60] [formerly 2447699b9373672878bdc3d1b593c32f627a3309 [formerly 20fda57d37]]
Former-commit-id: 0d408d1b5d8d6a0e00b9bcad92b5b644cd644f59 [formerly 9e75c7e5f1]
Former-commit-id: 8413f8d96c
|
2012-08-16 10:27:51 -05:00 |
|
root
|
d0f911274c
|
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: e2b7a1679b [formerly ac8888ae10] [formerly 342bda7e5f] [formerly e2b7a1679b [formerly ac8888ae10] [formerly 342bda7e5f] [formerly 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]]]
Former-commit-id: 6eec24180e
Former-commit-id: c7a8b1e7fd [formerly f0cb647101] [formerly 688200e149897d55c1b90b9f2d6fb48f7cfa67a2 [formerly b3217ad886]]
Former-commit-id: eb42969b62682f808230b579e5f3d75f037e2892 [formerly d1f2ac6698]
Former-commit-id: a689deb547
|
2012-08-15 22:29:38 +00:00 |
|
root
|
7b6fb2ec7f
|
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: b6e17e9b02 [formerly d170ae704b] [formerly b93989daaf] [formerly b6e17e9b02 [formerly d170ae704b] [formerly b93989daaf] [formerly ba40e18fb2 [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]]
Former-commit-id: ba40e18fb2
Former-commit-id: c8d09a5973 [formerly fd69b031d2] [formerly b304e3656660b7049f012ff5306eb9b118135fb1 [formerly 3e9d1fa430]]
Former-commit-id: 2d2cd5211b32f326f99a886ca98f22774f097460 [formerly 64c3ccb4a4]
Former-commit-id: 84a8231c49
|
2012-08-15 22:29:07 +00:00 |
|
root
|
73466bae44
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
|
2012-08-15 22:15:20 +00:00 |
|
Benjamin Phillippe
|
ff6c5dc660
|
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]]
Former-commit-id: 7bad34f906
Former-commit-id: ebdadf4b89 [formerly 11bf8bb4c7] [formerly c02cc2e93c8e648fd97f9f7d42aacefcb2dffcb0 [formerly 91493ee0b9]]
Former-commit-id: 27079c626ffeaf0adc7ac87aaf5ceaa302211c16 [formerly e23523ad80]
Former-commit-id: bd2023ec70
|
2012-08-15 16:22:39 -05:00 |
|
Nate Jensen
|
b7cd17640a
|
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: a94964d940 [formerly b94597d03c] [formerly 9c1597b554] [formerly a94964d940 [formerly b94597d03c] [formerly 9c1597b554] [formerly 6897b1d480 [formerly 9c1597b554 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]]
Former-commit-id: 6897b1d480
Former-commit-id: 0321bf5fe3 [formerly 3b31bc0500] [formerly 03020103f952139717e6611a3b60d333734a6753 [formerly b7bc962da4]]
Former-commit-id: 8299877b3a8416a8dcc76a45f85321ce495f76dd [formerly ca08f538e8]
Former-commit-id: b0eb5c1493
|
2012-08-15 16:18:36 -05:00 |
|
Ben Steffensmeier
|
ba78c72f6e
|
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 8dffbba06e [formerly 9c41e73ee5] [formerly cb99170685] [formerly 8dffbba06e [formerly 9c41e73ee5] [formerly cb99170685] [formerly b194a17abc [formerly cb99170685 [formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]]
Former-commit-id: b194a17abc
Former-commit-id: 2c1640fde4 [formerly 98728915f8] [formerly 2ef9a5e297cead370e230dc243b7a36dec6a00bc [formerly 74acf329c4]]
Former-commit-id: e147955fac3e590b13ad6c4eea7c7fdd49d0a069 [formerly 48a5389b2f]
Former-commit-id: e64c4d343f
|
2012-08-15 15:25:46 -05:00 |
|
Steve Harris
|
867586657b
|
12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
d7acb65c06
|
12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb]
Former-commit-id: 03bb51ed0e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
8c620ce4dd
|
12.9.1-2 baseline
Former-commit-id: ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]]
Former-commit-id: a198b3a807
Former-commit-id: 8690f264b6 [formerly de4c812834] [formerly db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2]]
Former-commit-id: 007434bc5f036c2f1f728feff774f4546fd4a8a5 [formerly ed416f241e]
Former-commit-id: adf346e7d3
|
2012-08-15 14:12:24 -05:00 |
|
Jonathan Sanchez
|
c1d52bb83b
|
Issue #915 Set the user data.
Former-commit-id: 55ac7d7684 [formerly f37a75f265] [formerly 865136f6ef] [formerly 55ac7d7684 [formerly f37a75f265] [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: b0036d9ad7 [formerly f1749f4fcc] [formerly aede2757d06a4b4752402af488f523f9e9e0e79e [formerly e584d728f0]]
Former-commit-id: 158f1995d650b2e6c15cad816c980ce6972d5eb8 [formerly 38bb2743e5]
Former-commit-id: 49c757f958
|
2012-08-15 14:05:50 -05:00 |
|
Steve Harris
|
31353e2296
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
|
2012-08-15 13:59:00 -05:00 |
|
Ron Anderson
|
58e3f96915
|
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 0328f2f50a [formerly 5c80f582b3] [formerly 71d74b1dcf] [formerly 0328f2f50a [formerly 5c80f582b3] [formerly 71d74b1dcf] [formerly 985167892d [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]]]
Former-commit-id: 985167892d
Former-commit-id: 77bfb8a2dd [formerly c90619a3bc] [formerly 4241981581eb1d69e70fae848a376e84169e96cf [formerly 9bf0166f13]]
Former-commit-id: 4a62b310663cf12792dba877978047a1f360353b [formerly 13d7576686]
Former-commit-id: d47eda2d66
|
2012-08-14 16:20:23 -05:00 |
|
Nate Jensen
|
91d6c58f3d
|
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
Former-commit-id: 98c132222b [formerly 9657ce7e32] [formerly 571e16bd23] [formerly 98c132222b [formerly 9657ce7e32] [formerly 571e16bd23] [formerly 80f1766f9a [formerly 571e16bd23 [formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]]]
Former-commit-id: 80f1766f9a
Former-commit-id: 7dfe07291e [formerly 45d5fa0366] [formerly ce6e73388738585c32c632e84c06a69be0168b9f [formerly b6e459615b]]
Former-commit-id: 468b8d3408a2ff5240e1fe431a45b472ad0793bd [formerly 7961babdb2]
Former-commit-id: 7bdb5e26ec
|
2012-08-14 16:15:55 -05:00 |
|
Ben Steffensmeier
|
e85f540bba
|
Issue #947 revert changes to dataTime format
Former-commit-id: 85bba2f435 [formerly fd2bf26119] [formerly ce689ad5fa] [formerly 85bba2f435 [formerly fd2bf26119] [formerly ce689ad5fa] [formerly 434193b34b [formerly ce689ad5fa [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]]]
Former-commit-id: 434193b34b
Former-commit-id: 037ecbd293 [formerly c14674c64f] [formerly 804eb32ad6a8cd0f132940c420498966a58cd373 [formerly 15977fdba2]]
Former-commit-id: fa4901700b74b5bbe73242ef69052ec82d0cb342 [formerly f50c979293]
Former-commit-id: 7950a24c07
|
2012-08-14 16:12:02 -05:00 |
|
Lee Venable
|
c38501a934
|
Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
Former-commit-id: 5c02dabb9d [formerly fe9a85cefb] [formerly 457d099cca] [formerly 5c02dabb9d [formerly fe9a85cefb] [formerly 457d099cca] [formerly 2c2a3f4aec [formerly 457d099cca [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: db3711bd9a [formerly b42d389cb2] [formerly dde5f0cc18d13fc3ea7c28937cf3133c8b1b76c5 [formerly a3651c5813]]
Former-commit-id: 302cb06f8f026434bbf043f46fe10e0e395bf82b [formerly 5f180a03cc]
Former-commit-id: 3187523b41
|
2012-08-14 14:26:10 -05:00 |
|
Ben Steffensmeier
|
c07defa133
|
Issue #1058 fix reprojection of wind vectors
Former-commit-id: eee0d925ec [formerly 283781ba03] [formerly c25c08c8e7] [formerly eee0d925ec [formerly 283781ba03] [formerly c25c08c8e7] [formerly 09c412d754 [formerly c25c08c8e7 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]]
Former-commit-id: 09c412d754
Former-commit-id: 1a351fbb0c [formerly 6207cd7310] [formerly fbb7642d733d90a42019f35984b47984ce3bdc89 [formerly ea551d3866]]
Former-commit-id: 02644f637ce3f4823b2d7bc8f7b4293d8cdf08b1 [formerly e0561a1a35]
Former-commit-id: dfd6d73cc2
|
2012-08-14 13:44:21 -05:00 |
|
David Gillingham
|
2073aaa06a
|
Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: a795b2fbca [formerly 06e789e986] [formerly b587c1ea4f] [formerly a795b2fbca [formerly 06e789e986] [formerly b587c1ea4f] [formerly f2795370d1 [formerly b587c1ea4f [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]]]
Former-commit-id: f2795370d1
Former-commit-id: a9c5ee80a2 [formerly 35ac266c34] [formerly a8a492c16a701283d691fc37d11077cd2527f3c8 [formerly e51d931a5a]]
Former-commit-id: 73cf61b80c0285ecc9922603f27090403b99148f [formerly 2ba2b982a0]
Former-commit-id: 767fdf56a1
|
2012-08-14 13:36:51 -05:00 |
|
Nate Jensen
|
69a5fa29c0
|
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: 80b312f764 [formerly 32cc46ec4e] [formerly eeaa2c798f] [formerly 80b312f764 [formerly 32cc46ec4e] [formerly eeaa2c798f] [formerly 4211a8deac [formerly eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]]
Former-commit-id: 4211a8deac
Former-commit-id: 47e3a26d29 [formerly c0fa1e8cf2] [formerly c6c095ba54831e57f26b23a2fa36bd907bb06747 [formerly 2cc3c63ba7]]
Former-commit-id: fd3a4df97e9d71bfd55e39e6b0be2627914c7271 [formerly 0df3ab80eb]
Former-commit-id: 5e82400554
|
2012-08-09 17:18:38 -05:00 |
|
Ben Steffensmeier
|
e1f186077f
|
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 16187575d7 [formerly 64caa963b1] [formerly 066a5af2a6] [formerly 16187575d7 [formerly 64caa963b1] [formerly 066a5af2a6] [formerly ad1415948f [formerly 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]]
Former-commit-id: ad1415948f
Former-commit-id: 66f4ccc09b [formerly e03eb5f5c9] [formerly b76d791052722d8c2dddfa92d72e7c08b447c653 [formerly 65c33256d9]]
Former-commit-id: a082627e7f5bc5e6972b2264f7e0275f1e0df5e7 [formerly 70f8f93f81]
Former-commit-id: aa740ef6a8
|
2012-08-09 17:16:38 -05:00 |
|
Jonathan Sanchez
|
239f5e8d8c
|
Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.
Former-commit-id: 457cbcdf95 [formerly 4f2d6630c1] [formerly 6507a97665] [formerly 457cbcdf95 [formerly 4f2d6630c1] [formerly 6507a97665] [formerly fa7795d17f [formerly 6507a97665 [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]]
Former-commit-id: fa7795d17f
Former-commit-id: 46b7a35134 [formerly 3952dfc7ac] [formerly faff7eb8279d6805bdc05f6ec705924a3bd4c05e [formerly 7ad6329fe0]]
Former-commit-id: b4ce220d65ccf5d18e018934612b0ed2721272a4 [formerly 8a006c6093]
Former-commit-id: 1986477214
|
2012-08-09 08:26:21 -05:00 |
|
Nate Jensen
|
6b53686be9
|
Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: 3aeaced4dc [formerly 8cd83e1571] [formerly a88d7bcedc] [formerly 3aeaced4dc [formerly 8cd83e1571] [formerly a88d7bcedc] [formerly fbbf74eb50 [formerly a88d7bcedc [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]]]
Former-commit-id: fbbf74eb50
Former-commit-id: 4235ad69c1 [formerly e2462c0cc3] [formerly c2a90fec0f6904b81f0f00d073e9861b9dc1c1ef [formerly 1214c05b72]]
Former-commit-id: 6949e7061d5e4ae1f90360a2a26702fb38bef2e6 [formerly 135239eaee]
Former-commit-id: b36d8c3f03
|
2012-08-08 16:10:13 -05:00 |
|
Ben Steffensmeier
|
527c5cac9f
|
Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: ee8a4896bd [formerly cac790ac5a] [formerly 97ba96759c] [formerly ee8a4896bd [formerly cac790ac5a] [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]]
Former-commit-id: 5da238c8b9
Former-commit-id: a35bdcb526 [formerly 8cdf1f8d1c] [formerly 664f9aa2a161dd26a76c59a3bc493a05cfa127d3 [formerly b6cc71bf75]]
Former-commit-id: 3b8c6f781ed6d2098e46f442d0d8043316b740e0 [formerly 726e934763]
Former-commit-id: 873a7d64b6
|
2012-08-08 14:41:33 -05:00 |
|
Steve Harris
|
bde05a24e1
|
Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 0cf8ae644e [formerly 24515a43b6] [formerly 1feb52683a] [formerly 0cf8ae644e [formerly 24515a43b6] [formerly 1feb52683a] [formerly a9b587019a [formerly 1feb52683a [formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]]]
Former-commit-id: a9b587019a
Former-commit-id: c66c9d6930 [formerly 2b43860c67] [formerly 9429fd93f90ed639adc4a84b646db125f946be24 [formerly 805972e2fd]]
Former-commit-id: 9e82ef152836659e698a30865aa9aaee294ac26f [formerly e9f1fc444d]
Former-commit-id: ba5dc17e63
|
2012-08-08 13:59:52 -05:00 |
|
Steve Harris
|
1b653e33d1
|
Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 655b5932d9 [formerly fc39ef78e4] [formerly bbf4b18204] [formerly 655b5932d9 [formerly fc39ef78e4] [formerly bbf4b18204] [formerly d538fd8913 [formerly bbf4b18204 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]]]
Former-commit-id: d538fd8913
Former-commit-id: 6a3c6e8bb0 [formerly 352f391700] [formerly 022edb28baadf65af52f9e87c035ad735e9f6cfd [formerly 0ef9f1c86e]]
Former-commit-id: e314e437d4ccbeef51da631b974e97604d470625 [formerly 9d5b631109]
Former-commit-id: fe54bcc7e3
|
2012-08-08 13:57:46 -05:00 |
|
Nate Jensen
|
b3a472533f
|
Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds
Former-commit-id: 2c3d03a4e5 [formerly a241db9e69] [formerly b704e8d3f4] [formerly 2c3d03a4e5 [formerly a241db9e69] [formerly b704e8d3f4] [formerly 6c758b7c84 [formerly b704e8d3f4 [formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]]]
Former-commit-id: 6c758b7c84
Former-commit-id: 15618c6a64 [formerly 197fbde870] [formerly 3f4279a4583cd4336a4762bdbb700a49c0a5d892 [formerly 81bba55a1e]]
Former-commit-id: 6b1d6a7a2e32d943f0f5f967411735c74c51f5d9 [formerly d2ae1cc27a]
Former-commit-id: 1d30356cec
|
2012-08-08 09:43:40 -05:00 |
|
Steve Harris
|
0e71c58d17
|
Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: c72218985b [formerly e2267aa186] [formerly 926ff5dc5a] [formerly c72218985b [formerly e2267aa186] [formerly 926ff5dc5a] [formerly 9e2e0fa166 [formerly 926ff5dc5a [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]]]
Former-commit-id: 9e2e0fa166
Former-commit-id: 9688e06a3a [formerly d42beafc73] [formerly 447b1173369877f42f724fff7bac204016c3883e [formerly 15753699bd]]
Former-commit-id: d7ed4a42f3312d5ff6c151f837117009fbb2640a [formerly 3eefb26e94]
Former-commit-id: 05ef298baf
|
2012-08-07 15:29:25 -05:00 |
|
Ben Steffensmeier
|
ff17b28d1a
|
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: d84fd21e2a [formerly 0a974b26c2] [formerly c9774a4f03] [formerly d84fd21e2a [formerly 0a974b26c2] [formerly c9774a4f03] [formerly 83d6cde368 [formerly c9774a4f03 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]]
Former-commit-id: 83d6cde368
Former-commit-id: b7d35b54b4 [formerly f47d533ac3] [formerly 810e689fbbbecab708e7169a87c326f4c9cccecf [formerly ea70488664]]
Former-commit-id: 86b838715b1ffecdc83ca21e06631b6fd712a713 [formerly d645fc787e]
Former-commit-id: 1dc30083ca
|
2012-08-07 12:03:13 -05:00 |
|
Steve Harris
|
aa7a35f8c3
|
Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: f19c9fa55d [formerly 6615c96f33] [formerly 6dae0398d3] [formerly f19c9fa55d [formerly 6615c96f33] [formerly 6dae0398d3] [formerly 3f88fa9078 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]]]
Former-commit-id: 3f88fa9078
Former-commit-id: bbed4fde42 [formerly a810a273a2] [formerly bc692ca83d4420ec117ce5220cfdb080125d6865 [formerly 9387e8b2d0]]
Former-commit-id: b95386553694b80068661f4ae80054fe8efd2944 [formerly 57d749c037]
Former-commit-id: 87b964449a
|
2012-08-07 10:04:39 -05:00 |
|
Steve Harris
|
20be471839
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 1cd1cb250f [formerly f540dbfb87] [formerly 32ee17d124] [formerly 1cd1cb250f [formerly f540dbfb87] [formerly 32ee17d124] [formerly 515c8ec596 [formerly 32ee17d124 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]]]
Former-commit-id: 515c8ec596
Former-commit-id: 9d2e3f8206 [formerly 5e30a4282c] [formerly 7b3e219c5ce6a9f1027f1d5b1db732473c6535de [formerly 533d58b312]]
Former-commit-id: 5750e71f98b8db4a1eb63ad05bc2d1f8506412b6 [formerly e3da0259e8]
Former-commit-id: b77e7400c8
|
2012-08-06 12:57:56 -05:00 |
|
Steve Harris
|
007f8ad932
|
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: 9bec162043 [formerly 60c0cfc3b3] [formerly d90c5f989d] [formerly 9bec162043 [formerly 60c0cfc3b3] [formerly d90c5f989d] [formerly f3babcf1a1 [formerly d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]]
Former-commit-id: f3babcf1a1
Former-commit-id: eb49637382 [formerly 2f3ef9f4da] [formerly e438829b2a367a69a3e71e2949d85e4fe52cf613 [formerly 62e9207ba7]]
Former-commit-id: 00001d20471d4d139b79c92a968ec46865e83734 [formerly 0428530b73]
Former-commit-id: 3f8544203f
|
2012-08-06 11:13:47 -05:00 |
|
Steve Harris
|
fe4f531ab4
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 4f1a7eb689 [formerly 52e0da2293] [formerly ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f]]
Former-commit-id: 0f6649139bcd0bcc13452f409ebf934272d58b9b [formerly dcc56b8a23]
Former-commit-id: 9fd142b98e
|
2012-08-06 09:38:26 -05:00 |
|
Steve Harris
|
5b36559525
|
12.8.1-10 baseline
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f [formerly 78d34d65d2] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c]
Former-commit-id: 78d66ba6df
|
2012-08-06 09:34:26 -05:00 |
|
Jonathan Sanchez
|
763dd39bdb
|
Issue #1006 Implemented urban areas.
Former-commit-id: 62106ee967 [formerly 06ce1c6dd5] [formerly dbd30e3b67] [formerly 62106ee967 [formerly 06ce1c6dd5] [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]]]
Former-commit-id: 62db15b6f4
Former-commit-id: eaf9b20392 [formerly 1af2520b91] [formerly 5f6b0bcbbe4c81300aa41b9e4ca28ecfb7b04c3d [formerly f26cce33a9]]
Former-commit-id: e838654d79cb0d751c816256d5ae597dbba72dd8 [formerly 549b50ea40]
Former-commit-id: 9737533feb
|
2012-08-06 08:41:52 -05:00 |
|
Steve Harris
|
dd62566e7c
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]]
Former-commit-id: a1071e3204
Former-commit-id: 9cce94e63a [formerly dbe07ca70c] [formerly c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]]
Former-commit-id: a822a26595a3bbeeeebb85b374d317db53bd3919 [formerly d507458b9b]
Former-commit-id: b62ac9c78e
|
2012-08-06 08:23:04 -05:00 |
|
Ben Steffensmeier
|
6c903d9494
|
Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: e242274f06 [formerly 6e3cd8976b] [formerly 0f7dd0f4cd] [formerly e242274f06 [formerly 6e3cd8976b] [formerly 0f7dd0f4cd] [formerly 5fe65c6538 [formerly 0f7dd0f4cd [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]]]
Former-commit-id: 5fe65c6538
Former-commit-id: 3e8465c717 [formerly 83effa4f85] [formerly 2373780f335104e728351ffbb13d250cc6c48845 [formerly 6ccc09e0b4]]
Former-commit-id: 1550f6c9975b0fba224770b08a04aac963ae3930 [formerly b03eceb82a]
Former-commit-id: e6a6c5345e
|
2012-08-03 16:39:33 -05:00 |
|
Ben Steffensmeier
|
f11e02c4e0
|
Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: d841924588 [formerly c5c9e8b05c] [formerly 8346805ed2] [formerly d841924588 [formerly c5c9e8b05c] [formerly 8346805ed2] [formerly 090b9f5ccb [formerly 8346805ed2 [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]]]
Former-commit-id: 090b9f5ccb
Former-commit-id: eef338e55c [formerly 5954717c26] [formerly 48422de135df5bd5bb5a29c2544903c467f744af [formerly 942b0e5315]]
Former-commit-id: 0722b15165acc9f6b2bbe675f6f368a2ffbfca0a [formerly 42e01d8b1b]
Former-commit-id: a1c0547c50
|
2012-08-03 15:52:47 -05:00 |
|
Richard Peter
|
749cf64485
|
Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
Former-commit-id: 1d953096d4 [formerly 2154c4e286] [formerly fd051c19d4] [formerly 1d953096d4 [formerly 2154c4e286] [formerly fd051c19d4] [formerly 131ba842e9 [formerly fd051c19d4 [formerly 622e8119ab53ed34e5249c67186343203a56b821]]]]
Former-commit-id: 131ba842e9
Former-commit-id: 2bdb58cd5d [formerly 3984511a6e] [formerly d65748890b1ca30b09edcf12695bce09fb06a43f [formerly c61f4f8245]]
Former-commit-id: 32aecabc22ed78c24eb3fc62fa7363e4630974c8 [formerly a096babf14]
Former-commit-id: 990ad59b97
|
2012-08-03 14:32:35 -05:00 |
|
James Korman
|
44191f6a78
|
Issue #798 - Force interpolationLevels in derived satellite
Former-commit-id: 2ebcf052dc [formerly dfd18c7a85] [formerly 1bc1784478] [formerly 2ebcf052dc [formerly dfd18c7a85] [formerly 1bc1784478] [formerly 317acc38fe [formerly 1bc1784478 [formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]]]
Former-commit-id: 317acc38fe
Former-commit-id: eaae0fb042 [formerly 93a1311cf9] [formerly aac25737a50f3eb1e8e9d907d3cd6302b91ceefc [formerly b27f4fb5e5]]
Former-commit-id: 7e2e780110339d3f6c623739dc5a67abb7ab249e [formerly 955e30950a]
Former-commit-id: 95eaa68f1b
|
2012-08-03 14:14:53 -05:00 |
|
Ben Steffensmeier
|
85fb96f320
|
Issue #1001 synchronize paint with add.
Former-commit-id: c57d546746 [formerly 3e601b2baf] [formerly 2c9737ca5c] [formerly c57d546746 [formerly 3e601b2baf] [formerly 2c9737ca5c] [formerly 798d26e954 [formerly 2c9737ca5c [formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]]]
Former-commit-id: 798d26e954
Former-commit-id: 459a0ace5a [formerly ceaf86128c] [formerly b3c3aaee59020f6f8374104ecaafafa0ca424d80 [formerly e9cde98072]]
Former-commit-id: b36354cc5b4e288029c2a5d8e0524af21df80db0 [formerly db95e6621b]
Former-commit-id: 2640d54aa1
|
2012-08-03 14:10:04 -05:00 |
|
Nate Jensen
|
1f10da6ac5
|
Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development
Former-commit-id: ce6c112f84 [formerly 689dcd5d4d] [formerly c74a54b9ed] [formerly ce6c112f84 [formerly 689dcd5d4d] [formerly c74a54b9ed] [formerly 47920c3168 [formerly c74a54b9ed [formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]]]
Former-commit-id: 47920c3168
Former-commit-id: 2c8f6d8003 [formerly ca6dbc6be6] [formerly a8c6bce5aee38ac8dac9b05e15b94c8629861511 [formerly 528f6045e9]]
Former-commit-id: 80af2f22043b4532bbf7c0f81256dfdd71e1ed91 [formerly 5dc36127da]
Former-commit-id: db839357c2
|
2012-08-03 10:43:39 -05:00 |
|
Bryan Kowal
|
e52e61fb6f
|
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: 4b329f54fe [formerly 40e69fad53] [formerly e371bd14dd] [formerly 4b329f54fe [formerly 40e69fad53] [formerly e371bd14dd] [formerly 08651d2c21 [formerly e371bd14dd [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]]]
Former-commit-id: 08651d2c21
Former-commit-id: d887a8b33f [formerly 185daa58d9] [formerly 23db5d4b07ffb7bf2bf1a3fb565f40d500f73de9 [formerly a70bbf3e4d]]
Former-commit-id: 480db83057ef3c774645fdd164b8b4c00dc61496 [formerly ed6b7edbe1]
Former-commit-id: 4500559264
|
2012-08-02 16:13:58 -05:00 |
|
Bryan Kowal
|
bbd6cf5bf5
|
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: 642d57b71d [formerly dd1acbe70a] [formerly c6b2d65308] [formerly 642d57b71d [formerly dd1acbe70a] [formerly c6b2d65308] [formerly 5ca4a66fdc [formerly c6b2d65308 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: 8359361a2f [formerly 14c20083b0] [formerly f0e488e17505a4686cc6a6a7196566ed2a0f1fee [formerly f295ee11ea]]
Former-commit-id: e74407f1fccb26dc005e577029fbe1c85cb190a1 [formerly f064d0cf6c]
Former-commit-id: 25ff80983e
|
2012-08-02 10:33:55 -05:00 |
|
James Korman
|
d91c43c522
|
Issue #798 - Updates to satellite
Former-commit-id: 6f631b4aca [formerly fd1156d67d] [formerly 7928d912e1] [formerly 6f631b4aca [formerly fd1156d67d] [formerly 7928d912e1] [formerly 2ddb2f6df0 [formerly 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: 4f225f7cd5 [formerly 4226007a10] [formerly f845b9502eac9ffac52fe2265fd485df150217aa [formerly 241303f9a0]]
Former-commit-id: 6d53485bfa7cb132556a4a5b7dfb2cc7ea23f2ce [formerly af41598a7b]
Former-commit-id: 7dc687b0f4
|
2012-08-01 16:31:59 -05:00 |
|
Steve Harris
|
5d5bcddfd2
|
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: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628]
Former-commit-id: 078b4fff3c
|
2012-08-01 12:43:12 -05:00 |
|