Richard Peter
|
bf183109be
|
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 90d2108293 [formerly 88419fb8f3] [formerly 0222a89cd4] [formerly 90d2108293 [formerly 88419fb8f3] [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 0222a89cd4 [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: 1dab76f463 [formerly d16ddba2f5] [formerly 91c2b9274636fd96628da212f4a5cb80811946f9 [formerly 2b75d79e0f]]
Former-commit-id: f85235918af1de3ef6706abbddad2e54d7451004 [formerly d1af1f615d]
Former-commit-id: 878c3fe29e
|
2014-07-11 17:46:14 -05:00 |
|
Benjamin Phillippe
|
7b98ae2e01
|
Omaha #3379 Removing DWR
Former-commit-id: e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly 4e1d93abf8 [formerly d110e8428b [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 63354789de [formerly 5eea012728] [formerly c20f089fcf16ae33c66408335723c47e9c63b082 [formerly 06e73cd55f]]
Former-commit-id: 9c31f8986bfae1d5ec15dea29bd1f66a4ab15fd7 [formerly 11a8186cbc]
Former-commit-id: 0c80abcc15
|
2014-07-11 11:56:44 -05:00 |
|
Brian Clements
|
8c248326c9
|
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly 0113e109d3 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]]
Former-commit-id: 0113e109d3
Former-commit-id: 034bf93c29 [formerly ed9ba91d4e] [formerly 177f6db44761392bd73fa9adfd0d53bb7bd07a4b [formerly c32592fd1c]]
Former-commit-id: 6ad739e068be5779be4f5fd46af88fce9eedd972 [formerly 94f5989af7]
Former-commit-id: f2d27e2f8b
|
2014-07-10 16:31:11 -05:00 |
|
Brian Clements
|
fc54248d9a
|
Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: fc246aa082 [formerly dba1fb3fc1] [formerly 994226e82b] [formerly fc246aa082 [formerly dba1fb3fc1] [formerly 994226e82b] [formerly ac8f861112 [formerly 994226e82b [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]]
Former-commit-id: ac8f861112
Former-commit-id: e2d16bde70 [formerly f9dad29ad8] [formerly 58cd6b777893efcab676bfb302e4f2adb7c4adbf [formerly e74fcfbce1]]
Former-commit-id: 30d73e14407e75bece52e4efa2274ee651889e84 [formerly 97451515b6]
Former-commit-id: 5e7da3ffac
|
2014-07-09 14:13:47 -05:00 |
|
Nate Jensen
|
879c34599b
|
Omaha #3361 reduce number of extraneous localization requests at GFE
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: 93012a8b76 [formerly c3bd61a2c0] [formerly 0c397d2b7e] [formerly 93012a8b76 [formerly c3bd61a2c0] [formerly 0c397d2b7e] [formerly 5547ea1c7d [formerly 0c397d2b7e [formerly efa10ca2702ecee4535711be06373e5d079ac117]]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: 0d5c29fee9 [formerly d5f944d203] [formerly 03c7194ee9d1c11cb9ccecc4e9a319197e8bdda4 [formerly af08cc189f]]
Former-commit-id: ce0d12bcfaa0a5262bdc5ed9899758826739c126 [formerly 9931cfdf84]
Former-commit-id: ed4cfdb1f3
|
2014-07-09 09:24:31 -05:00 |
|
Brian Clements
|
175c675ac9
|
Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 0d4cd4bab8 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 55c2c91ec9 [formerly 2cea766aed] [formerly 1a54c47307e1f8f59e93102d31d75908a974c968 [formerly e6e84d2c71]]
Former-commit-id: 69df56fbd21f5de41d96518bf209cc59acc31c5a [formerly 9a1bc8c521]
Former-commit-id: 2bebd393d8
|
2014-07-07 12:29:12 -05:00 |
|
Richard Peter
|
4c1f802f39
|
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 1dca75e12d [formerly 4219dbeec8] [formerly ba1bd20407] [formerly 1dca75e12d [formerly 4219dbeec8] [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly ba1bd20407 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 95aad91ab1 [formerly 3e19911306] [formerly 775632f0e76f18c983cc243c8d72112f19425048 [formerly 741fc59f34]]
Former-commit-id: 90f5c3e857fd6ca6a1c0b4699a3321c8f854e15c [formerly b4e4629d24]
Former-commit-id: 1399f0cd57
|
2014-07-07 09:39:28 -05:00 |
|
Brian Clements
|
42250dbe29
|
Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: aad63c257d [formerly c3a25024ae] [formerly bfd9f59de8] [formerly aad63c257d [formerly c3a25024ae] [formerly bfd9f59de8] [formerly e4c9a13adb [formerly bfd9f59de8 [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]]
Former-commit-id: e4c9a13adb
Former-commit-id: b5c4951144 [formerly 50d2c6e24c] [formerly e2f81d3a7a49c030107992abebd7d8580750a677 [formerly bd9520f4fe]]
Former-commit-id: cd76914370d3d1df64ffd22b1b50e22e0b336ba1 [formerly 276dd801f2]
Former-commit-id: 55bcd816ff
|
2014-07-03 15:11:48 -05:00 |
|
Roger Ferrel
|
79f087b47e
|
Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: b56fe77cbf [formerly 2723c92167] [formerly 02d9609862] [formerly b56fe77cbf [formerly 2723c92167] [formerly 02d9609862] [formerly 1869745cce [formerly 02d9609862 [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]]
Former-commit-id: 1869745cce
Former-commit-id: e39f121e2f [formerly 37c05adfaf] [formerly 2019d68e3d931cb5d78090dac17da8e40c293a1c [formerly 7f50b8fb93]]
Former-commit-id: de000dd4bb55aaf6060d960844bb751811565b11 [formerly a7daeebc77]
Former-commit-id: 862a065051
|
2014-07-02 14:27:28 -05:00 |
|
Brian Clements
|
0a5aa48230
|
Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 2773cf8935 [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]]
Former-commit-id: 2773cf8935
Former-commit-id: fff99d35ee [formerly 767d8abd20] [formerly 6f1522e1278daecbab2015532d3b9735aa656635 [formerly 648ffac146]]
Former-commit-id: dcb07a7cef6bd3e14b77eb9e604caed1f47d482d [formerly 6dea5ec026]
Former-commit-id: c502009375
|
2014-07-02 14:20:10 -05:00 |
|
Richard Peter
|
605f3eb2e2
|
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 1c07ac97d1 [formerly 9c41b7c23e] [formerly 59325cf1f1] [formerly 1c07ac97d1 [formerly 9c41b7c23e] [formerly 59325cf1f1] [formerly 27ba905947 [formerly 59325cf1f1 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]]
Former-commit-id: 27ba905947
Former-commit-id: 2bcaeba573 [formerly a22847695d] [formerly 419af79068d9745f445fda7d8a758b4df367781b [formerly 127ce13eb8]]
Former-commit-id: b099c2c2e0c375a4c1927f8de4cdbf8545ddaa80 [formerly a357fc835b]
Former-commit-id: 6710269555
|
2014-07-02 11:51:26 -05:00 |
|
Nate Jensen
|
22149e3ccc
|
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: 0031f7adf5 [formerly e193fe4719] [formerly 324194117a] [formerly 0031f7adf5 [formerly e193fe4719] [formerly 324194117a] [formerly 14b514df2c [formerly 324194117a [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]]
Former-commit-id: 14b514df2c
Former-commit-id: 7f89f61ab6 [formerly be426fc965] [formerly c2d54b4085047fd6f9014cc3a8a78b63b52a1bab [formerly f39f6858e2]]
Former-commit-id: b261915878e797637ac87390cd55b581495bd6fd [formerly 760adb2b77]
Former-commit-id: 54a1daffc6
|
2014-07-02 11:20:26 -05:00 |
|
Nate Jensen
|
a80e3727ab
|
Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]]
Former-commit-id: 74e2bd1670
Former-commit-id: 480b5b5863 [formerly db24013aa6] [formerly 75b52b38b35362eb3e87ef30cfcfd7e988c52e0c [formerly e9b31a4429]]
Former-commit-id: 3b726b72ea38dd26b8a5f934112cbe9fddad43c9 [formerly db9550e367]
Former-commit-id: f4540db824
|
2014-07-02 11:18:59 -05:00 |
|
Brian Clements
|
67ae3d92ac
|
Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 8b5ad1ec33 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]]
Former-commit-id: eac871eed7
Former-commit-id: 2d1a994bfc [formerly ea1ac8ee8f] [formerly 0a47f310c2bc5e76e5ed2484684f46b47351e783 [formerly cd282ef018]]
Former-commit-id: 05bc19a3cf47dc045c80f93a19cbd2c2d220635e [formerly d066846c3f]
Former-commit-id: 2cd0d94e5d
|
2014-07-02 10:02:52 -05:00 |
|
Nate Jensen
|
2d6a340288
|
Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 765ac1258b [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]]
Former-commit-id: 765ac1258b
Former-commit-id: b31f618153 [formerly bbd50040a5] [formerly 54fa8041ee3052325df6cccd79220220bae3bcdd [formerly 264ac4d8a3]]
Former-commit-id: 4a6c0f0533d3de82d21896cbe01b6e6c1a176864 [formerly d1d3aa94a6]
Former-commit-id: ef967d42e3
|
2014-07-02 10:01:05 -05:00 |
|
Nate Jensen
|
a3949b4437
|
Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly f32bf19eb7 [formerly f10efa300c [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]]
Former-commit-id: f32bf19eb7
Former-commit-id: bdb4d8e102 [formerly ec64800f28] [formerly 698bed9b285b34465367799322f3d30195e6be16 [formerly 55dcecc7a7]]
Former-commit-id: 0b197806e0b2ceee741054932d4a8acc506b8f4d [formerly e659a0702d]
Former-commit-id: 8c99b38625
|
2014-07-01 17:37:08 -05:00 |
|
Richard Peter
|
0b0b58e89c
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7408b3e09d
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: 3369bc4a1d [formerly a4d91c59d6] [formerly f86265bab0c346864e940cc8c360ec5235644553 [formerly 6f9129ac78]]
Former-commit-id: 6030625bf5e788ecaebe0b3ec7cdd364685df43e [formerly d600ed9acf]
Former-commit-id: 15267970e4
|
2014-07-01 13:38:18 -05:00 |
|
Nate Jensen
|
eee4a69f11
|
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 1183c0538e [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]]
Former-commit-id: 1183c0538e
Former-commit-id: 886348da08 [formerly 52d5edac63] [formerly ad38ccbb38ccc3c1e25afc6279df150354266fb5 [formerly cb9e715aec]]
Former-commit-id: 7e40e67a6c3c32d32eefa89c005c098e6189c848 [formerly 10dee29029]
Former-commit-id: 7d03309e18
|
2014-07-01 10:30:54 -05:00 |
|
Nate Jensen
|
c790f68d66
|
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]]
Former-commit-id: fbda7c4489
Former-commit-id: d1ce9eed5b [formerly fe1f9e8977] [formerly 42f3d41f4fbd3ce168d8d1117e5ce0b5a752ff73 [formerly 9e6433f44b]]
Former-commit-id: c95a4ea6c20a688372f25863036f83f25fb0d751 [formerly 6f0d007112]
Former-commit-id: 73bdd3a339
|
2014-07-01 10:22:25 -05:00 |
|
Steve Harris
|
1bbbdc9c62
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
|
2014-07-01 11:08:46 -04:00 |
|
Richard Peter
|
ffe546f816
|
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 17839c2514 [formerly 2965150f36] [formerly f3ceb72fd3502a79aad5e85f5fd66b79cc0bab66 [formerly 3de8492ff3]]
Former-commit-id: a70bbfc5b1d3137936ce79f8cf308613fb74cf69 [formerly e659b5a694]
Former-commit-id: 8c2a97eb67
|
2014-07-01 09:48:20 -05:00 |
|
Nate Jensen
|
ee9c8b0fb9
|
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly fb84c94552 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]]
Former-commit-id: fb84c94552
Former-commit-id: d4b265fcca [formerly 7314f9c2f1] [formerly 4978882e135ef3f25c2e0ca1dfb306b8b77a8b49 [formerly 01115d0ad0]]
Former-commit-id: 771686decac75f30c6529d246ca4f20201dfebad [formerly a2ab4f6c76]
Former-commit-id: 94cd22b009
|
2014-06-30 16:21:09 -05:00 |
|
Brian Clements
|
9f8aea91aa
|
Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1 [formerly b186894f32] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c]
Former-commit-id: be0185379b
|
2014-06-30 15:57:58 -05:00 |
|
Nate Jensen
|
be7402f054
|
Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
|
2014-06-30 15:53:41 -05:00 |
|
Nate Jensen
|
7f5285bf96
|
Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]]
Former-commit-id: 128950ec19
Former-commit-id: c8d32368ee [formerly 4ac06c06ee] [formerly d73b0a686415d6d641d233bfd24d10daefab34d7 [formerly 2bf3449e00]]
Former-commit-id: f3f1fbc5a2e3ec9b02255dccd1989db205cdb8ee [formerly 345de597a6]
Former-commit-id: 25b2c1fa3e
|
2014-06-30 13:22:57 -05:00 |
|
Lee Venable
|
c65c39934d
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly 07a7a00256 [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]]
Former-commit-id: 07a7a00256
Former-commit-id: 4f413032e3 [formerly e5f1eaf67d] [formerly fc579be7cecbd579b95c1f5d5f7bbe974dc68c31 [formerly c6e53f6a9b]]
Former-commit-id: 049ab47ed6895126be0b8ff0b09a75d6c325e763 [formerly 6046a2cbe1]
Former-commit-id: 44f67ce5ad
|
2014-06-30 13:15:31 -05:00 |
|
Nate Jensen
|
8771aee35d
|
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly fdddf1e096 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]]
Former-commit-id: fdddf1e096
Former-commit-id: 108be98832 [formerly cc66308aaa] [formerly 9468d0a901837ec71be397a13e71483e27e0c273 [formerly 1ac5c54ee3]]
Former-commit-id: 44b6830b6ca7df9073bb2997f0cd12ba1cc234a3 [formerly c6c921279a]
Former-commit-id: 29a41f81c2
|
2014-06-30 12:03:21 -05:00 |
|
Slav Korolev
|
896b7c59d1
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 1956077e1a [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]]
Former-commit-id: 1956077e1a
Former-commit-id: 3e4c08d4ef [formerly e8811128fc] [formerly f18e8934ed21b7acc8f3181e19942bfba56cdf4c [formerly 0f5a2c0233]]
Former-commit-id: c7a99399c01956b4c0308375cdf8c555baeec8f2 [formerly a78f0ea765]
Former-commit-id: 5395df01c9
|
2014-06-30 09:40:32 -04:00 |
|
Richard Peter
|
c2835d25ac
|
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 570bf42f89 [formerly b94dc3b045] [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966 [formerly e3c3d55883]]
Former-commit-id: 731bb0268edd89c419ea3b8bb57b91ea5afc516a [formerly 25dd598b55]
Former-commit-id: 50fdb66cb4
|
2014-06-27 16:52:39 -05:00 |
|
Richard Peter
|
e6ee020f9d
|
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly cfb9e6d0ad [formerly 48aceec348 [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: bc43fa3722 [formerly d15be4d4a1] [formerly eb62a7da73e93f0a97aa85a3191e21df053469ca [formerly b1810026c8]]
Former-commit-id: ffce97b79e3bf6cf71a787a276401e8ab159977a [formerly 8b8f6ff0fe]
Former-commit-id: 3847155429
|
2014-06-27 16:51:36 -05:00 |
|
Brian Clements
|
e25a446dae
|
Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly fe149faffa [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]]
Former-commit-id: fe149faffa
Former-commit-id: 6bae8b556c [formerly b8dc75d192] [formerly 54898f3b2d36260900cf96d8c93cda806a155e01 [formerly cb108f12b8]]
Former-commit-id: f94b54e29b3d2880b30c8a131c9ec16015f7c641 [formerly 0800ea7cb7]
Former-commit-id: ac986ca600
|
2014-06-27 16:33:27 -05:00 |
|
Brian Clements
|
1fc32ef3c5
|
Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 31a08efb61 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]]
Former-commit-id: 31a08efb61
Former-commit-id: 46526f932b [formerly 2350f7f630] [formerly 93c5a5d813b69eae74ceea0b7251e483a789c393 [formerly ed2823daef]]
Former-commit-id: a6fba588dbe193fe0fe78c90743505b834dd3904 [formerly c1bfab0914]
Former-commit-id: 55e3b3673c
|
2014-06-27 15:33:11 -05:00 |
|
Slav Korolev
|
e3d989504c
|
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly f6e8dedfa3 [formerly b72f146d95 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 7fa0a80090 [formerly 34d57cd15e] [formerly 31447de11fcb6e2546cb39702813ba6cf2f0ba14 [formerly 03890f03e3]]
Former-commit-id: 8ed7b73c8cf35ecfa3aac5e18de6fbaf88b30690 [formerly 99fc9b951a]
Former-commit-id: a8e4449248
|
2014-06-27 12:29:25 -04:00 |
|
Richard Peter
|
99c550709e
|
Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 56389ef395 [formerly 46f42687e2 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]]
Former-commit-id: 56389ef395
Former-commit-id: bcf92a4b08 [formerly 2d18721bd6] [formerly 395291351cc63f90d7019e4eb6186c1ef830f36e [formerly 5112bbb8d5]]
Former-commit-id: 40b5d58c95a8b7c0f6129a2b1c88baa2f6af8cdf [formerly c5003ff6c4]
Former-commit-id: 7daa1ed24b
|
2014-06-26 17:46:57 -05:00 |
|
Matt Nash
|
b6e460a97a
|
Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly 58a9434254 [formerly 2be9c89722 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]]]
Former-commit-id: 58a9434254
Former-commit-id: afdac2bafd [formerly d4b6c9803e] [formerly a3d17e4f46d08b2176b5ac7766da43408244c04f [formerly a82e71702a]]
Former-commit-id: bf26c0317b05796c264b1626da690d41db48f07c [formerly 0bfa8347a4]
Former-commit-id: adc1a6df6d
|
2014-06-26 17:30:22 -05:00 |
|
Nate Jensen
|
f6d1119040
|
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 1f6df7f52f [formerly 024bc29e10 [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]]]
Former-commit-id: 1f6df7f52f
Former-commit-id: c2b644f4f0 [formerly 0c9596bff8] [formerly 6a3f1ad5122f1bb80c5298f408960868796a628e [formerly 96a065399e]]
Former-commit-id: 893c04d3b75c57a7f1ad2ecd752ed991d4b222ed [formerly 58791a046a]
Former-commit-id: 329f14de63
|
2014-06-26 15:26:21 -05:00 |
|
Nate Jensen
|
db86c797a0
|
Omaha #3236 thin client pref page supports proxy server as text or combo
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 061482b015 [formerly f4c1691c8d [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]]]
Former-commit-id: 061482b015
Former-commit-id: c42d328429 [formerly dc99cf6c15] [formerly bc9de07f4e93861a5ad39757d852e64ad9f15a41 [formerly 40a3c0a372]]
Former-commit-id: 2dc074be3b70d9267c463e477fa249d6759b4dc6 [formerly 392ddd5ce0]
Former-commit-id: f957dd8e18
|
2014-06-26 15:06:38 -05:00 |
|
Slav Korolev
|
594c28c023
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 900d5e8fbe [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: af6e5d0d24 [formerly 90ad46ac58] [formerly 0779b5b65e56e3aca2f1181750d2562c333a3f3a [formerly 3b9ed35eb0]]
Former-commit-id: 7d40d99d01e0c2d54fed5e98555f22bfcfe5f213 [formerly 0a006483ae]
Former-commit-id: 81ae177c42
|
2014-06-26 14:04:34 -04:00 |
|
Roger Ferrel
|
f0a6f0841f
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly ad6eac6e20 [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]]
Former-commit-id: ad6eac6e20
Former-commit-id: c6e2725ccb [formerly 6e37a43757] [formerly bfed3ce96674059d15316bcc9f04471a2469b25b [formerly 801bdc8fc7]]
Former-commit-id: 2e59e5b070ee1cbe0348eca7fc85285c2835dcc9 [formerly 7fef8ed924]
Former-commit-id: f954d93c5a
|
2014-06-26 11:16:09 -05:00 |
|
Nate Jensen
|
66ab17a9a8
|
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 49a592b19f [formerly 589f74f6d8 [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]]]
Former-commit-id: 49a592b19f
Former-commit-id: 78ccc8922c [formerly c73138b29e] [formerly 07db96ba799a55bc88db475276f8fed8e524ee12 [formerly 2b3f7f02e5]]
Former-commit-id: d8b0dddfe938e999c3a69db10cfa3c66ec3973ba [formerly e5c63a67ac]
Former-commit-id: 30d4d8fe27
|
2014-06-25 12:07:28 -05:00 |
|
Ben Steffensmeier
|
a91e213b4f
|
Omaha #3164 Disable compression on server error 500.
Former-commit-id: feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly 120e9099e4 [formerly d7cdfa655d [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]]]
Former-commit-id: 120e9099e4
Former-commit-id: 20bc155506 [formerly 93ecdeeb08] [formerly f94c53315410df314a83f5e6e963796cd9ddd49e [formerly 8ea38a01a3]]
Former-commit-id: e096e7a2d40227945e7fb1d2a3c83b5cfaa9f584 [formerly 05ad65e8a0]
Former-commit-id: c0b839ce78
|
2014-06-25 11:13:39 -05:00 |
|
Nate Jensen
|
9afe98bf2b
|
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: af46dfd419 [formerly c9696dbd3b] [formerly 791ab4913c] [formerly af46dfd419 [formerly c9696dbd3b] [formerly 791ab4913c] [formerly 4bd68c8bd0 [formerly 791ab4913c [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 05c81f432b [formerly 299c77f875] [formerly 8061c2ddd36f44e33ab8f0c40752fafbbbe7409b [formerly ce7812983a]]
Former-commit-id: 98f991d11bbde4854fbbda437ae830942345566a [formerly 374fb4373e]
Former-commit-id: 124d873714
|
2014-06-25 09:54:38 -05:00 |
|
Nate Jensen
|
e881e3afdd
|
Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: f388fc9e22 [formerly 054e8ba9b9] [formerly 3b1c37dc38] [formerly f388fc9e22 [formerly 054e8ba9b9] [formerly 3b1c37dc38] [formerly 760b0cb584 [formerly 3b1c37dc38 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]]]]
Former-commit-id: 760b0cb584
Former-commit-id: 5634845b65 [formerly ad647e2e85] [formerly 1191a36dc2bdc04783f33dac9ef3cd444f527ced [formerly a727313c41]]
Former-commit-id: 37cd511e3e38aa4d5884885f5c1a092db0977af3 [formerly 5854347d2b]
Former-commit-id: 73bc714f93
|
2014-06-25 08:54:24 -05:00 |
|
Nate Jensen
|
dd88b1c3dd
|
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 17e4bd9707 [formerly 9c058c1e56] [formerly eacd31aa9b] [formerly 17e4bd9707 [formerly 9c058c1e56] [formerly eacd31aa9b] [formerly 425651652d [formerly eacd31aa9b [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]]]
Former-commit-id: 425651652d
Former-commit-id: cf14ebd812 [formerly 7d54b214e1] [formerly 42770a7bda9b6c60ffa646d2171d3d52037e0ecf [formerly 3b288534e4]]
Former-commit-id: fcdd3f6f43d57cf12f9606e6ec2640a2cb5f8584 [formerly c811adf70b]
Former-commit-id: 0938ff0ab7
|
2014-06-25 08:32:25 -05:00 |
|
Steve Harris
|
d85d6e3d7c
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)
Former-commit-id: 80d4e29167 [formerly c6aa4b6cbd] [formerly d9a3129339] [formerly 80d4e29167 [formerly c6aa4b6cbd] [formerly d9a3129339] [formerly 23d0cf81f8 [formerly d9a3129339 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]]]
Former-commit-id: 23d0cf81f8
Former-commit-id: 4ce15f3642 [formerly 5a5b95e88e] [formerly fb85df5f20cce260e0bb7de9e36d6bb272141638 [formerly f6f5c5a395]]
Former-commit-id: 285ed0388fe5cc149e690eeccae8d189bfb94c59 [formerly 766c6ca296]
Former-commit-id: deb3e3e437
|
2014-06-25 07:11:58 -05:00 |
|
Ben Steffensmeier
|
ac910bf48f
|
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 5c4f89644c [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]]
Former-commit-id: 5c4f89644c
Former-commit-id: 216f6615df [formerly d52b2254f5] [formerly cdfe226fd4f2936b8857ca657cf932d134dc0f2f [formerly 4d22a3c58e]]
Former-commit-id: 0238336c4ba4ce650a90647685bf7af41b2168f5 [formerly 397f83b2da]
Former-commit-id: 8dbd523f44
|
2014-06-24 18:16:09 -05:00 |
|
Brian Clements
|
984043b7b6
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly 0f25ac3b5b [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]]]
Former-commit-id: 3b71bedd14
Former-commit-id: 2b0a3b71be [formerly 91d1378c31] [formerly 777e6a4c592f7446174da9efb1e7a8578faea8b6 [formerly be3d47e5e9]]
Former-commit-id: 02b429c884ef9326e34cb1c454c39abcfa429ef4 [formerly f1a30bf16e]
Former-commit-id: be85fe241f
|
2014-06-24 11:15:45 -05:00 |
|
Steve Harris
|
6285d3dac6
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]]
Former-commit-id: ddc6f2092a
Former-commit-id: dd6d6c031d [formerly 304d918a7c] [formerly 018aec814b6ca7a979cdc1b5c53150d6797d0df5 [formerly 1f033d22e6]]
Former-commit-id: 7b12be7aa1ce8ea1ba2ec797cf62aa5d09c44514 [formerly 323c240f59]
Former-commit-id: 2841134c60
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
e683a9e5b9
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 886e738c6f [formerly 2c1988017e] [formerly aaa146b2d0] [formerly 886e738c6f [formerly 2c1988017e] [formerly aaa146b2d0] [formerly 46b8688597 [formerly aaa146b2d0 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]]]
Former-commit-id: 46b8688597
Former-commit-id: a638ba05b1 [formerly 9edc1153de] [formerly 91aee63991f0525d37934c2e6dc7774e0f24ffb3 [formerly c184936340]]
Former-commit-id: 1e516e8c449d0c3d54c14bc6e3374606e4c9e7af [formerly 17e92d31bd]
Former-commit-id: 364953e5b7
|
2014-06-24 10:57:02 -05:00 |
|