Richard Peter
|
d37ba352e2
|
Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt
Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c
Former-commit-id: a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a33ddbd1a6
Former-commit-id: 648a1b25ae
|
2013-05-17 10:33:18 -05:00 |
|
Steve Harris
|
f9535abb10
|
Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: 16ba74496d
Former-commit-id: 87a31f9990
|
2013-05-16 13:45:58 -05:00 |
|
Steve Harris
|
301821988e
|
13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: bcf7f15c90
Former-commit-id: 88eee9cbfa
|
2013-05-16 11:12:07 -04:00 |
|
Richard Peter
|
31a84fb91f
|
Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea
Former-commit-id: d4135dba62 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]
Former-commit-id: 99391cfe12
Former-commit-id: c63a4882e7
|
2013-05-13 17:16:57 -05:00 |
|
Ben Steffensmeier
|
7c91a83521
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 4209e014d8
Former-commit-id: dab2af2df5
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
313481c30e
|
13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 85bbf6d242
Former-commit-id: aa9a719836
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
ef5893b279
|
13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: d33e5861aa
Former-commit-id: 99f4569650
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
196767d525
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
1b8e623c9b
|
13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
6f374b35d0
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
52f48669f6
|
13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
e2b47a728a
|
13.2.1-5 baseline
Former-commit-id: d26a488ee4 [formerly a11ab8f26e [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: a11ab8f26e
Former-commit-id: d6a9d68c10
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
11b05eedeb
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: 9771dfae6b
Former-commit-id: 48d1aa7732
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
d0cd58d6bc
|
12.10.1-5 baseline
Former-commit-id: 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: a96d35a1fa
Former-commit-id: 82feb4de50
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
77cbd6c1e5
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
b9fb1c89d4
|
12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
32fdf6ed3b
|
12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
2f10c7a1e4
|
12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
4767b0e069
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
|
2012-04-18 15:18:16 -05:00 |
|
root
|
133dc97f67
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
|
2012-01-06 08:55:05 -06:00 |
|