Fay.Liang
|
559106e551
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: bafd1eb2db [formerly 2cdb454dc0 [formerly c127d4bd2f42a22d91e9a0517a6d0e8b17198d6b]]
Former-commit-id: 2cdb454dc0
Former-commit-id: cc627997a8
|
2015-03-05 10:41:04 -05:00 |
|
Fay.Liang
|
654d618fc5
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 211d9bb8eb [formerly aa2fa72260 [formerly 10b981ac5353585985f450b849006bd6514fe057]]
Former-commit-id: aa2fa72260
Former-commit-id: 7398f8fb7b
|
2015-03-05 10:39:44 -05:00 |
|
Fay.Liang
|
62ebaa1443
|
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c5257a52c6 [formerly 50bdaba08f [formerly 1dc1cede71ab27d3339f396369827a6a89a8ad80]]
Former-commit-id: 50bdaba08f
Former-commit-id: 13392d8181
|
2015-03-05 10:33:36 -05:00 |
|
Ron Anderson
|
6fcf5636ab
|
Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990
Former-commit-id: 893de08048 [formerly 0f7f415204 [formerly 30bfaf9432481328ed9d23ef56568a857cf775c7]]
Former-commit-id: 0f7f415204
Former-commit-id: ea5dd120e2
|
2015-03-05 08:56:48 -06:00 |
|
Steve Harris
|
1bc802c759
|
Merge tag 'OB_14.4.1-15m' into omaha_14.4.1
14.4.1-14m
Former-commit-id: 3e7b58caa0 [formerly f7816713fb [formerly 5504ca980916e676a2c4886c816f6edb532f1afb]]
Former-commit-id: f7816713fb
Former-commit-id: 4ff6ac3ccc
|
2015-03-04 20:56:37 -06:00 |
|
Ron Anderson
|
1d5a9b4cd8
|
Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: e08d469768 [formerly a6167718b2 [formerly eaecbaa0b66153b43bfe59f96c43a1876b9e235f]]
Former-commit-id: a6167718b2
Former-commit-id: e315d9811d
|
2015-03-04 16:06:41 -06:00 |
|
Ron Anderson
|
c18c4dbbad
|
Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc
Former-commit-id: 1b2258ed00 [formerly 3468d2ee60 [formerly 009e56509930c8fdf2eacd250903260a13a6f3ca]]
Former-commit-id: 3468d2ee60
Former-commit-id: f299aab920
|
2015-03-04 15:37:22 -06:00 |
|
Dave Hladky
|
ada3a1c3f1
|
Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug
Former-commit-id: 63322de483 [formerly e958125848 [formerly d734262db63974de8bb846df63942596d06b24c1]]
Former-commit-id: e958125848
Former-commit-id: 44b9d9691d
|
2015-03-04 14:11:51 -06:00 |
|
Shawn.Hooper
|
4261f6843f
|
ASM #16946 - Update typo from dateFile to dataFile
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2
Former-commit-id: 08f7a7ef1c [formerly f3f48cf71f [formerly 13fbcbd0a2cb70228a47d63839640c7612caaa2a]]
Former-commit-id: f3f48cf71f
Former-commit-id: e30935d13d
|
2015-03-04 14:07:01 -05:00 |
|
cmadmin
|
775909af61
|
Merge "Omaha #4200 - Update Shapely to v1.4.4" into omaha_14.4.1
Former-commit-id: d104afe0c7 [formerly e6c66c93d3 [formerly a4ea977b9609c1d12f874b1abe3158f7aeb985f1]]
Former-commit-id: e6c66c93d3
Former-commit-id: de489986cb
|
2015-03-04 11:59:25 -06:00 |
|
David Gillingham
|
1d45c1f80f
|
Omaha #4128: Ensure active table sharing is configured before enabling it.
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937
Former-commit-id: 46e371f7e6 [formerly 07805e808c [formerly 3ebb60db47fc74a77eea56ae7738b5f7b405fb19]]
Former-commit-id: 07805e808c
Former-commit-id: 0ced2f9067
|
2015-03-03 16:46:39 -06:00 |
|
Greg Armendariz
|
b2c39e311d
|
Omaha #4200 - Update Shapely to v1.4.4
Former-commit-id: d49207c051 [formerly 031d63b6fc [formerly c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9]]
Former-commit-id: 031d63b6fc
Former-commit-id: 21f742d81c
|
2015-03-03 16:05:47 -06:00 |
|
Ron Anderson
|
06b572187d
|
Merge "Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service." into omaha_14.4.1
Former-commit-id: c50e75314f [formerly 9648dbc550 [formerly 3ccb7a96f716bf5cd829a8f34a93dbc6744f3d1b]]
Former-commit-id: 9648dbc550
Former-commit-id: 5fe860eba4
|
2015-03-03 15:59:42 -06:00 |
|
steve.naples
|
d0a5bc2d8b
|
ASM #15660 Fixed issues with saving disagg data.
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331
Former-commit-id: 31a7909085 [formerly 3ecaf0c634 [formerly 4646f7396153651359624f3dd12660810fe2bf6e]]
Former-commit-id: 3ecaf0c634
Former-commit-id: 4dd189791e
|
2015-03-03 21:02:54 +00:00 |
|
Fay.Liang
|
065ce3318a
|
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 1ed5d493fa [formerly f00b3d3156 [formerly c91a37257cd2882047e79200f624acc1e0312cba]]
Former-commit-id: f00b3d3156
Former-commit-id: 07c0347c3e
|
2015-03-03 14:44:31 -05:00 |
|
Fay.Liang
|
548851cad0
|
Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9a4751b60e [formerly 8bfe8fb65f [formerly 5aa2c444583d03b442768a8e9ea462877a25bb8d]]
Former-commit-id: 8bfe8fb65f
Former-commit-id: 97be252793
|
2015-03-03 14:26:22 -05:00 |
|
Ana Rivera
|
d3cb86bfcd
|
Merge branch 'master_14.4.1'(14.4.1-14m) into gsd_14.4.1
Change-Id: Ia28b2274f55845670f44f60a5d5251a013832c0d
Former-commit-id: acd54e928c [formerly 2b9a2ae753 [formerly 6f8aafe588c13769a1c322436c594e3effcea3ff]]
Former-commit-id: 2b9a2ae753
Former-commit-id: 307f93e0e4
|
2015-03-03 16:20:25 +00:00 |
|
Juliya Dynina
|
03789c14eb
|
Merge "ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable." into asm_14.4.1
Former-commit-id: 25b044355a [formerly cc0d8eaf8a [formerly dd529eadfb006ff48cc975ae7926c06bf952f271]]
Former-commit-id: cc0d8eaf8a
Former-commit-id: a83d35b986
|
2015-03-03 09:55:58 -05:00 |
|
Michael Gamazaychikov
|
140ceb8df5
|
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e
Former-commit-id: 9db91abd8a [formerly 6897cfd7b9 [formerly ab0f7f0f627ab3926a219940f1267dc460e74e14]]
Former-commit-id: 6897cfd7b9
Former-commit-id: b6fab0df30
|
2015-03-03 09:38:34 -05:00 |
|
Ana Rivera
|
87e12ee70f
|
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517" into tcv_14.3.2
Former-commit-id: 5c19f14f0e [formerly 9fb3b29048 [formerly 7746c8ce24f444d0d9b480e756d092b482e7428a]]
Former-commit-id: 9fb3b29048
Former-commit-id: f77e0ff965
|
2015-03-02 22:19:14 +00:00 |
|
cmadmin
|
faba4fdb38
|
Merge "Omaha #3299 - Remove fits plugin from awips2-edex-cots feature" into omaha_14.4.1
Former-commit-id: fc5e9ad8e2 [formerly 58cb5d45be [formerly c0686acd33a35fdbca17dcc0255826a0e10c74d8]]
Former-commit-id: 58cb5d45be
Former-commit-id: 828b308922
|
2015-03-02 14:12:07 -06:00 |
|
Greg Armendariz
|
b0dcdf688c
|
Omaha #3299 - Remove fits plugin from awips2-edex-cots feature
Former-commit-id: bd3a7e13ac [formerly 07c51b71bf [formerly 4ddbeaba11bab77ece13ee46e89d34f141619701]]
Former-commit-id: 07c51b71bf
Former-commit-id: 8ea0c0d1b5
|
2015-03-02 13:11:44 -06:00 |
|
Joshua Watson
|
3d500422e1
|
VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7
Former-commit-id: ac92410d39 [formerly 7fc4a6f2ae [formerly 5a0b0653e28f31a080eec2123386359691c4b1fd]]
Former-commit-id: 7fc4a6f2ae
Former-commit-id: 845e1557e5
|
2015-03-02 12:10:07 -05:00 |
|
Steven Harris
|
342a165c96
|
Merge tag 'OB_14.4.1-14m' into omaha_14.4.1
14.4.1-14
Former-commit-id: 318afb44dc [formerly 84804cf7c6 [formerly bf4f8eca3dfd48957a84a8594ea6aa02b77dc700]]
Former-commit-id: 84804cf7c6
Former-commit-id: 4ae60f470a
|
2015-03-02 09:25:54 -06:00 |
|
Fay.Liang
|
0a13ba3a8c
|
Merge branch 'asm_14.3.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1.1
Former-commit-id: 0d3078ace9 [formerly 185feac0e0 [formerly f07eab6e1ccf6737cb90dc9af5ac247807124158]]
Former-commit-id: 185feac0e0
Former-commit-id: 267928c10b
|
2015-03-02 09:29:39 -05:00 |
|
Qinglu.Lin
|
9ee1b4a0a2
|
ASM #17169: WarnGen Templates: IBW marine CTA and impact updates
Change-Id: I59e000340b6a82dc439128f3ad6963476b669344
Former-commit-id: dcef82c4d6 [formerly cf66bb11f3 [formerly 441be68f8726618225b0c7a5077443b8a7815d99]]
Former-commit-id: cf66bb11f3
Former-commit-id: 5258c8f8b7
|
2015-02-27 16:10:22 -05:00 |
|
Shawn.Hooper
|
b9ee569243
|
ASM #17172 - Update heap size to 1536M for 14.3.1.1 64-bit
Change-Id: Iea8841e91a5d4ea005fecd0e89cd55d67319db1c
Former-commit-id: a28a9e18b0 [formerly ef3fe69c5f [formerly c96e25664a8ef82f33bbad3ea82efad90024baee]]
Former-commit-id: ef3fe69c5f
Former-commit-id: daddc33728
|
2015-02-27 14:17:34 -05:00 |
|
Ron Anderson
|
3f6421925f
|
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: ce87addfe4 [formerly a4fea90f17 [formerly 781b6d4f32ec8e9d34d746db72aebab4d4153c56]]
Former-commit-id: a4fea90f17
Former-commit-id: 9203b33ee6
|
2015-02-27 12:29:22 -06:00 |
|
Ron Anderson
|
d957abcd64
|
Merge "Omaha #3299 - Remove features" into omaha_14.4.1
Former-commit-id: 966accd5e4 [formerly 25dab5d8ca [formerly 7af54abd5e920241bc6f389f5b3010794c498605]]
Former-commit-id: 25dab5d8ca
Former-commit-id: cc84e9161d
|
2015-02-27 09:44:44 -06:00 |
|
Greg Armendariz
|
214513f99b
|
Omaha #3299 - Remove features
Change-Id: Icb1583b2f0a7bd165034714826c5c43ff7bf88b7
Former-commit-id: d7fad73fcc [formerly dc4cc9e7c7 [formerly 504cf2eb9598364f7f2717dafe93f54bd8f2187d]]
Former-commit-id: dc4cc9e7c7
Former-commit-id: dbb07175dc
|
2015-02-27 09:37:25 -06:00 |
|
Ana Rivera
|
495a0014af
|
Merge branch 'master_14.4.1' (OB_14.4.1-13m) into gsd_14.4.1
Conflicts:
gsd/gov.noaa.gsd.viz.ensemble/src/gov/noaa/gsd/viz/ensemble/display/control/EnsembleToolDisplayCustomizer.java
gsd/gov.noaa.gsd.viz.ensemble/src/gov/noaa/gsd/viz/ensemble/navigator/ui/viewer/EnsembleToolViewer.java
Change-Id: I407b17ca164c752a7d90d407862923ae0f4bf5c0
Former-commit-id: a22052fb5e [formerly cb05d85286 [formerly ea254b8234504a2f8a2fa9f4c73328d421a3ac8c]]
Former-commit-id: cb05d85286
Former-commit-id: 751a01bf5b
|
2015-02-27 15:13:46 +00:00 |
|
Richard Peter
|
607e050a79
|
Omaha #3353 - Fix warngen geometry generation blocking cave
Change-Id: I3c29747e0d9f0f265fbdab4e152b1739c42e26d0
Former-commit-id: 6224457b6e [formerly cc3d526f60 [formerly 62410b8ce728440326997eab37a37a9650e51223]]
Former-commit-id: cc3d526f60
Former-commit-id: 008dde0ec5
|
2015-02-26 16:45:18 -06:00 |
|
David Gillingham
|
fde97e61b3
|
Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31
Former-commit-id: 63139c2f38 [formerly d7c0000508 [formerly 5d962bf6cf7a3e40ee152bc98817daf116633f60]]
Former-commit-id: d7c0000508
Former-commit-id: cdb695e517
|
2015-02-26 15:57:47 -06:00 |
|
Greg Armendariz
|
82842a4717
|
Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8
Former-commit-id: 9d95e79cd7 [formerly 7539d84bba [formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]]
Former-commit-id: 7539d84bba
Former-commit-id: 465da92660
|
2015-02-26 14:03:17 -06:00 |
|
Fay.Liang
|
7fd40ceb4d
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ab02834301 [formerly fa65e0ecc9 [formerly f784dc11199f557d0bd39181d3e55bfa2b06a42a]]
Former-commit-id: fa65e0ecc9
Former-commit-id: fcd6e64aed
|
2015-02-26 13:41:37 -05:00 |
|
Fay.Liang
|
f601ce6f4b
|
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7a25728a83 [formerly ba56127604 [formerly 4e3fc06b752911badc86f6a1b72ad177863378ed]]
Former-commit-id: ba56127604
Former-commit-id: 310450e968
|
2015-02-26 13:36:56 -05:00 |
|
Shawn.Hooper
|
14aba20c37
|
Merge "ASM #17175 - Increase the JVM heap size to 2560M for I-met client" into asm_14.4.1
Former-commit-id: 2f8cc3993a [formerly 264a1a0274 [formerly 0a2dce294e4dc37b10fc08ee2ca6cee9efaee4df]]
Former-commit-id: 264a1a0274
Former-commit-id: 9b6d2c0bd2
|
2015-02-26 13:23:51 -05:00 |
|
Shawn.Hooper
|
c887f6cb74
|
ASM #17175 - Increase the JVM heap size to 2560M for I-met client
Change-Id: I88c6a9a40b2145d9dd013b7c78d22af57fd7d987
Former-commit-id: f36dce4f91 [formerly b5224e393c [formerly cdc6bacc3b8b162a90b0ec8921b6805d77bccf23]]
Former-commit-id: b5224e393c
Former-commit-id: 2255c32cfc
|
2015-02-26 13:18:14 -05:00 |
|
Shawn.Hooper
|
d1f7bb1be6
|
ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm
Change-Id: Id0cd2a97147cfb1a041e8b09ed155dafd67b1256
Former-commit-id: 3a31571f60 [formerly fb99c62e1a [formerly b67527007223dd0fbb2a6c5c17ef7fb6a68b2410]]
Former-commit-id: fb99c62e1a
Former-commit-id: 72abfa1668
|
2015-02-26 13:15:17 -05:00 |
|
Nate Jensen
|
bea946605f
|
Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: ad82097a9e [formerly 601df7e202 [formerly 338968eebfe41680949dc39b60696e2fdc9f96c1]]
Former-commit-id: 601df7e202
Former-commit-id: 5d8b9f55e6
|
2015-02-26 09:28:55 -06:00 |
|
Richard Peter
|
7ae1b885c1
|
Omaha #3353 - Fix warngen sync blocks on geospatial data.
Change-Id: I3d596030d4a06eb3e9cc8fbffa15ce5c596ed8ac
Former-commit-id: b8becf24a3 [formerly b0fba55588 [formerly 4df7c51d45ca960f364d9b0a626e8ec1fd0c325c]]
Former-commit-id: b0fba55588
Former-commit-id: 32ba320224
|
2015-02-25 20:00:19 -06:00 |
|
Mark Peters
|
bd18a8f195
|
Omaha #4154 Null pointer when trying to add a contact notifier in collaboration
Change-Id: Ie291a4638e5a82a45f5d8a7a46c80604997dea89
Former-commit-id: cc9720e678 [formerly a037243fee [formerly ade10f507637a6cc9689fd020d9bf5f98270b53c]]
Former-commit-id: a037243fee
Former-commit-id: ad7efdb649
|
2015-02-25 16:24:38 -06:00 |
|
Sarah Pontius
|
97d82399b1
|
VLab Issue #6517 - TCMWindTool Fix; fixes #6517
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86
Former-commit-id: 054762876e [formerly 8463da45e6 [formerly 427c442c31ba87f6c20bdfe17abedceb90fb2e7a]]
Former-commit-id: 8463da45e6
Former-commit-id: cda75a856f
|
2015-02-25 13:51:44 -07:00 |
|
Greg Armendariz
|
fe5cf3f8e6
|
Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2
Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]
Former-commit-id: 6a5463ab87
Former-commit-id: 2fd4ace0a2
|
2015-02-25 09:51:49 -06:00 |
|
Dave Hladky
|
de74770e0b
|
Omaha #3220 Verified config file is read when an update occurs.
Former-commit-id: 15f3234242 [formerly c7de9128a2 [formerly 9ad78f067456eb04367a9d3aca58d9f5ee330c41]]
Former-commit-id: c7de9128a2
Former-commit-id: 99cc0e8764
|
2015-02-24 16:20:56 -06:00 |
|
Steve Harris
|
a4eb4e6446
|
Omaha #3220 - reverting #3841, #3873, and most of #3220
Revert "Omaha #3841 - Fixed saving problem for distance and time."
This reverts commit 9b4c91d9ba [formerly bfbe322c73] [formerly 15ae209055] [formerly b8be69c429 [formerly 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]].
Revert "Omaha #3220 - Performance - Safe Seas, Snow, Fog."
This reverts commit e44794e98b [formerly efee22d0fb] [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]].
Revert "Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers."
This reverts commit ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]].
Revert "Omaha #3841 - Corrected updateZones method."
This reverts commit 81791694e9 [formerly 01d004673d] [formerly 24322ed6ca] [formerly 6ebe11d430 [formerly 24322ed6ca [formerly 4d133cc367ab016b378ada534cff0fcda579e323]]].
Revert "Omaha #3220 - Moved refreshing of table in the UI thread."
This reverts commit c61f1676dc [formerly 974cc09ca5] [formerly d06882f4c9] [formerly fd3a6ea199 [formerly d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]].
Revert "Omaha #3873 - Fixed assigning timeObs for maritime record."
This reverts commit fc045d397e [formerly 4b43ae6fb4] [formerly 090bc93302] [formerly 63026ac59b [formerly 090bc93302 [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559]]].
Revert "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station."
This reverts commit f0a1a13869 [formerly f20361a507] [formerly 8763f67abf] [formerly dc1722a8b7 [formerly 8763f67abf [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]]].
Revert "Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors."
This reverts commit c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]].
Former-commit-id: 49a1879325 [formerly 6dc41740c8 [formerly fa81485722db0bcc734095c0639f0ac8875117b5]]
Former-commit-id: 6dc41740c8
Former-commit-id: 19f7dbd0cc
|
2015-02-24 15:39:04 -06:00 |
|
Fay.Liang
|
4c8e279c0c
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 4521a28536 [formerly 61d335650b [formerly 0580ad455973b3a176208203a140474df0040155]]
Former-commit-id: 61d335650b
Former-commit-id: cd76675754
|
2015-02-24 15:36:40 -05:00 |
|
Fay.Liang
|
f94af6d720
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 66dd6987a1 [formerly ff74566cda [formerly c1bcd2a0db42c30d447a54ed185fc33d875628b3]]
Former-commit-id: ff74566cda
Former-commit-id: 429e0abfd6
|
2015-02-24 14:58:28 -05:00 |
|
Fay.Liang
|
6b09ea0d2f
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]
Former-commit-id: 94a7507b9b
Former-commit-id: da2f15f749
|
2015-02-24 14:56:50 -05:00 |
|
David Gillingham
|
073988bd69
|
Issue #4127: Add ClusterTask-backed write lock to ActiveTable.
Change-Id: I54309f369e7ef872fd102a764641569d95c62799
Former-commit-id: def338c49f [formerly 34ea2453b8 [formerly c564462d34bae64c3339339254d5cb6caba70fda]]
Former-commit-id: 34ea2453b8
Former-commit-id: ab7e413893
|
2015-02-24 12:39:03 -06:00 |
|