Commit graph

5404 commits

Author SHA1 Message Date
Michael Gamazaychikov
ce40c60dd3 ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c

Former-commit-id: 65353b595e [formerly 4f541a5460] [formerly 65353b595e [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: eb159fb31f [formerly 447eca7802]
Former-commit-id: 14440818e7
2014-05-12 13:33:58 +01:00
Michael Gamazaychikov
7e5adc3edb ASM #510 - textdb -pil -a command fails to add scripts with option
arguments.

Change-Id: I3f6c1c334db1100af0cb137f2f0a1a856564aaf4

Former-commit-id: 6497950f3d [formerly 97ec336416] [formerly 6497950f3d [formerly 97ec336416] [formerly c9df02db64 [formerly 77b054caca0aa54d51fa947a4a8aa041ef0cdcab]]]
Former-commit-id: c9df02db64
Former-commit-id: 34c44b6b8f [formerly f253b0ca13]
Former-commit-id: 02d0503b16
2014-05-09 14:45:27 +01:00
Michael Gamazaychikov
b9d57aa0b4 ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf

Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
2014-05-08 14:02:21 +01:00
Juliya Dynina
547c86f36f Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 2f3f953823 [formerly d6a796c476] [formerly 2f3f953823 [formerly d6a796c476] [formerly 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]
Former-commit-id: 92202928c9
Former-commit-id: 87433219cc [formerly 3be2acf831]
Former-commit-id: 5e9af9b47d
2014-05-07 14:18:01 -05:00
Melissa Porricel
9b7d84bfc4 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
2014-05-05 14:56:58 -04:00
Qinglu.Lin
03f7862321 ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
2014-05-05 11:54:56 -04:00
Xuezhi.Wei
02e31e37f6 ASM #579 Shef Ingest ProcessUtil configuration update
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150

Former-commit-id: b017e1c390 [formerly fb359316c8] [formerly b017e1c390 [formerly fb359316c8] [formerly e3b1ee759d [formerly ddda775e85dd8cba5f4342de330d1446647c621c]]]
Former-commit-id: e3b1ee759d
Former-commit-id: 4fcbc99209 [formerly 454b3acb5c]
Former-commit-id: 627a1aa6d8
2014-05-02 19:48:55 +00:00
Juliya Dynina
35bbea77af Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: 1d2297e489 [formerly cf742e4dc0] [formerly 1d2297e489 [formerly cf742e4dc0] [formerly 9da4eaaad5 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]]
Former-commit-id: 9da4eaaad5
Former-commit-id: 2611615ee3 [formerly a9556d4d2e]
Former-commit-id: a7e8e4a9c4
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
2bc8a6c5fd ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a647b1ddf3 [formerly c4fc2f169b] [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]
Former-commit-id: 071a1ae06a
Former-commit-id: f31f39a875 [formerly 1ce32e2be1]
Former-commit-id: 57a6bcfca6
2014-05-02 16:55:36 +00:00
steve.naples
18c51dac23 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: a7092ac01d [formerly b58b7d3d5a] [formerly a7092ac01d [formerly b58b7d3d5a] [formerly 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e [formerly d079dbcb7c]
Former-commit-id: 39437970c7
2014-05-02 16:15:04 +00:00
Matthew Howard
f99bcfc97f Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: 3b48dcc680 [formerly 55b1198186] [formerly 3b48dcc680 [formerly 55b1198186] [formerly 9e7a0e0a61 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]]]
Former-commit-id: 9e7a0e0a61
Former-commit-id: fce48ae3fd [formerly 571a45c6ea]
Former-commit-id: 4f5e129201
2014-05-01 16:07:11 -05:00
brian.dyke
22ffaef982 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a] [formerly 2a934def82 [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1]
Former-commit-id: b72e2d4289
2014-05-01 15:20:36 -04:00
Gang.Zhang
d4b87f3bad ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 090ed29386 [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]]]
Former-commit-id: 090ed29386
Former-commit-id: 3131e25e69 [formerly 7c7adbd77d]
Former-commit-id: 2b25e8c401
2014-05-01 15:49:48 +01:00
Juliya Dynina
bac2c83f58 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: 308e775017 [formerly d804167bb2] [formerly 308e775017 [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: cc93e11ce8 [formerly 6282dd45cb]
Former-commit-id: 80e6ae71d0
2014-04-30 14:53:36 -05:00
Brian.Dyke
f16c305ae4 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
2014-04-30 12:57:09 -04:00
Juliya Dynina
18c84c47bc Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: 00bbbf32c1 [formerly d37490acb1] [formerly 00bbbf32c1 [formerly d37490acb1] [formerly 78bb549533 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac [formerly d5290b8bbf]
Former-commit-id: a4073b805e
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
ecbad2efac ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 1b5bccc451 [formerly 760ee964d6] [formerly 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 93a6523f46 [formerly e28ec3469d]
Former-commit-id: 84640a8936
2014-04-29 21:09:34 +00:00
Brian.Dyke
1aec51b7c4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
2014-04-29 12:07:21 -04:00
brian.dyke
864e83994e Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: ffad42f2ef [formerly 8bda882ed0] [formerly ffad42f2ef [formerly 8bda882ed0] [formerly 4621d66089 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]
Former-commit-id: 4621d66089
Former-commit-id: c27ffd0678 [formerly 1939a06ced]
Former-commit-id: d6287274b2
2014-04-28 13:25:41 -04:00
Juliya Dynina
849045445d Merge "ASM #528 Updated DrawPolygonDlg to remember location when opened and closed." into asm_14.3.1
Former-commit-id: 6e0844240b [formerly 1c6d9ca844] [formerly 6e0844240b [formerly 1c6d9ca844] [formerly 489a9789c1 [formerly 06f3392fb1e1352cc626a334bb4a140447b3cd88]]]
Former-commit-id: 489a9789c1
Former-commit-id: a87734333f [formerly eee061db3d]
Former-commit-id: 0546dabf2c
2014-04-28 10:46:04 -05:00
Loubna.Bousaidi
5afa75d122 ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34

Former-commit-id: 0cf63a9711 [formerly 9585fc8077] [formerly 0cf63a9711 [formerly 9585fc8077] [formerly 26daea0e30 [formerly 598700ad6ca6cb7881d68f8e7703327f7c58c19c]]]
Former-commit-id: 26daea0e30
Former-commit-id: 2d2493dc93 [formerly 39b11467cf]
Former-commit-id: 896be043c8
2014-04-28 14:16:50 +00:00
steve.naples
b5e6653935 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 58b091e37b [formerly e0b6f674f3] [formerly 58b091e37b [formerly e0b6f674f3] [formerly 760fc00028 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]
Former-commit-id: 760fc00028
Former-commit-id: 399702b22b [formerly bed2334f57]
Former-commit-id: 26da8e332a
2014-04-28 13:55:21 +00:00
David Friedman
eed80b716a ASM #525 - Text Workstation expiration pop-up inconsistent
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: 01b0960ac9 [formerly 8b595435e2] [formerly 01b0960ac9 [formerly 8b595435e2] [formerly ae90da3011 [formerly f7bfa197b1b61b69029efd8e225ba5dea22c17f2]]]
Former-commit-id: ae90da3011
Former-commit-id: 2a2cfa122a [formerly 4f54767780]
Former-commit-id: 3742b82fc1
2014-04-25 19:32:47 +00:00
Brian.Dyke
f31d8cc8cf Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
2014-04-25 11:06:11 -04:00
Brian.Dyke
d6e931dd87 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: a5c9321a8d [formerly a61af3e6d3] [formerly a5c9321a8d [formerly a61af3e6d3] [formerly ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]
Former-commit-id: ac74878ae2
Former-commit-id: ae4aea9abf [formerly c21644c87f]
Former-commit-id: b3a733036c
2014-04-24 13:28:31 -04:00
Brian.Dyke
2161c569ea Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
2014-04-23 14:05:50 -04:00
brian.dyke
8f28d7213d Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: c7d785d503 [formerly 805af72ef8] [formerly c7d785d503 [formerly 805af72ef8] [formerly 24316a7f66 [formerly 3f3c0a55218af9f27abce65c0ec3e8704485c36e]]]
Former-commit-id: 24316a7f66
Former-commit-id: ab43d20b28 [formerly acc904e4e8]
Former-commit-id: 8540e0de6f
2014-04-22 16:50:57 -04:00
Ron Anderson
0c7c52095e Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052

Former-commit-id: db978fff9a [formerly b12a6cd828] [formerly db978fff9a [formerly b12a6cd828] [formerly 859d709a03 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]
Former-commit-id: 859d709a03
Former-commit-id: 57e277dc69 [formerly e8a07a2ebe]
Former-commit-id: 51bb78561c
2014-04-22 14:38:54 -05:00
Zhidong.Hao
914803ff7a ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303

Former-commit-id: f16936223a [formerly e1d5aa284d] [formerly f16936223a [formerly e1d5aa284d] [formerly 0177756f97 [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]
Former-commit-id: 0177756f97
Former-commit-id: d6edd56d34 [formerly 358e7b2b54]
Former-commit-id: 7d00166b10
2014-04-22 14:31:14 -04:00
Dave Hladky
4ce5dfcd92 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
2014-04-21 12:26:47 -05:00
Richard Peter
8768811fde Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: dc41da4a65 [formerly 9dc957f1a1] [formerly dc41da4a65 [formerly 9dc957f1a1] [formerly 1e33125cb7 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]]
Former-commit-id: 1e33125cb7
Former-commit-id: 5dd87d4b5d [formerly 4e71d9e099]
Former-commit-id: 68df58fb03
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
160f48406a Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5

Former-commit-id: b0d162ccba [formerly b2686e46cf] [formerly b0d162ccba [formerly b2686e46cf] [formerly b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]
Former-commit-id: b86fae838f
Former-commit-id: 1d600c8559 [formerly d8408a9b3f]
Former-commit-id: 201f25eab3
2014-04-18 15:10:46 -05:00
Brian.Dyke
ddee08368a Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3b90abdf7a [formerly 880329e4ae] [formerly 3b90abdf7a [formerly 880329e4ae] [formerly 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]
Former-commit-id: 9943a331c3
Former-commit-id: 2c8e6ec2fc [formerly 62c2a8b843]
Former-commit-id: 989b873f6e
2014-04-18 07:53:10 -04:00
Brian.Dyke
8275f3907f Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
2014-04-17 14:42:35 -04:00
Nate Jensen
f607630d72 Issue #3018 addressing code review comments
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
2014-04-17 09:28:47 -05:00
Juliya Dynina
39d8d731b0 Merge "ASM #530 - Enable calculation/display of snow accum for GFSEnsemble" into asm_14.3.1
Former-commit-id: a53243358e [formerly 5876f5781d] [formerly a53243358e [formerly 5876f5781d] [formerly b7af2339ca [formerly 932bda1bf98702e0c2af1fa6851f67818d3ee84b]]]
Former-commit-id: b7af2339ca
Former-commit-id: c9ec40b73f [formerly 730b4f194d]
Former-commit-id: 46021270c5
2014-04-17 08:50:13 -05:00
Ron Anderson
d704f90445 Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
2014-04-16 18:02:11 -05:00
Nate Jensen
de32624fdf Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
2014-04-16 17:25:09 -05:00
Nate Jensen
64e7ac4225 Issue #3039 fix ifpImage class cast exception
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
2014-04-16 16:17:05 -05:00
Nate Jensen
7031f73fe2 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 9ebedf0b98 [formerly d121f07e76] [formerly 9ebedf0b98 [formerly d121f07e76] [formerly e0ae9e5f8f [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: 736c2cc764 [formerly e0ffa7b6b4]
Former-commit-id: 700080e879
2014-04-16 08:41:54 -05:00
Ron Anderson
072102dff0 Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
7dc8709a5b Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 49ca556b33 [formerly ecbe6fd2d7] [formerly 49ca556b33 [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 2f51d63032 [formerly 3eebc7a864]
Former-commit-id: af826302a1
2014-04-15 13:29:05 -05:00
Steve Harris
ac077b24a1 Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9132d9004e [formerly eb2f2865fe] [formerly 9132d9004e [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly f4c8ce899d312b389aff32d052564559e79904be]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 6ed279d306 [formerly c361ccd531]
Former-commit-id: 9be8c87f87
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
f026a17b07 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 490413551b [formerly 3db751fc5b] [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 62062bf288
Former-commit-id: 0b149f92d9 [formerly 035272360b]
Former-commit-id: f6f51d3575
2014-04-15 09:15:12 -05:00
brian.dyke
6a5c7d7684 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 5fc07cafc8 [formerly fb1c399d4d] [formerly 5fc07cafc8 [formerly fb1c399d4d] [formerly a6708cc174 [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]
Former-commit-id: a6708cc174
Former-commit-id: e8dffad9cb [formerly 5b27f2987f]
Former-commit-id: d148fbe645
2014-04-14 15:29:23 -04:00
Melissa Porricel
5d50b3996e ASM #530 - Enable calculation/display of snow accum for GFSEnsemble
Change-Id: I0036ab27ba16fc530d48853e9de4b3f7e763dc43

Former-commit-id: c5fed02653 [formerly 9a72fdc4e2] [formerly c5fed02653 [formerly 9a72fdc4e2] [formerly 7cd9dec78e [formerly fe1d0f147e2b0e4106afd092bb381e7958ca7a6e]]]
Former-commit-id: 7cd9dec78e
Former-commit-id: 1f57189285 [formerly be42595ba7]
Former-commit-id: aafeee18a1
2014-04-14 11:48:00 -04:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
2014-04-11 17:37:59 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
2014-04-11 16:23:09 -05:00