Brian.Dyke
|
f0b8ea5822
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: fb1f5aa593
|
2014-04-25 11:06:11 -04:00 |
|
David Gillingham
|
1c7e650e6a
|
Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]
Former-commit-id: c8a6dc8769
|
2014-04-10 11:24:40 -05:00 |
|
Richard Peter
|
5676090443
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
17477e7db1
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
|
2014-04-04 12:57:32 -04:00 |
|
David Gillingham
|
c58160c9a9
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]
Former-commit-id: 297fd6c3d4
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
145b6fffce
|
Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739
Former-commit-id: f82364f18e [formerly 065be6691bf102699dc7ece3424f6972792c4d6f]
Former-commit-id: 6c2ff04b69
|
2013-10-15 10:08:15 -05:00 |
|
David Gillingham
|
1f8db069d7
|
Issue #1843: Implement ETN remote partners functionality.
Change-Id: I827e312941b4dbd15e3c6c90e04e38ffbf457294
Former-commit-id: 0359324523 [formerly b0c40550c1448894915583a0426e78602cbe05c6]
Former-commit-id: f72a420d53
|
2013-09-18 13:19:28 -05:00 |
|
Richard Peter
|
bf99d8fd4d
|
Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]
Former-commit-id: 359ee5d1af
|
2013-07-26 14:36:46 -05:00 |
|
Ben Steffensmeier
|
e8b22db364
|
Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 0bc5aca64b [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]
Former-commit-id: a655380bad
|
2013-07-16 15:50:14 -05:00 |
|
Steve Harris
|
d6319a2ca6
|
13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]
Former-commit-id: 2edee36158
|
2013-05-21 09:19:25 -04:00 |
|
Richard Peter
|
c63a4882e7
|
Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea
Former-commit-id: d4135dba62 [formerly 883a51484d03900852ed84820aa559e088c97335]
Former-commit-id: 99391cfe12
|
2013-05-13 17:16:57 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
750b7543dd
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
580e2938d7
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
|
2012-01-19 11:53:12 -06:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|