Nate Jensen
65eb76ff66
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: 599f2598f711ce2ae6ac69ed78a90502a84d2716
2014-06-19 10:02:34 -05:00
Greg Armendariz
9d1630a617
Omaha #3299 - Fix qpid dependency
...
Former-commit-id: d292734da643f003d9d04e03b32727bf9c007443
2014-06-19 09:56:10 -05:00
Nate Jensen
7bb2aebd59
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 667817cf9473889f8c5cc39dd71814f1181a3805
2014-06-18 18:23:36 -05:00
Nate Jensen
835b65b7b8
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6
2014-06-18 17:17:17 -05:00
Nate Jensen
fbd7e64fe2
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: 84257c99914950f412f1e3d8c12b691fb428086f
2014-06-18 17:17:04 -05:00
Nate Jensen
9a76fd4db0
Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1
...
Former-commit-id: 968613aaa91648a8e860eff88293744ddc00464c
2014-06-18 17:07:19 -05:00
Nate Jensen
30e76a1fd5
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: d06eedeefc7997f6c881cf267c7f24979afbd9d7
2014-06-18 17:02:10 -05:00
Nate Jensen
3ba4931eee
Omaha #3242 fix errors that can occur if a user zooms or pans while the
...
time series is still loading
Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb
Former-commit-id: 7999e026e8ff02ccb0f155af8770b0d8aac43339
2014-06-18 16:48:48 -05:00
Nate Jensen
46c843f51a
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 4a7eebe03c9cd84702e6cda1258503da725a10bb
2014-06-18 16:37:49 -05:00
Nate Jensen
e10a73c17b
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 453c1eecf4f08203b4c6e2a74ad5dc366d85d359
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
bc9e7f1cb3
Omaha #3255 Fix build
...
Former-commit-id: cd985e372ebdd705e1e93c4760fc02f229ddfddd
2014-06-18 14:03:23 -05:00
Benjamin Phillippe
7e7cecceea
Omaha #3255 Fixing Build
...
Former-commit-id: a2a18d6f4a9f536172c264eeeee3ff51e225981f
2014-06-18 13:57:27 -05:00
Nate Jensen
9fd4e4a8d9
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: b209ae6772fe33ca73a130468c4c314f86ffeba5
2014-06-18 12:14:45 -05:00
Ben Steffensmeier
7b356e8ce0
Omaha #2061 Remove another reference to IDecoderGettable.
...
Former-commit-id: bdca92f18fa4a7348dd82d9f2348583398dd5c30
2014-06-18 12:12:01 -05:00
Nate Jensen
32bc3e4056
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 5d378ca9529b48bd0a1422aec3263310f8350161
2014-06-18 11:11:34 -05:00
Nate Jensen
17dc45e7ca
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: dd628b80f7798bb66d3c54568b9549e66870ddec
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
c2ed8a39d1
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: dbac62df979f23402594dc6439b53e7884ea1bd1
2014-06-18 09:54:40 -05:00
Steve Harris
676948e239
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts (these go to ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java
Former-commit-id: da50f581c90ea0cca5f43c45c44cb8ac045a6c8c
2014-06-18 08:52:25 -05:00
Brian.Dyke
8ecdd9a192
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
2014-06-18 08:55:49 -04:00
Nate Jensen
764f977bf6
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 4468390aaf89456e93b45fca20aeca7fb96d8c12
2014-06-17 18:09:33 -05:00
Nate Jensen
7fc256d076
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: c632bf24ee15cc85da9d7e7fb0a295912bf06b78
2014-06-17 17:01:46 -05:00
Brian Clements
5d03048fff
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5d298b39786d37aa365ccfe2c337214d1e46f1a9
2014-06-17 17:01:23 -05:00
Nate Jensen
8ab7d86a8f
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 539d497c5fc80efd5099e76a9e95a4709ace041d
2014-06-17 16:31:20 -05:00
Nate Jensen
c05ae83ea2
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: 2c2b3891003076484539ef5fa7d6772b6336c635
2014-06-17 16:24:42 -05:00
Brian Clements
add8286d52
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: a51847aff197f805a4e48c9ecdb0c16f874e6a78
2014-06-17 14:32:17 -05:00
Nate Jensen
acd7620d7a
Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
...
Former-commit-id: 6efd831efcc5372c7e7bfd52265d13de382407ee
2014-06-17 14:21:55 -05:00
Ron Anderson
855b4ad7c1
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc
2014-06-17 13:54:11 -05:00
Ron Anderson
1a8ccd0181
Omaha #3110 Fix typos in revision comment and log message.
...
Changed to log number of messages in queue instead of number being added to queue.
Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7
Former-commit-id: 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527
2014-06-17 13:46:38 -05:00
Brian Clements
97a6f5bfe8
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
2014-06-17 11:52:58 -05:00
Nate Jensen
d334c16d1c
Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1
...
Former-commit-id: 615a1baccb5f263bd29a5e4a6da95f1a8c6e6568
2014-06-17 11:19:03 -05:00
Nate Jensen
44cb0e6ae6
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 0355813f030ac996427c64dfcb6cbd4dd781ad2f
2014-06-17 10:54:57 -05:00
Brian Clements
84e3f967d9
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
2014-06-17 09:26:24 -05:00
Nate Jensen
3c57231c82
Omaha #3255 attempt to fix build
...
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25
Former-commit-id: 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3
2014-06-17 08:42:29 -05:00
Nate Jensen
c65c392d63
Omaha #3255 fix build
...
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46
Former-commit-id: 579cef6ab063bae1df0cfe85411d174dc75b08bd
2014-06-17 07:40:18 -05:00
Ben Steffensmeier
8064a74866
Omaha #2061 Update ncep copies of radar resources.
...
Former-commit-id: 64b5e484c0dd8409ab0b791763c31681c94a38d3
2014-06-16 10:56:40 -05:00
Nate Jensen
9b7ed95e6b
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: 2ee54c1f78136332f1cd2c40da0c2e7953510e7f
2014-06-16 09:26:30 -05:00
Nate Jensen
b3df7745d4
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d
2014-06-16 09:00:47 -05:00
Nate Jensen
5908a4501a
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 34250721f97f05be61e9e4e8b6f71758347a9f60
2014-06-16 09:00:39 -05:00
Greg Armendariz
8c568a223e
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
...
Former-commit-id: 2484a3407392f64b51b93bd3a4dab04194debea5
2014-06-16 08:57:12 -05:00
Nate Jensen
ed36453f09
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: 93f63c0d42941001e4d59a4840df5e5b525592bf
2014-06-16 08:31:30 -05:00
Steve Harris
e1c8ad2611
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: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
2014-06-16 08:19:12 -05:00
Steve Harris
6c82cc5c3d
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
...
Former-commit-id: 4041e8afbb4bf1c0c416624140d74d27e963f9c8
2014-06-16 07:49:58 -05:00
Greg Armendariz
70104bc9aa
Omaha #3247 - Update qpid dependency
...
Former-commit-id: 9a6a0c9941aaa9b49da7329cccb7e05456ad514c
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
29b423645e
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
7245544e1f
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
...
Former-commit-id: 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5
2014-06-13 16:49:25 -05:00
Brian.Dyke
482f915b42
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
2014-06-13 14:05:49 -04:00
Brian.Dyke
81832d97e5
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
2014-06-13 13:21:19 -04:00
Benjamin Phillippe
63d104d18d
Omaha #3255 Fix Build
...
Former-commit-id: 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
493302f63b
Omaha #3255 Fix Build
...
Former-commit-id: 3182016dc2a85aef65a6f715dc1ed5e60bedb27d
2014-06-13 10:55:23 -05:00
Ron Anderson
97c35aacd2
Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
...
Former-commit-id: a4102501a895730d99e03b6fbafe0e7152b198cd
2014-06-13 10:45:48 -05:00
