Commit graph

7357 commits

Author SHA1 Message Date
Nate Jensen
737fa5c716 Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1
Former-commit-id: 68880c0426392a15fc1d05a423c381856b032634
2014-11-21 14:59:08 -06:00
Mark Peters
0332e4e693 Omaha #3709 Collaboration chat colors for PeerToPeerView
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 341b54d6d23f08499345b8972a77acc9e2ca8c8b
2014-11-21 12:57:08 -06:00
Mark Peters
5bff597f00 Omaha #3768 Add localization to build.properties in uf.viz.aviation.advisory
Change-Id: I96afa121509b7e70fbb0113843924737330366a5

Former-commit-id: 42faaabd5fb640add67bd1c68898e87af670db3e
2014-11-20 17:50:52 -06:00
Greg Armendariz
e3c69ea595 Merge "Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build" into omaha_14.4.1
Former-commit-id: 0982fa7fb3657e11a2dfe3a17e51cafedd9cef21
2014-11-19 13:08:28 -06:00
Ron Anderson
1823bd4801 Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
Former-commit-id: e572e5586d80623e8c6453404dc94691bfd5014d
2014-11-18 18:43:41 -06:00
Mark Peters
bcff3fc981 Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: 1694a064c9496599532e9348a5eb89e558862e60
2014-11-18 16:03:42 -06:00
Nate Jensen
95d510849a Omaha #3549 improve performance of DataStoreResource processing of
requests

Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755

Former-commit-id: bab091169dff1383a3b78ea4b94ec67d446e5f80
2014-11-18 15:22:09 -06:00
Greg Armendariz
ad5e3134e4 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e
2014-11-18 13:48:19 -06:00
Steve Harris
e1106f77eb Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9c77ee7c19b87501983acf88279205644e1692f2
2014-11-17 14:31:43 -06:00
Nathan Bowler
1b201a0777 Omaha #3599 Fix typo in get_args() call.
Change-Id: I7ad64eb987c0162ae4f31b76cbc386d06daf2a91

Former-commit-id: 3916cf0e8b708bb0a6a5fde3208d1d0a77878a90
2014-11-17 11:05:23 -05:00
Fay.Liang
82f427924a Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3b21d69375ceb9c07377082c5e46a094742406a0
2014-11-14 16:24:25 -05:00
Lee Venable
f198da3f4d Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: b6d35ac4e3aa430de7057a16f9d5516584833150
2014-11-14 11:14:16 -06:00
Lee Venable
d28ecb61cf Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1
Former-commit-id: 8632472592ff0dc8611e528cb774d6b1586fea58
2014-11-13 14:47:58 -06:00
Nate Jensen
4d5fb1f014 Merge "Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references" into omaha_14.4.1
Former-commit-id: a532e9607d5e8fee053ef3bbfdc5c517ac481544
2014-11-13 14:40:41 -06:00
Mark Peters
a3725b43bc Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496

Former-commit-id: fa93950435431248bd5790788e3a6936b4f4de2b
2014-11-13 13:34:42 -06:00
David Lovely
e0525f7816 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 89acb99f0639f34e4ba3530e49c81ce5dda42785
2014-11-13 10:59:00 -06:00
Nate Jensen
e2ee787b63 Merge "Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin." into omaha_14.4.1
Former-commit-id: d6e12ddac807e109746f1614b4fd74d49fe259ca
2014-11-13 09:45:40 -06:00
Nate Jensen
3d945c4772 Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1
Former-commit-id: 6ad3a9d449cbdc06d68335d49bb0ac5620585758
2014-11-13 09:45:21 -06:00
Slav Korolev
87a369bc98 Omaha #3650 - Added confirmation box for unsaved changes in the dialog.
Former-commit-id: d24676cfc946cb31618e0178d67d2d687e6a4599
2014-11-13 10:33:58 -05:00
Lee Venable
6b127b488d Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: 389c35bce7c456154321605c3415c43431a46c7b
2014-11-13 09:31:57 -06:00
Mike Duff
8503cc25a7 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: 8d30af1c970cca70fe74560d3157e754e1164785
2014-11-12 18:34:32 -06:00
Ben Steffensmeier
376f566451 Omaha #3810 Make D2D nsharp more thread safe.
Former-commit-id: 31901b563e4169cc44494134e3cac55a5542a79f
2014-11-12 14:48:08 -06:00
Ben Steffensmeier
11966fc0de Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin.
Former-commit-id: 9bbd3f9f8dea46b14d77b796d0ea00285628ea75
2014-11-12 12:50:17 -06:00
Ron Anderson
a60e3465f4 Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0
2014-11-12 11:25:32 -06:00
Roger Ferrel
334d738c79 Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3

Former-commit-id: 414f6e16547e0535ae36c5c4cc86f43db54b689c
2014-11-12 10:50:43 -06:00
Brian Clements
4089f14d57 Omaha #3705 fixed collaboration public room empty participants list problem
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e

Former-commit-id: 251a206c409855ee105c97bdbfe80715142bf25d
2014-11-12 10:38:15 -06:00
Mark Peters
9498a60e7b Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f

