Nate Jensen
|
f943500410
|
Omaha #3242 support ensemble id in time series legends
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 9fad6c4712 [formerly 73082de461] [formerly 1a8995fc2d] [formerly 9fad6c4712 [formerly 73082de461] [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 1a8995fc2d [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]]
Former-commit-id: e10a73c17b
Former-commit-id: 7f3df290d5 [formerly d6f84d8281] [formerly f01e86a5e49651bbc7ef488fdb5b254269b6d87f [formerly a575c57ecc]]
Former-commit-id: 89d347029c66f9cb9c20aee6545ec2bc64fdc26f [formerly 1d244a4a95]
Former-commit-id: bf95e2a827
|
2014-06-18 15:37:14 -05:00 |
|
Ron Anderson
|
f33f5aec85
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
f8f17037ca
|
14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
|
2014-01-06 14:02:30 -05:00 |
|
Ben Steffensmeier
|
91e76a843a
|
Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ed7e75b748 [formerly 8248ea2b3b] [formerly abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]]
Former-commit-id: 3ccecf75b62e442a4753a4c621bced1a16209986 [formerly 7272087374]
Former-commit-id: 0fd0580788
|
2013-10-25 14:46:43 -05:00 |
|
Matt Nash
|
f0f9bdf1ac
|
Issue #2251 move style rules and preferences to common
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030
Former-commit-id: e2d8355f77 [formerly e6af6c447f] [formerly 06e04a419d] [formerly e2d8355f77 [formerly e6af6c447f] [formerly 06e04a419d] [formerly f0a32e82a1 [formerly 06e04a419d [formerly 982f297ab19ebcb5e49f662c30b44992e63569cb]]]]
Former-commit-id: f0a32e82a1
Former-commit-id: ffb69f5dbe [formerly 698e2ee1cc] [formerly e6c81ce8eb0ae4359aa1fa46ebbd30bd4763c607 [formerly 2e8149bcb2]]
Former-commit-id: 78c3bb3ab67128ff163541066ef51c6d21a0f319 [formerly d1ea1f569f]
Former-commit-id: d70677d78e
|
2013-09-10 09:28:11 -05:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|