Commit graph

6107 commits

Author SHA1 Message Date
Brian Clements
cdcf7d8143 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 86e89665bf [formerly 37699395ef] [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 51e2606277 [formerly 60508bf674]
Former-commit-id: 4433482d56
2014-06-17 11:52:58 -05:00
Nate Jensen
84e78f0edf Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1
Former-commit-id: 1df0cf7aff [formerly 812f679b22] [formerly 1df0cf7aff [formerly 812f679b22] [formerly d334c16d1c [formerly 615a1baccb5f263bd29a5e4a6da95f1a8c6e6568]]]
Former-commit-id: d334c16d1c
Former-commit-id: 41e11f430c [formerly 3d2de14300]
Former-commit-id: d083f76eb4
2014-06-17 11:19:03 -05:00
Nate Jensen
54b72c7108 Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 14a520dbd9 [formerly 4a91c3320b] [formerly 14a520dbd9 [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 439e037d03 [formerly 3981241355]
Former-commit-id: fe47ecf6ce
2014-06-17 10:54:57 -05:00
Brian Clements
0dcfac1a44 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 8205f7cd56 [formerly b6a2bf0ae4] [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 4dc81aabfa [formerly 5436efb886]
Former-commit-id: 616315d830
2014-06-17 09:26:24 -05:00
Nate Jensen
e699c6e40e Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 985c88d38b [formerly bc48674092] [formerly 985c88d38b [formerly bc48674092] [formerly 3c57231c82 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]]]
Former-commit-id: 3c57231c82
Former-commit-id: f2424f843e [formerly ec83717594]
Former-commit-id: 9a7e51f8b2
2014-06-17 08:42:29 -05:00
Nate Jensen
dde3272ecb Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: 4fd29b211a [formerly a8bae916f3] [formerly 4fd29b211a [formerly a8bae916f3] [formerly c65c392d63 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: c65c392d63
Former-commit-id: 47907b7dcd [formerly 9cd933cc7b]
Former-commit-id: 22b353ee4e
2014-06-17 07:40:18 -05:00
Ben Steffensmeier
ccd8d16097 Omaha #2061 Update ncep copies of radar resources.
Former-commit-id: 8d521a40d0 [formerly 14b5c0d792] [formerly 8d521a40d0 [formerly 14b5c0d792] [formerly 8064a74866 [formerly 64b5e484c0dd8409ab0b791763c31681c94a38d3]]]
Former-commit-id: 8064a74866
Former-commit-id: 7fc201d3e8 [formerly 50a1fd7cf9]
Former-commit-id: 3a9650dd1b
2014-06-16 10:56:40 -05:00
Nate Jensen
19383cbf10 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: 95b2e262a0 [formerly b1acd1709a] [formerly 95b2e262a0 [formerly b1acd1709a] [formerly 9b7ed95e6b [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 99b46cfbcf [formerly 521065548d]
Former-commit-id: ea80faede7
2014-06-16 09:26:30 -05:00
Nate Jensen
2566b6419c Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
Former-commit-id: c2766190a4 [formerly 5fad6501a7] [formerly c2766190a4 [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]]
Former-commit-id: b3df7745d4
Former-commit-id: ca06c42305 [formerly 752fe50104]
Former-commit-id: 35ed3931c3
2014-06-16 09:00:47 -05:00
Nate Jensen
450611cd70 Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
Former-commit-id: 4544d7d3e0 [formerly 181a87e72d] [formerly 4544d7d3e0 [formerly 181a87e72d] [formerly 5908a4501a [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]]
Former-commit-id: 5908a4501a
Former-commit-id: 8aa1e4aacb [formerly 442a3d9683]
Former-commit-id: e01ddac6ad
2014-06-16 09:00:39 -05:00
Greg Armendariz
8f76c38e68 Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: e73a0de182 [formerly faebbc13f7] [formerly e73a0de182 [formerly faebbc13f7] [formerly 8c568a223e [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]
Former-commit-id: 8c568a223e
Former-commit-id: 5fd5c7f8ff [formerly 5c8c3ba6b3]
Former-commit-id: a4692c8966
2014-06-16 08:57:12 -05:00
Nate Jensen
cc66519671 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: eddc8f373a [formerly c2aa87470d] [formerly eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]
Former-commit-id: ed36453f09
Former-commit-id: 50715cc012 [formerly ef61539a8a]
Former-commit-id: 48496aeb9b
2014-06-16 08:31:30 -05:00
Steve Harris
a0d17947a9 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
2014-06-16 08:19:12 -05:00
Steve Harris
e0be1f390e Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: f2d30c4c62 [formerly 7a8741d8fa]
Former-commit-id: 61112bc258
2014-06-16 07:49:58 -05:00
Greg Armendariz
377d8f3a70 Omaha #3247 - Update qpid dependency
Former-commit-id: c14107d4cf [formerly db4e94b713] [formerly c14107d4cf [formerly db4e94b713] [formerly 70104bc9aa [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]]
Former-commit-id: 70104bc9aa
Former-commit-id: 3bd1c7ff81 [formerly d2f9344b5f]
Former-commit-id: b8b50069f5
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
6594b9dbd8 Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 9caf60a551 [formerly 81fbf3b697] [formerly 9caf60a551 [formerly 81fbf3b697] [formerly 29b423645e [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]]
Former-commit-id: 29b423645e
Former-commit-id: 18f1cd9d5b [formerly b0ff6298f1]
Former-commit-id: 07f36a59a7
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
307f065952 Omaha #3163 Fix NPE when styleless strings are sent to 14.3
Former-commit-id: d2997f9fc0 [formerly 1f8f612d3a] [formerly d2997f9fc0 [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]]
Former-commit-id: 7245544e1f
Former-commit-id: 1282f74317 [formerly 59b5076a66]
Former-commit-id: 991dff52d2
2014-06-13 16:49:25 -05:00
Benjamin Phillippe
3845d1e1cb Omaha #3255 Fix Build
Former-commit-id: 67ee2613d7 [formerly a22c77cbfb] [formerly 67ee2613d7 [formerly a22c77cbfb] [formerly 63d104d18d [formerly 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6]]]
Former-commit-id: 63d104d18d
Former-commit-id: 2b58b5736d [formerly e53e82e5c0]
Former-commit-id: 1c74add53a
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
1514b2d812 Omaha #3255 Fix Build
Former-commit-id: 9a2b844db1 [formerly 0baf11790f] [formerly 9a2b844db1 [formerly 0baf11790f] [formerly 493302f63b [formerly 3182016dc2a85aef65a6f715dc1ed5e60bedb27d]]]
Former-commit-id: 493302f63b
Former-commit-id: 990ba586b4 [formerly e3f37f8ddd]
Former-commit-id: dd9658b657
2014-06-13 10:55:23 -05:00
Ron Anderson
5822560328 Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
Former-commit-id: 606920b67d [formerly ee21383c07] [formerly 606920b67d [formerly ee21383c07] [formerly 97c35aacd2 [formerly a4102501a895730d99e03b6fbafe0e7152b198cd]]]
Former-commit-id: 97c35aacd2
Former-commit-id: 857be88042 [formerly 47ec04766d]
Former-commit-id: 795aa07ddc
2014-06-13 10:45:48 -05:00
Ron Anderson
51a0db50cd Merge "Omaha #3262 smarter detection of java packages/classes" into omaha_14.4.1
Former-commit-id: 9cc016dbfb [formerly 00eac78a02] [formerly 9cc016dbfb [formerly 00eac78a02] [formerly 8857dfe49a [formerly d02af9d53b1f00d21f3d7ef92c54a930d13441ae]]]
Former-commit-id: 8857dfe49a
Former-commit-id: 2a54c939dd [formerly 4b4638c5a9]
Former-commit-id: d36bf15e0b
2014-06-12 18:19:25 -05:00
Richard Peter
decbe09951 Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
Former-commit-id: 5c343e736a [formerly 9f2854abe8] [formerly 5c343e736a [formerly 9f2854abe8] [formerly 7a750bc86a [formerly e5d608a8977a62143bf487737e1852cd43776cfd]]]
Former-commit-id: 7a750bc86a
Former-commit-id: fa29bb1f50 [formerly 458ead4d6b]
Former-commit-id: fb9beb4150
2014-06-12 16:50:20 -05:00
Richard Peter
e9d1b4d22f Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
Former-commit-id: 581b2cc7b7 [formerly b630aa2971] [formerly 581b2cc7b7 [formerly b630aa2971] [formerly 418ad24111 [formerly 5dab0d8232781688132d7df0710a86ea98f93810]]]
Former-commit-id: 418ad24111
Former-commit-id: b645f7423b [formerly 601a4c7ee0]
Former-commit-id: 410f807554
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
68a4e59e08 Omaha #3255 Fixing bundle version to fix build
Former-commit-id: 025597ee18 [formerly 7da0490ede] [formerly 025597ee18 [formerly 7da0490ede] [formerly ed5a7a50f2 [formerly 5201bd2f8cc36c2dd39ac7bab51693affa5e6da1]]]
Former-commit-id: ed5a7a50f2
Former-commit-id: 50d1f6b858 [formerly 13549f05d8]
Former-commit-id: b4126beaaf
2014-06-12 16:39:25 -05:00
Nate Jensen
cfa8bc6903 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: 254ba2762f [formerly ba2f130b13] [formerly 254ba2762f [formerly ba2f130b13] [formerly fc905ca588 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]]
Former-commit-id: fc905ca588
Former-commit-id: 55ddf5dbe7 [formerly 907fc445a3]
Former-commit-id: 198da6201c
2014-06-12 15:14:50 -05:00
Brian Clements
338f293065 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: 42e6e38c2e [formerly adbffa5ddd] [formerly 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: b1fac777f4 [formerly 3bdbf79eeb]
Former-commit-id: e13aeb0ca5
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
c73ec7db64 Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: c105de1a4c [formerly 5355ca8c1c] [formerly c105de1a4c [formerly 5355ca8c1c] [formerly df2fed2be3 [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]]
Former-commit-id: df2fed2be3
Former-commit-id: 6309145495 [formerly ab616254bf]
Former-commit-id: 5e433c9871
2014-06-12 15:00:26 -05:00
Nate Jensen
53fe673750 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: dd10c76b19 [formerly 387b0604cc] [formerly dd10c76b19 [formerly 387b0604cc] [formerly d3417d8e45 [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]]
Former-commit-id: d3417d8e45
Former-commit-id: 66c3efd784 [formerly 6220def099]
Former-commit-id: 4dc987369a
2014-06-12 14:27:47 -05:00
Nate Jensen
d933774746 Merge "Omaha #3270 fix warngen manifest's register buddy" into omaha_14.4.1
Former-commit-id: 67d197dffb [formerly 2ef1293724] [formerly 67d197dffb [formerly 2ef1293724] [formerly 6ce08839d8 [formerly 6bc86288772152802b164382293f040691fcc262]]]
Former-commit-id: 6ce08839d8
Former-commit-id: 2685705310 [formerly ed46d95f35]
Former-commit-id: 60e926d118
2014-06-12 14:20:47 -05:00
Richard Peter
2cc5675f89 Merge "Omaha #3255 Registry Security Features (commit 1/5)" into omaha_14.4.1
Former-commit-id: 32323da812 [formerly 912c112e09] [formerly 32323da812 [formerly 912c112e09] [formerly c7a82e08ca [formerly 22b5edf2bbd47eb1a80bfa60a1ffd46c8c4d0d71]]]
Former-commit-id: c7a82e08ca
Former-commit-id: 09e822b13c [formerly 3f80ff0247]
Former-commit-id: a95ec60c2c
2014-06-12 14:16:21 -05:00
Ben Steffensmeier
deaecfc649 Omaha #2061 Remove dataURI from acars.
Former-commit-id: 0a6e99e9d1 [formerly f66725a515] [formerly 0a6e99e9d1 [formerly f66725a515] [formerly 35ad2f2b8d [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: 4e3a8e97fe [formerly e227d408db]
Former-commit-id: 81b4860e27
2014-06-12 13:59:45 -05:00
Nate Jensen
985da469eb Omaha #3270 fix warngen manifest's register buddy
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: eeb97a239a [formerly 31b3029e02] [formerly eeb97a239a [formerly 31b3029e02] [formerly 305564d6f0 [formerly 796e242b031087e08b9ba5e44664d6b400405c42]]]
Former-commit-id: 305564d6f0
Former-commit-id: eeb4824569 [formerly 0b185c3b6c]
Former-commit-id: 0a893a8692
2014-06-12 13:58:27 -05:00
Brian Clements
88bc3a948e Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: 909561d871 [formerly 5424eb0258] [formerly 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 077976c912 [formerly 9e39c19a7d]
Former-commit-id: 649d0cf43f
2014-06-12 13:40:33 -05:00
Nate Jensen
20d48d21f6 Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
Former-commit-id: cd10372371 [formerly 4ac8246386] [formerly cd10372371 [formerly 4ac8246386] [formerly f118e1b0e9 [formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]]
Former-commit-id: f118e1b0e9
Former-commit-id: 595cb870bf [formerly 343b88e3b3]
Former-commit-id: 576fc405e5
2014-06-12 12:36:14 -05:00
Richard Peter
8f55fcab69 Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
Former-commit-id: f4cd1ce52d [formerly df86770b4e] [formerly f4cd1ce52d [formerly df86770b4e] [formerly 7731e25983 [formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]]
Former-commit-id: 7731e25983
Former-commit-id: 0ef48baedc [formerly 40e2813f50]
Former-commit-id: 52b9f0107f
2014-06-12 12:35:24 -05:00
Dave Hladky
bbe889e44e Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA
Former-commit-id: d0743f46f4 [formerly 7516b5ffbc] [formerly d0743f46f4 [formerly 7516b5ffbc] [formerly 65e85058e0 [formerly 8b4bea63939089b805aaa3b08d6907c95c04230e]]]
Former-commit-id: 65e85058e0
Former-commit-id: d4bae18c27 [formerly 09e9ffd211]
Former-commit-id: 33710d29d4
2014-06-12 11:58:42 -05:00
Nate Jensen
6f25339365 Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: 1a94d51831 [formerly d4471bf759] [formerly 1a94d51831 [formerly d4471bf759] [formerly 95fe41966a [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]]
Former-commit-id: 95fe41966a
Former-commit-id: 08b53fe0fe [formerly a6fa27a1b8]
Former-commit-id: 7fac05ac42
2014-06-12 11:38:22 -05:00
Benjamin Phillippe
55f7eabc96 Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: e05f09bb20 [formerly cfe7bb251f] [formerly e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]]
Former-commit-id: fb9e936e0e
Former-commit-id: d46a6df3e0 [formerly c523752519]
Former-commit-id: 31aeb53f7c
2014-06-12 11:26:51 -05:00
Slav Korolev
d6ef83e619 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]
Former-commit-id: 16ec392c12
Former-commit-id: fec8eb4fae [formerly d8ebeb4778]
Former-commit-id: a66dd879c7
2014-06-12 12:24:34 -04:00
Mike Duff
a87ac48a53 Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 522d3c70f2 [formerly 80922824a3] [formerly 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]
Former-commit-id: c920a24300
Former-commit-id: 0bdefaabdd [formerly b15b6514fd]
Former-commit-id: 5e0aa25048
2014-06-12 11:21:15 -05:00
Nate Jensen
ee19a66ea6 Omaha #3262 smarter detection of java packages/classes
Change-Id: I2f38e02cfa084803c5b40318a2789a236865dda6

Former-commit-id: fde925f383 [formerly d43a01f5d8] [formerly fde925f383 [formerly d43a01f5d8] [formerly 746daf5f3e [formerly 6afa4c1beeba55509d3222ea908595aee59a7f38]]]
Former-commit-id: 746daf5f3e
Former-commit-id: 5cf6041b43 [formerly 36c38389a5]
Former-commit-id: 2289c7fafe
2014-06-12 10:40:36 -05:00
Brian Clements
043cde3d60 Omaha #3229 added bufr buoy support
small bufr obs refactor
fixed empty array issue in bufr parser

Change-Id: Ie21ffdafed8b137264db4751c147ce1dd13eabd2

Former-commit-id: 2e0408ca10 [formerly 99e86f95be] [formerly 2e0408ca10 [formerly 99e86f95be] [formerly 5be93b4084 [formerly 763ea813523d2e6a6da3fb6a80c94939ce605f6c]]]
Former-commit-id: 5be93b4084
Former-commit-id: 87f60d2e22 [formerly bab2785b71]
Former-commit-id: 659e83127b
2014-06-12 10:12:13 -05:00
Roger Ferrel
06808134bf Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 09ae36d8de [formerly 960772ea44] [formerly 09ae36d8de [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: c43758bdbb [formerly 95d7540d05]
Former-commit-id: 5e9ed74eac
2014-06-12 10:08:51 -05:00
Ron Anderson
c0442f63b0 Omaha #3244 Improved GFE purge error handling
Change-Id: I18fcf443b6c77a323df76659a8a60cb10b65669c

Former-commit-id: 65fbf7f61e [formerly 366e5d7fd3] [formerly 65fbf7f61e [formerly 366e5d7fd3] [formerly 9ac1f19455 [formerly d8955e6dcd8f16b33c54de104596e9743ce7d85e]]]
Former-commit-id: 9ac1f19455
Former-commit-id: 6627d6c913 [formerly 864cfd2c30]
Former-commit-id: 75ac1a92a8
2014-06-12 08:05:56 -05:00
Lee Venable
119d128dfd Merge "Omaha #3217 Add always prompt option to thinclient connectivity dialog." into omaha_14.4.1
Former-commit-id: f7161d6a76 [formerly 041488064b] [formerly f7161d6a76 [formerly 041488064b] [formerly aaecd1edaa [formerly 607e2a8ec37798a3620d298077d038417d93007c]]]
Former-commit-id: aaecd1edaa
Former-commit-id: 33b3bf61ee [formerly 817cff4701]
Former-commit-id: d0e77c1e5a
2014-06-12 07:59:53 -05:00
Brian.Dyke
40fb1f6159 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 50073f34b2 [formerly 10696504a0]
Former-commit-id: ac235bf20a
2014-06-12 07:07:17 -04:00
Ron Anderson
c0760ebe57 Merge "Omaha #2840 log tool can now save html reports to directory" into omaha_14.4.1
Former-commit-id: 801509a7e5 [formerly c474ec8b28] [formerly 801509a7e5 [formerly c474ec8b28] [formerly bb6a28c4c0 [formerly d111434bc3cae174f7e19fe670d3b8b837caad5b]]]
Former-commit-id: bb6a28c4c0
Former-commit-id: 990b79ddb3 [formerly da54c5f4da]
Former-commit-id: cb6bc3836c
2014-06-11 17:49:11 -05:00
Nate Jensen
4e3f445707 Omaha #2840 log tool can now save html reports to directory
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682

Former-commit-id: 4b1c9f17ca [formerly 3f586a2690] [formerly 4b1c9f17ca [formerly 3f586a2690] [formerly f681b52b46 [formerly 4aec10e9b7155baa7e4243a4db78ad16440dbba7]]]
Former-commit-id: f681b52b46
Former-commit-id: aa30d5d5ce [formerly 9e476810dd]
Former-commit-id: 3897523dfb
2014-06-11 17:13:38 -05:00
Nate Jensen
b74f6a74dc Merge "Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)" into omaha_14.4.1
Former-commit-id: eaca89ac58 [formerly 944dee69a4] [formerly eaca89ac58 [formerly 944dee69a4] [formerly 967a446097 [formerly c2e210b7157f82a2a1af625d805e3a6751ff6d0d]]]
Former-commit-id: 967a446097
Former-commit-id: 5821cbfa84 [formerly cae40316cf]
Former-commit-id: 2192ad6036
2014-06-11 17:12:07 -05:00
Ben Steffensmeier
993da07002 Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: 13e618cf89 [formerly b8f331bfba] [formerly 13e618cf89 [formerly b8f331bfba] [formerly c70462fb8a [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]]
Former-commit-id: c70462fb8a
Former-commit-id: 726c91ed9e [formerly 96591c2ddb]
Former-commit-id: f6ea37ef66
2014-06-11 17:00:16 -05:00