Former-commit-id: e156d9527a0dd5fb25aca0264f1fddf546e60acf
2014-11-11 17:16:51 -06:00
Nate Jensen
f1c0b33254 Merge "Omaha #3760 Moved derived parameters with grid models to grid plugin" into omaha_14.4.1
Former-commit-id: c2d32105c4cd1e7acb52b84ba23d119720888c96
2014-11-11 17:09:08 -06:00
Nate Jensen
d330df4e91 Merge "Omaha #3549 improve logging of findDataTime errors" into omaha_14.4.1
Former-commit-id: 979cf995bf6c239a39e57eb06ba36e58ea0d9830
2014-11-11 17:08:54 -06:00
Roger Ferrel
28041de97e Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e

Former-commit-id: 0456cbbaf9c694a73c9862773b0e42165114b78d
2014-11-11 16:10:48 -06:00
Mark Peters
805bc7c7bc Omaha #3760 Moved derived parameters with grid models to grid plugin
Change-Id: I7ac459804b50872203103eb0e2b8a833aa1015ba

Former-commit-id: 314e0cd90be176af62c452d44ea53587a2408c5d
2014-11-11 15:21:02 -06:00
Slav Korolev
a873fe7b5c Omaha #3741 - Updated procedures for calculation of a center for zone and station.
Former-commit-id: a34a8901f83457fa21fc99a0f2ff0df956487b62
2014-11-11 14:56:21 -05:00
Dave Hladky
3052a38081 Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb

Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
2014-11-11 10:18:47 -06:00
Nate Jensen
9d52d4eb5c Omaha #3549 improve logging of findDataTime errors
Change-Id: Ie1af1aac1750ebc42257d3dd3e448bb95801cceb

Former-commit-id: 7a1dd6c72261fb0c1118cea226b5c31c8225b1c7
2014-11-11 09:54:18 -06:00
Nate Jensen
a3366c9417 Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
Former-commit-id: 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e
2014-11-11 09:11:18 -06:00
Nate Jensen
13645f54d4 Merge "Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr" into omaha_14.4.1
Former-commit-id: ea80beca2d0da38d31e0fde21414c7b481c8f61d
2014-11-10 11:19:40 -06:00
Nate Jensen
1a59453949 Merge "Omaha #3760 Move derived parameter definitions to grid plugin" into omaha_14.4.1
Former-commit-id: c9856a64e466695be51903d88ba9f87b0286b19b
2014-11-10 11:17:16 -06:00
Steve Harris
a16abe1b8b Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
David Lovely
625e83c445 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: 3addb3007b0bf7aab88b423bbf700583fc2b3e48
2014-11-10 08:27:28 -06:00
Mark Peters
131ee29479 Omaha #3760 Move derived parameter definitions to grid plugin
Change-Id: I760f2a61e270c38e92c4321489d2b2220d55129b

Former-commit-id: 4c8316b98529d111b24ca7fdfd10d62ba6058148
2014-11-07 16:56:22 -06:00
Mark Peters
724cb2e7d2 Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr
Change-Id: Ic8f3675e7d50cc4b5803bb2c6991ef860afa4dd8

Former-commit-id: 06fed9a6d76c59c77e12fec2789707e46df44817
2014-11-07 16:17:24 -06:00
Mark Peters
80454c815d Omaha #3760 Derived parameter definitons for ldadhydro and obs split to appropriate plugins
Change-Id: I61d7553d300a173bb64d09898c76c23a0ef94241

Former-commit-id: dc5f62b485b32bea22d9886e22fe053163aff19a
2014-11-07 14:05:04 -06:00
Nate Jensen
d5f3bc859e Merge "Omaha #3760 Derived parameter definitions should be split to appropriate plugins" into omaha_14.4.1
Former-commit-id: abd111e667be780e9e5eb3c416b7e4fcf73f5e9a
2014-11-07 13:35:57 -06:00
Mark Peters
2ee1a9b31f Omaha #3760 Derived parameter definitions should be split to appropriate plugins
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611

Former-commit-id: d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa
2014-11-07 12:09:04 -06:00
Lee Venable
b9ae93b31d Merge "Omaha #3667 - Corrected functionality of dialog." into omaha_14.4.1
Former-commit-id: d0812d4d7ce5a01f6a5de7ceea84dd098f3c4354
2014-11-07 12:07:12 -06:00
Brian.Dyke
3dff476497 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b683c7776ef1fad2702fca82aed1abb4873e433b
2014-11-07 12:55:38 -05:00
Richard Peter
9047da36ae Merge "Omaha #3788 Switch satellite_spatial.gid to a sequence." into omaha_14.4.1
Former-commit-id: 4b78380f15df6a8d9a35eb7a2b976b982e949243
2014-11-07 11:18:54 -06:00
Ben Steffensmeier
5d40da982a Omaha #3788 Switch satellite_spatial.gid to a sequence.
Former-commit-id: 919f4ca671ca953b881037e4a69d720d3bf79eb5
2014-11-07 10:23:39 -06:00
Richard Peter
4bdb77ea6a Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
Former-commit-id: e10b35d2537f6aec5cd007e071f570734098c802
2014-11-07 10:01:32 -06:00
Richard Peter
b92033924b Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700
2014-11-07 09:50:34 -06:00