Commit graph

20 commits

Author SHA1 Message Date
Richard Peter
aff520d61b 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: 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a9869f07ba
Former-commit-id: c47eb36e43
2013-05-17 10:33:18 -05:00
Steve Harris
b5d3ff1867 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: 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: b76d359695
Former-commit-id: 26664e6615
2013-05-16 13:45:58 -05:00
Steve Harris
67a95d07d2 13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
2013-05-16 11:12:07 -04:00
Richard Peter
43a90c062c Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: c63a4882e7 [formerly 99391cfe12] [formerly d4135dba62 [formerly 883a51484d03900852ed84820aa559e088c97335]]
Former-commit-id: d4135dba62
Former-commit-id: a02955e40c
2013-05-13 17:16:57 -05:00
Ben Steffensmeier
9cf071338e Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: dab2af2df5 [formerly 4209e014d8] [formerly 79015595ee [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 79015595ee
Former-commit-id: 1c51f0b5f2
2013-05-08 18:39:25 -05:00
Steve Harris
e0af96524f 13.4.1-5 baseline
Former-commit-id: aa9a719836 [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 4ae0e2e858
Former-commit-id: aa4624c58f
2013-05-03 09:29:14 -05:00
Steve Harris
4357e2dacc 13.4.1-4 baseline
Former-commit-id: 99f4569650 [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7828293d32
2013-05-02 10:00:38 -05:00
Steve Harris
ed4150db5f 13.3.1-19 baseline
Former-commit-id: dc9fef33a9 [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Steve Harris
ef413da5f7 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
bbe92e6824 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Steve Harris
72ca459f76 13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
2013-02-04 16:31:26 -06:00
Steve Harris
8ed6a53113 13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
2013-01-23 11:13:03 -05:00
Steve Harris
a903893a09 12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
2012-09-17 15:42:31 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
aed7a644df 12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
dc50bc8443 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Steve Harris
97c4db937e 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00